aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MANUAL.txt11
-rw-r--r--src/Text/Pandoc/Writers/Docx.hs2
2 files changed, 8 insertions, 5 deletions
diff --git a/MANUAL.txt b/MANUAL.txt
index 2eda67cc4..ecb2bcb2c 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -3993,11 +3993,12 @@ whether or not they appear in the document, by using a wildcard:
@*
...
-For LaTeX or PDF output, you can also use [`natbib`] or [`biblatex`]
-to render bibliography. In order to do so, specify bibliography files as
-outlined above, and add `--natbib` or `--biblatex` argument to `pandoc`
-invocation. Bear in mind that bibliography files have to be in respective
-format (either BibTeX or BibLaTeX).
+For LaTeX output, you can also use [`natbib`] or [`biblatex`] to
+render the bibliography. In order to do so, specify bibliography
+files as outlined above, and add `--natbib` or `--biblatex`
+argument to `pandoc` invocation. Bear in mind that bibliography
+files have to be in respective format (either BibTeX or
+BibLaTeX).
For more information, see the [pandoc-citeproc man page].
diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs
index 2055ee1da..5bd7e809b 100644
--- a/src/Text/Pandoc/Writers/Docx.hs
+++ b/src/Text/Pandoc/Writers/Docx.hs
@@ -763,11 +763,13 @@ writeOpenXML opts (Pandoc meta blocks) = do
let abstract' = case lookupMeta "abstract" meta of
Just (MetaBlocks bs) -> bs
Just (MetaInlines ils) -> [Plain ils]
+ Just (MetaString s) -> [Plain [Str s]]
_ -> []
let subtitle' = case lookupMeta "subtitle" meta of
Just (MetaBlocks [Plain xs]) -> xs
Just (MetaBlocks [Para xs]) -> xs
Just (MetaInlines xs) -> xs
+ Just (MetaString s) -> [Str s]
_ -> []
let includeTOC = writerTableOfContents opts ||
case lookupMeta "toc" meta of