3f5d5a0 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

RST Writer: treat headings in block quotes, etc as rubrics

3f5d5a0Nikolay Yakimov12 years ago

src/Text/Pandoc/Writers/RST.hs+29−7

compare with master

unifiedsplit

@@ -54,6 +54,7 @@ data WriterState =

54 , stHasMath :: Bool

55 , stHasRawTeX :: Bool

56 , stOptions :: WriterOptions

57+ , stTopLevel :: Bool

57 }

58 }

59-- | Convert Pandoc to RST.

60-- | Convert Pandoc to RST.

@@ -61,7 +62,8 @@ writeRST :: WriterOptions -> Pandoc -> String

61writeRST opts document =

62writeRST opts document =

62 let st = WriterState { stNotes = [], stLinks = [],

63 let st = WriterState { stNotes = [], stLinks = [],

63 stImages = [], stHasMath = False,

64 stImages = [], stHasMath = False,

64− stHasRawTeX = False, stOptions = opts }

65+ stHasRawTeX = False, stOptions = opts,

66+ stTopLevel = True}

65 in evalState (pandocToRST document) st

67 in evalState (pandocToRST document) st

67-- | Return RST representation of document.

69-- | Return RST representation of document.

@@ -79,7 +81,7 @@ pandocToRST (Pandoc meta blocks) = do

79 (fmap (render colwidth) . blockListToRST)

81 (fmap (render colwidth) . blockListToRST)

80 (fmap (trimr . render colwidth) . inlineListToRST)

82 (fmap (trimr . render colwidth) . inlineListToRST)

81 $ deleteMeta "title" $ deleteMeta "subtitle" meta

83 $ deleteMeta "title" $ deleteMeta "subtitle" meta

82− body <- blockListToRST $ normalizeHeadings 1 blocks

84+ body <- blockListToRST' True $ normalizeHeadings 1 blocks

83 notes <- liftM (reverse . stNotes) get >>= notesToRST

85 notes <- liftM (reverse . stNotes) get >>= notesToRST

84 -- note that the notes may contain refs, so we do them first

86 -- note that the notes may contain refs, so we do them first

85 refs <- liftM (reverse . stLinks) get >>= refsToRST

87 refs <- liftM (reverse . stLinks) get >>= refsToRST

@@ -198,11 +200,21 @@ blockToRST (RawBlock f@(Format f') str)

198 (nest 3 $ text str) $$ blankline

200 (nest 3 $ text str) $$ blankline

199blockToRST HorizontalRule =

201blockToRST HorizontalRule =

200 return $ blankline $$ "--------------" $$ blankline

202 return $ blankline $$ "--------------" $$ blankline

201−blockToRST (Header level _ inlines) = do

203+blockToRST (Header level (name,classes,_) inlines) = do

202 contents <- inlineListToRST inlines

204 contents <- inlineListToRST inlines

205+ isTopLevel <- gets stTopLevel

206+ if isTopLevel

207+ then do

203− let headerChar = if level > 5 then ' ' else "=-~^'" !! (level - 1)

208+ let headerChar = if level > 5 then ' ' else "=-~^'" !! (level - 1)

204− let border = text $ replicate (offset contents) headerChar

209+ let border = text $ replicate (offset contents) headerChar

205− return $ nowrap $ contents $$ border $$ blankline

210+ return $ nowrap $ contents $$ border $$ blankline

211+ else do

212+ let rub = "rubric:: " <> contents

213+ let name' | null name = empty

214+ | otherwise = ":name: " <> text name

215+ let cls | null classes = empty

216+ | otherwise = ":class: " <> text (unwords classes)

217+ return $ nowrap $ hang 3 ".. " (rub $$ name' $$ cls) $$ blankline

206blockToRST (CodeBlock (_,classes,kvs) str) = do

218blockToRST (CodeBlock (_,classes,kvs) str) = do

207 opts <- stOptions <$> get

219 opts <- stOptions <$> get

208 let tabstop = writerTabStop opts

220 let tabstop = writerTabStop opts

@@ -304,9 +316,19 @@ definitionListItemToRST (label, defs) = do

304 return $ label' $$ nest tabstop (nestle contents <> cr)

316 return $ label' $$ nest tabstop (nestle contents <> cr)

305

317

306-- | Convert list of Pandoc block elements to RST.

318-- | Convert list of Pandoc block elements to RST.

319+blockListToRST' :: Bool

320+ -> [Block] -- ^ List of block elements

321+ -> State WriterState Doc

322+blockListToRST' topLevel blocks = do

323+ tl <- gets stTopLevel

324+ modify (\s->s{stTopLevel=topLevel})

325+ res <- vcat `fmap` mapM blockToRST blocks

326+ modify (\s->s{stTopLevel=tl})

327+ return res

328+

307blockListToRST :: [Block] -- ^ List of block elements

329blockListToRST :: [Block] -- ^ List of block elements

308 -> State WriterState Doc

330 -> State WriterState Doc

309−blockListToRST blocks = mapM blockToRST blocks >>= return . vcat

331+blockListToRST = blockListToRST' False

310

332

311-- | Convert list of Pandoc inline elements to RST.

333-- | Convert list of Pandoc inline elements to RST.

312inlineListToRST :: [Inline] -> State WriterState Doc

334inlineListToRST :: [Inline] -> State WriterState Doc