cdccb4c · typeable/pandoc

git.iko.soy/typeable/pandoc

Add fields for CSL optinos to Opt.

* Add `optCSL`, `optBibliography`, `optCitationAbbreviations` to `Opt` [API change]. * Move `addMeta` from T.P.App.Opt to T.P.App.CommandLineOptions.

commitcdccb4c1fa9466018223226117d66f844ec307cb authorJohn MacFarlane <jgm@berkeley.edu> dateFri 5 Mar 2021, 10:42 (6 years ago) parent223f734

2 files changed+46−53

compare with master

unifiedsplit

src/Text/Pandoc/App/CommandLineOptions.hs+26−5 src/Text/Pandoc/App/Opt.hs+20−48

src/Text/Pandoc/App/CommandLineOptions.hs+26−5

@@ -48,12 +48,13 @@ import System.FilePath

4848import System.IO (stdout)

4949import Text.DocTemplates (Context (..), ToContext (toVal), Val (..))

5050import Text.Pandoc

51+import Text.Pandoc.Builder (setMeta)

5152import Text.Pandoc.App.Opt (Opt (..), LineEnding (..), IpynbOutput (..),

52− DefaultsState (..), addMeta, applyDefaults,

53+ DefaultsState (..), applyDefaults,

5354 fullDefaultsPath)

5455import Text.Pandoc.Filter (Filter (..))

5556import Text.Pandoc.Highlighting (highlightingStyles)

56−import Text.Pandoc.Shared (ordNub, elemText, safeStrRead, defaultUserDataDirs)

57+import Text.Pandoc.Shared (ordNub, elemText, safeStrRead, defaultUserDataDir)

5758import Text.Printf

5859

5960#ifdef EMBED_DATA_FILES

@@ -939,13 +940,12 @@ options =

939940 (NoArg

940941 (\_ -> do

941942 prg <- getProgName

942− defaultDatadirs <- defaultUserDataDirs

943+ defaultDatadir <- defaultUserDataDir

943944 UTF8.hPutStrLn stdout

944945 $ T.pack

945946 $ prg ++ " " ++ T.unpack pandocVersion ++

946947 compileInfo ++

947− "\nUser data directory: " ++

948− intercalate " or " defaultDatadirs ++

948+ "\nUser data directory: " ++ defaultDatadir ++

949949 ('\n':copyrightMessage)

950950 exitSuccess ))

951951 "" -- "Print version"

@@ -1053,6 +1053,27 @@ setVariable key val (Context ctx) = Context $ M.alter go key ctx

10531053 go (Just (ListVal xs)) = Just $ ListVal $ xs ++ [toVal val]

10541054 go (Just x) = Just $ ListVal [x, toVal val]

10551055

1056+addMeta :: String -> String -> Meta -> Meta

1057+addMeta k v meta =

1058+ case lookupMeta k' meta of

1059+ Nothing -> setMeta k' v' meta

1060+ Just (MetaList xs) ->

1061+ setMeta k' (MetaList (xs ++ [v'])) meta

1062+ Just x -> setMeta k' (MetaList [x, v']) meta

1063+ where

1064+ v' = readMetaValue v

1065+ k' = T.pack k

1066+

1067+readMetaValue :: String -> MetaValue

1068+readMetaValue s

1069+ | s == "true" = MetaBool True

1070+ | s == "True" = MetaBool True

1071+ | s == "TRUE" = MetaBool True

1072+ | s == "false" = MetaBool False

1073+ | s == "False" = MetaBool False

1074+ | s == "FALSE" = MetaBool False

1075+ | otherwise = MetaString $ T.pack s

1076+

10561077-- On Windows with ghc 8.6+, we need to rewrite paths

10571078-- beginning with \\ to \\?\UNC\. -- See #5127.

10581079normalizePath :: FilePath -> FilePath

src/Text/Pandoc/App/Opt.hs+20−48

@@ -22,7 +22,6 @@ module Text.Pandoc.App.Opt (

2222 , IpynbOutput (..)

2323 , DefaultsState (..)

2424 , defaultOpts

25− , addMeta

2625 , applyDefaults

2726 , fullDefaultsPath

2827 ) where

@@ -32,7 +31,6 @@ import System.FilePath ( addExtension, (</>), takeExtension )

3231import Data.Char (isLower, toLower)

3332import Data.Maybe (fromMaybe)

3433import GHC.Generics hiding (Meta)

35−import Text.Pandoc.Builder (setMeta)

3634import Text.Pandoc.Filter (Filter (..))

3735import Text.Pandoc.Logging (Verbosity (WARNING))

3836import Text.Pandoc.Options (TopLevelDivision (TopLevelDefault),

@@ -52,7 +50,7 @@ import Data.Text (Text, unpack)

5250import Data.Default (def)

5351import qualified Data.Text as T

5452import qualified Data.Map as M

55−import Text.Pandoc.Definition (Meta(..), MetaValue(..), lookupMeta)

53+import Text.Pandoc.Definition (Meta(..), MetaValue(..))

5654import Data.Aeson (defaultOptions, Options(..))

5755import Data.Aeson.TH (deriveJSON)

5856import Control.Applicative ((<|>))

@@ -156,6 +154,9 @@ data Opt = Opt

156154 , optNoCheckCertificate :: Bool -- ^ Disable certificate validation

157155 , optEol :: LineEnding -- ^ Style of line-endings to use

158156 , optStripComments :: Bool -- ^ Skip HTML comments

157+ , optCSL :: Maybe FilePath -- ^ CSL stylesheet

158+ , optBibliography :: [FilePath] -- ^ Bibliography files

159+ , optCitationAbbreviations :: Maybe FilePath -- ^ Citation abbreviations

159160 } deriving (Generic, Show)

160161

161162instance FromYAML (Opt -> Opt) where

@@ -428,26 +429,18 @@ doOpt (k',v) = do

428429 (parseYAML v >>= \x -> return (\o -> o{ optCss = optCss o <>

429430 [unpack x] }))

430431 "bibliography" ->

431− do let addItem x o = o{ optMetadata =

432− addMeta "bibliography" (T.unpack x)

433− (optMetadata o) }

434− (parseYAML v >>= \(xs :: [Text]) -> return $ \o ->

435− foldr addItem o xs)

436− <|>

437− (parseYAML v >>= \(x :: Text) -> return $ \o -> addItem x o)

432+ (parseYAML v >>= \x -> return (\o ->

433+ o{ optBibliography = optBibliography o <>

434+ map unpack x }))

435+ <|>

436+ (parseYAML v >>= \x -> return (\o ->

437+ o{ optBibliography = optBibliography o <>

438+ [unpack x] }))

438439 "csl" ->

439− do let addItem x o = o{ optMetadata =

440− addMeta "csl" (T.unpack x)

441− (optMetadata o) }

442− (parseYAML v >>= \(xs :: [Text]) -> return $ \o ->

443− foldr addItem o xs)

444− <|>

445− (parseYAML v >>= \(x :: Text) -> return $ \o -> addItem x o)

440+ parseYAML v >>= \x -> return (\o -> o{ optCSL = unpack <$> x })

446441 "citation-abbreviations" ->

447− parseYAML v >>= \x ->

448− return (\o -> o{ optMetadata =

449− addMeta "citation-abbreviations" (T.unpack x)

450− (optMetadata o) })

442+ parseYAML v >>= \x -> return (\o -> o{ optCitationAbbreviations =

443+ unpack <$> x })

451444 "ipynb-output" ->

452445 parseYAML v >>= \x -> return (\o -> o{ optIpynbOutput = x })

453446 "include-before-body" ->

@@ -562,6 +555,9 @@ defaultOpts = Opt

562555 , optNoCheckCertificate = False

563556 , optEol = Native

564557 , optStripComments = False

558+ , optCSL = Nothing

559+ , optBibliography = []

560+ , optCitationAbbreviations = Nothing

565561 }

566562

567563parseStringKey :: Node Pos -> Parser Text

@@ -579,27 +575,6 @@ yamlToMeta (Mapping _ _ m) =

579575 >>= fmap (Meta . flip P.runF def)

580576yamlToMeta _ = return mempty

581577

582−addMeta :: String -> String -> Meta -> Meta

583−addMeta k v meta =

584− case lookupMeta k' meta of

585− Nothing -> setMeta k' v' meta

586− Just (MetaList xs) ->

587− setMeta k' (MetaList (xs ++ [v'])) meta

588− Just x -> setMeta k' (MetaList [x, v']) meta

589− where

590− v' = readMetaValue v

591− k' = T.pack k

592−

593−readMetaValue :: String -> MetaValue

594−readMetaValue s

595− | s == "true" = MetaBool True

596− | s == "True" = MetaBool True

597− | s == "TRUE" = MetaBool True

598− | s == "false" = MetaBool False

599− | s == "False" = MetaBool False

600− | s == "FALSE" = MetaBool False

601− | otherwise = MetaString $ T.pack s

602−

603578-- | Apply defaults from --defaults file.

604579applyDefaults :: (PandocMonad m, MonadIO m)

605580 => Opt

@@ -625,12 +600,9 @@ fullDefaultsPath dataDir file = do

625600 let fp = if null (takeExtension file)

626601 then addExtension file "yaml"

627602 else file

628− dataDirs <- liftIO defaultUserDataDirs

629− let fps = fp : case dataDir of

630− Nothing -> map (</> ("defaults" </> fp))

631− dataDirs

632− Just dd -> [dd </> "defaults" </> fp]

633− fromMaybe fp <$> findM fileExists fps

603+ defaultDataDir <- liftIO defaultUserDataDir

604+ let defaultFp = fromMaybe defaultDataDir dataDir </> "defaults" </> fp

605+ fromMaybe fp <$> findM fileExists [fp, defaultFp]

634606

635607-- | In a list of lists, append another list in front of every list which

636608-- starts with specific element.