aboutsummaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-12-19 00:07:28 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2015-12-19 00:07:28 -0800
commit4c103f67f9c4a9c65be1f5af9116c7e4250c763f (patch)
treeaab74dcc83ef8e1b3c84eaccbc83d7fec4c9d29c /README
parentce21b2ca073c94926c57de3bb6816578a1c3b260 (diff)
parentf0c47907ca1d7ee9600a574c3e007640c7700d7d (diff)
downloadpandoc-4c103f67f9c4a9c65be1f5af9116c7e4250c763f.tar.gz
Merge branch 'master' of https://github.com/AndreasLoow/pandoc into AndreasLoow-master
Diffstat (limited to 'README')
-rw-r--r--README13
1 files changed, 7 insertions, 6 deletions
diff --git a/README b/README
index bd0b065cb..5bc6231e3 100644
--- a/README
+++ b/README
@@ -184,10 +184,10 @@ document contains images), [`hyperref`], [`ulem`],
[`mathspec`], [`polyglossia`] (with `lang`), [`xecjk`], and
[`bidi`] (with the `dir` variable set). The [`upquote`] and
[`microtype`] packages are used if available, and [`csquotes`] will
-be used for [smart punctuation] if added to the template. The
-[`natbib`], [`biblatex`], [`bibtex`], and [`biber`] packages can
-optionally be used for [citation rendering]. These are included with
-all recent versions of [TeX Live].
+be used for [smart punctuation] if added to the template or included in
+any header file. The [`natbib`], [`biblatex`], [`bibtex`], and [`biber`]
+packages can optionally be used for [citation rendering]. These are
+included with all recent versions of [TeX Live].
Alternatively, pandoc can use ConTeXt to create a PDF.
To do this, specify an output file with a `.pdf` extension,
@@ -2473,8 +2473,9 @@ correct output, converting straight quotes to curly quotes, `---` to
em-dashes, `--` to en-dashes, and `...` to ellipses. Nonbreaking spaces
are inserted after certain abbreviations, such as "Mr."
-Note: if your LaTeX template calls for the [`csquotes`] package, pandoc will
-detect this automatically and use `\enquote{...}` for quoted text.
+Note: if your LaTeX template or any included header file call for the
+[`csquotes`] package, pandoc will detect this automatically and use
+`\enquote{...}` for quoted text.
Inline formatting
-----------------