From aceee9ca48484c300ac3519fb7991e3d22768312 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 8 Oct 2019 09:22:46 -0700 Subject: Options.WriterOptions: Change type of writerVariables to Context Text. This will allow structured values. [API change] --- src/Text/Pandoc/Writers/Powerpoint/Output.hs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/Text/Pandoc/Writers/Powerpoint') diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs index 6b43fa34a..58f230a9d 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE PatternGuards #-} {- | @@ -24,6 +25,7 @@ import Codec.Archive.Zip import Data.Char (toUpper) import Data.List (intercalate, stripPrefix, nub, union, isPrefixOf, intersperse) import Data.Default +import qualified Data.Text as T import Data.Time (formatTime, defaultTimeLocale) import Data.Time.Clock (UTCTime) import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds, posixSecondsToUTCTime) @@ -43,6 +45,7 @@ import Data.Maybe (mapMaybe, listToMaybe, fromMaybe, maybeToList, catMaybes, isN import Text.Pandoc.ImageSize import Control.Applicative ((<|>)) import System.FilePath.Glob +import Text.DocTemplates (FromContext(lookupContext)) import Text.TeXMath import Text.Pandoc.Writers.Math (convertMath) import Text.Pandoc.Writers.Powerpoint.Presentation @@ -159,8 +162,8 @@ runP env st p = evalStateT (runReaderT p env) st monospaceFont :: Monad m => P m String monospaceFont = do vars <- writerVariables <$> asks envOpts - case lookup "monofont" vars of - Just s -> return s + case lookupContext "monofont" vars of + Just s -> return (T.unpack s) Nothing -> return "Courier" fontSizeAttributes :: Monad m => RunProps -> P m [(String, String)] -- cgit v1.2.3