9b5d203 · typeable/pandoc

src/Text/Pandoc/Options.hs+2

compare with master

unifiedsplit

@@ -54,6 +54,7 @@ data ReaderOptions = ReaderOptions{

54 readerExtensions :: Set Extension -- ^ Syntax extensions

55 , readerSmart :: Bool -- ^ Smart punctuation

56 , readerStrict :: Bool -- ^ FOR TRANSITION ONLY

57+ , readerStandalone :: Bool -- ^ Standalone document with header

57 , readerParseRaw :: Bool -- ^ Parse raw HTML, LaTeX

58 , readerParseRaw :: Bool -- ^ Parse raw HTML, LaTeX

58 , readerColumns :: Int -- ^ Number of columns in terminal

59 , readerColumns :: Int -- ^ Number of columns in terminal

59 , readerTabStop :: Int -- ^ Tab stop

60 , readerTabStop :: Int -- ^ Tab stop

@@ -72,6 +73,7 @@ instance Default ReaderOptions

72 readerExtensions = Set.fromList [minBound..maxBound]

73 readerExtensions = Set.fromList [minBound..maxBound]

73 , readerSmart = False

74 , readerSmart = False

74 , readerStrict = False

75 , readerStrict = False

76+ , readerStandalone = False

75 , readerParseRaw = False

77 , readerParseRaw = False

76 , readerColumns = 80

78 , readerColumns = 80

77 , readerTabStop = 4

79 , readerTabStop = 4

src/Text/Pandoc/Readers/RST.hs+5−2

@@ -103,10 +103,13 @@ parseRST = do

103 let reversedNotes = stateNotes st'

104 updateState $ \s -> s { stateNotes = reverse reversedNotes }

105 -- now parse it for real...

106− blocks <- parseBlocks

106+ blocks <- parseBlocks

107 let blocks' = filter (/= Null) blocks

108+ standalone <- getOption readerStandalone

109+ let (blocks'', title) = if standalone

110+ then titleTransform blocks'

111+ else (blocks', [])

108 state <- getState

112 state <- getState

109− let (blocks'', title) = titleTransform blocks'

110 let authors = stateAuthors state

113 let authors = stateAuthors state

111 let date = stateDate state

114 let date = stateDate state

112 let title' = if (null title) then (stateTitle state) else title

115 let title' = if (null title) then (stateTitle state) else title

src/pandoc.hs+1

@@ -940,6 +940,7 @@ main = do

940 readerStrict = strict

941 , readerSmart = smart || (texLigatures &&

942 (laTeXOutput || writerName' == "context"))

943+ , readerStandalone = standalone'

943 , readerParseRaw = parseRaw

944 , readerParseRaw = parseRaw

944 , readerColumns = columns

945 , readerColumns = columns

945 , readerTabStop = tabStop

946 , readerTabStop = tabStop