git.iko.soy/typeable/pandoc
on master help sign in
RST reader: Fixed `..include::` directive.
8fcf664John MacFarlane
pandoc.cabal+1
compare with master
unifiedsplit
@@ -138,6 +138,7 @@ Extra-Source-Files:
138 test/*.native
138 test/*.native
139 test/command/*.md
139 test/command/*.md
140 test/command/3533-rst-csv-tables.csv
140 test/command/3533-rst-csv-tables.csv
141+ test/command/3880.txt
141 test/command/abbrevs
142 test/command/abbrevs
142 test/command/SVG_logo-without-xml-declaration.svg
143 test/command/SVG_logo-without-xml-declaration.svg
143 test/command/SVG_logo.svg
144 test/command/SVG_logo.svg
src/Text/Pandoc/Readers/RST.hs+9−9
@@ -219,7 +219,6 @@ block = choice [ codeBlock
219 , directive
219 , directive
220 , anchor
220 , anchor
221 , comment
221 , comment
222− , include
223 , header
222 , header
224 , hrule
223 , hrule
225 , lineBlock -- must go before definitionList
224 , lineBlock -- must go before definitionList
@@ -460,16 +459,16 @@ tab-width
460encoding
459encoding
461-}
460-}
462
461
462+includeDirective :: PandocMonad m
463+ => String -> [(String, String)] -> String
463−include :: PandocMonad m => RSTParser m Blocks
464+ -> RSTParser m Blocks
464−include = try $ do
465+includeDirective top fields body = do
465− string ".. include::"
466+ let f = trim top
466− skipMany spaceChar
467+ guard $ not (null f)
467− f <- trim <$> anyLine
468+ guard $ null (trim body)
468− fields <- many $ rawFieldListItem 3
469 -- options
469 -- options
470 let (startLine :: Maybe Int) = lookup "start-line" fields >>= safeRead
470 let (startLine :: Maybe Int) = lookup "start-line" fields >>= safeRead
471 let (endLine :: Maybe Int) = lookup "end-line" fields >>= safeRead
471 let (endLine :: Maybe Int) = lookup "end-line" fields >>= safeRead
472− guard $ not (null f)
473 oldPos <- getPosition
472 oldPos <- getPosition
474 oldInput <- getInput
473 oldInput <- getInput
475 containers <- stateContainers <$> getState
474 containers <- stateContainers <$> getState
@@ -501,7 +500,7 @@ include = try $ do
501 Just patt -> drop 1 .
500 Just patt -> drop 1 .
502 dropWhile (not . (patt `isInfixOf`))
501 dropWhile (not . (patt `isInfixOf`))
503 Nothing -> id) $ contentLines'
502 Nothing -> id) $ contentLines'
504− let contents' = unlines contentLines''
503+ let contents' = unlines contentLines'' ++ "\n"
505 case lookup "code" fields of
504 case lookup "code" fields of
506 Just lang -> do
505 Just lang -> do
507 let numberLines = lookup "number-lines" fields
506 let numberLines = lookup "number-lines" fields
@@ -687,6 +686,7 @@ directive' = do
687 $ lookup "height" fields >>=
686 $ lookup "height" fields >>=
688 (lengthToDim . filter (not . isSpace))
687 (lengthToDim . filter (not . isSpace))
689 case label of
688 case label of
689+ "include" -> includeDirective top fields body'
690 "table" -> tableDirective top fields body'
690 "table" -> tableDirective top fields body'
691 "list-table" -> listTableDirective top fields body'
691 "list-table" -> listTableDirective top fields body'
692 "csv-table" -> csvTableDirective top fields body'
692 "csv-table" -> csvTableDirective top fields body'
test/command/3880.mdnew file+6
@@ -0,0 +1,6 @@
1+```
2+pandoc -f rst -t native
3+.. include:: command/3880.txt
4+^D
5+[Para [Str "hi"]]
6+```
test/command/3880.txtnew file+1
@@ -0,0 +1 @@
1+hi