diff options
| -rw-r--r-- | pandoc-server/src/Text/Pandoc/Server.hs | 8 | ||||
| -rw-r--r-- | src/Text/Pandoc/App/OutputSettings.hs | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pandoc-server/src/Text/Pandoc/Server.hs b/pandoc-server/src/Text/Pandoc/Server.hs index e4825721f..b5b8a77e7 100644 --- a/pandoc-server/src/Text/Pandoc/Server.hs +++ b/pandoc-server/src/Text/Pandoc/Server.hs @@ -21,6 +21,7 @@ import Text.Pandoc import Text.Pandoc.Writers.Shared (lookupMetaString) import Text.Pandoc.Citeproc (processCitations) import Text.Pandoc.Highlighting (lookupHighlightingStyle) +import Text.Pandoc.Chunks (PathTemplate(..)) import qualified Text.Pandoc.UTF8 as UTF8 import Data.Text (Text) import qualified Data.Text as T @@ -302,7 +303,7 @@ server = convertBytes , readerStripComments = optStripComments opts } - let writeropts = def + let writeropts = WriterOptions { writerExtensions = writerExts , writerTabStop = optTabStop opts , writerWrapText = optWrap opts @@ -327,10 +328,15 @@ server = convertBytes , writerListings = optListings opts , writerHighlightStyle = hlStyle , writerSetextHeaders = optSetextHeaders opts + , writerListTables = optListTables opts , writerEpubSubdirectory = T.pack $ optEpubSubdirectory opts , writerEpubMetadata = T.pack <$> optEpubMetadata opts , writerEpubFonts = optEpubFonts opts + , writerEpubTitlePage = optEpubTitlePage opts , writerSplitLevel = optSplitLevel opts + , writerChunkTemplate = maybe (PathTemplate "%s-%i.html") + PathTemplate + (optChunkTemplate opts) , writerTOCDepth = optTOCDepth opts , writerReferenceDoc = optReferenceDoc opts , writerReferenceLocation = optReferenceLocation opts diff --git a/src/Text/Pandoc/App/OutputSettings.hs b/src/Text/Pandoc/App/OutputSettings.hs index dd4b2ed47..25646be77 100644 --- a/src/Text/Pandoc/App/OutputSettings.hs +++ b/src/Text/Pandoc/App/OutputSettings.hs @@ -224,8 +224,8 @@ optToOutputSettings scriptingEngine opts = do setVariableM "dzslides-core" dzcore vars else return vars) - let writerOpts = def { - writerTemplate = mtemplate + let writerOpts = WriterOptions + { writerTemplate = mtemplate , writerVariables = variables , writerTabStop = optTabStop opts , writerTableOfContents = optTableOfContents opts |