2902260 · typeable/pandoc

git.iko.soy/typeable/pandoc

Make `papersize: a4` work regardless of the case of `a4`.

It is converted to `a4` in LaTeX and `A4` in ConTeXt.

commit2902260b636b36134c0157e32291900603e1011d authorJohn MacFarlane <jgm@berkeley.edu> dateWed 28 Jun 2017, 15:07 (9 years ago) parent7ea49da

2 files changed+9

unifiedsplit

src/Text/Pandoc/Writers/ConTeXt.hs+5

@@ -1,4 +1,5 @@

11{-# LANGUAGE OverloadedStrings #-}

2+{-# LANGUAGE ScopedTypeVariables #-}

23{-

@@ -103,6 +104,10 @@ pandocToConTeXt options (Pandoc meta blocks) = do

103104 $ defField "layout" layoutFromMargins

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

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

107+ $ (case getField "papersize" metadata of

108+ Just ("a4" :: String) -> resetField "papersize"

109+ ("A4" :: String)

110+ _ -> id)

106111 $ metadata

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

108113 $ getField "dir" context) context

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

@@ -256,6 +256,10 @@ pandocToLaTeX options (Pandoc meta blocks) = do

256256 else defField "dir" ("ltr" :: String)) $

257257 defField "section-titles" True $

258258 defField "geometry" geometryFromMargins $

259+ (case getField "papersize" metadata of

260+ Just ("A4" :: String) -> resetField "papersize"

261+ ("a4" :: String)

262+ _ -> id) $

259263 metadata

260264 let context' =

261265 -- note: lang is used in some conditionals in the template,