a276bb0 · typeable/pandoc

git.iko.soy/typeable/pandoc

Let papersizes a0, a1, a2, ... be case-insensitive in LaTeX and ConTeXt.

commita276bb0a8a07650368f3007820b96909c2734ff0 authorJohn MacFarlane <jgm@berkeley.edu> dateWed 29 Nov 2017, 09:45 (9 years ago) parent7751391

2 files changed+8−5

unifiedsplit

src/Text/Pandoc/Writers/ConTeXt.hs+4−3

@@ -31,7 +31,7 @@ Conversion of 'Pandoc' format into ConTeXt.

3131-}

3232module Text.Pandoc.Writers.ConTeXt ( writeConTeXt ) where

3333import Control.Monad.State.Strict

34−import Data.Char (ord)

34+import Data.Char (ord, isDigit)

3535import Data.List (intercalate, intersperse)

3636import Data.Maybe (mapMaybe)

3737import Data.Text (Text)

@@ -104,8 +104,9 @@ pandocToConTeXt options (Pandoc meta blocks) = do

104104 $ defField "number-sections" (writerNumberSections options)

105105 $ maybe id (defField "context-lang") mblang

106106 $ (case getField "papersize" metadata of

107− Just ("a4" :: String) -> resetField "papersize"

108− ("A4" :: String)

107+ Just (('a':d:ds) :: String)

108+ | all isDigit (d:ds) -> resetField "papersize"

109+ (('A':d:ds) :: String)

109110 _ -> id) metadata

110111 let context' = defField "context-dir" (toContextDir

111112 $ getField "dir" context) context

src/Text/Pandoc/Writers/LaTeX.hs+4−2

@@ -253,8 +253,10 @@ pandocToLaTeX options (Pandoc meta blocks) = do

253253 defField "section-titles" True $

254254 defField "geometry" geometryFromMargins $

255255 (case getField "papersize" metadata of

256− Just ("A4" :: String) -> resetField "papersize"

257− ("a4" :: String)

256+ -- uppercase a4, a5, etc.

257+ Just (('A':d:ds) :: String)

258+ | all isDigit (d:ds) -> resetField "papersize"

259+ (('a':d:ds) :: String)

258260 _ -> id)

259261 metadata

260262 let context' =