5fc6669 · typeable/pandoc

git.iko.soy/typeable/pandoc

Added --atx-headers option.

commit5fc6669be6823f19dd515f699c90101e919e2803 authorJohn MacFarlane <fiddlosopher@gmail.com> dateThu 26 Jan 2012, 23:55 (15 years ago) parent1ce7c38

3 files changed+17−1

compare with master

unifiedsplit

README+4 src/Text/Pandoc/Shared.hs+2 src/pandoc.hs+11−1

README+4

@@ -342,6 +342,10 @@ Options affecting specific writers

342342: Use reference-style links, rather than inline links, in writing markdown

343343 or reStructuredText. By default inline links are used.

344344

345+`--atx-headers`

346+: Use ATX style headers in markdown output. The default is to use

347+ setext-style headers for levels 1-2, and then ATX headers.

348+

345349`--chapters`

346350: Treat top-level headers as chapters in LaTeX, ConTeXt, and DocBook

347351 output. When the LaTeX template uses the report, book, or

src/Text/Pandoc/Shared.hs+2

@@ -483,6 +483,7 @@ data WriterOptions = WriterOptions

483483 , writerListings :: Bool -- ^ Use listings package for code

484484 , writerHighlight :: Bool -- ^ Highlight source code

485485 , writerHighlightStyle :: Style -- ^ Style to use for highlighting

486+ , writerSetextHeaders :: Bool -- ^ Use setext headers for levels 1-2 in markdown

486487 } deriving Show

487488

488489{-# DEPRECATED writerXeTeX "writerXeTeX no longer does anything" #-}

@@ -520,6 +521,7 @@ defaultWriterOptions =

520521 , writerListings = False

521522 , writerHighlight = False

522523 , writerHighlightStyle = pygments

524+ , writerSetextHeaders = True

523525 }

524526

525527--

src/pandoc.hs+11−1

@@ -132,6 +132,7 @@ data Opt = Opt

132132 , optLaTeXEngine :: String -- ^ Program to use for latex -> pdf

133133 , optBeamer :: Bool -- ^ Produce latex output for beamer class

134134 , optSlideLevel :: Maybe Int -- ^ Header level that creates slides

135+ , optSetextHeaders :: Bool -- ^ Use atx headers for markdown level 1-2

135136 }

136137

137138-- | Defaults for command-line options.

@@ -182,6 +183,7 @@ defaultOpts = Opt

182183 , optLaTeXEngine = "pdflatex"

183184 , optBeamer = False

184185 , optSlideLevel = Nothing

186+ , optSetextHeaders = True

185187 }

186188

187189-- | A list of functions, each transforming the options data structure

@@ -414,6 +416,11 @@ options =

414416 (\opt -> return opt { optReferenceLinks = True } ))

415417 "" -- "Use reference links in parsing HTML"

416418

419+ , Option "" ["atx-headers"]

420+ (NoArg

421+ (\opt -> return opt { optSetextHeaders = False } ))

422+ "" -- "Use atx-style headers for markdown"

423+

417424 , Option "" ["chapters"]

418425 (NoArg

419426 (\opt -> return opt { optChapters = True }))

@@ -810,6 +817,7 @@ main = do

810817 , optLaTeXEngine = latexEngine

811818 , optBeamer = beamer

812819 , optSlideLevel = slideLevel

820+ , optSetextHeaders = setextHeaders

813821 } = opts

814822

815823 when dumpArgs $

@@ -960,7 +968,9 @@ main = do

960968 writerBeamer = beamer,

961969 writerSlideLevel = slideLevel,

962970 writerHighlight = highlight,

963− writerHighlightStyle = highlightStyle }

971+ writerHighlightStyle = highlightStyle,

972+ writerSetextHeaders = setextHeaders

973+ }

964974

965975 when (writerName' `elem` nonTextFormats&& outputFile == "-") $

966976 err 5 $ "Cannot write " ++ writerName' ++ " output to stdout.\n" ++