aboutsummaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-09-22 22:21:06 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-09-22 22:21:06 -0700
commitf232a0a720ea4879fe2e6f1b9e1a5c4e20097341 (patch)
treed2bd6aaf46f3601fcd14e1b3713b0e6cd7459fbf /README
parentd25a37c122a85b0aeef7d0039d5464d275ad4b07 (diff)
parent622df7034c96d1d0ba10b1ad654840ac93baf7f7 (diff)
downloadpandoc-f232a0a720ea4879fe2e6f1b9e1a5c4e20097341.tar.gz
Merge pull request #2369 from mb21/language-variables
`lang` variable is now in BCP47 format
Diffstat (limited to 'README')
-rw-r--r--README20
1 files changed, 16 insertions, 4 deletions
diff --git a/README b/README
index 93efab039..8921d076e 100644
--- a/README
+++ b/README
@@ -945,7 +945,19 @@ as `title`, `author`, and `date`) as well as the following:
: body of document
`lang`
-: language code for HTML or LaTeX documents
+: The `lang` variable should be set by the user to a language
+ code according to [BCP 47] (e.g. `en` or `en-GB`).
+ For some output formats, pandoc will convert it to an approriate
+ format stored in the additional variables `babel-lang`,
+ `polyglossia-lang`, `polyglossia-variant` (LaTeX)
+ and `context-lang` (ConTeXt).
+
+`otherlangs`
+: Should be set to a list of other languages used in the document
+ in the YAML metadata, according to [BCP 47]. For example:
+ `otherlangs: [en-GB, fr]`.
+ Currently only used by XeTeX through the generated
+ `polyglossia-otherlangs` variable.
`slidy-url`
: base URL for Slidy documents (defaults to
@@ -3264,8 +3276,8 @@ The following fields are recognized:
~ A string value in `YYYY-MM-DD` format. (Only the year is necessary.)
Pandoc will attempt to convert other common date formats.
-`language`
- ~ A string value in [RFC5646] format. Pandoc will default to the local
+`lang` (or legacy: `language`)
+ ~ A string value in [BCP 47] format. Pandoc will default to the local
language if nothing is specified.
`subject`
@@ -3549,7 +3561,7 @@ Xavier Olive.
[FictionBook2]: http://www.fictionbook.org/index.php/Eng:XML_Schema_Fictionbook_2.1
[lua]: http://www.lua.org
[marc relators]: http://www.loc.gov/marc/relators/relaterm.html
-[RFC5646]: http://tools.ietf.org/html/rfc5646
+[BCP 47]: https://tools.ietf.org/html/bcp47
[InDesign ICML]: https://www.adobe.com/content/dam/Adobe/en/devnet/indesign/cs55-docs/IDML/idml-specification.pdf
[txt2tags]: http://txt2tags.org/
[EPUB]: http://idpf.org/epub