git.iko.soy/typeable/pandoc
on master help sign in
945 files changed+62082−14437
since splitsnapshots
unifiedsplit
.circleci/config.yml+64−122 .editorconfig+8 .github/ISSUE_TEMPLATE−11 .github/ISSUE_TEMPLATE/bug_report.md+25 .github/ISSUE_TEMPLATE/config.yml+9 .github/ISSUE_TEMPLATE/feature_request.md+21 .github/workflows/ci.yml+146−48 .github/workflows/format-validation.yml+88 .github/workflows/lint.yml+33 .github/workflows/nightly.yml+18−26 .github/workflows/release-candidate.yml+5−63 .gitignore+8 .hlint.yaml+83−54 AUTHORS.md+42 CONTRIBUTING.md+134−30 COPYING.md+1−1 COPYRIGHT+17−26 INSTALL.md+27−38 MANUAL.txt+1034−498 Makefile+55−50 README.md+106−93 README.template+6−7 RELEASE-CHECKLIST+3−1 SECURITY.md+12 pandoc.hs → app/pandoc.hs+1−3 benchmark/benchmark-pandoc.hs+63−72 benchmark/weigh-pandoc.hs−50 cabal.project+9−10 changelog.md+2680−21 citeproc/biblatex-localization/.strings citeproc/biblatex-localization/UKenglish.lbx.strings citeproc/biblatex-localization/USenglish.lbx.strings citeproc/biblatex-localization/american.lbx.strings citeproc/biblatex-localization/australian.lbx.strings citeproc/biblatex-localization/austrian.lbx.strings+1 citeproc/biblatex-localization/brazil.lbx.strings citeproc/biblatex-localization/brazilian.lbx.strings+233 citeproc/biblatex-localization/british.lbx.strings+3 citeproc/biblatex-localization/bulgarian.lbx.strings+28 citeproc/biblatex-localization/canadian.lbx.strings citeproc/biblatex-localization/catalan.lbx.strings+158 citeproc/biblatex-localization/croatian.lbx.strings+214 citeproc/biblatex-localization/czech.lbx.strings+91 citeproc/biblatex-localization/danish.lbx.strings+106 citeproc/biblatex-localization/dutch.lbx.strings+23 citeproc/biblatex-localization/english.lbx.strings+254 citeproc/biblatex-localization/estonian.lbx.strings+178 citeproc/biblatex-localization/finnish.lbx.strings+254 citeproc/biblatex-localization/french.lbx.strings+245 citeproc/biblatex-localization/galician.lbx.strings+28 citeproc/biblatex-localization/german.lbx.strings+28 citeproc/biblatex-localization/greek.lbx.strings+9 citeproc/biblatex-localization/hungarian.lbx.strings citeproc/biblatex-localization/icelandic.lbx.strings+7 citeproc/biblatex-localization/italian.lbx.strings+9 citeproc/biblatex-localization/latvian.lbx.strings+75 citeproc/biblatex-localization/lithuanian.lbx.strings+31 citeproc/biblatex-localization/magyar.lbx.strings+29 citeproc/biblatex-localization/naustrian.lbx.strings+2 citeproc/biblatex-localization/newzealand.lbx.strings citeproc/biblatex-localization/ngerman.lbx.strings+1 citeproc/biblatex-localization/norsk.lbx.strings+98 citeproc/biblatex-localization/nswissgerman.lbx.strings+2 citeproc/biblatex-localization/nynorsk.lbx.strings+28 citeproc/biblatex-localization/polish.lbx.strings+100 citeproc/biblatex-localization/portuges.lbx.strings citeproc/biblatex-localization/portuguese.lbx.strings+95 citeproc/biblatex-localization/russian.lbx.strings+102 citeproc/biblatex-localization/serbian.lbx.strings citeproc/biblatex-localization/serbianc.lbx.strings citeproc/biblatex-localization/slovak.lbx.strings+82 citeproc/biblatex-localization/slovene.lbx.strings+28 citeproc/biblatex-localization/slovenian.lbx.strings citeproc/biblatex-localization/spanish.lbx.strings+190 citeproc/biblatex-localization/swedish.lbx.strings+9 citeproc/biblatex-localization/swissgerman.lbx.strings+1 citeproc/biblatex-localization/turkish.lbx.strings+157 citeproc/biblatex-localization/ukrainian.lbx.strings+102 data/default.csl+658 data/docx/word/settings.xml+6−16 data/docx/word/styles.xml+19 data/epub.css+3−2 data/make-reference-files.hs−27 data/odt/styles.xml+1−1 data/pandoc.lua+27−3 data/sample.lua+7−8 data/templates/.github/ISSUE_TEMPLATE.md−3 data/templates/.github/PULL_REQUEST_TEMPLATE.md−4 data/templates/README.markdown−49 data/templates/affiliations.jats+38 data/templates/article.jats_publishing+23−7 data/templates/default.biblatex+10 data/templates/default.bibtex+10 data/templates/default.context+10−8 data/templates/default.dzslides+1−1 data/templates/default.epub2+1−1 data/templates/default.epub3+1−1 data/templates/default.html4+3 data/templates/default.html5+3 data/templates/default.jats_articleauthoring+7−4 data/templates/default.latex+80−28 data/templates/default.man+1−1 data/templates/default.opendocument+1−1 data/templates/default.org+3−3 data/templates/default.revealjs+84−122 data/templates/default.s5+3 data/templates/default.slideous+7 data/templates/default.slidy+5 data/templates/styles.html+165 data/translations/zh-Hans.yaml+22 data/translations/zh-Hant.yaml+22 data/vimwiki.css−82 default.nix+13 doc/epub.md+9−2 doc/faqs.md+128 doc/filters.md+91−6 doc/jats.md+414 doc/libraries.md+63 doc/lua-filters.md+525−77 doc/org.md+96−4 doc/using-the-pandoc-api.md+30−16 linux/Dockerfile−30 linux/Makefile−18 linux/control.in+1−1 linux/make_artifacts.sh+84 linux/make_deb.sh−51 linux/make_tarball.sh−19 macos/Makefile+1−2 man/pandoc.1+1206−676 man/pandoc.1.after+1−1 pandoc.cabal+222−240 release.nix+4 shell.nix+106 src/Text/Pandoc.hs+1−1 src/Text/Pandoc/App.hs+98−66 src/Text/Pandoc/App/CommandLineOptions.hs+123−77 src/Text/Pandoc/App/FormatHeuristics.hs+20−8 src/Text/Pandoc/App/Opt.hs+274−48 src/Text/Pandoc/App/OutputSettings.hs+3−3 src/Text/Pandoc/Asciify.hs+14−391 src/Text/Pandoc/BCP47.hs−112 src/Text/Pandoc/CSS.hs+24−25 src/Text/Pandoc/CSV.hs+2−3 src/Text/Pandoc/Citeproc.hs+661 src/Text/Pandoc/Citeproc/BibTeX.hs+1476 src/Text/Pandoc/Citeproc/CslJson.hs+37 src/Text/Pandoc/Citeproc/Data.hs+32 src/Text/Pandoc/Citeproc/Locator.hs+295 src/Text/Pandoc/Citeproc/MetaValue.hs+255 src/Text/Pandoc/Citeproc/Util.hs+70 src/Text/Pandoc/Class/CommonState.hs+1−1 src/Text/Pandoc/Class/IO.hs+24−24 src/Text/Pandoc/Class/PandocMonad.hs+52−45 src/Text/Pandoc/Data.hs+1−1 src/Text/Pandoc/Error.hs+111−53 src/Text/Pandoc/Extensions.hs+107−18 src/Text/Pandoc/Filter.hs+18−7 src/Text/Pandoc/Filter/JSON.hs+1−1 src/Text/Pandoc/Filter/Lua.hs+1−1 src/Text/Pandoc/Filter/Path.hs+1−1 src/Text/Pandoc/Highlighting.hs+6−6 src/Text/Pandoc/Image.hs+1−2 src/Text/Pandoc/ImageSize.hs+61−341 src/Text/Pandoc/Logging.hs+88−57 src/Text/Pandoc/Lua.hs+1−1 src/Text/Pandoc/Lua/ErrorConversion.hs+1−1 src/Text/Pandoc/Lua/Filter.hs+7−4 src/Text/Pandoc/Lua/Global.hs+1−1 src/Text/Pandoc/Lua/Init.hs+16−5 src/Text/Pandoc/Lua/Marshaling.hs+2−2 src/Text/Pandoc/Lua/Marshaling/AST.hs+81−85 src/Text/Pandoc/Lua/Marshaling/AnyValue.hs+1−1 src/Text/Pandoc/Lua/Marshaling/CommonState.hs+2−2 src/Text/Pandoc/Lua/Marshaling/Context.hs+3−2 src/Text/Pandoc/Lua/Marshaling/List.hs+2−2 src/Text/Pandoc/Lua/Marshaling/MediaBag.hs+3−3 src/Text/Pandoc/Lua/Marshaling/PandocError.hs+1−1 src/Text/Pandoc/Lua/Marshaling/ReaderOptions.hs+2−2 src/Text/Pandoc/Lua/Marshaling/SimpleTable.hs+59 src/Text/Pandoc/Lua/Marshaling/Version.hs+1−1 src/Text/Pandoc/Lua/Module/MediaBag.hs+18−17 src/Text/Pandoc/Lua/Module/Pandoc.hs+29−23 src/Text/Pandoc/Lua/Module/System.hs+1−1 src/Text/Pandoc/Lua/Module/Types.hs+1−1 src/Text/Pandoc/Lua/Module/Utils.hs+47−9 src/Text/Pandoc/Lua/Packages.hs+10−27 src/Text/Pandoc/Lua/PandocLua.hs+20−13 src/Text/Pandoc/Lua/Util.hs+3−3 src/Text/Pandoc/Lua/Walk.hs+2−2 src/Text/Pandoc/MIME.hs+26−3 src/Text/Pandoc/MediaBag.hs+46−15 src/Text/Pandoc/Options.hs+25−21 src/Text/Pandoc/PDF.hs+40−19 src/Text/Pandoc/Parsing.hs+426−276 src/Text/Pandoc/Process.hs+1−1 src/Text/Pandoc/Readers.hs+61−45 src/Text/Pandoc/Readers/BibTeX.hs+77 src/Text/Pandoc/Readers/CSV.hs+10−10 src/Text/Pandoc/Readers/CommonMark.hs+91−197 src/Text/Pandoc/Readers/Creole.hs+6−7 src/Text/Pandoc/Readers/CslJson.hs+54 src/Text/Pandoc/Readers/DocBook.hs+274−141 src/Text/Pandoc/Readers/Docx.hs+119−104 src/Text/Pandoc/Readers/Docx/Combine.hs+44−67 src/Text/Pandoc/Readers/Docx/Parse.hs+221−130 src/Text/Pandoc/Readers/Docx/Parse/Styles.hs+44−31 src/Text/Pandoc/Readers/Docx/Util.hs+28−26 src/Text/Pandoc/Readers/DokuWiki.hs+11−10 src/Text/Pandoc/Readers/EPUB.hs+46−39 src/Text/Pandoc/Readers/FB2.hs+57−51 src/Text/Pandoc/Readers/HTML.hs+266−563 src/Text/Pandoc/Readers/HTML/Parsing.hs+225 src/Text/Pandoc/Readers/HTML/Table.hs+283 src/Text/Pandoc/Readers/HTML/TagCategories.hs+78 src/Text/Pandoc/Readers/HTML/Types.hs+97 src/Text/Pandoc/Readers/Haddock.hs+12−8 src/Text/Pandoc/Readers/Ipynb.hs+12−7 src/Text/Pandoc/Readers/JATS.hs+54−68 src/Text/Pandoc/Readers/Jira.hs+14−10 src/Text/Pandoc/Readers/LaTeX.hs+291−1511 src/Text/Pandoc/Readers/LaTeX/Citation.hs+210 src/Text/Pandoc/Readers/LaTeX/Inline.hs+397 src/Text/Pandoc/Readers/LaTeX/Lang.hs+201−122 src/Text/Pandoc/Readers/LaTeX/Macro.hs+184 src/Text/Pandoc/Readers/LaTeX/Math.hs+221 src/Text/Pandoc/Readers/LaTeX/Parsing.hs+361−54 src/Text/Pandoc/Readers/LaTeX/SIunitx.hs+434 src/Text/Pandoc/Readers/LaTeX/Table.hs+378 src/Text/Pandoc/Readers/LaTeX/Types.hs+15−2 src/Text/Pandoc/Readers/Man.hs+39−18 src/Text/Pandoc/Readers/Markdown.hs+389−265 src/Text/Pandoc/Readers/MediaWiki.hs+24−17 src/Text/Pandoc/Readers/Metadata.hs+115−34 src/Text/Pandoc/Readers/Muse.hs+11−10 src/Text/Pandoc/Readers/Native.hs+8−6 src/Text/Pandoc/Readers/OPML.hs+22−36 src/Text/Pandoc/Readers/Odt.hs+28−25 src/Text/Pandoc/Readers/Odt/Arrows/State.hs+2−2 src/Text/Pandoc/Readers/Odt/ContentReader.hs+25−18 src/Text/Pandoc/Readers/Odt/Generic/Namespaces.hs+2−1 src/Text/Pandoc/Readers/Odt/Generic/Utils.hs+10−26 src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs+15−15 src/Text/Pandoc/Readers/Odt/Namespaces.hs+6−5 src/Text/Pandoc/Readers/Odt/StyleReader.hs+21−17 src/Text/Pandoc/Readers/Org.hs+5−8 src/Text/Pandoc/Readers/Org/BlockStarts.hs+1−1 src/Text/Pandoc/Readers/Org/Blocks.hs+84−47 src/Text/Pandoc/Readers/Org/DocumentTree.hs+1−1 src/Text/Pandoc/Readers/Org/ExportSettings.hs+1−1 src/Text/Pandoc/Readers/Org/Inlines.hs+13−13 src/Text/Pandoc/Readers/Org/Meta.hs+13−5 src/Text/Pandoc/Readers/Org/ParserState.hs+2−2 src/Text/Pandoc/Readers/Org/Parsing.hs+6−6 src/Text/Pandoc/Readers/Org/Shared.hs+2−4 src/Text/Pandoc/Readers/RST.hs+102−122 src/Text/Pandoc/Readers/Roff.hs+16−18 src/Text/Pandoc/Readers/TWiki.hs+14−34 src/Text/Pandoc/Readers/Textile.hs+99−93 src/Text/Pandoc/Readers/TikiWiki.hs+6−6 src/Text/Pandoc/Readers/Txt2Tags.hs+50−24 src/Text/Pandoc/Readers/Vimwiki.hs+12−7 src/Text/Pandoc/RoffChar.hs+1−1 src/Text/Pandoc/SelfContained.hs+16−12 src/Text/Pandoc/Shared.hs+56−107 src/Text/Pandoc/Slides.hs+1−1 src/Text/Pandoc/Sources.hs+195 src/Text/Pandoc/Templates.hs+7−1 src/Text/Pandoc/Translations.hs+1−1 src/Text/Pandoc/UTF8.hs+21−24 src/Text/Pandoc/UUID.hs+1−1 src/Text/Pandoc/Writers.hs+13−4 src/Text/Pandoc/Writers/AnnotatedTable.hs+323 src/Text/Pandoc/Writers/AsciiDoc.hs+84−38 src/Text/Pandoc/Writers/BibTeX.hs+61 src/Text/Pandoc/Writers/CommonMark.hs+2−352 src/Text/Pandoc/Writers/ConTeXt.hs+47−41 src/Text/Pandoc/Writers/CslJson.hs+91 src/Text/Pandoc/Writers/Custom.hs+1−1 src/Text/Pandoc/Writers/Docbook.hs+118−37 src/Text/Pandoc/Writers/Docx.hs+286−404 src/Text/Pandoc/Writers/Docx/StyleMap.hs+1−1 src/Text/Pandoc/Writers/Docx/Table.hs+227 src/Text/Pandoc/Writers/Docx/Types.hs+185 src/Text/Pandoc/Writers/DokuWiki.hs+29−16 src/Text/Pandoc/Writers/EPUB.hs+280−225 src/Text/Pandoc/Writers/FB2.hs+62−78 src/Text/Pandoc/Writers/GridTable.hs+157 src/Text/Pandoc/Writers/HTML.hs+412−127 src/Text/Pandoc/Writers/Haddock.hs+14−3 src/Text/Pandoc/Writers/ICML.hs+102−61 src/Text/Pandoc/Writers/Ipynb.hs+3−6 src/Text/Pandoc/Writers/JATS.hs+115−122 src/Text/Pandoc/Writers/JATS/References.hs+164 src/Text/Pandoc/Writers/JATS/Table.hs+268 src/Text/Pandoc/Writers/JATS/Types.hs+57 src/Text/Pandoc/Writers/Jira.hs+54−27 src/Text/Pandoc/Writers/LaTeX.hs+128−805 src/Text/Pandoc/Writers/LaTeX/Caption.hs+47 src/Text/Pandoc/Writers/LaTeX/Citation.hs+181 src/Text/Pandoc/Writers/LaTeX/Lang.hs+192 src/Text/Pandoc/Writers/LaTeX/Notes.hs+34 src/Text/Pandoc/Writers/LaTeX/Table.hs+307 src/Text/Pandoc/Writers/LaTeX/Types.hs+83 src/Text/Pandoc/Writers/LaTeX/Util.hs+275 src/Text/Pandoc/Writers/Man.hs+5−5 src/Text/Pandoc/Writers/Markdown.hs+173−681 src/Text/Pandoc/Writers/Markdown/Inline.hs+616 src/Text/Pandoc/Writers/Markdown/Types.hs+81 src/Text/Pandoc/Writers/MediaWiki.hs+10−3 src/Text/Pandoc/Writers/Ms.hs+96−24 src/Text/Pandoc/Writers/Muse.hs+6−3 src/Text/Pandoc/Writers/Native.hs+1−1 src/Text/Pandoc/Writers/ODT.hs+29−23 src/Text/Pandoc/Writers/OOXML.hs+22−22 src/Text/Pandoc/Writers/OPML.hs+2−2 src/Text/Pandoc/Writers/OpenDocument.hs+269−115 src/Text/Pandoc/Writers/Org.hs+67−43 src/Text/Pandoc/Writers/Powerpoint.hs+1−1 src/Text/Pandoc/Writers/Powerpoint/Output.hs+186−163 src/Text/Pandoc/Writers/Powerpoint/Presentation.hs+6−7 src/Text/Pandoc/Writers/RST.hs+38−22 src/Text/Pandoc/Writers/RTF.hs+20−14 src/Text/Pandoc/Writers/Roff.hs+2−2 src/Text/Pandoc/Writers/Shared.hs+41−13 src/Text/Pandoc/Writers/TEI.hs+8−7 src/Text/Pandoc/Writers/Texinfo.hs+23−16 src/Text/Pandoc/Writers/Textile.hs+1−1 src/Text/Pandoc/Writers/XWiki.hs+1−1 src/Text/Pandoc/Writers/ZimWiki.hs+5−3 src/Text/Pandoc/XML.hs+44−21 src/Text/Pandoc/XML/Light.hs+89 src/Text/Pandoc/XML/Light/Output.hs+234 src/Text/Pandoc/XML/Light/Proc.hs+139 src/Text/Pandoc/XML/Light/Types.hs+193 stack.yaml+11−23 test/Tests/Command.hs+74−47 test/Tests/Helpers.hs+25−37 test/Tests/Lua.hs+2−4 test/Tests/Lua/Module.hs+3−1 test/Tests/Old.hs+39−34 test/Tests/Readers/Creole.hs+1−3 test/Tests/Readers/Docx.hs+30−8 test/Tests/Readers/DokuWiki.hs−2 test/Tests/Readers/EPUB.hs+2−4 test/Tests/Readers/FB2.hs−2 test/Tests/Readers/HTML.hs+24−19 test/Tests/Readers/JATS.hs+1−2 test/Tests/Readers/Jira.hs+22−2 test/Tests/Readers/LaTeX.hs+93−24 test/Tests/Readers/Man.hs+2−3 test/Tests/Readers/Markdown.hs+8−10 test/Tests/Readers/Muse.hs+1−3 test/Tests/Readers/Odt.hs+2−3 test/Tests/Readers/Org.hs+1−1 test/Tests/Readers/Org/Block.hs+22−24 test/Tests/Readers/Org/Block/CodeBlock.hs+36−38 test/Tests/Readers/Org/Block/Figure.hs+9−11 test/Tests/Readers/Org/Block/Header.hs+4−6 test/Tests/Readers/Org/Block/List.hs+14−3 test/Tests/Readers/Org/Block/Table.hs+4−6 test/Tests/Readers/Org/Directive.hs+2−4 test/Tests/Readers/Org/Inline.hs+5−7 test/Tests/Readers/Org/Inline/Citation.hs+41−3 test/Tests/Readers/Org/Inline/Note.hs+1−3 test/Tests/Readers/Org/Inline/Smart.hs+1−3 test/Tests/Readers/Org/Meta.hs+44−30 test/Tests/Readers/Org/Shared.hs+1−3 test/Tests/Readers/RST.hs+1−3 test/Tests/Readers/Txt2Tags.hs+2−4 test/Tests/Shared.hs+19−21 test/Tests/Writers/AnnotatedTable.hs+253 test/Tests/Writers/AsciiDoc.hs−2 test/Tests/Writers/ConTeXt.hs+122−115 test/Tests/Writers/Docbook.hs+103−2 test/Tests/Writers/Docx.hs+25−2 test/Tests/Writers/FB2.hs−2 test/Tests/Writers/HTML.hs+57−54 test/Tests/Writers/JATS.hs+135−93 test/Tests/Writers/Jira.hs+60−1 test/Tests/Writers/LaTeX.hs−2 test/Tests/Writers/Markdown.hs+3−3 test/Tests/Writers/Ms.hs+35 test/Tests/Writers/Muse.hs−1 test/Tests/Writers/Native.hs−2 test/Tests/Writers/OOXML.hs+6−5 test/Tests/Writers/Org.hs+46−13 test/Tests/Writers/Plain.hs−2 test/Tests/Writers/Powerpoint.hs−2 test/Tests/Writers/RST.hs−2 test/Tests/Writers/TEI.hs−2 test/command/01.csv+4 test/command/1279.md+1−1 test/command/1608.md+41 test/command/1881.md+13−13 test/command/2103.md+8 test/command/2378.md+3−3 test/command/2874.md+2−2 test/command/3516.md+1−5 test/command/3577.md+3−3 test/command/3587.md+98−8 test/command/3674.md+1−1 test/command/3706.md+8−8 test/command/3734.md+1−1 test/command/3736.md+3−6 test/command/3752.md+60 test/command/3792.md+1−1 test/command/3824.md+1 test/command/4063.md+29 test/command/4164.md+5−9 test/command/4186.md+8−8 test/command/4420.md−11 test/command/4442.md+1−1 test/command/4465.md+15 test/command/4528.md+1−1 test/command/4677.md+1−1 test/command/4742.md+2−2 test/command/5099.md+1−1 test/command/5121.md+2−3 test/command/5178.md+10−10 test/command/5304.md+1−1 test/command/5321.md+2−2 test/command/5367.md+9−10 test/command/5519.md+1−1 test/command/5541-localLink.md+149 test/command/5541-nesting.md+98 test/command/5541-urlLink.md+112 test/command/5627.md+4−4 test/command/5642.md+1−1 test/command/5650.md+4−4 test/command/5686.md+1−1 test/command/5708.md+1−5 test/command/5849-prefix.md+5−6 test/command/5986.md+3−2 test/command/6026.md+19 test/command/6324.md+17 test/command/6388.md+16 test/command/6541.md+27 test/command/6549.md+26 test/command/6620.md+18 test/command/6658.md+75 test/command/6675.md+134 test/command/6699.md+13 test/command/6709.md+11 test/command/6719.md+18 test/command/6723.md+32 test/command/6739.md+21 test/command/6740.md+7 test/command/6741.md+145 test/command/6752.md+36 test/command/6755.md+11 test/command/6765.md+31 test/command/6768.md+21 test/command/6774.md+63 test/command/6783.md+26 test/command/6791.md+32 test/command/6792.md+66 test/command/6796.md+16 test/command/6802.md+9 test/command/6836.md+17 test/command/6837.md+29 test/command/6844.md+27 test/command/6855.md+12 test/command/6858.md+52 test/command/6869.md+6 test/command/6873.md+7 test/command/6890.md+36 test/command/6925.md+34 test/command/6948.md+31 test/command/6951.md+18 test/command/6958.md+10 test/command/6993.md+21 test/command/7003.md+37 test/command/7006.md+20 test/command/7009.md+8 test/command/7016.md+48 test/command/7041.md+23 test/command/7042.md+146 test/command/7058.md+6 test/command/7064.md+32 test/command/7067.md+90 test/command/7080.md+8 test/command/7092.md+8 test/command/7099.md+18 test/command/7112.md+15 test/command/7129.md+27 test/command/7132.md+10 test/command/7134.md+16 test/command/7145.md+12 test/command/7155.md+15 test/command/7173.md+137 test/command/7208.md+6 test/command/7214.md+28 test/command/7216.md+19 test/command/7266.md+10 test/command/7272.md+27 test/command/7278.md+38 test/command/7282.md+7 test/command/7288.md+40 test/command/7299.md+23 test/command/7321.md+24 test/command/7323.md+29 test/command/7324.md+25 test/command/7339.md+11 test/command/7340.md+6 test/command/7376.md+16 test/command/7394.md+85 test/command/7397.md+14 test/command/7400.md+9 test/command/7416.md+19 test/command/advanced-optical-materials.csl+155 test/command/annales.csl+334 test/command/apa.csl+474 test/command/archeologie-medievale.csl+291 test/command/averroes.bib+95 test/command/biblatex-266.md+34 test/command/biblatex-aksin.md+78 test/command/biblatex-almendro.md+71 test/command/biblatex-angenendt.md+66 test/command/biblatex-aristotle-anima.md+62 test/command/biblatex-aristotle-physics.md+63 test/command/biblatex-aristotle-poetics.md+65 test/command/biblatex-aristotle-rhetoric.md+80 test/command/biblatex-article.md+128 test/command/biblatex-augustine.md+56 test/command/biblatex-averroes-bland.md+85 test/command/biblatex-averroes-hannes.md+84 test/command/biblatex-averroes-hercz.md+85 test/command/biblatex-baez-article.md+76 test/command/biblatex-baez-online.md+69 test/command/biblatex-basic.md+71 test/command/biblatex-bertram.md+66 test/command/biblatex-bibstring-resolution.md+20 test/command/biblatex-book-averroes.md+129 test/command/biblatex-book-coleridge.md+59 test/command/biblatex-book-title-maintitle-series.md+39 test/command/biblatex-book-vazques-de-parga.md+48 test/command/biblatex-brandt.md+88 test/command/biblatex-britannica.md+85 test/command/biblatex-chiu.md+77 test/command/biblatex-cicero.md+82 test/command/biblatex-cms.md+81 test/command/biblatex-coleridge.md+86 test/command/biblatex-companion.md+70 test/command/biblatex-cotton.md+69 test/command/biblatex-crossref-inbook-mvbook.md+58 test/command/biblatex-crossref-nested.md+100 test/command/biblatex-ctan.md+73 test/command/biblatex-dates.md+162 test/command/biblatex-doody.md+101 test/command/biblatex-edtf-date.md+72 test/command/biblatex-escapedquotes.md+51 test/command/biblatex-formatting.md+23 test/command/biblatex-gaonkar-in.md+62 test/command/biblatex-gaonkar.md+59 test/command/biblatex-geer.md+70 test/command/biblatex-gerhardt.md+64 test/command/biblatex-gillies.md+69 test/command/biblatex-glashow.md+51 test/command/biblatex-gonzalez.md+62 test/command/biblatex-hammond.md+63 test/command/biblatex-herrmann.md+70 test/command/biblatex-hyman.md+79 test/command/biblatex-iliad.md+68 test/command/biblatex-inbook-title-booktitle-maintitle-series-2.md+48 test/command/biblatex-inbook-title-booktitle-maintitle-series.md+44 test/command/biblatex-inbook.md+147 test/command/biblatex-incollection-2.md+98 test/command/biblatex-incollection.md+130 test/command/biblatex-inproceedings.md+88 test/command/biblatex-issue288.md+35 test/command/biblatex-itzhaki.md+82 test/command/biblatex-jaffe.md+82 test/command/biblatex-jcg.md+54 test/command/biblatex-kant-kpv.md+90 test/command/biblatex-kant-ku.md+82 test/command/biblatex-kastenholz.md+126 test/command/biblatex-knuth-ct-a.md+78 test/command/biblatex-knuth-ct-b.md+70 test/command/biblatex-knuth-ct-c.md+69 test/command/biblatex-knuth-ct-d.md+71 test/command/biblatex-knuth-ct-e.md+66 test/command/biblatex-knuth-ct-related.md+72 test/command/biblatex-knuth-ct.md+66 test/command/biblatex-kowalik.md+68 test/command/biblatex-kullback-related.md+62 test/command/biblatex-kullback-reprint.md+71 test/command/biblatex-kullback.md+52 test/command/biblatex-laufenberg.md+109 test/command/biblatex-loh.md+65 test/command/biblatex-malinowski.md+67 test/command/biblatex-manual.md+51 test/command/biblatex-markey.md+65 test/command/biblatex-maron.md+70 test/command/biblatex-massa.md+56 test/command/biblatex-moore-related.md+66 test/command/biblatex-moore.md+56 test/command/biblatex-moraux.md+94 test/command/biblatex-murray.md+105 test/command/biblatex-nietzsche-historie.md+100 test/command/biblatex-nietzsche-ksa.md+89 test/command/biblatex-nietzsche-ksa1.md+95 test/command/biblatex-online.md+64 test/command/biblatex-options-url-false-doi-false.md+57 test/command/biblatex-padhye.md+117 test/command/biblatex-patent.md+158 test/command/biblatex-periodical.md+31 test/command/biblatex-piccato.md+59 test/command/biblatex-pines.md+77 test/command/biblatex-quotes.md+44 test/command/biblatex-reese.md+71 test/command/biblatex-report.md+119 test/command/biblatex-salam.md+69 test/command/biblatex-sarfraz.md+65 test/command/biblatex-shore.md+66 test/command/biblatex-sigfridsson.md+106 test/command/biblatex-sorace.md+65 test/command/biblatex-spiegelberg.md+74 test/command/biblatex-springer.md+58 test/command/biblatex-strings.md+46 test/command/biblatex-test-case-conversion.md+73 test/command/biblatex-textnormal.md+17 test/command/biblatex-thesis.md+68 test/command/biblatex-title-and-shorttitle.md+76 test/command/biblatex-vangennep-related.md+69 test/command/biblatex-vangennep-trans.md+69 test/command/biblatex-vangennep.md+61 test/command/biblatex-vazques-de-parga-mvbook.md+75 test/command/biblatex-vazques-de-parga.md+74 test/command/biblatex-video.md+19 test/command/biblatex-vizedom-related.md+68 test/command/biblatex-wassenberg.md+83 test/command/biblatex-weinberg.md+52 test/command/biblatex-westfahl-frontier.md+60 test/command/biblatex-westfahl-space.md+106 test/command/biblatex-wilde.md+65 test/command/biblatex-worman.md+60 test/command/biblatex-yoon.md+67 test/command/biblio.bib+26 test/command/bibtex-basic.md+71 test/command/bioethics.csl+226 test/command/chap1/spider.png test/command/chap1/text.md+17 test/command/chap2/spider.png test/command/chap2/text.md+5 test/command/chicago-annotated-bibliography.csl+1207 test/command/chicago-author-date-with-original-date-and-status.csl+575 test/command/chicago-fullnote-bibliography.csl+1430 test/command/chicago-note-bibliography.csl+1005 test/command/chinese-gb7714-2005-numeric.csl+213 test/command/cite-in-inline-note.md+1−1 test/command/citeproc-17.md+17 test/command/citeproc-20.md+25 test/command/citeproc-7a.md+42 test/command/citeproc-7b.md+36 test/command/citeproc-author-in-text-suffix.md+6 test/command/custom-attributes.html−16 test/command/defaults-inheritance-1.md+6 test/command/defaults-inheritance-2.md+5 test/command/defaults-inheritance-3.md+6 test/command/defaults3.yaml+4 test/command/defaults4.yaml+3 test/command/defaults5.yaml+2 test/command/defaults6.yaml+2 test/command/defaults7.yaml+2 test/command/defaults8.yaml+2 test/command/defaults9.yaml+1 test/command/din-1505-2.csl+406 test/command/docbook-bibliography.md+20 test/command/duplicate_attributes.md+7 test/command/empty-inline-code.txt−6 test/command/gfm.md+4−4 test/command/harvard-university-of-kent.csl+253 test/command/ieee.csl+339 test/command/issue160.csl+28 test/command/issue437.csl+26 test/command/issue58.csl+553 data/jats.csl → test/command/jats.csl+12−7 test/command/latex-center.md+13 test/command/le-tapuscrit-note.csl+496 test/command/lists-inside-definition.md+67 test/command/locators.csl+68 test/command/mmd-metadata.md+20 test/command/modern-humanities-research-association.csl+445 test/command/nested-table-to-asciidoc-6942.md+82 test/command/newif.md+55 test/command/oscola.csl+680 test/command/pandoc-citeproc-118.md+28 test/command/pandoc-citeproc-119.md+38 test/command/pandoc-citeproc-13.md+29 test/command/pandoc-citeproc-136.md+23 test/command/pandoc-citeproc-14.md+77 test/command/pandoc-citeproc-152.md+63 test/command/pandoc-citeproc-160.md+44 test/command/pandoc-citeproc-175.md+43 test/command/pandoc-citeproc-197.md+31 test/command/pandoc-citeproc-213.md+33 test/command/pandoc-citeproc-25.md+30 test/command/pandoc-citeproc-250.md+21 test/command/pandoc-citeproc-27.md+38 test/command/pandoc-citeproc-292.md+43 test/command/pandoc-citeproc-301.md+25 test/command/pandoc-citeproc-307.md+31 test/command/pandoc-citeproc-31.md+48 test/command/pandoc-citeproc-312.md+171 test/command/pandoc-citeproc-320.md+254 test/command/pandoc-citeproc-320a.md+87 test/command/pandoc-citeproc-322.md+35 test/command/pandoc-citeproc-325.md+30 test/command/pandoc-citeproc-327.md+51 test/command/pandoc-citeproc-338.md+35 test/command/pandoc-citeproc-351.md+27 test/command/pandoc-citeproc-356.md+20 test/command/pandoc-citeproc-360.md+35 test/command/pandoc-citeproc-361.md+80 test/command/pandoc-citeproc-365.md+39 test/command/pandoc-citeproc-371.md+40 test/command/pandoc-citeproc-38.md+29 test/command/pandoc-citeproc-386.md+35 test/command/pandoc-citeproc-392.md+29 test/command/pandoc-citeproc-399.md+45 test/command/pandoc-citeproc-401.md+59 test/command/pandoc-citeproc-408.md+39 test/command/pandoc-citeproc-416.md+60 test/command/pandoc-citeproc-437.md+23 test/command/pandoc-citeproc-47.md+112 test/command/pandoc-citeproc-51.md+45 test/command/pandoc-citeproc-53.md+56 test/command/pandoc-citeproc-57.md+37 test/command/pandoc-citeproc-58.md+32 test/command/pandoc-citeproc-61.md+77 test/command/pandoc-citeproc-64.md+24 test/command/pandoc-citeproc-65.md+38 test/command/pandoc-citeproc-68.md+56 test/command/pandoc-citeproc-7.md+31 test/command/pandoc-citeproc-70.md+73 test/command/pandoc-citeproc-75.md+67 test/command/pandoc-citeproc-76.md+64 test/command/pandoc-citeproc-77.md+67 test/command/pandoc-citeproc-82.md+39 test/command/pandoc-citeproc-87.md+156 test/command/pandoc-citeproc-chicago-author-date.md+109 test/command/pandoc-citeproc-chicago-fullnote-bibliography.md+134 test/command/pandoc-citeproc-ieee.md+113 test/command/pandoc-citeproc-locators-delimited.md+127 test/command/pandoc-citeproc-locators-integrated.md+159 test/command/pandoc-citeproc-move-period-inside-quote.md+52 test/command/pandoc-citeproc-no-author.md+73 test/command/pandoc-citeproc-number-of-volumes.md+29 test/command/pandoc-citeproc-page-range.md+32 test/command/sage-harvard.csl+202 test/command/science.csl+245 test/command/style399.csl+12 test/command/svg.md+17−15 test/command/table-with-cell-align.md+82 test/command/table-with-column-span.md+276 test/command/toc.md+11−20 test/command/unicode-collation.md+130 test/command/vancouver.csl+351 test/command/yaml-metadata-blocks.md+3−3 test/command/zeitschrift-fur-kunstgeschichte.csl+346 test/docbook-reader.docbook+9−2 test/docx/0_level_headers.native+2−2 test/docx/golden/block_quotes.docx test/docx/golden/codeblock.docx test/docx/golden/comments.docx test/docx/golden/custom_style_no_reference.docx test/docx/golden/custom_style_preserve.docx test/docx/golden/custom_style_reference.docx test/docx/golden/definition_list.docx test/docx/golden/document-properties-short-desc.docx test/docx/golden/document-properties.docx test/docx/golden/headers.docx test/docx/golden/image.docx test/docx/golden/inline_code.docx test/docx/golden/inline_formatting.docx test/docx/golden/inline_images.docx test/docx/golden/link_in_notes.docx test/docx/golden/links.docx test/docx/golden/lists.docx test/docx/golden/lists_continuing.docx test/docx/golden/lists_multiple_initial.docx test/docx/golden/lists_restarting.docx test/docx/golden/nested_anchors_in_header.docx test/docx/golden/notes.docx test/docx/golden/raw-blocks.docx test/docx/golden/raw-bookmarks.docx test/docx/golden/table_one_row.docx test/docx/golden/table_with_list_cell.docx test/docx/golden/tables-default-widths.docx test/docx/golden/tables.docx test/docx/golden/track_changes_deletion.docx test/docx/golden/track_changes_insertion.docx test/docx/golden/track_changes_move.docx test/docx/golden/track_changes_scrubbed_metadata.docx test/docx/golden/unicode.docx test/docx/golden/verbatim_subsuper.docx test/docx/image_vml_as_object.docx test/docx/image_vml_as_object.native+2 test/docx/inline_formatting.native+1−1 test/docx/lists_multiple_initial.native+8 test/docx/raw-blocks.native+6 test/docx/raw-bookmarks.native+3 test/docx/sdt_elements.native+9−10 test/docx/table_captions_no_field.docx test/docx/table_captions_no_field.native+34 test/docx/table_captions_with_field.docx test/docx/table_captions_with_field.native+54 test/docx/table_header_rowspan.docx test/docx/table_header_rowspan.native+189 test/docx/table_one_header_row.docx test/docx/table_one_header_row.native+18 test/docx/table_one_row.docx test/docx/table_one_row.native+4−4 test/docx/table_variable_width.native+12−17 test/docx/table_with_list_cell.native+3−3 test/docx/tables-default-widths.native+92 test/docx/tables.native+9−9 test/docx/track_changes_scrubbed_metadata.docx test/docx/track_changes_scrubbed_metadata.native+9 test/epub/features.epub test/epub/features.native+3−3 test/epub/wasteland.epub test/epub/wasteland.native+4−4 test/fb2/images.fb2+1−1 test/fb2/test.jpg test/grofftest.sh−26 test/html-reader.html+76 test/html-reader.native+148−37 test/ipynb/simple.out.native+3−3 test/jats-reader.native+1−1 test/jats-reader.xml+1 test/jira-reader.native+1−1 test/latex-reader.native+26−13 test/lhs-test.html+135−3 test/lhs-test.html+lhs+135−3 test/lhs-test.latex+6−3 test/lhs-test.latex+lhs+6−3 test/lua/module/pandoc-path.lua+44 test/lua/module/pandoc-utils.lua+66 test/markdown-citations.native+14−14 test/markdown-reader-more.native+6−34 test/odt/native/tab.native+1 test/odt/odt/tab.odt test/org-select-tags.org+2−2 test/pipe-tables.native+2−10 test/pptx/code-custom.pptx test/pptx/code-custom_templated.pptx test/pptx/code.pptx test/pptx/code_templated.pptx test/pptx/document-properties-short-desc.pptx test/pptx/document-properties-short-desc_templated.pptx test/pptx/document-properties.pptx test/pptx/document-properties_templated.pptx test/pptx/endnotes.pptx test/pptx/endnotes_templated.pptx test/pptx/endnotes_toc.pptx test/pptx/endnotes_toc_templated.pptx test/pptx/images.pptx test/pptx/images_templated.pptx test/pptx/inline_formatting.pptx test/pptx/inline_formatting_templated.pptx test/pptx/lists.pptx test/pptx/lists_templated.pptx test/pptx/raw_ooxml.native+1−1 test/pptx/raw_ooxml.pptx test/pptx/raw_ooxml_templated.pptx test/pptx/reference_depth.pptx test/pptx/remove_empty_slides.pptx test/pptx/remove_empty_slides_templated.pptx test/pptx/slide_breaks.pptx test/pptx/slide_breaks_slide_level_1.pptx test/pptx/slide_breaks_slide_level_1_templated.pptx test/pptx/slide_breaks_templated.pptx test/pptx/slide_breaks_toc.pptx test/pptx/slide_breaks_toc_templated.pptx test/pptx/speaker_notes.pptx test/pptx/speaker_notes_after_metadata.pptx test/pptx/speaker_notes_after_metadata_templated.pptx test/pptx/speaker_notes_afterheader.pptx test/pptx/speaker_notes_afterheader_templated.pptx test/pptx/speaker_notes_afterseps.pptx test/pptx/speaker_notes_afterseps_templated.pptx test/pptx/speaker_notes_templated.pptx test/pptx/start_numbering_at.pptx test/pptx/start_numbering_at_templated.pptx test/pptx/tables.pptx test/pptx/tables_templated.pptx test/pptx/two_column.pptx test/pptx/two_column_templated.pptx test/rst-reader.native+3−21 test/s5-fancy.html+1−1 test/tables-rstsubset.native+1−9 test/tables.jats_archiving+156−156 test/tables.jats_articleauthoring+156−156 test/tables.jats_publishing+156−156 test/tables.latex+65−101 test/tables.ms+44 test/tables.org+3−3 test/tables/nordics.html4+59 test/tables/nordics.html5+59 test/tables/nordics.jats_archiving+58 test/tables/nordics.latex+42 test/tables/nordics.native+73 test/tables/planets.html4+133 test/tables/planets.html5+133 test/tables/planets.jats_archiving+128 test/tables/planets.latex+30 test/tables/planets.native+241 test/tables/students.html4+55 test/tables/students.html5+55 test/tables/students.jats_archiving+56 test/tables/students.latex+31 test/tables/students.native+54 test/test-pandoc.hs+22−8 test/textile-reader.native+1−1 test/textile-reader.textile+1−1 test/txt2tags.native+1−1 test/txt2tags.t2t+1−1 test/writer.asciidoc+1−1 test/writer.asciidoctor+1−1 test/writer.context+45−43 test/writer.custom+2−2 test/writer.dokuwiki+11 test/writer.html4+131 test/writer.html5+132−1 test/writer.icml+65−29 test/writer.jats_archiving+12−8 test/writer.jats_articleauthoring+1−1 test/writer.jats_publishing+12−8 test/writer.jira+25−37 test/writer.latex+6−3 test/writer.markdown+28−55 test/writer.ms+1−1 test/writer.opml+1−1 test/writer.org+91−118 test/writer.zimwiki+3−3 test/writers-lang-and-dir.context+7−5 test/writers-lang-and-dir.latex+13−7 tools/build-arm.sh+110 tools/changelog-helper.sh+11−4 tools/parseTimings.pl+33 trypandoc/index.html+1−1 trypandoc/trypandoc.hs+4−10 windows/Makefile+1−1 windows/pandoc.wxs+2−4
.circleci/config.yml+64−122
@@ -1,130 +1,72 @@
11version: "2.1"
2−
3−env: &env
2+jobs:
3+ build:
4+ macos:
5+ xcode: 11.1.0
46 environment:
5− LC_ALL: "C.UTF-8"
6− docker:
7− - image: fpco/stack-build:lts-13
8−
9−#-----------------------------------------------------------------------------
10−# Common utility stuff, not to be modified usually
11−#-----------------------------------------------------------------------------
12−
13−preinstall: &preinstall
14− run: |
15− echo 'export PATH=/opt/cabal/bin:/opt/ghc/bin:$PATH' >> $BASH_ENV
16− source $BASH_ENV
17− apt-get update
18−
19−restore: &restore
20− # Needs to happen after installing ca-certificates
21− restore_cache:
22− key: v1-{{ .Environment.CIRCLE_JOB }}-{{ .Branch }}
23−
24−save: &save
25− save_cache:
26− key: v1-{{ .Environment.CIRCLE_JOB }}-{{ .Branch }}
27− paths:
28− - ~/.cabal
29− - ~/.ghc
30− - ~/.local
31− - ~/.stack
32−
33−commands:
34− cabal_build:
35− parameters:
36− ghcversion:
37− type: string
7+ HOMEBREW_NO_AUTO_UPDATE: 1
388 steps:
39− - checkout
40− - *preinstall
41− - *restore
42− - run:
43− name: install cabal
44− command: apt-get install -y cabal-install-2.4
45− - run:
46− name: install ghc
47− command: |
48− apt-get install -y ghc-<< parameters.ghcversion >>
49− - run:
50− name: build and test project
51− command: |
52− set -e
53− cabal v2-update
54− TMPDIR=`mktemp -d -t circleci.XXXXXXX`
55− cabal v2-sdist --output-dir=${TMPDIR}
56− cd ${TMPDIR}
57− tar xvzf *.tar.gz
58− cd *
59− cabal v2-build -w ghc-<< parameters.ghcversion >> -j2 --disable-optimization --dependencies-only --enable-tests --enable-benchmarks
60− cabal v2-build -w ghc-<< parameters.ghcversion >> -j2 --disable-optimization --enable-tests --enable-benchmarks 2>build.log
61− cat build.log
62− # fail if we had warnings in local build
63− # this is to work around the fact that cabal v2 doesn't allow
64− # us to use -Werror for just local build:
65− # https://github.com/haskell/cabal/issues/4247
66− ! grep -q "[Ww]arning:" build.log
67− cabal v2-test -w ghc-<< parameters.ghcversion >> -j2 --disable-optimization --enable-tests
68− cabal v2-haddock -w ghc-<< parameters.ghcversion >>
69− cabal check
70− - *save
9+ - checkout
10+ - restore_cache:
11+ # See https://circleci.com/docs/2.0/caching/
12+ name: Restore Cached Dependencies
13+ keys:
14+ - stack-dependencies-{{ checksum "stack.yaml" }}
15+ - run:
16+ name: Install stack
17+ command: stack --version || (curl -sSL https://get.haskellstack.org/ | sh -s - -f)
18+ - run:
19+ name: Resolve/Update Dependencies
20+ command: stack --no-terminal setup
21+ - run:
22+ name: Run tests
23+ command: stack --no-terminal test
24+ - run:
25+ name: Install executable
26+ command: stack --no-terminal install
27+ - run:
28+ name: Create artifacts
29+ command: |
30+ export VERSION=$(grep '^[Vv]ersion:' pandoc.cabal | awk '{print $$2;}')
31+ export ARTIFACTS=macos-release-candidate
32+ export RESOURCES=${ARTIFACTS}/Resources
33+ export ROOT=${ARTIFACTS}/pandoc
34+ export DEST=${ROOT}/usr/local
35+ export ME=$(whoami)
36+ export BASE=pandoc-$VERSION
37+ mkdir -p ${ARTIFACTS}
38+ mkdir -p ${RESOURCES}
39+ mkdir -p ${DEST}/bin
40+ mkdir -p ${DEST}/share/man/man1
41+ cp ~/.local/bin/pandoc ${DEST}/bin/
42+ strip ${DEST}/bin/pandoc
43+ cp man/pandoc.1 ${DEST}/share/man/man1/pandoc.1
44+ ~/.local/bin/pandoc -s COPYING.md -Vpagetitle=License -o ${RESOURCES}/license.html
45+ chown -R $ME:staff ${ROOT}
46+ sed -e "s/PANDOCVERSION/${VERSION}/" macos/distribution.xml.in > ${ARTIFACTS}/distribution.xml
47+ cp macos/Makefile ${ARTIFACTS}/
48+ echo ${VERSION} > ${ARTIFACTS}/version.txt
49+ zip -r macos-release-candidate.zip ${ARTIFACTS}
7150
72−#-----------------------------------------------------------------------------
73−# Build matrix
74−#-----------------------------------------------------------------------------
51+ - save_cache:
52+ name: Cache Dependencies
53+ key: stack-dependencies-{{ checksum "stack.yaml" }}
54+ paths:
55+ - "/root/.stack"
56+ - ".stack-work"
57+ - "/usr/local/bin/stack"
7558
76−jobs:
77− cabal-ghc-8_8_1:
78− <<: *env
79− steps:
80− - cabal_build:
81− ghcversion: 8.8.1
82−
83− cabal-ghc-8_6_5:
84− <<: *env
85− steps:
86− - cabal_build:
87− ghcversion: 8.6.5
88−
89− cabal-ghc-8_4_4:
90− <<: *env
91− steps:
92− - cabal_build:
93− ghcversion: 8.4.4
94−
95− cabal-ghc-8_2_2:
96− <<: *env
97− steps:
98− - cabal_build:
99− ghcversion: 8.2.2
100−
101− cabal-ghc-8_0_2:
102− <<: *env
103− steps:
104− - cabal_build:
105− ghcversion: 8.0.2
106−
107− stack-ghc-8_6:
108− <<: *env
109− steps:
110− - checkout
111− - *preinstall
112− - *restore
113− - run: |
114− set -e
115− apt-get install -y ghc-8.6.5
116− stack update
117− stack test --system-ghc --fast --ghc-options="-Werror" .
118− - *save
59+ - store_artifacts:
60+ # https://circleci.com/docs/2.0/artifacts/
61+ path: macos-release-candidate.zip
62+ destination: macos-release-candidate.zip
11963
12064workflows:
121− version: "2.1"
122− build:
65+ version: 2
66+ release:
12367 jobs:
124− - cabal-ghc-8_6_5
125− - cabal-ghc-8_4_4
126− - cabal-ghc-8_2_2
127− - cabal-ghc-8_0_2
128− - stack-ghc-8_6
129− # - cabal-ghc-8_8_1
130−
68+ - build:
69+ filters:
70+ branches:
71+ only:
72+ - /rc\/.*/
.editorconfig+8
@@ -8,6 +8,14 @@ indent_size = 2
88insert_final_newline = true
99trim_trailing_whitespace = true
1010
11+[*.{zip,docx}]
12+charset =
13+end_of_line =
14+indent_style =
15+indent_size =
16+insert_final_newline =
17+trim_trailing_whitespace =
18+
1119[*.{markdown,md}]
1220trim_trailing_whitespace = false
1321
.github/ISSUE_TEMPLATEdeleted−11
@@ -1,11 +0,0 @@
1−Asking a question?
2−Please use the pandoc-discuss mailing list instead:
3−https://groups.google.com/forum/#!forum/pandoc-discuss
4−This tracker is for bug reports and enhancement requests.
5−
6−Reporting a bug?
7−Please include your pandoc version and an example that allows us
8−to reproduce the problem (complete input, exact command line
9−used, expected and actual output). The smaller the example, the
10−better.
11−
.github/ISSUE_TEMPLATE/bug_report.mdnew file+25
@@ -0,0 +1,25 @@
1+---
2+name: Bug report
3+about: Create a report to help us improve
4+title: ''
5+labels: 'bug'
6+assignees: ''
7+
8+---
9+
10+<!--
11+Thank you for reporting an issue! Before you continue, please make sure that you have
12+
13+- searched the issue tracker for similar issues (including closed issues): https://github.com/jgm/pandoc/issues
14+- searched the pandoc-discuss mailing list for solutions: https://groups.google.com/forum/#!forum/pandoc-discuss
15+- reproduced your issue on the latest release of pandoc, or on https://pandoc.org/try
16+
17+Note that this bug tracker is for reporting bugs, not asking questions. For questions, use the pandoc-discuss mailing list.
18+-->
19+
20+**Explain the problem.**
21+Include the exact command line you used and all inputs necessary to reproduce the issue. Please create as minimal an example as possible, to help the maintainers isolate the problem. Explain the output you received and how it differs from what you expected.
22+
23+**Pandoc version?**
24+What version of pandoc are you using, on what OS?
25+
.github/ISSUE_TEMPLATE/config.ymlnew file+9
@@ -0,0 +1,9 @@
1+blank_issues_enabled: false
2+contact_links:
3+ - name: Ask a question
4+ url: https://groups.google.com/forum/#!forum/pandoc-discuss
5+ about: "Discussion forum for pandoc (may be used as an email list)"
6+ - name: Contributing Guidelines
7+ url: https://pandoc.org/CONTRIBUTING.html
8+ about: "Guidelines for submitting bug reports and code improvements"
9+
.github/ISSUE_TEMPLATE/feature_request.mdnew file+21
@@ -0,0 +1,21 @@
1+---
2+name: Feature request
3+about: Suggest an idea for this project
4+title: ''
5+labels: 'enhancement'
6+assignees: ''
7+
8+---
9+
10+<!--
11+Thank you for suggesting a feature! Before you continue, please make sure that you have
12+
13+- read the contributing guidelines: https://pandoc.org/CONTRIBUTING.html
14+- searched the issue tracker for similar issues (including closed issues): https://github.com/jgm/pandoc/issues
15+- searched the pandoc-discuss mailing list for relevant discussions: https://groups.google.com/forum/#!forum/pandoc-discuss
16+-->
17+
18+**Describe your proposed improvement and the problem it solves.**
19+
20+**Describe alternatives you've considered.**
21+
.github/workflows/ci.yml+146−48
@@ -45,32 +45,53 @@ jobs:
4545 versions:
4646 - ghc: '8.0.2'
4747 cabal: '2.4'
48+ prefix: 'v2-'
49+ cabalopts: ''
50+ testopts: ''
4851 - ghc: '8.2.2'
4952 cabal: '2.4'
53+ prefix: 'v2-'
54+ cabalopts: ''
55+ testopts: ''
5056 - ghc: '8.4.4'
5157 cabal: '2.4'
58+ prefix: 'v2-'
59+ cabalopts: '-f-embed_data_files'
60+ testopts: ''
5261 - ghc: '8.6.5'
5362 cabal: '3.2'
54− - ghc: '8.8.3'
63+ prefix: ''
64+ cabalopts: ''
65+ testopts: '--test-option=--hide-successes'
66+ - ghc: '8.8.4'
5567 cabal: '3.2'
56− - ghc: '8.10.1'
68+ prefix: ''
69+ cabalopts: ''
70+ testopts: '--test-option=--hide-successes'
71+ - ghc: '8.10.4'
5772 cabal: '3.2'
73+ prefix: ''
74+ cabalopts: '-ftrypandoc'
75+ testopts: '--test-option=--hide-successes'
76+ - ghc: '9.0.1'
77+ cabal: '3.4'
78+ prefix: ''
79+ cabalopts: ''
80+ testopts: '--test-option=--hide-successes'
5881 steps:
59− - uses: actions/checkout@v1
82+ - uses: actions/checkout@v2
83+
84+ # needed by memory
85+ - name: Install numa
86+ run: sudo apt-get install libnuma-dev
6087
6188 # need to install older cabal/ghc versions from ppa repository
6289
6390 - name: Install recent cabal/ghc
64− run: |
65− if [[ ! -d /opt/ghc/${{ matrix.versions.ghc }} ]]
66− then
67− sudo add-apt-repository ppa:hvr/ghc
68− sudo apt-get update
69− sudo apt-get install ghc-${{ matrix.versions.ghc }} cabal-install-${{ matrix.versions.cabal }}
70− fi
71− # Use a GitHub workflow command to add folders to PATH.
72− echo "::add-path::/opt/ghc/${{ matrix.versions.ghc }}/bin"
73− echo "::add-path::/opt/cabal/${{ matrix.versions.cabal }}/bin"
91+ uses: haskell/actions/setup@v1
92+ with:
93+ ghc-version: ${{ matrix.versions.ghc }}
94+ cabal-version: ${{ matrix.versions.cabal }}
7495
7596 # declare/restore cached things
7697 # caching doesn't work for scheduled runs yet
@@ -78,39 +99,44 @@ jobs:
7899
79100 - name: Cache cabal global package db
80101 id: cabal-global
81− uses: actions/cache@v1
102+ uses: actions/cache@v2
82103 with:
83− path: ~/.cabal
104+ path: |
105+ ~/.cabal
84106 key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-global-${{ hashFiles('cabal.project') }}
85107
86108 - name: Cache cabal work
87109 id: cabal-local
88− uses: actions/cache@v1
110+ uses: actions/cache@v2
89111 with:
90− path: dist-newstyle
112+ path: |
113+ dist-newstyle
91114 key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-local
92115
93116 - name: Install dependencies
94117 run: |
95− cabal v2-update
96− cabal v2-build --dependencies-only --enable-tests --disable-optimization
118+ cabal ${{ matrix.versions.prefix }}update
119+ cabal ${{ matrix.versions.prefix }}build ${{ matrix.versions.cabalopts }} --dependencies-only --enable-tests --disable-optimization
120+
97121 - name: Build and test
98122 run: |
99− cabal v2-build --enable-tests --disable-optimization 2>&1 | tee build.log
123+ cabal ${{ matrix.versions.prefix }}build ${{ matrix.versions.cabalopts }} --enable-tests --disable-optimization 2>&1 | tee build.log
100124 # fail if warnings in local build
101125 ! grep -q ": *[Ww]arning:" build.log || exit 1
102− cabal v2-test --disable-optimization
126+ cabal ${{ matrix.versions.prefix }}test ${{ matrix.versions.cabalopts }} --disable-optimization ${{ matrix.versions.testopts }}
103127
104128 windows:
105129
106130 runs-on: windows-2019
107131
108132 steps:
109− - uses: actions/checkout@v1
110− - name: Install stack
111− shell: cmd
112− run: |
113− choco install haskell-stack
133+ - uses: actions/checkout@v2
134+
135+ # We should have ghc 8.10, cabal, stack pre-installed
136+ # - uses: haskell/actions/setup@v1
137+ # with:
138+ # enable-stack: true
139+ # stack-version: 'latest'
114140
115141 # declare/restore cached things
116142 # caching doesn't work for scheduled runs yet
@@ -118,10 +144,11 @@ jobs:
118144
119145 - name: Cache stack global package db
120146 id: stack-global-package-db
121− uses: actions/cache@v1
147+ uses: actions/cache@v2
122148 with:
123− path: C:\Users\runneradmin\AppData\Roaming\stack\
124− key: ${{ runner.os }}-appdata-roaming-stack-${{ hashFiles('stack.yaml') }}
149+ path: |
150+ C:\Users\runneradmin\AppData\Roaming\stack\
151+ key: ${{ runner.os }}-appdata-roaming-stack-${{ hashFiles('stack.yaml') }}
125152
126153 # stack's local package dbs for the project and each package
127154 # - name: Cache .stack-work
@@ -134,6 +161,7 @@ jobs:
134161 - name: Install dependencies
135162 run: |
136163 stack update
164+ stack install happy
137165 stack test --dependencies-only --fast
138166 - name: Build and test
139167 shell: cmd
@@ -143,35 +171,105 @@ jobs:
143171 macos:
144172
145173 runs-on: macOS-10.15
174+ strategy:
175+ fail-fast: true
176+ matrix:
177+ versions:
178+ - ghc: '8.8.4'
179+ cabal: '3.2'
146180
147181 steps:
148− - uses: actions/checkout@v1
149− - name: Install stack
182+ - uses: actions/checkout@v2
183+
184+ - name: Install recent cabal/ghc
185+ uses: haskell/actions/setup@v1
186+ with:
187+ ghc-version: ${{ matrix.versions.ghc }}
188+ cabal-version: ${{ matrix.versions.cabal }}
189+
190+ # declare/restore cached things
191+ # caching doesn't work for scheduled runs yet
192+ # https://github.com/actions/cache/issues/63
193+
194+ - name: Cache cabal global package db
195+ id: cabal-global
196+ uses: actions/cache@v2
197+ with:
198+ path: |
199+ ~/.cabal
200+ key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-global-${{ hashFiles('cabal.project') }}
201+
202+ - name: Cache cabal work
203+ id: cabal-local
204+ uses: actions/cache@v2
205+ with:
206+ path: |
207+ dist-newstyle
208+ key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-local
209+
210+ - name: Install dependencies
211+ run: |
212+ cabal v2-update
213+ cabal v2-build --dependencies-only --enable-tests --disable-optimization
214+ - name: Build and test
150215 run: |
151− curl -L https://get.haskellstack.org/stable/osx-x86_64.tar.gz -o stack.tar.gz
152− tar xzvf stack.tar.gz --strip-components=1 'stack*/stack'
216+ cabal v2-build --enable-tests --disable-optimization 2>&1 | tee build.log
217+ # fail if warnings in local build
218+ ! grep -q ": *[Ww]arning:" build.log || exit 1
219+ cabal v2-test --disable-optimization
220+
221+ benchmark:
222+
223+ runs-on: ubuntu-18.04
224+ strategy:
225+ fail-fast: true
226+ matrix:
227+ versions:
228+ - ghc: '8.8.4'
229+ cabal: '3.2'
230+ - ghc: '8.10.2'
231+ cabal: '3.2'
232+ steps:
233+ - uses: actions/checkout@v2
234+
235+ # need to install older cabal/ghc versions from ppa repository
236+
237+ - name: Install recent cabal/ghc
238+ uses: haskell/actions/setup@v1
239+ with:
240+ ghc-version: ${{ matrix.versions.ghc }}
241+ cabal-version: ${{ matrix.versions.cabal }}
153242
154243 # declare/restore cached things
155− # caching doesn't work for scheduled runs yet https://github.com/actions/cache/issues/63
244+ # caching doesn't work for scheduled runs yet
245+ # https://github.com/actions/cache/issues/63
156246
157− - name: Cache stack global package db
158− id: stack-global
159− uses: actions/cache@v1
247+ - name: Cache cabal global package db
248+ id: cabal-global
249+ uses: actions/cache@v2
160250 with:
161− path: ~/.stack
162− key: ${{ runner.os }}-stack-global-${{ hashFiles('stack.yaml') }}
251+ path: |
252+ ~/.cabal
253+ key: benchmark-${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-global-${{ hashFiles('cabal.project') }}
163254
164− # stack's local package db
165− # - name: Cache .stack-work
166− # uses: actions/cache@v1
167− # with:
168− # path: .stack-work
169− # key: ${{ runner.os }}-stack-work
255+ - name: Cache cabal work
256+ id: cabal-local
257+ uses: actions/cache@v2
258+ with:
259+ path: |
260+ dist-newstyle
261+ key: benchmark-${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-local
170262
171263 - name: Install dependencies
172264 run: |
173− ./stack update
174− ./stack test --dependencies-only --fast
265+ v2=$([ "${{ matrix.versions.cabal }}" = "2.2" ] && printf 'new' || printf 'v2')
266+ cabal $v2-update
267+ cabal $v2-build --dependencies-only --enable-optimization=1 --enable-benchmarks --disable-tests
268+
175269 - name: Build and test
176270 run: |
177− ./stack test --fast --test-arguments=--hide-successes
271+ v2=$([ "${{ matrix.versions.cabal }}" = "2.2" ] && printf 'new' || printf 'v2')
272+ cabal $v2-build --enable-optimization=1 --enable-benchmarks --disable-tests 2>&1 | tee build.log
273+ # fail if warnings in local build
274+ ! grep -q ": *[Ww]arning:" build.log || exit 1
275+ cabal $v2-bench --enable-optimization=1 --benchmark-options='--timeout=6 +RTS -T -RTS'
.github/workflows/format-validation.ymlnew file+88
@@ -0,0 +1,88 @@
1+name: Format validation
2+
3+on:
4+ push:
5+ branches:
6+ - '*'
7+ - '!rc/*'
8+ paths:
9+ - 'test/writer.jats_articleauthoring'
10+ - 'test/writer.jats_publishing'
11+ - 'test/writer.jats_archiving'
12+ - 'test/tables.jats_archiving'
13+ - 'test/tables/nordics.jats_archiving'
14+ - 'test/tables/planets.jats_archiving'
15+ - 'test/tables/students.jats_archiving'
16+ pull_request:
17+ branches:
18+ - '*'
19+ - '!rc/*'
20+ paths:
21+ - 'test/writer.jats_articleauthoring'
22+ - 'test/writer.jats_publishing'
23+ - 'test/writer.jats_archiving'
24+ - 'test/tables.jats_archiving'
25+ - 'test/tables/nordics.jats_archiving'
26+ - 'test/tables/planets.jats_archiving'
27+ - 'test/tables/students.jats_archiving'
28+
29+jobs:
30+ jats:
31+ name: JATS
32+ runs-on: ubuntu-latest
33+ env:
34+ VALIDATOR_URL: "https://jats-validator.hubmed.org/dtd/"
35+ strategy:
36+ fail-fast: false
37+ matrix:
38+ tagset:
39+ - articleauthoring
40+ - publishing
41+ - archiving
42+ steps:
43+ - name: Checkout
44+ uses: actions/checkout@v2
45+
46+ - name: Validate writer output
47+ run: |
48+ filename=test/writer.jats_${{ matrix.tagset }}
49+ printf "Validating file %s\n" "$filename"
50+ json="$(curl --form "xml=@${filename}" --silent "$VALIDATOR_URL")"
51+ err_count="$(printf '%s' "$json" | jq '.errors | length')"
52+ if [ "$err_count" -eq 0 ]; then
53+ printf "File was validated successfully.\n"
54+ exit 0
55+ else
56+ printf "Validator report:\n%s" "$json"
57+ exit 1
58+ fi
59+
60+ - name: Validate tables
61+ # Archiving has the simplest template, so we only check with that.
62+ if: matrix.tagset == 'archiving'
63+ run: |
64+ tmpl="$(cat <<EOF
65+ <?xml version="1.0" encoding="utf-8" ?>
66+ <!DOCTYPE article PUBLIC "-//NLM//DTD JATS (Z39.96) Journal Archiving and Interchange DTD v1.2 20190208//EN"
67+ "JATS-archivearticle1.dtd">
68+ <article xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:xlink="http://www.w3.org/1999/xlink" dtd-version="1.2" article-type="other">
69+ <front><article-meta></article-meta></front>
70+ <body>%s</body></article>
71+ EOF
72+ )"
73+ jats_file="$(mktemp jats-tables.XXXXX)"
74+ exit_code=0
75+ for f in tables tables/nordics tables/planets tables/students; do
76+ filename=test/$f.jats_archiving
77+ printf "Validating %s...\n" "$filename"
78+ printf "$tmpl" "$(cat $filename)" > "$jats_file"
79+ json="$(curl --form "xml=@${jats_file}" --silent "$VALIDATOR_URL")"
80+ err_count="$(printf "%s" "$json" | jq '.errors | length')"
81+ if [ "$err_count" -eq 0 ]; then
82+ printf "Table output is valid when used as body content.\n"
83+ else
84+ printf "Validator report:\n%s" "$json"
85+ exit_code=1
86+ fi
87+ done
88+ exit "$exit_code"
.github/workflows/lint.ymlnew file+33
@@ -0,0 +1,33 @@
1+name: Lint
2+
3+# Trigger the workflow on push or pull request, but only for the
4+# master branch
5+on:
6+ pull_request:
7+ branch: [master]
8+ push:
9+ branch: [master]
10+ paths-ignore:
11+ - LICENSE
12+ - README.md
13+ - CHANGELOG.md
14+ - stack.yaml
15+ - .travis.yml
16+
17+jobs:
18+ lint:
19+ name: Lint
20+ runs-on: ubuntu-latest
21+ env:
22+ hlint_script: https://raw.github.com/ndmitchell/hlint/master/misc/run.sh
23+
24+ steps:
25+ - name: Checkout
26+ uses: actions/checkout@v2
27+
28+ - name: Check cabal file for missing test files
29+ run: make check-cabal
30+
31+ - name: Download and run hlint
32+ run: |
33+ curl -sSL "${hlint_script}" | sh -s .
.github/workflows/nightly.yml+18−26
@@ -2,35 +2,36 @@ name: Nightly
22
33on:
44 schedule:
5− - cron: '53 6 * * *'
5+ - cron: '53 7 * * *'
66
77jobs:
88 linux:
99
1010 runs-on: ubuntu-18.04
1111 steps:
12− - uses: actions/checkout@v1
12+ - uses: actions/checkout@v2
13+
14+ - name: Install recent cabal/ghc
15+ uses: haskell/actions/setup@v1
16+ with:
17+ ghc-version: '8.10.3'
18+ cabal-version: '3.2'
19+
1320 - name: Install dependencies
1421 run: |
15− export PATH=/opt/cabal/3.2/bin:/opt/ghc/8.8.3/bin:$PATH
16− ls /opt/cabal/*/bin
17− ls /opt/ghc/*/bin
1822 ghc --version
1923 cabal --version
2024 cabal v2-update
21− cabal v2-build --dependencies-only . pandoc-citeproc
25+ cabal v2-build --dependencies-only
2226 - name: Build
2327 run: |
24− export PATH=/opt/cabal/3.2/bin:/opt/ghc/8.8.3/bin:$PATH
25− cabal v2-install . pandoc-citeproc
28+ cabal v2-install
2629 strip $HOME/.cabal/bin/pandoc
27− strip $HOME/.cabal/bin/pandoc-citeproc
2830 - name: Install artifact
2931 run: |
3032 export ARTIFACTS=nightly-linux/pandoc-nightly-linux-$(date +%Y-%m-%d)
3133 mkdir -p ${ARTIFACTS}
3234 cp $HOME/.cabal/bin/pandoc ${ARTIFACTS}/
33− cp $HOME/.cabal/bin/pandoc-citeproc ${ARTIFACTS}/
3435 cp COPYRIGHT ${ARTIFACTS}/
3536 echo "Built from ${GITHUB_SHA}" > ${ARTIFACTS}/README.nightly.txt
3637 - uses: actions/upload-artifact@master
@@ -43,22 +44,18 @@ jobs:
4344 runs-on: windows-2019
4445
4546 steps:
46− - uses: actions/checkout@v1
47− - name: Install stack
48− shell: cmd
49− run: |
50− choco install haskell-stack
47+ - uses: actions/checkout@v2
5148 - name: Install dependencies
5249 run: |
5350 stack update
54− stack build --dependencies-only pandoc pandoc-citeproc
51+ stack build --dependencies-only pandoc
5552 - name: Build artifacts
5653 shell: cmd
5754 run: |
5855 for /f %%a in ('powershell -Command "Get-Date -format yyyy-MM-dd"') do set THEDATE=%%a
5956 set ARTIFACTS=%CD%\nightly-windows\pandoc-nightly-windows-%THEDATE%
6057 mkdir %ARTIFACTS%
61− stack build pandoc pandoc-citeproc
58+ stack build pandoc
6259 forfiles /P .\.stack-work\install /M pandoc*.exe /S /C "cmd /C copy @path %%ARTIFACTS%%"
6360 copy COPYRIGHT %ARTIFACTS%
6461 ren %ARTIFACTS%\COPYRIGHT COPYRIGHT.txt
@@ -73,23 +70,18 @@ jobs:
7370 runs-on: macOS-10.15
7471
7572 steps:
76− - uses: actions/checkout@v1
77− - name: Install stack
78− run: |
79− curl -L https://get.haskellstack.org/stable/osx-x86_64.tar.gz -o stack.tar.gz
80− tar xzvf stack.tar.gz --strip-components=1 'stack*/stack'
73+ - uses: actions/checkout@v2
8174 - name: Install dependencies
8275 run: |
83− ./stack update
84− ./stack build --dependencies-only pandoc pandoc-citeproc
76+ stack update
77+ stack build --dependencies-only pandoc
8578 - name: Build artifacts
8679 run: |
8780 export ARTIFACTS=nightly-macos/pandoc-nightly-macos-$(date +%Y-%m-%d)
8881 mkdir -p ${ARTIFACTS}
89− ./stack build pandoc pandoc-citeproc
82+ stack build pandoc
9083 for f in $(find .stack-work/install -name 'pandoc*' -perm +001 -type f); do cp $f ${ARTIFACTS}/; done
9184 mv ${ARTIFACTS}/pandoc ${ARTIFACTS}/pandoc
92− mv ${ARTIFACTS}/pandoc-citeproc ${ARTIFACTS}/pandoc-citeproc
9385 cp COPYRIGHT ${ARTIFACTS}/
9486 echo "Built from ${GITHUB_SHA}" > ${ARTIFACTS}/README.nightly.txt
9587 - uses: actions/upload-artifact@master
.github/workflows/release-candidate.yml+5−63
@@ -17,7 +17,7 @@ jobs:
1717 mkdir linux-release-candidate
1818 cp linux/artifacts/*.deb linux-release-candidate/
1919 cp linux/artifacts/*.tar.gz linux-release-candidate/
20− - uses: actions/upload-artifact@master
20+ - uses: actions/upload-artifact@v2
2121 with:
2222 name: linux-release-candidate
2323 path: linux-release-candidate
@@ -31,29 +31,18 @@ jobs:
3131 versions:
3232 - osarch: "windows-x86_64"
3333 arch: "x64"
34− choco_opts: ""
3534 stack_opts: "-j1"
36− - osarch: "windows-i386"
37− arch: "x86"
38− choco_opts: "--x86 --version 2.1.3.20190715"
39− stack_opts: "-j1 --flag hslua:lua_32bits"
40− # we use stack 2.1.3 because 2.3.1 doesn't support i386
41−
4235 steps:
4336 - uses: actions/checkout@v1
44− - name: Install stack
45− shell: cmd
46− run: |
47− choco install haskell-stack ${{ matrix.versions.choco_opts }}
4837 - name: Install dependencies
4938 run: |
5039 stack update
51− stack build ${{ matrix.versions.stack_opts }} --dependencies-only pandoc pandoc-citeproc
40+ stack build ${{ matrix.versions.stack_opts }} --dependencies-only pandoc
5241 - name: Create windows package
5342 shell: cmd
5443 run: |
5544 for /f %%a in ('powershell -Command "Get-Date -format yyyy-MM-dd"') do set THEDATE=%%a
56− stack build ${{ matrix.versions.stack_opts }} pandoc pandoc-citeproc
45+ stack build ${{ matrix.versions.stack_opts }} pandoc
5746 for /f "tokens=1-2 delims= " %%a in ('stack exec pandoc -- --version') do (
5847 @set VERSION=%%b
5948 goto :next
@@ -67,7 +56,7 @@ jobs:
6756 @set WINDOWS=%CD%\windows
6857 @set RELEASE=%WINDOWS%\pandoc-%VERSION%
6958 mkdir %RELEASE%
70− forfiles /P .\.stack-work\install /M pandoc*.exe /S /C "cmd /C echo @path && echo %%WINDOWS%% && copy @path %%RELEASE%%"
59+ forfiles /P .\.stack-work\install /M pandoc.exe /S /C "cmd /C echo @path && echo %%WINDOWS%% && copy @path %%RELEASE%%"
7160 stack exec pandoc -- -s --toc MANUAL.txt -o %RELEASE%\MANUAL.html
7261 stack exec pandoc -- -s COPYING.md -t rtf -o %RELEASE%\COPYING.rtf
7362 copy %RELEASE%\COPYING.rtf %WINDOWS%
@@ -88,54 +77,7 @@ jobs:
8877 copy windows\pandoc-%VERSION%-${{ matrix.versions.osarch }}-UNSIGNED.msi windows-release-candidate
8978 copy windows\pandoc-%VERSION%-${{ matrix.versions.osarch }}.zip windows-release-candidate
9079 copy windows\Makefile windows-release-candidate
91− - uses: actions/upload-artifact@master
80+ - uses: actions/upload-artifact@v2
9281 with:
9382 name: windows-release-candidate
9483 path: windows-release-candidate
95−
96− macos:
97−
98− runs-on: macOS-10.15
99−
100− steps:
101− - uses: actions/checkout@v1
102− - name: Install stack
103− run: |
104− curl -L https://get.haskellstack.org/stable/osx-x86_64.tar.gz -o stack.tar.gz
105− tar xzvf stack.tar.gz --strip-components=1 'stack*/stack'
106− - name: Install dependencies
107− run: |
108− ./stack update
109− ./stack build --dependencies-only pandoc pandoc-citeproc
110− - name: Create macOS package
111− run: |
112− export VERSION=$(grep '^[Vv]ersion:' pandoc.cabal | awk '{print $$2;}')
113− export BASEDIR=$(pwd)
114− export ARTIFACTS=${BASEDIR}/macos-release-candidate
115− export RESOURCES=${ARTIFACTS}/Resources
116− export ROOT=${ARTIFACTS}/pandoc
117− export DEST=${ROOT}/usr/local
118− export ME=$(whoami)
119− export BASE=pandoc-$VERSION
120− mkdir -p ${ARTIFACTS}
121− mkdir -p ${RESOURCES}
122− mkdir -p ${DEST}/bin
123− mkdir -p ${DEST}/share/man/man1
124− ./stack build pandoc pandoc-citeproc
125− for f in $(find .stack-work/install -name 'pandoc*' -perm +001 -type f); do cp $f ${DEST}/bin/; done
126− strip ${DEST}/bin/pandoc
127− strip ${DEST}/bin/pandoc-citeproc
128− cp man/pandoc.1 ${DEST}/share/man/man1/pandoc.1
129− ${DEST}/bin/pandoc-citeproc --man > \
130− $DEST/share/man/man1/pandoc-citeproc.1
131− ${DEST}/bin/pandoc -t html5 -s COPYING.md -Vpagetitle=License \
132− -o ${RESOURCES}/license.html
133− chown -R $ME:staff ${ROOT}
134− sed -e "s/PANDOCVERSION/${VERSION}/" macos/distribution.xml.in > ${ARTIFACTS}/distribution.xml
135− cp macos/Makefile ${ARTIFACTS}/
136− echo ${VERSION} > ${ARTIFACTS}/version.txt
137− - uses: actions/upload-artifact@master
138− with:
139− name: macos-release-candidate
140− path: macos-release-candidate
141−
.gitignore+8
@@ -1,4 +1,6 @@
11*~
2+.DS_Store
3+*.orig
24deb/.vagrant
35dist/*
46MANUAL.*
@@ -14,6 +16,10 @@ man/man?/*.html
1416*.o
1517*.hi
1618*.pyc
19+.hie/
20+.policeman-evidence/
21+.projectile/
22+.vscode/
1723/COPYING.rtf
1824/COPYRIGHT.txt
1925/cabal-dev/
@@ -23,5 +29,7 @@ windows/*.wixobj
2329data/reference.docx
2430data/reference.odt
2531.stack-work
32+/stack.yaml.lock
2633cabal.project.local
2734/dist-newstyle/
35+pandoc-2*/
.hlint.yaml+83−54
@@ -2,82 +2,111 @@
22# https://github.com/ndmitchell/hlint
33##########################
44
5−# This file contains a template configuration file, which is typically
6−# placed as .hlint.yaml in the root of your project
7−
8−
95# Specify additional command line arguments
106#
11−- arguments: [--color, --cpp-ansi]
12−
13−
14−# Control which extensions/flags/modules/functions can be used
15−#
16−# - extensions:
17−# - default: false # all extension are banned by default
18−# - name: [PatternGuards, ViewPatterns] # only these listed extensions can be used
19−# - {name: CPP, within: CrossPlatform} # CPP can only be used in a given module
20−#
21−# - flags:
22−# - {name: -w, within: []} # -w is allowed nowhere
23−#
24−# - modules:
25−# - {name: [Data.Set, Data.HashSet], as: Set} # if you import Data.Set qualified, it must be as 'Set'
26−# - {name: Control.Arrow, within: []} # Certain modules are banned entirely
27−#
28−# - functions:
29−# - {name: unsafePerformIO, within: []} # unsafePerformIO can only appear in no modules
30−
31−
32−# Add custom hints for this project
33−#
34−# Will suggest replacing "wibbleMany [myvar]" with "wibbleOne myvar"
35−# - error: {lhs: "wibbleMany [x]", rhs: wibbleOne x}
36−
37−
38−# Turn on hints that are off by default
39−#
40−# Ban "module X(module X) where", to require a real export list
41−# - warn: {name: Use explicit module export list}
42−#
43−# Replace a $ b $ c with a . b $ c
44−# - group: {name: dollar, enabled: true}
45−#
46−# Generalise map to fmap, ++ to <>
47−# - group: {name: generalise, enabled: true}
48−
7+- arguments: [--color=auto, --cpp-ansi]
498
509# Ignore some builtin hints
51−# - ignore: {name: Use let}
52−# - ignore: {name: Use const, within: SpecialModule} # Only within certain modules
53−# - ignore: {name: "Use section"}
54−# - ignore: {name: "Use camelCase"}
55−# - ignore: {name: "Use list comprehension"}
56−# - ignore: {name: "Redundant if"}
10+#
5711- ignore: {name: "Avoid lambda"}
12+- ignore: {name: "Use bimap"}
5813- ignore: {name: "Eta reduce"}
5914- ignore: {name: "Evaluate"}
60−- ignore: {name: "Monad law, left identity", module: "Text.Pandoc.App.OutputSettings"}
61−- ignore: {name: "Reduce duplication", module: "Text.Pandoc.Readers.Markdown"}
15+- ignore: {name: "Reduce duplication"} # TODO: could be more fine-grained
6216- ignore: {name: "Use &&&"}
6317- ignore: {name: "Use String"}
18+- ignore: {name: "Use camelCase"}
6419- ignore: {name: "Use fmap"} # specific for GHC 7.8 compat
65−- ignore: {name: "Use forM_", module: "Text.Pandoc.Readers.DocBook"}
6620- ignore: {name: "Use isDigit"}
67−- ignore: {name: "Use tuple-section", module: "Text.Pandoc.Readers.EPUB"}
68−- ignore: {name: "Use uncurry", module: "Text.Pandoc.Readers.Docx.Combine"}
21+
22+- ignore:
23+ name: "Monad law, left identity"
24+ within: Text.Pandoc.App.OutputSettings
25+
26+- ignore:
27+ name: "Move brackets to avoid $"
28+ within: Text.Pandoc.Writers.CslJson
29+
30+- ignore:
31+ name: "Redundant <$>"
32+ within:
33+ - Text.Pandoc.Readers.Docx.Parse
34+ - Text.Pandoc.Writers.MediaWiki
35+ - Text.Pandoc.Writers.OpenDocument
36+ - Text.Pandoc.Writers.Powerpoint.Output
37+ - Text.Pandoc.Writers.Powerpoint.Presentation
38+
39+- ignore:
40+ name: "Redundant return"
41+ within: Text.Pandoc.Citeproc.BibTeX
42+
43+# With recent hlint this rule has given false positives on TH
44+- ignore:
45+ name: "Redundant bracket"
46+
47+
6948- ignore:
7049 name: "Use <$>"
7150 within:
7251 - Text.Pandoc.Readers.LaTeX
7352 - Text.Pandoc.Readers.Markdown
53+
7454- ignore:
7555 name: "Use camelCase"
7656 within:
57+ - Tests.Writers.Docbook
58+ - Tests.Writers.Native
59+ - Text.Pandoc.Citeproc
7760 - Text.Pandoc.Extensions
78− - Text.Pandoc.Lua.Marshalling.Version
61+ - Text.Pandoc.Lua.Marshaling.Version
62+ - Text.Pandoc.Lua.Module.Pandoc
63+ - Text.Pandoc.Lua.Module.Utils
7964 - Text.Pandoc.Readers.Odt.ContentReader
8065 - Text.Pandoc.Readers.Odt.Namespaces
8166
67+- ignore:
68+ name: "Use forM_"
69+ within:
70+ - Text.Pandoc.Readers.DocBook
71+
72+- ignore:
73+ name: "Use Just"
74+ within:
75+ - Text.Pandoc.Citeproc.MetaValue
76+ - Text.Pandoc.Readers.Odt.ContentReader
77+ - Text.Pandoc.Writers.Roff
78+
79+- ignore:
80+ name: "Use list comprehension"
81+ within: Text.Pandoc.Citeproc.BibTeX
82+
83+- ignore:
84+ name: "Use list literal pattern"
85+ within: Text.Pandoc.Citeproc.MetaValue
86+
87+# TODO: check
88+- ignore:
89+ name: "Use second"
90+ within:
91+ - Text.Pandoc.Citeproc.BibTeX
92+ - Text.Pandoc.Citeproc.Locator
93+
94+# TODO: check
95+- ignore:
96+ name: "Use sortOn"
97+ within: Text.Pandoc.Writers.OpenDocument
98+
99+- ignore:
100+ name: "Use tuple-section"
101+ within:
102+ - Text.Pandoc.Readers.EPUB
103+ - Text.Pandoc.ImageSize
104+ - Text.Pandoc.Readers.Markdown
105+ - Text.Pandoc.Readers.RST
106+
107+# fromRight is only in base >= 4.10
108+- ignore:
109+ name: "Use fromRight"
110+
82111# Define some custom infix operators
83112# - fixity: infixr 3 ~^#^~
AUTHORS.md+42
@@ -1,11 +1,13 @@
11# Contributors
22
33- Anabra
4+- Aner Lucero
45- Arata Mizuki
56- Arfon Smith
67- Aaron Wolen
78- Albert Krewinkel
89- Alex Ivkin
10+- Alex Toldaiev
911- Alex Vong
1012- Alexander Kondratskiy
1113- Alexander Krotov
@@ -17,6 +19,8 @@
1719- Anders Waldenborg
1820- Andreas Lööw
1921- Andrew Dunning
22+- Andy Morris
23+- Anti-Distinctlyminty
2024- Antoine Latter
2125- Antonio Terceiro
2226- Arata Mizuki
@@ -31,6 +35,8 @@
3135- Beni Cherniavsky-Paskin
3236- Benoit Schweblin
3337- Bjorn Buckwalter
38+- Blake Eryx
39+- Bodigrim
3440- Bradley Kuhn
3541- Brent Yorgey
3642- Brian Leung
@@ -41,6 +47,7 @@
4147- Carlos Sosa
4248- Cécile Chemin
4349- Cédric Couralet
50+- Charanjit Singh
4451- Chris Black
4552- Christian Conkle
4653- Christian Despres
@@ -58,16 +65,23 @@
5865- Daniele D'Orazio
5966- David A Roberts
6067- David Lazar
68+- David Martschenko
6169- David Röthlisberger
6270- Denis Laxalde
6371- Denis Maier
6472- Derek Chen-Becker
73+- Diego Balseiro
74+- Dimitri Sabadie
6575- Dmitry Pogodin
76+- Dmitry Volodin
6677- Douglas Calvert
6778- Eigil Rischel
6879- Emanuel Evans
80+- Emerson Harkin
81+- Emily Bourke
6982- Emily Eisenberg
7083- Eric Kow
84+- Erik Rask
7185- Eric Seidel
7286- Eric Schrijver
7387- Ethan Riley
@@ -77,6 +91,7 @@
7791- Florian Beeres
7892- Florian Eitel
7993- Florian Klink
94+- Florian Kohrt
8095- Francesco Occhipinti
8196- François Gannaz
8297- Frederik Elwert
@@ -99,6 +114,7 @@
99114- Hubert Plociniczak
100115- Ian Max Andolina
101116- Igor Khorlo
117+- Igor Pashev
102118- Ilya V. Portnov
103119- Ivan Trubach
104120- Ivo Clarysse
@@ -112,6 +128,7 @@
112128- Jamie F. Olson
113129- Jan Larres
114130- Jan Schulz
131+- Jan Tojnar
115132- Jan-Otto Kröpke
116133- Jason Ronallo
117134- Jeff Arnold
@@ -119,6 +136,7 @@
119136- Jens Getreu
120137- Jens Petersen
121138- Jeroen de Haas
139+- Jerry Sky
122140- Jesse Rosenthal
123141- Joe Hermaszewski
124142- Joe Hillenbrand
@@ -134,6 +152,7 @@
134152- Josef Svenningsson
135153- Joseph C. Sible
136154- Julien Cretel
155+- Julien Dutant
137156- Juliette Fourcot
138157- Juliusz Gonera
139158- Justin Bogner
@@ -149,7 +168,10 @@
149168- Lars-Dominik Braun
150169- Laurent P. René de Cotret
151170- Leif Metcalf
171+- Leonard Rosenthol
152172- Lila
173+- Loïc Grobol
174+- Lorenzo
153175- Lucas Escot
154176- Luke Plant
155177- Marc Schreiber
@@ -172,6 +194,7 @@
172194- Merijn Verstraaten
173195- Michael Beaumont
174196- Michael Chladek
197+- Michael Hoffmann
175198- Michael Peyton Jones
176199- Michael Reed
177200- Michael Snoyman
@@ -182,10 +205,12 @@
182205- Nathan Gass
183206- Neil Mayhew
184207- Nick Bart
208+- Nick Berendsen
185209- Nick Fleisher
186210- Nicolas Kaiser
187211- Nikolay Yakimov
188212- Nils Carlson
213+- Nixon Enraght-Moony
189214- Nokome Bentley
190215- Ole Martin Ruud
191216- Oliver Matthews
@@ -210,6 +235,7 @@
210235- Raymond Ehlers
211236- Recai Oktaş
212237- Roland Hieber
238+- Roman Beránek
213239- RyanGlScott
214240- Salim B
215241- Sascha Wilde
@@ -220,12 +246,14 @@
220246- Shahbaz Youssefi
221247- Shaun Attfield
222248- Shim Myeongseob
249+- Shin Sang-jae
223250- Sidarth Kapur
224251- Sidharth Kapur
225252- Simon Hengel
226253- Stefan Dresselhaus
227254- Sumit Sahrawat
228255- Tarik Graba
256+- Tatiana Porras
229257- Thenaesh Elango
230258- Thomas Hodgson
231259- Thomas Weißschuh
@@ -256,22 +284,30 @@
256284- Yoan Blanc
257285- Yuchen Pei
258286- Zihang Chen
287+- a-vrma
259288- andrebauer
289+- argent0
290+- badumont
260291- blmage
261292- bucklereed
262293- bumper314
263294- chinapedia
295+- cholonam
264296- csforste
265297- dbecher-ito
266298- d-dorazio
267299- ebiim
300+- favonia
268301- infinity0x
269302- jeongminkim-islab
270303- kaizshang91
271304- lux-lth
272305- lwolfsonkin
306+- mbrackeantidot
273307- nkalvi
274308- niszet
309+- nuew
310+- obcat
275311- oltolm
276312- oquechy
277313- quasicomputational
@@ -282,7 +318,13 @@
282318- rski
283319- shreevatsa.public
284320- takahashim
321+- taotieren
322+- tecosaur
323+- TEC
285324- tgkokk
325+- the-solipsist
326+- timo-a
286327- thsutton
287328- vijayphoenix
288329- wiefling
330+- wuffi
CONTRIBUTING.md+134−30
@@ -1,6 +1,64 @@
11Contributing to pandoc
22======================
33
4+Welcome to pandoc! Very soon after its beginnings in 2006, pandoc
5+has been influenced, improved, and modified, by users, devs, and
6+newcomers alike. The project thrives on its active community. It is
7+great to have you here.
8+
9+How can I help?
10+---------------
11+
12+There are many ways in which you can support pandoc. Here are a few
13+ideas:
14+
15+ * Participate in online discussions. The [pandoc-discuss] mailing
16+ list is a good place for this. This gives valuable input and
17+ makes it easier to improve the program.
18+
19+ * Help with questions. Every request that is answered by the wider
20+ community frees time for programming contributors. This will
21+ speed up development of new features and issue fixes. Don't
22+ underestimate your knowledge, please share it!
23+
24+ Good places to help are the [pandoc-discuss] mailing list, Q/A
25+ sites like StackOverflow, community forums (e.g.
26+ [RStudio][RStudio Community], [Zettlr][Zettlr Forum]), and, for
27+ technical questions, the GitHub [issue tracker].
28+
29+ * Write or improve documentation. If you ran into a problem which
30+ took more time to figure out than expected, please consider to
31+ save other users from the same experience. People writing the
32+ documentation tend to lack an outside view, so please help
33+ provide one. Good documentation is both difficult and extremely
34+ important.
35+
36+ The official docs are not the only place for documentation.
37+ Pandoc also has a [Wiki][pandoc wiki]. Private blogs can serve
38+ as documentation just as the official manual can.
39+
40+ * Contribute code. No matter whether it's a small fix in a format
41+ template or a huge lump of Haskell code: help is welcome. It's
42+ usually a good idea to talk about the plans early, as this can
43+ prevent unnecessary work. See below for more information.
44+
45+ * Last but not least: consider funding the development and
46+ maintenance of pandoc financially. You can find sponsor buttons
47+ on the [pandoc website] and the [GitHub repository][GitHub
48+ repo].
49+
50+A rich ecosystem of libraries, editors, filters, and templates has
51+developed around pandoc; conversely, pandoc builds and depends on a
52+large number of libraries. Contributing to any of these projects is
53+another way that can help to ensure stability, and to keep pushing
54+the boundaries of what is possible with pandoc.
55+
56+[RStudio Community]: https://community.rstudio.com/
57+[Zettlr Forum]: https://forum.zettlr.com/
58+[pandoc wiki]: https://github.com/jgm/pandoc/wiki
59+[pandoc website]: https://pandoc.org
60+[GitHub repo]: https://github.com/jgm/pandoc
61+
462Have a question?
563----------------
664
@@ -10,15 +68,21 @@ Ask on [pandoc-discuss].
1068Found a bug?
1169------------
1270
13−Bug reports are welcome! Please report all bugs on pandoc's github
71+Bug reports are welcome! Please report all bugs on pandoc's GitHub
1472[issue tracker].
1573
1674Before you submit a bug report, search the [open issues] *and* [closed issues]
1775to make sure the issue hasn't come up before. Also, check the [User's Guide] and
1876[FAQs] for anything relevant.
1977
20−Make sure you can reproduce the bug with the [latest released version] of pandoc
21−(or, even better, the [development version]).
78+Make sure you can reproduce the bug with the [latest released
79+version] of pandoc---or, even better, the development version,
80+since the bug may have been fixed since the last release.
81+[Nightly builds] are available, so you don't need to compile
82+from source to test against the development version.
83+(To fetch a nightly, visit the link, click the topmost "Nightly"
84+in the table, then choose your platform under "Artifacts." Note
85+that you must be logged in with a GitHub account.)
2286
2387Your report should give detailed, *reproducible* instructions, including
2488
@@ -99,7 +163,12 @@ Explain the rationale for the feature you're requesting. Why would this
99163feature be useful? Consider also any possible drawbacks, including backwards
100164compatibility, new library dependencies, and performance issues.
101165
102−It is best to discuss a potential new feature on [pandoc-discuss]
166+Features are very rarely "implement and forget", as all code must be
167+maintained. This is especially relevant for large or complex
168+contributions. It is helpful to be sympathetic to that fact, and to
169+communicate future plans and availability clearly.
170+
171+Any potential new feature is best discussed on [pandoc-discuss]
103172before opening an issue.
104173
105174Patches and pull requests
@@ -146,7 +215,7 @@ Please follow these guidelines:
146215
14721610. We aim for compatibility with ghc versions from 8.0 to the
148217 latest release. All pull requests and commits are tested
149− automatically on CircleCI.
218+ automatically on GitHub Actions.
150219
151220Tests
152221-----
@@ -175,9 +244,16 @@ Or with stack:
175244
176245 stack test --test-arguments='-p markdown'
177246
178−It is often helpful to add `-j4` (run tests in parallel)
179−and `--hide-successes` (don't clutter output with successes)
180−to the test arguments as well.
247+It is often helpful to add `-j4` (run tests in parallel) and
248+`--hide-successes` (don't clutter output with successes) to the test
249+arguments as well. Collecting all options in a `cabal.project.local`
250+file in the project's root directory can help to keep `cabal`
251+commands short. E.g.:
252+
253+ flags: +embed_data_files
254+ tests: True
255+ test-show-details: direct
256+ test-options: -j4 --hide-successes
181257
182258If you add a new feature to pandoc, please add tests as well, following
183259the pattern of the existing tests. The test suite code is in
@@ -200,6 +276,35 @@ or Powerpoint to ensure that they weren't corrupted and that
200276they had the expected result, and mention the Word/Powerpoint
201277version and OS in your commit comment.
202278
279+Code style
280+----------
281+
282+Pandoc uses [hlint] to identify opportunities for code improvements
283+like redundant brackets or unnecessary `Language` extensions.
284+However, sometimes there are cases where there are good reasons to
285+use code different from what hlint proposes. In these cases, the
286+respective warning should be disabled in the file `.hlint.yaml`.
287+
288+There should be no errors when running `hlint .`; this is checked by
289+the continuous integration (CI) setup. It is recommended that
290+contributors check their code with a local hlint installation, but
291+relying on the CI is fine, too.
292+
293+A good way to ensure no new warnings are introduced is to use a Git
294+[pre-commit hook] which runs hlint on all updated Haskell files
295+before creating a commit:
296+
297+ #!/bin/sh
298+ git diff --diff-filter=MA --cached --name-only | grep '\.hs$' | \
299+ xargs hlint --hint .hlint.yaml
300+
301+(If you are using GNU `xargs`, add the `-r` option immediately
302+after `xargs`.)
303+
304+Saving this to `.git/hooks/pre-commit`, and making the script
305+executable, will prevent accidental introduction of potentially
306+problematic code.
307+
203308Benchmarks
204309----------
205310
@@ -213,9 +318,6 @@ With stack:
213318
214319 stack bench
215320
216−You can also build `weigh-pandoc` (`stack build pandoc:weigh-pandoc`)
217−to get some statistics on memory usage. (Eventually this should
218−be incorporated into the benchmark suite.)
219321
220322Using the REPL
221323--------------
@@ -227,10 +329,10 @@ a ghci REPL for working with pandoc. With [stack], use
227329We recommend using the following `.ghci` file (which can be
228330placed in the source directory):
229331
230− :set -fobject-code
231− :set -XTypeSynonymInstances
232− :set -XScopedTypeVariables
233− :set -XOverloadedStrings
332+ :set -fobject-code
333+ :set -XTypeSynonymInstances
334+ :set -XScopedTypeVariables
335+ :set -XOverloadedStrings
234336
235337Profiling
236338---------
@@ -274,7 +376,7 @@ The code
274376--------
275377
276378Pandoc has a publicly accessible git repository on
277−github: <http://github.com/jgm/pandoc>. To get a local copy of the source:
379+GitHub: <https://github.com/jgm/pandoc>. To get a local copy of the source:
278380
279381 git clone https://github.com/jgm/pandoc.git
280382
@@ -284,7 +386,7 @@ the pandoc library is in `src/`, the source for the tests is in
284386
285387The modules `Text.Pandoc.Definition`, `Text.Pandoc.Builder`, and
286388`Text.Pandoc.Generic` are in a separate library `pandoc-types`. The code can
287−be found in <http://github.com/jgm/pandoc-types>.
389+be found in <https://github.com/jgm/pandoc-types>.
288390
289391To build pandoc, you will need a working installation of the
290392[Haskell platform].
@@ -304,11 +406,11 @@ The library is structured as follows:
304406 tree automatically.
305407 - `Text.Pandoc.Readers.*` are the readers, and `Text.Pandoc.Writers.*`
306408 are the writers.
307− - `Text.Pandoc.Biblio` is a utility module for formatting citations
308− using citeproc-hs.
409+ - `Text.Pandoc.Citeproc.*` contain the code for citation handling,
410+ including an interface to the [citeproc] library.
309411 - `Text.Pandoc.Data` is used to embed data files when the `embed_data_files`
310− cabal flag is used. It is generated from `src/Text/Pandoc/Data.hsb` using
311− the preprocessor [hsb2hs].
412+ cabal flag is used.
413+ - `Text.Pandoc.Emoji` is a thin wrapper around [emojis].
312414 - `Text.Pandoc.Highlighting` contains the interface to the
313415 skylighting library, which is used for code syntax highlighting.
314416 - `Text.Pandoc.ImageSize` is a utility module containing functions for
@@ -319,7 +421,6 @@ The library is structured as follows:
319421 - `Text.Pandoc.PDF` contains functions for producing a PDF from a
320422 LaTeX source.
321423 - `Text.Pandoc.Parsing` contains parsing functions used in multiple readers.
322− - `Text.Pandoc.Pretty` is a pretty-printing library specialized to
323424 the needs of pandoc.
324425 - `Text.Pandoc.SelfContained` contains functions for making an HTML
325426 file "self-contained," by importing remotely linked images, CSS,
@@ -346,14 +447,18 @@ you may want to consider submitting a pull request to the
346447[open issues]: https://github.com/jgm/pandoc/issues
347448[closed issues]: https://github.com/jgm/pandoc/issues?q=is%3Aissue+is%3Aclosed
348449[latest released version]: https://github.com/jgm/pandoc/releases/latest
349−[development version]: https://github.com/pandoc-extras/pandoc-nightly/releases/latest
350−[pandoc-discuss]: http://groups.google.com/group/pandoc-discuss
450+[Nightly builds]: https://github.com/jgm/pandoc/actions?query=workflow%3ANightly
451+[pandoc-discuss]: https://groups.google.com/group/pandoc-discuss
351452[issue tracker]: https://github.com/jgm/pandoc/issues
352−[User's Guide]: http://pandoc.org/MANUAL.html
353−[FAQs]: http://pandoc.org/faqs.html
354−[EditorConfig]: http://editorconfig.org/
355−[Haskell platform]: http://www.haskell.org/platform/
356−[hsb2hs]: http://hackage.haskell.org/package/hsb2hs
453+[User's Guide]: https://pandoc.org/MANUAL.html
454+[FAQs]: https://pandoc.org/faqs.html
455+[EditorConfig]: https://editorconfig.org/
456+[Haskell platform]: https://www.haskell.org/platform/
457+[hlint]: https://hackage.haskell.org/package/hlint
458+[citeproc]: https://hackage.haskell.org/package/citeproc
459+[emojis]: https://hackage.haskell.org/package/emojis
460+[hsb2hs]: https://hackage.haskell.org/package/hsb2hs
461+[pre-commit hook]: https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks
357462[GitHub labels]: https://github.com/jgm/pandoc/labels
358463[good first issue]:https://github.com/jgm/pandoc/labels/good%20first%20issue
359464[enhancement]: https://github.com/jgm/pandoc/labels/enhancement
@@ -368,4 +473,3 @@ you may want to consider submitting a pull request to the
368473[status:more-discussion-needed]: https://github.com/jgm/pandoc/labels/status:more-discussion-needed
369474[status:more-info-needed]: https://github.com/jgm/pandoc/labels/status:more-info-needed
370475[stack]: https://github.com/commercialhaskell/stack
371−
COPYING.md+1−1
@@ -357,5 +357,5 @@ into proprietary programs. If your program is a subroutine library,
357357you may consider it more useful to permit linking proprietary
358358applications with the library. If this is what you want to do, use the
359359[GNU Lesser General Public
360−License](http://www.gnu.org/licenses/lgpl.html) instead of this
360+License](https://www.gnu.org/licenses/lgpl.html) instead of this
361361License.
COPYRIGHT+17−26
@@ -1,5 +1,5 @@
11Pandoc
2−Copyright (C) 2006-2020 John MacFarlane <jgm at berkeley dot edu>
2+Copyright (C) 2006-2021 John MacFarlane <jgm at berkeley dot edu>
33
44With the exceptions noted below, this code is released under the [GPL],
55version 2 or later:
@@ -22,11 +22,11 @@ The GNU General Public License is available in the file COPYING.md in
2222the source distribution. On Debian systems, the complete text of the
2323GPL can be found in `/usr/share/common-licenses/GPL`.
2424
25−[GPL]: http://www.gnu.org/copyleft/gpl.html
25+[GPL]: https://www.gnu.org/copyleft/gpl.html
2626
2727Pandoc's complete source code is available from the [Pandoc home page].
2828
29−[Pandoc home page]: http://pandoc.org
29+[Pandoc home page]: https://pandoc.org
3030
3131Pandoc includes some code with different copyrights, or subject to different
3232licenses. The copyright and license statements for these sources are included
@@ -37,7 +37,7 @@ The modules in the `pandoc-types` repository (Text.Pandoc.Definition,
3737Text.Pandoc.Builder, Text.Pandoc.Generics, Text.Pandoc.JSON,
3838Text.Pandoc.Walk) are licensed under the BSD 3-clause license:
3939
40−Copyright (c) 2006-2020, John MacFarlane
40+Copyright (c) 2006-2021, John MacFarlane
4141
4242All rights reserved.
4343
@@ -73,7 +73,7 @@ Pandoc's templates (in `data/templates`) are dual-licensed as either
7373GPL (v2 or higher, same as pandoc) or (at your option) the BSD
74743-clause license.
7575
76−Copyright (c) 2014--2020, John MacFarlane
76+Copyright (c) 2014--2021, John MacFarlane
7777
7878----------------------------------------------------------------------
7979src/Text/Pandoc/Writers/Muse.hs
@@ -83,19 +83,19 @@ Released under the GNU General Public License version 2 or later.
8383
8484----------------------------------------------------------------------
8585src/Text/Pandoc/Writers/Texinfo.hs
86−Copyright (C) 2008-2020 John MacFarlane and Peter Wang
86+Copyright (C) 2008-2021 John MacFarlane and Peter Wang
8787
8888Released under the GNU General Public License version 2 or later.
8989
9090----------------------------------------------------------------------
9191src/Text/Pandoc/Writers/OpenDocument.hs
92−Copyright (C) 2008-2020 Andrea Rossato and John MacFarlane
92+Copyright (C) 2008-2021 Andrea Rossato and John MacFarlane
9393
9494Released under the GNU General Public License version 2 or later.
9595
9696----------------------------------------------------------------------
9797src/Text/Pandoc/Writers/Org.hs
98−Copyright (C) 2010-2020 Puneeth Chaganti, John MacFarlane, and
98+Copyright (C) 2010-2021 Puneeth Chaganti, John MacFarlane, and
9999 Albert Krewinkel
100100
101101Released under the GNU General Public License version 2 or later.
@@ -115,7 +115,7 @@ Released under the GNU General Public License version 2 or later.
115115
116116----------------------------------------------------------------------
117117src/Text/Pandoc/Readers/Textile.hs
118−Copyright (C) 2010-2020 Paul Rivier and John MacFarlane
118+Copyright (C) 2010-2021 Paul Rivier and John MacFarlane
119119
120120Released under the GNU General Public License version 2 or later.
121121
@@ -133,7 +133,7 @@ Released under the GNU General Public License version 2 or later.
133133
134134----------------------------------------------------------------------
135135src/Text/Pandoc/Readers/EPUB.hs
136−Copyright (C) 2014-2020 Matthew Pickering and John MacFarlane
136+Copyright (C) 2014-2021 Matthew Pickering and John MacFarlane
137137
138138Released under the GNU General Public License version 2 or later.
139139
@@ -141,7 +141,7 @@ Released under the GNU General Public License version 2 or later.
141141src/Text/Pandoc/Readers/Org.hs
142142src/Text/Pandoc/Readers/Org/*
143143test/Tests/Readers/Org/*
144−Copyright (C) 2014-2020 Albert Krewinkel
144+Copyright (C) 2014-2021 Albert Krewinkel
145145
146146Released under the GNU General Public License version 2 or later.
147147
@@ -149,7 +149,7 @@ Released under the GNU General Public License version 2 or later.
149149src/Text/Pandoc/Lua.hs
150150src/Text/Pandoc/Lua/*
151151test/lua/*
152−Copyright (C) 2017--2020 Albert Krewinkel and John MacFarlane
152+Copyright (C) 2017--2021 Albert Krewinkel and John MacFarlane
153153
154154Released under the GNU General Public License version 2 or later.
155155
@@ -157,7 +157,7 @@ Released under the GNU General Public License version 2 or later.
157157src/Text/Pandoc/Readers/Jira.hs
158158src/Text/Pandoc/Writers/Jira.hs
159159test/Tests/Readers/Jira.hs
160−Copyright (C) 2019--2020 Albert Krewinkel
160+Copyright (C) 2019--2021 Albert Krewinkel
161161
162162Released under the GNU General Public License version 2 or later.
163163
@@ -169,21 +169,21 @@ Released under the GNU General Public License version 2 or later.
169169
170170----------------------------------------------------------------------
171171data/pandoc.lua
172−Copyright (C) 2017-2020 Albert Krewinkel
172+Copyright (C) 2017-2021 Albert Krewinkel
173173
174174Released under the GNU General Public License version 2 or later.
175175
176176----------------------------------------------------------------------
177177The dzslides template contains JavaScript and CSS from Paul Rouget's
178178dzslides template.
179−http://github.com/paulrouget/dzslides
179+https://github.com/paulrouget/dzslides
180180
181181Released under the Do What the Fuck You Want To Public License.
182182
183183------------------------------------------------------------------------
184−Pandoc embeds a lua interpreter (via hslua).
184+Pandoc embeds a Lua interpreter (via hslua).
185185
186−Copyright © 1994–2019 Lua.org, PUC-Rio.
186+Copyright © 1994–2020 Lua.org, PUC-Rio.
187187
188188Permission is hereby granted, free of charge, to any person obtaining
189189a copy of this software and associated documentation files (the
@@ -203,12 +203,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
203203LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
204204OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
205205WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
206−
207−------------------------------------------------------------------------
208−The template pandoc.jats is Copyright 2013--2015 Martin Fenner,
209−released under GPL version 2 or later.
210−
211−The file data/jats.csl is derived from a csl file by Martin Fenner,
212−revised by Martin Paul Eve and then John MacFarlane.
213−"This work is licensed under a Creative Commons Attribution-ShareAlike 3.0
214−License. Originally by Martin Fenner."
INSTALL.md+27−38
@@ -34,6 +34,10 @@ without SVG support), [Python] (to use Pandoc filters), and
3434
3535 choco install rsvg-convert python miktex
3636
37+Using multiple installation methods can result in two separate
38+installations of pandoc; it is recommended to properly uninstall
39+pandoc before switching to an alternative installation method.
40+
3741By default, Pandoc creates PDFs using LaTeX.
3842We recommend installing it via [MiKTeX].
3943
@@ -45,14 +49,10 @@ by downloading [this script][uninstaller]
4549and running it with `perl uninstall-pandoc.pl`.
4650
4751Alternatively, you can install pandoc using
48−[Homebrew](http://brew.sh):
52+[Homebrew](https://brew.sh):
4953
5054 brew install pandoc
5155
52−To include pandoc's citation parser:
53−
54− brew install pandoc-citeproc
55−
5656Homebrew can also install other software that integrates with Pandoc.
5757For example, to install [librsvg] (its `rsvg-convert` covers formats
5858without SVG support), [Python] (to use Pandoc filters), and
@@ -86,9 +86,8 @@ not outdated. Pandoc is in the [Debian], [Ubuntu], [Slackware],
8686To get the latest release, we provide a binary package for amd64
8787architecture on the **[download page]**.
8888
89−This provides both `pandoc` and `pandoc-citeproc`.
90−The executables are statically linked and
91−have no dynamic dependencies or dependencies on external
89+The executable is statically linked and
90+has no dynamic dependencies or dependencies on external
9291data files. Note: because of the static
9392linking, the pandoc binary from this package cannot use lua
9493filters that require external lua modules written in C.
@@ -98,8 +97,7 @@ Both a tarball and a deb installer are provided. To install the deb:
9897 sudo dpkg -i $DEB
9998
10099where `$DEB` is the path to the downloaded deb. This will
101−install the `pandoc` and `pandoc-citeproc` executables and
102−man pages.
100+install the `pandoc` executable and man page.
103101
104102If you use an RPM-based distro, you may be able to install
105103the deb from our download page using `alien`.
@@ -122,7 +120,7 @@ package repositories. For example, on Debian/Ubuntu,
122120you can install it with `apt-get install haskell-platform`.
123121
124122For PDF output, you'll need LaTeX. We recommend installing
125−[TeX Live](http://www.tug.org/texlive/) via your package
123+[TeX Live](https://www.tug.org/texlive/) via your package
126124manager. (On Debian/Ubuntu, `apt-get install texlive`.)
127125
128126## Chrome OS
@@ -149,7 +147,7 @@ The official Docker images for pandoc can be found at
149147[dockerhub](https://hub.docker.com/).
150148
151149The [pandoc/core](https://hub.docker.com/r/pandoc/core)
152−image contains `pandoc` and `pandoc-citeproc`.
150+image contains `pandoc`.
153151
154152The [pandoc/latex](https://hub.docker.com/r/pandoc/latex)
155153image also contains the minimal LaTeX installation needed
@@ -244,28 +242,22 @@ The easiest way to build pandoc from source is to use [stack][stack]:
244242
245243 pandoc --help
246244
247− [Not sure where `$CABALDIR` is?](http://www.haskell.org/haskellwiki/Cabal-Install#The_cabal-install_configuration_file)
245+ [Not sure where `$CABALDIR` is?](https://wiki.haskell.org/Cabal-Install#The_cabal-install_configuration_file)
248246
249−5. If you want to process citations with pandoc, you will also need to
250− install a separate package, `pandoc-citeproc`. This can be installed
251− using cabal:
252−
253− cabal install pandoc-citeproc
254−
255− By default `pandoc-citeproc` uses the "i;unicode-casemap" method
247+5. By default `pandoc` uses the "i;unicode-casemap" method
256248 to sort bibliography entries (RFC 5051). If you would like to
257249 use the locale-sensitive unicode collation algorithm instead,
258− specify the `unicode_collation` flag:
250+ specify the `icu` flag (which affects the dependency `citeproc`):
259251
260− cabal install pandoc-citeproc -funicode_collation
252+ cabal install pandoc -ficu
261253
262254 Note that this requires the `text-icu` library, which in turn
263255 depends on the C library `icu4c`. Installation directions
264256 vary by platform. Here is how it might work on macOS with Homebrew:
265257
266258 brew install icu4c
267− stack install pandoc-citeproc \
268− --flag "pandoc-citeproc:unicode_collation" \
259+ stack install pandoc \
260+ --flag "citeproc:icu" \
269261 --extra-lib-dirs=/usr/local/opt/icu4c/lib \
270262 --extra-include-dirs=/usr/local/opt/icu4c/include
271263
@@ -274,8 +266,6 @@ The easiest way to build pandoc from source is to use [stack][stack]:
274266 accordingly. If `MANUAL.txt` has been modified, the man page can be
275267 rebuilt: `make man/pandoc.1`.
276268
277− The `pandoc-citeproc.1` man page will also be installed automatically.
278−
279269
280270### Custom cabal method
281271
@@ -397,30 +387,29 @@ To run just the markdown benchmarks:
397387
398388
399389[Arch]: https://www.archlinux.org/packages/community/x86_64/pandoc/
400−[Cabal User's Guide]: http://www.haskell.org/cabal/release/latest/doc/users-guide/builders.html#setup-configure-paths
390+[Cabal User's Guide]: https://cabal.readthedocs.io/
401391[Debian]: https://packages.debian.org/pandoc
402392[Fedora]: https://apps.fedoraproject.org/packages/pandoc
403−[FreeBSD ports]: http://www.freshports.org/textproc/hs-pandoc/
404−[GHC]: http://www.haskell.org/ghc/
405−[GPL]: http://www.gnu.org/copyleft/gpl.html
406−[Haskell platform]: http://hackage.haskell.org/platform/
407−[MacPorts]: http://trac.macports.org/browser/trunk/dports/textproc/pandoc/Portfile
393+[FreeBSD ports]: https://www.freshports.org/textproc/hs-pandoc/
394+[GHC]: https://www.haskell.org/ghc/
395+[Haskell platform]: https://hackage.haskell.org/platform/
396+[MacPorts]: https://trac.macports.org/browser/trunk/dports/textproc/pandoc/Portfile
408397[MacTeX]: https://tug.org/mactex/
409−[BasicTeX]: http://www.tug.org/mactex/morepackages.html
398+[BasicTeX]: https://www.tug.org/mactex/morepackages.html
410399[LaTeX]: https://www.latex-project.org
411−[MiKTeX]: http://miktex.org/
400+[MiKTeX]: https://miktex.org/
412401[librsvg]: https://wiki.gnome.org/Projects/LibRsvg
413402[Python]: https://www.python.org
414−[NetBSD]: http://pkgsrc.se/wip/pandoc
403+[NetBSD]: https://pkgsrc.se/wip/pandoc
415404[NixOS]: https://nixos.org/nixos/packages.html
416405[Slackware]: https://www.slackbuilds.org/result/?search=pandoc&sv=
417406[Ubuntu]: https://packages.ubuntu.com/pandoc
418407[download page]: https://github.com/jgm/pandoc/releases/latest
419−[gentoo]: http://packages.gentoo.org/package/app-text/pandoc
408+[gentoo]: https://packages.gentoo.org/package/app-text/pandoc
420409[haskell repository]: https://wiki.archlinux.org/index.php/Haskell_Package_Guidelines#.5Bhaskell.5D
421410[openSUSE]: https://software.opensuse.org/package/pandoc
422−[source tarball]: http://hackage.haskell.org/package/pandoc
411+[source tarball]: https://hackage.haskell.org/package/pandoc
423412[stack]: https://docs.haskellstack.org/en/stable/install_and_upgrade.html
424−[cabal-install]: http://hackage.haskell.org/package/cabal-install
413+[cabal-install]: https://hackage.haskell.org/package/cabal-install
425414[Void]: https://voidlinux.org/
426415[uninstaller]: https://raw.githubusercontent.com/jgm/pandoc/master/macos/uninstall-pandoc.pl
MANUAL.txt+1034−498
@@ -1,7 +1,7 @@
11---
22title: Pandoc User's Guide
33author: John MacFarlane
4−date: June 29, 2020
4+date: June 20, 2021
55---
66
77# Synopsis
@@ -136,22 +136,22 @@ to output the generated LaTeX. You can then test it with `pdflatex test.tex`.
136136When using LaTeX, the following packages need to be available
137137(they are included with all recent versions of [TeX Live]):
138138[`amsfonts`], [`amsmath`], [`lm`], [`unicode-math`],
139−[`ifxetex`], [`ifluatex`], [`listings`] (if the
139+[`iftex`], [`listings`] (if the
140140`--listings` option is used), [`fancyvrb`], [`longtable`],
141141[`booktabs`], [`graphicx`] (if the document
142142contains images), [`hyperref`], [`xcolor`],
143143[`ulem`], [`geometry`] (with the `geometry` variable set),
144144[`setspace`] (with `linestretch`), and
145145[`babel`] (with `lang`). The use of `xelatex` or `lualatex` as
146−the PDF engine requires [`fontspec`]. `xelatex` uses
147−[`polyglossia`] (with `lang`), [`xecjk`], and [`bidi`] (with the
148−`dir` variable set). If the `mathspec` variable is set,
149−`xelatex` will use [`mathspec`] instead of [`unicode-math`].
150−The [`upquote`] and [`microtype`] packages are used if
151−available, and [`csquotes`] will be used for [typography]
152−if the `csquotes` variable or metadata field is set to a
153−true value. The [`natbib`], [`biblatex`], [`bibtex`], and
154−[`biber`] packages can optionally be used for [citation
146+the PDF engine requires [`fontspec`]. `lualatex` uses
147+[`selnolig`]. `xelatex` uses [`polyglossia`] (with `lang`),
148+[`xecjk`], and [`bidi`] (with the `dir` variable set). If the
149+`mathspec` variable is set, `xelatex` will use [`mathspec`]
150+instead of [`unicode-math`]. The [`upquote`] and [`microtype`]
151+packages are used if available, and [`csquotes`] will be used
152+for [typography] if the `csquotes` variable or metadata field is
153+set to a true value. The [`natbib`], [`biblatex`], [`bibtex`],
154+and [`biber`] packages can optionally be used for [citation
155155rendering]. The following packages will be used to improve
156156output quality if present, but pandoc does not require them to
157157be present: [`upquote`] (for straight quotes in verbatim
@@ -180,8 +180,7 @@ footnotes in tables).
180180[`graphicx`]: https://ctan.org/pkg/graphicx
181181[`grffile`]: https://ctan.org/pkg/grffile
182182[`hyperref`]: https://ctan.org/pkg/hyperref
183−[`ifluatex`]: https://ctan.org/pkg/ifluatex
184−[`ifxetex`]: https://ctan.org/pkg/ifxetex
183+[`iftex`]: https://ctan.org/pkg/iftex
185184[`listings`]: https://ctan.org/pkg/listings
186185[`lm`]: https://ctan.org/pkg/lm
187186[`longtable`]: https://ctan.org/pkg/longtable
@@ -200,6 +199,7 @@ footnotes in tables).
200199[`xcolor`]: https://ctan.org/pkg/xcolor
201200[`xecjk`]: https://ctan.org/pkg/xecjk
202201[`xurl`]: https://ctan.org/pkg/xurl
202+[`selnolig`]: https://ctan.org/pkg/selnolig
203203
204204
205205
@@ -225,8 +225,12 @@ header when requesting a document from a URL:
225225: Specify input format. *FORMAT* can be:
226226
227227 ::: {#input-formats}
228+ - `bibtex` ([BibTeX] bibliography)
229+ - `biblatex` ([BibLaTeX] bibliography)
228230 - `commonmark` ([CommonMark] Markdown)
231+ - `commonmark_x` ([CommonMark] Markdown with extensions)
229232 - `creole` ([Creole 1.0])
233+ - `csljson` ([CSL JSON] bibliography)
230234 - `csv` ([CSV] table)
231235 - `docbook` ([DocBook])
232236 - `docx` ([Word docx])
@@ -276,8 +280,12 @@ header when requesting a document from a URL:
276280 ::: {#output-formats}
277281 - `asciidoc` ([AsciiDoc]) or `asciidoctor` ([AsciiDoctor])
278282 - `beamer` ([LaTeX beamer][`beamer`] slide show)
283+ - `bibtex` ([BibTeX] bibliography)
284+ - `biblatex` ([BibLaTeX] bibliography)
279285 - `commonmark` ([CommonMark] Markdown)
286+ - `commonmark_x` ([CommonMark] Markdown with extensions)
280287 - `context` ([ConTeXt])
288+ - `csljson` ([CSL JSON] bibliography)
281289 - `docbook` or `docbook4` ([DocBook] 4)
282290 - `docbook5` (DocBook 5)
283291 - `docx` ([Word docx])
@@ -353,15 +361,15 @@ header when requesting a document from a URL:
353361 will be used. On \*nix and macOS systems this will be the `pandoc`
354362 subdirectory of the XDG data directory (by default,
355363 `$HOME/.local/share`, overridable by setting the `XDG_DATA_HOME`
356− environment variable). If that directory does not exist,
357− `$HOME/.pandoc` will be used (for backwards compatibility).
358− In Windows the default user data directory is
364+ environment variable). If that directory does not exist and
365+ `$HOME/.pandoc` exists, it will be used (for backwards compatibility).
366+ On Windows the default user data directory is
359367 `C:\Users\USERNAME\AppData\Roaming\pandoc`.
360368 You can find the default user data directory on your system by
361369 looking at the output of `pandoc --version`.
362− A `reference.odt`, `reference.docx`, `epub.css`, `templates`,
363− `slidy`, `slideous`, or `s5` directory
364− placed in this directory will override pandoc's normal defaults.
370+ Data files placed in this directory (for example, `reference.odt`,
371+ `reference.docx`, `epub.css`, `templates`) will override
372+ pandoc's normal defaults.
365373
366374`-d` *FILE*, `--defaults=`*FILE*
367375
@@ -478,7 +486,7 @@ header when requesting a document from a URL:
478486[Emacs Org mode]: https://orgmode.org
479487[AsciiDoc]: https://www.methods.co.nz/asciidoc/
480488[AsciiDoctor]: https://asciidoctor.org/
481−[DZSlides]: http://paulrouget.com/dzslides/
489+[DZSlides]: https://paulrouget.com/dzslides/
482490[Word docx]: https://en.wikipedia.org/wiki/Office_Open_XML
483491[PDF]: https://www.adobe.com/pdf/
484492[reveal.js]: https://revealjs.com/
@@ -489,6 +497,9 @@ header when requesting a document from a URL:
489497[Muse]: https://amusewiki.org/library/manual
490498[PowerPoint]: https://en.wikipedia.org/wiki/Microsoft_PowerPoint
491499[Vimwiki]: https://vimwiki.github.io
500+[CSL JSON]: https://citeproc-js.readthedocs.io/en/latest/csl-json/markup.html
501+[BibTeX]: https://ctan.org/pkg/bibtex
502+[BibLaTeX]: https://ctan.org/pkg/biblatex
492503
493504## Reader options {.options}
494505
@@ -578,13 +589,13 @@ header when requesting a document from a URL:
578589
579590 3. `$PATH` (executable only)
580591
581− Filters and Lua-filters are applied in the order specified
582− on the command line.
592+ Filters, Lua-filters, and citeproc processing are applied in
593+ the order specified on the command line.
583594
584595`-L` *SCRIPT*, `--lua-filter=`*SCRIPT*
585596
586597: Transform the document in a similar fashion as JSON filters (see
587− `--filter`), but use pandoc's build-in Lua filtering system. The given
598+ `--filter`), but use pandoc's built-in Lua filtering system. The given
588599 Lua script is expected to return a list of Lua filters which will be
589600 applied in order. Each Lua filter must contain element-transforming
590601 functions indexed by the name of the AST element on which the filter
@@ -593,26 +604,17 @@ header when requesting a document from a URL:
593604 The `pandoc` Lua module provides helper functions for element
594605 creation. It is always loaded into the script's Lua environment.
595606
596− The following is an example Lua script for macro-expansion:
597−
598− function expand_hello_world(inline)
599− if inline.c == '{{helloworld}}' then
600− return pandoc.Emph{ pandoc.Str "Hello, World" }
601− else
602− return inline
603− end
604− end
605−
606− return {{Str = expand_hello_world}}
607+ See the [Lua filters documentation] for further details.
607608
608609 In order of preference, pandoc will look for Lua filters in
609610
610− 1. a specified full or relative path (executable or
611− non-executable)
611+ 1. a specified full or relative path
612612
613− 2. `$DATADIR/filters` (executable or non-executable)
614− where `$DATADIR` is the user data directory (see
615− `--data-dir`, above).
613+ 2. `$DATADIR/filters` where `$DATADIR` is the user data
614+ directory (see `--data-dir`, above).
615+
616+ Filters, Lua filters, and citeproc processing are applied in
617+ the order specified on the command line.
616618
617619`-M` *KEY*[`=`*VAL*], `--metadata=`*KEY*[`:`*VAL*]
618620
@@ -655,30 +657,30 @@ header when requesting a document from a URL:
655657
656658: Specifies what to do with insertions, deletions, and comments
657659 produced by the MS Word "Track Changes" feature. `accept` (the
658− default), inserts all insertions, and ignores all
659− deletions. `reject` inserts all deletions and ignores
660− insertions. Both `accept` and `reject` ignore comments. `all` puts
661− in insertions, deletions, and comments, wrapped in spans with
662− `insertion`, `deletion`, `comment-start`, and `comment-end`
663− classes, respectively. The author and time of change is
664− included. `all` is useful for scripting: only accepting changes
665− from a certain reviewer, say, or before a certain date. If a
666− paragraph is inserted or deleted, `track-changes=all` produces a
667− span with the class `paragraph-insertion`/`paragraph-deletion`
668− before the affected paragraph break. This option only affects the
669− docx reader.
660+ default) processes all the insertions and deletions.
661+ `reject` ignores them. Both `accept` and `reject` ignore comments.
662+ `all` includes all insertions, deletions, and comments, wrapped
663+ in spans with `insertion`, `deletion`, `comment-start`, and
664+ `comment-end` classes, respectively. The author and time of
665+ change is included. `all` is useful for scripting: only
666+ accepting changes from a certain reviewer, say, or before a
667+ certain date. If a paragraph is inserted or deleted,
668+ `track-changes=all` produces a span with the class
669+ `paragraph-insertion`/`paragraph-deletion` before the
670+ affected paragraph break. This option only affects the docx
671+ reader.
670672
671673`--extract-media=`*DIR*
672674
673675: Extract images and other media contained in or linked from
674676 the source document to the path *DIR*, creating it if
675677 necessary, and adjust the images references in the document
676− so they point to the extracted files. If the source format is
677− a binary container (docx, epub, or odt), the media is
678− extracted from the container and the original
679− filenames are used. Otherwise the media is read from the
680− file system or downloaded, and new filenames are constructed
681− based on SHA1 hashes of the contents.
678+ so they point to the extracted files. Media are downloaded,
679+ read from the file system, or extracted from a binary
680+ container (e.g. docx), as needed. The original file paths
681+ are used if they are relative paths not containing `..`.
682+ Otherwise filenames are constructed from the SHA1 hash of
683+ the contents.
682684
683685`--abbreviations=`*FILE*
684686
@@ -689,14 +691,15 @@ header when requesting a document from a URL:
689691 system default, use
690692 `pandoc --print-default-data-file=abbreviations`. The only
691693 use pandoc makes of this list is in the Markdown reader.
692− Strings ending in a period that are found in this list will
693− be followed by a nonbreaking space, so that the period will
694− not produce sentence-ending space in formats like LaTeX.
694+ Strings found in this list will be followed by a nonbreaking
695+ space, and the period will not produce sentence-ending space
696+ in formats like LaTeX. The strings may not contain spaces.
695697
696698[`pandocfilters`]: https://github.com/jgm/pandocfilters
697699[PHP]: https://github.com/vinai/pandocfilters-php
698700[perl]: https://metacpan.org/pod/Pandoc::Filter
699701[JavaScript/node.js]: https://github.com/mvhenderson/pandoc-filter-node
702+[Lua filters documentation]: https://pandoc.org/lua-filters.html
700703
701704## General writer options {.options}
702705
@@ -888,11 +891,11 @@ header when requesting a document from a URL:
888891 will not be searched. For example:
889892 `--resource-path=.:test` will search the working directory
890893 and the `test` subdirectory, in that order.
891−
892− `--resource-path` only has an effect if (a) the output
893− format embeds images (for example, `docx`, `pdf`, or `html`
894− with `--self-contained`) or (b) it is used together with
895− `--extract-media`.
894+ This option can be used repeatedly. Search path components
895+ that come later on the command line will be searched before
896+ those that come earlier, so
897+ `--resource-path foo:bar --resource-path baz:bim` is
898+ equivalent to `--resource-path baz:bim:foo:bar`.
896899
897900`--request-header=`*NAME*`:`*VAL*
898901
@@ -902,9 +905,9 @@ header when requesting a document from a URL:
902905 downloaded). If you're behind a proxy, you also need to set
903906 the environment variable `http_proxy` to `http://...`.
904907
905−`--no-check-certificate
908+`--no-check-certificate`
906909
907−: Disable the certificate verification to allow access to
910+: Disable the certificate verification to allow access to
908911 unsecure HTTP resources (for example when the certificate
909912 is no longer valid or self signed).
910913
@@ -933,7 +936,9 @@ header when requesting a document from a URL:
933936
934937`--html-q-tags`
935938
936−: Use `<q>` tags for quotes in HTML.
939+: Use `<q>` tags for quotes in HTML. (This option only has an
940+ effect if the `smart` extension is enabled for the input
941+ format used.)
937942
938943`--ascii`
939944
@@ -951,37 +956,45 @@ header when requesting a document from a URL:
951956 placement of link references is affected by the
952957 `--reference-location` option.
953958
954−`--reference-location = block`|`section`|`document`
959+`--reference-location=block`|`section`|`document`
955960
956961: Specify whether footnotes (and references, if `reference-links` is
957962 set) are placed at the end of the current (top-level) block, the
958963 current section, or the document. The default is
959964 `document`. Currently only affects the markdown writer.
960965
966+`--markdown-headings=setext`|`atx`
967+
968+: Specify whether to use ATX-style (`#`-prefixed) or
969+ Setext-style (underlined) headings for level 1 and 2
970+ headings in Markdown output. (The default is `atx`.)
971+ ATX-style headings are always used for levels 3+.
972+ This option also affects Markdown cells in `ipynb` output.
973+
961974`--atx-headers`
962975
963−: Use ATX-style headings in Markdown output. The default is
964− to use setext-style headings for levels 1 to 2, and then ATX headings.
965− (Note: for `gfm` output, ATX headings are always used.)
966− This option also affects markdown cells in `ipynb` output.
976+: *Deprecated synonym for `--markdown-headings=atx`.*
967977
968−`--top-level-division=[default|section|chapter|part]`
978+`--top-level-division=default`|`section`|`chapter`|`part`
969979
970−: Treat top-level headings as the given division type in LaTeX, ConTeXt,
971− DocBook, and TEI output. The hierarchy order is part, chapter, then section;
972− all headings are shifted such that the top-level heading becomes the specified
973− type. The default behavior is to determine the best division type via
974− heuristics: unless other conditions apply, `section` is chosen. When the
975− `documentclass` variable is set to `report`, `book`, or `memoir` (unless the
976− `article` option is specified), `chapter` is implied as the setting for this
977− option. If `beamer` is the output format, specifying either `chapter` or
978− `part` will cause top-level headings to become `\part{..}`, while
979− second-level headings remain as their default type.
980+: Treat top-level headings as the given division type in
981+ LaTeX, ConTeXt, DocBook, and TEI output. The hierarchy
982+ order is part, chapter, then section; all headings are
983+ shifted such that the top-level heading becomes the
984+ specified type. The default behavior is to determine the
985+ best division type via heuristics: unless other conditions
986+ apply, `section` is chosen. When the `documentclass`
987+ variable is set to `report`, `book`, or `memoir` (unless the
988+ `article` option is specified), `chapter` is implied as the
989+ setting for this option. If `beamer` is the output format,
990+ specifying either `chapter` or `part` will cause top-level
991+ headings to become `\part{..}`, while second-level headings
992+ remain as their default type.
980993
981994`-N`, `--number-sections`
982995
983−: Number section headings in LaTeX, ConTeXt, HTML, or EPUB output.
984− By default, sections are not numbered. Sections with class
996+: Number section headings in LaTeX, ConTeXt, HTML, Docx, ms, or EPUB
997+ output. By default, sections are not numbered. Sections with class
985998 `unnumbered` will never be numbered, even if `--number-sections`
986999 is specified.
9871000
@@ -1123,6 +1136,7 @@ header when requesting a document from a URL:
11231136 - Verbatim Char
11241137 - Footnote Reference
11251138 - Hyperlink
1139+ - Section Number
11261140
11271141 Table style:
11281142
@@ -1289,50 +1303,77 @@ header when requesting a document from a URL:
12891303
12901304## Citation rendering {.options}
12911305
1306+`-C`, `--citeproc`
1307+
1308+: Process the citations in the file, replacing them with
1309+ rendered citations and adding a bibliography.
1310+ Citation processing will not take place unless bibliographic
1311+ data is supplied, either through an external file specified
1312+ using the `--bibliography` option or the `bibliography`
1313+ field in metadata, or via a `references` section in metadata
1314+ containing a list of citations in CSL YAML format with
1315+ Markdown formatting. The style is controlled by a [CSL]
1316+ stylesheet specified using the `--csl` option or the `csl`
1317+ field in metadata. (If no stylesheet is specified,
1318+ the `chicago-author-date` style will be used by default.)
1319+ The citation processing transformation may be applied before
1320+ or after filters or Lua filters (see `--filter`,
1321+ `--lua-filter`): these transformations are applied in the
1322+ order they appear on the command line. For more
1323+ information, see the section on [Citations].
1324+
12921325`--bibliography=`*FILE*
12931326
12941327: Set the `bibliography` field in the document's metadata to *FILE*,
1295− overriding any value set in the metadata, and process citations
1296− using `pandoc-citeproc`. (This is equivalent to
1297− `--metadata bibliography=FILE --filter pandoc-citeproc`.)
1298− If `--natbib` or `--biblatex` is also supplied, `pandoc-citeproc` is not
1299− used, making this equivalent to `--metadata bibliography=FILE`.
1300− If you supply this argument multiple times, each *FILE* will be added
1301− to bibliography.
1328+ overriding any value set in the metadata. If you supply
1329+ this argument multiple times, each *FILE* will be added to
1330+ bibliography. If *FILE* is a URL, it will be fetched
1331+ via HTTP. If *FILE* is not found relative to the
1332+ working directory, it will be sought in the resource path
1333+ (see `--resource-path`).
13021334
13031335`--csl=`*FILE*
13041336
13051337: Set the `csl` field in the document's metadata to *FILE*,
13061338 overriding any value set in the metadata. (This is equivalent to
1307− `--metadata csl=FILE`.)
1308− This option is only relevant with `pandoc-citeproc`.
1339+ `--metadata csl=FILE`.) If *FILE* is a URL, it will be
1340+ fetched via HTTP. If *FILE* is not found relative to the
1341+ working directory, it will be sought in the resource path
1342+ (see `--resource-path`) and finally in the `csl`
1343+ subdirectory of the pandoc user data directory.
13091344
13101345`--citation-abbreviations=`*FILE*
13111346
13121347: Set the `citation-abbreviations` field in the document's metadata to
13131348 *FILE*, overriding any value set in the metadata. (This is equivalent to
13141349 `--metadata citation-abbreviations=FILE`.)
1315− This option is only relevant with `pandoc-citeproc`.
1350+ If *FILE* is a URL, it will be fetched via HTTP. If *FILE* is not
1351+ found relative to the working directory, it will be sought
1352+ in the resource path (see `--resource-path`) and finally in
1353+ the `csl` subdirectory of the pandoc user data directory.
13161354
13171355`--natbib`
13181356
1319−: Use [`natbib`] for citations in LaTeX output. This option is not for use
1320− with the `pandoc-citeproc` filter or with PDF output. It is intended for
1321− use in producing a LaTeX file that can be processed with [`bibtex`].
1357+: Use [`natbib`] for citations in LaTeX output. This option
1358+ is not for use with the `--citeproc` option or with PDF
1359+ output. It is intended for use in producing a LaTeX file
1360+ that can be processed with [`bibtex`].
13221361
13231362`--biblatex`
13241363
1325−: Use [`biblatex`] for citations in LaTeX output. This option is not for use
1326− with the `pandoc-citeproc` filter or with PDF output. It is intended for
1327− use in producing a LaTeX file that can be processed with [`bibtex`] or [`biber`].
1364+: Use [`biblatex`] for citations in LaTeX output. This option
1365+ is not for use with the `--citeproc` option or with PDF
1366+ output. It is intended for use in producing a LaTeX file
1367+ that can be processed with [`bibtex`] or [`biber`].
13281368
13291369## Math rendering in HTML {.options}
13301370
1331−The default is to render TeX math as far as possible using Unicode characters.
1332−Formulas are put inside a `span` with `class="math"`, so that they may be styled
1333−differently from the surrounding text if needed. However, this gives acceptable
1334−results only for basic math, usually you will want to use `--mathjax` or another
1335−of the following options.
1371+The default is to render TeX math as far as possible using
1372+Unicode characters. Formulas are put inside a `span` with
1373+`class="math"`, so that they may be styled differently from the
1374+surrounding text if needed. However, this gives acceptable
1375+results only for basic math, usually you will want to use
1376+`--mathjax` or another of the following options.
13361377
13371378`--mathjax`[`=`*URL*]
13381379
@@ -1346,10 +1387,11 @@ of the following options.
13461387
13471388`--mathml`
13481389
1349−: Convert TeX math to [MathML] (in `epub3`, `docbook4`, `docbook5`, `jats`,
1350− `html4` and `html5`). This is the default in `odt` output. Note that
1351− currently only Firefox and Safari (and select e-book readers) natively
1352− support MathML.
1390+: Convert TeX math to [MathML] (in `epub3`, `docbook4`,
1391+ `docbook5`, `jats`, `html4` and `html5`). This is the
1392+ default in `odt` output. Note that currently only Firefox
1393+ and Safari (and select e-book readers) natively support
1394+ MathML.
13531395
13541396`--webtex`[`=`*URL*]
13551397
@@ -1373,13 +1415,12 @@ of the following options.
13731415`--gladtex`
13741416
13751417: Enclose TeX math in `<eq>` tags in HTML output. The resulting HTML
1376− can then be processed by [GladTeX] to produce images of the typeset
1377− formulas and an HTML file with links to these images.
1378− So, the procedure is:
1418+ can then be processed by [GladTeX] to produce SVG images of the typeset
1419+ formulas and an HTML file with these images embedded.
13791420
13801421 pandoc -s --gladtex input.md -o myfile.htex
1381− gladtex -d myfile-images myfile.htex
1382− # produces myfile.html and images in myfile-images
1422+ gladtex -d image_dir myfile.htex
1423+ # produces myfile.html and images in image_dir
13831424
13841425[MathML]: https://www.w3.org/Math/
13851426[MathJax]: https://www.mathjax.org
@@ -1424,8 +1465,10 @@ Nonzero exit codes have the following meanings:
14241465 21 PandocUnknownReaderError
14251466 22 PandocUnknownWriterError
14261467 23 PandocUnsupportedExtensionError
1468+ 24 PandocCiteprocError
14271469 31 PandocEpubSubdirectoryError
14281470 43 PandocPDFError
1471+ 44 PandocXMLError
14291472 47 PandocPDFProgramNotFoundError
14301473 61 PandocHttpError
14311474 62 PandocShouldNeverHappenError
@@ -1438,6 +1481,7 @@ Nonzero exit codes have the following meanings:
14381481 91 PandocMacroLoop
14391482 92 PandocUTF8DecodingError
14401483 93 PandocIpynbDecodingError
1484+ 94 PandocUnsupportedCharsetError
14411485 97 PandocCouldNotFindDataFileError
14421486 99 PandocResourceNotFound
14431487----- ------------------------------------
@@ -1462,6 +1506,16 @@ input-files:
14621506- content.md
14631507# or you may use input-file: with a single value
14641508
1509+# Include options from the specified defaults files.
1510+# The files will be searched for first in the working directory
1511+# and then in the defaults subdirectory of the user data directory.
1512+# The files are included in the same order in which they appear in
1513+# the list. Options specified in this defaults file always have
1514+# priority over the included ones.
1515+defaults:
1516+- defsA
1517+- defsB
1518+
14651519template: letter
14661520standalone: true
14671521self-contained: false
@@ -1489,11 +1543,24 @@ include-after-body: []
14891543include-in-header: []
14901544resource-path: ["."]
14911545
1492−# filters will be assumed to be Lua filters if they have
1546+# turn on built-in citation processing. Note that if you need
1547+# control over when the citeproc processing is done relative
1548+# to other filters, you should instead use `citeproc` in the
1549+# list of `filters` (see below).
1550+citeproc: true
1551+csl: ieee
1552+bibliography:
1553+- foobar.bib
1554+- barbaz.json
1555+citation-abbreviations: abbrevs.json
1556+
1557+# Filters will be assumed to be Lua filters if they have
14931558# the .lua extension, and json filters otherwise. But
1494−# the filter type can also be specified explicitly, as shown:
1559+# the filter type can also be specified explicitly, as shown.
1560+# Filters are run in the order specified.
1561+# To include the built-in citeproc filter, use either `citeproc`
1562+# or `{type: citeproc}`.
14951563filters:
1496−- pandoc-citeproc
14971564- wordcount.lua
14981565- type: json
14991566 path: foo.lua
@@ -1506,8 +1573,11 @@ data-dir:
15061573verbosity: INFO
15071574log-file: log.json
15081575
1509−# citeproc, natbib, or biblatex
1576+# citeproc, natbib, or biblatex. This only affects LaTeX
1577+# output. If you want to use citeproc to format citations,
1578+# you should also set 'citeproc: true' (see above).
15101579cite-method: citeproc
1580+
15111581# part, chapter, section, or default:
15121582top-level-division: chapter
15131583abbreviations:
@@ -1576,7 +1646,7 @@ epub-cover-image: cover.jpg
15761646reference-links: true
15771647# block, section, or document
15781648reference-location: block
1579−atx-headers: false
1649+markdown-headings: setext
15801650
15811651# accept, reject, or all
15821652track-changes: accept
@@ -1606,6 +1676,34 @@ one line:
16061676verbosity: INFO
16071677```
16081678
1679+In fields that expect a file path (or list of file paths), the
1680+following syntax may be used to interpolate environment variables:
1681+
1682+``` yaml
1683+csl: ${HOME}/mycsldir/special.csl
1684+```
1685+
1686+`${USERDATA}` may also be used; this will always resolve to the
1687+user data directory that is current when the defaults file is
1688+parsed, regardless of the setting of the environment
1689+variable `USERDATA`.
1690+
1691+`${.}` will resolve to the directory containing the default
1692+file itself. This allows you to refer to resources contained
1693+in that directory:
1694+
1695+``` yaml
1696+epub-cover-image: ${.}/cover.jpg
1697+epub-metadata: ${.}/meta.xml
1698+resource-path:
1699+- . # the working directory from which pandoc is run
1700+- ${.}/images # the images subdirectory of the directory
1701+ # containing this defaults file
1702+```
1703+
1704+This environment variable interpolation syntax *only* works in
1705+fields that expect file paths.
1706+
16091707Default files can be placed in the `defaults` subdirectory of
16101708the user data directory and used from any directory. For
16111709example, one could create a file specifying defaults for writing
@@ -1833,7 +1931,8 @@ ${ styles.html() }
18331931```
18341932
18351933(If a partial is not found in the directory of the
1836−template, it will also be sought in the `templates`
1934+template and the template path is given as a relative
1935+path, it will also be sought in the `templates`
18371936subdirectory of the user data directory.)
18381937
18391938Partials may optionally be applied to variables using
@@ -2051,7 +2150,8 @@ Currently the following pipes are predefined:
20512150 including a title block in the document itself, you can
20522151 set the `title-meta`, `author-meta`, and `date-meta`
20532152 variables. (By default these are set automatically, based
2054− on `title`, `author`, and `date`.)
2153+ on `title`, `author`, and `date`.) The page title in HTML
2154+ is set by `pagetitle`, which is equal to `title` by default.
20552155
20562156`subtitle`
20572157: document subtitle, included in HTML, EPUB, LaTeX, ConTeXt, and docx
@@ -2125,32 +2225,97 @@ ODT or pptx.
21252225: the base script direction, either `rtl` (right-to-left)
21262226 or `ltr` (left-to-right).
21272227
2128− For bidirectional documents, native pandoc `span`s and `div`s
2129− with the `dir` attribute (value `rtl` or `ltr`) can be used to
2130− override the base direction in some output formats.
2131− This may not always be necessary if the final renderer
2132− (e.g. the browser, when generating HTML) supports the
2133− [Unicode Bidirectional Algorithm].
2228+ For bidirectional documents, native pandoc `span`s and
2229+ `div`s with the `dir` attribute (value `rtl` or `ltr`) can
2230+ be used to override the base direction in some output
2231+ formats. This may not always be necessary if the final
2232+ renderer (e.g. the browser, when generating HTML) supports
2233+ the [Unicode Bidirectional Algorithm].
21342234
2135− When using LaTeX for bidirectional documents, only the `xelatex` engine
2136− is fully supported (use `--pdf-engine=xelatex`).
2235+ When using LaTeX for bidirectional documents, only the
2236+ `xelatex` engine is fully supported (use
2237+ `--pdf-engine=xelatex`).
21372238
21382239[BCP 47]: https://tools.ietf.org/html/bcp47
21392240[Unicode Bidirectional Algorithm]: https://www.w3.org/International/articles/inline-bidi-markup/uba-basics
21402241[Language subtag lookup]: https://r12a.github.io/app-subtags/
21412242
2243+### Variables for HTML
2244+
2245+`document-css`
2246+: Enables inclusion of most of the [CSS] in the `styles.html`
2247+ [partial](#partials) (have a look with
2248+ `pandoc --print-default-data-file=templates/styles.html`).
2249+ Unless you use [`--css`](#option--css), this variable
2250+ is set to `true` by default. You can disable it with
2251+ e.g. `pandoc -M document-css=false`.
2252+
2253+`mainfont`
2254+: sets the CSS `font-family` property on the `html` element.
2255+
2256+`fontsize`
2257+: sets the base CSS `font-size`, which you'd usually set
2258+ to e.g. `20px`, but it also accepts `pt`
2259+ (12pt = 16px in most browsers).
2260+
2261+`fontcolor`
2262+: sets the CSS `color` property on the `html` element.
2263+
2264+`linkcolor`
2265+: sets the CSS `color` property on all links.
2266+
2267+`monofont`
2268+: sets the CSS `font-family` property on `code` elements.
2269+
2270+`monobackgroundcolor`
2271+: sets the CSS `background-color` property on `code` elements
2272+ and adds extra padding.
2273+
2274+`linestretch`
2275+: sets the CSS `line-height` property on the `html` element,
2276+ which is preferred to be unitless.
2277+
2278+`backgroundcolor`
2279+: sets the CSS `background-color` property on the `html` element.
2280+
2281+`margin-left`, `margin-right`, `margin-top`, `margin-bottom`
2282+: sets the corresponding CSS `padding` properties on the `body` element.
2283+
2284+To override or extend some [CSS] for just one document, include for example:
2285+
2286+ ---
2287+ header-includes: |
2288+ <style>
2289+ blockquote {
2290+ font-style: italic;
2291+ }
2292+ tr.even {
2293+ background-color: #f0f0f0;
2294+ }
2295+ td, th {
2296+ padding: 0.5em 2em 0.5em 0.5em;
2297+ }
2298+ tbody {
2299+ border-bottom: none;
2300+ }
2301+ </style>
2302+ ---
2303+
2304+[CSS]: https://developer.mozilla.org/en-US/docs/Learn/CSS
2305+
21422306### Variables for HTML math
21432307
21442308`classoption`
2145−: when using [KaTeX](#option--katex), you can render display math equations
2146− flush left using [YAML metadata](#layout) or with `-M classoption=fleqn`.
2309+: when using [KaTeX](#option--katex), you can render display
2310+math equations flush left using [YAML metadata](#layout) or with
2311+`-M classoption=fleqn`.
21472312
21482313### Variables for HTML slides
21492314
21502315These affect HTML output when [producing slide shows with pandoc].
21512316
2152−All [reveal.js configuration options] are available as variables.
2153−To turn off boolean flags that default to true in reveal.js, use `0`.
2317+`institute`
2318+: author affiliations: can be a list when there are multiple authors
21542319
21552320`revealjs-url`
21562321: base URL for reveal.js documents (defaults to
@@ -2170,6 +2335,9 @@ To turn off boolean flags that default to true in reveal.js, use `0`.
21702335: additional attributes for the title slide of reveal.js slide shows.
21712336 See [background in reveal.js and beamer] for an example.
21722337
2338+All [reveal.js configuration options] are available as variables.
2339+To turn off boolean flags that default to true in reveal.js, use `0`.
2340+
21732341[reveal.js configuration options]: https://revealjs.com/config/
21742342
21752343### Variables for Beamer slides
@@ -2255,9 +2423,10 @@ Pandoc uses these variables when [creating a PDF] with a LaTeX engine.
22552423 ...
22562424
22572425`documentclass`
2258−: document class: usually one of the standard classes, [`article`], [`book`],
2259− and [`report`]; the [KOMA-Script] equivalents, `scrartcl`, `scrbook`,
2260− and `scrreprt`, which default to smaller margins; or [`memoir`]
2426+: document class: usually one of the standard classes,
2427+ [`article`], [`book`], and [`report`]; the [KOMA-Script]
2428+ equivalents, `scrartcl`, `scrbook`, and `scrreprt`, which
2429+ default to smaller margins; or [`memoir`]
22612430
22622431`geometry`
22632432: option for [`geometry`] package, e.g. `margin=1in`;
@@ -2282,8 +2451,9 @@ Pandoc uses these variables when [creating a PDF] with a LaTeX engine.
22822451 ...
22832452
22842453`indent`
2285−: uses document class settings for indentation (the default LaTeX template
2286− otherwise removes indentation and adds space between paragraphs)
2454+: if true, pandoc will use document class settings for
2455+ indentation (the default LaTeX template otherwise removes
2456+ indentation and adds space between paragraphs)
22872457
22882458`linestretch`
22892459: adjusts line spacing using the [`setspace`]
@@ -2308,8 +2478,8 @@ Pandoc uses these variables when [creating a PDF] with a LaTeX engine.
23082478#### Fonts
23092479
23102480`fontenc`
2311−: allows font encoding to be specified through `fontenc` package (with `pdflatex`);
2312− default is `T1` (see [LaTeX font encodings guide])
2481+: allows font encoding to be specified through `fontenc` package (with
2482+ `pdflatex`); default is `T1` (see [LaTeX font encodings guide])
23132483
23142484`fontfamily`
23152485: font package for use with `pdflatex`:
@@ -2379,7 +2549,8 @@ Pandoc uses these variables when [creating a PDF] with a LaTeX engine.
23792549: contents of acknowledgments footnote after document title
23802550
23812551`toc`
2382−: include table of contents (can also be set using `--toc/--table-of-contents`)
2552+: include table of contents (can also be set using
2553+ `--toc/--table-of-contents`)
23832554
23842555`toc-depth`
23852556: level of section to include in table of contents
@@ -2421,12 +2592,12 @@ Pandoc uses these variables when [creating a PDF] with ConTeXt.
24212592: font size for body text (e.g. `10pt`, `12pt`)
24222593
24232594`headertext`, `footertext`
2424−: text to be placed in running header or footer (see [ConTeXt Headers and Footers]);
2425− repeat up to four times for different placement
2595+: text to be placed in running header or footer (see [ConTeXt Headers and
2596+ Footers]); repeat up to four times for different placement
24262597
24272598`indenting`
2428−: controls indentation of paragraphs, e.g. `yes,small,next` (see [ConTeXt Indentation]);
2429− repeat for multiple options
2599+: controls indentation of paragraphs, e.g. `yes,small,next` (see
2600+ [ConTeXt Indentation]); repeat for multiple options
24302601
24312602`interlinespace`
24322603: adjusts line spacing, e.g. `4ex` (using [`setupinterlinespace`]);
@@ -2437,16 +2608,19 @@ Pandoc uses these variables when [creating a PDF] with ConTeXt.
24372608 repeat for multiple options
24382609
24392610`linkcolor`, `contrastcolor`
2440−: color for links outside and inside a page, e.g. `red`, `blue` (see [ConTeXt Color])
2611+: color for links outside and inside a page, e.g. `red`, `blue` (see
2612+ [ConTeXt Color])
24412613
24422614`linkstyle`
2443−: typeface style for links, e.g. `normal`, `bold`, `slanted`, `boldslanted`, `type`, `cap`, `small`
2615+: typeface style for links, e.g. `normal`, `bold`, `slanted`, `boldslanted`,
2616+ `type`, `cap`, `small`
24442617
24452618`lof`, `lot`
24462619: include list of figures, list of tables
24472620
24482621`mainfont`, `sansfont`, `monofont`, `mathfont`
2449−: font families: take the name of any system font (see [ConTeXt Font Switching])
2622+: font families: take the name of any system font (see
2623+ [ConTeXt Font Switching])
24502624
24512625`margin-left`, `margin-right`, `margin-top`, `margin-bottom`
24522626: sets margins, if `layout` is not used (otherwise `layout`
@@ -2461,16 +2635,18 @@ Pandoc uses these variables when [creating a PDF] with ConTeXt.
24612635 repeat for multiple options
24622636
24632637`pdfa`
2464−: adds to the preamble the setup necessary to generate PDF/A of the type
2465− specified, e.g. `1a:2005`, `2a`. If no type is specified (i.e. the value
2466− is set to True, by e.g. `--metadata=pdfa` or `pdfa: true` in a YAML metadata
2467− block), `1b:2005` will be used as default, for reasons of backwards
2468− compatibility. Using `--variable=pdfa` without specified value is not supported.
2469− To successfully generate PDF/A the required ICC color profiles have to
2470− be available and the content and all included files (such as images)
2471− have to be standard conforming. The ICC profiles and output intent
2472− may be specified using the variables `pdfaiccprofile` and `pdfaintent`.
2473− See also [ConTeXt PDFA] for more details.
2638+: adds to the preamble the setup necessary to generate PDF/A
2639+ of the type specified, e.g. `1a:2005`, `2a`. If no type is
2640+ specified (i.e. the value is set to True, by e.g.
2641+ `--metadata=pdfa` or `pdfa: true` in a YAML metadata block),
2642+ `1b:2005` will be used as default, for reasons of backwards
2643+ compatibility. Using `--variable=pdfa` without specified value
2644+ is not supported. To successfully generate PDF/A the required
2645+ ICC color profiles have to be available and the content and all
2646+ included files (such as images) have to be standard conforming.
2647+ The ICC profiles and output intent may be specified using the
2648+ variables `pdfaiccprofile` and `pdfaintent`. See also [ConTeXt
2649+ PDFA] for more details.
24742650
24752651`pdfaiccprofile`
24762652: when used in conjunction with `pdfa`, specifies the ICC profile to use
@@ -2485,10 +2661,12 @@ Pandoc uses these variables when [creating a PDF] with ConTeXt.
24852661 If left unspecified, `sRGB IEC61966-2.1` is used as default.
24862662
24872663`toc`
2488−: include table of contents (can also be set using `--toc/--table-of-contents`)
2664+: include table of contents (can also be set using
2665+ `--toc/--table-of-contents`)
24892666
24902667`whitespace`
2491−: spacing between paragraphs, e.g. `none`, `small` (using [`setupwhitespace`])
2668+: spacing between paragraphs, e.g. `none`, `small` (using
2669+ [`setupwhitespace`])
24922670
24932671`includesource`
24942672: include all source documents as file attachments in the PDF file
@@ -2767,53 +2945,43 @@ reading web pages formatted using MathJax, for example.
27672945
27682946## Raw HTML/TeX
27692947
2770−The following extensions (especially how they affect Markdown
2771−input/output) are also described in more detail in their respective
2772−sections of [Pandoc's Markdown].
2773−
2774−#### Extension: `raw_html` {#raw_html}
2775−
2776−When converting from HTML, parse elements to raw HTML which are not
2777−representable in pandoc's AST.
2778−By default, this is disabled for HTML input.
2779−
2780−#### Extension: `raw_tex` {#raw_tex}
2781−
2782−Allows raw LaTeX, TeX, and ConTeXt to be included in a document.
2783−
2784−This extension can be enabled/disabled for the following formats
2785−(in addition to `markdown`):
2786−
2787−input formats
2788−: `latex`, `org`, `textile`, `html` (environments, `\ref`, and
2789− `\eqref` only), `ipynb`
2790−
2791−output formats
2792−: `textile`, `commonmark`
2948+The following extensions are described in more detail in
2949+their respective sections of [Pandoc's Markdown]:
27932950
2794−Note: as applied to `ipynb`, `raw_html` and `raw_tex` affect not
2795−only raw TeX in markdown cells, but data with mime type
2796−`text/html` in output cells. Since the `ipynb` reader attempts
2797−to preserve the richest possible outputs when several options
2798−are given, you will get best results if you disable `raw_html`
2799−and `raw_tex` when converting to formats like `docx` which don't
2800−allow raw `html` or `tex`.
2951+- [`raw_html`](#extension-raw_html) allows HTML elements which
2952+ are not representable in pandoc's AST to be parsed as raw HTML.
2953+ By default, this is disabled for HTML input.
28012954
2802−#### Extension: `native_divs` {#native_divs}
2955+- [`raw_tex`](#extension-raw_tex) allows raw LaTeX, TeX, and ConTeXt
2956+ to be included in a document. This extension can be enabled/disabled
2957+ for the following formats (in addition to `markdown`):
28032958
2804−This extension is enabled by default for HTML input. This means that
2805−`div`s are parsed to pandoc native elements. (Alternatively, you
2806−can parse them to raw HTML using `-f html-native_divs+raw_html`.)
2959+ input formats
2960+ : `latex`, `textile`, `html` (environments, `\ref`, and
2961+ `\eqref` only), `ipynb`
28072962
2808−When converting HTML to Markdown, for example, you may want to drop all
2809−`div`s and `span`s:
2963+ output formats
2964+ : `textile`, `commonmark`
28102965
2811− pandoc -f html-native_divs-native_spans -t markdown
2966+ Note: as applied to `ipynb`, `raw_html` and `raw_tex` affect not
2967+ only raw TeX in markdown cells, but data with mime type
2968+ `text/html` in output cells. Since the `ipynb` reader attempts
2969+ to preserve the richest possible outputs when several options
2970+ are given, you will get best results if you disable `raw_html`
2971+ and `raw_tex` when converting to formats like `docx` which don't
2972+ allow raw `html` or `tex`.
28122973
2813−#### Extension: `native_spans` {#native_spans}
2814−
2815−Analogous to `native_divs` above.
2974+- [`native_divs`](#extension-native_divs) causes HTML `div`
2975+ elements to be parsed as native pandoc Div blocks.
2976+ If you want them to be parsed as raw HTML, use
2977+ `-f html-native_divs+raw_html`.
28162978
2979+- [`native_spans`](#extension-native_spans) causes HTML `span`
2980+ elements to be parsed as native pandoc Span inlines.
2981+ If you want them to be parsed as raw HTML, use
2982+ `-f html-native_spans+raw_html`. If you want to drop all
2983+ `div`s and `span`s when converting HTML to Markdown, you
2984+ can use `pandoc -f html-native_divs-native_spans -t markdown`.
28172985
28182986## Literate Haskell support
28192987
@@ -2901,7 +3069,44 @@ This extension can be enabled/disabled for the following formats:
29013069output formats
29023070: `odt`, `opendocument`
29033071
2904−#### Extension: `styles` {#ext-styles} ####
3072+#### Extension: `xrefs_name` ####
3073+
3074+Links to headings, figures and tables inside the document are
3075+substituted with cross-references that will use the name or caption
3076+of the referenced item. The original link text is replaced once
3077+the generated document is refreshed. This extension can be combined
3078+with `xrefs_number` in which case numbers will appear before the
3079+name.
3080+
3081+Text in cross-references is only made consistent with the referenced
3082+item once the document has been refreshed.
3083+
3084+This extension can be enabled/disabled for the following formats:
3085+
3086+output formats
3087+: `odt`, `opendocument`
3088+
3089+#### Extension: `xrefs_number` ####
3090+
3091+Links to headings, figures and tables inside the document are
3092+substituted with cross-references that will use the number
3093+of the referenced item. The original link text is discarded.
3094+This extension can be combined with `xrefs_name` in which case
3095+the name or caption numbers will appear after the number.
3096+
3097+For the `xrefs_number` to be useful heading numbers must be enabled
3098+in the generated document, also table and figure captions must be enabled
3099+using for example the `native_numbering` extension.
3100+
3101+Numbers in cross-references are only visible in the final document once
3102+it has been refreshed.
3103+
3104+This extension can be enabled/disabled for the following formats:
3105+
3106+output formats
3107+: `odt`, `opendocument`
3108+
3109+#### Extension: `styles` #### {#ext-styles}
29053110
29063111When converting from docx, read all docx styles as divs (for
29073112paragraph styles) and spans (for character styles) regardless
@@ -2917,10 +3122,25 @@ input formats
29173122In the `muse` input format, this enables Text::Amuse
29183123extensions to Emacs Muse markup.
29193124
3125+#### Extension: `raw_markdown` ####
3126+
3127+In the `ipynb` input format, this causes Markdown cells
3128+to be included as raw Markdown blocks (allowing lossless
3129+round-tripping) rather than being parsed. Use this only
3130+when you are targeting `ipynb` or a markdown-based
3131+output format.
3132+
29203133#### Extension: `citations` {#org-citations}
29213134
2922−Some aspects of [Pandoc's Markdown citation syntax](#citations) are also accepted
2923−in `org` input.
3135+Some aspects of [Pandoc's Markdown citation syntax](#citations)
3136+are also accepted in `org` input.
3137+
3138+#### Extension: `element_citations` ####
3139+
3140+In the `jats` output formats, this causes reference items to
3141+be replaced with `<element-citation>` elements. These
3142+elements are not influenced by CSL styles, but all information
3143+on the item is included in tags.
29243144
29253145#### Extension: `ntb` ####
29263146
@@ -3028,7 +3248,8 @@ pandoc does require the space.
30283248
30293249### Heading identifiers ###
30303250
3031−See also the [`auto_identifiers` extension](#extension-auto_identifiers) above.
3251+See also the [`auto_identifiers`
3252+extension](#extension-auto_identifiers) above.
30323253
30333254#### Extension: `header_attributes` ####
30343255
@@ -3150,11 +3371,12 @@ block in a block quote, you need five spaces after the `>`:
31503371
31513372#### Extension: `blank_before_blockquote` ####
31523373
3153−Standard Markdown syntax does not require a blank line before a block
3154−quote. Pandoc does require this (except, of course, at the beginning of the
3155−document). The reason for the requirement is that it is all too easy for a
3156−`>` to end up at the beginning of a line by accident (perhaps through line
3157−wrapping). So, unless the `markdown_strict` format is used, the following does
3374+Standard Markdown syntax does not require a blank line before a
3375+block quote. Pandoc does require this (except, of course, at
3376+the beginning of the document). The reason for the requirement
3377+is that it is all too easy for a `>` to end up at the beginning
3378+of a line by accident (perhaps through line wrapping). So,
3379+unless the `markdown_strict` format is used, the following does
31583380not produce a nested block quote in pandoc:
31593381
31603382 > This is a block quote.
@@ -3223,14 +3445,16 @@ this syntax:
32233445 qsort (filter (>= x) xs)
32243446 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
32253447
3226−Here `mycode` is an identifier, `haskell` and `numberLines` are classes, and
3227−`startFrom` is an attribute with value `100`. Some output formats can use this
3228−information to do syntax highlighting. Currently, the only output formats
3229−that uses this information are HTML, LaTeX, Docx, Ms, and PowerPoint. If
3230−highlighting is supported for your output format and language, then the code
3231−block above will appear highlighted, with numbered lines. (To see which
3232−languages are supported, type `pandoc --list-highlight-languages`.) Otherwise,
3233−the code block above will appear as follows:
3448+Here `mycode` is an identifier, `haskell` and `numberLines` are
3449+classes, and `startFrom` is an attribute with value `100`. Some
3450+output formats can use this information to do syntax
3451+highlighting. Currently, the only output formats that uses this
3452+information are HTML, LaTeX, Docx, Ms, and PowerPoint. If
3453+highlighting is supported for your output format and language,
3454+then the code block above will appear highlighted, with numbered
3455+lines. (To see which languages are supported, type `pandoc
3456+--list-highlight-languages`.) Otherwise, the code block above
3457+will appear as follows:
32343458
32353459 <pre id="mycode" class="haskell numberLines" startFrom="100">
32363460 <code>
@@ -3293,6 +3517,9 @@ line must begin with a space.
32933517 | 200 Main St.
32943518 | Berkeley, CA 94718
32953519
3520+Inline formatting (such as emphasis) is allowed in the content,
3521+but not block-level formatting (such as block quotes or lists).
3522+
32963523This syntax is borrowed from [reStructuredText].
32973524
32983525## Lists
@@ -3496,11 +3723,12 @@ a blank line, and must be followed by one or more definitions.
34963723A definition begins with a colon or tilde, which may be indented one
34973724or two spaces.
34983725
3499−A term may have multiple definitions, and each definition may consist of one or
3500−more block elements (paragraph, code block, list, etc.), each indented four
3501−spaces or one tab stop. The body of the definition (including the first line,
3502−aside from the colon or tilde) should be indented four spaces. However,
3503−as with other Markdown lists, you can "lazily" omit indentation except
3726+A term may have multiple definitions, and each definition may
3727+consist of one or more block elements (paragraph, code block,
3728+list, etc.), each indented four spaces or one tab stop. The
3729+body of the definition (including the first line, aside from the
3730+colon or tilde) should be indented four spaces. However, as with
3731+other Markdown lists, you can "lazily" omit indentation except
35043732at the beginning of a paragraph or other block element:
35053733
35063734 Term 1
@@ -3526,9 +3754,10 @@ definition:
35263754Note that space between items in a definition list is required.
35273755(A variant that loosens this requirement, but disallows "lazy"
35283756hard wrapping, can be activated with `compact_definition_lists`: see
3529−[Non-pandoc extensions], below.)
3757+[Non-default extensions], below.)
35303758
3531−[^3]: I have been influenced by the suggestions of [David Wheeler](https://justatheory.com/2009/02/modest-markdown-proposal/).
3759+[^3]: I have been influenced by the suggestions of [David
3760+ Wheeler](https://justatheory.com/2009/02/modest-markdown-proposal/).
35323761
35333762### Numbered example lists ###
35343763
@@ -3564,30 +3793,6 @@ list marker. That is, example lists always behave as if the
35643793labels tend to be long, and indenting content to the
35653794first non-space character after the label would be awkward.
35663795
3567−### Compact and loose lists ###
3568−
3569−Pandoc behaves differently from `Markdown.pl` on some "edge
3570−cases" involving lists. Consider this source:
3571−
3572− + First
3573− + Second:
3574− - Fee
3575− - Fie
3576− - Foe
3577−
3578− + Third
3579−
3580−Pandoc transforms this into a "compact list" (with no `<p>` tags around
3581−"First", "Second", or "Third"), while Markdown puts `<p>` tags around
3582−"Second" and "Third" (but not "First"), because of the blank space
3583−around "Third". Pandoc follows a simple rule: if the text is followed by
3584−a blank line, it is treated as a paragraph. Since "Second" is followed
3585−by a list, and not a blank line, it isn't treated as a paragraph. The
3586−fact that the list is followed by a blank line is irrelevant. (Note:
3587−Pandoc works this way even when the `markdown_strict` format is specified. This
3588−behavior is consistent with the official Markdown syntax description,
3589−even though it is different from that of `Markdown.pl`.)
3590−
35913796
35923797### Ending a list ###
35933798
@@ -3974,10 +4179,12 @@ option is used. All of the metadata will appear in a single block
39744179at the beginning of the document.
39754180
39764181Note that [YAML] escaping rules must be followed. Thus, for example,
3977−if a title contains a colon, it must be quoted. The pipe character
3978−(`|`) can be used to begin an indented block that will be interpreted
3979−literally, without need for escaping. This form is necessary
3980−when the field contains blank lines or block-level formatting:
4182+if a title contains a colon, it must be quoted, and if it contains a
4183+backslash escape, then it must be ensured that it is not treated as a
4184+[YAML escape sequence]. The pipe character (`|`) can be used to begin
4185+an indented block that will be interpreted literally, without need for
4186+escaping. This form is necessary when the field contains blank lines
4187+or block-level formatting:
39814188
39824189 ---
39834190 title: 'This is the title: it contains a colon'
@@ -3991,6 +4198,12 @@ when the field contains blank lines or block-level formatting:
39914198 It consists of two paragraphs.
39924199 ...
39934200
4201+The literal block after the `|` must be indented relative to the
4202+line containing the `|`. If it is not, the YAML will be invalid
4203+and pandoc will not interpret it as metadata. For an overview
4204+of the complex rules governing YAML, see the [Wikipedia entry on
4205+YAML syntax].
4206+
39944207Template variables will be set automatically from the metadata. Thus, for
39954208example, in writing HTML, the variable `abstract` will be set to the HTML
39964209equivalent of the Markdown in the `abstract` field:
@@ -4037,6 +4250,24 @@ will be interpreted as markdown. For example:
40374250 \renewcommand{\section}[1]{\clearpage\oldsection{#1}}
40384251 ```
40394252
4253+Note: the `yaml_metadata_block` extension works with
4254+`commonmark` as well as `markdown` (and it is enabled by default
4255+in `gfm` and `commonmark_x`). However, in these formats the
4256+following restrictions apply:
4257+
4258+- The YAML metadata block must occur at the beginning of the
4259+ document (and there can be only one). If multiple files are
4260+ given as arguments to pandoc, only the first can be a YAML
4261+ metadata block.
4262+
4263+- The leaf nodes of the YAML structure are parsed in isolation from
4264+ each other and from the rest of the document. So, for
4265+ example, you can't use a reference link in these contexts
4266+ if the link definition is somewhere else in the document.
4267+
4268+[YAML escape sequence]: https://yaml.org/spec/1.2/spec.html#id2776092
4269+[Wikipedia entry on YAML syntax]: https://en.m.wikipedia.org/wiki/YAML#Syntax
4270+
40404271## Backslash escapes
40414272
40424273#### Extension: `all_symbols_escapable` ####
@@ -4194,7 +4425,8 @@ you need to enclose text in literal `$` characters, backslash-escape
41944425them and they won't be treated as math delimiters.
41954426
41964427For display math, use `$$` delimiters. (In this case, the delimiters
4197−may be separated from the formula by whitespace.)
4428+may be separated from the formula by whitespace. However, there can be
4429+no blank lines betwen the opening and closing `$$` delimiters.)
41984430
41994431TeX math will be printed in all output formats. How it is rendered
42004432depends on the output format:
@@ -4312,8 +4544,8 @@ into
43124544
43134545whereas `Markdown.pl` will preserve it as is.
43144546
4315−There is one exception to this rule: text between `<script>` and
4316−`<style>` tags is not interpreted as Markdown.
4547+There is one exception to this rule: text between `<script>`,
4548+`<style>`, and `<textarea>` tags is not interpreted as Markdown.
43174549
43184550This departure from standard Markdown should make it easier to mix
43194551Markdown with HTML block elements. For example, one can surround
@@ -4724,142 +4956,72 @@ they cannot contain multiple paragraphs). The syntax is as follows:
47244956
47254957Inline and regular footnotes may be mixed freely.
47264958
4727−## Citations
4959+## Citation syntax
47284960
47294961#### Extension: `citations` ####
47304962
4731−Using an external filter, `pandoc-citeproc`, pandoc can automatically generate
4732−citations and a bibliography in a number of styles. Basic usage is
4733−
4734− pandoc --filter pandoc-citeproc myinput.txt
4735−
4736−In order to use this feature, you will need to specify a bibliography file
4737−using the `bibliography` metadata field in a YAML metadata section, or
4738−`--bibliography` command line argument. You can supply multiple `--bibliography`
4739−arguments or set `bibliography` metadata field to YAML array, if you want to
4740−use multiple bibliography files. The bibliography may have any of these
4741−formats:
4963+To cite a bibliographic item with an identifier foo, use the
4964+syntax `@foo`. Normal citations should be included in square
4965+brackets, with semicolons separating distinct items:
47424966
4743− Format File extension
4744− ------------ --------------
4745− BibLaTeX .bib
4746− BibTeX .bibtex
4747− Copac .copac
4748− CSL JSON .json
4749− CSL YAML .yaml
4750− EndNote .enl
4751− EndNote XML .xml
4752− ISI .wos
4753− MEDLINE .medline
4754− MODS .mods
4755− RIS .ris
4967+ Blah blah [@doe99; @smith2000; @smith2004].
47564968
4757−Note that `.bib` can be used with both BibTeX and BibLaTeX files;
4758−use `.bibtex` to force BibTeX.
4969+How this is rendered depends on the citation style. In an
4970+author-date style, it might render as
47594971
4760−Note that `pandoc-citeproc --bib2json` and `pandoc-citeproc --bib2yaml`
4761−can produce `.json` and `.yaml` files from any of the supported formats.
4972+ Blah blah (Doe 1999, Smith 2000, 2004).
47624973
4763−In-field markup: In BibTeX and BibLaTeX databases,
4764−pandoc-citeproc parses a subset of LaTeX markup; in CSL YAML
4765−databases, pandoc Markdown; and in CSL JSON databases, an
4766−[HTML-like markup][CSL markup specs]:
4974+In a footnote style, it might render as
47674975
4768−`<i>...</i>`
4769−: italics
4976+ Blah blah.[^1]
47704977
4771−`<b>...</b>`
4772−: bold
4978+ [^1]: John Doe, "Frogs," *Journal of Amphibians* 44 (1999);
4979+ Susan Smith, "Flies," *Journal of Insects* (2000);
4980+ Susan Smith, "Bees," *Journal of Insects* (2004).
47734981
4774−`<span style="font-variant:small-caps;">...</span>` or `<sc>...</sc>`
4775−: small capitals
4982+See the [CSL user documentation] for more information about CSL
4983+styles and how they affect rendering.
47764984
4777−`<sub>...</sub>`
4778−: subscript
4985+Unless a citation key start with a letter, digit, or `_`,
4986+and contains only alphanumerics and internal punctuation
4987+characters (`:.#$%&-+?<>~/`), it must be surrounded
4988+by curly braces, which are not considered part of the key.
4989+In `@Foo_bar.baz.`, the key is `Foo_bar.baz`. The final
4990+period is not *internal* punctuation, so it is not included in
4991+the key. In `@{Foo_bar.baz.}`, the key is `Foo_bar.baz.`, including
4992+the final period. The curly braces are recommended if you use URLs as
4993+keys: `[@{https://example.com/bib?name=foobar&date=2000}, p. 33]`.
47794994
4780−`<sup>...</sup>`
4781−: superscript
4995+Citation items may optionally include a prefix, a locator, and
4996+a suffix. In
47824997
4783−`<span class="nocase">...</span>`
4784−: prevent a phrase from being capitalized as title case
4785−
4786−`pandoc-citeproc -j` and `-y` interconvert the CSL JSON
4787−and CSL YAML formats as far as possible.
4788−
4789−As an alternative to specifying a bibliography file using `--bibliography`
4790−or the YAML metadata field `bibliography`, you can include
4791−the citation data directly in the `references` field of the
4792−document's YAML metadata. The field should contain an array of
4793−YAML-encoded references, for example:
4794−
4795− ---
4796− references:
4797− - type: article-journal
4798− id: WatsonCrick1953
4799− author:
4800− - family: Watson
4801− given: J. D.
4802− - family: Crick
4803− given: F. H. C.
4804− issued:
4805− date-parts:
4806− - - 1953
4807− - 4
4808− - 25
4809− title: 'Molecular structure of nucleic acids: a structure for deoxyribose
4810− nucleic acid'
4811− title-short: Molecular structure of nucleic acids
4812− container-title: Nature
4813− volume: 171
4814− issue: 4356
4815− page: 737-738
4816− DOI: 10.1038/171737a0
4817− URL: https://www.nature.com/articles/171737a0
4818− language: en-GB
4819− ...
4998+ Blah blah [see @doe99, pp. 33-35 and *passim*; @smith04, chap. 1].
48204999
4821−(`pandoc-citeproc --bib2yaml` can produce these from a bibliography file in one
4822−of the supported formats.)
5000+The first item (`doe99`) has prefix `see `, locator `pp. 33-35`,
5001+and suffix `and *passim*`. The second item (`smith04`) has
5002+locator `chap. 1` and no prefix or suffix.
48235003
4824−Citations and references can be formatted using any style supported by the
4825−[Citation Style Language], listed in the [Zotero Style Repository].
4826−These files are specified using the `--csl` option or the `csl` metadata field.
4827−By default, `pandoc-citeproc` will use the [Chicago Manual of Style] author-date
4828−format. The CSL project provides further information on [finding and editing styles].
4829−
4830−To make your citations hyperlinks to the corresponding bibliography
4831−entries, add `link-citations: true` to your YAML metadata.
4832−
4833−Citations go inside square brackets and are separated by semicolons.
4834−Each citation must have a key, composed of '@' + the citation
4835−identifier from the database, and may optionally have a prefix,
4836−a locator, and a suffix. The citation key must begin with a letter, digit,
4837−or `_`, and may contain alphanumerics, `_`, and internal punctuation
4838−characters (`:.#$%&-+?<>~/`). Here are some examples:
4839−
4840− Blah blah [see @doe99, pp. 33-35; also @smith04, chap. 1].
4841−
4842− Blah blah [@doe99, pp. 33-35, 38-39 and *passim*].
4843−
4844− Blah blah [@smith04; @doe99].
4845−
4846−`pandoc-citeproc` detects locator terms in the [CSL locale files].
4847−Either abbreviated or unabbreviated forms are accepted. In the `en-US`
4848−locale, locator terms can be written in either singular or plural forms,
4849−as `book`, `bk.`/`bks.`; `chapter`, `chap.`/`chaps.`; `column`,
4850−`col.`/`cols.`; `figure`, `fig.`/`figs.`; `folio`, `fol.`/`fols.`;
4851−`number`, `no.`/`nos.`; `line`, `l.`/`ll.`; `note`, `n.`/`nn.`; `opus`,
4852−`op.`/`opp.`; `page`, `p.`/`pp.`; `paragraph`, `para.`/`paras.`; `part`,
4853−`pt.`/`pts.`; `section`, `sec.`/`secs.`; `sub verbo`, `s.v.`/`s.vv.`;
4854−`verse`, `v.`/`vv.`; `volume`, `vol.`/`vols.`; `¶`/`¶¶`; `§`/`§§`. If no
5004+Pandoc uses some heuristics to separate the locator from the
5005+rest of the subject. It is sensitive to the locator terms
5006+defined in the [CSL locale files]. Either abbreviated or
5007+unabbreviated forms are accepted. In the `en-US` locale, locator
5008+terms can be written in either singular or plural forms, as
5009+`book`, `bk.`/`bks.`; `chapter`, `chap.`/`chaps.`; `column`,
5010+`col.`/`cols.`; `figure`, `fig.`/`figs.`; `folio`,
5011+`fol.`/`fols.`; `number`, `no.`/`nos.`; `line`, `l.`/`ll.`;
5012+`note`, `n.`/`nn.`; `opus`, `op.`/`opp.`; `page`, `p.`/`pp.`;
5013+`paragraph`, `para.`/`paras.`; `part`, `pt.`/`pts.`; `section`,
5014+`sec.`/`secs.`; `sub verbo`, `s.v.`/`s.vv.`; `verse`,
5015+`v.`/`vv.`; `volume`, `vol.`/`vols.`; `¶`/`¶¶`; `§`/`§§`. If no
48555016locator term is used, "page" is assumed.
48565017
4857−`pandoc-citeproc` will use heuristics to distinguish the locator
4858−from the suffix. In complex cases, the locator can be enclosed
4859−in curly braces (using `pandoc-citeproc` 0.15 and higher only):
5018+In complex cases, you can force something to be treated as
5019+a locator by enclosing it in curly braces or prevent parsing
5020+the suffix as locator by prepending curly braces:
48605021
48615022 [@smith{ii, A, D-Z}, with a suffix]
48625023 [@smith, {pp. iv, vi-xi, (xv)-(xvii)} with suffix here]
5024+ [@smith{}, 99 years later]
48635025
48645026A minus sign (`-`) before the `@` will suppress mention of
48655027the author in the citation. This can be useful when the
@@ -4867,82 +5029,103 @@ author is already mentioned in the text:
48675029
48685030 Smith says blah [-@smith04].
48695031
4870−You can also write an in-text citation, as follows:
5032+You can also write an author-in-text citation, by omitting the
5033+square brackets:
48715034
48725035 @smith04 says blah.
48735036
48745037 @smith04 [p. 33] says blah.
48755038
4876−If the style calls for a list of works cited, it will be placed
4877−in a div with id `refs`, if one exists:
4878−
4879− ::: {#refs}
4880− :::
4881−
4882−Otherwise, it will be placed at the end of the document.
4883−Generation of the bibliography can be suppressed by setting
4884−`suppress-bibliography: true` in the YAML metadata.
4885−
4886−If you wish the bibliography to have a section heading, you can
4887−set `reference-section-title` in the metadata, or put the heading
4888−at the beginning of the div with id `refs` (if you are using it)
4889−or at the end of your document:
4890−
4891− last paragraph...
4892−
4893− # References
4894−
4895−The bibliography will be inserted after this heading. Note that
4896−the `unnumbered` class will be added to this heading, so that the
4897−section will not be numbered.
4898−
4899−If you want to include items in the bibliography without actually
4900−citing them in the body text, you can define a dummy `nocite` metadata
4901−field and put the citations there:
4902−
4903− ---
4904− nocite: |
4905− @item1, @item2
4906− ...
4907−
4908− @item3
4909−
4910−In this example, the document will contain a citation for `item3`
4911−only, but the bibliography will contain entries for `item1`, `item2`, and
4912−`item3`.
4913−
4914−It is possible to create a bibliography with all the citations,
4915−whether or not they appear in the document, by using a wildcard:
4916−
4917− ---
4918− nocite: |
4919− @*
4920− ...
4921−
4922−For LaTeX output, you can also use [`natbib`] or [`biblatex`] to
4923−render the bibliography. In order to do so, specify bibliography
4924−files as outlined above, and add `--natbib` or `--biblatex`
4925−argument to `pandoc` invocation. Bear in mind that bibliography
4926−files have to be in respective format (either BibTeX or
4927−BibLaTeX).
5039+This will cause the author's name to be rendered, followed by
5040+the bibliographical details. Use this form when you want to
5041+make the citation the subject of a sentence.
49285042
4929−For more information, see the [pandoc-citeproc man page].
5043+When you are using a note style, it is usually better to let
5044+citeproc create the footnotes from citations rather than writing
5045+an explicit note. If you do write an explicit note that
5046+contains a citation, note that normal citations will be put in
5047+parentheses, while author-in-text citations will not. For
5048+this reason, it is sometimes preferable to use the
5049+author-in-text style inside notes when using a note style.
49305050
5051+[CSL user documentation]: https://citationstyles.org/authors/
5052+[CSL]: https://docs.citationstyles.org/en/stable/specification.html
49315053[CSL markup specs]: https://docs.citationstyles.org/en/1.0/release-notes.html#rich-text-markup-within-fields
49325054[Chicago Manual of Style]: https://chicagomanualofstyle.org
49335055[Citation Style Language]: https://citationstyles.org
49345056[Zotero Style Repository]: https://www.zotero.org/styles
49355057[finding and editing styles]: https://citationstyles.org/authors/
49365058[CSL locale files]: https://github.com/citation-style-language/locales
4937−[pandoc-citeproc man page]: https://github.com/jgm/pandoc-citeproc/blob/master/man/pandoc-citeproc.1.md
49385059
4939−## Non-pandoc extensions
5060+## Non-default extensions
49405061
49415062The following Markdown syntax extensions are not enabled by default
49425063in pandoc, but may be enabled by adding `+EXTENSION` to the format
49435064name, where `EXTENSION` is the name of the extension. Thus, for
49445065example, `markdown+hard_line_breaks` is Markdown with hard line breaks.
49455066
5067+#### Extension: `rebase_relative_paths` ####
5068+
5069+Rewrite relative paths for Markdown links and images, depending
5070+on the path of the file containing the link or image link. For
5071+each link or image, pandoc will compute the directory of the
5072+containing file, relative to the working directory, and prepend
5073+the resulting path to the link or image path.
5074+
5075+The use of this extension is best understood by example.
5076+Suppose you have a a subdirectory for each chapter of a book,
5077+`chap1`, `chap2`, `chap3`. Each contains a file `text.md` and a
5078+number of images used in the chapter. You would like to have
5079+`![image](spider.jpg)` in `chap1/text.md` refer to
5080+`chap1/spider.jpg` and `![image](spider.jpg)` in `chap2/text.md`
5081+refer to `chap2/spider.jpg`. To do this, use
5082+
5083+ pandoc chap*/*.md -f markdown+rebase_relative_paths
5084+
5085+Without this extension, you would have to use
5086+`![image](chap1/spider.jpg)` in `chap1/text.md` and
5087+`![image](chap2/spider.jpg)` in `chap2/text.md`. Links with
5088+relative paths will be rewritten in the same way as images.
5089+
5090+Absolute paths and URLs are not changed. Neither are empty
5091+paths or paths consisting entirely of a fragment, e.g., `#foo`.
5092+
5093+Note that relative paths in reference links and images will
5094+be rewritten relative to the file containing the link
5095+reference definition, not the file containing the reference link
5096+or image itself, if these differ.
5097+
5098+#### Extension: `attributes` ####
5099+
5100+Allows attributes to be attached to any inline or block-level
5101+element. The syntax for the attributes is the same as that
5102+used in [`header_attributes`][Extension: `header_attributes`].
5103+
5104+- Attributes that occur immediately after an inline
5105+ element affect that element. If they follow a space, then they
5106+ belong to the space. (Hence, this option subsumes
5107+ `inline_code_attributes` and `link_attributes`.)
5108+- Attributes that occur immediately before a block
5109+ element, on a line by themselves, affect that
5110+ element.
5111+- Consecutive attribute specifiers may be used,
5112+ either for blocks or for inlines. Their attributes
5113+ will be combined.
5114+- Attributes that occur at the end of the text of
5115+ a Setext or ATX heading (separated by whitespace
5116+ from the text) affect the heading element. (Hence, this
5117+ option subsumes `header_attributes`.)
5118+- Attributes that occur after the opening fence
5119+ in a fenced code block affect the code block element. (Hence,
5120+ this option subsumes `fenced_code_attributes`.)
5121+- Attributes that occur at the end of a reference
5122+ link definition affect links that refer to that
5123+ definition.
5124+
5125+Note that pandoc's AST does not currently allow attributes
5126+to be attached to arbitrary elements. Hence a Span or Div
5127+container will be added if needed.
5128+
49465129#### Extension: `old_dashes` ####
49475130
49485131Selects the pandoc <= 1.8.2.1 behavior for parsing smart dashes:
@@ -5098,58 +5281,382 @@ for regular emphasis, add extra blank space around headings.
50985281
50995282 [Project Gutenberg]: https://www.gutenberg.org
51005283
5284+#### Extension: `sourcepos` ####
5285+
5286+Include source position attributes when parsing `commonmark`.
5287+For elements that accept attributes, a `data-pos` attribute
5288+is added; other elements are placed in a surrounding
5289+Div or Span elemnet with a `data-pos` attribute.
5290+
51015291## Markdown variants
51025292
51035293In addition to pandoc's extended Markdown, the following Markdown
51045294variants are supported:
51055295
5106−`markdown_phpextra` (PHP Markdown Extra)
5107−: `footnotes`, `pipe_tables`, `raw_html`, `markdown_attribute`,
5108− `fenced_code_blocks`, `definition_lists`, `intraword_underscores`,
5109− `header_attributes`, `link_attributes`, `abbreviations`,
5110− `shortcut_reference_links`, `spaced_reference_links`.
5111−
5112−`markdown_github` (deprecated GitHub-Flavored Markdown)
5113−: `pipe_tables`, `raw_html`, `fenced_code_blocks`, `auto_identifiers`,
5114− `gfm_auto_identifiers`, `backtick_code_blocks`,
5115− `autolink_bare_uris`, `space_in_atx_header`,
5116− `intraword_underscores`, `strikeout`, `task_lists`, `emoji`,
5117− `shortcut_reference_links`, `angle_brackets_escapable`,
5118− `lists_without_preceding_blankline`.
5119−
5120−`markdown_mmd` (MultiMarkdown)
5121−: `pipe_tables`, `raw_html`, `markdown_attribute`, `mmd_link_attributes`,
5122− `tex_math_double_backslash`, `intraword_underscores`,
5123− `mmd_title_block`, `footnotes`, `definition_lists`,
5124− `all_symbols_escapable`, `implicit_header_references`,
5125− `auto_identifiers`, `mmd_header_identifiers`,
5126− `shortcut_reference_links`, `implicit_figures`,
5127− `superscript`, `subscript`, `backtick_code_blocks`,
5128− `spaced_reference_links`, `raw_attribute`.
5129−
5130−`markdown_strict` (Markdown.pl)
5131−: `raw_html`, `shortcut_reference_links`,
5132− `spaced_reference_links`.
5133−
5134−We also support `commonmark` and `gfm` (GitHub-Flavored Markdown,
5135−which is implemented as a set of extensions on `commonmark`).
5136−
5137−Note, however, that `commonmark` and `gfm` have limited support
5138−for extensions. Only those listed below (and `smart`,
5139−`raw_tex`, and `hard_line_breaks`) will work. The extensions
5140−can, however, all be individually disabled. Also, `raw_tex`
5141−only affects `gfm` output, not input.
5142−
5143−`gfm` (GitHub-Flavored Markdown)
5144−: `pipe_tables`, `raw_html`, `fenced_code_blocks`, `auto_identifiers`,
5145− `gfm_auto_identifiers`, `backtick_code_blocks`,
5146− `autolink_bare_uris`, `space_in_atx_header`,
5147− `intraword_underscores`, `strikeout`, `task_lists`, `emoji`,
5148− `shortcut_reference_links`, `angle_brackets_escapable`,
5149− `lists_without_preceding_blankline`.
5150−
5151−
5152−# Producing slide shows with pandoc
5296+- `markdown_phpextra` (PHP Markdown Extra)
5297+- `markdown_github` (deprecated GitHub-Flavored Markdown)
5298+- `markdown_mmd` (MultiMarkdown)
5299+- `markdown_strict` (Markdown.pl)
5300+- `commonmark` (CommonMark)
5301+- `gfm` (Github-Flavored Markdown)
5302+- `commonmark_x` (CommonMark with many pandoc extensions)
5303+
5304+To see which extensions are supported for a given format,
5305+and which are enabled by default, you can use the command
5306+
5307+ pandoc --list-extensions=FORMAT
5308+
5309+where `FORMAT` is replaced with the name of the format.
5310+
5311+Note that the list of extensions for `commonmark`,
5312+`gfm`, and `commonmark_x` are defined relative to default
5313+commonmark. So, for example, `backtick_code_blocks`
5314+does not appear as an extension, since it is enabled by
5315+default and cannot be disabled.
5316+
5317+# Citations
5318+
5319+When the `--citeproc` option is used, pandoc can automatically generate
5320+citations and a bibliography in a number of styles. Basic usage is
5321+
5322+ pandoc --citeproc myinput.txt
5323+
5324+To use this feature, you will need to have
5325+
5326+- a document containing citations (see [Extension: `citations`]);
5327+- a source of bibliographic data: either an external bibliography
5328+ file or a list of `references` in the document's YAML metadata
5329+- optionally, a [CSL] citation style.
5330+
5331+## Specifying bibliographic data
5332+
5333+You can specify an external bibliography using the
5334+`bibliography` metadata field in a YAML metadata section or the
5335+`--bibliography` command line argument. If you want to use
5336+multiple bibliography files, you can supply multiple
5337+`--bibliography` arguments or set `bibliography` metadata field
5338+to YAML array. A bibliography may have any of these formats:
5339+
5340+ Format File extension
5341+ ------------ --------------
5342+ BibLaTeX .bib
5343+ BibTeX .bibtex
5344+ CSL JSON .json
5345+ CSL YAML .yaml
5346+
5347+Note that `.bib` can be used with both BibTeX and BibLaTeX files;
5348+use the extension `.bibtex` to force interpretation as BibTeX.
5349+
5350+In BibTeX and BibLaTeX databases, pandoc parses LaTeX markup
5351+inside fields such as `title`; in CSL YAML databases, pandoc
5352+Markdown; and in CSL JSON databases, an [HTML-like markup][CSL
5353+markup specs]:
5354+
5355+`<i>...</i>`
5356+: italics
5357+
5358+`<b>...</b>`
5359+: bold
5360+
5361+`<span style="font-variant:small-caps;">...</span>` or `<sc>...</sc>`
5362+: small capitals
5363+
5364+`<sub>...</sub>`
5365+: subscript
5366+
5367+`<sup>...</sup>`
5368+: superscript
5369+
5370+`<span class="nocase">...</span>`
5371+: prevent a phrase from being capitalized as title case
5372+
5373+As an alternative to specifying a bibliography file using
5374+`--bibliography` or the YAML metadata field `bibliography`, you
5375+can include the citation data directly in the `references` field
5376+of the document's YAML metadata. The field should contain an
5377+array of YAML-encoded references, for example:
5378+
5379+ ---
5380+ references:
5381+ - type: article-journal
5382+ id: WatsonCrick1953
5383+ author:
5384+ - family: Watson
5385+ given: J. D.
5386+ - family: Crick
5387+ given: F. H. C.
5388+ issued:
5389+ date-parts:
5390+ - - 1953
5391+ - 4
5392+ - 25
5393+ title: 'Molecular structure of nucleic acids: a structure for
5394+ deoxyribose nucleic acid'
5395+ title-short: Molecular structure of nucleic acids
5396+ container-title: Nature
5397+ volume: 171
5398+ issue: 4356
5399+ page: 737-738
5400+ DOI: 10.1038/171737a0
5401+ URL: https://www.nature.com/articles/171737a0
5402+ language: en-GB
5403+ ...
5404+
5405+If both an external bibliography and inline (YAML metadata)
5406+references are provided, both will be used. In case of
5407+conflicting `id`s, the inline references will take precedence.
5408+
5409+Note that `pandoc` can be used to produce such a YAML metadata
5410+section from a BibTeX, BibLaTeX, or CSL JSON bibliography:
5411+
5412+ pandoc chem.bib -s -f biblatex -t markdown
5413+ pandoc chem.json -s -f csljson -t markdown
5414+
5415+Indeed, `pandoc` can convert between any of these
5416+citation formats:
5417+
5418+ pandoc chem.bib -s -f biblatex -t csljson
5419+ pandoc chem.yaml -s -f markdown -t biblatex
5420+
5421+Running pandoc on a bibliography file with the `--citeproc`
5422+option will create a formatted bibliography in the format
5423+of your choice:
5424+
5425+ pandoc chem.bib -s --citeproc -o chem.html
5426+ pandoc chem.bib -s --citeproc -o chem.pdf
5427+
5428+### Capitalization in titles
5429+
5430+If you are using a bibtex or biblatex bibliography, then observe
5431+the following rules:
5432+
5433+ - English titles should be in title case. Non-English titles should
5434+ be in sentence case, and the `langid` field in biblatex should be
5435+ set to the relevant language. (The following values are treated
5436+ as English: `american`, `british`, `canadian`, `english`,
5437+ `australian`, `newzealand`, `USenglish`, or `UKenglish`.)
5438+
5439+ - As is standard with bibtex/biblatex, proper names should be
5440+ protected with curly braces so that they won't be lowercased
5441+ in styles that call for sentence case. For example:
5442+
5443+ title = {My Dinner with {Andre}}
5444+
5445+ - In addition, words that should remain lowercase (or camelCase)
5446+ should be protected:
5447+
5448+ title = {Spin Wave Dispersion on the {nm} Scale}
5449+
5450+ Though this is not necessary in bibtex/biblatex, it is necessary
5451+ with citeproc, which stores titles internally in sentence case,
5452+ and converts to title case in styles that require it. Here we
5453+ protect "nm" so that it doesn't get converted to "Nm" at this stage.
5454+
5455+If you are using a CSL bibliography (either JSON or YAML), then observe
5456+the following rules:
5457+
5458+ - All titles should be in sentence case.
5459+
5460+ - Use the `language` field for non-English titles to prevent their
5461+ conversion to title case in styles that call for this. (Conversion
5462+ happens only if `language` begins with `en` or is left empty.)
5463+
5464+ - Protect words that should not be converted to title case using
5465+ this syntax:
5466+
5467+ Spin wave dispersion on the <span class="nocase">nm</span> scale
5468+
5469+### Conference Papers, Published vs. Unpublished
5470+
5471+For a formally published conference paper, use the biblatex entry type
5472+`inproceedings` (which will be mapped to CSL `paper-conference`).
5473+
5474+For an unpublished manuscript, use the biblatex entry type
5475+`unpublished` without an `eventtitle` field (this entry type
5476+will be mapped to CSL `manuscript`).
5477+
5478+For a talk, an unpublished conference paper, or a poster
5479+presentation, use the biblatex entry type `unpublished` with an
5480+`eventtitle` field (this entry type will be mapped to CSL
5481+`speech`). Use the biblatex `type` field to indicate the type,
5482+e.g. "Paper", or "Poster". `venue` and `eventdate` may be useful
5483+too, though `eventdate` will not be rendered by most CSL styles.
5484+Note that `venue` is for the event's venue, unlike `location`
5485+which describes the publisher's location; do not use the latter
5486+for an unpublished conference paper.
5487+
5488+
5489+## Specifying a citation style
5490+
5491+Citations and references can be formatted using any style supported by the
5492+[Citation Style Language], listed in the [Zotero Style Repository].
5493+These files are specified using the `--csl` option or the `csl`
5494+(or `citation-style`) metadata field. By default, pandoc will
5495+use the [Chicago Manual of Style] author-date format. (You can
5496+override this default by copying a CSL style of your choice
5497+to `default.csl` in your user data directory.)
5498+The CSL project provides further information on [finding and
5499+editing styles].
5500+
5501+The `--citation-abbreviations` option (or the
5502+`citation-abbreviations` metadata field) may be used to specify
5503+a JSON file containing abbreviations of journals that should be
5504+used in formatted bibliographies when `form="short"` is
5505+specified. The format of the file can be illustrated with an
5506+example:
5507+
5508+
5509+ { "default": {
5510+ "container-title": {
5511+ "Lloyd's Law Reports": "Lloyd's Rep",
5512+ "Estates Gazette": "EG",
5513+ "Scots Law Times": "SLT"
5514+ }
5515+ }
5516+ }
5517+
5518+
5519+## Citations in note styles
5520+
5521+Pandoc's citation processing is designed to allow you to
5522+move between author-date, numerical, and note styles without
5523+modifying the markdown source. When you're using a note
5524+style, avoid inserting footnotes manually. Instead, insert
5525+citations just as you would in an author-date style---for
5526+example,
5527+
5528+ Blah blah [@foo, p. 33].
5529+
5530+The footnote will be created automatically. Pandoc will take
5531+care of removing the space and moving the note before or
5532+after the period, depending on the setting of
5533+`notes-after-punctuation`, as described below in [Other relevant
5534+metadata fields].
5535+
5536+In some cases you may need to put a citation inside a regular
5537+footnote. Normal citations in footnotes (such as `[@foo, p.
5538+33]`) will be rendered in parentheses. In-text citations (such
5539+as `@foo [p. 33]`) will be rendered without parentheses. (A
5540+comma will be added if appropriate.) Thus:
5541+
5542+ [^1]: Some studies [@foo; @bar, p. 33] show that
5543+ frubulicious zoosnaps are quantical. For a survey
5544+ of the literature, see @baz [chap. 1].
5545+
5546+## Raw content in a style
5547+
5548+To include raw content in a prefix, suffix, delimiter, or term,
5549+surround it with these tags indicating the format:
5550+
5551+ {{jats}}&lt;ref&gt;{{/jats}}
5552+
5553+Without the tags, the string will be interpreted as a string
5554+and escaped in the output, rather than being passed through raw.
5555+
5556+This feature allows stylesheets to be customized to give
5557+different output for different output formats. However,
5558+stylesheets customized in this way will not be usable
5559+by other CSL implementations.
5560+
5561+
5562+
5563+## Placement of the bibliography
5564+
5565+If the style calls for a list of works cited, it will be placed
5566+in a div with id `refs`, if one exists:
5567+
5568+ ::: {#refs}
5569+ :::
5570+
5571+Otherwise, it will be placed at the end of the document.
5572+Generation of the bibliography can be suppressed by setting
5573+`suppress-bibliography: true` in the YAML metadata.
5574+
5575+If you wish the bibliography to have a section heading, you can
5576+set `reference-section-title` in the metadata, or put the heading
5577+at the beginning of the div with id `refs` (if you are using it)
5578+or at the end of your document:
5579+
5580+ last paragraph...
5581+
5582+ # References
5583+
5584+The bibliography will be inserted after this heading. Note that
5585+the `unnumbered` class will be added to this heading, so that the
5586+section will not be numbered.
5587+
5588+## Including uncited items in the bibliography
5589+
5590+If you want to include items in the bibliography without actually
5591+citing them in the body text, you can define a dummy `nocite` metadata
5592+field and put the citations there:
5593+
5594+ ---
5595+ nocite: |
5596+ @item1, @item2
5597+ ...
5598+
5599+ @item3
5600+
5601+In this example, the document will contain a citation for `item3`
5602+only, but the bibliography will contain entries for `item1`, `item2`, and
5603+`item3`.
5604+
5605+It is possible to create a bibliography with all the citations,
5606+whether or not they appear in the document, by using a wildcard:
5607+
5608+ ---
5609+ nocite: |
5610+ @*
5611+ ...
5612+
5613+For LaTeX output, you can also use [`natbib`] or [`biblatex`] to
5614+render the bibliography. In order to do so, specify bibliography
5615+files as outlined above, and add `--natbib` or `--biblatex`
5616+argument to `pandoc` invocation. Bear in mind that bibliography
5617+files have to be in either BibTeX (for `--natbib`)
5618+or BibLaTeX (for `--biblatex`) format.
5619+
5620+## Other relevant metadata fields
5621+
5622+A few other metadata fields affect bibliography formatting:
5623+
5624+`link-citations`
5625+: If true, citations will be
5626+ hyperlinked to the corresponding bibliography entries
5627+ (for author-date and numerical styles only).
5628+
5629+`lang`
5630+: The `lang` field will affect how the style is localized,
5631+ for example in the translation of labels, the use
5632+ of quotation marks, and the way items are sorted.
5633+ (For backwards compatibility, `locale` may be used instead
5634+ of `lang`, but this use is deprecated.)
5635+
5636+ A BCP 47 language tag is expected: for example, `en`,
5637+ `de`, `en-US`, `fr-CA`, `ug-Cyrl`. The unicode extension
5638+ syntax (after `-u-`) may be used to specify options for
5639+ collation (sorting) more precisely. Here are some examples:
5640+
5641+ - `zh-u-co-pinyin` -- Chinese with the Pinyin collation.
5642+ - `es-u-co-trad` -- Spanish with the traditional collation
5643+ (with `Ch` sorting after `C`).
5644+ - `fr-u-kb` -- French with "backwards" accent sorting
5645+ (with `coté` sorting after `côte`).
5646+ - `en-US-u-kf-upper` -- English with uppercase letters sorting
5647+ before lower (default is lower before upper).
5648+
5649+`notes-after-punctuation`
5650+: If true (the default), pandoc will put footnote citations
5651+ after following punctuation. For example, if the source
5652+ contains `blah blah [@jones99].`, the result will look like
5653+ `blah blah.[^1]`, with the note moved after the period and
5654+ the space collapsed. If false, the space will still be
5655+ collapsed, but the footnote will not be moved after the
5656+ punctuation.
5657+
5658+
5659+# Slide shows
51535660
51545661You can use pandoc to produce an HTML + JavaScript slide presentation
51555662that can be viewed via a web browser. There are five ways to do this,
@@ -5197,18 +5704,21 @@ To produce an HTML/JavaScript slide show, simply type
51975704
51985705where `FORMAT` is either `s5`, `slidy`, `slideous`, `dzslides`, or `revealjs`.
51995706
5200−For Slidy, Slideous, reveal.js, and S5, the file produced by pandoc with the
5201−`-s/--standalone` option embeds a link to JavaScript and CSS files, which are
5202−assumed to be available at the relative path `s5/default` (for S5), `slideous`
5203−(for Slideous), `reveal.js` (for reveal.js), or at the Slidy website at
5204−`w3.org` (for Slidy). (These paths can be changed by setting the `slidy-url`,
5205−`slideous-url`, `revealjs-url`, or `s5-url` variables; see [Variables for HTML slides],
5206−above.) For DZSlides, the (relatively short) JavaScript and CSS are included in
5207−the file by default.
5208−
5209−With all HTML slide formats, the `--self-contained` option can be used to
5210−produce a single file that contains all of the data necessary to display the
5211−slide show, including linked scripts, stylesheets, images, and videos.
5707+For Slidy, Slideous, reveal.js, and S5, the file produced by
5708+pandoc with the `-s/--standalone` option embeds a link to
5709+JavaScript and CSS files, which are assumed to be available at
5710+the relative path `s5/default` (for S5), `slideous` (for
5711+Slideous), `reveal.js` (for reveal.js), or at the Slidy website
5712+at `w3.org` (for Slidy). (These paths can be changed by setting
5713+the `slidy-url`, `slideous-url`, `revealjs-url`, or `s5-url`
5714+variables; see [Variables for HTML slides], above.) For
5715+DZSlides, the (relatively short) JavaScript and CSS are included
5716+in the file by default.
5717+
5718+With all HTML slide formats, the `--self-contained` option can
5719+be used to produce a single file that contains all of the data
5720+necessary to display the slide show, including linked scripts,
5721+stylesheets, images, and videos.
52125722
52135723To produce a PDF slide show using beamer, type
52145724
@@ -5238,7 +5748,11 @@ rules:
52385748 * A heading at the slide level always starts a new slide.
52395749
52405750 * Headings *below* the slide level in the hierarchy create
5241− headings *within* a slide.
5751+ headings *within* a slide. (In beamer, a "block" will be
5752+ created. If the heading has the class `example`, an
5753+ `exampleblock` environment will be used; if it has the class
5754+ `alert`, an `alertblock` will be used; otherwise a regular
5755+ `block` will be used.)
52425756
52435757 * Headings *above* the slide level in the hierarchy create
52445758 "title slides," which just contain the section title
@@ -5491,7 +6005,7 @@ Slide 1 has background_image.png as its background.
54916005Slide 2 has a special image for its background, even though the heading has no content.
54926006```
54936007
5494−# Creating EPUBs with pandoc
6008+# EPUBs
54956009
54966010## EPUB Metadata
54976011
@@ -5571,6 +6085,15 @@ The following fields are recognized:
55716085
55726086`rights`
55736087 ~ A string value.
6088+
6089+`belongs-to-collection`
6090+ ~ A string value. identifies the name of a collection to which
6091+ the EPUB Publication belongs.
6092+
6093+`group-position`
6094+ ~ The `group-position` field indicates the numeric position in which
6095+ the EPUB Publication belongs relative to other works belonging to
6096+ the same `belongs-to-collection` field.
55746097
55756098`cover-image`
55766099 ~ A string value (path to cover image).
@@ -5632,8 +6155,6 @@ halftitlepage frontmatter
56326155seriespage frontmatter
56336156foreword frontmatter
56346157preface frontmatter
5635−seriespage frontmatter
5636−titlepage frontmatter
56376158appendix backmatter
56386159colophon backmatter
56396160bibliography backmatter
@@ -5656,7 +6177,7 @@ with the `src` attribute. For example:
56566177 </source>
56576178 </audio>
56586179
5659−# Creating Jupyter notebooks with pandoc
6180+# Jupyter notebooks
56606181
56616182When creating a [Jupyter notebook], pandoc will try to infer the
56626183notebook structure. Code blocks with the class `code` will be
@@ -5809,7 +6330,7 @@ Then edit `my.theme` and use it like this:
58096330If you are not satisfied with the built-in highlighting, or you
58106331want highlight a language that isn't supported, you can use the
58116332`--syntax-definition` option to load a [KDE-style XML syntax definition
5812−file](https://docs.kde.org/stable5/en/applications/katepart/highlight.html).
6333+file](https://docs.kde.org/stable5/en/kate/katepart/highlight.html).
58136334Before writing your own, have a look at KDE's [repository of syntax
58146335definitions](https://github.com/KDE/syntax-highlighting/tree/master/data/syntax).
58156336
@@ -5940,6 +6461,21 @@ subdirectory of your user data directory (see [Templates]).
59406461
59416462[Lua]: https://www.lua.org
59426463
6464+# Reproducible builds
6465+
6466+Some of the document formats pandoc targets (such as EPUB,
6467+docx, and ODT) include build timestamps in the generated document.
6468+That means that the files generated on successive builds will
6469+differ, even if the source does not. To avoid this, set the
6470+`SOURCE_DATE_EPOCH` environment variable, and the timestamp will
6471+be taken from it instead of the current time.
6472+`SOURCE_DATE_EPOCH` should contain an integer unix timestamp
6473+(specifying the number of second since midnight UTC January 1, 1970).
6474+
6475+Some document formats also include a unique identifier. For
6476+EPUB, this can be set explicitly by setting the `identifier`
6477+metadata field (see [EPUB Metadata], above).
6478+
59436479# A note on security
59446480
59456481If you use pandoc to convert user-contributed content in a web
@@ -5968,13 +6504,13 @@ application, here are some things to keep in mind:
596865044. The HTML generated by pandoc is not guaranteed to be safe.
59696505 If `raw_html` is enabled for the Markdown input, users can
59706506 inject arbitrary HTML. Even if `raw_html` is disabled,
5971− users can include dangerous content in attributes for
5972− headings, spans, and code blocks. To be safe, you should
5973− run all the generated HTML through an HTML sanitizer.
6507+ users can include dangerous content in URLs and attributes.
6508+ To be safe, you should run all the generated HTML through
6509+ an HTML sanitizer.
59746510
59756511# Authors
59766512
5977−Copyright 2006--2020 John MacFarlane (jgm@berkeley.edu). Released
6513+Copyright 2006--2021 John MacFarlane (jgm@berkeley.edu). Released
59786514under the [GPL], version 2 or greater. This software carries no
59796515warranty of any kind. (See COPYRIGHT for full copyright and
59806516warranty notices.) For a full list of contributors, see the file
Makefile+55−50
@@ -2,16 +2,31 @@ version?=$(shell grep '^[Vv]ersion:' pandoc.cabal | awk '{print $$2;}')
22pandoc=$(shell find dist -name pandoc -type f -exec ls -t {} \; | head -1)
33SOURCEFILES?=$(shell git ls-tree -r master --name-only | grep "\.hs$$")
44BRANCH?=master
5−RESOLVER?=lts-13
6−GHCOPTS=-fdiagnostics-color=always
5+ARCH=$(shell uname -m)
6+DOCKERIMAGE=registry.gitlab.b-data.ch/ghc/ghc4pandoc:8.10.4
7+COMMIT=$(shell git rev-parse --short HEAD)
8+TIMESTAMP=$(shell date "+%Y%m%d_%H%M")
9+LATESTBENCH=$(word 1,$(shell ls -t bench_*.csv 2>/dev/null))
10+BASELINE?=$(LATESTBENCH)
11+ifeq ($(BASELINE),)
12+BASELINECMD=
13+else
14+BASELINECMD=--baseline $(BASELINE)
15+endif
16+GHCOPTS=-fdiagnostics-color=always -j4 +RTS -A8m -RTS
717WEBSITE=../../web/pandoc.org
18+REVISION?=1
19+# For gauge:
20+# BENCHARGS?=--small --ci=0.90 --match=pattern $(PATTERN)
21+# For tasty-bench:
22+BENCHARGS?=--csv bench_$(TIMESTAMP).csv $(BASELINECMD) --timeout=6 +RTS -T -RTS $(if $(PATTERN),--pattern "$(PATTERN)",)
823
924quick:
10− stack install --ghc-options='$(GHCOPTS)' --install-ghc --flag 'pandoc:embed_data_files' --fast --test --ghc-options='-j +RTS -A64m -RTS' --test-arguments='-j4 --hide-successes $(TESTARGS)'
25+ stack install --ghc-options='$(GHCOPTS)' --install-ghc --flag 'pandoc:embed_data_files' --fast --test --ghc-options='$(GHCOPTS)' --test-arguments='-j4 --hide-successes $(TESTARGS)'
1126
1227quick-cabal:
1328 cabal new-configure . --ghc-options '$(GHCOPTS)' --disable-optimization --enable-tests
14− cabal new-build . --disable-optimization
29+ cabal new-build -j4 . --disable-optimization
1530 cabal new-run test-pandoc --disable-optimization -- --hide-successes $(TESTARGS)
1631
1732full-cabal:
@@ -20,7 +35,7 @@ full-cabal:
2035 cabal new-run test-pandoc --disable-optimization -- --hide-successes $(TESTARGS)
2136
2237full:
23− stack install --flag 'pandoc:embed_data_files' --flag 'pandoc:trypandoc' --bench --no-run-benchmarks --test --test-arguments='-j4 --hide-successes' --ghc-options '-Wall -Werror -fno-warn-unused-do-bind -O0 -j4 $(GHCOPTS)'
38+ stack install --flag 'pandoc:embed_data_files' --flag 'pandoc:trypandoc' --bench --no-run-benchmarks --test --test-arguments='-j4 --hide-successes' --ghc-options '-Wall -Werror -fno-warn-unused-do-bind -O0 $(GHCOPTS)'
2439
2540ghci:
2641 stack ghci --flag 'pandoc:embed_data_files'
@@ -36,11 +51,14 @@ test:
3651ghcid:
3752 ghcid -c "stack repl --flag 'pandoc:embed_data_files'"
3853
39−bench:
40− stack bench --benchmark-arguments='$(BENCHARGS)' --ghc-options '$(GHCOPTS)'
54+ghcid-test:
55+ ghcid -c "stack repl --ghc-options=-XNoImplicitPrelude --flag 'pandoc:embed_data_files' --ghci-options=-fobject-code pandoc:lib pandoc:test-pandoc"
4156
42−weigh:
43− stack build --ghc-options '$(GHCOPTS)' pandoc:weigh-pandoc && stack exec weigh-pandoc
57+bench:
58+ stack bench \
59+ --ghc-options '$(GHCOPTS)' \
60+ --benchmark-arguments='$(BENCHARGS)' 2>&1 | \
61+ tee "bench_latest.txt"
4462
4563reformat:
4664 for f in $(SOURCEFILES); do echo $$f; stylish-haskell -i $$f ; done
@@ -64,48 +82,25 @@ dist: man/pandoc.1
6482 cd pandoc-${version}
6583 stack setup && stack test && cd .. && rm -rf "pandoc-${version}"
6684
67−packages: checkdocs winpkg debpkg macospkg
85+check: checkdocs check-cabal
6886
69−checkdocs: README.md
70− ! grep -n -e "\t" MANUAL.txt changelog
87+checkdocs:
88+ ! grep -q -n -e "\t" MANUAL.txt changelog.md
7189
7290debpkg: man/pandoc.1
73− make -C linux && \
74− cp linux/artifacts/pandoc-$(version)-*.* .
75−
76−macospkg: man/pandoc.1
77− ./macos/make_macos_package.sh
78−
79−winpkg: pandoc-$(version)-windows-i386.msi pandoc-$(version)-windows-i386.zip pandoc-$(version)-windows-x86_64.msi pandoc-$(version)-windows-x86_64.zip
80−
81−pandoc-$(version)-windows-%.zip: pandoc-$(version)-windows-%.msi
82− ORIGDIR=`pwd` && \
83− CONTAINER=$(basename $<) && \
84− TEMPDIR=`mktemp -d` && \
85− msiextract -C $$TEMPDIR/msi $< && \
86− pushd $$TEMPDIR && \
87− mkdir $$CONTAINER && \
88− find msi -type f -exec cp {} $$CONTAINER/ \; && \
89− zip -r $$ORIGDIR/$@ $$CONTAINER && \
90− popd & \
91− rm -rf $$TEMPDIR
92−
93−pandoc-$(version)-windows-%.msi: pandoc-windows-%.msi
94− osslsigncode sign -pkcs12 ~/Private/SectigoCodeSigning.exp2023.p12 -in $< -i http://johnmacfarlane.net/ -t http://timestamp.comodoca.com/ -out $@ -askpass
95− rm $<
96−
97−.INTERMEDIATE: pandoc-windows-i386.msi pandoc-windows-x86_64.msi
98−
99−pandoc-windows-i386.msi:
100− JOBID=$(shell curl https://ci.appveyor.com/api/projects/jgm/pandoc | jq '.build.jobs[]| select(.name|test("i386")) | .jobId') && \
101− wget "https://ci.appveyor.com/api/buildjobs/$$JOBID/artifacts/windows%2F$@" -O $@
102−
103−pandoc-windows-x86_64.msi:
104− JOBID=$(shell curl https://ci.appveyor.com/api/projects/jgm/pandoc | jq '.build.jobs[]| select(.name|test("x86_64")) | .jobId') && \
105− wget "https://ci.appveyor.com/api/buildjobs/$$JOBID/artifacts/windows%2F$@" -O $@
91+ docker run -v `pwd`:/mnt \
92+ -v `pwd`/linux/artifacts:/artifacts \
93+ --user $(id -u):$(id -g) \
94+ -e REVISION=$(REVISION) \
95+ -w /mnt \
96+ --memory=0 \
97+ --rm \
98+ $(DOCKERIMAGE) \
99+ bash \
100+ /mnt/linux/make_artifacts.sh 2>&1 > docker.log
106101
107102man/pandoc.1: MANUAL.txt man/pandoc.1.before man/pandoc.1.after
108− pandoc $< -f markdown-smart -t man -s \
103+ pandoc $< -f markdown -t man -s \
109104 --lua-filter man/manfilter.lua \
110105 --include-before-body man/pandoc.1.before \
111106 --include-after-body man/pandoc.1.after \
@@ -114,7 +109,7 @@ man/pandoc.1: MANUAL.txt man/pandoc.1.before man/pandoc.1.after
114109 -o $@
115110
116111README.md: README.template MANUAL.txt tools/update-readme.lua
117− pandoc --lua-filter tools/update-readme.lua --reference-links \
112+ pandoc --lua-filter tools/update-readme.lua \
118113 --reference-location=section -t gfm $< -o $@
119114
120115download_stats:
@@ -123,9 +118,9 @@ download_stats:
123118
124119pandoc-templates:
125120 rm ../pandoc-templates/default.* ; \
126− cp data/templates/default.* data/templates/README.markdown data/templates/styles.* ../pandoc-templates/ ; \
121+ cp data/templates/* ../pandoc-templates/ ; \
127122 pushd ../pandoc-templates/ && \
128− git add default.* README.markdown styles.* && \
123+ git add * && \
129124 git commit -m "Updated templates for pandoc $(version)" && \
130125 popd
131126
@@ -140,4 +135,14 @@ update-website:
140135clean:
141136 stack clean
142137
143−.PHONY: deps quick full haddock install clean test bench changes_github macospkg dist prof download_stats reformat lint weigh doc/lua-filters.md packages pandoc-templates trypandoc update-website debpkg macospkg winpkg checkdocs ghcid ghci fix_spacing hlint
138+check-cabal: git-files.txt sdist-files.txt
139+ echo "Checking to see if all committed test/data files are in sdist."
140+ diff -u $^
141+
142+sdist-files.txt: .FORCE
143+ cabal sdist --list-only | sed 's/\.\///' | grep '^\(test\|data\)\/' | sort > $@
144+
145+git-files.txt: .FORCE
146+ git ls-tree -r --name-only HEAD | grep '^\(test\|data\)\/' | sort > $@
147+
148+.PHONY: .FORCE deps quick full haddock install clean test bench changes_github dist prof download_stats reformat lint weigh doc/lua-filters.md pandoc-templates trypandoc update-website debpkg checkdocs ghcid ghci fix_spacing hlint check check-cabal
README.md+106−93
@@ -8,11 +8,10 @@ pandoc --lua-filter tools/update-readme.lua README.template -o README.md
88[![github
99release](https://img.shields.io/github/release/jgm/pandoc.svg?label=current+release)](https://github.com/jgm/pandoc/releases)
1010[![hackage
11−release](https://img.shields.io/hackage/v/pandoc.svg?label=hackage)](http://hackage.haskell.org/package/pandoc)
12−[![homebrew](https://img.shields.io/homebrew/v/pandoc.svg)](http://brewformulas.org/Pandoc)
11+release](https://img.shields.io/hackage/v/pandoc.svg?label=hackage)](https://hackage.haskell.org/package/pandoc)
12+[![homebrew](https://img.shields.io/homebrew/v/pandoc.svg)](https://formulae.brew.sh/formula/pandoc)
1313[![stackage LTS
14−package](http://stackage.org/package/pandoc/badge/lts)](http://stackage.org/lts/package/pandoc)
15−[![CircleCI](https://circleci.com/gh/jgm/pandoc.svg?style=svg)](https://circleci.com/gh/jgm/pandoc)
14+package](https://stackage.org/package/pandoc/badge/lts)](https://www.stackage.org/lts/package/pandoc-types)
1615[![CI
1716tests](https://github.com/jgm/pandoc/workflows/CI%20tests/badge.svg)](https://github.com/jgm/pandoc/actions)
1817[![license](https://img.shields.io/badge/license-GPLv2+-lightgray.svg)](https://www.gnu.org/licenses/gpl.html)
@@ -21,64 +20,71 @@ groups](https://img.shields.io/badge/pandoc-discuss-red.svg?style=social)](https
2120
2221## The universal markup converter
2322
24−Pandoc is a [Haskell](http://haskell.org) library for converting from
23+Pandoc is a [Haskell](https://haskell.org) library for converting from
2524one markup format to another, and a command-line tool that uses this
2625library. It can convert *from*
2726
2827<div id="input-formats">
2928
30− - `commonmark` ([CommonMark](https://commonmark.org) Markdown)
31− - `creole` ([Creole 1.0](http://www.wikicreole.org/wiki/Creole1.0))
32− - `csv` ([CSV](https://tools.ietf.org/html/rfc4180) table)
33− - `docbook` ([DocBook](https://docbook.org))
34− - `docx` ([Word docx](https://en.wikipedia.org/wiki/Office_Open_XML))
35− - `dokuwiki` ([DokuWiki markup](https://www.dokuwiki.org/dokuwiki))
36− - `epub` ([EPUB](http://idpf.org/epub))
37− - `fb2`
29+- `bibtex` ([BibTeX](https://ctan.org/pkg/bibtex) bibliography)
30+- `biblatex` ([BibLaTeX](https://ctan.org/pkg/biblatex) bibliography)
31+- `commonmark` ([CommonMark](https://commonmark.org) Markdown)
32+- `commonmark_x` ([CommonMark](https://commonmark.org) Markdown with
33+ extensions)
34+- `creole` ([Creole 1.0](http://www.wikicreole.org/wiki/Creole1.0))
35+- `csljson` ([CSL
36+ JSON](https://citeproc-js.readthedocs.io/en/latest/csl-json/markup.html)
37+ bibliography)
38+- `csv` ([CSV](https://tools.ietf.org/html/rfc4180) table)
39+- `docbook` ([DocBook](https://docbook.org))
40+- `docx` ([Word docx](https://en.wikipedia.org/wiki/Office_Open_XML))
41+- `dokuwiki` ([DokuWiki markup](https://www.dokuwiki.org/dokuwiki))
42+- `epub` ([EPUB](http://idpf.org/epub))
43+- `fb2`
3844 ([FictionBook2](http://www.fictionbook.org/index.php/Eng:XML_Schema_Fictionbook_2.1)
3945 e-book)
40− - `gfm` ([GitHub-Flavored
46+- `gfm` ([GitHub-Flavored
4147 Markdown](https://help.github.com/articles/github-flavored-markdown/)),
4248 or the deprecated and less accurate `markdown_github`; use
4349 [`markdown_github`](https://pandoc.org/MANUAL.html#markdown-variants)
4450 only if you need extensions not supported in
4551 [`gfm`](https://pandoc.org/MANUAL.html#markdown-variants).
46− - `haddock` ([Haddock
52+- `haddock` ([Haddock
4753 markup](https://www.haskell.org/haddock/doc/html/ch03s08.html))
48− - `html` ([HTML](https://www.w3.org/html/))
49− - `ipynb` ([Jupyter
54+- `html` ([HTML](https://www.w3.org/html/))
55+- `ipynb` ([Jupyter
5056 notebook](https://nbformat.readthedocs.io/en/latest/))
51− - `jats` ([JATS](https://jats.nlm.nih.gov) XML)
52− - `jira`
57+- `jats` ([JATS](https://jats.nlm.nih.gov) XML)
58+- `jira`
5359 ([Jira](https://jira.atlassian.com/secure/WikiRendererHelpAction.jspa?section=all)/Confluence
5460 wiki markup)
55− - `json` (JSON version of native AST)
56− - `latex` ([LaTeX](https://www.latex-project.org/))
57− - `markdown` ([Pandoc’s
61+- `json` (JSON version of native AST)
62+- `latex` ([LaTeX](https://www.latex-project.org/))
63+- `markdown` ([Pandoc’s
5864 Markdown](https://pandoc.org/MANUAL.html#pandocs-markdown))
59− - `markdown_mmd`
65+- `markdown_mmd`
6066 ([MultiMarkdown](https://fletcherpenney.net/multimarkdown/))
61− - `markdown_phpextra` ([PHP Markdown
67+- `markdown_phpextra` ([PHP Markdown
6268 Extra](https://michelf.ca/projects/php-markdown/extra/))
63− - `markdown_strict` (original unextended
69+- `markdown_strict` (original unextended
6470 [Markdown](https://daringfireball.net/projects/markdown/))
65− - `mediawiki` ([MediaWiki
71+- `mediawiki` ([MediaWiki
6672 markup](https://www.mediawiki.org/wiki/Help:Formatting))
67− - `man` ([roff man](https://man.cx/groff_man\(7\)))
68− - `muse` ([Muse](https://amusewiki.org/library/manual))
69− - `native` (native Haskell)
70− - `odt` ([ODT](https://en.wikipedia.org/wiki/OpenDocument))
71− - `opml` ([OPML](http://dev.opml.org/spec2.html))
72− - `org` ([Emacs Org mode](https://orgmode.org))
73− - `rst`
73+- `man` ([roff man](https://man.cx/groff_man(7)))
74+- `muse` ([Muse](https://amusewiki.org/library/manual))
75+- `native` (native Haskell)
76+- `odt` ([ODT](https://en.wikipedia.org/wiki/OpenDocument))
77+- `opml` ([OPML](http://dev.opml.org/spec2.html))
78+- `org` ([Emacs Org mode](https://orgmode.org))
79+- `rst`
7480 ([reStructuredText](https://docutils.sourceforge.io/docs/ref/rst/introduction.html))
75− - `t2t` ([txt2tags](https://txt2tags.org))
76− - `textile` ([Textile](https://www.promptworks.com/textile))
77− - `tikiwiki` ([TikiWiki
81+- `t2t` ([txt2tags](https://txt2tags.org))
82+- `textile` ([Textile](https://www.promptworks.com/textile))
83+- `tikiwiki` ([TikiWiki
7884 markup](https://doc.tiki.org/Wiki-Syntax-Text#The_Markup_Language_Wiki-Syntax))
79− - `twiki` ([TWiki
85+- `twiki` ([TWiki
8086 markup](https://twiki.org/cgi-bin/view/TWiki/TextFormattingRules))
81− - `vimwiki` ([Vimwiki](https://vimwiki.github.io))
87+- `vimwiki` ([Vimwiki](https://vimwiki.github.io))
8288
8389</div>
8490
@@ -86,94 +92,101 @@ It can convert *to*
8692
8793<div id="output-formats">
8894
89− - `asciidoc` ([AsciiDoc](https://www.methods.co.nz/asciidoc/)) or
95+- `asciidoc` ([AsciiDoc](https://www.methods.co.nz/asciidoc/)) or
9096 `asciidoctor` ([AsciiDoctor](https://asciidoctor.org/))
91− - `beamer` ([LaTeX beamer](https://ctan.org/pkg/beamer) slide show)
92− - `commonmark` ([CommonMark](https://commonmark.org) Markdown)
93− - `context` ([ConTeXt](https://www.contextgarden.net/))
94− - `docbook` or `docbook4` ([DocBook](https://docbook.org) 4)
95− - `docbook5` (DocBook 5)
96− - `docx` ([Word docx](https://en.wikipedia.org/wiki/Office_Open_XML))
97− - `dokuwiki` ([DokuWiki markup](https://www.dokuwiki.org/dokuwiki))
98− - `epub` or `epub3` ([EPUB](http://idpf.org/epub) v3 book)
99− - `epub2` (EPUB v2)
100− - `fb2`
97+- `beamer` ([LaTeX beamer](https://ctan.org/pkg/beamer) slide show)
98+- `bibtex` ([BibTeX](https://ctan.org/pkg/bibtex) bibliography)
99+- `biblatex` ([BibLaTeX](https://ctan.org/pkg/biblatex) bibliography)
100+- `commonmark` ([CommonMark](https://commonmark.org) Markdown)
101+- `commonmark_x` ([CommonMark](https://commonmark.org) Markdown with
102+ extensions)
103+- `context` ([ConTeXt](https://www.contextgarden.net/))
104+- `csljson` ([CSL
105+ JSON](https://citeproc-js.readthedocs.io/en/latest/csl-json/markup.html)
106+ bibliography)
107+- `docbook` or `docbook4` ([DocBook](https://docbook.org) 4)
108+- `docbook5` (DocBook 5)
109+- `docx` ([Word docx](https://en.wikipedia.org/wiki/Office_Open_XML))
110+- `dokuwiki` ([DokuWiki markup](https://www.dokuwiki.org/dokuwiki))
111+- `epub` or `epub3` ([EPUB](http://idpf.org/epub) v3 book)
112+- `epub2` (EPUB v2)
113+- `fb2`
101114 ([FictionBook2](http://www.fictionbook.org/index.php/Eng:XML_Schema_Fictionbook_2.1)
102115 e-book)
103− - `gfm` ([GitHub-Flavored
116+- `gfm` ([GitHub-Flavored
104117 Markdown](https://help.github.com/articles/github-flavored-markdown/)),
105118 or the deprecated and less accurate `markdown_github`; use
106119 [`markdown_github`](https://pandoc.org/MANUAL.html#markdown-variants)
107120 only if you need extensions not supported in
108121 [`gfm`](https://pandoc.org/MANUAL.html#markdown-variants).
109− - `haddock` ([Haddock
122+- `haddock` ([Haddock
110123 markup](https://www.haskell.org/haddock/doc/html/ch03s08.html))
111− - `html` or `html5` ([HTML](https://www.w3.org/html/),
124+- `html` or `html5` ([HTML](https://www.w3.org/html/),
112125 i.e. [HTML5](https://html.spec.whatwg.org/)/XHTML [polyglot
113126 markup](https://www.w3.org/TR/html-polyglot/))
114− - `html4` ([XHTML](https://www.w3.org/TR/xhtml1/) 1.0 Transitional)
115− - `icml` ([InDesign
127+- `html4` ([XHTML](https://www.w3.org/TR/xhtml1/) 1.0 Transitional)
128+- `icml` ([InDesign
116129 ICML](https://wwwimages.adobe.com/www.adobe.com/content/dam/acom/en/devnet/indesign/sdk/cs6/idml/idml-cookbook.pdf))
117− - `ipynb` ([Jupyter
130+- `ipynb` ([Jupyter
118131 notebook](https://nbformat.readthedocs.io/en/latest/))
119− - `jats_archiving` ([JATS](https://jats.nlm.nih.gov) XML, Archiving
132+- `jats_archiving` ([JATS](https://jats.nlm.nih.gov) XML, Archiving
120133 and Interchange Tag Set)
121− - `jats_articleauthoring` ([JATS](https://jats.nlm.nih.gov) XML,
134+- `jats_articleauthoring` ([JATS](https://jats.nlm.nih.gov) XML,
122135 Article Authoring Tag Set)
123− - `jats_publishing` ([JATS](https://jats.nlm.nih.gov) XML, Journal
136+- `jats_publishing` ([JATS](https://jats.nlm.nih.gov) XML, Journal
124137 Publishing Tag Set)
125− - `jats` (alias for `jats_archiving`)
126− - `jira`
138+- `jats` (alias for `jats_archiving`)
139+- `jira`
127140 ([Jira](https://jira.atlassian.com/secure/WikiRendererHelpAction.jspa?section=all)/Confluence
128141 wiki markup)
129− - `json` (JSON version of native AST)
130− - `latex` ([LaTeX](https://www.latex-project.org/))
131− - `man` ([roff man](https://man.cx/groff_man\(7\)))
132− - `markdown` ([Pandoc’s
142+- `json` (JSON version of native AST)
143+- `latex` ([LaTeX](https://www.latex-project.org/))
144+- `man` ([roff man](https://man.cx/groff_man(7)))
145+- `markdown` ([Pandoc’s
133146 Markdown](https://pandoc.org/MANUAL.html#pandocs-markdown))
134− - `markdown_mmd`
147+- `markdown_mmd`
135148 ([MultiMarkdown](https://fletcherpenney.net/multimarkdown/))
136− - `markdown_phpextra` ([PHP Markdown
149+- `markdown_phpextra` ([PHP Markdown
137150 Extra](https://michelf.ca/projects/php-markdown/extra/))
138− - `markdown_strict` (original unextended
151+- `markdown_strict` (original unextended
139152 [Markdown](https://daringfireball.net/projects/markdown/))
140− - `mediawiki` ([MediaWiki
153+- `mediawiki` ([MediaWiki
141154 markup](https://www.mediawiki.org/wiki/Help:Formatting))
142− - `ms` ([roff ms](https://man.cx/groff_ms\(7\)))
143− - `muse` ([Muse](https://amusewiki.org/library/manual)),
144− - `native` (native Haskell),
145− - `odt` ([OpenOffice text
155+- `ms` ([roff ms](https://man.cx/groff_ms(7)))
156+- `muse` ([Muse](https://amusewiki.org/library/manual)),
157+- `native` (native Haskell),
158+- `odt` ([OpenOffice text
146159 document](https://en.wikipedia.org/wiki/OpenDocument))
147− - `opml` ([OPML](http://dev.opml.org/spec2.html))
148− - `opendocument` ([OpenDocument](http://opendocument.xml.org))
149− - `org` ([Emacs Org mode](https://orgmode.org))
150− - `pdf` ([PDF](https://www.adobe.com/pdf/))
151− - `plain` (plain text),
152− - `pptx`
160+- `opml` ([OPML](http://dev.opml.org/spec2.html))
161+- `opendocument` ([OpenDocument](http://opendocument.xml.org))
162+- `org` ([Emacs Org mode](https://orgmode.org))
163+- `pdf` ([PDF](https://www.adobe.com/pdf/))
164+- `plain` (plain text),
165+- `pptx`
153166 ([PowerPoint](https://en.wikipedia.org/wiki/Microsoft_PowerPoint)
154167 slide show)
155− - `rst`
168+- `rst`
156169 ([reStructuredText](https://docutils.sourceforge.io/docs/ref/rst/introduction.html))
157− - `rtf` ([Rich Text
170+- `rtf` ([Rich Text
158171 Format](https://en.wikipedia.org/wiki/Rich_Text_Format))
159− - `texinfo` ([GNU Texinfo](https://www.gnu.org/software/texinfo/))
160− - `textile` ([Textile](https://www.promptworks.com/textile))
161− - `slideous` ([Slideous](https://goessner.net/articles/slideous/) HTML
172+- `texinfo` ([GNU Texinfo](https://www.gnu.org/software/texinfo/))
173+- `textile` ([Textile](https://www.promptworks.com/textile))
174+- `slideous` ([Slideous](https://goessner.net/articles/slideous/) HTML
162175 and JavaScript slide show)
163− - `slidy` ([Slidy](https://www.w3.org/Talks/Tools/Slidy2/) HTML and
176+- `slidy` ([Slidy](https://www.w3.org/Talks/Tools/Slidy2/) HTML and
164177 JavaScript slide show)
165− - `dzslides` ([DZSlides](http://paulrouget.com/dzslides/) HTML5 +
178+- `dzslides` ([DZSlides](https://paulrouget.com/dzslides/) HTML5 +
166179 JavaScript slide show),
167− - `revealjs` ([reveal.js](https://revealjs.com/) HTML5 + JavaScript
180+- `revealjs` ([reveal.js](https://revealjs.com/) HTML5 + JavaScript
168181 slide show)
169− - `s5` ([S5](https://meyerweb.com/eric/tools/s5/) HTML and JavaScript
182+- `s5` ([S5](https://meyerweb.com/eric/tools/s5/) HTML and JavaScript
170183 slide show)
171− - `tei` ([TEI Simple](https://github.com/TEIC/TEI-Simple))
172− - `xwiki` ([XWiki
184+- `tei` ([TEI Simple](https://github.com/TEIC/TEI-Simple))
185+- `xwiki` ([XWiki
173186 markup](https://www.xwiki.org/xwiki/bin/view/Documentation/UserGuide/Features/XWikiSyntax/))
174− - `zimwiki` ([ZimWiki
187+- `zimwiki` ([ZimWiki
175188 markup](https://zim-wiki.org/manual/Help/Wiki_Syntax.html))
176− - the path of a custom Lua writer, see [Custom
189+- the path of a custom Lua writer, see [Custom
177190 writers](https://pandoc.org/MANUAL.html#custom-writers) below
178191
179192</div>
@@ -225,7 +238,7 @@ opening a new issue.
225238
226239## License
227240
228−© 2006-2020 John MacFarlane (jgm@berkeley.edu). Released under the
229−[GPL](http://www.gnu.org/copyleft/gpl.html "GNU General Public License"),
241+© 2006-2021 John MacFarlane (jgm@berkeley.edu). Released under the
242+[GPL](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html "GNU General Public License"),
230243version 2 or greater. This software carries no warranty of any kind.
231244(See COPYRIGHT for full copyright and warranty notices.)
README.template+6−7
@@ -7,10 +7,9 @@ Pandoc
77======
88
99[![github release](https://img.shields.io/github/release/jgm/pandoc.svg?label=current+release)](https://github.com/jgm/pandoc/releases)
10−[![hackage release](https://img.shields.io/hackage/v/pandoc.svg?label=hackage)](http://hackage.haskell.org/package/pandoc)
11−[![homebrew](https://img.shields.io/homebrew/v/pandoc.svg)](http://brewformulas.org/Pandoc)
12−[![stackage LTS package](http://stackage.org/package/pandoc/badge/lts)](http://stackage.org/lts/package/pandoc)
13−[![CircleCI](https://circleci.com/gh/jgm/pandoc.svg?style=svg)](https://circleci.com/gh/jgm/pandoc)
10+[![hackage release](https://img.shields.io/hackage/v/pandoc.svg?label=hackage)](https://hackage.haskell.org/package/pandoc)
11+[![homebrew](https://img.shields.io/homebrew/v/pandoc.svg)](https://formulae.brew.sh/formula/pandoc)
12+[![stackage LTS package](https://stackage.org/package/pandoc/badge/lts)](https://www.stackage.org/lts/package/pandoc-types)
1413[![CI tests](https://github.com/jgm/pandoc/workflows/CI%20tests/badge.svg)](https://github.com/jgm/pandoc/actions)
1514[![license](https://img.shields.io/badge/license-GPLv2+-lightgray.svg)](https://www.gnu.org/licenses/gpl.html)
1615[![pandoc-discuss on google groups](https://img.shields.io/badge/pandoc-discuss-red.svg?style=social)](https://groups.google.com/forum/#!forum/pandoc-discuss)
@@ -82,9 +81,9 @@ new issue.
8281License
8382-------
8483
85−© 2006-2020 John MacFarlane (jgm@berkeley.edu). Released under the
84+© 2006-2021 John MacFarlane (jgm@berkeley.edu). Released under the
8685[GPL], version 2 or greater. This software carries no warranty of
8786any kind. (See COPYRIGHT for full copyright and warranty notices.)
8887
89−[GPL]: http://www.gnu.org/copyleft/gpl.html "GNU General Public License"
90−[Haskell]: http://haskell.org
88+[GPL]: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html "GNU General Public License"
89+[Haskell]: https://haskell.org
RELEASE-CHECKLIST+3−1
@@ -1,9 +1,11 @@
1+[ ] use 'policeman' to check API changes and version update
12[ ] make README.md and commit if needed
23[ ] make man/pandoc.1 and commit if needed
34[ ] Finalize changelog
4− tools/changelog-helper.sh
55[ ] push release candidate branch rc/VERSION and (if it builds
66 successfully) download artifacts
7+[ ] run tools/build-arm.sh to create and download arm64 linux package
8+[ ] download macos artifacts from CircleCI
79[ ] Use 'make' in macos and windows artifacts to sign code
810[ ] make update-website
911[ ] make trypandoc
SECURITY.mdnew file+12
@@ -0,0 +1,12 @@
1+# Security Policy
2+
3+## Supported Versions
4+
5+Only the most recent version of pandoc is supported with security updates.
6+
7+## Reporting a Vulnerability
8+
9+To report a vulnerability, email the maintainer, jgm@berkeley.edu.
10+But first please read the section of the manual entitled
11+[A note on security](https://pandoc.org/MANUAL.html#a-note-on-security),
12+which describes some security guarantees pandoc does NOT make.
pandoc.hs → app/pandoc.hsrenamed+1−3
@@ -1,7 +1,6 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
21{- |
32 Module : Main
4− Copyright : Copyright (C) 2006-2020 John MacFarlane
3+ Copyright : Copyright (C) 2006-2021 John MacFarlane
54 License : GNU GPL, version 2 or above
65
76 Maintainer : John MacFarlane <jgm@berkeley@edu>
@@ -12,7 +11,6 @@ Parses command-line options and calls the appropriate readers and
1211writers.
1312-}
1413module Main where
15−import Prelude
1614import qualified Control.Exception as E
1715import Text.Pandoc.App (convertWithOpts, defaultOpts, options, parseOptions)
1816import Text.Pandoc.Error (handleError)
benchmark/benchmark-pandoc.hs+63−72
@@ -1,8 +1,6 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
21{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE TupleSections #-}
42{-
5−Copyright (C) 2012-2019 John MacFarlane <jgm@berkeley.edu>
3+Copyright (C) 2012-2021 John MacFarlane <jgm@berkeley.edu>
64
75This program is free software; you can redistribute it and/or modify
86it under the terms of the GNU General Public License as published by
@@ -18,95 +16,88 @@ You should have received a copy of the GNU General Public License
1816along with this program; if not, write to the Free Software
1917Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2018-}
21−import Prelude
2219import Text.Pandoc
2320import Text.Pandoc.MIME
24−import Text.Pandoc.Error (PandocError(..))
21+import Control.DeepSeq (force)
2522import Control.Monad.Except (throwError)
2623import qualified Text.Pandoc.UTF8 as UTF8
2724import qualified Data.ByteString as B
2825import qualified Data.Text as T
29−import Criterion.Main
30−import Criterion.Types (Config(..))
31−import Data.List (intersect)
32−import Data.Maybe (mapMaybe)
33−import System.Environment (getArgs)
26+import Test.Tasty.Bench
27+-- import Gauge
3428import qualified Data.ByteString.Lazy as BL
29+import Data.Maybe (mapMaybe)
30+import Data.List (sortOn)
3531
3632readerBench :: Pandoc
3733 -> T.Text
3834 -> Maybe Benchmark
39−readerBench doc name =
40− case res of
41− Right (readerFun, inp) ->
42− Just $ bench (T.unpack $ name <> " reader")
43− $ nf (\i -> either (error . show) id $ runPure (readerFun i))
44− inp
45− Left _ -> Nothing
46− where res = runPure $ do
47− (rdr, rexts) <- getReader name
48− (wtr, wexts) <- getWriter name
49− case (rdr, wtr) of
50− (TextReader r, TextWriter w) -> do
51− setResourcePath ["../test"]
52− inp <- w def{ writerWrapText = WrapAuto
53− , writerExtensions = wexts } doc
54− return $ (r def{ readerExtensions = rexts }, inp)
55− _ -> throwError $ PandocSomeError $ "not a text format: "
56− <> name
35+readerBench _ name
36+ | name `elem` ["bibtex", "biblatex", "csljson"] = Nothing
37+readerBench doc name = either (const Nothing) Just $
38+ runPure $ do
39+ (rdr, rexts) <- getReader name
40+ (wtr, wexts) <- getWriter name
41+ case (rdr, wtr) of
42+ (TextReader r, TextWriter w) -> do
43+ inp <- w def{ writerWrapText = WrapAuto
44+ , writerExtensions = wexts } doc
45+ return $ bench (T.unpack name) $
46+ nf (either (error . show) id . runPure . r def) inp
47+ (ByteStringReader r, ByteStringWriter w) -> do
48+ tmpl <- Just <$> compileDefaultTemplate name
49+ inp <- w def{ writerWrapText = WrapAuto
50+ , writerExtensions = wexts
51+ , writerTemplate = tmpl } doc
52+ return $ bench (T.unpack name) $
53+ nf (either (error . show) id .
54+ runPure . r def{readerExtensions = rexts}) inp
55+ _ -> throwError $ PandocSomeError $ "text/bytestring format mismatch: "
56+ <> name
5757
5858getImages :: IO [(FilePath, MimeType, BL.ByteString)]
5959getImages = do
60− ll <- BL.readFile "test/lalune.jpg"
61− mv <- BL.readFile "test/movie.jpg"
62− return [("lalune.jpg", "image/jpg", ll)
63− ,("movie.jpg", "image/jpg", mv)]
60+ ll <- B.readFile "test/lalune.jpg"
61+ mv <- B.readFile "test/movie.jpg"
62+ return [("lalune.jpg", "image/jpg", BL.fromStrict ll)
63+ ,("movie.jpg", "image/jpg", BL.fromStrict mv)]
6464
65−writerBench :: Pandoc
65+writerBench :: [(FilePath, MimeType, BL.ByteString)]
66+ -> Pandoc
6667 -> T.Text
6768 -> Maybe Benchmark
68−writerBench doc name =
69− case res of
70− Right writerFun ->
71− Just $ env getImages $ \imgs ->
72− bench (T.unpack $ name <> " writer")
69+writerBench _ _ name
70+ | name `elem` ["bibtex", "biblatex", "csljson"] = Nothing
71+writerBench imgs doc name = either (const Nothing) Just $
72+ runPure $ do
73+ (wtr, wexts) <- getWriter name
74+ case wtr of
75+ TextWriter writerFun ->
76+ return $ bench (T.unpack name)
77+ $ nf (\d -> either (error . show) id $
78+ runPure $ do
79+ mapM_ (\(fp,mt,bs) -> insertMedia fp (Just mt) bs) imgs
80+ writerFun def{ writerExtensions = wexts} d)
81+ doc
82+ ByteStringWriter writerFun ->
83+ return $ bench (T.unpack name)
7384 $ nf (\d -> either (error . show) id $
74− runPure (do mapM_
75− (\(fp, mt, bs) ->
76− insertMedia fp (Just mt) bs)
77− imgs
78− writerFun d)) doc
79− Left _ -> Nothing
80− where res = runPure $ do
81− (wtr, wexts) <- getWriter name
82− case wtr of
83− TextWriter w ->
84− return $ w def{ writerExtensions = wexts }
85− _ -> throwError $ PandocSomeError
86− $ "could not get text writer for " <> name
85+ runPure $ do
86+ mapM_ (\(fp,mt,bs) -> insertMedia fp (Just mt) bs) imgs
87+ writerFun def{ writerExtensions = wexts} d)
88+ doc
8789
8890main :: IO ()
8991main = do
90− args <- filter (\x -> T.take 1 x /= "-") . fmap T.pack <$> getArgs
91− print args
92− let matchReader (n, TextReader _) =
93− null args || ("reader" `elem` args && n `elem` args)
94− matchReader _ = False
95− let matchWriter (n, TextWriter _) =
96− null args || ("writer" `elem` args && n `elem` args)
97− matchWriter _ = False
98− let matchedReaders = map fst $ (filter matchReader readers
99− :: [(T.Text, Reader PandocPure)])
100− let matchedWriters = map fst $ (filter matchWriter writers
101− :: [(T.Text, Writer PandocPure)])
10292 inp <- UTF8.toText <$> B.readFile "test/testsuite.txt"
10393 let opts = def
104− let doc = either (error . show) id $ runPure $ readMarkdown opts inp
105− let readerBs = mapMaybe (readerBench doc)
106− $ filter (/="haddock")
107− (matchedReaders `intersect` matchedWriters)
108− -- we need the corresponding writer to generate
109− -- input for the reader
110− let writerBs = mapMaybe (writerBench doc) matchedWriters
111− defaultMainWith defaultConfig{ timeLimit = 6.0 }
112− (writerBs ++ readerBs)
94+ let doc = either (error . show) force $ runPure $ readMarkdown opts inp
95+ defaultMain
96+ [ env getImages $ \imgs ->
97+ bgroup "writers" $ mapMaybe (writerBench imgs doc . fst)
98+ (sortOn fst
99+ writers :: [(T.Text, Writer PandocPure)])
100+ , bgroup "readers" $ mapMaybe (readerBench doc . fst)
101+ (sortOn fst
102+ readers :: [(T.Text, Reader PandocPure)])
103+ ]
benchmark/weigh-pandoc.hsdeleted−50
@@ -1,50 +0,0 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2−{-# LANGUAGE OverloadedStrings #-}
3−{- |
4− Module : Main
5− Copyright : © 2016-2019 John MacFarlane <jgm@berkeley.edu>
6− License : GNU GPL, version 2 or above
7−
8− Maintainer : John MacFarlane <jgm@berkeley.edu>
9− Stability : alpha
10− Portability : portable
11−
12−Benchmarks to determine resource use of readers and writers.
13−-}
14−import Prelude
15−import Weigh
16−import Text.Pandoc
17−import Data.Text (Text, unpack)
18−
19−main :: IO ()
20−main = do
21− doc <- read <$> readFile "test/testsuite.native"
22− mainWith $ do
23− func "Pandoc document" id doc
24− mapM_
25− (\(n,r) -> weighReader doc n (either (error . show) id . runPure . r def{readerExtensions = pandocExtensions}))
26− [("markdown", readMarkdown)
27− ,("html", readHtml)
28− ,("docbook", readDocBook)
29− ,("latex", readLaTeX)
30− ,("commonmark", readCommonMark)
31− ]
32− mapM_
33− (\(n,w) -> weighWriter doc n (either (error . show) id . runPure . w def))
34− [("markdown", writeMarkdown)
35− ,("html", writeHtml5String)
36− ,("docbook", writeDocbook5)
37− ,("latex", writeLaTeX)
38− ,("commonmark", writeCommonMark)
39− ]
40−
41−weighWriter :: Pandoc -> String -> (Pandoc -> Text) -> Weigh ()
42−weighWriter doc name writer = func (name ++ " writer") writer doc
43−
44−weighReader :: Pandoc -> Text -> (Text -> Pandoc) -> Weigh ()
45−weighReader doc name reader = do
46− case lookup name writers of
47− Just (TextWriter writer) ->
48− let inp = either (error . show) id $ runPure $ writer def{ writerWrapText = WrapAuto} doc
49− in func (unpack $ name <> " reader") reader inp
50− _ -> return () -- no writer for reader
cabal.project+9−10
@@ -1,14 +1,13 @@
11packages: pandoc.cabal
2+tests: True
3+flags: +embed_data_files
24
3−package pandoc
4− flags: +embed_data_files -trypandoc
5− ghc-options: -j +RTS -A64m -RTS
6−
7−package pandoc-citeproc
8− flags: +embed_data_files +bibutils -unicode_collation -test_citeproc -debug
9− ghc-options: -j +RTS -A64m -RTS
5+source-repository-package
6+ type: git
7+ location: https://github.com/jgm/doctemplates
8+ tag: 428c26d5303cf7a2b1051fe1ffd9aafe9ba71c81
109
1110source-repository-package
12− type: git
13− location: https://github.com/jgm/pandoc-citeproc
14− tag: 0.17.0.1
11+ type: git
12+ location: https://github.com/jgm/citeproc
13+ tag: 4ce0501cd6f9c86eee087afcf878c256e49b9615
changelog.md+2680−21
@@ -1,5 +1,2656 @@
11# Revision history for pandoc
22
3+## pandoc 2.14.0.3 (2021-06-22)
4+
5+ * Text.Pandoc.MediaBag `insertMediaBag`: ensure we get a sane mediaPath
6+ for URLs (#7391). In earlier 2.14.x versions, we'd get
7+ incorrect paths for resources downloaded from URLs when the
8+ media are extracted (including in PDF production).
9+ * Text.Pandoc.Parsing: improve `emailAddress` (#7398).
10+ Previously the parser would accept characters in domains
11+ that are illegal in domains, and this sometimes caused it
12+ to gobble bits of the following text.
13+ * txt2tags reader: modify the email address parser so
14+ it still includes form parameters, even after the change to
15+ `emailAddress` in Text.Pandoc.Parsing.
16+ * Text.Pandoc.Readers.Metadata: Fix regression with comment-only YAML
17+ metadata blocks (#7400).
18+ * reveal.js writer and template: better handling of options. Previously
19+ it was impossible to specify false values for options that default to
20+ true (e.g. `center`); setting the option to false just caused the portion
21+ of the template setting the option to be omitted. Now we prepopulate
22+ all the variables with their default values, including them all
23+ unconditionally and allowing them to be overridden.
24+ * Markdown writer: Fix regression in code blocks with attributes (#7397).
25+ Code blocks with a single class but nonempty attributes
26+ were having attributes drop as a result of #7242.
27+ * LaTeX writer:
28+ + Add strut at end of minipage if it contains line breaks.
29+ Without them, the last line is not as tall as it should be in
30+ some cases.
31+ + Always use a minipage for cells with line breaks, when
32+ width information is available (#7393). Otherwise the way we treat them
33+ can lead to content that overflows a cell.
34+ + Use `\strut` instead of `~` before `\\` in empty line.
35+ * Use lts-18.0 stack resolver.
36+ * Require skylighting 0.10.5.2 (adding support for Swift).
37+ * Require commonmark 0.2.1.
38+ * Rephrase section on unsafe HTML in manual.
39+ * Create SECURITY.md
40+
41+## pandoc 2.14.0.2 (2021-06-13)
42+
43+ * Fix MediaBag regressions (#7345). iIn the 2.14 release `--extract-media`
44+ stopped working as before; there could be mismatches between the
45+ paths in the rendered document and the extracted media.
46+ This patch makes several changes that restore the earlier behavior
47+ (while keeping the same API). The `mediaPath` in 2.14 was always
48+ constructed from the SHA1 hash of the media contents. Now, we
49+ preserve the original path unless it's an absolute path or contains
50+ `..` segments (in that case we use a path based on the SHA1 hash of
51+ the contents).
52+
53+ In Text.Pandoc.MediaBag, `mediaDirectory` and `mediaItems` now use the
54+ `mediaPath`, rather than the mediabag key, for the first component of the
55+ tuple. This makes more sense, I think, and fits with the documentation of
56+ these functions; eventually, though, we should rework the API so that
57+ `mediaItems` returns both the keys and the MediaItems.
58+
59+ In Text.Pandoc.Class.IO, rewriting of source paths in `extractMedia` has
60+ been fixed.
61+
62+ In Text.Pandoc.Class.PandocMonad, `fillMediaBag` has been modified so that
63+ it doesn't modify image paths (that was part of the problem in #7345).
64+
65+ We now do path normalization (e.g. `\` separators on Windows) in
66+ writing the media.
67+
68+ * Text.Pandoc.PDF:
69+
70+ + Text.Pandoc.PDF: Fix regression in 2.14 for generation of PDFs with
71+ SVGs (#7344).
72+ + Only print relevant part of environment on `--verbose`. Since
73+ `--verbose` output might be put in an issue, we want to avoid
74+ spilling out secrets in environment variables.
75+
76+ * Markdown reader: fix pipe table regression in 2.11.4 (#7343).
77+ Previously pipe tables with empty headers (that is, a header
78+ line with all empty cells) would be rendered as headerless
79+ tables. This broke in 2.11.4. The fix here is to produce an
80+ AST with an empty table head when a pipe table has all empty
81+ header cells.
82+
83+ * LaTeX reader: don't allow optional `*` on symbol control sequences
84+ (#7340). Generally we allow optional starred variants of LaTeX commands
85+ (since many allow them, and if we don't accept these explicitly,
86+ ignoring the star usually gives acceptable results). But we
87+ don't want to do this for `\(*\)` and similar cases.
88+
89+ * Docx reader: handle absolute URIs in Relationship Target (#7374).
90+
91+ * Docx writer: fix handling of empty table headers (Albert Krewinkel,
92+ #7369). A table header which does not contain any cells is now treated as
93+ an empty header.
94+
95+ * LaTeX writer: Fix regression in table header position (#7347).
96+ In recent versions the table headers were no longer bottom-aligned
97+ (if more than one line). This patch fixes that by using minipages
98+ for table headers in non-simple tables.
99+
100+ * CommonMark writer:
101+
102+ + Do not use simple class for fenced-divs (Jan Tojnar, amends #7242.)
103+ + Do not throw away attributes when `Ext_attributes` is enabled.
104+ `Ext_attributes` covers at least the following:
105+ `Ext_fenced_code_attributes`, `Ext_header_attributes`,
106+ `Ext_inline_code_attributes`, `Ext_link_attributes`.
107+
108+ * Markdown writer:
109+
110+ + Allow `pipe_tables` to be disabled for commonmark formats
111+ (`commonmark_x`, `gfm`) (#7375).
112+ + Re-use functions from Text.Pandoc.Markdown.Inline (Jan Tojnar).
113+
114+ * DocBook writer: Remove non-existent admonitions (Jan Tojnar).
115+ `attention`, `error` and `hint` are reStructuredText specific.
116+
117+ * HTML writer: Don't omit width attribute on div (#7342).
118+
119+ * Text.Pandoc.MIME, `extensionFromMimeType`: add a few special cases.
120+ When we do a reverse lookup in the MIME table, we just get the
121+ last match, so when the same mime type is associated with several
122+ different extensions, we sometimes got weird results, e.g. `.vs`
123+ for `text/plain`. These special cases help us get the most standard
124+ extensions for mime types like `text/plain`.
125+
126+ * Lua utils: fix handling of table headers in `from_simple_table` (Albert
127+ Krewinkel, #7369). Passing an empty list of header cells now results
128+ in an empty table header.
129+
130+ * Text.Pandoc.Citeproc:
131+
132+ + Avoid duplicate classes and attributes on references div.
133+ + Fix regression in citeproc processing (#7376). If inline
134+ references are used (in the metadata `references` field), we
135+ should still only include in the bibliography items that are
136+ actually cited (unless `nocite` is used).
137+
138+ * Require citeproc 0.4.0.1. This fixes a bug which led to doubled
139+ "et al." in some (rare) circumstances.
140+
141+ * MANUAL.txt:
142+
143+ + Mention GladTeX for EPUB export (Sebastian Humenda).
144+ This updates the manual and the web site about the GladTeX usage.
145+ + More details and a useful link for YAML syntax.
146+
147+ * CONTRIBUTING.md: update modules overview (Albert Krewinkel).
148+
149+ * using-the-pandoc-api.md: switch from String to Text (Albert Krewinkel).
150+
151+
152+## pandoc 2.14.0.1 (2021-06-01)
153+
154+ * Commonmark reader: Fix regression in 2.14 with YAML metdata block parsing,
155+ which could cause the document body to be omitted after metadata (#7339).
156+
157+ * HTML reader: fix column width regression in 2.14 (#7334).
158+ Column widths specified with a style attribute were off by a factor of 100.
159+
160+ * Markdown reader: in `rebasePaths`, check for both Windows and Posix
161+ absolute paths. Previously Windows pandoc was treating
162+ `/foo/bar.jpg` as non-absolute.
163+
164+ * Text.Pandoc.Logging: In rendering `LoadedResource`, use relative paths.
165+
166+ * Docx writer: fix regression on captions (#7328). The "Table Caption"
167+ style was no longer getting applied. (It was overwritten by "Compact.")
168+
169+ * Use commonmark-extensions 0.2.1.2
170+
171+## pandoc 2.14 (2021-05-28)
172+
173+ * Change reader types, allowing better tracking of source positions
174+ [API change]. Previously, when multiple file arguments were provided,
175+ pandoc simply concatenated them and passed the contents to the readers,
176+ which took a Text argument. As a result, the readers had no way of knowing
177+ which file was the source of any particular bit of text. This meant that
178+ we couldn't report accurate source positions on errors or include accurate
179+ source positions as attributes in the AST. More seriously, it meant that
180+ we couldn't resolve resource paths relative to the files containing them
181+ (see e.g. #5501, #6632, #6384, #3752).
182+
183+ * Add `rebase_relative_paths` extension (#3752). When enabled, this
184+ extension rewrites relative image and link paths by prepending
185+ the (relative) directory of the containing file. This
186+ behavior is useful when your input sources are split
187+ into multiple files, across several directories, with files
188+ referring to images stored in the same directory. The
189+ extension can be enabled for all markdown and commonmark-based formats.
190+
191+ * Add Text.Pandoc.Sources (exported module), with a `Sources` type and a
192+ `ToSources` class. A `Sources` wraps a list of `(SourcePos, Text)` pairs
193+ [API change]. A parsec `Stream` instance is provided for `Sources`. The
194+ module also exports versions of parsec's `satisfy` and other Char parsers
195+ that track source positions accurately from a `Sources` stream (or any
196+ instance of the new `UpdateSourcePos` class).
197+
198+ * Text.Pandoc.Parsing
199+
200+ + Export the modified Char parsers defined in Text.Pandoc.Sources
201+ instead of the ones parsec provides. Modified parsers to use a
202+ `Sources` as stream [API change].
203+ + Improve include file functions [API change]. Remove old
204+ `insertIncludedFileF`. Give `insertIncludedFile` a more general type,
205+ allowing it to be used where `insertIncludedFileF` was.
206+ + Add parameter to the `citeKey` parser from
207+ Text.Pandoc.Parsing, which controls whether the `@{..}`
208+ syntax is allowed [API change].
209+
210+ * Text.Pandoc.Error: Modified the constructor `PandocParsecError` to take a
211+ `Sources` rather than a `Text` as first argument, so parse error locations
212+ can be accurately reported.
213+
214+ * Fix source position reporting for YAML bibliographies (#7273).
215+
216+ * Issue error message when reader or writer format is malformed
217+ (#7231). Previously we exited with an error status but (due to a bug)
218+ no message.
219+
220+ * Smarter smart quotes (#7216, #2103). Treat a leading `"` with no
221+ closing `"` as a left curly quote. This supports the practice, in
222+ fiction, of continuing paragraphs quoting the same speaker without an
223+ end quote. It also helps with quotes that break over lines in line blocks.
224+
225+ * Markdown reader:
226+
227+ + Use MetaInlines not MetaBlocks for multimarkdown metadata fields.
228+ This gives better results in converting to e.g. pandoc markdown.
229+ + Implement curly-brace syntax for Markdown citation keys (#6026).
230+ The change provides a way to use citation keys that contain
231+ special characters not usable with the standard citation key syntax.
232+ Example: `@{foo_bar{x}'}` for the key `foo_bar{x}`. It also allows
233+ separating citation keys from immediately following text, e.g. `@{foo}A`.
234+
235+ * RST reader:
236+
237+ + Seek include files in the directory of the file
238+ containing the include directive, as RST requires (#6632).
239+ + Use `insertIncludedFile` from Text.Pandoc.Parsing
240+ instead of reproducing much of its code.
241+
242+ * Org reader: Resolve org includes relative to the directory containing the
243+ file containing the INCLUDE directive (#5501).
244+
245+ * ODT reader: Treat tabs as spaces (#7185, niszet).
246+
247+ * Docx reader:
248+
249+ + Add handling of vml image objects (#7257, mbrackeantidot).
250+ + Support new table features (Emily Bourke, #6316): column
251+ spans, row spans, multiple header rows, table description
252+ (parsed as a simple caption), captions, column widths.
253+
254+ * LaTeX reader:
255+
256+ + Improved siunitx support (#6658, #6620).
257+ + Better support for `\xspace` (#7299).
258+ + Improve parsing of `\def` macros. We previously set "verbatim mode"
259+ even for parsing the initial `\def`; this caused problems
260+ for `\def` nested inside another `\def`.
261+ + Implement `\newif`.
262+
263+ * ConTeXt writer: improve ordered lists (#5016, Denis Maier).
264+ Change ordered list from itemize to enumerate. Add new
265+ itemgroup for ordered lists. Remove manual insertion of
266+ width attributes. Use tabular figures in ordered list
267+ enumerators.
268+
269+ * HTML reader:
270+
271+ + Don't fail on unmatched closing "script" tag (Albert Krenkel, #7282).
272+ + Keep h1 tags as normal headers (#2293, Albert Krewinkel).
273+ The tags `<title>` and `<h1 class="title">` often contain the same
274+ information, so the latter was dropped from the document. However, as
275+ this can lead to loss of information, the heading is now always
276+ retained. Use `--shift-heading-level-by=-1` to turn the `<h1>`
277+ into the document title, or a filter to restore the previous behavior.
278+ + Handle relative lengths (e.g. `2*`) in HTML column widths (#4063).
279+ See <https://www.w3.org/TR/html4/types.html#h-6.6>.
280+
281+ * DocBook/JATS readers:
282+
283+ + Fix mathml regression caused by the switch in XML libraries (#7173).
284+ + Fix "phrase" in DocBook: take classes from "role" not "class" (#7195).
285+
286+ * DocBook reader: ensure that first and last names are separated (#6541).
287+
288+ * Jira reader (Albert Krewinkel, #7218):
289+
290+ + Support "smart" links: `[alias|https://example.com|smart-card]` syntax.
291+ + Allow spaces and most unicode characters in attachment links.
292+ + No longer require a newline character after `{noformat}`.
293+ + Only allow URI path segment characters in bare links.
294+ + The `file:` schema is no longer allowed in bare links; these
295+ rarely make sense.
296+
297+ * Plain writer: handle superscript unicode minus (#7276).
298+
299+ * LaTeX writer:
300+
301+ + Better handling of line breaks in simple tables (#7272).
302+ Now we also handle the case where they're embedded in other elements,
303+ e.g. spans.
304+ + For beamer output, support `exampleblock` and `alertblock` (#7278).
305+ A block will be rendered as an `exampleblock` if the heading
306+ has class `example` and an `alertblock` if it has class `alert`.
307+ + Separate successive quote chars with thin space (#6958,
308+ Albert Krewinkel). Successive quote characters are separated with
309+ a thin space to improve readability and to prevent unwanted ligatures.
310+ Detection of these quotes sometimes had failed if the second quote
311+ was nested in a span element.
312+ + Separate successive quote chars with thin space (#6958, Albert
313+ Krewinkel).
314+
315+ * EPUB Writer: Fix belongs-to-collection XML id choice (#7267, nuew).
316+ The epub writer previously used the same XML id for both the book
317+ identifier and the epub collection. This causes an error on epubcheck.
318+
319+ * BibTeX/BibLaTeX writer: Handle `annote` field (#7266).
320+
321+ * ZimWiki writer: allow links and emphasis in headers (#6605,
322+ Albert Krewinkel).
323+
324+ * ConTeXt writer:
325+
326+ + Support blank lines in line blocks (#6564, Albert Krewinkel,
327+ thanks to @denismaier).
328+ + Use span identifiers as reference anchors (#7246, Albert Krewinkel).
329+
330+ * HTML writer:
331+
332+ + Keep attributes from code nested below `pre` tag (#7221,
333+ Albert Krewinkel). If a code block is defined with `<pre><code
334+ class="language-x">…</code></pre>`, where the `<pre>` element has no
335+ attributes, then the attributes from the `<code>` element are used
336+ instead. Any leading `language-` prefix is dropped in the code's
337+ `class` attribute are dropped to improve syntax highlighting.
338+ + Ensure headings only have valid attribs in HTML4 (#5944, Albert
339+ Krewinkel).
340+ + Parse `<header>` as a Div (Albert Krewinkel).
341+
342+ * Org writer:
343+
344+ + Inline latex envs need newlines (#7252, tecosaur).
345+ As specified in https://orgmode.org/manual/LaTeX-fragments.html, an
346+ inline \begin{}...\end{} LaTeX block must start on a new line.
347+ + Use LaTeX style maths deliminators (#7196, tecosaur).
348+
349+ * JATS writer (Albert Krewinkel):
350+
351+ + Use either styled-content or named-content for spans (#7211).
352+ If the element has a content-type attribute, or at least one class,
353+ then that value is used as `content-type` and the span is put inside
354+ a `<named-content>` element. Otherwise a `<styled-content>` element
355+ is used instead.
356+ + Reduce unnecessary use of `<p>` elements for wrapping (#7227).
357+ The `<p>` element is used for wrapping in cases were the contents
358+ would otherwise not be allowed in a certain context. Unnecessary
359+ wrapping is avoided, especially around quotes (`<disp-quote>` elements).
360+ + Convert spans to `<named-content>` elements (#7211). Spans with
361+ attributes are converted to `<named-content>` elements instead of
362+ being wrapped with `<milestone-start/>` and `<milestone-end>`
363+ elements. Milestone elements are not allowed in documents using the
364+ articleauthoring tag set, so this change ensures the creation of valid
365+ documents.
366+ + Add footnote number as label in backmatter (#7210). Footnotes in the
367+ backmatter are given the footnote's number as a label. The
368+ articleauthoring output is unaffected from this change, as footnotes
369+ are placed inline there.
370+ + Escape disallows chars in identifiers. XML identifiers must start
371+ with an underscore or letter, and can contain only a limited set
372+ of punctuation characters. Any IDs not adhering to these rules are
373+ rewritten by writing the offending characters as `Uxxxx`,
374+ where `xxxx` is the character's hex code.
375+
376+ * Jira writer: use `{color}` when span has a color attribute
377+ (Albert Krewinkel, tarleb/jira-wiki-markup#10).
378+
379+ * Docx writer:
380+
381+ + Autoset table width if no column has an explicit width (Albert
382+ Krewinkel).
383+ + Extract Table handling into separate module (Albert Krewinkel).
384+ + Support colspans and rowspans in tables (Albert Krewinkel, #6315).
385+ + Support multirow table headers (Albert Krewinkel).
386+ + Improve integration of settings from reference.docx (#1209).
387+ This change allows users to create a reference.docx that
388+ sets `w:proofState` for spelling or grammar to `dirty`,
389+ so that spell/grammar checking will be triggered on the
390+ generated docx.
391+ + Copy over more settings from reference.docx (#7240). From settings.xml
392+ in the reference-doc, we now include: `zoom`, `embedSystemFonts`,
393+ `doNotTrackMoves`, `defaultTabStop`, `drawingGridHorizontalSpacing`,
394+ `drawingGridVerticalSpacing`, `displayHorizontalDrawingGridEvery`,
395+ `displayVerticalDrawingGridEvery`, `characterSpacingControl`,
396+ `savePreviewPicture`, `mathPr`, `themeFontLang`, `decimalSymbol`,
397+ `listSeparator`, `autoHyphenation`, `compat`.
398+ + Set zoom to 100% by default in settings.xml.
399+ + Align math options more with current Word defaults (e.g. Cambria Math
400+ font).
401+ + Remove `rsid`s from default settings.xml. Word will add these
402+ when revisions are made.
403+
404+ * Ms writer: Handle tables with multiple paragraphs (#7288).
405+ Previously they overflowed the table cell width. We now set line lengths
406+ per-cell and restore them after the table has been written.
407+
408+ * Markdown writer:
409+
410+ + Use cleaner braceless syntax for code blocks with a
411+ single class (#7242, Jan Tojnar).
412+ + Add quotes properly in markdown YAML metadata fields (#7245).
413+ This fixes a bug, which caused the writer to look at the *last*
414+ rather than the *first* character in determining whether quotes
415+ were needed. So we got spurious quotes in some cases and
416+ didn't get necessary quotes in others.
417+ + Use `@{..}` syntax for citations when needed.
418+ + Use fewer unneeded escapes for `#` (see #6259).
419+ + Improve escaping of `@`. We need to escape literal `@` before
420+ `{` because of the new citation syntax.
421+
422+ * Commonmark writer: Use backslash escapes for `<` and `|`...
423+ instead of entities (#7208).
424+
425+ * Powerpoint writer: allow `monofont` to be specified in metadata
426+ (#7187).
427+
428+ * LaTeX template:
429+
430+ + Use non-starred names for xcolor color names (#6109).
431+ This should make svgnames and x11names work properly.
432+ + Fix bad vertical spacing after bibliography (#7234, badumont).
433+ + List of figures before list of tables (#7235, Julien Dutant).
434+ + Move CSL macro definitions before header-includes so they can be
435+ overridden (#7286).
436+ + Improve treatment of CSL `entry-spacing` (#7296).
437+ Previously with the default template settings (`indent` variable
438+ not set), we would get interparagraph spaces separating bib
439+ entries even with `entry-spacing="0"`. On the other hand,
440+ setting `entry-spacing="2"` gave ridiculously large spacing.
441+ This change makes the spacing caused by `entry-spacing` a multiple
442+ of `\parskip` by default, which gives aesthetically reasonable
443+ output. Those who want a larger or smaller unit (e.g. because
444+ they use `indent` which sets `\parskip` to 0) may
445+ `\setlength{\cslentryspacingunit}{10pt}` in header-includes
446+ to override the defaults.
447+ + Move title, author, date up to top of preamble (#7295).
448+ This allows header-includes to use them, and puts them
449+ in a position where you can see them immediately.
450+ + Define commands for zero width non-joiner character
451+ (#6639, Albert Krewinkel). The zero-width non-joiner character
452+ is used to avoid ligatures (e.g. in German).
453+
454+ * ConTeXt template:
455+
456+ + Define `enumerate` itemgroup (#5016, Denis Maier).
457+ + List of figures before list of tables (#7235, Julien Dutant).
458+
459+ * reveal.js template:
460+
461+ + Support `toc-title` (#7171, Florian Kohrt).
462+ + Use `hash: true` by default rather than `history: true` (#6968).
463+
464+ * HTML-based slide shows: add support for `institute` (#7289, Thomas
465+ Hodgson).
466+
467+ * Text.Pandoc.Extensions: Add constructor `Ext_rebase_relative_paths` to
468+ `Extensions` [API change].
469+
470+ * Text.Pandoc.XML.Light: add Eq, Ord instances for Content,
471+ Element, Attr, CDataKind [API change].
472+
473+ * Text.Pandoc.MediaBag:
474+
475+ + Change type to use a `Text` key instead of `[FilePath]`.
476+ We normalize the path and use `/` separators for consistency.
477+ + Export `MediaItem` type [API change].
478+ + Change `MediaBag` type to a map from Text to MediaItem [API change].
479+ + `lookupMedia` now returns a `MediaItem` [API change].
480+ + Change `insertMedia` so it sets the `mediaPath` to a filename based on
481+ the SHA1 hash of the contents. This will be used when contents
482+ are extracted.
483+
484+ * Text.Pandoc.Class.PandocMonad:
485+
486+ + Remove `fetchMediaResource` [API change]. Use `fetchItem` to get
487+ resources in `fillMediaBag`.
488+ + Add informational message in `downloadOrRead` indicating what path
489+ local resources have been loaded from.
490+
491+ * Text.Pandoc.Logging:
492+
493+ + Remove single quotes around paths in messages.
494+ + Add LoadedResource constructor to LogMessage [API change].
495+ This is for INFO-level messages telling where image data has been
496+ loaded from. (This can vary because of the resource path.)
497+
498+ * Text.Pandoc.Asciify: simplify code and export `toAsciiText` [API change].
499+ Instead of encoding a giant (and incomplete) map, we now
500+ just use unicode-transforms to normalize the text to
501+ a canonical decomposition, and manipulate the result.
502+
503+ * App: allow tabs expansion even if file-scope is used (Albert Krewinkel,
504+ #6709). Tabs in plain-text inputs are now handled correctly, even if
505+ the `--file-scope` flag is used.
506+
507+ * Add new internal module Text.Pandoc.Writers.GridTable (Albert Krewinkel).
508+
509+ * Text.Pandoc.Highlighting: Change type of `languagesByExtension`, adding
510+ a parameter for a `SyntaxMap` [API change] (Jan Tojnar, #7241).
511+ Languages defined using `--syntax-definition` were not recognized by
512+ `languagesByExtension`. This patch corrects that, allowing the writers
513+ to see all custom definitions. The LaTeX writer still uses the default
514+ syntax map, but that's okay in that context, since
515+ `--syntax-definition` won't create new listings styles.
516+
517+ * Text.Pandoc.Citeproc:
518+
519+ + Ensure that CSL-related attributes are passed on to a Div with id
520+ 'refs'. Otherwise things like `entry-spacing` won't work when
521+ such Divs are used.
522+ + Use metadata's `lang` for the lang parameter of citeproc, overriding
523+ `localeLanguage`.
524+ + Recognize locators spelled with a capital letter (#7323).
525+ + Add a comma and a space in front of the suffix if it doesn't start
526+ with space or punctuation (#7324).
527+ + Don't detect math elements as locators (#7321).
528+
529+ * Remove Text.Pandoc.BCP47 module [API change]. Use types and functions
530+ from UnicodeCollation.Lang instead. This is a richer implementation
531+ of BCP 47.
532+
533+ * Text.Pandoc.Shared:
534+
535+ + Fix regression in grid tables for wide characters (#7214).
536+ In the translation from String to Text, a char-width-sensitive
537+ `splitAt'` was dropped. This commit reinstates it and uses it to make
538+ `splitTextByInstances` char-width sensitive.
539+ + Add `getLang` (formerly in the now-removed BCP47) [API change].
540+
541+ * Text.Pandoc.SelfContained: use `application/octet-stream`
542+ for unknown mime types instead of halting with an error (#7202).
543+
544+ * Lua filters: respect Inlines/Blocks filter functions in `pandoc.walk_*`
545+ (Albert Krewinkel).
546+
547+ * Add text as build-depend for trypandoc (#7193, Roman Beránek).
548+
549+ * Bump upper-bounds for network-uri, time, attoparsec.
550+
551+ * Use citeproc 0.4.
552+
553+ * Use texmath 0.12.3.
554+
555+ * Use jira-wiki-markup 1.3.5 (Albert Krewinkel).
556+
557+ * Require latest skylighting (fixes a bug in XML syntax highlighting).
558+
559+ * Use latest xml-conduit.
560+
561+ * Use latest commonmark, commonmark-extensions, commonmark-pandoc.
562+
563+ * Use haddock-library-1.10.0 (Albert Krewinkel).
564+
565+ * Allow compilation with base 4.15 (Albert Krewinkel).
566+
567+ * MANUAL:
568+
569+ + Add information about `lang` and bibliography sorting.
570+ + Add info about YAML escape sequences, link to spec (#7152,
571+ Albert Krewinkel).
572+ + Note that `institute` variable works for HTML-based slides.
573+ + Update documentation on citation syntax.
574+ + Add citation example for locators and suffixes (Tristan Stenner)
575+
576+ * Updated and fixed typos in documentation (Charanjit Singh,
577+ Anti-Distinctlyminty, Tatiana Porras, obcat).
578+
579+ * Add instructions for installing pandoc-types before compiling filter.
580+
581+ * INSTALL: add note that parallel installations should be avoided
582+ (#6865).
583+
584+ * Remove `biblatex-nussbaum.md` test. It is basically the same
585+ as `biblaetx-quotes.md`.
586+
587+ * Command tests: fail if a file contains no tests---and fix a
588+ test that failed in that way!
589+
590+ * Use smaller images in tests, reducing the size of the source tarball by 8 MB.
591+
592+
593+## pandoc 2.13 (2021-03-21)
594+
595+ * Support `yaml_metadata_block` extension for `commonmark`, `gfm` (#6537).
596+ This supported is a bit more limited than with pandoc's
597+ `markdown`. The YAML block must be the first thing in the input,
598+ and the leaf notes are parsed in isolation from the rest of
599+ the document. So, for example, you can't use reference
600+ links if the references are defined later in the document.
601+
602+ * Fix fallback to default partials when custom templates are used.
603+ If the directory containing a template does not contain the partial,
604+ it should be sought in the default templates, but this was not
605+ working properly (#7164).
606+
607+ * Handle `nocite` better with `--biblatex` and `--natbib` (#4585).
608+ Previously the nocite metadata field was ignored with these formats.
609+ Now it populates a `nocite-ids` template variable and causes a
610+ `\nocite` command to be issued.
611+
612+ * Text.Pandoc.Citeproc: apply `fixLinks` correctly (#7130). This is code
613+ that incorporates a prefix like `https://doi.org/` into a following link
614+ when appropriate.
615+
616+ * Text.Pandoc.Shared:
617+
618+ + Remove `backslashEscapes`, `escapeStringUsing` [API change]. Replace
619+ these inefficient association list lookups with more efficient escaping
620+ functions in the writers that used them (for a 10-25% performance boost
621+ in org, haddock, rtf, texinfo writers).
622+ + Remove `ToString`, `ToText` typeclasses [API change]. These were needed
623+ for the transition from String to Text, but they are no longer used and
624+ may clash with other things.
625+ + Simplify `compactDL`.
626+
627+ * Text.Pandoc.Parsing:
628+
629+ + Change type of `readWithM` so that it is no longer polymorphic
630+ [API change]. The `ToText` class has been removed, and now that we've
631+ completed the transition to Text we no longer need this to operate
632+ on Strings.
633+ + Remove `F` type synonym [API change]. Muse and Org were defining their
634+ own `F` anyway.
635+
636+ * Text.Pandoc.Readers.Metadata:
637+
638+ + Export `yamlMetaBlock` [API change].
639+ + Make `yamlBsToMeta`, `yamlBsToRefs` polymorphic on the parser state
640+ [API change].
641+
642+ * Markdown reader: Fix regression with `tex_math_backslash` (#7155).
643+
644+ * MediaWiki reader: Allow block-level content in notes (ref) (#7145).
645+
646+ * Jira reader (Albert Krewinkel):
647+
648+ + Fixed parsing of autolinks (i.e., of bare URLs in the text).
649+ Previously an autolink would take up the rest of a line, as spaces
650+ were allowed characters in these items.
651+ + Emoji character sequences no longer cause parsing failures. This was
652+ due to missing backtracking when emoji parsing fails.
653+ + Mark divs created from panels with class "panel".
654+
655+ * RST reader: fix logic for ending comments (#7134). Previously comments
656+ sometimes got extended too far.
657+
658+ * DocBook writer: include Header attributes as XML attributes on
659+ section (Erik Rask). Attributes with key names that are not allowed
660+ as XML attributes are dropped, as are attributes with invalid values
661+ and `xml:id` (DocBook 5) and `id` (DocBook 4).
662+
663+ * Docx writer:
664+
665+ + Make `nsid` in `abstractNum` deterministic. Previously we assigned
666+ a random number, but we don't need random values, so now we just
667+ assign a value based on the list marker.
668+ + Use integral values for `w:tblW` (#7141).
669+
670+ * Jira writer (Albert Krewinkel):
671+
672+ + Block quotes are only rendered as `bq.` if they do not contain a
673+ linebreak.
674+ + Jira writer: improve div/panel handling. Include div attributes in
675+ panels, always render divs with class `panel` as panels, and
676+ avoid nesting of panels.
677+
678+ * HTML writer: Add warnings on duplicate attribute values.
679+ This prevents emitting invalid HTML. Ultimately it would be good to
680+ prevent this in the types themselves, but this is better for now.
681+
682+ * Org writer: Prevent unintended creation of ordered list items (#7132,
683+ Albert Krewinkel). Adjust line wrapping if default wrapping would cause
684+ a line to be read as an ordered list item.
685+
686+ * JATS templates: support 'equal-contrib' attrib for authors (Albert
687+ Krewinkel). Authors who contributed equally to a paper may be marked
688+ with `equal-contrib`.
689+
690+ * reveal.js template: replace JS comment with HTML (#7154, Florian Kohrt).
691+
692+ * Text.Pandoc.Logging: Add `DuplicateAttribute` constructor to `LogMessage`.
693+ [API change]
694+
695+ * Use `-j4` for linux release build. This speeds up the build dramatically
696+ on arm.
697+
698+ * cabal.project: remove ghcoptions. Move flags to top level, so they can
699+ be set differently on the command line.
700+
701+ * Require latest texmath, skylighting, citeproc, jira-wiki-markup.
702+ (The latest skylighting fixes a bad bug with Haskell syntax highlighting.)
703+ Narrow version bounds for texmath, skylighting, and citeproc, since
704+ the test output depend on them.
705+
706+ * Use doclayout 0.3.0.2. This significantly reduces the time and memory
707+ needed to compile pandoc.
708+
709+ * Use `foldl'` instead of `foldl` everywhere.
710+
711+ * Update bounds for random (#7156, Alexey Kuleshevich).
712+
713+ * Remove uses of some partial functions.
714+
715+ * Don't bake in a larger stack size for the executable.
716+
717+ * Test improvements:
718+
719+ + Use `getExecutablePath` from base, avoiding the dependency on
720+ `executable-path`.
721+ + Factor out `setupEnvironment` in Helpers, to avoid code duplication.
722+ + Fix finding of data files by setting teh `pandoc_datadir` environment
723+ variable when we shell out to pandoc. This avoids the need to use
724+ `--data-dir` for the tests, which caused problems finding `pandoc.lua`
725+ when compiling without the `embed_data_files` flag (#7163).
726+
727+ * Benchmark improvements:
728+
729+ + Build `+RTS -A8m -RTS` into default ghc-options for benchmark.
730+ This is necessary to get accurate benchmark results; otherwise we
731+ are largely measuring garbage collecting, some not related to the
732+ current benchmark.
733+ + Allow specifying BASELINE file in 'make bench' for comparison
734+ (otherwise the latest benchmark is chosen by default).
735+ + Force `readFile` in benchmarks early (Bodigrim).
736+
737+ * CONTRIBUTING: suggest using a `cabal.project.local` file (#7153,
738+ Albert Krewinkel).
739+
740+ * Add ghcid-test to Makefile. This loads the test suite in ghcid.
741+
742+
743+## pandoc 2.12 (2021-03-08)
744+
745+ * `--resource-path` now accumulates if specified multiple
746+ times (#6152). Resource paths specified later on the command line are
747+ prepended to those specified earlier. Thus,
748+ `--resource-path foo --resource-path bar:baz` is equivalent to
749+ `--resource-path bar:bas:foo`. (The previous behavior was
750+ for the last `--resource-path` to replace all the rest.)
751+ `resource-path` in defaults files behaves the same way: it
752+ will be prepended to the resource path set by earlier
753+ command line options or defaults files. This change
754+ facilitates the use of multiple defaults files: each can
755+ specify a directory containing resources it refers to
756+ without clobbering the resource paths set by the others.
757+
758+ * Allow defaults files to refer to the home directory, the
759+ user data directory, and the directory containing the defaults file
760+ itself (#5871, #5982, #5977). In fields that expect file paths
761+ (and only in these fields),
762+
763+ + `${VARIABLE}` will expand to the value of the environment variable
764+ `VARIABLE` (and in particular `${HOME}` will expand to the path
765+ of the home directory). A warning will be raised for undefined
766+ variables.
767+ + `${USERDATA}` will expand to the path of the user data
768+ directory in force when the defaults file is being processed.
769+ + `${.}` will expand to the directory containing the defaults file.
770+ (This allows default files to be placed in a directory containing
771+ resources they make use of.)
772+
773+ * When downloading content from URL arguments, be sensitive to
774+ the character encoding (#5600). We can properly handle UTF-8 and latin1
775+ (ISO-8859-1); for others we raise an error. Fall back to latin1 if
776+ no charset is given in the mime type and UTF-8 decoding fails.
777+
778+ * Allow abbreviations that don't end in a period to be
779+ specified using `--abbreviations` (#7124).
780+
781+ * Add new unexported module Text.Pandoc.XML.Light, as well
782+ as Text.Pandoc.XML.Light.Types, Text.Pantoc.XML.Light.Proc,
783+ Text.Pandoc.XML.Light.Output. (Closes #6001, #6565, #7091).
784+
785+ This module exports definitions of `Element` and `Content`
786+ that are isomorphic to xml-light's, but with Text
787+ instead of String. This allows us to keep most of the code in existing
788+ readers that use xml-light, but avoid lots of unnecessary allocation.
789+
790+ We also add versions of the functions from xml-light's
791+ Text.XML.Light.Output and Text.XML.Light.Proc that operate on our
792+ modified XML types, and functions that convert xml-light types to our
793+ types (since some of our dependencies, like texmath, use xml-light).
794+
795+ We export functions that use xml-conduit's parser to produce an
796+ `Element` or `[Content]`. This allows existing pandoc code to use
797+ a better parser without much modification.
798+
799+ The new parser is used in all places where xml-light's parser was
800+ previously used. Benchmarks show a significant performance improvement
801+ in parsing XML-based formats (with docbook, opml, jats, and docx
802+ almost twice as fast, odt and fb2 more than twice as fast).
803+
804+ In addition, the new parser gives us better error reporting than
805+ xml-light. We report XML errors, when possible, using the new
806+ `PandocXMLError` constructor in `PandocError`.
807+
808+ These changes revealed the need for some changes in the tests. The
809+ docbook-reader.docbook test lacked definitions for the entities it used;
810+ these have been added. And the docx golden tests have been updated,
811+ because the new parser does not preserve the order of attributes.
812+
813+ * DocBook reader:
814+
815+ + Avoid expensive tree normalization step, as it is not necessary
816+ with the new XML parser.
817+ + Support `informalfigure` (#7079) (Nils Carlson).
818+
819+ * Docx reader:
820+
821+ + Use Map instead of list for Namespaces. This gives a speedup of
822+ about 5-10%. With this and the XML parsing changes, the docx reader
823+ is now about twice as fast as in the previous release.
824+
825+ * HTML reader:
826+
827+ + Small performance tweaks.
828+ + Also, remove exported class `NamedTag(..)` [API change]. This was just
829+ intended to smooth over the transition from String to Text and is no
830+ longer needed.
831+ + As a result, the functions `isInlineTag` and `isBlockTag`
832+ are no longer polymorphic; they apply to a `Tag Text` [API change].
833+ + Do a lookahead to find the right parser to use. This takes
834+ benchmarks from 34ms to 23ms, with less allocation.
835+ + Fix bad handling of empty `src` attribute in `iframe` (#7099).
836+ If `src` is empty, we simply skip the `iframe`.
837+ If `src` is invalid or cannot be fetched, we issue a warning
838+ nd skip instead of failing with an error.
839+
840+ * JATS reader:
841+
842+ + Avoid tree normalization, which is no longer necessary given the
843+ new XML parser.
844+
845+ * LaTeX reader:
846+
847+ + Don't export `tokenize`, `untokenize` [API change]. These are internal
848+ implementation details, which were only exported for testing.
849+ They don't belong in the public API.
850+ + Improved efficiency of the parser. With these changes the reader
851+ is almost twice as fast as in the last release in our benchmarks.
852+ + Code cleanup, removing some unnecessary things.
853+ + Rewrite `withRaw` so it doesn't rely on fragile assumptions
854+ about token positions (which break when macros are expanded)
855+ (#7092). This requires the addition of `sEnableWithRaw` and
856+ `sRawTokens` in `LaTeXState`, and a new combinator `disablingWithRaw`
857+ to disable collecting of raw tokens in certain contexts.
858+ Add `parseFromToks` to Text.Pandoc.Readers.LaTeX.Parsing.
859+ Fix parsing of single character tokens so it doesn't mess
860+ up the new raw token collecting. These changes slightly increase
861+ allocations and have a small performance impact.
862+ + Handle some bibtex/biblatex-specific commands that used to be
863+ dealt with in pandoc-citeproc (#7049).
864+ + Optimize `satisfyTok`, avoiding unnecessary macro expansion steps.
865+ Benchmarks after this change show 2/3 of the run time and 2/3 of the
866+ allocation of the Feb. 10 benchmarks.
867+ + Removed `sExpanded` in state. This isn't actually needed and checking
868+ it doesn't change anything.
869+ + Improve `braced'`. Remove the parameter, have it parse the
870+ opening brace, and make it more efficient.
871+ + Factor out pieces of the LaTeX reader to make the module smaller.
872+ This reduces memory demands when compiling. Created
873+ Text.Pandoc.Readers.{LaTeX,Math,Citation,Table,Macro,Inline}.
874+ Changed Text.Pandoc.Readers.LaTeX.SIunitx to export a command map
875+ instead of individual commands.
876+ + Handle table cells containing `&` in `\verb` (#7129).
877+
878+ * Make Text.Pandoc.Readers.LaTeX.Types an unexported module [API change].
879+
880+ * Markdown reader:
881+
882+ + Improved handling of mmd link attributes in references (#7080).
883+ Previously they only worked for links that had titles.
884+ + Improved efficiency of the parser (benchmarks show a 15% speedup).
885+
886+ * OPML reader:
887+
888+ + Avoid tree normalization, which is no longer necessary with the
889+ new XML parser.
890+
891+ * ODT reader:
892+
893+ + Finer-grained errors on parse failure (#7091).
894+ + Give more information if the zip container can't be unpacked.
895+
896+ * Org reader:
897+
898+ + Support `task_lists` extension (Albert Krewinkel, #6336).
899+ + Fix bug in org-ref citation parsing (Albert Krewinkel, #7101).
900+ The org-ref syntax allows to list multiple citations separated by
901+ comma. Previously commas were accepted as part of the citation id,
902+ so all citation lists were parsed as one single citation.
903+
904+ * RST reader:
905+
906+ + Use `getTimestamp` instead of `getCurrentTime` to fetch timestamp.
907+ Setting `SOURCE_DATE_EPOCH` will allow reproducible builds.
908+ + RST reader: fix handling of header in CSV tables (#7064).
909+ The interpretation of this line is not affected by the delim option.
910+
911+ * Jira reader:
912+
913+ + Modified the Doc parser to skip leading blank lines. This fixes
914+ parsing of documents which start with multiple blank lines (Albert
915+ Krewinkel, #7095).
916+ + Prevent URLs within link aliases to be treated as autolinks (Albert
917+ Krewinkel, #6944).
918+
919+ * Text.Pandoc.Shared
920+
921+ + Remove formerly exported functions that are no longer used in the
922+ code base: `splitByIndices`, `splitStringByIndicies`, `substitute`,
923+ and `underlineSpan` (which had been deprecated in April 2020)
924+ [API change].
925+ + Export `handleTaskListItem` (Albert Krewinkel) [API change].
926+ + Change `defaultUserDataDirs` to `defaultUserDataDir` [API
927+ change]. We determine what is the default user data directory
928+ by seeing whether the XDG directory and/or legacy
929+ directory exist.
930+
931+ * BibTeX writer:
932+
933+ + BibTeX writer: use doclayout and doctemplate. This change allows
934+ bibtex/biblatex output to wrap as other formats do,
935+ depending on the settings of `--wrap` and `--columns` (#7068).
936+
937+ * CSL JSON writer:
938+
939+ + Output `[]` if no references in input, instead of raising a
940+ PandocAppError as before.
941+
942+ * Docx writer:
943+
944+ + Use `getTimestamp` instead of `getCurrentTime` for timestamp.
945+ Setting `SOURCE_DATE_EPOCH` will allow reproducible builds.
946+
947+ * EPUB writer:
948+
949+ + Use `getTimestamp` instead of `getCurrentTime` for timestamp.
950+ Setting `SOURCE_DATE_EPOCH` will allow reproducible builds (#7093).
951+ This does not suffice to fully enable reproducible in EPUB, since
952+ a unique id is still being generated for each build.
953+ + Support `belongs-to-collection` metadata (#7063) (Nick Berendsen).
954+
955+ * JATS writer:
956+
957+ + Escape special chars in reference elements (Albert Krewinkel).
958+ Prevents the generation of invalid markup if a citation element
959+ contains an ampersand or another character with a special meaning
960+ in XML.
961+
962+ * Jira writer:
963+
964+ + Use Span identifiers as anchors (Albert Krewinkel).
965+ + Use `{noformat}` instead of `{code}` for unknown languages (Albert
966+ Krewinkel). Code blocks which are not marked as a language supported
967+ by Jira are rendered as preformatted text via `{noformat}` blocks.
968+
969+ * LaTeX writer:
970+
971+ + Adjust hypertargets to beginnings of paragraphs (#7078).
972+ Use `\vadjust pre` so that the hypertarget takes you to the beginning
973+ of the paragraph rather than one line down.
974+ This makes a particular difference for links to citations using
975+ `--citeproc` and `link-citations: true`.
976+ + Change BCP47 lang tag from `jp` to `ja` (Mauro Bieg, #7047).
977+ + Use function instead of map for accent lookup (should be
978+ more efficient).
979+ + Split the module to make it easier to compile on low-memory
980+ systems: added Text.Pandoc.Writers.LaTeX.{Util,Citation,Lang}.
981+
982+ * Markdown writer:
983+
984+ + Handle math right before digit. We insert an HTML comment to
985+ avoid a `$` right before a digit, which pandoc will not recognize
986+ as a math delimiter.
987+ + Split the module to make it easier to compile on low-memory
988+ systems: added Text.Pandoc.Writers.Markdown.{Types,Inline}.
989+
990+ * ODT writer:
991+
992+ + Use `getTimestamp` instead of `getCurrentTime` for timestamp.
993+ Setting `SOURCE_DATE_EPOCH` will allow reproducible builds.
994+ + Update default ODT style (Lorenzo). Previously, the "First paragraph"
995+ style inherited from "Standard" but not from "Text body." Now
996+ it is adjusted to inherit from "Text body", to avoid some ugly
997+ spacing issues. It may be necessary to update a custom `reference.odt`
998+ in light of this change.
999+
1000+ * Org writer:
1001+
1002+ + Support `task_lists` extension (Albert Krewinkel, #6336).
1003+
1004+ * Pptx writer:
1005+
1006+ + Use `getTimestamp` instead of `getCurrentTime` for timestamp.
1007+ Setting `SOURCE_DATE_EPOCH` will allow reproducible builds.
1008+
1009+ * JATS templates: tag `author.name` as `string-name` (Albert Krewinkel).
1010+ The partitioning the components of a name into surname, given names,
1011+ etc. is not always possible or not available. Using `author.name`
1012+ allows to give the full name as a fallback to be used when
1013+ `author.surname` is not available.
1014+
1015+ * Add default templates for bibtex and biblatex, so that
1016+ the variables `header-include`, `include-before`, `include-after`
1017+ (or alternatively the command line options
1018+ `--include-in-header`, `--include-before-body`, `--include-after-body`)
1019+ may be used.
1020+
1021+ * LaTeX template:
1022+
1023+ + Update to iftex package (#7073) (Andrew Dunning)
1024+ + Wrap url colours in braces (#7121) (Loïc Grobol).
1025+
1026+ * revealjs template: Add 'center' option for vertical slide centering.
1027+ (maurerle, #7104).
1028+
1029+ * Text.Pandoc.XML: Improve efficiency of `fromEntities`.
1030+
1031+ * Text.Pandoc.MIME
1032+
1033+ + Add exported function `getCharset` [API change].
1034+
1035+ * Text.Pandoc.UTF8: change IO functions to return Text, not String
1036+ [API change]. This affects `readFile`, `getContents`, `writeFileWith`,
1037+ `writeFile`, `putStrWith`, `putStr`, `putStrLnWith`, `putStrLn`.
1038+ `hPutStrWith`, `hPutStr`, `hPutStrLnWith`, `hPutStrLn`, `hGetContents`.
1039+ This avoids the need to uselessly create a linked list of characters
1040+ when emiting output.
1041+
1042+ * Text.Pandoc.App
1043+
1044+ + Add `parseOptionsFromArgs` [API change, new exported function].
1045+ + Add fields for CSL options to `Opt` [API change]:
1046+ `optCSL`, `optbibliography`, `optCitationAbbreviations`.
1047+
1048+ * Text.Pandoc.Citeproc.BibTeX
1049+
1050+ + `Text.Pandoc.Citeproc.writeBibTeXString` now returns
1051+ `Doc Text` instead of `Text` (#7068).
1052+ + Correctly handle `pages` (= `page` in CSL) (#7067).
1053+ + Correctly handle BibLaTeX `langid` (= `language` in CSL, #7067).
1054+ + In BibTeX output, protect foreign titles since there's no language
1055+ field (#7067).
1056+ + Clean up BibTeX parsing (#7049). Previously there was a messy code
1057+ path that gave strange results in some cases, not passing through raw
1058+ tex but trying to extract a string content. This was an artefact of
1059+ trying to handle some special bibtex-specific commands in the BibTeX
1060+ reader. Now we just handle these in the LaTeX reader and simplify
1061+ parsing in the BibTeX reader. This does mean that more raw tex will
1062+ be passed through (and currently this is not sensitive to the
1063+ `raw_tex` extension; this should be fixed).
1064+
1065+ * Text.Pandoc.Citeproc.MetaValue
1066+
1067+ + Correctly parse "raw" date value in markdown references metadata.
1068+ (See jgm/citeproc#53.)
1069+
1070+ * Text.Pandoc.Citeproc
1071+
1072+ + Use https URLs for links (Salim B, #7122).
1073+
1074+ * Text.Pandoc.Class
1075+
1076+ + Add `getTimestamp` [API change]. This attempts to read the
1077+ `SOURCE_DATE_EPOCH` environment variable and parse a UTC time
1078+ from it (treating it as a unix date stamp, see
1079+ https://reproducible-builds.org/specs/source-date-epoch/). If the
1080+ variable is not set or can't be parsed as a unix date stamp, then the
1081+ function returns the current date.
1082+
1083+ * Text.Pandoc.Error
1084+
1085+ + Add `PandocUnsupportedCharsetError` constructor for
1086+ `PandocError` [API change].
1087+ + Export `renderError` [API change].
1088+ + Refactor `handleError` to use `renderError`. This allows us render
1089+ error messages without exiting.
1090+
1091+ * Text.Pandoc.Extensions
1092+
1093+ + `Ext_task_lists` is now supported by org (and turned
1094+ on by default) (Albert Krewinkel, #6336).
1095+ + Remove `Ext_fenced_code_attributes` from allowed commonmark attributes
1096+ (#7097). This attribute was listed as allowed, but it didn't actually
1097+ do anything. Use `attributes` for code attributes and more.
1098+
1099+ * Lua subsystem:
1100+
1101+ + Always load built-in Lua scripts from default data-dir (Albert
1102+ Krewinkel). The Lua modules `pandoc` and `pandoc.List` are now always
1103+ loaded from the system's default data directory. Loading from a
1104+ different directory by overriding the default path, e.g. via
1105+ `--data-dir`, is no longer supported to avoid unexpected behavior
1106+ and to address security concerns.
1107+ + Add module "pandoc.path" (Albert Krewinkel, #6001, #6565).
1108+ The module allows to work with file paths in a convenient and
1109+ platform-independent manner.
1110+ + Use strict evaluation when retrieving AST value from the stack
1111+ (Albert Krewinkel, #6674).
1112+
1113+ * Text.Pandoc.PDF
1114+
1115+ + Disable `smart` extension when building PDF via LaTeX.
1116+ This is to prevent accidental creation of ligatures like
1117+ `` ?` `` and `` !` `` (especially in languages with quotations like
1118+ German), and similar ligature issues. (See jgm/citeproc#54.)
1119+
1120+ * Text.Pandoc.CSV:
1121+
1122+ + Fix parsing of unquoted values (#7112). Previously we didn't allow
1123+ unescaped quotes in unquoted values, but they are allowed
1124+ in CSV.
1125+
1126+ * Test suite:
1127+
1128+ + Use a more robust method for testing the executable. Many
1129+ of our tests require running the pandoc executable. This
1130+ is problematic for a few different reasons. First,
1131+ cabal-install will sometimes run the test suite after
1132+ building the library but before building the executable,
1133+ which means the executable isn't in place for the tests.
1134+ One can work around that by first building, then building
1135+ and running the tests, but that's fragile. Second, we
1136+ have to find the executable. So far, we've done that using
1137+ a function `findPandoc` that attempts to locate it
1138+ relative to the test executable (which can be located
1139+ using findExecutablePath). But the logic here is delicate
1140+ and work with every combination of options. To solve both
1141+ problems, we add an `--emulate` option to the
1142+ `test-pandoc` executable. When `--emulate` occurs as the
1143+ first argument passed to `test-pandoc`, the program simply
1144+ emulates the regular pandoc executable, using the rest of
1145+ the arguments (after `--emulate`). Thus, `test-pandoc
1146+ --emulate -f markdown -t latex` is just like `pandoc -f
1147+ markdown -t latex`. Since all the work is done by library
1148+ functions, implementing this emulation just takes a couple
1149+ lines of code and should be entirely reliable. With this
1150+ change, we can test the pandoc executable by running the
1151+ test program itself (locatable using `findExecutablePath`)
1152+ with the `--emulate` option. This removes the need for the
1153+ fragile `findPandoc` step, and it means we can run our
1154+ integration tests even when we're just building the
1155+ library, not the executable. [Note: part of this change
1156+ involved simplifying some complex handling to set
1157+ environment variables for dynamic library paths. I have
1158+ tested a build with `--enable-dynamic-executable`, and it
1159+ works, but further testing may be needed.]
1160+ + Print accurate location if a test fails (Albert
1161+ Krewinkel). Ensures that tasty-hunit reports the location
1162+ of the failing test instead of the location of the helper
1163+ `test` function.
1164+
1165+ * Documentation: Update URLs and use `https` where possible (#7122,
1166+ Salim B).
1167+
1168+ * Add `doc/libraries.md`, a description of libraries that support pandoc.
1169+
1170+ * MANUAL.txt
1171+
1172+ + MANUAL: block-level formatting is not allowed in line blocks (#7107).
1173+ + Clarify `tex_math_dollars` extension. Note that no blank lines
1174+ are allowed between the delimiters in display math.
1175+ + Add MANUAL section on reproducible builds.
1176+ + Document no template fallback for absolute path (#7077, Nixon
1177+ Enraght-Moony.)
1178+ + Improve docs for cite-method.
1179+ + Update README and man page.
1180+
1181+ * Makefile: in `make bench`, create CSV files for comparison and compare
1182+ against previous benchmark run. Add timestamp to CSV filenames.
1183+
1184+ * cabal.project: don't explicitly set -trypandoc.
1185+ If we do, this can't be overridden on the cabal command line.
1186+
1187+ * doc/lua-filters.md: improve documentation for
1188+ `pandoc.mediabag.insert`, `pandoc.mediabag.fetch`,
1189+ `directory`, `normalize` (Albert Krewinkel).
1190+
1191+ * Allow base64-bytestring-1.2.* (Dmitrii Kovanikov)
1192+
1193+ * Require jira-wiki-markup 1.3.3 (Albert Krewinkel)
1194+
1195+ * Require citeproc 0.3.0.8, which correctly titlecases when titles
1196+ contain non-ASCII characters.
1197+
1198+ * Use skylighting 0.10.4. This version of skylighting uses xml-conduit
1199+ rather than hxt. This speeds up parsing of XML syntax definitions
1200+ fourfold, and removes four packages from pandoc's dependency graph:
1201+ hxt-charproperties, hxt-unicode, hxt-regex-xmlschema, hxt.
1202+
1203+ * Add script `tools/parseTimings.pl` to help pin down which
1204+ modules take the most time and memory to compile.
1205+
1206+ * Avoid unnecessary use of NoImplicitPrelude pragma (#7089) (Albert
1207+ Krewinkel)
1208+
1209+ * Benchmarks
1210+
1211+ + Use the lighter-weight tasty-bench instead of criterion.
1212+ + Run writer benchmarks for binary formats too.
1213+ + Alphabetize benchmarks.
1214+ + Don't run benchmarks for bibliography formats
1215+ (yet; we need a special input for them).
1216+ + Show allocation data
1217+ + Clean up benchmark code.
1218+ + Allow specifying patterns using `-p blah'.
1219+
1220+ * trypandoc: add 2 second timeout.
1221+
1222+ * Use `-split-sections` in creating linux release binary.
1223+ This reduces executable size significantly (by about 30%).
1224+
1225+ * Remove `weigh-pandoc`. It's not really useful any more, now that our
1226+ regular benchmarks include data on allocation.
1227+
1228+ * Improve linux package build process and add script to
1229+ automate building an arm64 binary package.
1230+
1231+
1232+## pandoc 2.11.4 (2021-01-22)
1233+
1234+ * Add `biblatex`, `bibtex` as output formats (closes #7040).
1235+
1236+ * Recognize more extensions as markdown by default (#7034):
1237+ `mkdn`, `mkd`, `mdwn`, `mdown`, `Rmd`.
1238+
1239+ * Implement defaults file inheritance (#6924, David Martschenko).
1240+ Allow defaults files to inherit options from other defaults files by
1241+ specifying them with the following syntax:
1242+ `defaults: [list of defaults files or single defaults file]`.
1243+
1244+ * Fix infinite HTTP requests when writing epubs from URL source (#7013).
1245+ Due to a bug in code added to avoid overwriting the cover image
1246+ if it had the form `fileX.YYY`, pandoc made an endless sequence
1247+ of HTTP requests when writing epub with input from a URL.
1248+
1249+ * Org reader:
1250+
1251+ + Allow multiple pipe chars in todo sequences (Albert Krewinkel, #7014).
1252+ Additional pipe chars, used to separate "action" state from "no further
1253+ action" states, are ignored. E.g., for the following sequence, both
1254+ `DONE` and `FINISHED` are states with no further action required:
1255+ `#+TODO: UNFINISHED | DONE | FINISHED`.
1256+ + Restructure output of captioned code blocks (Albert Krewinkel, #6977).
1257+ The Div wrapper of code blocks with captions now has the class
1258+ "captioned-content". The caption itself is added as a Plain block
1259+ inside a Div of class "caption". This makes it easier to write filters
1260+ which match on captioned code blocks. Existing filters will need to be
1261+ updated.
1262+ + Mark verbatim code with class `verbatim` (Dimitri Sabadie, #6998).
1263+
1264+ * LaTeX reader:
1265+
1266+ + Handle `filecontents` environment (#7003).
1267+ + Put contents of unknown environments in a Div when `raw_tex` is not
1268+ enabled (#6997). (When `raw_tex` is enabled, the whole environment is
1269+ parsed as a raw block.) The class name is the name of the environment.
1270+ Previously, we just included the contents without the surrounding Div,
1271+ but having a record of the environment's boundaries and name can be
1272+ useful.
1273+
1274+ * Mediawiki reader:
1275+
1276+ + Allow space around storng/emph delimiters (#6993).
1277+
1278+ * New module Text.Pandoc.Writers.BibTeX, exporting
1279+ writeBibTeX and writeBibLaTeX. [API change]
1280+
1281+ * LaTeX writer:
1282+
1283+ + Revert table line height increase in 2.11.3 (#6996).
1284+ In 2.11.3 we started adding `\addlinespace`, which produced less dense
1285+ tables. This wasn't an intentional change; I misunderstood a comment in
1286+ the discussion leading up to the change. This commit restores the earlier
1287+ default table appearance. Note that if you want a less dense table, you
1288+ can use something like `\def\arraystretch{1.5}` in your header.
1289+
1290+ * EPUB writer:
1291+
1292+ + Adjust internal links to identifiers defined in raw HTML sections
1293+ after splitting into chapters (#7000).
1294+ + Recognize `Format "html4"`, `Format "html5"` as raw HTML.
1295+ + Adjust internal links to images, links, and tables after splitting into
1296+ chapters. Previously we only did this for Div and Span and Header
1297+ elements (see #7000).
1298+
1299+ * Ms writer:
1300+
1301+ + Don't justify text inside table cells.
1302+
1303+ * JATS writer:
1304+
1305+ + Use `<element-citation>` if `element_citations`
1306+ extension is enabled (Albert Krewinkel).
1307+ + Fix citations (Albert Krewinkel, #7018). By default
1308+ we use formatted citations.
1309+ + Ensure that `<disp-quote>` is always wrapped in `<p>` (#7041).
1310+
1311+ * Markdown writer:
1312+
1313+ + Cleaned up raw formats. We now react appropriately
1314+ to `gfm`, `commonmark`, and `commonmark_x` as raw formats.
1315+
1316+ * RST writer:
1317+
1318+ + Fix bug with dropped content from inside spans with a class in
1319+ some cases (#7039).
1320+
1321+ * Docx writer:
1322+
1323+ + Handle table header using styles (#7008). Instead of hard-coding
1324+ the border and header cell vertical alignment, we now let this
1325+ be determined by the Table style, making use of Word's
1326+ "conditional formatting" for the table's first row. For
1327+ headerless tables, we use the tblLook element to tell Word
1328+ not to apply conditional first-row formatting.
1329+
1330+ * Commonmark writer:
1331+
1332+ + Implement start number on ordered lists (#7009). Previously they always
1333+ started at 1, but according to the spec the start number is respected.
1334+
1335+ * HTML writer:
1336+
1337+ + Fix implicit_figure at end of footnotes (#7006).
1338+
1339+ * ConTeXt template: Remove `\setupthinrules` from default template.
1340+ The width parameter this used is not actually supported,
1341+ and the command didn't do anything.
1342+
1343+ * Text.Pandoc.Extensions:
1344+
1345+ + Add `Ext_element_citations` constructor (Albert Krewinkel).
1346+
1347+ * Text.Pandoc.Citeproc.BibTeX: New unexported function
1348+ `writeBibtexString`.
1349+
1350+ * Text.Pandoc.Citeproc:
1351+
1352+ + Use finer grained imports (Albert Krewinkel).
1353+ + Factor out and export `getStyle` [API change].
1354+ + Export `getReferences` [API change, #7106].
1355+ + Factor out getLang.
1356+
1357+ * Text.Pandoc.Parsing: modify `gridTableWith'` for headerless tables.
1358+ If the table lacks a header, the header row should be an empty
1359+ list. Previously we got a list of empty cells, which caused
1360+ an empty header to be emitted instead of no header. In LaTeX/PDF
1361+ output that meant we got a double top line with space between.
1362+
1363+ * ImageSize: use `viewBox` for SVG if no length, width attributes (#7045).
1364+ This change allows pandoc to extract size information from more SVGs.
1365+
1366+ * Add simple default.nix.
1367+
1368+ * Use commonmark 0.1.1.3.
1369+
1370+ * Use citeproc 0.3.0.5.
1371+
1372+ * Update default CSL to use latest chicago-author-date.csl.
1373+
1374+ * CONTRIBUTING.md: add note on GNU xargs.
1375+
1376+ * MANUAL.txt:
1377+
1378+ + Update description of `-L`/`--lua-filter`.
1379+ + Document use of citations in note styles (#6828).
1380+
1381+## pandoc 2.11.3.2 (2020-12-29)
1382+
1383+ * HTML reader: use renderTags' from Text.Pandoc.Shared (Albert Krewinkel).
1384+ A side effect of this change is that empty `<col>` elements are written
1385+ as self-closing tags in raw HTML blocks.
1386+
1387+ * Asciidoc writer: Add support for writing nested tables (#6972, timo-a).
1388+ Asciidoc supports one level of nesting. If deeper tables are to be
1389+ written, they are omitted and a warning is issued.
1390+
1391+ * Docx writer: fix nested tables with captions (#6983).
1392+ Previously we got unreadable content, because docx seems
1393+ to want a `<w:p>` element (even an empty one) at the end of
1394+ every table cell.
1395+
1396+ * Powerpoint writer: allow arbitrary OOXML in raw inline elements
1397+ (Albert Krewinkel). The raw text is now included verbatim in the
1398+ output. Previously is was parsed into XML elements, which prevented
1399+ the inclusion of partial XML snippets.
1400+
1401+ * LaTeX writer: support colspans and rowspans in tables (#6950,
1402+ Albert Krewinkel). Note that the multirow package is needed for
1403+ rowspans. It is included in the latex template under a variable,
1404+ so that it won't be used unless needed for a table.
1405+
1406+ * HTML writer: don't include p tags in CSL bibliography entries
1407+ (#6966). Fixes a regression in 2.11.3.
1408+
1409+ * Add `meta-description` variable to HTML templates (#6982). This
1410+ is populated by the writer by stringifying the `description`
1411+ field of metadata (Jerry Sky). The `description` meta tag will
1412+ make the generated HTML documents more complete and SEO-friendly.
1413+
1414+ * Citeproc: fix handling of empty URL variables (`DOI`, etc.).
1415+ The `linkifyVariables` function was changing these to links
1416+ which then got treated as non-empty by citeproc, leading
1417+ to wrong results (e.g. ignoring nonempty URL when empty DOI is present).
1418+ See jgm/citeproc#41.
1419+
1420+ * Use citeproc 0.3.0.3. Fixes an issue in author-only citations when
1421+ both an author and translator are present, and an issue with
1422+ citation group delimiters.
1423+
1424+ * Require texmath 0.12.1. This improves siunitx support in math,
1425+ fixes bugs with `\*mod` family operators and arrays, and avoids
1426+ italicizing symbols and operator names in docx output.
1427+
1428+ * Ensure that the perl interpreter used for filters with `.pl`
1429+ extension (wuffi).
1430+
1431+ * MANUAL: note that textarea content is never parsed as Markdown
1432+ (Albert Krewinkel).
1433+
1434+
1435+## pandoc 2.11.3.1 (2020-12-18)
1436+
1437+ * Added some missing files to extra-source-files and data
1438+ files, so they are included in the sdist tarball. Closes #6961.
1439+ Cleaned up some extraneous data and test files, and added
1440+ a CI check to ensure that the test and data files included
1441+ in the sdist match what is in the git repository.
1442+
1443+ * Use citeproc 0.3.0.1, which avoids removing nonbreaking
1444+ space at the end of the `initialize-with` attribute. (Some
1445+ journals require nonbreaking space after initials, and this
1446+ makes that possible.)
1447+
1448+## pandoc 2.11.3 (2020-12-17)
1449+
1450+ * With `--bibliography` (or `bibliography` in metadata), a
1451+ URL may now be provided, and pandoc will fetch the resource.
1452+ In addition, if a file path is provided and it is not
1453+ found relative to the working directory, the resource
1454+ path will be searched (#6940).
1455+
1456+ * Add `sourcepos` extension for `commonmark`, `gfm`, `commonmark_x`
1457+ (#4565). With the `sourcepos` extension set set, `data-pos`
1458+ attributes are added to the AST by the commonmark reader. No other
1459+ readers are affected. The `data-pos` attributes are put on elements
1460+ that accept attributes; for other elements, an enlosing Div or Span
1461+ is added to hold the attributes.
1462+
1463+ * Change extensions for `commonmark_x`: replace `auto_identifiers`
1464+ with `gfm_auto_identifiers` (#6863). `commonmark_x` never actually
1465+ supported `auto_identifiers` (it didn't do anything), because the
1466+ underlying library implements gfm-style identifiers only. Attempts
1467+ to add the `auto_identifiers` extension to `commonmark` will now
1468+ fail with an error.
1469+
1470+ * HTML reader:
1471+
1472+ + Split module into several submodules (Albert Krewinkel). Reducing
1473+ module size should reduce memory use during compilation.
1474+ + Support advanced table features (Albert Krewinkel):
1475+ block level content in captions, row and colspans,
1476+ body headers, row head columns, footers, attributes.
1477+ + Disable round-trip testing for tables. Information for cell
1478+ alignment in a column is not preserved during round-trips (Albert
1479+ Krewinkel).
1480+ + Allow finer grained options for tag omission (Albert Krewinkel).
1481+ + Simplify list attribute handling (Albert Krewinkel).
1482+ + Pay attention to `lang` attributes on body element (#6938).
1483+ These (as well as `lang` attributes on the html element) should update
1484+ lang in metadata.
1485+ + Retain attribute prefixes and avoid duplicates (#6938).
1486+ Previously we stripped attribute prefixes, reading `xml:lang` as
1487+ `lang` for example. This resulted in two duplicate `lang`
1488+ attributes when `xml:lang` and `lang` were both used. This commit
1489+ causes the prefixes to be retained, and also avoids invald
1490+ duplicate attributes.
1491+
1492+ * Commonmark reader:
1493+
1494+ + Refactor `specFor`.
1495+ + Set input name to `""` to avoid clutter in sourcepos output.
1496+
1497+ * Org reader:
1498+
1499+ + Parse `#+LANGUAGE` into `lang` metadata field (#6845, Albert
1500+ Krewinkel).
1501+ + Preserve targets of spurious links (#6916, Albert
1502+ Krewinkel). Links with (internal) targets that the reader doesn't
1503+ know about are converted into emphasized text. Information on the
1504+ link target is now preserved by wrapping the text in a Span of class
1505+ `spurious-link`, with an attribute `target` set to the link's
1506+ original target. This allows to recover and fix broken or unknown
1507+ links with filters.
1508+
1509+ * DocBook reader:
1510+
1511+ + Table text width support (#6791, Nils Carlson).
1512+ Table width in relation to text width is not natively supported
1513+ by docbook but is by the docbook `fo` stylesheets through an XML
1514+ processing instruction, `<?dbfo table-width="50%"?>`.
1515+
1516+ * LaTeX reader:
1517+
1518+ + Improve parsing of command options (#6869, #6873).
1519+ In cases where we run into trouble parsing inlines til the
1520+ closing `]`, e.g. quotes, we return a plain string with the
1521+ option contents. Previously we mistakenly included the brackets
1522+ in this string.
1523+ + Preserve center environment (#6852, Igor Pashev).
1524+ The contents of the `center` environment are put in a `Div`
1525+ with class `center`.
1526+ + Don't parse `\rule` with width 0 as horizontal rule. These are
1527+ sometimes used as spacers in LaTeX.
1528+ + Don't apply theorem default styling to a figure inside (#6925).
1529+ If we put an image in italics, then when rendering to Markdown
1530+ we no longer get an implicit figure.
1531+
1532+ * Dokuwiki reader:
1533+
1534+ + Handle unknown interwiki links better (#6932).
1535+ DokuWiki lets the user define his own Interwiki links. Previously
1536+ pandoc reacted to these by emitting a google search link, which is
1537+ not helpful. Instead, we now just emit the full URL including the
1538+ wikilink prefix, e.g. `faquk>FAQ-mathml`. This at least gives users
1539+ the ability to modify the links using filters.
1540+
1541+ * Markdown writer:
1542+
1543+ + Properly handle boolean values in writing YAML metadata (#6388).
1544+ + Ensure that a new csl-block begins on a new line (#6921).
1545+ This just looks better and doesn't affect the semantics.
1546+
1547+ * RST writer:
1548+
1549+ + Better image handling (#6948). An image alone in its paragraph
1550+ (but not a figure) is now rendered as an independent image, with an
1551+ `alt` attribute if a description is supplied. An inline image that
1552+ is not alone in its paragraph will be rendered, as before, using a
1553+ substitution. Such an image cannot have a "center", "left", or
1554+ "right" alignment, so the classes `align-center`, `align-left`, or
1555+ `align-right` are ignored. However, `align-top`, `align-middle`,
1556+ `align-bottom` will generate a corresponding `align` attribute.
1557+
1558+ * Docx writer:
1559+
1560+ + Keep raw openxml strings verbatim (#6933, Albert Krewinkel).
1561+ + Use Content instead of Element. This allows us to inject
1562+ raw OpenXML into the document without reparsing it into an
1563+ Element, which is necessary if you want to inject an open
1564+ tag or close tag.
1565+ + Fix bullets/lists indentation, so that the first level is slightly
1566+ indented to the right instead of right on the margin (cholonam).
1567+ + Support bold and italic in "complex script" (#6911).
1568+ Previously bold and italics didn't work properly in LTR
1569+ text. This commit causes the w:bCs and w:iCs attributes
1570+ to be used, in addition to w:b and w:i, for bold and
1571+ italics respectively.
1572+
1573+ * ICML writer:
1574+
1575+ + Fix image bounding box for custom widths/heighta (Mauro Bieg, #6936).
1576+
1577+ * LaTeX writer:
1578+
1579+ + Improve table spacing (#6842, #6860).
1580+ Remove the `\strut` that was added at the end of minipage
1581+ environments in cells. Replace `\tabularnewline` with
1582+ `\\ \addlinespace`.
1583+ + Improve calculation of column spacing (#6883).
1584+ + Extract table handling into separate module (Albert Krewinkel).
1585+ + Fix bug with nested `csl-` display Spans (#6921).
1586+ + Improve longtable output (#6883). Don't create minipages for
1587+ regular paragraphs. Put width and alignment information in the
1588+ longtable column descriptors.
1589+
1590+ * OpenDocument writer:
1591+
1592+ + Support for table width as a percentage of text width
1593+ (#6792, Nils Carson).
1594+ + Implement Div and Span ident support (#6755, Nils Carson).
1595+ Spans and Divs containing an ident in the Attr will become bookmarks
1596+ or sections with idents in OpenDocument format.
1597+ + Add two extensions, `xrefs_name` and `xrefs_number` (#6774, Nils
1598+ Carlson). Links to headings, figures and tables inside the
1599+ document are substituted with cross-references that will use the
1600+ name or caption of the referenced item for `xrefs_name` or the
1601+ number for `xrefs_number`. For the `xrefs_number` to be useful
1602+ heading numbers must be enabled in the generated document and
1603+ table and figure captions must be enabled using for example the
1604+ `native_numbering` extension. In order for numbers and reference
1605+ text to be updated the generated document must be refreshed.
1606+
1607+ * JATS writer:
1608+
1609+ + Support advanced table features (Albert Krewinkel).
1610+ + Support author affiliations (#6687, Albert Krewinkel).
1611+
1612+ * Docbook writer:
1613+
1614+ + Use correct id attribute consistently (Jan Tojnar).
1615+ DocBook5 should always use `xml:id` instead of `id`.
1616+ + Handle admonition titles better (Jan Tojnar).
1617+ Docbook reader produces a `Div` with `title` class for `<title>`
1618+ element within an “admonition” element. Markdown writer then turns
1619+ this into a fenced div with `title` class attribute. Since fenced
1620+ divs are block elements, their content is recognized as a
1621+ paragraph by the Markdown reader. This is an issue for Docbook
1622+ writer because it would produce an invalid DocBook document from
1623+ such AST – the `<title>` element can only contain “inline”
1624+ elements. Handle this special case separately by unwrapping
1625+ the paragraph before creating the `<title>` element.
1626+ + Add XML namespaces to top-level elements (#6923, Jan Tojnar).
1627+ Previously, we only added `xmlns` attributes to chapter
1628+ elements, even when running with `--top-level-division=section`.
1629+ These namespaces are now added to part and section elements too,
1630+ when they are the selected top-level divisions.
1631+ We do not need to add namespaces to documents produced with
1632+ `--standalone` flag, since those will already have xmlns attribute on
1633+ the root element in the template.
1634+
1635+ * HTML writer:
1636+
1637+ + Fix handling of nested `csl-` display spans (#6921).
1638+ Previously inner Spans used to represent CSL display attributes were
1639+ not rendered as div tags as intended.
1640+
1641+ * EPUB writer:
1642+
1643+ + Include title page in landmarks (#6919).
1644+ Note that the toc is also included if `--toc` is specified.
1645+ + Add frontmatter type on body element for nav.xhtml (#6918).
1646+
1647+ * EPUB templates: use preserveAspectRatio="xMidYMid" for cover image (#6895,
1648+ Shin Sang-jae). This change affects both the epub2 and the epub3
1649+ templates. It avoids distortion of the cover image by requiring that the
1650+ aspect ratio be preserved.
1651+
1652+ * LaTeX template:
1653+
1654+ + Include `csquotes` package if `csquotes` variable set.
1655+ + Put back `amssymb`. We need it for checkboxes in todo lists,
1656+ and maybe for other things. In this location it seems compatible
1657+ with the cases that prompted #6469 and PR #6762.
1658+ + Disable language-specific shorthands in babel (#6817, #6887).
1659+ Babel defines "shorthands" for some languages, and these can
1660+ produce unexpected results. For example, in Spanish, `1.22`
1661+ gets rendered as `122`, and `et~al.` as `etal`.
1662+ One would think that babel's `shorthands=off` option (which
1663+ we were using) would disable these, but it doesn't. So we
1664+ remove `shorthands=off` and add some code that redefines
1665+ the shorthands macro. Eventually this will be fixed in babel,
1666+ I hope, and we can revert to something simpler.
1667+
1668+ * JATS template: allow array of persistent institute ids in `pid`
1669+ (Albert Krewinkel).
1670+
1671+ * Text.Pandoc.Parsing: minor code and efficiency improvements.
1672+
1673+ * Text.Pandoc.Extension:
1674+
1675+ + Add `Ext_sourcepos` constructor for `Extension` [API change].
1676+ + Add `Ext_xrefs_name` and `Ext_xrefs_number` constructors for
1677+ `Extension` (Nils Carson) [API change].
1678+
1679+ * Text.Pandoc.Citeproc:
1680+
1681+ + Fix truncation of `[Citation]` list in `Cite` inside footnotes (#6890).
1682+ This affected author-in-text citations in footnotes. It didn't cause
1683+ problems for the printed output, but for filters that expected the
1684+ citation id and other information.
1685+ + Allow the use of both inline and external references (#6951),
1686+ as with pandoc-citeproc. References defined in the document's
1687+ metadata take priority over references with the same id defined in
1688+ an external bibliography.
1689+ + Use `fetchItem` to get external bibliography (#6940).
1690+ + Ensure that BCP47 lang codes can be used. We ignore the variants
1691+ and just use the base lang code and country code when passing off
1692+ to citeproc.
1693+ + Citeproc BibTeX parser: revert change in `getRawField`
1694+ which was made (for reasons forgotten) when transferring
1695+ this code from pandoc-citeproc. The change led to `--` in
1696+ URLs being interpreted as en-dashes, which is unwanted (#6874).
1697+
1698+ * Text.Pandoc.ImageSize:
1699+
1700+ + Default to DPI 72 if the format specifies DPI of 0 (#6880).
1701+ This shouldn't happen, in general, but it can happen with
1702+ JPEGs that don't conform to the spec. Having a DPI of 0
1703+ will blow up size calculations (division by 0).
1704+ + ImageSize: use JuicyPixels to determine size for png, jpeg, and
1705+ gif, instead of doing our own binary parsing (#6936). This
1706+ gives more reliable results.
1707+
1708+ * Text.Pandoc.CSS:
1709+
1710+ + Remove `foldOrElse` (internal module) (Albert Krewinkel).
1711+
1712+ * Use skylighting 0.10.2 (#6625).
1713+
1714+ * Use citeproc 0.3. This fixes issues with references with
1715+ duplicate ids (jgm/citeproc#36).
1716+
1717+ * Use doctemplates 0.9. This fixes issues with boolean
1718+ metadata values in the Markdown writer (#6388)
1719+ and in `meta-json` (#6650). It also fixes
1720+ issues with nested for loops in templates.
1721+
1722+ * Add translations zh-Hans.yaml and zh-Hant.yaml (#6904, #6909,
1723+ Kolen Cheung, taotieren).
1724+
1725+ * Add tests: True to cabal.project.
1726+ This fixes some CI failures for cabal.
1727+
1728+ * Normalize test/tables/*.native (#6888, Kolen Cheung).
1729+
1730+ * Move executable to `app` directory to avoid problems with cabal repl.
1731+
1732+ * CONTRIBUTING: add section "How can I help?" (#6892, Albert Krewinkel).
1733+ Also adds a paragraph aimed at highlighting the importance of feature
1734+ maintenance.
1735+
1736+ * MANUAL: Document that --number-sections works in `ms` (#6935).
1737+
1738+
1739+## pandoc 2.11.2 (2020-11-19)
1740+
1741+ * Default to using ATX (`##`-style) headings for Markdown output
1742+ (#6662, Aner Lucero). Previously we used Setext (underlined) headings
1743+ by default for levels 1--2.
1744+
1745+ * Add option `--markdown-headings=atx|setext`, and deprecate
1746+ `--atx-headers` (#6662, Aner Lucero).
1747+
1748+ * Support `markdown-headings` in defaults files.
1749+
1750+ * Fix corner case in YAML metadata parsing (#6823). Previously YAML
1751+ metadata would sometimes not get recognized if a field ended with a
1752+ newline followed by spaces.
1753+
1754+ * `--self-contained`: increase coverage (#6854).
1755+ Previously we only self-contained attributes for certain tag names
1756+ (`img`, `embed`, `video`, `input`, `audio`, `source`, `track`,
1757+ `section`). Now we self-contain any occurrence of `src`,
1758+ `data-src`, `poster`, or `data-background-image`, on any tag; and
1759+ also `href` on `link` tags.
1760+
1761+ * Markdown reader:
1762+
1763+ + Fix detection of locators following in-text citations.
1764+ Prevously, if we had `@foo [p. 33; @bar]`, the `p. 33` would be
1765+ incorrectly parsed as a prefix of `@bar` rather than a suffix of
1766+ `@foo`.
1767+ + Improve period suppression algorithm for citations in notes
1768+ in note citation styles (#6835).
1769+ + Don't increment `stateNoteNumber` for example list references.
1770+ This helps with #6836 (a bug in which example list references
1771+ disturb calculation of citation note number and affect when
1772+ `ibid` is triggered).
1773+
1774+ * LaTeX reader:
1775+
1776+ + Move `getNextNumber` from Readers.LaTeX to Readers.LaTeX.Parsing.
1777+ + Fix negative numbers in siunitx commands. A change in pandoc 2.11
1778+ broke negative numbers, e.g. `\SI{-33}{\celcius}` or `\num{-3}`.
1779+ This fixes the regression.
1780+
1781+ * DocBook reader: drop period in formalpara title
1782+ and put it in a div with class `formalpara-title`, so that
1783+ people can reformat with filters (#6562).
1784+
1785+ * Man reader: improve handling of `.IP` (#6858). We now better handle
1786+ `.IP` when it is used with non-bullet, non-numbered lists, creating a
1787+ definition list. We also skip blank lines like groff itself.
1788+
1789+ * Bibtex reader: fall back on `en-US` if locale for LANG not found.
1790+ This reproduces earlier pandoc-citeproc behavior (jgm/citeproc#26).
1791+
1792+ * JATS writer:
1793+
1794+ + Wrap all tables (Albert Krewinkel).
1795+ All `<table>` elements are put inside `<table-wrap>` elements, as the
1796+ former are not valid as immediate child elements of `<body>`.
1797+ + Move Table handling to separate module (Albert Krewinkel).
1798+ Adds two new unexported modules:
1799+ Text.Pandoc.Writers.JATS.Types, Text.Pandoc.Writers.JATS.Table.
1800+
1801+ * Org writer:
1802+
1803+ + Replace org #+KEYWORDS with #+keywords (TEC).
1804+ As of ~2 years ago, lower case keywords became the standard (though
1805+ they are handled case insensitive, as always).
1806+ + Update org supported languages and identifiers according to the
1807+ current list contained in
1808+ <https://orgmode.org/worg/org-contrib/babel/languages/index.html>
1809+ (TEC).
1810+
1811+ * Only use `filterIpynbOutput` if input format is ipynb (#6841).
1812+ Before this change content could go missing from divs with class
1813+ `output`, even when non-ipynb was being converted.
1814+
1815+ * When checking reader/writer name, check base name now that we permit
1816+ extensions on formats other than markdown.
1817+
1818+ * Text.Pandoc.PDF: Fix `changePathSeparators` for Windows (#6173).
1819+ Previously a path beginning with a drive, like `C:\foo\bar`, was
1820+ translated to `C:\/foo/bar`, which caused problems.
1821+ With this fix, the backslashes are removed.
1822+
1823+ * Text.Pandoc.Logging:
1824+
1825+ + Add constructor `ATXHeadingInLHS` to `LogMessage` [API change].
1826+ + Add constructor `EnvironmentVariableUndefined` to
1827+ `LogMessage` [API change].
1828+
1829+ * Fix error that is given when people specify `doc` output (#6834,
1830+ gison93).
1831+
1832+ * LaTeX template: add a `\break` after parbox in `CSLRightInline`.
1833+ This should fix spacing problems between entries with numeric styles.
1834+ Also fix number of params on `CSLReferences`.
1835+
1836+ * reveal.js template: Put quotes around `controlsLayout`,
1837+ `controlsBackArrows`, and `display`, since these require strings.
1838+ Add `showSlideNumber`, `hashOneBasedIndex`, `pause`.
1839+
1840+ * Use citeproc 0.2. This fixes a bug with title case around parentheses.
1841+
1842+ * pandoc.cabal: remove 'static' flag.
1843+ This isn't really necessary and can be misleading (e.g. on macOS,
1844+ where a fully static build isn't possible). cabal's new option
1845+ `--enable-executable-static` does the same. On stack you can add
1846+ something like this to the options for your executable in package.yaml:
1847+
1848+ ld-options: -static -pthread
1849+
1850+ * Remove obsolete bibutils flag setting in `linux/make_artifacts.sh`.
1851+
1852+ * Manual:
1853+
1854+ + Correct `link-citation` -> `link-citations`.
1855+ + Add a sentence about `pagetitle` for HTML (#6843, Alex Toldaiev).
1856+
1857+ * INSTALL.md: Remove references to `pandoc-citeproc` (#6857).
1858+
1859+ * CONTRIBUTING: describe hlint and how it's used (#6840, Albert
1860+ Krewinkel).
1861+
1862+## pandoc 2.11.1.1 (2020-11-07)
1863+
1864+ * Citeproc: improve punctuation in in-text note citations (#6813).
1865+ Previously in-text note citations inside a footnote would sometimes have
1866+ the final period stripped, even if it was needed (e.g. on the end of
1867+ 'ibid').
1868+
1869+ * Use citeproc 0.1.1.1. This improves the decision about when
1870+ to use `ibid` in cases where citations are used inside
1871+ a footnote (#6813).
1872+
1873+ * Support `nocase` spans for `csljson` output.
1874+
1875+ * Require latest commonmark, commonmark-extensions.
1876+ This fixes a bug with `autolink_bare_uris` and commonmark.
1877+
1878+ * LaTeX reader: better handling of `\\` inside math in table cells (#6811).
1879+
1880+ * DokuWiki writer: translate language names for code elements
1881+ and improve whitespace (#6807).
1882+
1883+ * MediaWiki writer: use `syntaxhighlight` tag instead of deprecated
1884+ `source` for highlighted code (#6810). Also support `startFrom`
1885+ attribute and `numberLines`.
1886+
1887+ * Lint code in PRs and when committing to master (#6790,
1888+ Albert Krewinkel).
1889+
1890+ * doc/filters.md: describe technical details of filter invocations (#6815,
1891+ Albert Krewinkel).
1892+
1893+
1894+## pandoc 2.11.1 (2020-11-03)
1895+
1896+ * DocBook Reader: fix duplicate bibliography bug (#6773, Nils Carlson).
1897+
1898+ * HTML reader:
1899+
1900+ + Parse contents of iframes (#6770).
1901+ + Parse inline svg as image unless `raw_html` is set in the reader (in
1902+ which case the svg is passed through as raw HTML) (#6770).
1903+
1904+ * LaTeX reader:
1905+
1906+ + Fix bug parsing macro arguments (#6796). If `\cL` is
1907+ defined as `\mathcal{L}`, and `\til` as `\tilde{#1}`, then
1908+ `\til\cL` should expand to `\tilde{\mathcal{L}}`, but
1909+ pandoc was expanding it to `\tilde\mathcal{L}`. This is
1910+ fixed by parsing the arguments in "verbatim mode" when the
1911+ macro expands arguments at the point of use.
1912+ + Properly support optional (cite) argument for
1913+ `\blockquote` from `csquotes` (#6802).
1914+
1915+ * LaTeX writer: Improved calculation of table column widths.
1916+ We now have LaTeX do the calculation, using `\tabcolsep`.
1917+ So we should now have accurate relative column widths no
1918+ matter what the text width. The default template has been modified to load
1919+ the calc package if tables are used.
1920+
1921+ * HTML writer: Fix duplicate "class" attribute for table
1922+ rows (Andy Morris).
1923+
1924+ * Text.Pandoc.Filter: allow shorter YAML representation of Citeproc
1925+ (Albert Krewinkel). The map-based YAML representation of filters expects
1926+ `type` and `path` fields. The path field had to be present for all filter
1927+ types, but is not used for citeproc filters. The field can now be omitted
1928+ when type is "citeproc", as described in the MANUAL.
1929+
1930+ * Text.Pandoc.Error: Add `PandocBibliographyError` constructor
1931+ for `PandocError` [API change]. This ensures that bibliography parsing
1932+ errors generate messages that include the bibliography file name --
1933+ otherwise it can be quite mysterious where it is coming from.
1934+
1935+ * Citeproc: properly handle `csl` field with `data:` URI (#6783).
1936+ This is used with the JATS writer, so this fixes a regression
1937+ in pandoc 2.11 with JATS output and citeproc.
1938+
1939+ * Allow `citation-abbreviations` in defaults file.
1940+
1941+ * JATS templates: ensure `jats_publishing` output is valid
1942+ (Albert Krewinkel).
1943+
1944+ * LaTeX template: Fix `CSLRightInline`, so that it does not
1945+ run over the right margin.
1946+
1947+ * HTML template: default CSS tweaks (Mauro Bieg and John
1948+ MacFarlane).
1949+
1950+ - Fix margin before codeblock
1951+ - Add `monobackgroundcolor` variable, making the background color
1952+ and padding of code optional.
1953+ - Ensure that backgrounds from highlighting styles take precedence over
1954+ monobackgroundcolor
1955+ - Remove list markers from TOC
1956+ - Add margin-bottom where needed
1957+ - Remove italics from blockquote styling
1958+ - Change borders and spacing in tables to be more consistent with other
1959+ output formats
1960+ - Style h5, h6
1961+ - Set font-size for print media to 12pt.
1962+ - Reduce interline space.
1963+ - Reduce interparagraph space.
1964+ - Reduce line width.
1965+ - Remove the special `line-height: 1` for table cells.
1966+ - Remove the special line-height for pre.
1967+ - Ensure that there is a bit more space before a heading
1968+ than after.
1969+ - Slightly reduced space after title header.
1970+ - Add CSS example to MANUAL
1971+
1972+ * man template: Change comment that triggers `tbl` from
1973+ `.\"t` to `'\" t`, as specified in groff_man(7) (#6803).
1974+
1975+ * Use latest commonmark, commonmark-extensions.
1976+ This fixes a bug with nested blocks in footnotes with the
1977+ `footnote` extension to `commonmark`. See jgm/commonmark-hs#63.
1978+
1979+ * Citeproc: use comma for in-text citations inside footnotes.
1980+ When an author-in-text citation like `@foo` occurs in a footnote,
1981+ we now render it with: `AUTHOR NAME + COMMA + SPACE + REST`.
1982+ Previously we rendered: `AUTHOR NAME + SPACE + "(" + REST + ")"`.
1983+ This gives better results. Note that normal citations are still
1984+ rendered in parentheses.
1985+
1986+ * Use latest citeproc:
1987+
1988+ + citeproc no longer capitalizes notes, so we do it
1989+ in pandoc when appropriate.
1990+ + Closes #6783.
1991+
1992+ * Clarify manual on `--track-changes` (#6801).
1993+
1994+ * Add `doc/jats.md` to document pandoc's handling of JATS
1995+ (#6794, Albert Krewinkel).
1996+
1997+ * Fix code example in lua-filters.md (#6795).
1998+
1999+## pandoc 2.11.0.4 (2020-10-21)
2000+
2001+ * Commonmark writer: fix regression with fenced divs (#6768).
2002+ Starting with 2.10.1, fenced divs no longer render with
2003+ HTML div tags in commonmark output. This is a regression
2004+ due to our transition from cmark-gfm. This commit fixes it.
2005+
2006+ * Use released version of citeproc. (This fixes a mis-step
2007+ in the 2.11.0.3 release, which is now deprecated.)
2008+
2009+ * Use latest sylighting, with support for `groovy`.
2010+
2011+ * Document that --html-q-tags requires the smart extension on the reader
2012+ (#6766).
2013+
2014+## pandoc 2.11.0.3 (2020-10-20)
2015+
2016+ * Use latest citeproc (closes #6765). This fixes a problem with
2017+ author-in-text citations for references including both an author
2018+ and an editor. Previously, both were included in the text, but only
2019+ the author should be.
2020+
2021+ * With `--citeproc`, ensure that the final period is removed when
2022+ citations that occur in notes in note-based styles get put in
2023+ parentheses. See jgm/citeproc#20.
2024+
2025+ * Normalize rewritten image paths with `--extract-media` (#6761).
2026+ This change will avoid mixed paths like this one when
2027+ `--extract-media` is used with a Word file:
2028+ `![](C:\Git\TIJ4\Markdown/media/image30.wmf)`. Instead we'll get
2029+ `![](C:\Git\TIJ4\Markdown`media`image30.wmf)`.
2030+
2031+ * Modify `--version` output. Use space more efficiently and report the
2032+ citeproc and ipynb versions, along with skylighting, texmath, and
2033+ pandoc-types. Drop the word "default" before "user data directory."
2034+
2035+ * DocBook reader: bibliomisc and anchor support (#6754, Nils Carlson).
2036+ Also ensure that bibliodiv without a title no longer results in
2037+ an empty Header.
2038+
2039+ * ConTeXt template: adds `\setupinterlinespace` to fonts larger
2040+ than normal (#6763, Denis Maier).
2041+
2042+ * LaTeX template: Do not load amssymb if not needed (#6469, Angelo Peronio).
2043+ See <https://tex.stackexchange.com/a/549938>.
2044+
2045+ * Relax upper bound on hslua, allow hslua-1.3.* (Albert Krewinkel).
2046+
2047+ * MANUAL:
2048+
2049+ + Improve explanation of "indent" variable (#6767, Cyrus Yip).
2050+ + Remove org from list of input formats supporting raw_tex (#6753,
2051+ Nick Fleisher).
2052+
2053+
2054+## pandoc 2.11.0.2 (2020-10-15)
2055+
2056+ * Fix handling of `xdata` in bibtex/biblatex bibliographies (#6752).
2057+
2058+ * Fix some small typos in the API documentation (#6751, Michael Hoffmann).
2059+
2060+ * Require citeproc 0.1.0.2. This fixes a regression from pandoc-citeproc
2061+ involving spacing between components of a reference in certain styles
2062+ (e.g. `cell.csl`).
2063+
2064+ * Fix typos in comments, doc strings, error messages, and tests
2065+ (Albert Krewinkel, #6738).
2066+
2067+## pandoc 2.11.0.1 (2020-10-13)
2068+
2069+ * LaTeX reader: support more acronym commands (#6746):
2070+ `\acl`, `\aclp`, and capitalized versions of already
2071+ supported commands.
2072+
2073+ * Commonmark reader: add `pipe_table` extension *after* defaults (#6739).
2074+ Otherwise we get bad results for non-table, non-paragraph
2075+ lines containing pipe characters.
2076+
2077+ * Markdown writer: Fix autolinks rendering for gfm (#6740).
2078+ Previously, autolinks rendered as raw HTML, due to the
2079+ `class="uri"` added by pandoc's markdown reader.
2080+
2081+ * LaTeX writer:
2082+
2083+ + Escape option values in lstlistings environment (#6742).
2084+ + Fix handling of `lang` `pt-BR` (#2953). For polyglossia we now
2085+ use `\setmainlanguage[variant=brazilian]{portuguese}` and for babel
2086+ `\usepackage[shorthands=off,main=brazilian]{babel}`.
2087+
2088+ * Depend on latest citeproc (0.1.0.1).
2089+
2090+ + This fixes the citation number issue with ieee.csl and other
2091+ styles that do not explicitly sort bibliographies (#6741). (Pandoc
2092+ was numbering them by their order in the bibliography file,
2093+ rather than the order cited, as required by the CSL spec.)
2094+ + Fixes groupin/collapsing with citation items with prefixes.
2095+
2096+ * default.latex: fix `CSLReference` macro definition.
2097+
2098+ * Fix MANUAL.txt CSL JSON conversion examples.
2099+
2100+ * Fix spelling errors in changelog, MANUAL.txt, `doc/org.md` (#6738).
2101+
2102+
2103+## pandoc 2.11 (2020-10-11)
2104+
2105+ * Add `--citeproc` (`-C`) option to trigger built-in citation processing.
2106+ It is no longer necessary to use the external `pandoc-citeproc`
2107+ filter. `--citeproc` behaves like a filter and can be positioned
2108+ relative to other filters as they appear on the command line.
2109+
2110+ The new built-in citation processing uses the citeproc library,
2111+ a reimplementation of CSL citation processing that fixes many
2112+ of the shortcomings of pandoc-citeproc. In general, citation
2113+ processing should work much the same as it did with pandoc-citeproc,
2114+ but with greater fidelity to CSL styles and better performance.
2115+ (The tests from the pandoc-citeproc package have been carried
2116+ over to pandoc.) The following differences should be noted:
2117+
2118+ - At this point, only some of the writers (HTML, ms, LaTeX) properly
2119+ interpret CSL display styles. You should get decent output in
2120+ all formats (at least as good as with pandoc-citeproc), but
2121+ indentation and block-alignment may not be right.
2122+
2123+ - pandoc-citeproc searches the `~/.csl` directory for `.csl`
2124+ styles. Pandoc instead searches the `csl` subdirectory of
2125+ the pandoc user data directory (e.g., `~/.pandoc/csl` or
2126+ `~/.local/share/pandoc/csl`). Users who already keep
2127+ CSL styles in `~/.csl` may find it convenient to add a
2128+ symlink.
2129+
2130+ - Some of the bibliography formats supported by pandoc-citeproc (via
2131+ hs-bibutils) are no longer supported: Copac, EndNote,
2132+ ISI, MEDLINE, MODS, and RIS. If you use one of these formats,
2133+ you may use the `bibutils` utility to convert to BibLaTeX.
2134+ We now support only BibTeX, BibLaTeX, CSL JSON,
2135+ and pandoc's YAML/Markdown analogue of CSL JSON.
2136+
2137+ - pandoc-citeproc would always retrieve the independent parent
2138+ of a dependent style by doing an HTTP request. pandoc will
2139+ now first seek the independent parent locally (in the resource
2140+ path or in the `csl` subdirectory of the pandoc user data
2141+ directory) before resorting to HTTP. In addition, you may
2142+ omit the `.csl` extension, e.g. `--csl zoology`.
2143+
2144+ - Using the `--bibliography` option (or including
2145+ `bibliography` in YAML metadata) no longer triggers
2146+ citation processing implicitly: one must always use the
2147+ `--citeproc` option if citation processing is wanted.
2148+
2149+ * Add `csljson` as and input and output format. This allows pandoc
2150+ to convert between `csljson` and other bibliography formats
2151+ (e.g. `-f csljson -t markdown -s` or `-f bibtex -t csljson`),
2152+ and to generate formatted versions of CSL JSON bibliographies
2153+ (e.g., `pandoc -f csljson --citeproc pl.json -o pl.pdf`).
2154+
2155+ * Added `bibtex`, `biblatex` as input formats. This allows pandoc
2156+ to convert between BibLaTeX and BibTeX and other bibliography formats,
2157+ and to generated formatted versions of BibTeX/BibLaTeX bibliographies
2158+ (e.g., `pandoc -f biblatex --citeproc pl.bib -o pl.pdf`).
2159+
2160+ * Raise informative errors when YAML metadata parsing fails (#6730).
2161+ Previously the command would succeed, returning empty metadata,
2162+ with no errors or warnings.
2163+
2164+ * Sort languages in `--list-highlight-languages` output (#6718,
2165+ Albert Krewinkel). Languages were previously sorted by their
2166+ long name, which leads to unexpected results).
2167+
2168+ * Add CSS to default HTML template (#6601, Mauro Bieg). This
2169+ greatly improves the default typography in pandoc's HTML
2170+ output. The CSS is sensitive to a number of variables
2171+ (e.g. `mainfont`, `fontsize`, `linestretch`): see the manual for
2172+ details. To restore the earlier, more spartan output, you can
2173+ disable this with `-M document-css=false`.
2174+
2175+ * Support `--toc-depth` option for ODT writer (#6696, niszet).
2176+
2177+ * Fix issues with Windows UNC paths with some options (#5127).
2178+
2179+ * Remove `fenced_code_blocks` and `backtick_code_blocks` from allowed
2180+ `commonmark` and `gfm` extensions. These shouldn't really be counted
2181+ as extensions, because they can't be disabled in commonmark.
2182+ Adjust markdown writer to check for the commonmark variant in addition
2183+ to extensions.
2184+
2185+ * Add these extensions to `gfm` and `commonmark`:
2186+ `fenced_code_blocks`, `backtick_code_blocks`, `fenced_code_attributes`.
2187+ These can't really be disabled in the reader, but they need to be enabled
2188+ in the writer or we just get indented code.
2189+
2190+ * Make sure proper set of extensions is recognized for `commonmark_x`.
2191+
2192+ * Allow `gfm_auto_identifiers`, `ascii_identifiers` extensions for `docx`.
2193+
2194+ * Markdown reader:
2195+
2196+ + Add `Maybe FilePath` parameter to `yamlToMeta` [API change].
2197+ + Export `yamlToRefs` [API change], a version of `yamlToMeta`
2198+ specialized to references.
2199+ + Set `citationNoteNum` accurately in citations.
2200+ + Revise abbreviation support. Don't insert a nonbreaking space after a
2201+ potential abbreviation if it comes right before a note or citation.
2202+ This causes problems for citeproc's moving of note citations.
2203+
2204+ * LaTeX reader:
2205+
2206+ + Support missing siunitx commands (#6658).
2207+ + Support `squared`, `cubed`, `tothe` in siunitx (#6657).
2208+ + Improved uncertainty handling in slunitx.
2209+ + Factored out siunitx stuff into separate unexposed module.
2210+ + Fix improper empty cell filtering (#6689, Christian Despres).
2211+ + Fix parsing of "show name" in `\newtheorem` (#6734).
2212+ Previously we were just treating it as a string and
2213+ ignoring accents and formatting.
2214+ + Prevent wrong nesting of `\multirow` and `\multicolumn` table
2215+ cells (#6603, Laurent P. René de Cotret).
2216+ + Table cell parser not consuming spaces correctly (#6596,
2217+ Laurent P. René de Cotret).
2218+ + Change `SIRange` to `SIrange` (#6617, Emerson Harkin).
2219+ + Allow blank lines inside `\author` (#6324).
2220+
2221+ * DocBook reader:
2222+
2223+ + Don't squelch space at end of emphasis and other inline elements;
2224+ instead, move it outside the element (#6719).
2225+ + Implement table cell alignment (#6698, Nils Carlson).
2226+ + Implement column span support for tables (#6492, Nils Carlson).
2227+ + Update list of block level tags (#6610).
2228+
2229+
2230+ * JATS reader:
2231+
2232+ + Don't squelch space at end of emphasis and other inline elements;
2233+ instead, move it outside the element (#6719).
2234+
2235+ * RST reader:
2236+
2237+ + Apply `.. class::` directly to following Header rather than creating
2238+ a surrounding Div (#6699).
2239+
2240+ * Docx reader:
2241+
2242+ + Allow empty dates in comments and tracked changes (#6726, Diego
2243+ Balseiro).
2244+
2245+ * Markdown writer:
2246+
2247+ + Be less aggressive about using quotes for YAML values,
2248+ allowing e.g. a quotation mark or bracket as long as it's not at the
2249+ beginning of the line.
2250+ + Use double quotes for YAML metadata (#6727).
2251+ + Sort YAML metadata keys in Markdown output case-insensitive.
2252+
2253+
2254+ * Asciidoc writer:
2255+
2256+ + Support asciidoctor's block figures (#6538, argent0).
2257+
2258+ * LaTeX writer:
2259+
2260+ + Fix spacing issue with list in definition list.
2261+ When a list occurs at the beginning of a definition list definition,
2262+ it can start on the same line as the label, which looks bad.
2263+ Fix that by starting such lists with an `\item[]`.
2264+
2265+ * HTML writer:
2266+
2267+ + Support intermediate table headers (#5314, Albert Krewinkel).
2268+ + Support attributes on all table elements (Albert Krewinkel).
2269+ + Render table footers if present (#6314, Albert Krewinkel).
2270+ + Fix addition of `doc-biblioentry` role.
2271+ + Support colspans and rowspans in HTML tables (#6312, Albert Krewinkel).
2272+
2273+ * ICML writer:
2274+
2275+ + Support internal document links (#5541, Leonard Rosenthol).
2276+ + Changed default link state to invisible (#6676, Leonard Rosenthol).
2277+
2278+ * Docx writer:
2279+
2280+ + Better handle list items whose contents are lists (#5948, Michael
2281+ Hoffmann). If the first element of a bulleted or ordered list is
2282+ another list, then that first item would previously disappear if the
2283+ target format is docx.
2284+ + Separate adjacent tables (#4315). Word combines adjacent tables,
2285+ so to prevent this we insert an empty paragraph between two
2286+ adjacent tables.
2287+
2288+ * Org writer:
2289+
2290+ + Don't force blank line after headings (#6554).
2291+
2292+ * OpenDocument writer:
2293+
2294+ + Implement table cell alignment (#6700 Nils Carson, Mauro Bieg).
2295+ + New table cell support with row and column spans (#6682, Nils Carson).
2296+ + Syntax highlighting for inline code (#6711, niszet).
2297+
2298+ * Add Text.Pandoc.Citeproc module, exporting `processCitations`
2299+ [API change]. This depends on several other, unexported
2300+ modules under Text.Pandoc.Citeproc.
2301+
2302+ * Add module Text.Pandoc.Writers.CslJson, exporting `writeCslJson`.
2303+ [API change]
2304+
2305+ * Add module Text.Pandoc.Readers.CslJson, exporting `readCslJson`.
2306+ [API change]
2307+
2308+ * Add module Text.Pandoc.Readers.BibTeX, exporting `readBibTeX` and
2309+ `readBibLaTeX`. [API change]
2310+
2311+ * Text.Pandoc.Filter: Add `CiteprocFilter` constructor to Filter.
2312+ [API change] This runs the processCitations transformation.
2313+ We need to treat it like a filter so it can be placed
2314+ in the sequence of filter runs (after some, before others).
2315+ In FromYAML, this is parsed from `citeproc` or `{type: citeproc}`,
2316+ so this special filter may be specified either way in a defaults file
2317+ (or by `citeproc: true`, though this gives no control of positioning
2318+ relative to other filters).
2319+
2320+ * Add new exported module Text.Pandoc.Writers.AnnotatedTable [API change]
2321+ (#6655, Christian Despres). This module (which should generally
2322+ be imported qualified to avoid name conflicts) provides a
2323+ `Table` type that mirrors the structure of a pandoc `Table`,
2324+ but with added inferred information so that the writers do not have to
2325+ lay out tables themselves. The `toTable` and `fromTable` functions convert
2326+ between an annotated `Table` and a regular pandoc `Table`. In addition to
2327+ producing a `Table` with coherent and well-formed annotations, the
2328+ `toTable` function also normalizes its input table like the table
2329+ builder does. Tests ensure that `toTable` normalizes tables exactly
2330+ like the table builder, and that its annotations are coherent.
2331+
2332+ * Text.Pandoc.Logging:
2333+
2334+ + Remove unused `CouldNotParseYamlMetadata` constructor for `LogMessage`
2335+ [API change].
2336+ + Add `CiteprocWarning` constructor to `LogMessage` [API change].
2337+
2338+ * Text.Pandoc.Readers.Metadata: export `yamlBsToRefs` [API change].
2339+ These allow specifying an id filter so we parse only references
2340+ that are used in the document.
2341+
2342+ * Text.Pandoc.Parsing:
2343+
2344+ + Export ParseError [API change].
2345+ + Add `stateInNote` and `stateNoteNumber` to `ParserState`
2346+ [API change]. These are used to populate note numbers for citation
2347+ processing.
2348+
2349+ * Fix apparent typos in sample.lua (#6729, William Lupton).
2350+ Also make the writer less aggressive in escaping quotes.
2351+
2352+ * Text.Pandoc.Options:
2353+
2354+ + `defaultMathJaxURL`: use `tex-chtml-full` instead of `tex-mml-chtml`
2355+ (#6599, Kolen Cheung). This drops the MathML support (which we
2356+ don't need for HTML math rendering) and includes the full JavaScript,
2357+ which makes it possible to use `--self-contained` (though there may
2358+ still be issues if the required math fonts aren't available). This
2359+ change should also reduce latency in pages with lots of formulas.
2360+ + Add `/tex-chtml-full.js` to `defaultMathJaxURL` (#6593) Previously we
2361+ added this in processing command line options, but not in processing
2362+ defaults files, which was inconsistent.
2363+
2364+ * epub.css: Fix cover page selectors and add note explaining their use
2365+ (#6649, a-vrma).
2366+
2367+ * Add data files needed for Text.Pandoc.Citeproc: these include
2368+ `default.csl` in the data directory and a `citeproc` directory that
2369+ is only used at compile-time for biblatex localizations. Note that we've
2370+ added `file-embed` as a mandatory rather than a conditional
2371+ dependency, because of the biblatex localization files.
2372+
2373+ * Lua filters:
2374+
2375+ + Add SimpleTable for backwards compatibility (#6575, Albert Krewinkel).
2376+ A new type `SimpleTable` is made available to Lua filters. It is
2377+ similar to the `Table` type in pandoc versions before 2.10;
2378+ conversion functions from and to the new Table type are provided.
2379+ Old filters using tables now require minimal changes and can use, e.g.,
2380+
2381+ if PANDOC_VERSION > {2,10,1} then
2382+ pandoc.Table = pandoc.SimpleTable
2383+ end
2384+
2385+ and
2386+
2387+ function Table (tbl)
2388+ tbl = pandoc.utils.to_simple_table(tbl)
2389+ …
2390+ return pandoc.utils.from_simple_table(tbl)
2391+ end
2392+
2393+ to work with the current pandoc version.
2394+
2395+ + Make `attr` argument optional in `Table` constructor (Albert Krewinkel).
2396+ This changes the Lua API. It is highly unlikely for this change to affect
2397+ existing filters, since the documentation for the new Table constructor
2398+ (and type) was incomplete and partly wrong before. The Lua API is now
2399+ more consistent, as all constructors for elements with attributes now
2400+ take attributes as the last parameter.
2401+
2402+ * MANUAL.txt:
2403+
2404+ * Add a dedicated Citations section which consolidates the information
2405+ the manual used to contain about citation processing, and incorporates
2406+ some information formerly found in the pandoc-citeproc man page.
2407+ + Add note about lualatex using `selnolig`.
2408+ + Remove duplicate `seriespage` (#6568, Blake Eryx).
2409+ + Remove lists of support extensions for markdown variants (#6604).
2410+ Instead, offer the advice to use `--list-extensions=FORMAT`.
2411+ + Fix position of attributes in header (Albert Krewinkel).
2412+ + Delete obsolete section on compact and loose lists (#6684).
2413+
2414+
2415+ * doc/lua-filters.md:
2416+
2417+ + Add info on how to debug Lua filters (#6732, Ian Max Andolina).
2418+ + Document Underline type and constructor (Albert Krewinkel).
2419+ + Document `body` field (Albert Krewinkel).
2420+ + Add missing header attribute
2421+ + Add missing Link.title field (Albert Krewinkel).
2422+ + Make the setting-the-date example conditional (the-solipsist).
2423+ This makes the example a bit more realistic.
2424+ + Remove outdated link table example.
2425+
2426+ * doc/org.md:
2427+
2428+ + Add section on tables (Albert Krewinkel).
2429+ + Add section on handling of unknown directives (Albert Krewinkel).
2430+
2431+ * CONTRIBUTING.md: fix typo (#6584, Dmitry Volodin).
2432+
2433+ * Use golden test framework for command tests. This means that
2434+ `--accept` can be used to update expected output.
2435+
2436+ * Use the `smart` extension when generating pandoc's man page (#6613).
2437+
2438+ * Release-candidate: don't build windows i386.
2439+ So far we haven't been able to figure out how to get
2440+ stack to use a 32-bit ghc.
2441+
2442+ * Use `null` instead of deprecated `Builder.isNull`.
2443+
2444+ * Makefile:
2445+
2446+ + Fix macospkg target to fetch target from S3 artifacts.
2447+ + Fix pandoc-templates target to include all partials.
2448+
2449+ * Remove duplicated dependency in pandoc.cabal (#6591, Felix Yan).
2450+
2451+ * Sort build depends in pandoc.cabal alphabetically (#6691,
2452+ Albert Krewinkel).
2453+
2454+ * Add .travis.yml for macos release candidate build (#6622).
2455+ We need to build the release candidate on Travis rather
2456+ than GitHub actions, because GH has macos 10.15, and
2457+ binaries compiled on that OS will not work with 10.13.
2458+ This build is only triggered on `rc/*` branches.
2459+
2460+ * Remove instructions for building pandoc-citeproc from CI and
2461+ release binary build instructions. We will no longer distribute
2462+ pandoc-citeproc.
2463+
2464+ * Fix math rendering in trypandoc (this broke after
2465+ commit d8ad766d17603784b86fc5c2e1b22864125d04d1).
2466+
2467+ * Use latest versions of skylighting, commonmark (#6589),
2468+ comonmark-extensions, commonmark-pandoc, texmath.
2469+
2470+ * Relax version bounds for hslua, hslua-module-text, bytestring.
2471+
2472+ * Use released pandoc-types 1.22. This changes the JSON
2473+ encoding slightly for the new table types introduced
2474+ in 1.21, so they're more consistent with the rest.
2475+ Developers of libraries for pandoc filters will want
2476+ to take note.
2477+
2478+ * Fix hlint suggestions, update hlint.yaml (#6680, Christian Despres).
2479+
2480+ * Code cleanup (#6678, Joseph C. Sible).
2481+
2482+ * Add haddocks to functions in Text.Pandoc.Writers.Shared (Albert
2483+ Krewinkel).
2484+
2485+ * Remove duplicate `tshow` definition.
2486+
2487+ * Linux release candidate build: use ghc-musl container. This simplifies
2488+ our build process (over using a customized alpine container).
2489+
2490+
2491+## pandoc 2.10.1 (2020-07-23)
2492+
2493+ * Add `commonmark_x` output format. This is `commonmark` with a number
2494+ of useful pandoc extensions enabled.
2495+
2496+ * Many more extensions now work with `commonmark` and `gfm`.
2497+
2498+ * Add generic `attributes` extension. This allows attributes to
2499+ be added to any block or inline element in a uniform way. Since
2500+ the Pandoc AST doesn't include attributes on each element type,
2501+ the attributes will sometimes be added by creating a surrounding
2502+ Div or Span container. Currently this extension is only
2503+ compatible with the `commonmark` and `gfm` readers.
2504+
2505+ To add an attribute to a block-level element, e.g. a paragraph,
2506+ put it before the block:
2507+ ```
2508+ {#mypara}
2509+ This is a paragraph.
2510+ ```
2511+ Multiple attributes may be used and will be combined:
2512+ ```
2513+ {#mypara}
2514+ {.blue .warning key="val"}
2515+ This is a paragraph.
2516+ ```
2517+ To add an attribute to an inline-level element, put it
2518+ immediately after the element:
2519+ ```
2520+ *emphasized text*{.special}
2521+ ```
2522+
2523+ * Support `--number-sections` for docx output (#1413).
2524+
2525+ * LaTeX reader:
2526+
2527+ + Support `\SIRange` reader (#6418, Emerson Harkin).
2528+ + Support table col-span and row-span (#6311, Laurent P. René de Cotret).
2529+ Supports `\multirow` and `\multicolumn`.
2530+ + Support amsthm: `\newtheorem`, `\theoremstyle`, and theorem and
2531+ proof environments, including labels and references. The only thing
2532+ that is unsupported is the second optional argument, which causes
2533+ numbering to be reset after the specified series is incremented.
2534+ + Moved some code to T.P.LaTeX.Parsing. We need to reduce the size
2535+ of the LaTeX reader to ease compilation on resource-limited systems.
2536+
2537+ * RST reader:
2538+
2539+ + Fix csv tables with multiline cells (#6549).
2540+ + Fix spurious newlines in some attributes from directives.
2541+ + Avoid extra newline in included code blocks.
2542+
2543+ * Commonmark reader:
2544+
2545+ + Switch from cmark-gfm to commonmark-hs for commonmark and gfm
2546+ parsing. This avoids depending on a C library
2547+ and allows us to support more pandoc extensions for
2548+ `commonmark` and `gfm`.
2549+
2550+ * DocBook reader:
2551+
2552+ + Parse releaseinfo as metadata (#6542).
2553+
2554+ * Docx reader:
2555+
2556+ + Only use `bCs/iCs` on runs with `rtl` or `cs` property (#6514, Nikolay
2557+ Yakimov).
2558+ + Code cleanup/refactoring (Nikolay Yakimov).
2559+
2560+ * Org reader (Albert Krewinkel):
2561+
2562+ + Respect export setting which disables entities
2563+ MathML-like entities, e.g., `\alpha`, can be disabled with the
2564+ `#+OPTION: e:nil` export setting (Albert Krewinkel).
2565+ + Respect export setting disabling footnotes. Footnotes can be removed
2566+ from the final document with the `#+OPTION: f:nil` export setting.
2567+ + Respect tables-excluding export setting. Tables can be removed from
2568+ the final document with the `#+OPTION: |:nil` export setting.
2569+
2570+ * Markdown writer:
2571+
2572+ + Move `asciify` out of `escapeString`. Otherwise `unsmartify`
2573+ doesn't catch quotes that have already been turned to entities.
2574+ + Add `writeCommonmark` (new exported function, API change).
2575+ + Use unicode super/subscript characters when possible if the
2576+ `superscript` or `subscript` extension or `raw_html` aren't available.
2577+ + Render caption as following paragraph when `table_caption` extension
2578+ is not enabled.
2579+ + Use numerical labels for reference links that are longer
2580+ than 999 characters or contain square brackets, for conformity
2581+ with commonmark (#6560).
2582+
2583+ * Commonmark writer:
2584+
2585+ + Instead of using cmark-gfm, use `writeCommonmark` from the
2586+ Markdown writer. This function calls the markdown writer
2587+ with appropriate extensions and a few small modifications
2588+ (e.g. not requiring backslashes before spaces inside
2589+ super/subscripts). With this change `comonmark` and
2590+ `gfm` output can be used with a wider selection of
2591+ extensions.
2592+
2593+ * Jira writer: keep image caption as alt attribute (#6529, Albert
2594+ Krewinkel).
2595+
2596+ * HTML writer:
2597+
2598+ + Improve alt-text/caption handling for HTML5 (#6491, Albert Krewinkel).
2599+ Screen readers read an image's `alt` attribute and the figure caption,
2600+ both of which come from the same source in pandoc. The figure caption is
2601+ hidden from screen readers with the `aria-hidden` attribute. This
2602+ improves accessibility. For HTML4, where `aria-hidden` is not allowed,
2603+ pandoc still uses an empty `alt` attribute to avoid duplicate contents.
2604+
2605+ * Ms writer:
2606+
2607+ + Fix code highlighting with blank lines. Previously blank lines
2608+ were simply omitted from highlighted code.
2609+ + Escape starting periods in ms writer code blocks (#6505, Michael
2610+ Hoffmann). If a line of ms code block output starts with a period (.),
2611+ it should be prepended by `\&` so that it is not interpreted as a roff
2612+ command.
2613+
2614+ * Text.Pandoc.Extensions:
2615+
2616+ + Add `raw_markdown` extension (which only affects `ipynb`
2617+ input).
2618+ + Trim down `githubMarkdownExtensions`.
2619+ Previously it included all of the following, which make
2620+ sense for the legacy `markdown_github` but not for `gfm`,
2621+ since they are part of base commonmark and thus
2622+ can't be turned off in `gfm`:
2623+
2624+ - `Ext_all_symbols_escapable`
2625+ - `Ext_backtick_code_blocks`
2626+ - `Ext_fenced_code_blocks`
2627+ - `Ext_space_in_atx_header`
2628+ - `Ext_intraword_underscores`
2629+ - `Ext_lists_without_preceding_blankline`
2630+ - `Ext_shortcut_reference_links`
2631+
2632+ These have been removed from `githubMarkdownExtensions`, though
2633+ they're still turned on for legacy `markdown_github`.
2634+ + Add `Ext_attributes` constructor for `Extension` [API change].
2635+
2636+ * LaTeX template: use selnolig to selectively suppress ligatures with
2637+ lualatex (#6534).
2638+
2639+ * Benchmark bytestring readers (Nikolay Yakimov).
2640+
2641+ * Documentation:
2642+
2643+ + Update using-the-pandoc-api.md (favonia).
2644+ + Fix Typos in lua-filters.md (tajmone).
2645+ + Rewrite Raw HTML/TeX section in MANUAL.txt to avoid duplicate
2646+ headings for the extensions.
2647+ + Fix typo in MANUAL.txt (Benjamin Wuethrich).
2648+ + Remove duplicate 'titlepage' in MANUAL.txt (Blake Eryx).
2649+ + CONTRIBUTING.md: Advertise the official nightlies in GitHub actions.
2650+ Replaces #6500, thanks to @ickc.
2651+
2652+
2653+
32654## pandoc 2.10 (2020-06-29)
42655
52656 * Use pandoc-types 1.21. This adds two things:
@@ -154,6 +2805,14 @@
1542805
1552806 * Ipynb reader:
1562807
2808+ + Implement `raw_markdown` extension (#5408). Specifying
2809+ `-f ipynb+raw_markdown` will cause Markdown cells
2810+ to be represented as raw Markdown blocks, instead of being
2811+ parsed. This is not what you want when going from `ipynb`
2812+ to other formats, but it may be useful when going from `ipynb`
2813+ to Markdown or to `ipynb`, to avoid semantically insignificant
2814+ changes in the contents of the Markdown cells that might
2815+ otherwise be introduced.
1572816 + Handle application/pdf output as image (#6430).
1582817 + Properly handle image/svg+xml as an image (#6430).
1592818
@@ -409,7 +3068,7 @@
4093068 * Make it possible to compile using Stack on NixOS (#6439, Mathieu
4103069 Boespflug).
4113070
412− * CI action to check for commit messsage length (Nikolay Yakimov, #6398).
3071+ * CI action to check for commit message length (Nikolay Yakimov, #6398).
4133072
4143073
4153074## pandoc 2.9.2.1 (2020-03-23)
@@ -976,7 +3635,7 @@
9763635 The main impact of this change is better reflowing of
9773636 content interpolated into templates. Previously,
9783637 interpolated variables were rendered independently and
979− intepolated as strings, which could lead to overly long
3638+ interpolated as strings, which could lead to overly long
9803639 lines. Now the templates interpolated as Doc values which
9813640 may include breaking spaces, and reflowing occurs after
9823641 template interpolation rather than before.
@@ -1455,7 +4114,7 @@
14554114 a margin and font size according to their level.
14564115 Furthermore this commit allows changing the font with which code is
14574116 formatted via the `monofont` option.
1458− + Start numbering at appopriate numbers (Jesse Rosenthal, #5709).
4117+ + Start numbering at appropriate numbers (Jesse Rosenthal, #5709).
14594118 Starting numbers for ordered lists were previously ignored. Now
14604119 we specify the number if it is something other than 1.
14614120
@@ -2774,7 +5433,7 @@
27745433 * Man/Ms writers: Don't escape `-` as `\-`. The `\-` gets rendered
27755434 in HTML and PDF as a unicode minus sign.
27765435
2777− * Ms writer: Ensure we have a newline after .EN in disply math (#5251).
5436+ * Ms writer: Ensure we have a newline after .EN in display math (#5251).
27785437
27795438 * RST writer: Don't wrap simple table header lines (#5128).
27805439
@@ -2906,7 +5565,7 @@
29065565 + Set default listings language for lua, assembler (#5227, John
29075566 MacFarlane). Otherwise we get an error when trying to compile code
29085567 with lua or assembler code. To change the default dialect
2909− (currenty 5.3 for lua and x86masm for assembler), you can use
5568+ (currently 5.3 for lua and x86masm for assembler), you can use
29105569 `--include-in-header` to inject something like
29115570 `\lstset{defaultdialect=[5.2]Lua}`.
29125571
@@ -6603,7 +9262,7 @@
66039262
66049263 * Removed `hard_line_breaks` extension from `markdown_github` (#3594).
66059264 GitHub has two Markdown modes, one for long-form documents like READMEs
6606− and one for short things like issue coments. In issue comments, a line
9265+ and one for short things like issue comments. In issue comments, a line
66079266 break is treated as a hard line break. In README, wikis, etc., it is
66089267 treated as a space as in regular Markdown. Since pandoc is more likely to
66099268 be used to convert long-form documents from GitHub Markdown,
@@ -6956,7 +9615,7 @@
69569615 top-level `Text.Pandoc` module.
69579616
69589617 + Changed `StringWriter` -> `TextWriter`.
6959− + `getWriter` now retuns a pair of a reader and
9618+ + `getWriter` now returns a pair of a reader and
69609619 `Extensions`, instead of building the extensions into the
69619620 reader (#3659). The calling code must explicitly set
69629621 `readerExtensions` using the `Extensions` returned. The
@@ -7908,7 +10567,7 @@
790810567 + Use `unicode-math` (Vaclav Haisman). Use `mathspec` with only
790910568 XeLaTeX on request.
791010569 + Don't load `fontspec` before `unicode-math` (over there).
7911− The `unicode-math` package loads `fontspec` so explict loading of
10570+ The `unicode-math` package loads `fontspec` so explicit loading of
791210571 `fontspec` before `unicode-math` is not necessary.
791310572 + Use `unicode-math` by default in default.latex template. mathspec will
791410573 be used in xelatex if the `mathspec` variable is set; otherwise
@@ -8589,7 +11248,7 @@
858911248 is now used in parsing RST and Markdown line blocks, DocBook
859011249 `linegroup`/`line` combinations, and Org-mode `VERSE` blocks.
859111250 Previously `Para` blocks with hard linebreaks were used. `LineBlock`s
8592− are handled specially in the following ouput formats: AsciiDoc
11251+ are handled specially in the following output formats: AsciiDoc
859311252 (as `[verse]` blocks), ConTeXt (`\startlines`/`\endlines`),
859411253 HTML (`div` with a style), Markdown (line blocks if `line_blocks`
859511254 is enabled), Org-mode (`VERSE` blocks), RST (line blocks). In
@@ -8736,7 +11395,7 @@
873611395 comma-separated list.
873711396 + Give precedence to later meta lines. The last meta-line of any given
873811397 type is the significant line. Previously the value of the first line
8739− was kept, even if more lines of the same type were encounterd.
11398+ was kept, even if more lines of the same type were encountered.
874011399 + Read LaTeX_header as header-includes. LaTeX-specific header commands
874111400 can be defined in `#+LaTeX_header` lines. They are parsed as
874211401 format-specific inlines to ensure that they will only show up in LaTeX
@@ -8784,7 +11443,7 @@
878411443 be able to figure out internal links to a header in a docx if the
878511444 anchor span was empty. We change that to read the inlines out of the
878611445 first anchor span in a header.
8787− + Let headers use exisiting id. Previously we always generated an id for
11446+ + Let headers use existing id. Previously we always generated an id for
878811447 headers (since they wouldn't bring one from Docx). Now we let it use an
878911448 existing one if possible. This should allow us to recurs through anchor
879011449 spans.
@@ -9363,7 +12022,7 @@
936312022 character. Empty rows where parsed as alignment rows and dropped from
936412023 the output.
936512024 + Fix spacing after LaTeX-style symbols.
9366− The org-reader was droping space after unescaped LaTeX-style symbol
12025+ The org-reader was dropping space after unescaped LaTeX-style symbol
936712026 commands: `\ForAll \Auml` resulted in `∀Ä` but should give `∀ Ä`
936812027 instead. This seems to be because the LaTeX-reader treats the
936912028 command-terminating space as part of the command. Dropping the trailing
@@ -9698,7 +12357,7 @@
969812357
969912358 * Entity handling fixes: improved handling of entities like
970012359 `&lang;` that require a trailing semicolon. Allow uppercase
9701− `x` in numerical hexidecimal character references, working
12360+ `x` in numerical hexadecimal character references, working
970212361 around a tagsoup bug.
970312362
970412363 * `stack.yaml` - use lts-4.0, but with older aeson to avoid excessive
@@ -11183,7 +13842,7 @@
1118313842 * `Text.Pandoc.Shared`:
1118413843
1118513844 + Make safeRead safe (#1801, Matthew Pickering).
11186− + Addded `mapLeft`, `hush` (Matthew Pickering).
13845+ + Added `mapLeft`, `hush` (Matthew Pickering).
1118713846
1118813847 * `Text.Pandoc.Pretty`:
1118913848
@@ -11251,7 +13910,7 @@
1125113910
1125213911 + Use `text:p` instead of `text:h` for title.
1125313912 Using `text:h` causes problems with numbering. Closes #2059.
11254− Thansk to @nkalvi for diagnosing this.
13913+ Thanks to @nkalvi for diagnosing this.
1125513914
1125613915 * reveal.js template:
1125713916
@@ -11517,7 +14176,7 @@
1151714176 * RST writer:
1151814177
1151914178 + Ensure blank line after figure.
11520− + Avoid exces whitespace after last list item (#1777).
14179+ + Avoid excess whitespace after last list item (#1777).
1152114180 + Wrap line blocks with spaces before continuations (#1656).
1152214181 + Fixed double-rendering of footnotes in RST tables (#1769).
1152314182
@@ -11579,7 +14238,7 @@
1157914238 + Renumber header and footer relationships to avoid collisions (Jesse
1158014239 Rosenthal). We previously took the old relationship names of the
1158114240 headers and footer in secptr. That led to collisions. We now make
11582− a map of availabl names in the relationships file, and then rename
14241+ a map of available names in the relationships file, and then rename
1158314242 in secptr.
1158414243
1158514244 * ConTeXt writer:
@@ -12302,7 +14961,7 @@
1230214961 different versions of the `directory` library.
1230314962
1230414963 + Added `Text.Pandoc.Compat.Except` to allow building against
12305− different verions of `mtl`.
14964+ different versions of `mtl`.
1230614965
1230714966 * Code cleanup in some writers, using Reader monad to avoid
1230814967 passing options parameter around (Matej Kollar).
@@ -13941,7 +16600,7 @@
1394116600 + Include HTML TOC, even in epub2. The TOC is included in `<spine>`,
1394216601 but `linear` is set to `no` unless the `--toc` option is specified.
1394316602 Include `<guide>` element in OPF. This should allow the TOC to
13944− be useable in Kindles when converted with kindlegen. Closes #773.
16603+ be usable in Kindles when converted with kindlegen. Closes #773.
1394516604
1394616605 * `Text.Pandoc.Parsing`: Optimized `oneOfStringsCI`.
1394716606 This dramatically reduces the speed penalty that comes from enabling the
@@ -14537,7 +17196,7 @@
1453717196 be a parenthesized emphasized "hello".
1453817197 The new list is taken from the PHP source of textile 2.4.
1453917198 + Fixed autolinks. Previously the textile reader and writer
14540− incorrectly implented RST-style autolinks for URLs and email
17199+ incorrectly implemented RST-style autolinks for URLs and email
1454117200 addresses. This has been fixed. Now an autolink is done this way:
1454217201 `"$":http://myurl.com`.
1454317202 + Fixed footnotes bug in textile. This affected notes occurring
@@ -15600,7 +18259,7 @@
1560018259 Items are no longer installed as root.
1560118260 Man pages are zipped and given proper permissions.
1560218261
15603− * Modified windows installer generater to use cabal-dev.
18262+ * Modified windows installer generator to use cabal-dev.
1560418263
1560518264 * Setup: Making man pages now works with cabal-dev (at least on OSX). In
1560618265 Setup.hs we now invoke 'runghc' in a way that points it to the correct
citeproc/biblatex-localization/.stringsnew file

No changes to the content.

citeproc/biblatex-localization/UKenglish.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/USenglish.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/american.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/australian.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/austrian.lbx.stringsnew file+1
@@ -0,0 +1 @@
1+january|J\"anner|J\"an\adddot
citeproc/biblatex-localization/brazil.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/brazilian.lbx.stringsnew file+233
@@ -0,0 +1,233 @@
1+bibliography|Bibliografia|Bibliografia
2+references|Refer\^encias|Refer\^encias
3+shorthands|Lista de abreviaturas|Abreviaturas
4+editor|editor|ed\adddot
5+editors|editores|ed\adddot
6+compiler|compilador|comp\adddot
7+compilers|compiladores|comp\adddot
8+redactor|redator|red\adddot
9+redactors|redatores|red\adddot
10+reviser|revisor|rev\adddot
11+revisers|revisores|rev\adddot
12+founder|fundador|fund\adddot
13+founders|fundadores|fund\adddot
14+continuator|continuador|cont\adddot
15+continuators|continuadores|cont\adddot
16+collaborator|colaborador|colab\adddot
17+collaborators|colaboradores|colab\adddot
18+translator|tradutor|trad\adddot
19+translators|tradutores|trad\adddot
20+commentator|coment\'ario|coment\adddot
21+commentators|coment\'ario|coment\adddot
22+annotator|notas|notas
23+annotators|notas|notas
24+commentary|coment\'ario|coment\adddot
25+annotations|notas|notas
26+foreword|pref\'acio|pref\adddot
27+afterword|posf\'acio|posf\adddot
28+organizer|organizador|org\adddot
29+organizers|organizadores|org\adddot
30+byauthor|por|por
31+byeditor|editado por|ed\adddotspace por
32+bycompiler|compilado por|comp\adddotspace por
33+byredactor|redigido por|red\adddotspace por
34+byreviser|revisado por|rev\adddotspace por
35+byreviewer|resenhado por|res\adddotspace por
36+byfounder|fundado por|fund\adddotspace por
37+bycontinuator|continuado por|cont\adddotspace por
38+bytranslator|traduzido \lbx@lfromlang\ por|trad\adddot\ \lbx@sfromlang\ por
39+bycommentator|comentado por|coment\adddot\ por
40+byannotator|anotado por|anot\adddot\ por
41+byorganizer|organizado por|org\adddotspace por
42+withcommentator|com coment\'ario de|com coment\adddot\ de
43+withannotator|com notas de|com notas de
44+withforeword|com pref\'acio de|com pref\adddot\ de
45+withafterword|com posf\'acio de|com posf\adddot\ de
46+and|e|e
47+andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
48+andmore|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
49+volume|volume|vol\adddot
50+volumes|volumes|vol\adddot
51+involumes|em|em
52+jourvol|volume|v\adddot
53+jourser|s\'erie|s\'er\adddot
54+book|livro|livro
55+part|parte|parte
56+issue|n\'umero|n\'um\adddot
57+newseries|nova s\'erie|nova s\'er\adddot
58+oldseries|s\'erie antiga|s\'er\adddot\ antiga
59+reprint|reimpress\~ao|reimpr\adddot
60+reprintof|reimpress\~ao de|reimpr\adddotspace de
61+reprintas|reimpresso como|reimpr\adddotspace como
62+reprintfrom|reimpresso de|reimpr\adddotspace de
63+translationas|traduzido como|trad\adddotspace como
64+translationfrom|traduzido do|trad\adddotspace do
65+reviewof|resenha de|res\adddotspace de
66+origpubas|originalmente publicado como|orig\adddotspace pub\adddotspace como
67+origpubin|originalmente publicado em|orig\adddotspace pub\adddotspace em
68+astitle|como|como
69+bypublisher|por|por
70+nodate|sem\space data|s\adddot d\adddot
71+page|p\'agina|p\adddot
72+pages|p\'aginas|pp\adddot
73+column|coluna|col\adddot
74+columns|colunas|col\adddot
75+line|linha|l\adddot
76+lines|linhas|ll\adddot
77+verse|verso|v\adddot
78+verses|versos|vv\adddot
79+paragraph|par\'agrafo|par\adddot
80+paragraphs|par\'agrafos|par\adddot
81+pagetotal|p\'agina|p\adddot
82+pagetotals|p\'aginas|pp\adddot
83+columntotal|coluna|col\adddot
84+columntotals|colunas|col\adddot
85+linetotal|linha|l\adddot
86+linetotals|linhas|ll\adddot
87+versetotal|verso|v\adddot
88+versetotals|versos|vv\adddot
89+paragraphtotal|par\'agrafo|par\adddot
90+paragraphtotals|par\'agrafos|par\adddot
91+in|em|em
92+inseries|em|em
93+ofseries|de|de
94+number|n\'umero|n\adddot
95+chapter|cap\'\i tulo|cap\adddot
96+bathesis|trabalho de conclus\~ao|trab\adddotspace de conc\adddot
97+phdthesis|tese de doutorado|tese de dout\adddot
98+candthesis||
99+resreport|relat\'orio de pesquisa|rel\adddotspace de pesq\adddot
100+techreport|relat\'orio t\'ecnico|rel\adddotspace t\'ecn\adddot
101+software|software|software
102+datacd|CD-ROM|CD-ROM
103+audiocd|CD de \'audio|CD de \'audio
104+version|vers\~ao|vers\~ao
105+urlfrom|dispon\'ivel em|disp\adddotspace em
106+urlseen|acesso em|acesso em
107+submitted|submetido|submetido
108+inpress|no prelo|no prelo
109+prepublished|pr\'e-publicado|pr\'e-publicado
110+citedas|doravante citado como|doravante citado como
111+thiscite|especialmente|esp\adddot
112+seenote|ver nota|ver nota
113+quotedin|apud|apud
114+idem|idem|idem
115+idemsm|idem|idem
116+idemsf|eadem|eadem
117+idemsn|idem|idem
118+idempm|eidem|eidem
119+idempf|eaedem|eaedem
120+idempn|eadem|eadem
121+idempp|eidem|eidem
122+ibidem|ibidem|ibid\adddot
123+opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot
124+loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot
125+confer|cf\adddot|cf\adddot
126+sequens|sq\adddot|sq\adddot
127+sequentes|sqq\adddot|sqq\adddot
128+passim|passim|passim
129+see|ver|ver
130+seealso|ver tamb\'em|ver tamb\'em
131+backrefpage|ver p\'agina|ver p\adddot
132+backrefpages|ver p\'aginas|ver pp\adddot
133+january|janeiro|jan\adddot
134+february|fevereiro|fev\adddot
135+april|abril|abr\adddot
136+may|maio|mai\adddot
137+june|junho|jun\adddot
138+july|julho|jul\adddot
139+august|agosto|ago\adddot
140+september|setembro|set\adddot
141+october|outubro|out\adddot
142+november|novembro|nov\adddot
143+december|dezembro|dez\adddot
144+langamerican|ingl\^es|ingl\^es
145+langbulgarian|b\'ulgaro|b\'ulgaro
146+langcatalan|catal\~ao|catal\~ao
147+langcroatian|croata|croata
148+langczech|tcheco|tcheco
149+langdanish|dinamarqu\^es|dinamarqu\^es
150+langenglish|ingl\^es|ingl\^es
151+langfinnish|finland\^es|finland\^es
152+langestonian|estoniano|estoniano
153+langfrench|franc\^es|franc\^es
154+langgalician|galego|galego
155+langgerman|alem\~ao|alem\~ao
156+langgreek|grego|grego
157+langhungarian|h\'ungaro|h\'ungaro
158+langitalian|italiano|italiano
159+langjapanese|japon\^es|japon\^es
160+langlatin|latim|latim
161+langlatvian|let\~ao|let\~ao
162+langlithuanian|lituano|lituano
163+langnorwegian|noruegu\^es|noruegu\^es
164+langpolish|polon\^es|polon\^es
165+langrussian|russo|russo
166+langserbian|s\'ervio|s\'ervio
167+langslovak|eslovaco|eslovaco
168+langslovene|esloveno|esloveno
169+langspanish|espanhol|espanhol
170+langswedish|sueco|sueco
171+langturkish|turco|turco
172+langukrainian|ucraniano|ucraniano
173+fromamerican|do ingl\^es|do ingl\^es
174+frombulgarian|do b\'ulgaro|do b\'ulgaro
175+fromcatalan|do catal\~ao|do catal\~ao
176+fromcroatian|do croata|do croata
177+fromczech|do tcheco|do tcheco
178+fromdanish|do dinamarqu\^es|do dinamarqu\^es
179+fromenglish|do ingl\^es|do ingl\^es
180+fromestonian|do estoniano|do estoniano
181+fromfinnish|do finland\^es|do finland\^es
182+fromfrench|do franc\^es|do franc\^es
183+fromgalician|do galego|do galego
184+fromgerman|do alem\~ao|do alem\~ao
185+fromgreek|do grego|do grego
186+fromhungarian|do h\'ungaro|do h\'ungaro
187+fromitalian|do italiano|do italiano
188+fromjapanese|do japon\^es|do japon\^es
189+fromlatin|do latim|do latim
190+fromlatvian|do let\~ao|do let\~ao
191+fromlithuanian|do lituano|do lituano
192+fromnorwegian|do noruegu\^es|do noruegu\^es
193+frompolish|do polon\^es|do polon\^es
194+fromrussian|do russo|do russo
195+fromserbian|do s\'ervio|do s\'ervio
196+fromslovak|do eslovaco|do eslovaco
197+fromslovene|do esloveno|do esloveno
198+fromspanish|do espanhol|do espanhol
199+fromswedish|do sueco|do sueco
200+fromturkish|do turco|do turco
201+fromukrainian|do ucraniano|do ucraniano
202+countryde|Alemanha|DE
203+countryeu|Uni\~ao Europeia|EU
204+countryep|Uni\~ao Europeia|EP
205+countryuk|Reino Unido|GB
206+countryus|Estados Unidos|US
207+patent|patente|pat\adddot
208+patentde|patente alem\~a|pat\adddot\ alem\~a
209+patenteu|patente europeia|pat\adddot\ europeia
210+patentfr|patente francesa|pat\adddot\ francesa
211+patentuk|patente brit\^anica|pat\adddot\ brit\^anica
212+patentus|patente americana|pat\adddot\ americana
213+patreq|pedido de patente|ped\adddot\ de pat\adddot
214+patreqde|pedido de patente alem\~a|ped\adddot\ de pat\adddot\ alem\~a
215+patreqeu|pedido de patente europeia|ped\adddot\ de pat\adddot\ europeia
216+patreqfr|pedido de patente francesa|ped\adddot\ de pat\adddot\ francesa
217+patrequk|pedido de patente brit\^anica|ped\adddot\ de pat\adddot\ brit\^anica
218+patrequs|pedido de patente americana|ped\adddot\ de pat\adddot\ americana
219+file|arquivo|arquivo
220+library|biblioteca|biblioteca
221+abstract|resumo|resumo
222+annotation|notas|notas
223+commonera|Era Comum|EC
224+beforecommonera|antes da Era Comum|AEC
225+annodomini|depois de Cristo|d\adddot C\adddot
226+beforechrist|antes de Cristo|a\adddot C\adddot
227+circa|circa|ca\adddot
228+spring|primavera|primavera
229+summer|ver\~ao|ver\~ao
230+autumn|outono|outono
231+winter|inverno|inverno
232+am|AM|AM
233+pm|PM|PM
citeproc/biblatex-localization/british.lbx.stringsnew file+3
@@ -0,0 +1,3 @@
1+organizer|organiser|org\adddot
2+organizers|organisers|orgs\adddot
3+byorganizer|organised by|org\adddotspace by
citeproc/biblatex-localization/bulgarian.lbx.stringsnew file+28
@@ -0,0 +1,28 @@
1+bibliography|Библиография|Библиография
2+references|Литература|Литература
3+shorthands|Списък на съкращенията|Съкращения
4+editor|редактор|ред\adddot
5+editors|редактори|ред\adddot
6+compiler|съставител|съст\adddot
7+compilers|съставители|съст\adddot
8+redactor|редактор|ред\adddot
9+redactors|редактори|ред\adddot
10+reviser|коректор|кор\adddotspace кор\adddot
11+revisers|коректор|кор\adddotspace кор\adddot
12+founder|основател|осн\adddot
13+founders|основатели|осн\adddot
14+continuator|продължител|прод\adddot
15+continuators|продължител|прод\adddot
16+collaborator|участник|участ\adddot
17+collaborators|участници|участ\adddot
18+translator|преводач|прев\adddot
19+translators|преводачи|прев\adddot
20+commentator|коментатор|комент\adddot
21+commentators|коментатори|комент\adddot
22+annotator|бележки|бел\adddot
23+annotators|бележки|бел\adddot
24+commentary|комментар|комент\adddot
25+annotations|бележки|бел\adddot
26+introduction|уводна статия|ув\adddotspace ст\adddot
27+foreword|предговор|предг\adddot
28+afterword|послеслов|послесл\adddot
citeproc/biblatex-localization/canadian.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/catalan.lbx.stringsnew file+158
@@ -0,0 +1,158 @@
1+bibliography|Bibliografia|Bibliografia
2+references|Refer\`encies|Refer\`encies
3+shorthands|Llista d'abreviatures|Abreviatures
4+editor|editor|ed\adddot
5+editors|editors|ed\adddot
6+compiler|compilador|comp\adddot
7+compilers|compiladors|comp\adddot
8+redactor|redactor|red\adddot
9+redactors|redactors|red\adddot
10+reviser|revisor|rev\adddot
11+revisers|revisors|rev\adddot
12+founder|fundador|fund\adddot
13+founders|fundadors|fund\adddot
14+continuator|continuador|cont\adddot
15+continuators|continuadors|cont\adddot
16+collaborator|co\l.laborador|co\l.l\adddot
17+collaborators|co\l.laboradors|co\l.l\adddot
18+translator|traductor|trad\adddot
19+translators|traductors|trad\adddot
20+commentator|comentarista|com\adddot
21+commentators|comentaristes|com\adddot
22+annotator|anotador|anot\adddot
23+annotators|anotadors|anot\adddot
24+commentary|comentari|com\adddot
25+annotations|notes|n\adddot
26+introduction|introducci\'o|intr\adddot
27+foreword|pr\`oleg|pr\`ol\adddot
28+editortr|editor i traductor|ed\adddotspace i trad\adddot
29+editorstr|editors i traductors|ed\adddotspace i trad\adddot
30+editorco|editor i comentarista|ed\adddotspace i com\adddot
31+editorsco|editors i comentaristes|ed\adddotspace i com\adddot
32+editoran|editor i anotador|ed\adddotspace i anot\adddot
33+editorsan|editors i anotadors|ed\adddotspace i anot\adddot
34+organizer|organitzador|org\adddot
35+organizers|organitzadors|org\adddot
36+byorganizer|organitzat per|org\adddotspace per
37+byauthor|per|per
38+byeditor|edici\'o a cura \smartof|ed\adddotspace\smartof
39+bycompiler|compilaci\'o a cura \smartof|comp\adddotspace\smartof
40+byredactor|redacci\'o a cura \smartof|red\adddotspace\smartof
41+byreviser|revisi\'o a cura \smartof|rev\adddotspace\smartof
42+byreviewer|ressenya a cura \smartof|ress\adddotspace\smartof
43+byfounder|fundat per|fund\adddotspace per
44+bycontinuator|continuat per|cont\adddotspace per
45+bycollaborator|amb la co\l.laboraci\'o \smartof|amb la co\l.l\adddotspace\smartof
46+bytranslator|traducci\'o \lbx@fromlang\ a cura \smartof|trad\adddotspace\lbx@fromlang\ \smartof
47+bycommentator|comentari a cura \smartof|com\adddotspace\smartof
48+byannotator|notes a cura \smartof|n\adddotspace\smartof
49+withcommentator|amb un comentari a cura \smartof|amb un com\adddotspace\smartof
50+withannotator|amb notes a cura \smartof|amb n\adddotspace\smartof
51+withintroduction|amb una introducci\'o a cura \smartof|amb una intr\adddotspace\smartof
52+withforeword|amb un pr\`oleg a cura \smartof|amb un pr\`ol\adddotspace\smartof
53+and|i|i
54+andothers|et al\adddot|et al\adddot
55+andmore|i m\'es|i m\'es
56+volume|volum|vol\adddot
57+volumes|volums|vol\adddot
58+involumes|en|en
59+jourvol|volum|vol\adddot
60+jourser|s\`erie|s\`er\adddot
61+book|llibre|llib\adddot
62+part|part|part
63+issue|n\'umero|n\'um\adddot
64+newseries|s\`erie nova|s\`erie nova
65+oldseries|s\`erie antiga|s\`erie ant\adddot
66+edition|edici\'o|ed\adddot
67+reprint|reimpressi\'o|reimpr\adddot
68+reprintof|reimpressi\'o \smartof|reimpr\adddotspace\smartof
69+reprintas|reimpr\`es com|reimpr\adddotspace com
70+reprintfrom|reimpr\`es \smartof|reimpr\adddotspace\smartof
71+reviewof|ressenya \smartof|ress\adddotspace\smartof
72+translationof|traducci\'o \smartof|trad\adddotspace\smartof
73+origpubas|publicat origin\`ariament com|pub\adddotspace orig\adddotspace com
74+origpubin|publicat origin\`ariament el|pub\adddotspace orig\adddotspace el
75+astitle|com|com
76+bypublisher|per|per
77+page|p\`agina|p\`ag\adddot
78+pages|p\`agines|p\`ag\adddot
79+column|columna|col\adddot
80+columns|columnes|cols\adddot
81+nodate|sine data|s\adddotspace d\adddot
82+verse|vers|v\adddot
83+verses|versos|v\adddot
84+section|apartat|\S
85+sections|apartats|\S
86+paragraph|par\`agraf|\P
87+paragraphs|par\`agrafs|\P
88+pagetotal|p\`agina|p\`ag\adddot
89+pagetotals|p\`agines|p\`ag\adddot
90+columntotal|columna|col\adddot
91+columntotals|columnes|col\adddot
92+versetotal|vers|v\adddot
93+versetotals|versos|v\adddot
94+sectiontotal|secci\'o|\S
95+sectiontotals|seccions|\S
96+paragraphtotal|par\`agrafs|\P
97+paragraphtotals|par\`agrafs|\P
98+in|a|a
99+inseries|a|a
100+ofseries|\smartof|\smartof
101+number|n\'umero|n\'um\adddot
102+bathesis|treball final de grau|treb\adddotspace fin\adddotspace de gr\adddot
103+mathesis|treball final de m\`aster|treb\adddotspace fin\adddotspace de m\`ast\adddot
104+phdthesis|tesi doctoral|tesi doct\adddot
105+candthesis|tesi de candidatura|tesi de cand\adddot
106+resreport|informe de recerca|inf\adddotspace de rec\adddot
107+techreport|informe t\`ecnic|inf\adddotspace t\`ec\adddot
108+software|programari|prog\adddot
109+datacd|CD de dades|CD de dades
110+audiocd|CD d'\`audio|CD d'\`audio
111+version|versi\'o|vers\adddot
112+urlfrom|disponible a|disp\adddotspace a
113+urlseen|consultat|cons\adddot
114+inpreparation|en preparaci\'o|en prep\adddot
115+inpress|a impremta|a impr\adddot
116+prepublished|pre-publicat|pre-publicat
117+submitted|enviat a publicar|env\adddotspace a pub\adddot
118+forthcoming|properament|prop\adddot
119+citedas|d'ara endavant citat com|d'ara end\adddotspace cit\adddotspace com
120+thiscite|concretament|concr\adddot
121+seenote|vegeu la nota|v\adddotspace la n\adddot
122+quotedin|citat a|cit\adddotspace a
123+opcit|\`op\adddotspace cit\adddot|\`op\adddotspace cit\adddot
124+loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot
125+confer|cf\adddot|cf\adddot
126+sequens|seq\adddot|seq\adddot
127+sequentes|et seq\adddot|et seq\adddot
128+passim|p\`assim|p\`assim
129+see|vegeu|v\adddot
130+seealso|vegeu tamb\'e|v\adddotspace tamb\'e
131+backrefpage|vegeu la p\`agina|v\adddotspace la p\`ag\adddot
132+backrefpages|vegeu les p\`agines|v\adddotspace les p\`ag\adddot
133+january|gener|gen\adddot
134+february|febrer|febr\adddot
135+april|abril|abr\adddot
136+may|maig|maig
137+june|juny|juny
138+july|juliol|jul\adddot
139+august|agost|ag\adddot
140+september|setembre|set\adddot
141+october|octubre|oct\adddot
142+november|novembre|nov\adddot
143+december|desembre|des\adddot
144+langamerican|angl\`es americ\`a|ang\adddotspace amer\adddot
145+langbrazilian|portugu\`es brasiler|port\adddotspace bras\adddot
146+langbulgarian|b\'ulgar|b\'ulg\adddot
147+langcatalan|catal\`a|cat\adddot
148+langczech|txec|txec
149+langcroatian|croat|croat
150+langdanish|dan\`es|dan\adddot
151+langdutch|neerland\`es|neerl\adddot
152+langenglish|angl\`es|ang\adddot
153+langestonian|estoni\`a|eston\adddot
154+langfinnish|fin\`es|fin\adddot
155+langfrench|franc\`es|fr\adddot
156+langgalician|gallec|gal\adddot
157+langgerman|alemany|al\adddot
158+langgreek|grec|grec
citeproc/biblatex-localization/croatian.lbx.stringsnew file+214
@@ -0,0 +1,214 @@
1+bibliography|Bibliografija|Bibliografija
2+references|Literatura|Literatura
3+shorthands|Popis kratica|Kratice
4+editor|urednik|ur\adddot
5+editors|urednici|ur\adddot
6+redactor|redaktor|redaktor
7+redactors|redaktori|redaktori
8+reviser|korektor|korektor
9+revisers|korektori|korektori
10+collaborator|suradnik|sur\adddot
11+collaborators|suradnici|sur\adddot
12+translator|prijevod|prev\adddot
13+translators|prijevod|prev\adddot
14+commentator|komentator|komentator
15+commentators|komentatori|komentatori
16+commentary|komentar|komentar
17+introduction|uvod|uvod
18+foreword|predgovor|predgovor
19+afterword|pogovor|pogovor
20+editortr|prijevod i obrada|ur\adddotspace i prev\adddot
21+editorstr|prijevod i obrada|ur\adddotspace i prev\adddot
22+organizer|organizacija|organizacija
23+organizers|organizacija|organizacija
24+byorganizer|organizacija|organizacija
25+byauthor|autor|autor
26+byeditor|obrada|ur\adddot
27+byredactor|redaktura|red\adddot
28+byreviser|korektura|kor\adddot
29+byreviewer|recenzija|recenzija
30+bycontinuator|nastavio|nastavio
31+bycollaborator|u suradnji s|u sur\adddotspace s
32+bycommentator|komentari|komentari
33+withcommentator|komentari|komentari
34+withintroduction|uvod|uvod
35+withforeword|predgovor|predgovor
36+withafterword|pogovor|pogovor
37+and|i|i
38+andothers|i drugi|i dr\adddot
39+andmore|i drugi|i dr\adddot
40+volume|sv\adddot|sv\adddot
41+volumes|sv\adddot|sv\adddot
42+involumes|u|u
43+jourvol|sv\adddot|sv\adddot
44+jourser|serija|serija
45+book|knjiga|knj\adddot
46+part|dio|dio
47+issue|izd\adddot|izd\adddot
48+newseries|nova serija|nova serija
49+oldseries|stara serija|stara serija
50+edition|izdanje|izdanje
51+reprint|pretisak|pretisak
52+reprintof|pretisak|pretisak
53+reprintas|iznova otisnuto kao|iznova otisnuto kao
54+reprintfrom|iznova otisnut|iznova otisnut
55+translationof|prijevod|prijevod
56+translationas|prev\adddotspace kao|prev\adddotspace kao
57+translationfrom|prijevod|prijevod
58+reviewof|osvrt na|osvrt na
59+origpubas|izvorno obj\adddotspace kao|izv\adddotspace obj\adddotspace kao
60+origpubin|izvorno obj\adddot|izv\adddotspace obj\adddot
61+astitle|kao|kao
62+bypublisher||
63+nodate|bez datuma|bez datuma
64+page|stranica|str\adddot
65+pages|stranice|str\adddot
66+column|stupac|stupac
67+columns|stupci|stupci
68+line|linija|l\adddot
69+lines|linije|ll\adddot
70+verse|stih|stih
71+verses|stihovi|stihovi
72+section|odjeljak|\S
73+sections|odjeljci|\S\S
74+paragraph|stavak|st\adddot
75+paragraphs|stavci|st\adddot
76+pagetotal|str\adddot|str\adddot
77+pagetotals|str\adddot|str\adddot
78+columntotal|stupac|stupac
79+columntotals|stupaca|stupaca
80+linetotal|linija|lin\adddot
81+linetotals|linija|lin\adddot
82+versetotal|stih|st\adddot
83+versetotals|stihova|st\adddot
84+sectiontotal|odjeljak|odj\adddot
85+sectiontotals|odjeljaka|odj\adddot
86+paragraphtotal|stavak|st\adddot
87+paragraphtotals|stavaka|st\adddot
88+in||
89+inseries|u seriji|u seriji
90+ofseries|iz serije|iz serije
91+number|broj|br\adddot
92+chapter|poglavlje|pogl\adddot
93+bathesis|diplomski rad|dipl\adddotspace rad
94+mathesis|magistarski rad|mag\adddotspace rad
95+phdthesis|doktorska disertacija|disertacija
96+software|softver|softver
97+datacd|CD-ROM|CD-ROM
98+audiocd|audio CD|audio CD
99+version|verzija|verzija
100+url|adresa|adresa
101+urlfrom|dostupno na|dost\adddotspace na
102+urlseen|pogledano|pogledano
103+inpreparation|u pripremi|u pripremi
104+submitted|predan|predan
105+inpress|u tisku|u tisku
106+prepublished|pred objavom|pred obj\adddot
107+citedas|dalje citirano kao|dalje citirano kao
108+thiscite|napose|napose
109+quotedin|citirano u|citirano u
110+idem|idem|idem
111+idemsm|idem|idem
112+idemsf|eadem|eadem
113+idemsn|idem|idem
114+idempm|eidem|eidem
115+idempf|eaedem|eaedem
116+idempn|eadem|eadem
117+idempp|eidem|eidem
118+ibidem|ibidem|ibid\adddot
119+opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot
120+loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot
121+confer|usporedi|usp\adddot
122+sequens|sq\adddot|sq\adddot
123+sequentes|sqq\adddot|sqq\adddot
124+passim|passim|pass\adddot
125+see|vidi|v\adddot
126+seealso|pogledaj i|pogl\adddotspace i
127+backrefpage|citirano na stranci|cit\adddotspace na str\adddot
128+backrefpages|cited on pages|cit\adddotspace na str\adddot
129+april|travanj|travanj
130+may|svibanj|svibanj
131+june|lipanj|lipanj
132+july|srpanj|srpanj
133+august|kolovoz|kolovoz
134+september|rujan|rujan
135+october|listopad|listopad
136+november|studeni|studeni
137+december|prosinac|prosinac
138+dateapril|travnja|travnja
139+datemay|svibnja|svibnja
140+datejune|lipnja|lipnja
141+datejuly|srpnja|srpnja
142+dateaugust|kolovoza|kolovoza
143+dateseptember|rujna|rujna
144+dateoctober|listopada|listopada
145+datenovember|studenoga|studenoga
146+datedecember|prosinca|prosinca
147+langamerican|engleski|engleski
148+langbrazilian|portugalski|portugalski
149+langbulgarian|bugarski|bugarski
150+langcatalan|katalonski|katalonski
151+langcroatian|hrvatski|hrvatski
152+langdanish|danski|danski
153+langdutch|nizozemski|nizozemski
154+langenglish|engleski|engleski
155+langestonian|estonski|estonski
156+langfinnish|finski|finski
157+langfrench|francuski|francuski
158+langgalician|galicijski|galicijski
159+langhungarian|ma\dj arski|ma\dj arski
160+langitalian|talijanski|talijanski
161+langjapanese|japanski|japanski
162+langlatin|latinski|latinski
163+langlatvian|letonski|letonski
164+langpolish|poljski|poljski
165+langportuguese|portugalski|portugalski
166+langrussian|ruski|ruski
167+langslovene|slovenski|slovenski
168+langukrainian|ukrajinski|ukrajinski
169+fromamerican|s engleskog|s engleskog
170+frombrazilian|s portugalskog|s portugalskog
171+frombulgarian|s bugarskog|s bugarskog
172+fromcatalan|s katalonskog|s katalonskog
173+fromcroatian|s hrvatskog|s hrvatskog
174+fromdanish|s danskog|s danskog
175+fromdutch|s nizozemskog|s nizozemskog
176+fromenglish|s engleskog|s engleskog
177+fromestonian|s estonskog|s estonskog
178+fromfinnish|s finskog|s finskog
179+fromfrench|s francuskog|s francuskog
180+fromgalician|s galicijskog|s galicijskog
181+fromhungarian|s ma\dj arskog|s ma\dj arskog
182+fromitalian|s talijanskog|s talijanskog
183+fromjapanese|s japanskog|s japanskog
184+fromlatin|s latinskog|s latinskog
185+fromlatvian|s letonskog|s letonskog
186+frompolish|s poljskog|s poljskog
187+fromportuguese|s portugalskog|s portugalskog
188+fromrussian|s ruskog|s ruskog
189+fromslovene|sa slovenskog|sa slovenskog
190+fromukrainian|s ukrajinskog|s ukrajinskog
191+countryeu|Europska unija|EU
192+countryep|Europska unija|EP
193+countryfr|Francuska|FR
194+countryuk|Velika Britanija|GB
195+patent|patent|pat\adddot
196+patenteu|europski patent|europski pat\adddot
197+patentfr|francuski patent|francuski pat\adddot
198+patentuk|britanski patent|britanski pat\adddot
199+patentus|US patent|US pat\adddot
200+patreq|patentni zahtjev|pat\adddot\ zahtjev
201+patreqeu|europski patentni zahtjev|EU pat\adddotspace zahtjev
202+patrequs|US patentni zahtjev|US pat\adddot\ zahtjev
203+file|datoteka|datoteka
204+library|biblioteka|biblioteka
205+commonera|n\adddotspace e\adddot|n\adddotspace e\adddot
206+beforecommonera|pr\adddotspace n\adddotspace e\adddot|pr\adddotspace n\adddotspace e\adddot
207+annodomini|poslije Krista|p\adddotspace Kr\adddot
208+beforechrist|prije Krista|pr\adddotspace Kr\adddot
209+circa|oko|cca\adddot
210+summer|ljeto|ljeto
211+autumn|jesen|jesen
212+winter|zima|zima
213+am|prije podne|AM
214+pm|poslije podne|PM
citeproc/biblatex-localization/czech.lbx.stringsnew file+91
@@ -0,0 +1,91 @@
1+bibliography|Bibliografie|Bibliografie
2+references|Odkazy|Odkazy
3+shorthands|Seznam zkratek|Zkratky
4+editor|editor|ed\adddot
5+compiler|sestavil|sest\adddot
6+compilers|sestavili|sest\adddot
7+redactor|redaktor|red\adddot
8+reviser|korektor|kor\adddot
9+founder|zakladatel|zakl\adddot
10+annotations|anotace|anot\adddot
11+afterword|doslov|dosl\adddot
12+byauthor||
13+bycompiler|sestaveno|sest\adddot
14+withannotator|s\addnbspace anotacemi od|s\addnbspace anot\adddot\ od
15+withafterword|s\addnbspace doslovem od|s\addnbspace dosl\adddot\ od
16+and|a|a
17+andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
18+andmore|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
19+volume|svazek|sv\adddot
20+volumes|svazky|sv\adddot
21+involumes|in|in
22+book|kniha|kniha
23+reprint|dotisk|dotisk
24+reprintof|dotisk|dotisk
25+reprintas|dotisknuto jako|dotisknuto jako
26+reprintfrom|dotisknuto z\addnbspace|dotisknuto z\addnbspace
27+reviewof|recenze|recenz\adddot
28+astitle|jako|jako
29+bypublisher||
30+page|strana|s\adddot
31+pages|strany|s\adddot
32+column|sloupec|sl\adddot
33+columns|sloupce|sl\adddot
34+section|sekce|\S
35+sections|sekce|\S\S
36+paragraph|odstavec|ods\adddot
37+paragraphs|odstavce|ods\adddot
38+pagetotal|strana|s\adddot
39+pagetotals|strany|s\adddot
40+columntotal|sloupec|sl\adddot
41+columntotals|sloupce|sl\adddot
42+sectiontotal|sekce|\S
43+sectiontotals|sekce|\S\S
44+paragraphtotal|odstavec|ods\adddot
45+paragraphtotals|odstavce|ods\adddot
46+in|in|in
47+inseries|in|in
48+ofseries|z|z
49+chapter|kapitola|kap\adddot
50+datacd|CD-ROM|CD-ROM
51+audiocd|audio CD|audio CD
52+version|verze|ver\adddot
53+url|URL|URL
54+inpress|v\addnbspace tisku|v\addnbspace tisku
55+idem|idem|idem
56+idemsm|idem|idem
57+idemsf|eadem|eadem
58+idemsn|idem|idem
59+idempm|eidem|eidem
60+idempf|eaedem|eaedem
61+idempn|eadem|eadem
62+idempp|eidem|eidem
63+ibidem|ibidem|ibid\adddot
64+opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot
65+loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot
66+confer|cf\adddot|cf\adddot
67+sequens|sq\adddot|sq\adddot
68+sequentes|sqq\adddot|sqq\adddot
69+passim|passim|pass\adddot
70+see|viz|viz
71+january|leden|led\adddot
72+april|duben|dub\adddot
73+august|srpen|srp\adddot
74+november|listopad|lis\adddot
75+december|prosinec|pros\adddot
76+langlatin|latina|lat\adddot
77+fromlatin|z\addnbspace latiny|z\addnbspace lat\adddot
78+countryfr|Francie|FR
79+patent|patent|pat\adddot
80+patentus|US patent|US pat\adddot
81+file|soubor|soub\adddot
82+library|knihovna|knih\adddot
83+abstract|abstrakt|abst\adddot
84+annotation|anotace|anot\adddot
85+annodomini|po Kristu|po Kr\adddot
86+circa|cirka|ca\adddot
87+spring|jaro|jaro
88+autumn|podzim|podzim
89+winter|zima|zima
90+am|AM|AM
91+pm|PM|PM
citeproc/biblatex-localization/danish.lbx.stringsnew file+106
@@ -0,0 +1,106 @@
1+bibliography|Bibliografi|Bibliografi
2+references|Litteraturhenvisninger|Litteratur
3+shorthands|Forkortelser|Forkortelser
4+editor|redakt\o r|red\adddot
5+editors|redakt\o rer|red\adddot
6+compiler|kompilator|kompilator
7+compilers|kompilatorer|kompilatorer
8+redactor|medredakt\o r|medred\adddot
9+redactors|medredakt\o rer|medred\adddot
10+reviser|revision|rev\adddot
11+revisers|revision|rev\adddot
12+founder|stifter|stifter
13+founders|stiftere|stiftere
14+continuator|videref\o rer|videref\adddot
15+continuators|videref\o rere|videref\adddot
16+collaborator|medarbejder|medarb\adddot
17+collaborators|medarbejdere|medarb\adddot
18+translator|overs\ae tter|overs\adddot
19+translators|overs\ae ttere|overs\adddot
20+commentator|kommentator|komm\adddot
21+commentators|kommentatorer|komm\adddot
22+annotator|kommentator|komm\adddot
23+annotators|kommentatorer|komm\adddot
24+commentary|kommentar|komm\adddot
25+annotations|annoteringer|ann\adddot
26+introduction|indledning|indl\adddot
27+foreword|forord|forord
28+afterword|efterord|efterord
29+organizer|organisator|org\adddot
30+organizers|organisatorer|org\adddot
31+byorganizer|organiseret af|org\adddotspace av
32+byauthor|af|af
33+byeditor|redigeret af|red\adddotspace af
34+bycompiler|kompileret af|komp\adddotspace af
35+byredactor|bearbejdet af|bearb\adddotspace af
36+byreviser|revideret af|rev\adddotspace af
37+byreviewer|bed\o mt af|bed\adddotspace af
38+byfounder|stiftet af|stiftet af
39+bycontinuator|videref\o rt af|videref\adddotspace af
40+bycollaborator|i samarbejde med|i samarb\adddotspace m\adddot
41+bycommentator|kommenteret af|komm\adddot\ af
42+byannotator|annoteret af|ann\adddot\ af
43+withcommentator|med kommentarer af|m\adddotspace komm\adddot\ af
44+withannotator|med annoteringer af|m\adddotspace ann\adddot\ af
45+withintroduction|med indledning af|m\adddotspace indl\adddot\ af
46+withforeword|med forord af|m\adddotspace forord af
47+withafterword|med efterord af|m\adddotspace efterord af
48+and|og|og
49+andothers|med flere|m.fl\adddot
50+andmore|med mere|m.m\adddot
51+volume|bind|bd\adddot
52+volumes|bind|bd\adddot
53+involumes|i|i
54+jourvol|\aa rgang|\aa rg\adddot
55+jourser|r\ae kke|rk\adddot
56+book|bog|bog
57+part|del|del
58+issue|nummer|nr\adddot
59+newseries|ny r\ae kke|ny rk\adddot
60+oldseries|gammel r\ae kke|gl. rk\adddot
61+edition|udgave|udg\adddot
62+reprint|genoptryk|genoptr\adddot
63+reprintof|genoptryk af|genoptr\adddot\ af
64+reprintas|genoptryk under titlen|genoptr\adddot\ under titlen
65+reprintfrom|genoptryk fra|genoptr\adddot\ fra
66+translationof|overs\ae ttelse af|overs\adddot\ af
67+translationas|oversat under titlen|overs\adddotspace\ under titlen
68+translationfrom|oversat fra|overs\adddotspace\ fra
69+reviewof|bed\o mmelse af|bed\adddotspace af
70+origpubas|oprindeligt udgivet som|opr\adddot\ udg\adddot\ som
71+origpubin|oprindeligt udgivet i|opr\adddot\ udg\adddot\ i
72+astitle|under titlen|under titlen
73+bypublisher|af|af
74+nodate|uden \aa rstal|u.\aa\adddot
75+page|side|s\adddot
76+pages|sider|s\adddot
77+column|spalte|sp\adddot
78+columns|spalter|sp\adddot
79+line|linje|l\adddot
80+lines|linjer|l\adddot
81+verse|vers|v\adddot
82+verses|vers|v\adddot
83+section|paragraf|par\adddot
84+sections|paragraffer|par\adddot
85+paragraph|afsnit|afsn\adddot
86+paragraphs|afsnit|afsn\adddot
87+pagetotal|side|s\adddot
88+pagetotals|sider|s\adddot
89+columntotal|spalte|sp\adddot
90+columntotals|spalter|sp\adddot
91+line|linje|l\adddot
92+lines|linjer|l\adddot
93+verse|vers|v\adddot
94+verses|vers|v\adddot
95+linetotal|linje|l\adddot
96+linetotals|linje|l\adddot
97+versetotal|vers|v\adddot
98+versetotals|vers|v\adddot
99+sectiontotal|paragraf|par\adddot
100+sectiontotals|paragraffer|par\adddot
101+paragraphtotal|afsnit|afsn\adddot
102+paragraphtotals|afsnit|afsn\adddot
103+in|i|i
104+inseries|i r\ae kken|i rk\adddot
105+ofseries|fra r\ae kken|fra rk\adddot
106+number|nummer|nr\adddot
citeproc/biblatex-localization/dutch.lbx.stringsnew file+23
@@ -0,0 +1,23 @@
1+bibliography|Bibliografie|Bibliografie
2+references|Referenties|Referenties
3+shorthands|Lijst van afkortingen|Afkortingen
4+editor|redacteur|red\adddot
5+editors|redacteurs|red\adddot
6+compiler|samensteller|samenst\adddot
7+compilers|samenstellers|samenst\adddot
8+founder|oprichter|opr\adddot
9+founders|oprichters|opr\adddot
10+continuator|opvolger|opv\adddot
11+continuators|opvolgers|opv\adddot
12+redactor|redacteur|red\adddot
13+redactors|redacteuren|red\adddot
14+reviser|revisor|rev\adddot
15+revisers|revisors|rev\adddot
16+collaborator|medewerker|med\adddot
17+collaborators|medewerkers|med\adddot
18+translator|vertaler|vert\adddot
19+translators|vertalers|vert\adddot
20+commentator|commentator|comm\adddot
21+commentators|commentatoren|comm\adddot
22+annotator|annotator|annot\adddot
23+annotators|annotatoren|annot\adddot
citeproc/biblatex-localization/english.lbx.stringsnew file+254
@@ -0,0 +1,254 @@
1+bibliography|Bibliography|Bibliography
2+references|References|References
3+shorthands|List of Abbreviations|Abbreviations
4+editor|editor|ed\adddot
5+editors|editors|eds\adddot
6+compiler|compiler|comp\adddot
7+compilers|compilers|comp\adddot
8+redactor|redactor|red\adddot
9+redactors|redactors|red\adddot
10+reviser|reviser|rev\adddot
11+revisers|revisers|rev\adddot
12+founder|founder|found\adddot
13+founders|founders|found\adddot
14+continuator|continued|cont\adddot
15+continuators|continued|cont\adddot
16+collaborator|collaborator|collab\adddot
17+collaborators|collaborators|collab\adddot
18+translator|translator|trans\adddot
19+translators|translators|trans\adddot
20+commentator|commentator|comm\adddot
21+commentators|commentators|comm\adddot
22+annotator|annotator|annot\adddot
23+annotators|annotators|annot\adddot
24+commentary|commentary|comm\adddot
25+annotations|annotations|annot\adddot
26+introduction|introduction|intro\adddot
27+foreword|foreword|forew\adddot
28+afterword|afterword|afterw\adddot
29+organizer|organizer|org\adddot
30+organizers|organizers|orgs\adddot
31+byorganizer|organized by|org\adddotspace by
32+byauthor|by|by
33+byeditor|edited by|ed\adddotspace by
34+bycompiler|compiled by|comp\adddotspace by
35+byredactor|redacted by|red\adddotspace by
36+byreviser|revised by|rev\adddotspace by
37+byreviewer|reviewed by|rev\adddotspace by
38+byfounder|founded by|found\adddotspace by
39+bycontinuator|continued by|cont\adddotspace by
40+bycollaborator|in collaboration with|in collab\adddotspace with
41+bytranslator|translated \lbx@lfromlang\ by|trans\adddot\ \lbx@sfromlang\ by
42+bycommentator|commented by|comm\adddot\ by
43+byannotator|annotated by|annot\adddot\ by
44+withcommentator|with a commentary by|with a comment\adddot\ by
45+withannotator|with annotations by|with annots\adddot\ by
46+withintroduction|with an introduction by|with an intro\adddot\ by
47+withforeword|with a foreword by|with a forew\adddot\ by
48+withafterword|with an afterword by|with an afterw\adddot\ by
49+and|and|and
50+andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
51+andmore|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
52+volume|volume|vol\adddot
53+volumes|volumes|vols\adddot
54+involumes|in|in
55+jourvol|volume|vol\adddot
56+jourser|series|ser\adddot
57+book|book|book
58+part|part|part
59+issue|issue|issue
60+newseries|new series|new ser\adddot
61+oldseries|old series|old ser\adddot
62+edition|edition|ed\adddot
63+reprint|reprint|repr\adddot
64+reprintof|reprint of|repr\adddotspace of
65+reprintas|reprinted as|rpt\adddotspace as
66+reprintfrom|reprinted from|repr\adddotspace from
67+reviewof|review of|rev\adddotspace of
68+translationof|translation of|trans\adddotspace of
69+translationas|translated as|trans\adddotspace as
70+translationfrom|translated from|trans\adddotspace from
71+origpubas|originally published as|orig\adddotspace pub\adddotspace as
72+origpubin|originally published in|orig\adddotspace pub\adddotspace in
73+astitle|as|as
74+bypublisher|by|by
75+nodate|no date|n\adddot d\adddot
76+page|page|p\adddot
77+pages|pages|pp\adddot
78+column|column|col\adddot
79+columns|columns|cols\adddot
80+line|line|l\adddot
81+lines|lines|ll\adddot
82+verse|verse|v\adddot
83+verses|verses|vv\adddot
84+section|section|\S
85+sections|sections|\S\S
86+paragraph|paragraph|par\adddot
87+paragraphs|paragraphs|par\adddot
88+pagetotal|page|p\adddot
89+pagetotals|pages|pp\adddot
90+columntotal|column|col\adddot
91+columntotals|columns|cols\adddot
92+linetotal|line|l\adddot
93+linetotals|lines|ll\adddot
94+versetotal|verse|v\adddot
95+versetotals|verses|vv\adddot
96+sectiontotal|section|\S
97+sectiontotals|sections|\S\S
98+paragraphtotal|paragraph|par\adddot
99+paragraphtotals|paragraphs|par\adddot
100+in|in|in
101+inseries|in|in
102+ofseries|of|of
103+number|number|no\adddot
104+chapter|chapter|chap\adddot
105+bathesis|Bachelor's thesis|BA\addabbrvspace thesis
106+mathesis|Master's thesis|MA\addabbrvspace thesis
107+phdthesis|PhD\addabbrvspace thesis|PhD\addabbrvspace thesis
108+candthesis|Candidate thesis|Cand\adddotspace thesis
109+resreport|research report|research rep\adddot
110+techreport|technical report|tech\adddotspace rep\adddot
111+software|computer software|comp\adddotspace software
112+datacd|CD-ROM|CD-ROM
113+audiocd|audio CD|audio CD
114+version|version|version
115+url|address|address
116+urlfrom|available from|available from
117+urlseen|visited on|visited on
118+inpreparation|in preparation|in preparation
119+submitted|submitted|submitted
120+forthcoming|forthcoming|forthcoming
121+inpress|in press|in press
122+prepublished|pre-published|pre-published
123+citedas|henceforth cited as|henceforth cited as
124+thiscite|especially|esp\adddot
125+seenote|see note|see n\adddot
126+quotedin|quoted in|qtd\adddotspace in
127+idem|idem|idem
128+idemsm|idem|idem
129+idemsf|eadem|eadem
130+idemsn|idem|idem
131+idempm|eidem|eidem
132+idempf|eaedem|eaedem
133+idempn|eadem|eadem
134+idempp|eidem|eidem
135+ibidem|ibidem|ibid\adddot
136+opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot
137+loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot
138+confer|cf\adddot|cf\adddot
139+sequens|sq\adddot|sq\adddot
140+sequentes|sqq\adddot|sqq\adddot
141+passim|passim|pass\adddot
142+see|see|see
143+seealso|see also|see also
144+backrefpage|cited on page|cit\adddotspace on p\adddot
145+backrefpages|cited on pages|cit\adddotspace on pp\adddot
146+january|January|Jan\adddot
147+february|February|Feb\adddot
148+march|March|Mar\adddot
149+april|April|Apr\adddot
150+may|May|May
151+june|June|June
152+july|July|July
153+august|August|Aug\adddot
154+september|September|Sept\adddot
155+october|October|Oct\adddot
156+november|November|Nov\adddot
157+december|December|Dec\adddot
158+langamerican|American|American
159+langbrazilian|Brazilian|Brazilian
160+langbulgarian|Bulgarian|Bulgarian
161+langcatalan|Catalan|Catalan
162+langcroatian|Croatian|Croatian
163+langczech|Czech|Czech
164+langdanish|Danish|Danish
165+langdutch|Dutch|Dutch
166+langenglish|English|English
167+langestonian|Estonian|Estonian
168+langfinnish|Finnish|Finnish
169+langfrench|French|French
170+langgalician|Galician|Galician
171+langgerman|German|German
172+langgreek|Greek|Greek
173+langhungarian|Hungarian|Hungarian
174+langitalian|Italian|Italian
175+langjapanese|Japanese|Japanese
176+langlatin|Latin|Latin
177+langlatvian|Latvian|Latvian
178+langlithuanian|Lithuanian|Lithuanian
179+langnorwegian|Norwegian|Norwegian
180+langpolish|Polish|Polish
181+langportuguese|Portuguese|Portuguese
182+langrussian|Russian|Russian
183+langserbian|Serbian|Serbian
184+langslovak|Slovak|Slovak
185+langslovene|Slovene|Slovene
186+langspanish|Spanish|Spanish
187+langswedish|Swedish|Swedish
188+langturkish|Turkish|Turkish
189+langukrainian|Ukrainian|Ukrainian
190+fromamerican|from the American|from the American
191+frombrazilian|from the Brazilian|from the Brazilian
192+frombulgarian|from the Bulgarian|from the Bulgarian
193+fromcatalan|from the Catalan|from the Catalan
194+fromcroatian|from the Croatian|from the Croatian
195+fromczech|from the Czech|from the Czech
196+fromdanish|from the Danish|from the Danish
197+fromdutch|from the Dutch|from the Dutch
198+fromenglish|from the English|from the English
199+fromestonian|from the Estonian|from the Estonian
200+fromfinnish|from the Finnish|from the Finnish
201+fromfrench|from the French|from the French
202+fromgalician|from the Galician|from the Galician
203+fromgerman|from the German|from the German
204+fromgreek|from the Greek|from the Greek
205+fromhungarian|from the Hungarian|from the Hungarian
206+fromitalian|from the Italian|from the Italian
207+fromjapanese|from the Japanese|from the Japanese
208+fromlatin|from the Latin|from the Latin
209+fromlatvian|from the Latvian|from the Latvian
210+fromlithuanian|from the Lithuanian|from the Lithuanian
211+fromnorwegian|from the Norwegian|from the Norwegian
212+frompolish|from the Polish|from the Polish
213+fromportuguese|from the Portuguese|from the Portuguese
214+fromrussian|from the Russian|from the Russian
215+fromserbian|from the Serbian|from the Serbian
216+fromslovak|from the Slovak|from the Slovak
217+fromslovene|from the Slovene|from the Slovene
218+fromspanish|from the Spanish|from the Spanish
219+fromswedish|from the Swedish|from the Swedish
220+fromturkish|from the Turkish|from the Turkish
221+fromukrainian|from the Ukrainian|from the Ukrainian
222+countryde|Germany|DE
223+countryeu|European Union|EU
224+countryep|European Union|EP
225+countryfr|France|FR
226+countryuk|United Kingdom|GB
227+countryus|United States of America|US
228+patent|patent|pat\adddot
229+patentde|German patent|German pat\adddot
230+patenteu|European patent|European pat\adddot
231+patentfr|French patent|French pat\adddot
232+patentuk|British patent|British pat\adddot
233+patentus|U.S\adddotspace patent|U.S\adddotspace pat\adddot
234+patreq|patent request|pat\adddot\ req\adddot
235+patreqde|German patent request|German pat\adddot\ req\adddot
236+patreqeu|European patent request|European pat\adddot\ req\adddot
237+patreqfr|French patent request|French pat\adddot\ req\adddot
238+patrequk|British patent request|British pat\adddot\ req\adddot
239+patrequs|U.S\adddotspace patent request|U.S\adddotspace pat\adddot\ req\adddot
240+file|file|file
241+library|library|library
242+abstract|abstract|abstract
243+annotation|annotations|annotations
244+commonera|Common Era|CE
245+beforecommonera|Before Common Era|BCE
246+annodomini|Anno Domini|AD
247+beforechrist|Before Christ|BC
248+circa|circa|ca\adddot
249+spring|Spring|Spr\adddot
250+summer|Summer|Sum\adddot
251+autumn|Autumn|Aut\adddot
252+winter|Winter|Win\adddot
253+am|AM|AM
254+pm|PM|PM
citeproc/biblatex-localization/estonian.lbx.stringsnew file+178
@@ -0,0 +1,178 @@
1+bibliography|bibliograafia|bibliograafia
2+references|viited|viited
3+editor|toimetaja|toim\adddot
4+editors|toimetajad|toim\adddot
5+compiler|koostaja|koost\adddot
6+compilers|koostajad|koost\adddot
7+redactor|toimetaja|toim\adddot
8+redactors|toimetajad|toim\adddot
9+reviser|toimetaja|toim\adddot
10+revisers|toimetajad|toim\adddot
11+founder|asutaja|asutaja
12+founders|asutajad|asutajad
13+commentator|kommenteerija|kommenteerija
14+commentators|kommenteerijad|kommenteerijad
15+annotator|kommenteerija|kommenteerija
16+annotators|kommenteerijad|kommenteerijad
17+commentary|kommentaarid|kommentaarid
18+annotations|kommentaarid|kommentaarid
19+introduction|sissejuhatus|sissejuhatus
20+organizer|korraldaja|korraldaja
21+organizers|korraldajad|korraldajad
22+byorganizer|korraldanud|korraldanud
23+byauthor|kirjutanud|kirj\adddot
24+byeditor|toimetanud|toim\adddot
25+bycompiler|koostanud|koost\adddot
26+byredactor|toimetanud|toim\adddot
27+byreviewer|vaadanud|vaadanud
28+byfounder|asutanud|asutanud
29+bycommentator|kommenteerinud|kommenteerinud
30+byannotator|kommenteerinud|kommenteerinud
31+withcommentator|koos kommentaaridega|koos kommentaaridega
32+withannotator|koos kommentaaridega|koos kommentaaridega
33+withintroduction|koos tutvustusega|koos tutvustusega
34+and|ja|ja
35+involumes|osas|osas
36+jourser|seeria|seeria
37+book|raamat|raamat
38+part|osa|osa
39+issue|number|nr\adddot
40+newseries|uus seerias|uus seer\adddot
41+oldseries|vana seeria|vana seer\adddot
42+reviewof|arvustus teosest|arvustus teosest
43+origpubas|algselt avaldatud kui|algselt avaldatud kui
44+origpubin|algselt avaldatud aastal|algselt avaldatud aastal
45+astitle|pealkirjaga|pealkirjaga
46+column|veerg|veerg
47+columns|veerud|veerud
48+line|rida|rida
49+lines|read|read
50+verse|salm|salm
51+verses|salmid|salmid
52+section|jagu|jagu
53+sections|jaod|jaod
54+columntotal|veerge kokku|veerge kokku
55+columntotals|veergusid kokku|veergusid kokku
56+linetotal|ridu kokku|ridu kokku
57+linetotals|ridasid kokku|ridasid kokku
58+versetotal|salmi kokku|salmi kokku
59+versetotals|salmesid kokku|salmesid kokku
60+sectiontotal|jagusid kokku|jagusid kokku
61+sectiontotals|jagusid kokku|jagusid kokku
62+in|teoses|teoses
63+inseries|sarjas|sarjas
64+ofseries|sarjast|sarjast
65+number|number|nr
66+resreport|uuringuraport|uuringuraport
67+techreport|tehniline raport|tehniline raport
68+software|tarkvara|tarkvara
69+datacd|CD-ROM|CD-ROM
70+audiocd|audioplaat|audioplaat
71+version|versioon|versioon
72+url|aadress|aadress
73+urlfrom|saadaval|saadaval
74+urlseen|vaadatud|vaadatud
75+inpreparation|koostamisel|koostamisel
76+submitted|esitatud|esitatud
77+forthcoming|tulevases|tulevases
78+citedas|edaspidi viidatud kui|edaspidi viidatud kui
79+thiscite|eriti|eriti
80+quotedin|noteeritud|noteeritud
81+see|vaata|vt
82+seealso|vaata ka|vt ka
83+backrefpage|viidatud lehel|viidatud lehel
84+january|jaanuar|jaanuar
85+february|veebruar|veebruar
86+april|aprill|aprill
87+may|mai|mai
88+june|juuni|juuni
89+july|juuli|juuli
90+august|august|august
91+september|september|september
92+october|oktoober|oktoober
93+november|november|november
94+december|detsember|detsember
95+langamerican|Ameerika inglise keel|Ameerika inglise keel
96+langbrazilian|brasiilia keel|brasiilia keel
97+langbulgarian|bulgaaria keel|bulgaaria keel
98+langcatalan|katalaani keel|katalaani keel
99+langcroatian|horvaadi keel|horvaadi keel
100+langdanish|taani keel|taani keel
101+langdutch|hollandi keel|hollandi keel
102+langenglish|inglise keel|inglise keel
103+langestonian|eesti keel|eesti keel
104+langfinnish|soome keel|soome keel
105+langfrench|prantsuse keel|prantsuse keel
106+langgalician|galeegi keel|galeegi keel
107+langgerman|saksa keel|saksa keel
108+langgreek|kreeka keel|kreeka keel
109+langhungarian|ungari keel|ungari keel
110+langitalian|itaalia keel|itaalia keel
111+langjapanese|jaapani keel|jaapani keel
112+langlatin|ladina keel|ladina keel
113+langnorwegian|norra keel|norra keel
114+langpolish|poola keel|poola keel
115+langportuguese|portugali keel|portugali keel
116+langrussian|vene keel|vene keel
117+langslovak|slovakia keel|slovakia keel
118+langslovene|sloveeni keel|sloveeni keel
119+langspanish|hispaania keel|hispaania keel
120+langswedish|rootsi keel|rootsi keel
121+langukrainian|ukraina keel|ukraina keel
122+fromamerican|Ameerika inglise keelest|Ameerika inglise keelest
123+frombrazilian|brasiilia keelest|brasiilia keelest
124+frombulgarian|bulgaaria keelest|bulgaaria keelest
125+fromcatalan|katalani keelest|kalatalani keelest
126+fromcroatian|horvaadi keelest|horvaadi keelest
127+fromdanish|taani keelest|taani keelest
128+fromdutch|hollandi keelest|hollandi keelest
129+fromenglish|inglise keelest|inglise keelest
130+fromestonian|eesti keelest|eesti keelest
131+fromfinnish|soome keelest|soome keelest
132+fromfrench|prantsuse keelest|prantsuse keelest
133+fromgalician|galeegi keelest|galeegi keelest
134+fromgerman|saksa keelest|saksa keelest
135+fromgreek|kreeka keelest|kreeka keelest
136+fromhungarian|ungari keelest|ungari keelest
137+fromitalian|itaalia keelest|itaalia keelest
138+fromjapanese|jaapani keelest|jaapani keelest
139+fromlatin|ladina keelest|ladina keelest
140+fromnorwegian|norra keelest|norra keelest
141+fromportuguese|portugali keelest|portugali keelest
142+fromrussian|vene keelest|vene keelest
143+fromslovak|slovakia keelest|slovakia keelest
144+fromslovene|sloveenia keelest|sloveenia keelest
145+fromspanish|hispaania keelest|hispaania keelest
146+fromswedish|rootsi keelest|rootsi keelest
147+fromukrainian|ukraina keelest|ukraina keelest
148+countryde|Saksamaa|DE
149+countryeu|Euroopa Liit|EL
150+countryep|Euroopa Parlament|EP
151+countryfr|Prantsusmaa|FR
152+countryuk|Suurbritannia|GB
153+countryus|Ameerika|US
154+patent|patent|pat\adddot
155+patentde|Saksa patent|Saksa pat\adddot
156+patenteu|Euroopa patent|Euroopa pat\adddot
157+patentfr|Prantsuse patent|Prantsuse pat\adddot
158+patentuk|Briti patent|Briti pat\adddot
159+patentus|U.S\adddotspace patent|U.S\adddotspace pat\adddot
160+patreq|patendi taotlus|pat\adddotspace taotl\adddot
161+patreqde|Saksa patendi taotlus|Saksa pat\adddotspace taotl\adddot
162+patreqeu|Euroopa patendi taotlus|Euroopa pat\adddotspace taotl\adddot
163+patreqfr|Prantsuse patendi taotlus|Prantsuse pat\adddotspace taotl\adddot
164+patrequk|Briti patendi taotlus|Briti pat\adddotspace taotl\adddot
165+patrequs|U.S\adddotspace patendi taotlus.|U.S\adddotspace pat\adddotspace taotl\adddot
166+file|fail|fail
167+library|raamatukogu|raamatukogu
168+abstract|teesid|teesid
169+annotation|kommentaarid|kommentaarid
170+commonera|meie ajaarvamise j\"argi|m\adddot a\adddot j
171+beforecommonera|enne meie ajaarvamist|e\adddot m\adddot a
172+annodomini|p\"arast Kristust|pKr
173+beforechrist|enne Kristust|eKr
174+spring|kevadel|kevadel
175+summer|suvel|suvel
176+winter|talvel|talvel
177+am|AM|AM
178+pm|PM|PM
citeproc/biblatex-localization/finnish.lbx.stringsnew file+254
@@ -0,0 +1,254 @@
1+bibliography|Kirjallisuusluettelo|Kirjallisuus
2+references|Viitteet|Viitteet
3+shorthands|Lyhenteet|Lyhenteet
4+editor|toimittanut|toim\adddot
5+editors|toimittaneet|toim\adddot
6+compiler|koontanut|koontanut
7+compilers|koontaneet|koontaneet
8+redactor|toimittanut|toim\adddot
9+redactors|toimittaneet|toim\adddot
10+reviser|toimittanut|toim\adddot
11+revisers|toimittaneet|toim\adddot
12+founder|perustaja|perustaja
13+founders|perustajat|perustajat
14+continuator|jatkaja|jatkaja
15+continuators|jatkajat|jatkajat
16+collaborator|avustaja|avustaja
17+collaborators|avustajat|avustajat
18+translator|k\"a\"ant\"anyt|k\"a\"ant\adddot
19+translators|k\"a\"ant\"anyt|k\"a\"ant\adddot
20+commentator|kommentaarin kirjoittanut|kommentaarin kirjoittanut
21+commentators|kommentaarin kirjoittaneet|kommentaarin kirjoittaneet
22+annotator|selityksin varustanut|selityksin varustanut
23+annotators|selityksin varustaneet|selityksin varustaneet
24+commentary|kommentaari|kommentaari
25+annotations|selitykset|selitykset
26+introduction|johdanto|johdanto
27+foreword|esipuhe|esipuhe
28+afterword|j\"alkisanat|j\"alkisanat
29+organizer|toimittanut|toim\adddot
30+organizers|toimittaneet|toim\adddot
31+byorganizer|toimittanut|toim\adddot
32+byauthor|kirjoittanut|kirj\adddot
33+byeditor|toimittanut|toim\adddot
34+bycompiler|koontanut|koontanut
35+byredactor|toimittanut|toim\adddot
36+byreviser|toimittanut|toim\adddot
37+byreviewer|toimittanut|toim\adddot
38+byfounder|perustanut|perustanut
39+bycontinuator|jatkanut|jatkanut
40+bycollaborator|yhteisty\"oss\"a|yhteisty\"oss\"a
41+bytranslator|\lbx@lfromlang k\"a\"ant\"anyt|\lbx@sfromlang k\"a\"ant\adddot
42+bycommentator|kommentaarin kirjoittanut|kommentaarin kirjoittanut
43+byannotator|selityksin varustanut|selityksin varustanut
44+withcommentator|kommentaarin kirjoittanut|kommentaarin kirjoittanut
45+withannotator|selityksin varustanut|selityksin varustanut
46+withintroduction|johdannon kirjottanut|johdannon kirjottanut
47+withforeword|esipuheen kirjoittanut|esipuheen kirjoittanut
48+withafterword|j\"alkisanat kirjoittanut|j\"alkisanat kirjoittanut
49+and|ja|ja
50+andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
51+andmore|jne\adddot|jne\adddot
52+volume|volyymi|vol\adddot
53+volumes|volyymit|vol\adddot
54+involumes||
55+jourvol|volyymi|vol\adddot
56+jourser|sarja|sarja
57+book|kirja|kirja
58+part|osa|osa
59+issue|numero|numero
60+newseries|uusi sarja|uusi sarja
61+oldseries|vanha sarja|vanha sarja
62+edition|painos|painos
63+reprint|j\"alkipainos|j\"alkipainos
64+reprintof|julkaistu aiemmin nimell\"a|julkaistu aiemmin nimell\"a
65+reprintas|julkaistu uudelleen nimell\"a|julkaistu uudelleen nimell\"a
66+reprintfrom|julkaistu aiemmin nimell\"a|julkaistu aiemmin nimell\"a
67+translationof|k\"a\"ann\"os teoksesta|k\"a\"ann\"os teoksesta
68+translationas|k\"a\"annetty nimell\"a|k\"a\"annetty nimell\"a
69+translationfrom|k\"a\"annetty kielest\"a|k\"a\"annetty kielest\"a
70+reviewof|arvostelu teoksesta|arvostelu teoksesta
71+origpubas|julkaistu ensi kerran nimell\"a|julkaistu ensi kerran nimell\"a
72+origpubin|julkaistu ensi kerran vuonna|julkaistu ensi kerran vuonna
73+astitle|nimell\"a|nimell\"a
74+bypublisher|julkaissut|julkaissut
75+page|sivu|s\adddot
76+pages|sivut|s\adddot
77+column|palsta|palsta
78+columns|palstat|palstat
79+line|rivi|rivi
80+lines|rivit|rivit
81+nodate|ei julkaisup\"aiv\"a\"a|ei julkaisup\"aiv\"a\"a
82+verse|s\"ae|s\"ae
83+verses|s\"akeet|s\"akeet
84+section|kohta|kohta
85+sections|kohdat|kohdat
86+paragraph|kappale|kappale
87+paragraphs|kappaleet|kappaleet
88+pagetotal|sivu|s\adddot
89+pagetotals|sivut|s\adddot
90+columntotal|palsta|palsta
91+columntotals|palstat|palstat
92+linetotal|rivi|rivi
93+linetotals|rivit|rivit
94+versetotal|s\"ae|s\"ae
95+versetotals|s\"akeet|s\"akeet
96+sectiontotal|kohta|kohta
97+sectiontotals|kohdat|kohdat
98+paragraphtotal|kappale|kappale
99+paragraphtotals|kappaleet|kappaleet
100+in|teoksessa|teoksessa
101+inseries|sarjassa|sarjassa
102+ofseries|sarjassa|sarjassa
103+number|numero|nro
104+chapter|luku|luku
105+bathesis|tutkielma|tutkielma
106+mathesis|tutkielma|tutkielma
107+phdthesis|tohtorinv\"ait\"oskirja|tohtorinv\"ait\"oskirja
108+candthesis|kanditaatintutkielma|kanditaatintutkielma
109+resreport|tutkimusraportti|tutkimusraportti
110+techreport|tekninen raportti|tekninen raportti
111+software|ohjelmisto|ohjelmisto
112+datacd|data-CD|data-CD
113+audiocd|\"a\"ani-CD|\"a\"ani-CD
114+version|versio|versio
115+url|url|url
116+urlfrom|saatavilla osoitteesta|saatavilla osoitteesta
117+urlseen|viitattu|viitattu
118+inpreparation|valmisteilla|valmisteilla
119+submitted|l\"ahetetty|l\"ahetetty
120+forthcoming|hyv\"aksytty julkaistavaksi|hyv\"aksytty julkaistavaksi
121+inpress|painossa|painossa
122+prepublished|esijulkaistu|esijulkaistu
123+citedas|jatkossa|jatkossa
124+thiscite|sama|sama
125+seenote|katso viite|katso viite
126+quotedin|lainattu teoksessa|lainattu teoksessa
127+idem|idem|id\adddot
128+idemsf|idem|id\adddot
129+idemsm|idem|id\adddot
130+idemsn|idem|id\adddot
131+idempf|idem|id\adddot
132+idempm|idem|id\adddot
133+idempn|idem|id\adddot
134+idempp|idem|id\adddot
135+ibidem|ibidem|ibid\adddot
136+opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot
137+loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot
138+confer|cf\adddot|cf\adddot
139+sequens|sq\adddot|sq\adddot
140+sequentes|sqq\adddot|sqq\adddot
141+passim|passim|pass\adddot
142+see|katso|ks\adddot
143+seealso|katso my\"os|katso my\"os
144+backrefpage|katso sivu|ks\adddotspace s\adddot
145+backrefpages|katso sivut|ks\adddotspace s\adddot
146+january|tammikuuta|tammikuuta
147+february|helmikuuta|helmikuuta
148+march|maaliskuuta|maaliskuuta
149+april|huhtikuuta|huhtikuuta
150+may|toukokuuta|toukokuuta
151+june|kes\"akuuta|kes\"akuuta
152+july|hein\"akuuta|hein\"akuuta
153+august|elokuuta|elokuuta
154+september|syyskuuta|syyskuuta
155+october|lokakuuta|lokakuuta
156+november|marraskuuta|marraskuuta
157+december|joulukuuta|joulukuuta
158+basicjanuary|tammikuu|tammikuu
159+basicfebruary|helmikuu|helmikuu
160+basicmarch|maaliskuu|maaliskuu
161+basicapril|huhtikuu|huhtikuu
162+basicmay|toukokuu|toukokuu
163+basicjune|kes\"akuu|kes\"akuu
164+basicjuly|hein\"akuu|hein\"akuu
165+basicaugust|elokuu|elokuu
166+basicseptember|syyskuu|syyskuu
167+basicoctober|lokakuu|lokakuu
168+basicnovember|marraskuu|marraskuu
169+basicdecember|joulukuu|joulukuu
170+langamerican|amerikanenglanti|amerikanenglanti
171+langbrazilian|brasilianportugali|brasilianportugali
172+langbulgarian|bulgaria|bulgaria
173+langcatalan|katalonia|katalonia
174+langcroatian|kroatia|kroatia
175+langdanish|tanska|tanska
176+langdutch|hollanti|hollanti
177+langenglish|englanti|englanti
178+langestonian|viro|viro
179+langfinnish|suomi|suomi
180+langfrench|ranska|ranska
181+langgalician|galicia|galicia
182+langgerman|saksa|saksa
183+langgreek|kreikka|kreikka
184+langhungarian|unkari|unkari
185+langitalian|italia|italia
186+langlatin|latina|latina
187+langlatvian|latvia|latvia
188+langnorwegian|norja|norja
189+langpolish|puola|puola
190+langportuguese|portugali|portugali
191+langrussian|ven\"aj\"a|ven\"aj\"a
192+langslovak|slovakia|slovakia
193+langslovene|slovenia|slovenia
194+langspanish|espanja|espanja
195+langswedish|ruotsi|ruotsi
196+fromamerican|englannin kielest\"a|englannin kielest\"a
197+frombrazilian|portugalin kielest\"a|portugalin kielest\"a
198+frombulgarian|bulgarian kielest\"a|bulgarian kielest\"a
199+fromcatalan|katalonian kielest\"a|katalonian kielest\"a
200+fromcroatian|kroatian kielest\"a|kroatian kielest\"a
201+fromdanish|tanskan kielest\"a|tanskan kielest\"a
202+fromdutch|hollannin kielest\"a|hollannin kielest\"a
203+fromenglish|englannin kielest\"a|englannin kielest\"a
204+fromestonian|viron kielest\"a|viron kielest\"a
205+fromfinnish|suomen kielest\"a|suomen kielest\"a
206+fromfrench|ranskan kielest\"a|ranskan kielest\"a
207+fromgalician|galician kielest\"a|galician kielest\"a
208+fromgerman|saksan kielest\"a|saksan kielest\"a
209+fromgreek|kreikan kielest\"a|kreikan kielest\"a
210+fromhungarian|unkarin kielest\"a|unkarin kielest\"a
211+fromitalian|italian kielest\"a|italian kielest\"a
212+fromlatin|latinan kielest\"a|latinan kielest\"a
213+fromlatvian|latvian kielest\"a|latvian kielest\"a
214+fromnorwegian|norjan kielest\"a|norjan kielest\"a
215+frompolish|puolan kielest\"a|puolan kielest\"a
216+fromportuguese|portugalin kielest\"a|portugalin kielest\"a
217+fromrussian|ven\"aj\"an kielest\"a|ven\"aj\"an kielest\"a
218+fromslovak|slovakian kielest\"a|slovakian kielest\"a
219+fromslovene|slovenian kielest\"a|slovenian kielest\"a
220+fromspanish|espanjan kielest\"a|espanjan kielest\"a
221+fromswedish|ruotsin kielest\"a|ruotsin kielest\"a
222+countryde|Saksa|DE
223+countryeu|Euroopan Unioni|EU
224+countryep|Euroopan Unioni|EP
225+countryfr|Ranska|FR
226+countryuk|Iso-Britannia|GB
227+countryus|Yhdysvallat|US
228+patent|patentti|pat\adddot
229+patentde|saksalainen patentti|saksalainen pat\adddot
230+patenteu|Euroopan Unionin patentti|Euroopan Unionin pat\adddot
231+patentfr|ranskalainen patentti|ranskalainen pat\adddot
232+patentuk|isobritannialainen patentti|isobritannialainen pat\adddot
233+patentus|yhdysvaltalainen patentti|yhdysvaltalainen pat\adddot
234+patreq|patenttihakemus|pat\adddot\ hak\adddot
235+patreqde|saksalainen patenttihakemus|saksalainen pat\adddot\ hak\adddot
236+patreqeu|Euroopan Unionin patenttihakemus|Euroopan Unionin pat\adddot\ hak\adddot
237+patreqfr|ranskalainen patenttihakemus|ranskalainen pat\adddot\ hak\adddot
238+patrequk|isobritannialainen patenttihakemus|isobritannialainen pat\adddot\ hak\adddot
239+patrequs|yhdysvaltalainen patenttihakemus|yhdysvaltalainen pat\adddot\ hak\adddot
240+file|tiedosto|tiedosto
241+library|kirjasto|kirjasto
242+abstract|tiivistelm\"a|tiivistelm\"a
243+annotation|selitykset|selitykset
244+commonera|j\"alkeen ajanlaskun alun|jaa\adddot
245+beforecommonera|ennen ajanlaskun alkua|eaa\adddot
246+annodomini|j\"alkeen Kristuksen syntym\"an|jKr\adddot
247+beforechrist|ennen Kristuksen syntym\"a\"a|eKr\adddot
248+circa|noin|n\adddot
249+spring|kev\"at|kev\"at
250+summer|kes\"a|kes\"a
251+autumn|syksy|syksy
252+winter|talvi|talvi
253+am|ap\adddot|ip\adddot
254+pm|ip\adddot|ip\adddot
citeproc/biblatex-localization/french.lbx.stringsnew file+245
@@ -0,0 +1,245 @@
1+bibliography|Bibliographie|Bibliographie
2+references|R\'ef\'erences|R\'ef\'erences
3+shorthands|Liste des abr\'eviations|Abr\'eviations
4+editor|\'editeur|\'ed\adddot
5+editors|\'editeurs|\'ed\adddot
6+compiler|compilateur|comp\adddot
7+compilers|compilateurs|comp\adddot
8+redactor|r\'edacteur|r\'ed\adddot
9+redactors|r\'edacteurs|r\'ed\adddot
10+reviser|r\'eviseur|r\'ev\adddot
11+revisers|r\'eviseurs|r\'ev\adddot
12+founder|fondateur|fond\adddot
13+founders|fondateurs|fond\adddot
14+continuator|continuateur|cont\adddot
15+continuators|continuateurs|cont\adddot
16+collaborator|collaborateur|coll\adddot
17+collaborators|collaborateurs|coll\adddot
18+translator|traducteur|trad\adddot
19+translators|traducteurs|trad\adddot
20+commentator|commentateur|comm\adddot
21+commentators|commentateurs|comm\adddot
22+annotator|annotateur|annot\adddot
23+annotators|annotateurs|annot\adddot
24+commentary|commentaires|comment\adddot
25+annotations|annotations|annot\adddot
26+introduction|introduction|introd\adddot
27+foreword|pr\'eface|pr\'ef\adddot
28+afterword|postface|postf\adddot
29+editortr|\'editeur et traducteur|\'ed\adddotspace et trad\adddot
30+editorstr|\'editeurs et traducteurs|\'ed\adddotspace et trad\adddot
31+organizer|organisateur|org\adddot
32+organizers|organisateurs|org\adddot
33+byorganizer|organis\'e par|org\adddotspace par
34+byauthor|par|par
35+byeditor|sous la direction \smartof|sous la dir\adddotspace\smartof
36+bycompiler|compil\'e par|comp\adddotspace par
37+byredactor|r\'edig\'e par|r\'ed\adddotspace par
38+byreviser|r\'evis\'e par|r\'ev\adddotspace par
39+byreviewer|examin\'e par|ex\adddotspace par
40+byfounder|d\'ecouvert par|d\'ecouv\adddotspace par
41+bycontinuator|continu\'e par|cont\adddotspace par
42+bytranslator|traduit \lbx@lfromlang\ par|trad\adddotspace \lbx@sfromlang\ par
43+bycommentator|comment\'e par|comm\adddotspace par
44+byannotator|annot\'e par|annot\adddotspace par
45+withcommentator|avec des commentaires \smartof|avec des comment\adddotspace\smartof
46+withannotator|avec des annotations \smartof|avec des annot\adddotspace\smartof
47+withintroduction|avec une introduction \smartof|avec une introd\adddotspace\smartof
48+withforeword|avec une pr\'eface \smartof|avec une pr\'ef\adddotspace\smartof
49+withafterword|avec une postface \smartof|avec une postf\adddotspace\smartof
50+and|et|et
51+andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
52+andmore|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
53+volume|tome|t\adddot
54+volumes|tomes|t\adddot
55+involumes|en|en
56+jourvol|tome|t\adddot
57+jourser|s\'erie|s\'er\adddot
58+book|livre|livre
59+part|partie|partie
60+issue|\'edition|\'ed\adddot
61+newseries|nouvelle s\'erie|nouv\adddotspace s\'er\adddot
62+oldseries|ancienne s\'erie|anc\adddotspace s\'er\adddot
63+edition|\'edition|\'ed\adddot
64+reprint|r\'eimpression|r\'eimpr\adddot
65+reprintof|r\'eimpression de|r\'eimpr\adddotspace de
66+reprintas|r\'eimpression sous le titre|r\'eimpr\adddotspace sous le titre
67+reprintfrom|r\'eimpression \`a partir \smartof|r\'eimpr\adddotspace \`a part\adddotspace\smartof
68+translationof|traduction de|trad\adddotspace de
69+translationas|traduit sous le titre|trad\adddotspace sous le titre
70+translationfrom|traduit de|trad\adddotspace de
71+reviewof|critique de|crit.\adddotspace de
72+origpubas|publi\'e \`a l'origine sous le titre|pub\adddotspace \`a l'orig\adddotspace sous le titre
73+origpubin|publi\'e \`a l'origine en|pub\adddotspace \`a l'orig\adddotspace en
74+astitle|sous le titre|sous le titre
75+bypublisher|par|par
76+page|page|p\adddot
77+pages|pages|p\adddot
78+column|colonne|col\adddot
79+columns|colonnes|col\adddot
80+line|ligne|l\adddot
81+lines|lignes|l\adddot
82+verse|vers|v\adddot
83+verses|vers|v\adddot
84+section|section|sect\adddot
85+sections|sections|sect\adddot
86+paragraph|paragraphe|\S
87+paragraphs|paragraphes|\S
88+pagetotal|page|p\adddot
89+pagetotals|pages|p\adddot
90+columntotal|colonne|col\adddot
91+columntotals|colonnes|col\adddot
92+linetotal|ligne|l\adddot
93+linetotals|lignes|l\adddot
94+versetotal|vers|v\adddot
95+versetotals|vers|v\adddot
96+sectiontotal|section|sect\adddot
97+sectiontotals|sections|sect\adddot
98+paragraphtotal|paragraphe|\S
99+paragraphtotals|paragraphes|\S
100+in|in|in
101+inseries|in|in
102+ofseries|de|de
103+number|num\'ero|n\textsuperscript{o
104+chapter|chapitre|chap\adddot
105+bathesis|m\'emoire de bachelor|m\'em\adddotspace de bach\adddot
106+mathesis|m\'emoire de master|m\'em\adddotspace de mast\adddot
107+phdthesis|th\`ese de doctorat|th\`ese de doct\adddot
108+candthesis|th\`ese de candidature|th\`ese de cand\adddot
109+resreport|rapport scientifique|rapp\adddotspace scient\adddot
110+techreport|rapport technique|rapp\adddotspace tech\adddot
111+software|logiciel|logiciel
112+datacd|c\'ed\'erom|c\'ed\'erom
113+audiocd|disque compact audio|CD
114+version|version|version
115+url|adresse|adresse
116+urlfrom|disponible \`a l'adresse|disp\adddotspace \`a l'adr\adddot
117+urlseen|visit\'e le|visit\'e le
118+inpreparation|en pr\'eparation|en pr\'ep\adddot
119+submitted|soumis|soumis
120+inpress|sous presse|sous presse
121+prepublished|pr\'epubli\'e|pr\'epubl\adddot
122+citedas|d\'esign\'e ci-apr\`es par|ci-apr\`es
123+thiscite|sp\'ecialement|sp\'ec\adddot
124+seenote|voir note|cf\adddotspace note
125+quotedin|cit\'e dans|cit\'e dans
126+idem|idem|idem
127+idemsm|idem|idem
128+idemsf|eadem|eadem
129+idemsn|idem|idem
130+idempm|eidem|eidem
131+idempf|eaedem|eaedem
132+idempn|eadem|eadem
133+idempp|eidem|eidem
134+ibidem|ibidem|ibid\adddot
135+opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot
136+loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot
137+confer|cf\adddot|cf\adddot
138+sequens|sq\adddot|sq\adddot
139+sequentes|sqq\adddot|sqq\adddot
140+passim|passim|pass\adddot
141+see|cf\adddot|cf\adddot
142+seealso|cf\adddotspace aussi|cf\adddotspace aussi
143+backrefpage|cf\adddotspace page|cf\adddotspace p\adddot
144+backrefpages|cf\adddotspace pages|cf\adddotspace p\adddot
145+january|janvier|jan\adddot
146+february|f\'evrier|f\'ev\adddot
147+march|mars|mars
148+april|avril|avr\adddot
149+may|mai|mai
150+june|juin|juin
151+july|juillet|juill\adddot
152+august|ao\^ut|ao\^ut
153+september|septembre|sept\adddot
154+october|octobre|oct\adddot
155+november|novembre|nov\adddot
156+december|d\'ecembre|d\'ec\adddot
157+langamerican|am\'ericain|am\'ericain
158+langbrazilian|br\'esilien|br\'esilien
159+langbulgarian|bulgare|bulgare
160+langcatalan|catalan|catalan
161+langcroatian|croate|croate
162+langczech|tch\`eque|tch\`eque
163+langdanish|danois|danois
164+langdutch|n\'eerlandais|n\'eerlandais
165+langenglish|anglais|anglais
166+langestonian|estonien|estonien
167+langfinnish|finnois|finnois
168+langgalician|galicien|galicien
169+langgerman|allemand|allemand
170+langgreek|grec|grec
171+langhungarian|hongrois|hongrois
172+langitalian|italien|italien
173+langjapanese|japonais|japonais
174+langlatin|latin|latin
175+langlatvian|letton|letton
176+langnorwegian|norv\'egien|norv\'egien
177+langpolish|polonais|polonais
178+langportuguese|portugais|portugais
179+langrussian|russe|russe
180+langserbian|serbe|serbe
181+langslovak|slovaque|slovaque
182+langslovene|slov\`ene|slov\`ene
183+langspanish|espagnol|espagnol
184+langswedish|su\'edois|su\'edois
185+langukrainian|ukrainien|ukrainien
186+fromamerican|de l'am\'ericain|de l'am\'ericain
187+frombrazilian|du br\'esilien|du br\'esilien
188+frombulgarian|du bulgare|du bulgare
189+fromcatalan|du catalan|du catalan
190+fromcroatian|du croate|du croate
191+fromczech|du tch\`eque|du tch\`eque
192+fromdanish|du danois|du danois
193+fromdutch|du n\'eerlandais|du n\'eerlandais
194+fromenglish|de l'anglais|de l'anglais
195+fromestonian|de l'estonien|de l'estonien
196+fromfinnish|du finnois|du finnois
197+fromgalician|du galicien|du galicien
198+fromgerman|de l'allemand|de l'allemand
199+fromgreek|du grec|du grec
200+fromhungarian|du hongrois|du hongrois
201+fromitalian|de l'italien|de l'italien
202+fromjapanese|du japonais|du japonais
203+fromlatin|du latin|du latin
204+fromlatvian|du letton|du letton
205+fromnorwegian|du norv\'egien|du norv\'egien
206+frompolish|du polonais|du polonais
207+fromportuguese|du portugais|du portugais
208+fromrussian|du russe|du russe
209+fromserbian|du serbe|du serbe
210+fromslovak|du slovaque|du slovaque
211+fromslovene|du slov\`ene|du slov\`ene
212+fromspanish|de l'espagnol|de l'espagnol
213+fromswedish|du su\'edois|du su\'edois
214+fromukrainian|de l'ukrainien|de l'ukrainien
215+countryde|Allemagne|DE
216+countryeu|Union europ\'eenne|EU
217+countryep|Union europ\'eenne|EP
218+countryfr|France|FR
219+countryuk|Royaume-Uni|GB
220+countryus|\'Etats-Unis|US
221+patent|brevet|brev\adddot
222+patentde|brevet allemand|brev\adddotspace allem\adddot
223+patenteu|brevet europ\'een|brev\adddotspace europ\adddot
224+patentuk|brevet britannique|brev\adddotspace brit\adddot
225+patentus|brevet am\'ericain|brev\adddotspace am\'er\adddot
226+patreq|demande de brevet|demande de brev\adddot
227+patreqde|demande de brevet allemand|demande de brev\adddotspace allem\adddot
228+patreqeu|demande de brevet europ\'een|demande de brev\adddotspace europ\adddot
229+patrequk|demande de brevet britannique|demande de brev\adddotspace brit\adddot
230+patrequs|demande de brevet am\'ericain|demande de brev\adddotspace am\'er\adddot
231+file|fichier|fichier
232+library|biblioth\`eque|biblioth\adddot
233+abstract|r\'esum\'e|r\'es\adddot
234+annotation|annotations|annotations
235+commonera|de l'\`ere commune|EC
236+beforecommonera|avant l'\`ere commune|AEC
237+annodomini|apr\`es J\'esus-Christ|apr\adddotspace J\adddot-C\adddot
238+beforechrist|avant J\'esus-Christ|av\adddotspace J\adddot-C\adddot
239+circa|vers|vers
240+spring|printemps|printemps
241+summer|\'et\'e|\'et\'e
242+autumn|automne|automne
243+winter|hiver|hiver
244+am|AM|AM
245+pm|PM|PM
citeproc/biblatex-localization/galician.lbx.stringsnew file+28
@@ -0,0 +1,28 @@
1+bibliography|Bibliograf\'ia|Bibliograf\'ia
2+references|Referencias|Referencias
3+shorthands|Lista de abreviaturas|Abreviaturas
4+editor|editor|ed\adddot
5+editors|editores|eds\adddot
6+compiler|compilador|comp\adddot
7+compilers|compiladores|comp\adddot
8+redactor|redactor|red\adddot
9+redactors|redactores|red\adddot
10+reviser|revisor|rev\adddot
11+revisers|revisores|revs\adddot
12+founder|fundador|fund\adddot
13+founders|fundadores|fund\adddot
14+continuator|continuador|cont\adddot
15+continuators|continuadores|cont\adddot
16+collaborator|colaborador|col\adddot
17+collaborators|colaboradores|cols\adddot
18+translator|tradutor|trad\adddot
19+translators|tradutores|trads\adddot
20+commentator|comentador|coment\adddot
21+commentators|comentadores|coments\adddot
22+annotator|anotador|anot\adddot
23+annotators|anotadores|anots\adddot
24+commentary|comentario|coment\adddot
25+annotations|notas|notas
26+introduction|introduci\'on|introd\adddot
27+foreword|prefacio|pref\adddot
28+afterword|posfacio|posf\adddot
citeproc/biblatex-localization/german.lbx.stringsnew file+28
@@ -0,0 +1,28 @@
1+bibliography|Literaturverzeichnis|Literatur
2+references|Literaturverzeichnis|Literatur
3+shorthands|Sigelverzeichnis|Sigel
4+editor|Herausgeber|Hrsg\adddot
5+editors|Herausgeber|Hrsg\adddot
6+compiler|Kompilator|Komp\adddot
7+compilers|Kompilatoren|Komp\adddot
8+redactor|Bearbeiter|Bearb\adddot
9+redactors|Bearbeiter|Bearb\adddot
10+reviser|\"Uberarbeiter|\"Uberarb\adddot
11+revisers|\"Uberarbeiter|\"Uberarb\adddot
12+founder|Begr\"under|Begr\adddot
13+founders|Begr\"under|Begr\adddot
14+continuator|Fortf\"uhrer|Fortf\adddot
15+continuators|Fortf\"uhrer|Fortf\adddot
16+collaborator|Mitarbeiter|Mitarb\adddot
17+collaborators|Mitarbeiter|Mitarb\adddot
18+translator|\"Ubersetzer|\"Ubers\adddot
19+translators|\"Ubersetzer|\"Ubers\adddot
20+commentator|Kommentator|Komm\adddot
21+commentators|Kommentatoren|Komm\adddot
22+annotator|Kommentator|Komm\adddot
23+annotators|Kommentatoren|Komm\adddot
24+commentary|Kommentar|Komm\adddot
25+annotations|Erl\"auterungen|Erl\"aut\adddot
26+introduction|Einleitung|Einl\adddot
27+foreword|Vorwort|Vorw\adddot
28+afterword|Nachwort|Nachw\adddot
citeproc/biblatex-localization/greek.lbx.stringsnew file+9
@@ -0,0 +1,9 @@
1+bibliography|Βιβλιογραφία|Βιβλιογραφία
2+references|Αναφορές|Αναφορές
3+shorthands|Κατάλογος συντμήσεων|Συντμήσεις
4+editor|επιμελητής|επιμελητής
5+editors|επιμελητές|επιμελητές
6+compiler|συντάκτης|συντάκτης
7+compilers|συντάκτες|συντάκτες
8+redactor|συντάκτης|συντάκτης
9+redactors|συντάκτες|συντάκτες
citeproc/biblatex-localization/hungarian.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/icelandic.lbx.stringsnew file+7
@@ -0,0 +1,7 @@
1+bibliography|Heimildaskr\'a|Heimildaskr\'a
2+references|Heimildir|Heimildir
3+shorthands|Listi yfir skammstafanir|Skammstafanir
4+editor|ristj\'ori|ritstj\adddot
5+editors|ritstj\'orar|ritstj\adddot
6+compiler|samantekt|samantekt
7+compilers|samantekt|samantekt
citeproc/biblatex-localization/italian.lbx.stringsnew file+9
@@ -0,0 +1,9 @@
1+bibliography|Bibliografia|Bibliografia
2+references|Riferimenti bibliografici|Riferimenti bibliografici
3+shorthands|Elenco delle sigle|Sigle
4+editor|curatore|cur\adddot
5+editors|curatori|cur\adddot
6+compiler|compilatore|comp\adddot
7+compilers|compilatori|comp\adddot
8+redactor|redattore|red\adddot
9+redactors|redattori|red\adddot
citeproc/biblatex-localization/latvian.lbx.stringsnew file+75
@@ -0,0 +1,75 @@
1+redactor|redaktors|redakt\adddot
2+redactors|redaktori|radakt\adddot
3+reviser|revidents|revid\adddot
4+revisers|revidenti|revid\adddot
5+introduction|ievads|ievads
6+byeditor|izdevis|izdevis
7+bytranslator|tulkojis|tulk\adddot
8+withintroduction|ar ievadu no|ar ievadu no
9+byeditortr|izdevis un tulkojis|izdev\adddotspace un tulk\adddot
10+and|un|un
11+andothers|un citi|u\adddotspace c\adddot
12+jourvol|izdevums|izdev\adddot
13+issue|izdevums|izdev\adddot
14+edition|izdevums|izdev\adddot
15+translationof|tulkojums no|tulk\adddotspace no
16+translationfrom|tulkots no|tulk\adddotspace no
17+reviewof|recenzija|recenz\adddot
18+bypublisher|no|no
19+nodate|bez datuma|bez dat\adddot
20+page|lappuse|lpp\adddot
21+pages|lappuses|lpp\adddot
22+column|sleja|sleja
23+columns|slejas|slejas
24+line|rinda|rinda
25+lines|rindas|rindas
26+verse|pants|pants
27+verses|panti|panti
28+paragraph|rindkopa|rindk\adddot
29+paragraphs|rindkopas|rindk\adddot
30+pagetotal|lappuse|lpp\adddot
31+pagetotals|lappuses|lpp\adddot
32+columntotal|sleja|sleja
33+columntotals|slejas|slejas
34+linetotal|rinda|rinda
35+linetotals|rindas|rindas
36+versetotal|pants|pants
37+versetotals|panti|panti
38+paragraphtotal|rindkopa|rindk\adddot
39+paragraphtotals|rindkopas|rindk\adddot
40+in||
41+number|numurs|nr\adddot
42+datacd|datu CD|datu CD
43+audiocd|audio CD|audio CD
44+version|versija|versija
45+url|pieejams|pieejams
46+urlfrom|pieejams no|pieejams no
47+inpreparation|tiek gatavots|tiek gatavots
48+submitted|iesniegts|iesniegts
49+march|marts|marts
50+may|maijs|maijs
51+august|augusts|aug\adddot
52+september|septembris|sept\adddot
53+october|oktobris|okt\adddot
54+november|novembris|nov\adddot
55+december|decembris|dec\adddot
56+langfinnish|somu|somu
57+langrussian|krievu|krievu
58+langswedish|zviedru|zviedru
59+fromfinnish|no somu|no somu
60+fromrussian|no krievu|no krievu
61+fromswedish|no zviedru|no zviedru
62+countryep|Eiropas Parlaments|EP
63+countryfr|Francija|FR
64+patent|patents|patents
65+patenteu|Eiropas patents|Eiropas pat\adddot
66+patentus|ASV patents|ASV pat\adddot
67+file|fails|fails
68+circa|ap|ap
69+spring|pavasaris|pav\adddot
70+summer|vasara|vas\adddot
71+autumn|rudens|rud\adddot
72+winter|ziema|ziema
73+am|AM|AM
74+pm|PM|PM
75+dateyear|gada|g\adddot
citeproc/biblatex-localization/lithuanian.lbx.stringsnew file+31
@@ -0,0 +1,31 @@
1+bibliography|Bibliografija|Bibliografija
2+references|Literatūros sąrašas|Literatūra
3+shorthands|Santrumpų sąrašas|Santrumpos
4+editor|sudarytojas|sud\adddot
5+editors|sudarytojai|sud\adddot
6+compiler|parengėjas|pareng\adddot
7+compilers|parengėjai|pareng\adddot
8+redactor|redaktorius|red\adddot
9+redactors|redaktoriai|red\adddot
10+reviser|korektorius|kor\adddot
11+revisers|korektoriai|kor\adddot
12+founder|pradininkas|prad\adddot
13+founders|pradininkai|prad\adddot
14+continuator|tęsėjas|tęs\adddot
15+continuators|tęsėjai|tęs\adddot
16+collaborator|bendradarbis|bendr\adddot
17+collaborators|bendradarbiai|bendr\adddot
18+translator|vertėjas|vert\adddot
19+translators|vertėjai|vert\adddot
20+commentator|komentarų autorius|koment\adddotspace aut\adddot
21+commentators|komentarų autoriai|koment\adddotspace aut\adddot
22+annotator|paaiškinimų autorius|paaišk\adddotspace aut\adddot
23+annotators|paaiškinimų autoriai|paaišk\adddotspace aut\adddot
24+commentary|komentarai|koment\adddot
25+annotations|paaiškinimai|paaišk\adddot
26+introduction|įvadas|įv\adddot
27+foreword|pratarmė|prat\adddot
28+afterword|pabaigos žodis|pab\adddotspace žodis
29+organizer|organizatorius|org\adddot
30+organizers|organizatoriai|org\adddot
31+byorganizer|organizavo|org\adddot
citeproc/biblatex-localization/magyar.lbx.stringsnew file+29
@@ -0,0 +1,29 @@
1+bibliography|Irodalomjegyz\'ek|Irodalom
2+references|Hivatkoz\'asok|Hivatkoz\'asok
3+shorthands|R\"ovid\'it\'esek jegyz\'eke|R\"ovid\'it\'esek
4+compiler|\"ossze\'all\'it\'o|\"ossze\'all\adddot
5+compilers|\"ossze\'all\'it\'ok|\"ossze\'all\adddot
6+reviser|korrektor|korr\adddot
7+revisers|korrektorok|korr\adddot
8+founder|alap\'it\'o|alap\adddot
9+founders|alap\'it\'ok|alap\adddot
10+%continuator||
11+%continuators||
12+translator|ford\'it\'o|ford\adddot
13+translators|ford\'it\'ok|ford\adddot
14+commentator|komment\'ator|komm\adddot
15+commentators|komment\'atorok|komm\adddot
16+annotator|jegyzetek \'ir\'oja|jegyz\adddot
17+annotators|jegyzetek \'ir\'oi|jegyz\adddot
18+commentary|komment\'ar|komm\adddot
19+annotations|jegyzetek|jegyz\adddot
20+introduction|bevezet\'es|bev\adddot
21+afterword|ut\'osz\'o|ut\'osz\'o
22+byorganizer|szervezte|szerv\adddot
23+byauthor|\'irta|\'irta
24+byeditor|szerkesztette|szerk\adddot
25+bycompiler|\"ossze\'all\'itotta|\"ossze\'all\adddot
26+byredactor|sajt\'o al\'a rendezte|kiad\adddot
27+byreviser|jav\'itotta|jav\adddot
28+byreviewer|b\'ir\'alta|b\'ir\adddot
29+byfounder|alap\'itotta|alap\adddot
citeproc/biblatex-localization/naustrian.lbx.stringsnew file+2
@@ -0,0 +1,2 @@
1+citedas|im Folgenden zitiert als|im Folgenden zit\adddotspace als
2+january|J\"anner|J\"an\adddot
citeproc/biblatex-localization/newzealand.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/ngerman.lbx.stringsnew file+1
@@ -0,0 +1 @@
1+citedas|im Folgenden zitiert als|im Folgenden zit\adddotspace als
citeproc/biblatex-localization/norsk.lbx.stringsnew file+98
@@ -0,0 +1,98 @@
1+bibliography|Bibliografi|Bibliografi
2+references|Referanser|Referanser
3+shorthands|Forkortelser|Forkortelser
4+compiler|kompilator|komp\adddot
5+compilers|kompilatorer|komp\adddot
6+redactor|bearbeidelse|bearb\adddot
7+redactors|bearbeidelse|bearb\adddot
8+reviser|revisjon|rev\adddot
9+revisers|revisjon|rev\adddot
10+founder|grunnlegger|grunnl\adddot
11+founders|grunnleggere|grunnl\adddot
12+collaborator|samarbeid|samarb\adddot
13+collaborators|samarbeid|samarb\adddot
14+translator|oversetter|overs\adddot
15+translators|oversettere|overs\adddot
16+commentator|kommentarer|komm\adddot
17+commentators|kommentarer|komm\adddot
18+annotator|forklaringer|forkl\adddot
19+annotators|forklaringer|forkl\adddot
20+commentary|kommentarer|komm\adddot
21+annotations|forklaringer|forkl\adddot
22+introduction|innledning|innl\adddot
23+foreword|forord|forord
24+afterword|etterord|etterord
25+organizer|organisator|org\adddot
26+organizers|organisatorer|org\adddot
27+byorganizer|organisert av|org\adddotspace av
28+byauthor|av|av
29+byeditor|redigert av|red\adddotspace av
30+bycompiler|kompilert av|komp\adddotspace av
31+byredactor|bearbeidet av|bearb\adddotspace av
32+byreviser|revidert av|rev\adddotspace av
33+byreviewer|kritikk ved|krit\adddotspace ved
34+byfounder|grunnlagt av|grunnl\adddotspace av
35+bycollaborator|i samarbeid med|i samarb\adddotspace med
36+bytranslator|oversatt \lbx@lfromlang\ av|overs\adddot\ \lbx@sfromlang\ av
37+bycommentator|kommentert av|komm\adddot\ av
38+byannotator|forklart av|forkl\adddot\ av
39+withcommentator|med kommentarer av|med komm\adddot\ av
40+withannotator|med forklaringer av|med forkl\adddot\ av
41+withintroduction|med innledning av|med innl\adddot\ av
42+withforeword|med forord av|med forord av
43+withafterword|med etterord av|med etterord av
44+and|og|og
45+andothers|med flere|mfl\adddot
46+andmore|med mer|m.m\adddot
47+volume|bind|bd\adddot
48+volumes|bind|bd\adddot
49+involumes|i|i
50+jourser|serie|ser\adddot
51+book|bok|bok
52+part|del|del
53+issue|nummer|nr\adddot
54+newseries|ny serie|ny ser\adddot
55+oldseries|gammel serie|gl\adddotspace ser\adddot
56+edition|utgave|utg\adddot
57+reprint|opptrykk|opptr\adddot
58+reprintof|opptrykk av|opptr\adddotspace av
59+reprintas|trykt om som|tr\adddotspace om som
60+reprintfrom|opptrykk fra|opptr\adddotspace fra
61+translationof|oversettelse av|overs\adddotspace av
62+translationas|oversatt som|overs\adddotspace som
63+translationfrom|oversatt fra|overs\adddotspace fra
64+reviewof|kritikk av|krit\adddotspace av
65+origpubas|opprinnelig utgitt som|oppr\adddot\ utg\adddot\ som
66+origpubin|opprinnelig utgitt i|oppr\adddot\ utg\adddot\ i
67+astitle|som|som
68+bypublisher|av|av
69+nodate|udatert|udatert
70+page|side|s\adddot
71+pages|sider|s\adddot
72+column|spalte|sp\adddot
73+columns|spalter|sp\adddot
74+line|linje|l\adddot
75+lines|linjer|l\adddot
76+verse|vers|v\adddot
77+verses|vers|v\adddot
78+section|avsnitt|avsn\adddot
79+sections|avsnitt|avsn\adddot
80+paragraph|avsnitt|avsn\adddot
81+paragraphs|avsnitt|avsn\adddot
82+pagetotal|side|s\adddot
83+pagetotals|sider|s\adddot
84+columntotal|spalte|sp\adddot
85+columntotals|spalter|sp\adddot
86+linetotal|linje|l\adddot
87+linetotals|linjer|l\adddot
88+versetotal|vers|v\adddot
89+versetotals|vers|v\adddot
90+sectiontotal|avsnitt|avsn\adddot
91+sectiontotals|avsnitt|avsn\adddot
92+paragraphtotal|avsnitt|avsn\adddot
93+paragraphtotals|avsnitt|avsn\adddot
94+in|i|i
95+inseries|i|i
96+ofseries|av|av
97+number|nummer|nr\adddot
98+chapter|kapittel|kap\adddot
citeproc/biblatex-localization/nswissgerman.lbx.stringsnew file+2
@@ -0,0 +1,2 @@
1+citedas|im Folgenden zitiert als|im Folgenden zit\adddotspace als
2+countryuk|Grossbritannien|GB
citeproc/biblatex-localization/nynorsk.lbx.stringsnew file+28
@@ -0,0 +1,28 @@
1+references|Referansar|Referansar
2+shorthands|Forkortingar|Forkortingar
3+compilers|kompilatorar|komp\adddot
4+redactor|omarbeiding|omarb\adddot
5+redactors|omarbeiding|omarb\adddot
6+founder|grunnleggjar|grunnl\adddot
7+founders|grunnleggjarar|grunnl\adddot
8+translator|omsetjar|oms\adddot
9+translators|omsetjarar|oms\adddot
10+commentator|kommentarar|komm\adddot
11+commentators|kommentarar|komm\adddot
12+annotator|forklaringar|forkl\adddot
13+annotators|forklaringar|forkl\adddot
14+commentary|kommentarar|komm\adddot
15+annotations|forklaringar|forkl\adddot
16+introduction|innleiing|innl\adddot
17+organizers|organisatorar|org\adddot
18+byredactor|omarbeidd av|omarb\adddotspace av
19+withcommentator|med kommentarar av|med komm\adddot\ av
20+withannotator|med forklaringar av|med forkl\adddot\ av
21+withintroduction|med innleiing av|med innl\adddot\ av
22+andothers|med fleire|mfl\adddot
23+andmore|med meir|m.m\adddot
24+oldseries|gamal serie|gl\adddotspace ser\adddot
25+translationof|omsetjing av|oms\adddotspace av
26+translationas|omsett som|oms\adddotspace som
27+origpubas|opphavleg utgitt som|opph\adddot\ utg\adddot\ som
28+origpubin|opphavleg utgitt i|opph\adddot\ utg\adddot\ i
citeproc/biblatex-localization/polish.lbx.stringsnew file+100
@@ -0,0 +1,100 @@
1+bibliography|Bibliografia|Bibliografia
2+references|Bibliografia|Bibliografia
3+editor|redaktor|red\adddot
4+editors|redaktorzy|red\adddot
5+compiler|redaktor|red\adddot
6+compilers|redaktorzy|red\adddot
7+redactor|redaktor|red\adddot
8+redactors|redaktorzy|red\adddot
9+reviser|korektor|kor\adddot
10+revisers|korektorzy|kor\adddot
11+collaborator|uczestnik|ucz\adddot
12+collaborators|uczestnicy|ucz\adddot
13+translator|t\l umacz|t\l um\adddot
14+translators|t\l umacze|t\l um\adddot
15+commentator|komentator|kom\adddot
16+commentators|komentatorzy|kom\adddot
17+annotator|uwaga|uw\adddot
18+annotators|uwagi|uw\adddot
19+commentary|komentarz|kom\adddot
20+annotations|komentarze|kom\adddot
21+foreword|przedmowa|przedm\adddot
22+afterword|pos\l owie|pos\l \adddot
23+editortr|redaktor i t\l umacz|red\adddotspace i per\adddot
24+editorstr|redaktorzy i t\l umacze|red\adddotspace i per\adddot
25+editorco|redaktor i komentator|red\adddotspace i kom\adddot
26+translatorco|t\l umacz i komentator|t\l um\adddotspace i kom\adddot
27+translatorsco|t\l umacze i komentatorzy|t\l um\adddotspace i kom\adddot
28+organizer|organizator|org\adddot
29+organizers|organizatorzy|org\adddot
30+byorganizer|organizowane|org\adddot
31+byauthor|autorstwo|aut\adddot
32+byeditor|redagowa\l|red\adddot
33+byredactor|zredagowano|zred\adddot
34+byreviser|poprawione|popr\adddot
35+byreviewer|recenzja|rec\adddot
36+bytranslator|t\l umaczenie \lbx@lfromlang|t\l um\adddotspace \lbx@sfromlang
37+bycommentator|skomentowane przez|skom\adddot
38+byannotator|uwagi od|uw\adddot
39+withcommentator|komentarze|kom\adddot
40+withannotator|uwagi|uw\adddot
41+withforeword|przedmowa|przedm\adddot
42+withafterword|pos\l owie|pos\l \adddot
43+byeditoran|zredagowany i z uwagami|zredag\adddotspace i z uw\adddot
44+byeditoraf|zredagowany, z pos\l owiem|zred., z pos\l \adddot
45+byeditorcofo|zredagowany, komentarze i przedmowa|zred., kom\adddotspace i przedm\adddot
46+byeditorcoaf|zredagowany, komentarze i pos\l owie|zred., kom\adddotspace i pos\l \adddot
47+byeditoranfo|zredagowany, uwagi i przedmowa|zred., uw\adddotspace i przedm\adddot
48+byeditoranaf|zredagowany, uwagi i pos\l owie|zred., uw\adddotspace i pos\l \adddot
49+and|i|i
50+andothers|i inni|i in\adddot
51+andmore|i inni|i in\adddot
52+volume|tom|t\adddot
53+volumes|tomy|t\adddot
54+involumes|w|w
55+jourvol|tom|t\adddot
56+jourser|seria|ser\adddot
57+issue|wydanie|wyd\adddot
58+newseries|nowa seria|now\adddotspace ser\adddot
59+oldseries|stara seria|star\adddotspace ser\adddot
60+edition|wydruk|wyd\adddot
61+reprint|przedruk|przedr\adddot
62+reprintof|przedruk|przedr\adddot
63+reprintas|przedrukowano jako|przedr\adddotspace jako
64+reprintfrom|przedrukowano z|przedr\adddotspace z
65+translationof|t\l umaczenie|t\l um\adddot
66+translationas|t\l umaczenie jako|t\l um\adddotspace jako
67+translationfrom|t\l umaczenie z|t\l um\adddotspace z
68+reviewof|recenzja na\addcolon|rec\adddotspace na\addcolon
69+origpubin|pierwodruk wydano w|pierw\adddotspace wyd\adddotspace w
70+astitle|pod tytu\l em|pod tyt\adddot
71+page|strona|s\adddot
72+pages|strony|s\adddot
73+column|kolumna|kol\adddot
74+columns|kolumny|kol\adddot
75+line|linijka|l\adddot
76+lines|linijki|l\adddot
77+nodate|bez daty|b\adddot d\adddot
78+verse|werset|wer\adddot
79+verses|wersety|wer\adddot
80+section|paragraf|par\adddot
81+sections|paragrafy|par\adddot
82+paragraph|akapit|akap\adddot
83+paragraphs|akapity|akap\adddot
84+pagetotal|strona|s\adddot
85+pagetotals|strony|s\adddot
86+columntotal|kolumna|kol\adddot
87+columntotals|kolumny|kol\adddot
88+linetotal|wers|wer\adddot
89+linetotals|wersy|wer\adddot
90+versetotal|wiersz|wier\adddot
91+versetotals|wiersze|wier\adddot
92+sectiontotal|paragraf|par\adddot
93+sectiontotals|paragrafy|par\adddot
94+paragraphtotal|akapit|akap\adddot
95+paragraphtotals|akapit|akap\adddot
96+in|w|w
97+inseries|w|w
98+ofseries|z|z
99+number|numer|nr\adddot
100+chapter|rozdzia\l |rozd\adddot
citeproc/biblatex-localization/portuges.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/portuguese.lbx.stringsnew file+95
@@ -0,0 +1,95 @@
1+bibliography|Bibliografia|Bibliografia
2+references|Refer\^encias|Refer\^encias
3+shorthands|Lista de Abreviaturas|Abreviaturas
4+editor|editor|ed\adddot
5+editors|editores|eds\adddot
6+compiler|compilador|comp\adddot
7+compilers|compiladores|comp\adddot
8+redactor|redator|red\adddot
9+redactors|redatores|red\adddot
10+reviser|revisor|rev\adddot
11+revisers|revisores|rev\adddot
12+founder|fundador|fund\adddot
13+founders|fundadores|fund\adddot
14+continuator|continuador|cont\adddot
15+continuators|continuadores|cont\adddot
16+collaborator|colaborador|col\adddot
17+collaborators|colaboradores|col\adddot
18+translator|tradutor|trad\adddot
19+translators|tradutores|trad\adddot
20+commentator|comentador|coment\adddot
21+commentators|comentadores|coment\adddot
22+annotator|anotador|anot\adddot
23+annotators|anotadores|anot\adddot
24+commentary|coment\'ario|coment\adddot
25+annotations|notas|notas
26+foreword|pref\'acio|pref\adddot
27+afterword|posf\'acio|posf\adddot
28+organizer|organizador|org\adddot
29+organizers|organizadores|orgs\adddot
30+byorganizer|organizado por|org\adddotspace por
31+byauthor|por|por
32+byeditor|editado por|ed\adddotspace por
33+bycompiler|compilado por|comp\adddotspace por
34+byredactor|redigido por|red\adddotspace por
35+byreviser|revisto por|rev\adddotspace por
36+byreviewer|resenhado por|res\adddotspace por
37+byfounder|fundado por|fund\adddotspace por
38+bycontinuator|continuado por|cont\adddotspace por
39+bytranslator|traduzido \lbx@lfromlang\ por|trad\adddot\ \lbx@sfromlang\ por
40+bycommentator|comentado por|coment\adddot\ por
41+byannotator|notas de|notas de
42+withcommentator|com coment\'arios de|com coment\adddot\ de
43+withannotator|com notas de|com notas de
44+withforeword|com pref\'acio de|com pref\adddot\ de
45+withafterword|com posf\'acio de|com posf\adddot\ de
46+and|e|e
47+andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
48+andmore|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
49+volume|volume|vol\adddot
50+volumes|volumes|vols\adddot
51+involumes|em|em
52+jourvol|volume|vol\adddot
53+jourser|s\'erie|s\'er\adddot
54+book|livro|livro
55+part|parte|parte
56+issue|n\'umero|n\'umero
57+newseries|nova s\'erie|nova s\'er\adddot
58+oldseries|s\'erie antiga|s\'er\adddot\ antiga
59+reprint|reimpress\~ao|reimpr\adddot
60+reprintof|reimpress\~ao de|reimpr\adddotspace de
61+reprintas|reimpresso como|reimpr\adddotspace como
62+reprintfrom|reimpresso|reimpr\adddot
63+translationas|traduzido como|trad\adddotspace como
64+translationfrom|traduzido do|trad\adddotspace do
65+reviewof|resenha de|res\adddotspace de
66+origpubas|originalmente publicado como|orig\adddotspace pub\adddotspace como
67+origpubin|originalmente publicado em|orig\adddotspace pub\adddotspace em
68+astitle|como|como
69+bypublisher|por|por
70+nodate|sem data|s\adddot d\adddot
71+page|p\'agina|p\adddot
72+pages|p\'aginas|pp\adddot
73+column|coluna|col\adddot
74+columns|colunas|cols\adddot
75+line|linha|l\adddot
76+lines|linhas|ll\adddot
77+verse|verso|v\adddot
78+verses|versos|vv\adddot
79+paragraph|par\'agrafo|par\adddot
80+paragraphs|par\'agrafo|par\adddot
81+pagetotal|p\'agina|p\adddot
82+pagetotals|p\'aginas|pp\adddot
83+columntotal|coluna|col\adddot
84+columntotals|colunas|cols\adddot
85+linetotal|linha|l\adddot
86+linetotals|linhas|ll\adddot
87+versetotal|verso|v\adddot
88+versetotals|versos|vv\adddot
89+paragraphtotal|par\'agrafo|par\adddot
90+paragraphtotals|par\'agrafo|par\adddot
91+in|em|em
92+inseries|em|em
93+ofseries|de|de
94+number|n\'umero|n\adddot\textordmasculine
95+chapter|cap\'\i tulo|cap\adddot
citeproc/biblatex-localization/russian.lbx.stringsnew file+102
@@ -0,0 +1,102 @@
1+bibliography|Список литературы|Список литературы
2+references|Список литературы|Список литературы
3+shorthands|Список сокращений|Сокращения
4+editor|редактор|ред\adddot
5+editors|редакторы|ред\adddot
6+compiler|составитель|сост\adddot
7+compilers|составители|сост\adddot
8+redactor|редактор|ред\adddot
9+redactors|редакторы|ред\adddot
10+reviser|ревизионный корректор|ревиз\adddotspace кор\adddot
11+revisers|ревизионные корректоры|ревиз\adddotspace кор\adddot
12+founder|основатель|осн\adddot
13+founders|основатели|осн\adddot
14+continuator|продолжатель|прод\adddot
15+continuators|продолжатели|прод\adddot
16+collaborator|участник|участ\adddot
17+collaborators|участники|участ\adddot
18+translator|переводчик|пер\adddot
19+translators|переводчики|пер\adddot
20+commentator|комментатор|коммент\adddot
21+commentators|комментаторы|коммент\adddot
22+annotator|примечания|примеч\adddot
23+annotators|примечания|примеч\adddot
24+commentary|комментарий|коммент\adddot
25+annotations|примечания|примеч\adddot
26+introduction|вступительная статья|вступ\adddotspace ст\adddot
27+foreword|предисловие|предисл\adddot
28+afterword|послесловие|послесл\adddot
29+organizer|организатор|орг\adddot
30+organizers|организаторы|орг\adddot
31+byorganizer|организатор|орг\adddot
32+byauthor||
33+byeditor|под редакцией|под\addabbrvspace ред\adddot
34+bycompiler|составитель|сост\adddot
35+byredactor|под редакцией|под\addabbrvspace ред\adddot
36+byreviser|исправлено|испр\adddot
37+byreviewer|рецензия|рец\adddot
38+byfounder|учредитель|учр\adddot
39+bycontinuator|продолжение|продолж\adddot
40+bycollaborator|при участии|при\addabbrvspace уч\adddot
41+bytranslator|перевод \lbx@lfromlang|пер\adddot\ \lbx@sfromlang
42+bycommentator|комментарии|коммент\adddot
43+byannotator|примечания|примеч\adddot
44+withcommentator|комментарии|коммент\adddot
45+withannotator|примечания|примеч\adddot
46+withintroduction|вступительная статья|вступ\adddotspace ст\adddot
47+withforeword|предисловие|предисл\adddot
48+withafterword|послесловие|послесл\adddot
49+and|и|и
50+andothers|и\addabbrvspace др\adddot|и\addabbrvspace др\adddot
51+andmore|и\addabbrvspace др\adddot|и\addabbrvspace др\adddot
52+volume|том|т\adddot
53+volumes|томах|т\adddot
54+involumes|в|в
55+jourvol|том|т\adddot
56+jourser|серия|сер\adddot
57+book|книга|кн\adddot
58+part|часть|ч\adddot
59+issue|выпуск|вып\adddot
60+newseries|новая серия|нов\adddotspace сер\adddot
61+oldseries|старая серия|стар\adddotspace сер\adddot
62+edition|издание|изд\adddot
63+reprint|переиздание|переизд\adddot
64+reprintof|переиздание|переизд\adddot
65+reprintas|переиздано как|переизд\adddotspace как
66+reprintfrom|переиздано с|переизд\adddotspace с
67+translationof|перевод по изданию\addcolon|пер\adddotspace по изд\adddot\addcolon
68+translationas|перевод\addcolon|пер\adddot\addcolon
69+translationfrom|перевод с|пер\adddotspace с
70+reviewof|рецензия на\addcolon|рец\adddotspace на\addcolon
71+astitle|\addcolon|\addcolon
72+bypublisher|\addcomma|\addcomma
73+nodate|б\adddot г\adddot|б\adddot г\adddot
74+page|страница|с\adddot
75+pages|страницы|с\adddot
76+column|колонка|кол\adddot
77+columns|колонки|кол\adddot
78+line|строка|строка
79+lines|строки|строка
80+verse|стих|стих
81+verses|стихи|стихи
82+section|параграф|\S
83+sections|параграфы|\S\S
84+paragraph|абзац|абз\adddot
85+paragraphs|абзацы|абз\adddot
86+pagetotal|страница|с\adddot
87+pagetotals|страницы|с\adddot
88+columntotal|колонка|кол\adddot
89+columntotals|колонки|кол\adddot
90+linetotal|строка|строка
91+linetotals|строки|строка
92+versetotal|стих|стих
93+versetotals|стихи|стихи
94+sectiontotal|параграф|\S
95+sectiontotals|параграфы|\S\S
96+paragraphtotal|абзац|абз\adddot
97+paragraphtotals|абзацы|абз\adddot
98+in|в|в
99+inseries|в|в
100+ofseries|из|из
101+number|номер|№
102+chapter|глава|гл\adddot
citeproc/biblatex-localization/serbian.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/serbianc.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/slovak.lbx.stringsnew file+82
@@ -0,0 +1,82 @@
1+references|Referencie|Referencie
2+shorthands|Zoznam skratiek|Skratky
3+editor|editor|ed\adddot
4+editors|editori|ed\adddot
5+compilers|zostavovatelia|zost\adddot
6+redactor|redaktor|red\adddot
7+redactors|redaktori|red\adddot
8+reviser|korektor|kor\adddot
9+revisers|korektori|kor\adddot
10+founders|zakladatelia|zakl\adddot
11+translators|prekladatelia|prekl\adddot
12+foreword|predhovor|predh\adddot
13+afterword|doslov|dosl\adddot
14+byauthor||
15+withforeword|s\addnbspace predhovorom od|s\addnbspace predh\adddot\ od
16+withafterword|s\addnbspace doslovom od|s\addnbspace dosl\adddot\ od
17+and|a|a
18+andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
19+andmore|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
20+involumes|in|in
21+book|kniha|kniha
22+edition|vydanie|vyd\adddot
23+reviewof|recenzia|recenz\adddot
24+translationof|preklad|prekl\adddot
25+astitle|ako|ako
26+bypublisher||
27+page|strana|s\adddot
28+pages|strany|s\adddot
29+line|riadok|r\adddot
30+lines|riadky|r\adddot
31+section|sekcia|\S
32+sections|sekcie|\S\S
33+paragraph|odsek|ods\adddot
34+paragraphs|odseky|ods\adddot
35+pagetotal|strana|s\adddot
36+pagetotals|strany|s\adddot
37+linetotal|riadok|r\adddot
38+linetotals|riadky|r\adddot
39+sectiontotal|sekcia|\S
40+sectiontotals|sekcie|\S\S
41+paragraphtotal|odsek|ods\adddot
42+paragraphtotals|odseky|ods\adddot
43+in|in|in
44+inseries|in|in
45+ofseries|z|z
46+chapter|kapitola|kap\adddot
47+datacd|CD-ROM|CD-ROM
48+audiocd|audio CD|audio CD
49+version|verzia|ver\adddot
50+url|URL|URL
51+idem|idem|idem
52+idemsm|idem|idem
53+idemsf|eadem|eadem
54+idemsn|idem|idem
55+idempm|eidem|eidem
56+idempf|eaedem|eaedem
57+idempn|eadem|eadem
58+idempp|eidem|eidem
59+ibidem|ibidem|ibid\adddot
60+opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot
61+loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot
62+confer|cf\adddot|cf\adddot
63+sequens|sq\adddot|sq\adddot
64+sequentes|sqq\adddot|sqq\adddot
65+passim|passim|pass\adddot
66+march|marec|mar\adddot
67+august|august|aug\adddot
68+september|september|sept\adddot
69+november|november|nov\adddot
70+december|december|dec\adddot
71+countryde|Nemecko|DE
72+patent|patent|pat\adddot
73+patentus|US patent|US pat\adddot
74+abstract|abstrakt|abst\adddot
75+annodomini|po Kristovi|po Kr\adddot
76+beforechrist|pred Kristom|pred Kr\adddot
77+circa|cirka|ca\adddot
78+spring|jar|jar
79+summer|leto|leto
80+winter|zima|zima
81+am|AM|AM
82+pm|PM|PM
citeproc/biblatex-localization/slovene.lbx.stringsnew file+28
@@ -0,0 +1,28 @@
1+bibliography|Literatura|Literatura
2+references|Literatura|Literatura
3+shorthands|Kratice|Kratice
4+editor|urednik|ur\adddot
5+editors|uredniki|ur\adddot
6+compiler|sestavljalec|sest\adddot
7+compilers|sestavljalci|sest\adddot
8+redactor|redaktor|redaktor
9+redactors|redaktorji|redaktorji
10+reviser|korektor|korektor
11+revisers|korektorji|korektorji
12+founder|snovalec|snovalec
13+founders|snovalci|snovalci
14+continuator|nadaljevalec|nadaljevalec
15+continuators|nadaljevalci|nadaljevalci
16+collaborator|sodelavec|sod\adddot
17+collaborators|sodelavci|sod\adddot
18+translator|prevajalec|prev\adddot
19+translators|prevajalci|prev\adddot
20+commentator|komentator|komentator
21+commentators|komentatorji|komentatorji
22+annotator|anotator|anotator
23+annotators|anotatorji|anotatorji
24+commentary|komentar|komentar
25+annotations|opombe|op\adddot
26+introduction|uvod|uvod
27+foreword|predgovor|predg\adddot
28+afterword|spremna beseda|spr\adddotspace b\adddot
citeproc/biblatex-localization/slovenian.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/spanish.lbx.stringsnew file+190
@@ -0,0 +1,190 @@
1+references|Referencias|Referencias
2+shorthands|Lista de abreviaturas|Abreviaturas
3+editor|edici\'on|ed\adddot
4+editors|edici\'on|eds\adddot
5+commentator|comentario|com\adddot
6+commentators|comentarios|coms\adddot
7+annotator|anotaciones|anot\adddot
8+annotators|anotaciones|anots\adddot
9+commentary|comentario|com\adddot
10+annotations|notas|notas
11+introduction|introducci\'on|intr\adddot
12+foreword|pr\'ologo|pr\'ol\adddot
13+organizer|organizaci\'on|org\adddot
14+organizers|organizaci\'on|orgs\adddot
15+byorganizer|organizado por|org\adddotspace por
16+byauthor|de|de
17+byeditor|editado por|ed\adddotspace por
18+bycompiler|compilado por|comp\adddotspace por
19+byredactor|redacci\'on de|red\adddotspace de
20+byreviser|revisado por|rev\adddotspace por
21+byfounder|fundado por|fund\adddotspace por
22+bycontinuator|continuado por|cont\adddotspace por
23+bytranslator|traducido \lbx@lfromlang\ por|trad\adddot \lbx@sfromlang\ por
24+bycommentator|comentado por|com\adddotspace por
25+byannotator|anotado por|anot\adddotspace por
26+withcommentator|con comentario de|con com\adddotspace de
27+withannotator|con notas de|con notas de
28+withintroduction|con introduci\'on de|con intr\adddotspace de
29+withforeword|con pr\'ologo de|con pr\'ol\adddotspace de
30+and|y|y
31+andothers|y~col\adddot|y~col\adddot
32+andmore|et\adddotspace al\adddot|et\adddotspace al\adddot
33+volume|volumen|vol\adddot
34+volumes|vol\'umenes|vols\adddot
35+involumes|en|en
36+jourvol|volumen|vol\adddot
37+jourser|\'epoca|\'ep\adddot
38+book|libro|libro
39+part|parte|parte
40+issue|n\'umero|n\'um\adddot
41+newseries|nueva \'epoca|n\adddotspace \'ep\adddot
42+oldseries|antigua \'epoca|ant\adddotspace \'ep\adddot
43+edition|edici\'on|ed\adddot
44+reprintas|reimpreso como|reimp\adddotspace como
45+translationas|traducido como|trad\adddotspace como
46+translationfrom|traducido del|trad\adddotspace del
47+origpubas|publicado originalmente como|pub\adddotspace orig\adddotspace como
48+origpubin|publicado originalmente en|pub\adddot orig\adddot en
49+bypublisher|por la editorial|por la ed\adddot
50+page|p\'agina|p\'ag\adddot
51+pages|p\'aginas|p\'ags\adddot
52+column|columna|col\adddot
53+columns|columnas|cols\adddot
54+verse|verso|v\adddot
55+verses|versos|vv\adddot
56+sections|secciones|secs\adddot
57+pagetotal|p\'agina|p\'ag\adddot
58+pagetotals|p\'aginas|p\'ags\adddot
59+columntotal|columna|col\adddot
60+columntotals|columnas|cols\adddot
61+versetotal|verso|v\adddot
62+versetotals|versos|vv\adddot
63+sectiontotals|secciones|secs\adddot
64+in|en|en
65+inseries|en|en
66+ofseries|de|de
67+number|n\'umero|n\sptext{o
68+chapter|cap\'itulo|cap\adddot
69+bathesis|Tesis de licenciatura|Tesis de lic\adddot
70+phdthesis|Tesis doctoral|Tesis doct\adddot
71+candthesis|Tesis de candidatura doctoral|Tesis de cand\adddotspace doct\adddot
72+techreport|informe t\'ecnico|inf\adddotspace t\'ec\adddot
73+software|programa|prog\adddot
74+datacd|disco de datos|CD de datos
75+audiocd|disco de audio|CD de audio
76+version|versi\'on|ver\adddot
77+url|direcci\'on|direcci\'on
78+urlfrom|disponible desde|disp\adddotspace desde
79+urlseen|visitado|visitado
80+submitted|enviado|enviado
81+forthcoming|pr\'oximamente|prox\adddot
82+inpress|en prensa|en prensa
83+prepublished|previamente publicado|prepublicado
84+citedas|citado en adelante como|cit\adddotspace en adelante como
85+thiscite|especialmente|esp\adddot
86+seenote|ver nota|ver n\adddot
87+quotedin|citado en|cit\adddotspace en
88+loccit|loc\adddotspace cit\adddot|loc\adddot cit\adddot
89+confer|cf\adddot|cf\adddot
90+sequens|s\adddot|s\adddot
91+sequentes|ss\adddot|ss\adddot
92+passim|p\'assim|p\'assim
93+see|v\'ease|vid\adddot
94+seealso|v\'ease tambi\'en|vid\adddotspace tambi\'en
95+backrefpage|v\'ease p\'agina|vid\adddotspace p\'ag\adddot
96+backrefpages|v\'eanse p\'aginas|vid\adddotspace p\'ags\adddot
97+january|enero|ene\adddot
98+february|febrero|feb\adddot
99+march|marzo|mar\adddot
100+april|abril|abr\adddot
101+may|mayo|mayo
102+june|junio|jun\adddot
103+july|julio|jul\adddot
104+august|agosto|ago\adddot
105+september|septiembre|sep\adddot
106+october|octubre|oct\adddot
107+november|noviembre|nov\adddot
108+december|diciembre|dic\adddot
109+langbrazilian|brasile\~no|brasile\~no
110+langbulgarian|b\'ulgaro|b\'ulgaro
111+langcroatian|croata|croata
112+langczech|checo|checo
113+langdanish|dan\'es|dan\'es
114+langdutch|neerland\'es|neerland\'es
115+langenglish|ingl\'es|ingl\'es
116+langestonian|estonio|estonio
117+langfrench|franc\'es|franc\'es
118+langgalician|gallego|gallego
119+langgerman|alem\'an|alem\'an
120+langgreek|griego|griego
121+langhungarian|h\'ungaro|h\'ungaro
122+langitalian|italiano|italiano
123+langjapanese|japon\'es|japon\'es
124+langlatvian|lituano|lituano
125+langnorwegian|noruego|noruego
126+langpolish|polaco|polaco
127+langportuguese|portugu\'es|portugu\'es
128+langrussian|ruso|ruso
129+langslovak|eslovaco|eslovaco
130+langslovene|esloveno|esloveno
131+langspanish|espa\~nol|espa\~nol
132+langswedish|sueco|sueco
133+langukrainian|ucraniano|ucraniano
134+frombrazilian|del brasile\~no|del brasile\~no
135+frombulgarian|del b\'ulgaro|del b\'ulgaro
136+fromcroatian|del croata|del croata
137+fromczech|del checo|del checo
138+fromdanish|del dan\'es|del dan\'es
139+fromdutch|del neerland\'es|del neerland\'es
140+fromenglish|del ingl\'es|del ingl\'es
141+fromestonian|del estonio|del estonio
142+fromfrench|del franc\'es|del franc\'es
143+fromgalician|del gallego|del gallego
144+fromgerman|del alem\'an|del alem\'an
145+fromgreek|del griego|del griego
146+fromhungarian|del h\'ungaro|del h\'ungaro
147+fromitalian|del italiano|del italiano
148+fromjapanese|del japon\'es|del japon\'es
149+fromlatvian|del lituano|del lituano
150+fromnorwegian|del noruego|del noruego
151+frompolish|del polaco|del polaco
152+fromportuguese|del portugu\'es|del portugu\'es
153+fromrussian|del ruso|del ruso
154+fromslovak|del eslovaco|del eslovaco
155+fromslovene|del esloveno|del esloveno
156+fromspanish|del espa\~nol|del espa\~nol
157+fromswedish|del sueco|del sueco
158+fromukrainian|del ucraniano|del ucraniano
159+countryde|Alemania|DE
160+countryeu|Uni\'on Europea|EU
161+countryep|Uni\'on Europea|EP
162+countryfr|Francia|FR
163+countryuk|Reino Unido|GB
164+countryus|Estados Unidos|US
165+patent|patente|pat\adddot
166+patentde|patente alemana|pat\adddotspace alemana
167+patenteu|patente europea|pat\adddotspace europea
168+patentfr|patente francesa|pat\adddotspace francesa
169+patentuk|patente brit\'anica|pat\adddotspace brit\'anica
170+patentus|patente estadounidense|pat\adddotspace estadounidense
171+patreq|solicitud de patente|sol\adddotspace de pat\adddot
172+patreqde|solicitud de patente alemana|sol\adddotspace de pat\adddot alemana
173+patreqeu|solicitud de patente europea|sol\adddotspace de pat\adddot europea
174+patreqfr|solicitud de patente francesa|sol\adddotspace de pat\adddot francesa
175+patrequk|solicitud de patente brit\'anica|sol\adddotspace de pat\adddot brit\'anica
176+patrequs|solicitud de patente estadounidense|sol\adddotspace de pat\adddot estadounidense
177+file|archivo|archivo
178+library|biblioteca|bibl\adddot
179+abstract|resumen|resumen
180+commonera|era com\'un|e\adddotspace c\adddot
181+beforecommonera|antes de la era com\'un|a\adddotspace e\adddotspace c\adddot
182+annodomini|despu\'es de Cristo|d\adddotspace C\adddot
183+beforechrist|antes de Cristo|a\adddotspace C\adddot
184+circa|circa|ca\adddot
185+spring|primavera|prim\adddot
186+summer|verano|ver\adddot
187+autumn|oto\~no|ot\adddot
188+winter|invierno|inv\adddot
189+am|a\adddotspace m\adddot|a\adddot m\adddot
190+pm|p\adddotspace m\adddot|p\adddot m\adddot
citeproc/biblatex-localization/swedish.lbx.stringsnew file+9
@@ -0,0 +1,9 @@
1+bibliography|Litteraturf\"orteckning|Litteratur
2+references|Referenser|Referenser
3+shorthands|F\"orkortningar|F\"orkortningar
4+editor|utgivare|utg\adddot
5+editors|utgivare|utg\adddot
6+compiler|sammanst\"allare|sammanst\adddot
7+compilers|sammanst\"allare|sammanst\adddot
8+redactor|redakt\"or|red\adddot
9+redactors|redakt\"orer|red\adddot
citeproc/biblatex-localization/swissgerman.lbx.stringsnew file+1
@@ -0,0 +1 @@
1+countryuk|Grossbritannien|GB
citeproc/biblatex-localization/turkish.lbx.stringsnew file+157
@@ -0,0 +1,157 @@
1+references|Kaynaklar|Kaynaklar
2+shorthands|K\i saltmalar dizini|K\i saltmalar
3+compiler|derleyen|der\adddot
4+compilers|derleyenler|der\adddot
5+redactor|yay\i na haz\i rlayan|yay\adddot\ haz\adddot
6+redactors|yay\i na haz\i rlayanlar|yay\adddot\ haz\adddot
7+reviser|tashih eden|tashih\adddot
8+revisers|tashih edenler|tashih\adddot
9+founder|kurucu|kur\adddot
10+founders|kurucular|kur\adddot
11+continuator|tamamlayan|tam\adddot
12+continuators|tamamlayanlar|tam\adddot
13+collaborator|ortak|ortak
14+collaborators|ortaklar|ortaklar
15+commentator|yorumlayan|yrm\adddot
16+commentators|yorumlayanlar|yrm\adddot
17+commentary|yorum|yrm\adddot
18+byauthor|yazar|yazar
19+bycompiler|derleyen|der\adddot
20+byredactor|yay\i na haz\i rlayan|yay\adddot\ haz\adddot
21+byreviser|tashih|tashih
22+byfounder|kurucu|kur\adddot
23+bycontinuator|tamamlayan|tam\adddot
24+bycommentator|yorumlayan|yrm\adddot
25+withcommentator|yorumlar\i yla katk\i da bulunan|yrm\adddot\ kat\adddot\ bul\adddot
26+and|ve|ve
27+volume|cilt|c\adddot
28+volumes|cilt|c\adddot
29+jourvol|cilt|c\adddot
30+jourser|seri|seri
31+book|kitap|kitap
32+part|k\i s\i m|k\i s\i m
33+issue|say\i|say\i
34+newseries|yeni seri|yeni seri
35+oldseries|eski seri|eski seri
36+edition|bask\i|bs\adddot
37+reprint|yeni bask\i s\i|yeni bask\i s\i
38+reprintof|yeni bask\i s\i|yeni bask\i s\i
39+reprintas|yeni bask\i s\i|yeni bask\i s\i
40+reprintfrom|yeni bask\i s\i|yeni bask\i s\i
41+reviewof|derlenen eser|der\adddot\ eser
42+origpubas|as\i l eser|as\i l eser
43+origpubin|as\i l eser yay\i n tarihi|as\i l eser yay\i n tarihi
44+bypublisher|yay\i n evi|yay\i n evi
45+nodate|tarih yok|t\adddot y\adddot
46+page|sayfa|s\adddot
47+pages|sayfalar|ss\adddot
48+line|sat\i r|sat\adddot
49+lines|sat\i rlar|sat\adddot
50+verse|m\i sra|m\i s\adddot
51+verses|m\i sralar|m\i s\adddot
52+paragraph|paragraf|par\adddot
53+paragraphs|paragraflar|par\adddot
54+pagetotal|toplam sayfa|s\adddot
55+pagetotals|toplam sayfalar|ss\adddot
56+linetotal|toplam sat\i r|sat\adddot
57+linetotals|toplam sat\i rlar|sat\adddot
58+versetotal|toplam m\i sra|m\i s\adddot
59+versetotals|toplam m\i sralar|m\i s\adddot
60+paragraphtotal|toplam paragraf|par\adddot
61+paragraphtotals|toplam paragraflar|par\adddot
62+inseries|serilerde|serilerde
63+ofseries|serilerde|serilerde
64+number|numara|no\adddot
65+bathesis|lisans tezi|lis\adddot\ tezi
66+phdthesis|doktora tezi|dok\adddot\ tezi
67+candthesis|aday tezi|aday tezi
68+techreport|teknik rapor|tek\adddot\ rap\adddot
69+software|bilgisayar yaz\i l\i m\i|bilg\adddot\ yaz\adddot
70+datacd|CD|CD
71+audiocd|ses CD'si|ses CD'si
72+version|versiyon|ver\adddot
73+forthcoming|yak\i nda|yak\i nda
74+prepublished|taslak bas\i m\i|taslak bas\i m\i
75+citedas|at\i f olarak|at\i f olarak
76+seenote|nota bak\i n\i z|nota bkz\adddot
77+quotedin|al\i nt\i|al\i nt\i
78+idem|ayn\i|ayn\i
79+idemsm|ayn\i|ayn\i
80+idemsf|ayn\i|ayn\i
81+idemsn|ayn\i|ayn\i
82+idempm|ayn\i lar\i|ayn\i lar\i
83+idempf|ayn\i lar\i|ayn\i lar\i
84+idempn|ayn\i lar\i|ayn\i lar\i
85+idempp|ayn\i lar\i|ayn\i lar\i
86+loccit|at\i f yap\i lan yer|at\i f yap\adddot\ yer
87+sequens|takip eden|takip eden
88+sequentes|takip eden|takip eden
89+passim|rastgele|rastgele
90+see|bak\i n\i z|bkz\adddot
91+seealso|ayr\i ca bak\i n\i z|ayr\i ca bkz\adddot
92+january|Ocak|Ocak
93+march|Mart|Mar\adddot
94+april|Nisan|Nis\adddot
95+may|May\i s|May\adddot
96+june|Haziran|Haz\adddot
97+july|Temmuz|Tem\adddot
98+october|Ekim|Ekim
99+november|Kas\i m|Kas\adddot
100+december|Aral\i k|Ara\adddot
101+langamerican|Amerikanca|Amerikanca
102+langbrazilian|Brezilyanca|Brezilyanca
103+langbulgarian|Bulgarca|Bulgarca
104+langcatalan|Katalanca|Katalanca
105+langdanish|Danimarkanca|Danimarkanca
106+langestonian|Estonca|Estonca
107+langfinnish|Fince|Fince
108+langfrench|Frans\i zca|Frans\i zca
109+langgalician|Galce|Galce
110+langgerman|Almanca|Almanca
111+langgreek|Yunanca|Yunanca
112+langhungarian|Macarca|Macarca
113+langjapanese|Japonca|Japonca
114+langlatin|Latince|Latince
115+langlatvian|Letonca|Letonca
116+langlithuanian|Litvanca|Litvanca
117+langpolish|Polonyaca|Polonyaca
118+langportuguese|Portekizce|Portekizce
119+langslovene|Slovence|Slovence
120+langukrainian|Ukraynaca|Ukraynaca
121+fromamerican|Amerikanca'dan|Amerikanca'dan
122+frombrazilian|Brezilyanca'dan|Brezilyanca'dan
123+frombulgarian|Bulgarca'dan|Bulgarca'dan
124+fromcatalan|Katalanca'dan|Katalanca'dan
125+fromdanish|Danimarkanca'dan|Danimarkanca'dan
126+fromestonian|Estonyaca'dan|Estonyaca'dan
127+fromfinnish|Fince'den|Fince'den
128+fromfrench|Frans\i zca'dan|Frans\i zca'dan
129+fromgalician|Galyaca'dan|Galyaca'dan
130+fromgerman|Almanca'dan|Almanca'dan
131+fromgreek|Yunanca'dan|Yunanca'dan
132+fromhungarian|Macarca'dan|Macarca'dan
133+fromjapanese|Japonca'dan|Japonca'dan
134+fromlatin|Latince'den|Latince'den
135+fromlatvian|Latvianca'dan|Latvianca'dan
136+fromlithuanian|Litvanca'dan|Litvanca'dan
137+frompolish|Polonyaca'dan|Polonyaca'dan
138+fromportuguese|Portekizce'den|Portekizce'den
139+fromslovene|Slovence'den|Slovence'den
140+fromukrainian|Ukraynaca'dan|Ukraynaca'dan
141+countryde|Almanya|DE
142+countryfr|Fransa|FR
143+patent|patent|pat\adddot
144+patentde|Alman patenti|Alman pat\adddot
145+patenteu|Avrupa patenti|Avrupa pat\adddot
146+patentfr|Frans\i z patenti|Frans\i z pat\adddot
147+patentus|Amerika patenti|Amerika pat\adddot
148+patreq|patent beklemede|pat\adddot\ bek\adddot
149+patreqde|Alman patenti beklemede|Alman pat\adddot\ bek\adddot
150+patreqeu|Avrupa patenti beklemede|Avrupa pat\adddot\ bek\adddot
151+patreqfr|Frans\i z patenti beklemede|Frans\i z pat\adddot\ bek\adddot
152+patrequs|Amerika patenti beklemede|Amerika pat\adddot\ bek\adddot
153+file|dosya|dosya
154+commonera|milattan sonra|MS
155+annodomini|milattan sonra|MS
156+summer|Yaz|Yaz
157+autumn|Sonbahar|Sonbahar
citeproc/biblatex-localization/ukrainian.lbx.stringsnew file+102
@@ -0,0 +1,102 @@
1+bibliography|Перелік літератури|Література
2+references|Перелік літератури|Література
3+shorthands|Перелік скорочень|Скорочення
4+editor|редактор|ред\adddot
5+editors|редактори|ред\adddot
6+compiler|укладач|уклад\adddot
7+compilers|укладачі|уклад\adddot
8+redactor|редактор|ред\adddot
9+redactors|редактори|ред\adddot
10+reviser|ревізійний коректор|ревіз\adddotspace кор\adddot
11+revisers|ревізійні коректори|ревіз\adddotspace кор\adddot
12+founder|засновник|засн\adddot
13+founders|засновник|засн\adddot
14+continuator|продовжувач|прод\adddot
15+continuators|продовжувачі|прод\adddot
16+collaborator|учасник|учас\adddot
17+collaborators|учасники|учас\adddot
18+translator|перекладач|пер\adddot
19+translators|перекладачі|пер\adddot
20+commentator|коментатор|комент\adddot
21+commentators|коментатори|комент\adddot
22+annotator|примітки|прим\adddot
23+annotators|примітки|прим\adddot
24+commentary|коментар|комент\adddot
25+annotations|примітки|прим\adddot
26+introduction|вступна стаття|вступ\adddotspace ст\adddot
27+foreword|передмова|передм\adddot
28+afterword|післямова|післям\adddot
29+organizer|організатор|орг\adddot
30+organizers|організатори|орг\adddot
31+byorganizer|організатор|орг\adddot
32+byauthor|згідно автора|згідн\adddot авт\adddot
33+byeditor|за редакцією|за\addabbrvspace ред\adddot
34+bycompiler|укладач|уклад\adddot
35+byredactor|за редакцією|за\addabbrvspace ред\adddot
36+byreviser|виправлено|випр\adddot
37+byreviewer|рецензія|рец\adddot
38+byfounder|засновник|засн\adddot
39+bycontinuator|продовження|продовж\adddot
40+bycollaborator|за участю|за\addabbrvspace уч\adddot
41+bytranslator|переклад \lbx@lfromlang|пер\adddot\ \lbx@sfromlang
42+bycommentator|коментарі|комент\adddot
43+byannotator|примітки|прим\adddot
44+withcommentator|коментарі|комент\adddot
45+withannotator|примітки|прим\adddot
46+withintroduction|вступна стаття|вступ\adddotspace ст\adddot
47+withforeword|передмовие|передм\adddot
48+withafterword|післямовие|післям\adddot
49+and|та|та
50+andothers|та\addabbrvspace ін\adddot|та\addabbrvspace ін\adddot
51+andmore|та\addabbrvspace ін\adddot|та\addabbrvspace ін\adddot
52+volume|том|т\adddot
53+volumes|томах|т\adddot
54+involumes|в|в
55+jourvol|том|т\adddot
56+jourser|серія|сер\adddot
57+book|книга|кн\adddot
58+part|частина|ч\adddot
59+issue|випуск|вип\adddot
60+newseries|нова серія|нов\adddotspace сер\adddot
61+oldseries|стара серія|стар\adddotspace сер\adddot
62+edition|видання|вид\adddot
63+reprint|перевидання|перевид\adddot
64+reprintof|перевидання|перевид\adddot
65+reprintas|перевидано як|перевид\adddotspace як
66+reprintfrom|перевидано з|перевид\adddotspace з
67+translationof|переклад по виданню\addcolon|пер\adddotspace по вид\adddot\addcolon
68+translationas|переклад\addcolon|пер\adddot\addcolon
69+translationfrom|переклад з|пер\adddotspace з
70+reviewof|рецензія на\addcolon|рец\adddotspace на\addcolon
71+astitle|\addcolon|\addcolon
72+bypublisher|\addcomma|\addcomma
73+nodate|б\adddot р\adddot|б\adddot р\adddot
74+page|сторінка|с\adddot
75+pages|сторінки|с\adddot
76+column|колонка|кол\adddot
77+columns|колонки|кол\adddot
78+line|рядок|рядок
79+lines|рядки|рядки
80+verse|вірш|вірш
81+verses|вірші|вірші
82+section|параграф|\S
83+sections|параграфи|\S\S
84+paragraph|абзац|абз\adddot
85+paragraphs|абзаци|абз\adddot
86+pagetotal|сторінка|с\adddot
87+pagetotals|сторінки|с\adddot
88+columntotal|колонка|кол\adddot
89+columntotals|колонки|кол\adddot
90+linetotal|рядок|рядок
91+linetotals|рядки|рядки
92+versetotal|вірш|вірш
93+versetotals|вірші|вірші
94+sectiontotal|параграф|\S
95+sectiontotals|параграфи|\S\S
96+paragraphtotal|абзац|абз\adddot
97+paragraphtotals|абзаци|абз\adddot
98+in|в|в
99+inseries|в|в
100+ofseries|із|із
101+number|номер|№
102+chapter|глава|гл\adddot
data/default.cslnew file+658
@@ -0,0 +1,658 @@
1+<?xml version="1.0" encoding="utf-8"?>
2+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="display-and-sort" page-range-format="chicago">
3+ <info>
4+ <title>Chicago Manual of Style 17th edition (author-date)</title>
5+ <id>http://www.zotero.org/styles/chicago-author-date</id>
6+ <link href="http://www.zotero.org/styles/chicago-author-date" rel="self"/>
7+ <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
8+ <author>
9+ <name>Julian Onions</name>
10+ <email>julian.onions@gmail.com</email>
11+ </author>
12+ <contributor>
13+ <name>Sebastian Karcher</name>
14+ </contributor>
15+ <contributor>
16+ <name>Richard Karnesky</name>
17+ <email>karnesky+zotero@gmail.com</email>
18+ <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
19+ </contributor>
20+ <contributor>
21+ <name>Andrew Dunning</name>
22+ <email>andrew.dunning@utoronto.ca</email>
23+ <uri>https://orcid.org/0000-0003-0464-5036</uri>
24+ </contributor>
25+ <contributor>
26+ <name>Matthew Roth</name>
27+ <email>matthew.g.roth@yale.edu</email>
28+ <uri> https://orcid.org/0000-0001-7902-6331</uri>
29+ </contributor>
30+ <contributor>
31+ <name>Brenton M. Wiernik</name>
32+ </contributor>
33+ <category citation-format="author-date"/>
34+ <category field="generic-base"/>
35+ <summary>The author-date variant of the Chicago style</summary>
36+ <updated>2018-01-24T12:00:00+00:00</updated>
37+ <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
38+ </info>
39+ <locale xml:lang="en">
40+ <terms>
41+ <term name="editor" form="verb-short">ed.</term>
42+ <term name="container-author" form="verb">by</term>
43+ <term name="translator" form="verb-short">trans.</term>
44+ <term name="editortranslator" form="verb">edited and translated by</term>
45+ <term name="translator" form="short">trans.</term>
46+ </terms>
47+ </locale>
48+ <macro name="secondary-contributors">
49+ <choose>
50+ <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
51+ <group delimiter=". ">
52+ <names variable="editor translator" delimiter=". ">
53+ <label form="verb" text-case="capitalize-first" suffix=" "/>
54+ <name and="text" delimiter=", "/>
55+ </names>
56+ <names variable="director" delimiter=". ">
57+ <label form="verb" text-case="capitalize-first" suffix=" "/>
58+ <name and="text" delimiter=", "/>
59+ </names>
60+ </group>
61+ </if>
62+ </choose>
63+ </macro>
64+ <macro name="container-contributors">
65+ <choose>
66+ <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
67+ <group prefix=", " delimiter=", ">
68+ <names variable="container-author" delimiter=", ">
69+ <label form="verb" suffix=" "/>
70+ <name and="text" delimiter=", "/>
71+ </names>
72+ <names variable="editor translator" delimiter=", ">
73+ <label form="verb" suffix=" "/>
74+ <name and="text" delimiter=", "/>
75+ </names>
76+ </group>
77+ </if>
78+ </choose>
79+ </macro>
80+ <macro name="editor">
81+ <names variable="editor">
82+ <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
83+ <label form="short" prefix=", "/>
84+ </names>
85+ </macro>
86+ <macro name="translator">
87+ <names variable="translator">
88+ <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
89+ <label form="short" prefix=", "/>
90+ </names>
91+ </macro>
92+ <macro name="recipient">
93+ <choose>
94+ <if type="personal_communication">
95+ <choose>
96+ <if variable="genre">
97+ <text variable="genre" text-case="capitalize-first"/>
98+ </if>
99+ <else>
100+ <text term="letter" text-case="capitalize-first"/>
101+ </else>
102+ </choose>
103+ </if>
104+ </choose>
105+ <names variable="recipient" delimiter=", ">
106+ <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
107+ <name and="text" delimiter=", "/>
108+ </names>
109+ </macro>
110+ <macro name="substitute-title">
111+ <choose>
112+ <if type="article-magazine article-newspaper review review-book" match="any">
113+ <text macro="container-title"/>
114+ </if>
115+ </choose>
116+ </macro>
117+ <macro name="contributors">
118+ <group delimiter=". ">
119+ <names variable="author">
120+ <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
121+ <label form="short" prefix=", "/>
122+ <substitute>
123+ <names variable="editor"/>
124+ <names variable="translator"/>
125+ <names variable="director"/>
126+ <text macro="substitute-title"/>
127+ <text macro="title"/>
128+ </substitute>
129+ </names>
130+ <text macro="recipient"/>
131+ </group>
132+ </macro>
133+ <macro name="contributors-short">
134+ <names variable="author">
135+ <name form="short" and="text" delimiter=", " initialize-with=". "/>
136+ <substitute>
137+ <names variable="editor"/>
138+ <names variable="translator"/>
139+ <names variable="director"/>
140+ <text macro="substitute-title"/>
141+ <text macro="title"/>
142+ </substitute>
143+ </names>
144+ </macro>
145+ <macro name="interviewer">
146+ <names variable="interviewer" delimiter=", ">
147+ <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
148+ <name and="text" delimiter=", "/>
149+ </names>
150+ </macro>
151+ <macro name="archive">
152+ <group delimiter=". ">
153+ <text variable="archive_location" text-case="capitalize-first"/>
154+ <text variable="archive"/>
155+ <text variable="archive-place"/>
156+ </group>
157+ </macro>
158+ <macro name="access">
159+ <group delimiter=". ">
160+ <choose>
161+ <if type="graphic report" match="any">
162+ <text macro="archive"/>
163+ </if>
164+ <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
165+ <text macro="archive"/>
166+ </else-if>
167+ </choose>
168+ <choose>
169+ <if type="webpage post-weblog" match="any">
170+ <date variable="issued" form="text"/>
171+ </if>
172+ </choose>
173+ <choose>
174+ <if variable="issued" match="none">
175+ <group delimiter=" ">
176+ <text term="accessed" text-case="capitalize-first"/>
177+ <date variable="accessed" form="text"/>
178+ </group>
179+ </if>
180+ </choose>
181+ <choose>
182+ <if type="legal_case" match="none">
183+ <choose>
184+ <if variable="DOI">
185+ <text variable="DOI" prefix="https://doi.org/"/>
186+ </if>
187+ <else>
188+ <text variable="URL"/>
189+ </else>
190+ </choose>
191+ </if>
192+ </choose>
193+ </group>
194+ </macro>
195+ <macro name="title">
196+ <choose>
197+ <if variable="title" match="none">
198+ <choose>
199+ <if type="personal_communication" match="none">
200+ <text variable="genre" text-case="capitalize-first"/>
201+ </if>
202+ </choose>
203+ </if>
204+ <else-if type="bill book graphic legislation motion_picture song" match="any">
205+ <text variable="title" text-case="title" font-style="italic"/>
206+ <group prefix=" (" suffix=")" delimiter=" ">
207+ <text term="version"/>
208+ <text variable="version"/>
209+ </group>
210+ </else-if>
211+ <else-if variable="reviewed-author">
212+ <choose>
213+ <if variable="reviewed-title">
214+ <group delimiter=". ">
215+ <text variable="title" text-case="title" quotes="true"/>
216+ <group delimiter=", ">
217+ <text variable="reviewed-title" text-case="title" font-style="italic" prefix="Review of "/>
218+ <names variable="reviewed-author">
219+ <label form="verb-short" text-case="lowercase" suffix=" "/>
220+ <name and="text" delimiter=", "/>
221+ </names>
222+ </group>
223+ </group>
224+ </if>
225+ <else>
226+ <group delimiter=", ">
227+ <text variable="title" text-case="title" font-style="italic" prefix="Review of "/>
228+ <names variable="reviewed-author">
229+ <label form="verb-short" text-case="lowercase" suffix=" "/>
230+ <name and="text" delimiter=", "/>
231+ </names>
232+ </group>
233+ </else>
234+ </choose>
235+ </else-if>
236+ <else-if type="legal_case interview patent" match="any">
237+ <text variable="title"/>
238+ </else-if>
239+ <else>
240+ <text variable="title" text-case="title" quotes="true"/>
241+ </else>
242+ </choose>
243+ </macro>
244+ <macro name="edition">
245+ <choose>
246+ <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
247+ <choose>
248+ <if is-numeric="edition">
249+ <group delimiter=" " prefix=". ">
250+ <number variable="edition" form="ordinal"/>
251+ <text term="edition" form="short" strip-periods="true"/>
252+ </group>
253+ </if>
254+ <else>
255+ <text variable="edition" text-case="capitalize-first" prefix=". "/>
256+ </else>
257+ </choose>
258+ </if>
259+ <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
260+ <choose>
261+ <if is-numeric="edition">
262+ <group delimiter=" " prefix=", ">
263+ <number variable="edition" form="ordinal"/>
264+ <text term="edition" form="short"/>
265+ </group>
266+ </if>
267+ <else>
268+ <text variable="edition" prefix=", "/>
269+ </else>
270+ </choose>
271+ </else-if>
272+ </choose>
273+ </macro>
274+ <macro name="locators">
275+ <choose>
276+ <if type="article-journal">
277+ <choose>
278+ <if variable="volume">
279+ <text variable="volume" prefix=" "/>
280+ <group prefix=" (" suffix=")">
281+ <choose>
282+ <if variable="issue">
283+ <text variable="issue"/>
284+ </if>
285+ <else>
286+ <date variable="issued">
287+ <date-part name="month"/>
288+ </date>
289+ </else>
290+ </choose>
291+ </group>
292+ </if>
293+ <else-if variable="issue">
294+ <group delimiter=" " prefix=", ">
295+ <text term="issue" form="short"/>
296+ <text variable="issue"/>
297+ <date variable="issued" prefix="(" suffix=")">
298+ <date-part name="month"/>
299+ </date>
300+ </group>
301+ </else-if>
302+ <else>
303+ <date variable="issued" prefix=", ">
304+ <date-part name="month"/>
305+ </date>
306+ </else>
307+ </choose>
308+ </if>
309+ <else-if type="legal_case">
310+ <text variable="volume" prefix=", "/>
311+ <text variable="container-title" prefix=" "/>
312+ <text variable="page" prefix=" "/>
313+ </else-if>
314+ <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
315+ <group prefix=". " delimiter=". ">
316+ <group>
317+ <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
318+ <number variable="volume" form="numeric"/>
319+ </group>
320+ <group>
321+ <number variable="number-of-volumes" form="numeric"/>
322+ <text term="volume" form="short" prefix=" " plural="true"/>
323+ </group>
324+ </group>
325+ </else-if>
326+ <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
327+ <choose>
328+ <if variable="page" match="none">
329+ <group prefix=". ">
330+ <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
331+ <number variable="volume" form="numeric"/>
332+ </group>
333+ </if>
334+ </choose>
335+ </else-if>
336+ </choose>
337+ </macro>
338+ <macro name="locators-chapter">
339+ <choose>
340+ <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
341+ <choose>
342+ <if variable="page">
343+ <group prefix=", ">
344+ <text variable="volume" suffix=":"/>
345+ <text variable="page"/>
346+ </group>
347+ </if>
348+ </choose>
349+ </if>
350+ </choose>
351+ </macro>
352+ <macro name="locators-article">
353+ <choose>
354+ <if type="article-newspaper">
355+ <group prefix=", " delimiter=", ">
356+ <group delimiter=" ">
357+ <text variable="edition"/>
358+ <text term="edition"/>
359+ </group>
360+ <group>
361+ <text term="section" form="short" suffix=" "/>
362+ <text variable="section"/>
363+ </group>
364+ </group>
365+ </if>
366+ <else-if type="article-journal">
367+ <choose>
368+ <if variable="volume issue" match="any">
369+ <text variable="page" prefix=": "/>
370+ </if>
371+ <else>
372+ <text variable="page" prefix=", "/>
373+ </else>
374+ </choose>
375+ </else-if>
376+ </choose>
377+ </macro>
378+ <macro name="point-locators">
379+ <choose>
380+ <if variable="locator">
381+ <choose>
382+ <if locator="page" match="none">
383+ <choose>
384+ <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
385+ <choose>
386+ <if variable="volume">
387+ <group>
388+ <text term="volume" form="short" suffix=" "/>
389+ <number variable="volume" form="numeric"/>
390+ <label variable="locator" form="short" prefix=", " suffix=" "/>
391+ </group>
392+ </if>
393+ <else>
394+ <label variable="locator" form="short" suffix=" "/>
395+ </else>
396+ </choose>
397+ </if>
398+ <else>
399+ <label variable="locator" form="short" suffix=" "/>
400+ </else>
401+ </choose>
402+ </if>
403+ <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
404+ <number variable="volume" form="numeric" suffix=":"/>
405+ </else-if>
406+ </choose>
407+ <text variable="locator"/>
408+ </if>
409+ </choose>
410+ </macro>
411+ <macro name="container-prefix">
412+ <text term="in" text-case="capitalize-first"/>
413+ </macro>
414+ <macro name="container-title">
415+ <choose>
416+ <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
417+ <text macro="container-prefix" suffix=" "/>
418+ </if>
419+ </choose>
420+ <choose>
421+ <if type="webpage">
422+ <text variable="container-title" text-case="title"/>
423+ </if>
424+ <else-if type="legal_case" match="none">
425+ <group delimiter=" ">
426+ <text variable="container-title" text-case="title" font-style="italic"/>
427+ <choose>
428+ <if type="post-weblog">
429+ <text value="(blog)"/>
430+ </if>
431+ </choose>
432+ </group>
433+ </else-if>
434+ </choose>
435+ </macro>
436+ <macro name="publisher">
437+ <group delimiter=": ">
438+ <text variable="publisher-place"/>
439+ <text variable="publisher"/>
440+ </group>
441+ </macro>
442+ <macro name="date">
443+ <choose>
444+ <if variable="issued">
445+ <group delimiter=" ">
446+ <date variable="original-date" form="text" date-parts="year" prefix="(" suffix=")"/>
447+ <date variable="issued">
448+ <date-part name="year"/>
449+ </date>
450+ </group>
451+ </if>
452+ <else-if variable="status">
453+ <text variable="status" text-case="capitalize-first"/>
454+ </else-if>
455+ <else>
456+ <text term="no date" form="short"/>
457+ </else>
458+ </choose>
459+ </macro>
460+ <macro name="date-in-text">
461+ <choose>
462+ <if variable="issued">
463+ <group delimiter=" ">
464+ <date variable="original-date" form="text" date-parts="year" prefix="[" suffix="]"/>
465+ <date variable="issued">
466+ <date-part name="year"/>
467+ </date>
468+ </group>
469+ </if>
470+ <else-if variable="status">
471+ <text variable="status"/>
472+ </else-if>
473+ <else>
474+ <text term="no date" form="short"/>
475+ </else>
476+ </choose>
477+ </macro>
478+ <macro name="day-month">
479+ <date variable="issued">
480+ <date-part name="month"/>
481+ <date-part name="day" prefix=" "/>
482+ </date>
483+ </macro>
484+ <macro name="collection-title">
485+ <choose>
486+ <if match="none" type="article-journal">
487+ <choose>
488+ <if match="none" is-numeric="collection-number">
489+ <group delimiter=", ">
490+ <text variable="collection-title" text-case="title"/>
491+ <text variable="collection-number"/>
492+ </group>
493+ </if>
494+ <else>
495+ <group delimiter=" ">
496+ <text variable="collection-title" text-case="title"/>
497+ <text variable="collection-number"/>
498+ </group>
499+ </else>
500+ </choose>
501+ </if>
502+ </choose>
503+ </macro>
504+ <macro name="collection-title-journal">
505+ <choose>
506+ <if type="article-journal">
507+ <group delimiter=" ">
508+ <text variable="collection-title"/>
509+ <text variable="collection-number"/>
510+ </group>
511+ </if>
512+ </choose>
513+ </macro>
514+ <macro name="event">
515+ <group delimiter=" ">
516+ <choose>
517+ <if variable="genre">
518+ <text term="presented at"/>
519+ </if>
520+ <else>
521+ <text term="presented at" text-case="capitalize-first"/>
522+ </else>
523+ </choose>
524+ <text variable="event"/>
525+ </group>
526+ </macro>
527+ <macro name="description">
528+ <choose>
529+ <if type="interview">
530+ <group delimiter=". ">
531+ <text macro="interviewer"/>
532+ <text variable="medium" text-case="capitalize-first"/>
533+ </group>
534+ </if>
535+ <else-if type="patent">
536+ <group delimiter=" " prefix=". ">
537+ <text variable="authority"/>
538+ <text variable="number"/>
539+ </group>
540+ </else-if>
541+ <else>
542+ <text variable="medium" text-case="capitalize-first" prefix=". "/>
543+ </else>
544+ </choose>
545+ <choose>
546+ <if variable="title" match="none"/>
547+ <else-if type="thesis personal_communication speech" match="any"/>
548+ <else>
549+ <group delimiter=" " prefix=". ">
550+ <text variable="genre" text-case="capitalize-first"/>
551+ <choose>
552+ <if type="report">
553+ <text variable="number"/>
554+ </if>
555+ </choose>
556+ </group>
557+ </else>
558+ </choose>
559+ </macro>
560+ <macro name="issue">
561+ <choose>
562+ <if type="legal_case">
563+ <text variable="authority" prefix=". "/>
564+ </if>
565+ <else-if type="speech">
566+ <group prefix=". " delimiter=", ">
567+ <group delimiter=" ">
568+ <text variable="genre" text-case="capitalize-first"/>
569+ <text macro="event"/>
570+ </group>
571+ <text variable="event-place"/>
572+ <text macro="day-month"/>
573+ </group>
574+ </else-if>
575+ <else-if type="article-newspaper article-magazine personal_communication" match="any">
576+ <date variable="issued" form="text" prefix=", "/>
577+ </else-if>
578+ <else-if type="patent">
579+ <group delimiter=", " prefix=", ">
580+ <group delimiter=" ">
581+ <!--Needs Localization-->
582+ <text value="filed"/>
583+ <date variable="submitted" form="text"/>
584+ </group>
585+ <group delimiter=" ">
586+ <choose>
587+ <if variable="issued submitted" match="all">
588+ <text term="and"/>
589+ </if>
590+ </choose>
591+ <!--Needs Localization-->
592+ <text value="issued"/>
593+ <date variable="issued" form="text"/>
594+ </group>
595+ </group>
596+ </else-if>
597+ <else-if type="article-journal" match="any"/>
598+ <else>
599+ <group prefix=". " delimiter=", ">
600+ <choose>
601+ <if type="thesis">
602+ <text variable="genre" text-case="capitalize-first"/>
603+ </if>
604+ </choose>
605+ <text macro="publisher"/>
606+ </group>
607+ </else>
608+ </choose>
609+ </macro>
610+ <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year" after-collapse-delimiter="; ">
611+ <layout prefix="(" suffix=")" delimiter="; ">
612+ <group delimiter=", ">
613+ <choose>
614+ <if variable="issued accessed" match="any">
615+ <group delimiter=" ">
616+ <text macro="contributors-short"/>
617+ <text macro="date-in-text"/>
618+ </group>
619+ </if>
620+ <!---comma before forthcoming and n.d.-->
621+ <else>
622+ <group delimiter=", ">
623+ <text macro="contributors-short"/>
624+ <text macro="date-in-text"/>
625+ </group>
626+ </else>
627+ </choose>
628+ <text macro="point-locators"/>
629+ </group>
630+ </layout>
631+ </citation>
632+ <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
633+ <sort>
634+ <key macro="contributors"/>
635+ <key variable="issued"/>
636+ <key variable="title"/>
637+ </sort>
638+ <layout suffix=".">
639+ <group delimiter=". ">
640+ <text macro="contributors"/>
641+ <text macro="date"/>
642+ <text macro="title"/>
643+ </group>
644+ <text macro="description"/>
645+ <text macro="secondary-contributors" prefix=". "/>
646+ <text macro="container-title" prefix=". "/>
647+ <text macro="container-contributors"/>
648+ <text macro="edition"/>
649+ <text macro="locators-chapter"/>
650+ <text macro="collection-title-journal" prefix=", " suffix=", "/>
651+ <text macro="locators"/>
652+ <text macro="collection-title" prefix=". "/>
653+ <text macro="issue"/>
654+ <text macro="locators-article"/>
655+ <text macro="access" prefix=". "/>
656+ </layout>
657+ </bibliography>
658+</style>
data/docx/word/settings.xml+6−16
@@ -1,6 +1,6 @@
11<?xml version="1.0" encoding="UTF-8"?>
22<w:settings xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main">
3− <w:zoom w:percent="90" />
3+ <w:zoom w:percent="100" />
44 <w:embedSystemFonts />
55 <w:proofState w:spelling="clean" w:grammar="clean" />
66 <w:stylePaneFormatFilter w:val="0004" />
@@ -17,31 +17,21 @@
1717 <w:characterSpacingControl w:val="doNotCompress" />
1818 <w:savePreviewPicture />
1919 <w:rsids>
20− <w:rsidRoot w:val="00590D07" />
21− <w:rsid w:val="00011C8B" />
22− <w:rsid w:val="004E29B3" />
23− <w:rsid w:val="00590D07" />
24− <w:rsid w:val="00784D58" />
25− <w:rsid w:val="008D6863" />
26− <w:rsid w:val="00B86B75" />
27− <w:rsid w:val="00BC48D5" />
28− <w:rsid w:val="00C36279" />
29− <w:rsid w:val="00E315A3" />
3020 </w:rsids>
3121 <m:mathPr>
32− <m:mathFont m:val="Lucida Grande" />
22+ <m:mathFont m:val="Cambria Math" />
3323 <m:brkBin m:val="before" />
3424 <m:brkBinSub m:val="--" />
35− <m:smallFrac m:val="false" />
36− <m:dispDef m:val="false" />
25+ <m:smallFrac m:val="0" />
26+ <m:dispDef />
3727 <m:lMargin m:val="0" />
3828 <m:rMargin m:val="0" />
3929 <m:wrapRight />
4030 <m:intLim m:val="subSup" />
41− <m:naryLim m:val="subSup" />
31+ <m:naryLim m:val="undOvr" />
4232 </m:mathPr>
4333 <w:themeFontLang w:val="en-US" />
4434 <w:clrSchemeMapping w:bg1="light1" w:t1="dark1" w:bg2="light2" w:t2="dark2" w:accent1="accent1" w:accent2="accent2" w:accent3="accent3" w:accent4="accent4" w:accent5="accent5" w:accent6="accent6" w:hyperlink="hyperlink" w:followedHyperlink="followedHyperlink" />
4535 <w:decimalSymbol w:val="." />
4636 <w:listSeparator w:val="," />
47−</w:settings>
37+</w:settings>
data/docx/word/styles.xml+19
@@ -350,6 +350,21 @@
350350 <w:right w:w="108" w:type="dxa" />
351351 </w:tblCellMar>
352352 </w:tblPr>
353+ <w:tblStylePr w:type="firstRow">
354+ <w:tblPr>
355+ <w:jc w:val="left"/>
356+ <w:tblInd w:w="0" w:type="dxa"/>
357+ </w:tblPr>
358+ <w:trPr>
359+ <w:jc w:val="left"/>
360+ </w:trPr>
361+ <w:tcPr>
362+ <w:vAlign w:val="bottom"/>
363+ <w:tcBorders>
364+ <w:bottom w:val="single"/>
365+ </w:tcBorders>
366+ </w:tcPr>
367+ </w:tblStylePr>
353368 </w:style>
354369 <w:style w:type="paragraph" w:customStyle="1" w:styleId="DefinitionTerm">
355370 <w:name w:val="Definition Term" />
@@ -414,6 +429,10 @@
414429 <w:sz w:val="22" />
415430 </w:rPr>
416431 </w:style>
432+ <w:style w:type="character" w:customStyle="1" w:styleId="SectionNumber">
433+ <w:name w:val="Section Number" />
434+ <w:basedOn w:val="BodyTextChar" />
435+ </w:style>
417436 <w:style w:type="character" w:styleId="FootnoteReference">
418437 <w:name w:val="Footnote Reference" />
419438 <w:basedOn w:val="BodyTextChar" />
data/epub.css+3−2
@@ -7,9 +7,10 @@ h3 { text-align: left; }
77h4 { text-align: left; }
88h5 { text-align: left; }
99h6 { text-align: left; }
10+/* For title, author, and date on the cover page */
1011h1.title { }
11−h2.author { }
12−h3.date { }
12+p.author { }
13+p.date { }
1314nav#toc ol,
1415nav#landmarks ol { padding: 0; margin-left: 1em; }
1516nav#toc ol li,
data/make-reference-files.hsdeleted−27
@@ -1,27 +0,0 @@
1−import System.Environment
2−import System.Directory
3−import Codec.Archive.Zip
4−import qualified Data.ByteString.Lazy as BS
5−import qualified Control.Exception as E
6−import System.IO.Error (isDoesNotExistError)
7−import System.FilePath
8−
9−mkzip :: String -> IO ()
10−mkzip fmt = do
11− let dir = "data" </> fmt
12− output = "data" </> "reference" <.> fmt
13− cd <- getCurrentDirectory
14− setCurrentDirectory dir
15− archive <- addFilesToArchive [OptRecursive] emptyArchive ["."]
16− setCurrentDirectory cd
17− removeIfExists output
18− BS.writeFile output $ fromArchive archive
19−
20−removeIfExists :: FilePath -> IO ()
21−removeIfExists fileName = removeFile fileName `E.catch` handleExists
22− where handleExists e
23− | isDoesNotExistError e = return ()
24− | otherwise = E.throwIO e
25−
26−main :: IO ()
27−main = getArgs >>= mkzip . (!!0)
data/odt/styles.xml+1−1
@@ -350,7 +350,7 @@ xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2">
350350 </style:style>
351351 <style:style style:name="First_20_paragraph"
352352 style:display-name="First paragraph" style:family="paragraph"
353− style:parent-style-name="Standard"
353+ style:parent-style-name="Text_20_body"
354354 style:next-style-name="Text_20_body" style:class="text" />
355355 <style:style style:name="Numbering_20_Symbols"
356356 style:display-name="Numbering Symbols" style:family="text" />
data/pandoc.lua+27−3
@@ -556,18 +556,18 @@ M.RawBlock = M.Block:create_constructor(
556556
557557--- Creates a table element.
558558-- @function Table
559−-- @tparam Attr attr attributes
560559-- @tparam Caption caption table caption
561560-- @tparam {ColSpec,...} colspecs column alignments and widths
562561-- @tparam TableHead head table head
563562-- @tparam {TableBody,..} bodies table bodies
564563-- @treturn TableFoot foot table foot
564+-- @tparam[opt] Attr attr attributes
565565M.Table = M.Block:create_constructor(
566566 "Table",
567− function(attr, caption, colspecs, head, bodies, foot)
567+ function(caption, colspecs, head, bodies, foot, attr)
568568 return {
569569 c = {
570− attr,
570+ ensureAttr(attr),
571571 caption,
572572 List:new(colspecs),
573573 head,
@@ -1058,6 +1058,30 @@ M.ListAttributes.behavior.__pairs = function(t)
10581058 return make_next_function(fields), t, nil
10591059end
10601060
1061+--
1062+-- Legacy and compatibility types
1063+--
1064+
1065+--- Creates a simple (old style) table element.
1066+-- @function SimpleTable
1067+-- @tparam {Inline,...} caption table caption
1068+-- @tparam {AlignDefault|AlignLeft|AlignRight|AlignCenter,...} aligns alignments
1069+-- @tparam {int,...} widths column widths
1070+-- @tparam {Block,...} headers header row
1071+-- @tparam {{Block,...}} rows table rows
1072+-- @treturn Block table element
1073+M.SimpleTable = function(caption, aligns, widths, headers, rows)
1074+ return {
1075+ caption = ensureInlineList(caption),
1076+ aligns = List:new(aligns),
1077+ widths = List:new(widths),
1078+ headers = List:new(headers),
1079+ rows = List:new(rows),
1080+ tag = "SimpleTable",
1081+ t = "SimpleTable",
1082+ }
1083+end
1084+
10611085
10621086------------------------------------------------------------------------
10631087-- Constants
data/sample.lua+7−8
@@ -21,7 +21,7 @@ local stringify = (require "pandoc.utils").stringify
2121-- configure the writer.
2222local meta = PANDOC_DOCUMENT.meta
2323
24−-- Chose the image format based on the value of the
24+-- Choose the image format based on the value of the
2525-- `image_format` meta value.
2626local image_format = meta.image_format
2727 and stringify(meta.image_format)
@@ -45,9 +45,9 @@ local function escape(s, in_attribute)
4545 return '&gt;'
4646 elseif x == '&' then
4747 return '&amp;'
48− elseif x == '"' then
48+ elseif in_attribute and x == '"' then
4949 return '&quot;'
50− elseif x == "'" then
50+ elseif in_attribute and x == "'" then
5151 return '&#39;'
5252 else
5353 return x
@@ -141,8 +141,8 @@ function Strikeout(s)
141141 return '<del>' .. s .. '</del>'
142142end
143143
144−function Link(s, src, tit, attr)
145− return "<a href='" .. escape(src,true) .. "' title='" ..
144+function Link(s, tgt, tit, attr)
145+ return "<a href='" .. escape(tgt,true) .. "' title='" ..
146146 escape(tit,true) .. "'>" .. s .. "</a>"
147147end
148148
@@ -271,7 +271,7 @@ end
271271
272272-- Convert pandoc alignment to something HTML can use.
273273-- align is AlignLeft, AlignRight, AlignCenter, or AlignDefault.
274−function html_align(align)
274+local function html_align(align)
275275 if align == 'AlignLeft' then
276276 return 'left'
277277 elseif align == 'AlignRight' then
@@ -286,7 +286,7 @@ end
286286function CaptionedImage(src, tit, caption, attr)
287287 return '<div class="figure">\n<img src="' .. escape(src,true) ..
288288 '" title="' .. escape(tit,true) .. '"/>\n' ..
289− '<p class="caption">' .. caption .. '</p>\n</div>'
289+ '<p class="caption">' .. escape(caption) .. '</p>\n</div>'
290290end
291291
292292-- Caption is a string, aligns is an array of strings,
@@ -357,4 +357,3 @@ meta.__index =
357357 return function() return "" end
358358 end
359359setmetatable(_G, meta)
360−
data/templates/.github/ISSUE_TEMPLATE.mddeleted−3
@@ -1,3 +0,0 @@
1−This repository is now maintained as a subtree of
2−[jgm/pandoc](https://github.com/jgm/pandoc). Please open
3−your issue there, not here.
data/templates/.github/PULL_REQUEST_TEMPLATE.mddeleted−4
@@ -1,4 +0,0 @@
1−This repository is now maintained as a subtree of
2−[jgm/pandoc](https://github.com/jgm/pandoc). Please open
3−your pull request there, not here.
4−
data/templates/README.markdowndeleted−49
@@ -1,49 +0,0 @@
1−The [pandoc-templates] repository contains default templates for [pandoc].
2−
3−If you use custom templates, we recommend forking this
4−repository, so that you can integrate changes to the default
5−templates in future pandoc releases.
6−
7−This repository is a subtree of [pandoc]; it will be updated
8−each time there is a new pandoc release. However, changes to
9−templates are made first in [pandoc]; thus, issues and pull
10−requests should be made [pandoc]'s issue tracker rather than
11−here.
12−
13−[pandoc]: https://github.com/jgm/pandoc
14−[pandoc-templates]: https://github.com/jgm/pandoc-templates
15−
16−All of the templates in this repository are dual licensed, under both
17−the GPL (v2 or higher, same as pandoc) and the BSD 3-clause license
18−(included below).
19−
20−Copyright (c) 2014--2019, John MacFarlane
21−
22−All rights reserved.
23−
24−Redistribution and use in source and binary forms, with or without
25−modification, are permitted provided that the following conditions are met:
26−
27−* Redistributions of source code must retain the above copyright
28− notice, this list of conditions and the following disclaimer.
29−
30−* Redistributions in binary form must reproduce the above
31− copyright notice, this list of conditions and the following
32− disclaimer in the documentation and/or other materials provided
33− with the distribution.
34−
35−* Neither the name of John MacFarlane nor the names of other
36− contributors may be used to endorse or promote products derived
37− from this software without specific prior written permission.
38−
39−THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
40−"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
41−LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
42−A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
43−OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
44−SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
45−LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
46−DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
47−THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
48−(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
49−OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
data/templates/affiliations.jatsnew file+38
@@ -0,0 +1,38 @@
1+$--
2+$-- Affiliations
3+$--
4+$for(affiliation)$
5+<aff id="aff-$affiliation.id$">
6+$-- wrap affiliation if it has a known institution identifier
7+$if(affiliation.group)$
8+<institution content-type="group">$affiliation.group$</institution>
9+$endif$
10+$if(affiliation.department)$
11+<institution content-type="dept">$affiliation.department$</institution>
12+$endif$
13+<institution-wrap>
14+$if(affiliation.organization)$
15+<institution>$affiliation.organization$</institution>
16+$else$
17+<institution>$affiliation.name$</institution>
18+$endif$
19+$if(affiliation.isni)$
20+<institution-id institution-id-type="ISNI">$affiliation.isni$</institution-id>
21+$endif$
22+$if(affiliation.ringgold)$
23+<institution-id institution-id-type="Ringgold">$affiliation.ringgold$</institution-id>
24+$endif$
25+$if(affiliation.ror)$
26+<institution-id institution-id-type="ROR">$affiliation.ror$</institution-id>
27+$endif$
28+$for(affiliation.pid)$
29+<institution-id institution-id-type="$affiliation.pid.type$">$affiliation.pid.id$</institution-id>
30+$endfor$
31+</institution-wrap>$if(affiliation.street-address)$,
32+$for(affiliation.street-address)$
33+<addr-line>$affiliation.street-address$</addr-line>$sep$,
34+$endfor$
35+$else$$if(affiliation.city)$, <city>$affiliation.city$</city>$endif$$endif$$if(affiliation.country)$,
36+<country$if(affiliation.country-code)$ country="$affiliation.country-code$"$endif$>$affiliation.country$</country>$endif$
37+</aff>
38+$endfor$
data/templates/article.jats_publishing+23−7
@@ -14,6 +14,13 @@ $endif$
1414$if(journal.pmc)$
1515<journal-id journal-id-type="pmc">$journal.pmc$</journal-id>
1616$endif$
17+$-- Fallback: an empty journal-id in case none is available.
18+$if(journal.publisher-id)$
19+$elseif(journal.nlm-ta)$
20+$elseif(journal.pmc)$
21+$else$
22+<journal-id></journal-id>
23+$endif$
1724<journal-title-group>
1825$if(journal.title)$
1926<journal-title>$journal.title$</journal-title>
@@ -23,10 +30,16 @@ $if(journal.abbrev-title)$
2330$endif$
2431</journal-title-group>
2532$if(journal.pissn)$
26−<issn pub-type="ppub">$journal.pissn$</issn>
33+<issn publication-format="print">$journal.pissn$</issn>
2734$endif$
2835$if(journal.eissn)$
29−<issn pub-type="epub">$journal.eissn$</issn>
36+<issn publication-format="electronic">$journal.eissn$</issn>
37+$endif$
38+$-- At least one issn element is required; use empty issn as fallback
39+$if(journal.pissn)$
40+$elseif(journal.eissn)$
41+$else$
42+<issn></issn>
3043$endif$
3144<publisher>
3245<publisher-name>$journal.publisher-name$</publisher-name>
@@ -73,7 +86,7 @@ $endif$
7386$if(author)$
7487<contrib-group>
7588$for(author)$
76−<contrib contrib-type="author">
89+<contrib contrib-type="author"$if(author.equal-contrib)$ equal-contrib="true"$endif$>
7790$if(author.orcid)$
7891<contrib-id contrib-id-type="orcid">$author.orcid$</contrib-id>
7992$endif$
@@ -82,20 +95,23 @@ $if(author.surname)$
8295<surname>$author.surname$</surname>
8396<given-names>$author.given-names$</given-names>
8497</name>
98+$elseif(author.name)$
99+<string-name>$author.name$</string-name>
85100$else$
86101<string-name>$author$</string-name>
87102$endif$
88103$if(author.email)$
89104<email>$author.email$</email>
90105$endif$
91−$if(author.aff-id)$
92−<xref ref-type="aff" rid="aff-$contrib.aff-id$"/>
93−$endif$
106+$for(author.affiliation)$
107+<xref ref-type="aff" rid="aff-$author.affiliation$"/>
108+$endfor$
94109$if(author.cor-id)$
95110<xref ref-type="corresp" rid="cor-$author.cor-id$"><sup>*</sup></xref>
96111$endif$
97112</contrib>
98113$endfor$
114+${ affiliations.jats() }
99115</contrib-group>
100116$endif$
101117$if(article.author-notes)$
@@ -114,7 +130,7 @@ $endif$
114130</author-notes>
115131$endif$
116132$if(date)$
117−<pub-date pub-type="epub"$if(date.iso-8601)$ iso-8601-date="$date.iso-8601$"$endif$>
133+<pub-date date-type="$if(date.type)$$date.type$$else$pub$endif$" publication-format="electronic"$if(date.iso-8601)$ iso-8601-date="$date.iso-8601$"$endif$>
118134$if(date.day)$
119135<day>$date.day$</day>
120136$endif$
data/templates/default.biblatexnew file+10
@@ -0,0 +1,10 @@
1+$for(header-includes)$
2+$header-includes$
3+$endfor$
4+$for(include-before)$
5+$include-before$
6+$endfor$
7+$body$
8+$for(include-after)$
9+$include-after$
10+$endfor$
data/templates/default.bibtexnew file+10
@@ -0,0 +1,10 @@
1+$for(header-includes)$
2+$header-includes$
3+$endfor$
4+$for(include-before)$
5+$include-before$
6+$endfor$
7+$body$
8+$for(include-after)$
9+$include-after$
10+$endfor$
data/templates/default.context+10−8
@@ -51,6 +51,7 @@ $endif$
5151
5252% use microtypography
5353\definefontfeature[default][default][script=latn, protrusion=quality, expansion=quality, itlc=yes, textitalics=yes, onum=yes, pnum=yes]
54+\definefontfeature[default:tnum][default][tnum=yes, pnum=no]
5455\definefontfeature[smallcaps][script=latn, protrusion=quality, expansion=quality, smcp=yes, onum=yes, pnum=yes]
5556\setupalign[hz,hanging]
5657\setupitaliccorrection[global, always]
@@ -72,9 +73,9 @@ $if(interlinespace)$
7273\setupinterlinespace[$for(interlinespace)$$interlinespace$$sep$,$endfor$]
7374$endif$
7475
75−\setuphead[chapter] [style=\tfd,header=empty]
76−\setuphead[section] [style=\tfc]
77−\setuphead[subsection] [style=\tfb]
76+\setuphead[chapter] [style=\tfd\setupinterlinespace,header=empty]
77+\setuphead[section] [style=\tfc\setupinterlinespace]
78+\setuphead[subsection] [style=\tfb\setupinterlinespace]
7879\setuphead[subsubsection] [style=\bf]
7980\setuphead[subsubsubsection] [style=\sc]
8081\setuphead[subsubsubsubsection][style=\it]
@@ -97,11 +98,12 @@ $endif$
9798\setupitemize[autointro] % prevent orphan list intro
9899\setupitemize[indentnext=no]
99100
101+\defineitemgroup[enumerate]
102+\setupenumerate[each][fit][itemalign=left,distance=.5em,style={\feature[+][default:tnum]}]
103+
100104\setupfloat[figure][default={here,nonumber}]
101105\setupfloat[table][default={here,nonumber}]
102106
103−\setupthinrules[width=15em] % width of horizontal rules
104−
105107\setupxtable[frame=off]
106108\setupxtable[head][topframe=on,bottomframe=on]
107109\setupxtable[body][]
@@ -162,12 +164,12 @@ $endfor$
162164$if(toc)$
163165\completecontent
164166$endif$
165−$if(lot)$
166−\completelistoftables
167−$endif$
168167$if(lof)$
169168\completelistoffigures
170169$endif$
170+$if(lot)$
171+\completelistoftables
172+$endif$
171173
172174$body$
173175
data/templates/default.dzslides+1−1
@@ -171,7 +171,7 @@ $if(subtitle)$
171171 <h1 class="subtitle">$subtitle$</h1>
172172$endif$
173173 <footer>
174− $if(author)$<span class="author">$for(author)$$author$$sep$, $endfor$</span>$endif$ · $if(date)$<span class="date">$date$</span>$endif$
174+ $if(author)$<span class="author">$for(author)$$author$$sep$, $endfor$</span> · $endif$$if(institute)$<span class="institute">$for(institute)$$institute$$sep$, $endfor$</span> · $endif$$if(date)$<span class="date">$date$</span>$endif$
175175 </footer>
176176</section>
177177$endif$
data/templates/default.epub2+1−1
@@ -48,7 +48,7 @@ $endif$
4848$else$
4949$if(coverpage)$
5050<div id="cover-image">
51−<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="100%" height="100%" viewBox="0 0 $cover-image-width$ $cover-image-height$" preserveAspectRatio="none">
51+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="100%" height="100%" viewBox="0 0 $cover-image-width$ $cover-image-height$" preserveAspectRatio="xMidYMid">
5252<image width="$cover-image-width$" height="$cover-image-height$" xlink:href="../media/$cover-image$" />
5353</svg>
5454</div>
data/templates/default.epub3+1−1
@@ -49,7 +49,7 @@ $endif$
4949$else$
5050$if(coverpage)$
5151<div id="cover-image">
52−<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="100%" height="100%" viewBox="0 0 $cover-image-width$ $cover-image-height$" preserveAspectRatio="none">
52+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="100%" height="100%" viewBox="0 0 $cover-image-width$ $cover-image-height$" preserveAspectRatio="xMidYMid">
5353<image width="$cover-image-width$" height="$cover-image-height$" xlink:href="../media/$cover-image$" />
5454</svg>
5555</div>
data/templates/default.html4+3
@@ -12,6 +12,9 @@ $if(date-meta)$
1212$endif$
1313$if(keywords)$
1414 <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
15+$endif$
16+$if(description-meta)$
17+ <meta name="description" content="$description-meta$" />
1518$endif$
1619 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
1720 <style type="text/css">
data/templates/default.html5+3
@@ -12,6 +12,9 @@ $if(date-meta)$
1212$endif$
1313$if(keywords)$
1414 <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
15+$endif$
16+$if(description-meta)$
17+ <meta name="description" content="$description-meta$" />
1518$endif$
1619 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
1720 <style>
data/templates/default.jats_articleauthoring+7−4
@@ -19,7 +19,7 @@ $endif$
1919$if(author)$
2020<contrib-group>
2121$for(author)$
22−<contrib contrib-type="author">
22+<contrib contrib-type="author"$if(author.equal-contrib)$ equal-contrib="true"$endif$>
2323$if(author.orcid)$
2424<contrib-id contrib-id-type="orcid">$author.orcid$</contrib-id>
2525$endif$
@@ -28,20 +28,23 @@ $if(author.surname)$
2828<surname>$author.surname$</surname>
2929<given-names>$author.given-names$</given-names>
3030</name>
31+$elseif(author.name)$
32+<string-name>$author.name$</string-name>
3133$else$
3234<string-name>$author$</string-name>
3335$endif$
3436$if(author.email)$
3537<email>$author.email$</email>
3638$endif$
37−$if(author.aff-id)$
38−<xref ref-type="aff" rid="aff-$contrib.aff-id$"/>
39−$endif$
39+$for(author.affiliation)$
40+<xref ref-type="aff" rid="aff-$author.affiliation$"/>
41+$endfor$
4042$if(author.cor-id)$
4143<xref ref-type="corresp" rid="cor-$author.cor-id$"><sup>*</sup></xref>
4244$endif$
4345</contrib>
4446$endfor$
47+${ affiliations.jats() }
4548</contrib-group>
4649$endif$
4750$if(copyright)$
data/templates/default.latex+80−28
@@ -2,7 +2,7 @@
22\PassOptionsToPackage{unicode$for(hyperrefoptions)$,$hyperrefoptions$$endfor$}{hyperref}
33\PassOptionsToPackage{hyphens}{url}
44$if(colorlinks)$
5−\PassOptionsToPackage{dvipsnames,svgnames*,x11names*}{xcolor}
5+\PassOptionsToPackage{dvipsnames,svgnames,x11names}{xcolor}
66$endif$
77$if(dir)$
88$if(latex-dir-rtl)$
@@ -89,6 +89,7 @@ $endif$
8989$if(beamerarticle)$
9090\usepackage{beamerarticle} % needs to be loaded first
9191$endif$
92+\usepackage{amsmath,amssymb}
9293$if(fontfamily)$
9394\usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$}
9495$else$
@@ -97,15 +98,14 @@ $endif$
9798$if(linestretch)$
9899\usepackage{setspace}
99100$endif$
100−\usepackage{amssymb,amsmath}
101−\usepackage{ifxetex,ifluatex}
102−\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
101+\usepackage{iftex}
102+\ifPDFTeX
103103 \usepackage[$if(fontenc)$$fontenc$$else$T1$endif$]{fontenc}
104104 \usepackage[utf8]{inputenc}
105105 \usepackage{textcomp} % provide euro and other symbols
106106\else % if luatex or xetex
107107$if(mathspec)$
108− \ifxetex
108+ \ifXeTeX
109109 \usepackage{mathspec}
110110 \else
111111 \usepackage{unicode-math}
@@ -129,7 +129,7 @@ $for(fontfamilies)$
129129$endfor$
130130$if(mathfont)$
131131$if(mathspec)$
132− \ifxetex
132+ \ifXeTeX
133133 \setmathfont(Digits,Latin,Greek)[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$}
134134 \else
135135 \setmathfont[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$}
@@ -139,23 +139,42 @@ $else$
139139$endif$
140140$endif$
141141$if(CJKmainfont)$
142− \ifxetex
142+ \ifXeTeX
143143 \usepackage{xeCJK}
144144 \setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$}
145145 \fi
146146$endif$
147147$if(luatexjapresetoptions)$
148− \ifluatex
148+ \ifLuaTeX
149149 \usepackage[$for(luatexjapresetoptions)$$luatexjapresetoptions$$sep$,$endfor$]{luatexja-preset}
150150 \fi
151151$endif$
152152$if(CJKmainfont)$
153− \ifluatex
153+ \ifLuaTeX
154154 \usepackage[$for(luatexjafontspecoptions)$$luatexjafontspecoptions$$sep$,$endfor$]{luatexja-fontspec}
155155 \setmainjfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$}
156156 \fi
157157$endif$
158158\fi
159+$if(zero-width-non-joiner)$
160+%% Support for zero-width non-joiner characters.
161+\makeatletter
162+\def\zerowidthnonjoiner{%
163+ % Prevent ligatures and adjust kerning, but still support hyphenating.
164+ \texorpdfstring{%
165+ \textormath{\nobreak\discretionary{-}{}{\kern.03em}%
166+ \ifvmode\else\nobreak\hskip\z@skip\fi}{}%
167+ }{}%
168+}
169+\makeatother
170+\ifPDFTeX
171+ \DeclareUnicodeCharacter{200C}{\zerowidthnonjoiner}
172+\else
173+ \catcode`^^^^200c=\active
174+ \protected\def ^^^^200c{\zerowidthnonjoiner}
175+\fi
176+%% End of ZWNJ support
177+$endif$
159178$if(beamer)$
160179$if(theme)$
161180\usetheme[$for(themeoptions)$$themeoptions$$sep$,$endfor$]{$theme$}
@@ -219,10 +238,10 @@ $if(keywords)$
219238$endif$
220239$if(colorlinks)$
221240 colorlinks=true,
222− linkcolor=$if(linkcolor)$$linkcolor$$else$Maroon$endif$,
223− filecolor=$if(filecolor)$$filecolor$$else$Maroon$endif$,
224− citecolor=$if(citecolor)$$citecolor$$else$Blue$endif$,
225− urlcolor=$if(urlcolor)$$urlcolor$$else$Blue$endif$,
241+ linkcolor={$if(linkcolor)$$linkcolor$$else$Maroon$endif$},
242+ filecolor={$if(filecolor)$$filecolor$$else$Maroon$endif$},
243+ citecolor={$if(citecolor)$$citecolor$$else$Blue$endif$},
244+ urlcolor={$if(urlcolor)$$urlcolor$$else$Blue$endif$},
226245$else$
227246 hidelinks,
228247$endif$
@@ -254,7 +273,11 @@ $if(highlighting-macros)$
254273$highlighting-macros$
255274$endif$
256275$if(tables)$
257−\usepackage{longtable,booktabs}
276+\usepackage{longtable,booktabs,array}
277+$if(multirow)$
278+\usepackage{multirow}
279+$endif$
280+\usepackage{calc} % for calculating minipage widths
258281$if(beamer)$
259282\usepackage{caption}
260283% Make caption package work with longtable
@@ -321,11 +344,36 @@ $endif$
321344$if(pagestyle)$
322345\pagestyle{$pagestyle$}
323346$endif$
347+$if(csl-refs)$
348+\newlength{\cslhangindent}
349+\setlength{\cslhangindent}{1.5em}
350+\newlength{\csllabelwidth}
351+\setlength{\csllabelwidth}{3em}
352+\newlength{\cslentryspacingunit} % times entry-spacing
353+\setlength{\cslentryspacingunit}{\parskip}
354+\newenvironment{CSLReferences}[2] % #1 hanging-ident, #2 entry spacing
355+ {% don't indent paragraphs
356+ \setlength{\parindent}{0pt}
357+ % turn on hanging indent if param 1 is 1
358+ \ifodd #1
359+ \let\oldpar\par
360+ \def\par{\hangindent=\cslhangindent\oldpar}
361+ \fi
362+ % set entry spacing
363+ \setlength{\parskip}{#2\cslentryspacingunit}
364+ }%
365+ {}
366+\usepackage{calc}
367+\newcommand{\CSLBlock}[1]{#1\hfill\break}
368+\newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{#1}}
369+\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}\break}
370+\newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1}
371+$endif$
324372$for(header-includes)$
325373$header-includes$
326374$endfor$
327375$if(lang)$
328−\ifxetex
376+\ifXeTeX
329377 % Load polyglossia as late as possible: uses bidi with RTL langages (e.g. Hebrew, Arabic)
330378 \usepackage{polyglossia}
331379 \setmainlanguage[$for(polyglossia-lang.options)$$polyglossia-lang.options$$sep$,$endfor$]{$polyglossia-lang.name$}
@@ -333,18 +381,24 @@ $for(polyglossia-otherlangs)$
333381 \setotherlanguage[$for(polyglossia-otherlangs.options)$$polyglossia-otherlangs.options$$sep$,$endfor$]{$polyglossia-otherlangs.name$}
334382$endfor$
335383\else
336− \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$,$endfor$main=$babel-lang$]{babel}
384+ \usepackage[$for(babel-otherlangs)$$babel-otherlangs$,$endfor$main=$babel-lang$]{babel}
385+% get rid of language-specific shorthands (see #6817):
386+\let\LanguageShortHands\languageshorthands
387+\def\languageshorthands#1{}
337388$if(babel-newcommands)$
338389 $babel-newcommands$
339390$endif$
340391\fi
341392$endif$
393+\ifLuaTeX
394+ \usepackage{selnolig} % disable illegal ligatures
395+\fi
342396$if(dir)$
343−\ifxetex
397+\ifXeTeX
344398 % Load bidi as late as possible as it modifies e.g. graphicx
345399 \usepackage{bidi}
346400\fi
347−\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
401+\ifPDFTeX
348402 \TeXXeTstate=1
349403 \newcommand{\RL}[1]{\beginR #1\endR}
350404 \newcommand{\LR}[1]{\beginL #1\endL}
@@ -362,13 +416,11 @@ $for(bibliography)$
362416\addbibresource{$bibliography$}
363417$endfor$
364418$endif$
365−$if(csl-refs)$
366−\newlength{\cslhangindent}
367−\setlength{\cslhangindent}{1.5em}
368−\newenvironment{cslreferences}%
369− {$if(csl-hanging-indent)$\setlength{\parindent}{0pt}%
370− \everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces$endif$}%
371− {\par}
419+$if(nocite-ids)$
420+\nocite{$for(nocite-ids)$$it$$sep$, $endfor$}
421+$endif$
422+$if(csquotes)$
423+\usepackage{csquotes}
372424$endif$
373425
374426$if(title)$
@@ -442,12 +494,12 @@ $endif$
442494}
443495$endif$
444496$endif$
445−$if(lot)$
446−\listoftables
447−$endif$
448497$if(lof)$
449498\listoffigures
450499$endif$
500+$if(lot)$
501+\listoftables
502+$endif$
451503$if(linestretch)$
452504\setstretch{$linestretch$}
453505$endif$
data/templates/default.man+1−1
@@ -1,5 +1,5 @@
11$if(has-tables)$
2−.\"t
2+'\" t
33$endif$
44$if(pandoc-version)$
55.\" Automatically generated by Pandoc $pandoc-version$
data/templates/default.opendocument+1−1
@@ -31,7 +31,7 @@ $include-before$
3131$endfor$
3232$if(toc)$
3333<text:table-of-content>
34− <text:table-of-content-source text:outline-level="10">
34+ <text:table-of-content-source text:outline-level="$toc-depth$">
3535 <text:index-title-template text:style-name="Contents_20_Heading">$toc-title$</text:index-title-template>
3636 <text:table-of-content-entry-template text:outline-level="1"
3737 text:style-name="Contents_20_1">
data/templates/default.org+3−3
@@ -1,12 +1,12 @@
11$if(title)$
2−#+TITLE: $title$
2+#+title: $title$
33
44$endif$
55$if(author)$
6−#+AUTHOR: $for(author)$$author$$sep$; $endfor$
6+#+author: $for(author)$$author$$sep$; $endfor$
77$endif$
88$if(date)$
9−#+DATE: $date$
9+#+date: $date$
1010
1111$endif$
1212$for(header-includes)$
data/templates/default.revealjs+84−122
@@ -52,6 +52,9 @@ $endif$
5252$for(author)$
5353 <p class="author">$author$</p>
5454$endfor$
55+$for(institute)$
56+ <p class="institute">$institute$</p>
57+$endfor$
5558$if(date)$
5659 <p class="date">$date$</p>
5760$endif$
@@ -59,7 +62,12 @@ $endif$
5962$endif$
6063$if(toc)$
6164<section id="$idprefix$TOC">
65+<nav role="doc-toc">
66+$if(toc-title)$
67+<h2 id="$idprefix$toc-title">$toc-title$</h2>
68+$endif$
6269$table-of-contents$
70+</nav>
6371</section>
6472$endif$
6573
@@ -69,7 +77,7 @@ $body$
6977
7078 <script src="$revealjs-url$/dist/reveal.js"></script>
7179
72− // reveal.js plugins
80+ <!-- reveal.js plugins -->
7381 <script src="$revealjs-url$/plugin/notes/notes.js"></script>
7482 <script src="$revealjs-url$/plugin/search/search.js"></script>
7583 <script src="$revealjs-url$/plugin/zoom/zoom.js"></script>
@@ -82,244 +90,198 @@ $endif$
8290 // Full list of configuration options available at:
8391 // https://revealjs.com/config/
8492 Reveal.initialize({
85−$if(controls)$
8693 // Display controls in the bottom right corner
8794 controls: $controls$,
88−$endif$
89−$if(controlsTutorial)$
95+
9096 // Help the user learn the controls by providing hints, for example by
9197 // bouncing the down arrow when they first encounter a vertical slide
9298 controlsTutorial: $controlsTutorial$,
93−$endif$
94−$if(controlsLayout)$
99+
95100 // Determines where controls appear, "edges" or "bottom-right"
96− controlsLayout: $controlsLayout$,
97−$endif$
98−$if(controlsBackArrows)$
101+ controlsLayout: '$controlsLayout$',
102+
99103 // Visibility rule for backwards navigation arrows; "faded", "hidden"
100104 // or "visible"
101− controlsBackArrows: $controlsBackArrows$,
102−$endif$
103−$if(progress)$
105+ controlsBackArrows: '$controlsBackArrows$',
106+
104107 // Display a presentation progress bar
105108 progress: $progress$,
106−$endif$
107−$if(slideNumber)$
109+
108110 // Display the page number of the current slide
109111 slideNumber: $slideNumber$,
110−$endif$
111−$if(hash)$
112+
113+ // 'all', 'print', or 'speaker'
114+ showSlideNumber: '$showSlideNumber$',
115+
112116 // Add the current slide number to the URL hash so that reloading the
113117 // page/copying the URL will return you to the same slide
114118 hash: $hash$,
115−$endif$
119+
120+ // Start with 1 for the hash rather than 0
121+ hashOneBasedIndex: $hashOneBasedIndex$,
122+
123+ // Flags if we should monitor the hash and change slides accordingly
124+ respondToHashChanges: $respondToHashChanges$,
125+
116126 // Push each slide change to the browser history
117−$if(history)$
118127 history: $history$,
119−$else$
120− history: true,
121−$endif$
122−$if(keyboard)$
128+
123129 // Enable keyboard shortcuts for navigation
124130 keyboard: $keyboard$,
125−$endif$
126−$if(overview)$
131+
127132 // Enable the slide overview mode
128133 overview: $overview$,
129−$endif$
130−$if(center)$
134+
135+ // Disables the default reveal.js slide layout (scaling and centering)
136+ // so that you can use custom CSS layout
137+ disableLayout: false,
138+
131139 // Vertical centering of slides
132140 center: $center$,
133−$endif$
134−$if(touch)$
141+
135142 // Enables touch navigation on devices with touch input
136143 touch: $touch$,
137−$endif$
138−$if(loop)$
144+
139145 // Loop the presentation
140146 loop: $loop$,
141−$endif$
142−$if(rtl)$
147+
143148 // Change the presentation direction to be RTL
144149 rtl: $rtl$,
145−$endif$
146−$if(navigationMode)$
150+
147151 // see https://revealjs.com/vertical-slides/#navigation-mode
148152 navigationMode: '$navigationMode$',
149−$endif$
150−$if(shuffle)$
153+
151154 // Randomizes the order of slides each time the presentation loads
152155 shuffle: $shuffle$,
153−$endif$
154−$if(fragments)$
156+
155157 // Turns fragments on and off globally
156158 fragments: $fragments$,
157−$endif$
158−$if(fragmentInURL)$
159+
159160 // Flags whether to include the current fragment in the URL,
160161 // so that reloading brings you to the same fragment position
161162 fragmentInURL: $fragmentInURL$,
162−$endif$
163−$if(embedded)$
163+
164164 // Flags if the presentation is running in an embedded mode,
165165 // i.e. contained within a limited portion of the screen
166166 embedded: $embedded$,
167−$endif$
168−$if(help)$
167+
169168 // Flags if we should show a help overlay when the questionmark
170169 // key is pressed
171170 help: $help$,
172−$endif$
173−$if(showNotes)$
171+
172+ // Flags if it should be possible to pause the presentation (blackout)
173+ pause: $pause$,
174+
174175 // Flags if speaker notes should be visible to all viewers
175176 showNotes: $showNotes$,
176−$endif$
177−$if(autoPlayMedia)$
178− // Global override for autoplaying embedded media (video/audio/iframe)
179− // - null: Media will only autoplay if data-autoplay is present
180− // - true: All media will autoplay, regardless of individual setting
181− // - false: No media will autoplay, regardless of individual setting
177+
178+ // Global override for autoplaying embedded media (null/true/false)
182179 autoPlayMedia: $autoPlayMedia$,
183−$endif$
184−$if(preloadIframes)$
185− // Global override for preloading lazy-loaded iframes
186− // - null: Iframes with data-src AND data-preload will be loaded when within
187− // the viewDistance, iframes with only data-src will be loaded when visible
188− // - true: All iframes with data-src will be loaded when within the viewDistance
189− // - false: All iframes with data-src will be loaded only when visible
180+
181+ // Global override for preloading lazy-loaded iframes (null/true/false)
190182 preloadIframes: $preloadIframes$,
191−$endif$
192−$if(autoSlide)$
183+
193184 // Number of milliseconds between automatically proceeding to the
194185 // next slide, disabled when set to 0, this value can be overwritten
195186 // by using a data-autoslide attribute on your slides
196187 autoSlide: $autoSlide$,
197−$endif$
198−$if(autoSlideStoppable)$
188+
199189 // Stop auto-sliding after user input
200190 autoSlideStoppable: $autoSlideStoppable$,
201−$endif$
202−$if(autoSlideMethod)$
191+
203192 // Use this method for navigation when auto-sliding
204193 autoSlideMethod: $autoSlideMethod$,
205−$endif$
206−$if(defaultTiming)$
194+
207195 // Specify the average time in seconds that you think you will spend
208196 // presenting each slide. This is used to show a pacing timer in the
209197 // speaker view
210198 defaultTiming: $defaultTiming$,
211−$endif$
212−$if(totalTime)$
213− // Specify the total time in seconds that is available to
214− // present. If this is set to a nonzero value, the pacing
215− // timer will work out the time available for each slide,
216− // instead of using the defaultTiming value
217− totalTime: $totalTime$,
218−$endif$
219−$if(minimumTimePerSlide)$
220− // Specify the minimum amount of time you want to allot to
221− // each slide, if using the totalTime calculation method. If
222− // the automated time allocation causes slide pacing to fall
223− // below this threshold, then you will see an alert in the
224− // speaker notes window
225− minimumTimePerSlide: $minimumTimePerSlide$,
226−$endif$
227−$if(mouseWheel)$
199+
228200 // Enable slide navigation via mouse wheel
229201 mouseWheel: $mouseWheel$,
230−$endif$
231−$if(rollingLinks)$
232− // Apply a 3D roll to links on hover
233− rollingLinks: $rollingLinks$,
234−$endif$
235−$if(hideInactiveCursor)$
202+
203+ // The display mode that will be used to show slides
204+ display: '$display$',
205+
236206 // Hide cursor if inactive
237207 hideInactiveCursor: $hideInactiveCursor$,
238−$endif$
239−$if(hideCursorTime)$
208+
240209 // Time before the cursor is hidden (in ms)
241210 hideCursorTime: $hideCursorTime$,
242−$endif$
243−$if(hideAddressBar)$
244− // Hides the address bar on mobile devices
245− hideAddressBar: $hideAddressBar$,
246−$endif$
247−$if(previewLinks)$
211+
248212 // Opens links in an iframe preview overlay
249213 previewLinks: $previewLinks$,
250−$endif$
251−$if(transition)$
252− // Transition style
253− transition: '$transition$', // none/fade/slide/convex/concave/zoom
254−$endif$
255−$if(transitionSpeed)$
256− // Transition speed
257− transitionSpeed: '$transitionSpeed$', // default/fast/slow
258−$endif$
259−$if(backgroundTransition)$
214+
215+ // Transition style (none/fade/slide/convex/concave/zoom)
216+ transition: '$transition$',
217+
218+ // Transition speed (default/fast/slow)
219+ transitionSpeed: '$transitionSpeed$',
220+
260221 // Transition style for full page slide backgrounds
261− backgroundTransition: '$backgroundTransition$', // none/fade/slide/convex/concave/zoom
262−$endif$
263−$if(viewDistance)$
222+ // (none/fade/slide/convex/concave/zoom)
223+ backgroundTransition: '$backgroundTransition$',
224+
264225 // Number of slides away from the current that are visible
265226 viewDistance: $viewDistance$,
266−$endif$
267−$if(mobileViewDistance)$
227+
268228 // Number of slides away from the current that are visible on mobile
269229 // devices. It is advisable to set this to a lower number than
270230 // viewDistance in order to save resources.
271231 mobileViewDistance: $mobileViewDistance$,
272−$endif$
273232$if(parallaxBackgroundImage)$
233+
274234 // Parallax background image
275235 parallaxBackgroundImage: '$parallaxBackgroundImage$', // e.g. "'https://s3.amazonaws.com/hakim-static/reveal-js/reveal-parallax-1.jpg'"
276236$else$
277237$if(background-image)$
238+
278239 // Parallax background image
279240 parallaxBackgroundImage: '$background-image$', // e.g. "'https://s3.amazonaws.com/hakim-static/reveal-js/reveal-parallax-1.jpg'"
280241$endif$
281242$endif$
282243$if(parallaxBackgroundSize)$
244+
283245 // Parallax background size
284246 parallaxBackgroundSize: '$parallaxBackgroundSize$', // CSS syntax, e.g. "2100px 900px"
285247$endif$
286248$if(parallaxBackgroundHorizontal)$
249+
287250 // Amount to move parallax background (horizontal and vertical) on slide change
288251 // Number, e.g. 100
289252 parallaxBackgroundHorizontal: $parallaxBackgroundHorizontal$,
290253$endif$
291254$if(parallaxBackgroundVertical)$
255+
292256 parallaxBackgroundVertical: $parallaxBackgroundVertical$,
293257$endif$
294258$if(width)$
259+
295260 // The "normal" size of the presentation, aspect ratio will be preserved
296261 // when the presentation is scaled to fit different resolutions. Can be
297262 // specified using percentage units.
298263 width: $width$,
299264$endif$
300265$if(height)$
266+
301267 height: $height$,
302268$endif$
303269$if(margin)$
270+
304271 // Factor of the display size that should remain empty around the content
305272 margin: $margin$,
306273$endif$
307274$if(minScale)$
275+
308276 // Bounds for smallest/largest possible scale to apply to content
309277 minScale: $minScale$,
310278$endif$
311279$if(maxScale)$
280+
312281 maxScale: $maxScale$,
313282$endif$
314−$if(zoomKey)$
315− // Modifier key used to click-zoom to part of the slide
316− zoomKey: '$zoomKey$',
317−$endif$
318−$if(display)$
319− // The display mode that will be used to show slides
320− display: $display$,
321−$endif$
322283$if(mathjax)$
284+
323285 math: {
324286 mathjax: '$mathjaxurl$',
325287 config: 'TeX-AMS_HTML-full',
data/templates/default.s5+3
@@ -61,6 +61,9 @@ $endif$
6161$if(author)$
6262 <h3 class="author">$for(author)$$author$$sep$<br/>$endfor$</h3>
6363$endif$
64+$if(institute)$
65+ <h3 class="institute">$for(institute)$$institute$$sep$<br/>$endfor$</h3>
66+$endif$
6467$if(date)$
6568 <h4 class="date">$date$</h4>
6669$endif$
data/templates/default.slideous+7
@@ -63,9 +63,16 @@ $if(title)$
6363$if(subtitle)$
6464 <h1 class="subtitle">$subtitle$</h1>
6565$endif$
66+$if(author)$
6667 <p class="author">
6768$for(author)$$author$$sep$<br/>$endfor$
6869 </p>
70+$endif$
71+$if(institute)$
72+ <p class="institute">
73+$for(institute)$$institute$$sep$<br/>$endfor$
74+ </p>
75+$endif$
6976$if(date)$
7077 <p class="date">$date$</p>
7178$endif$
data/templates/default.slidy+5
@@ -52,6 +52,11 @@ $if(author)$
5252$for(author)$$author$$sep$<br/>$endfor$
5353 </p>
5454$endif$
55+$if(institute)$
56+ <p class="institute">
57+$for(institute)$$institute$$sep$<br/>$endfor$
58+ </p>
59+$endif$
5560$if(date)$
5661 <p class="date">$date$</p>
5762$endif$
data/templates/styles.html+165
@@ -1,3 +1,144 @@
1+$if(document-css)$
2+html {
3+ line-height: $if(linestretch)$$linestretch$$else$1.5$endif$;
4+ font-family: $if(mainfont)$$mainfont$$else$Georgia, serif$endif$;
5+ font-size: $if(fontsize)$$fontsize$$else$20px$endif$;
6+ color: $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
7+ background-color: $if(backgroundcolor)$$backgroundcolor$$else$#fdfdfd$endif$;
8+}
9+body {
10+ margin: 0 auto;
11+ max-width: 36em;
12+ padding-left: $if(margin-left)$$margin-left$$else$50px$endif$;
13+ padding-right: $if(margin-right)$$margin-right$$else$50px$endif$;
14+ padding-top: $if(margin-top)$$margin-top$$else$50px$endif$;
15+ padding-bottom: $if(margin-bottom)$$margin-bottom$$else$50px$endif$;
16+ hyphens: auto;
17+ overflow-wrap: break-word;
18+ text-rendering: optimizeLegibility;
19+ font-kerning: normal;
20+}
21+@media (max-width: 600px) {
22+ body {
23+ font-size: 0.9em;
24+ padding: 1em;
25+ }
26+}
27+@media print {
28+ body {
29+ background-color: transparent;
30+ color: black;
31+ font-size: 12pt;
32+ }
33+ p, h2, h3 {
34+ orphans: 3;
35+ widows: 3;
36+ }
37+ h2, h3, h4 {
38+ page-break-after: avoid;
39+ }
40+}
41+p {
42+ margin: 1em 0;
43+}
44+a {
45+ color: $if(linkcolor)$$linkcolor$$else$#1a1a1a$endif$;
46+}
47+a:visited {
48+ color: $if(linkcolor)$$linkcolor$$else$#1a1a1a$endif$;
49+}
50+img {
51+ max-width: 100%;
52+}
53+h1, h2, h3, h4, h5, h6 {
54+ margin-top: 1.4em;
55+}
56+h5, h6 {
57+ font-size: 1em;
58+ font-style: italic;
59+}
60+h6 {
61+ font-weight: normal;
62+}
63+ol, ul {
64+ padding-left: 1.7em;
65+ margin-top: 1em;
66+}
67+li > ol, li > ul {
68+ margin-top: 0;
69+}
70+blockquote {
71+ margin: 1em 0 1em 1.7em;
72+ padding-left: 1em;
73+ border-left: 2px solid #e6e6e6;
74+ color: #606060;
75+}
76+code {
77+ font-family: $if(monofont)$$monofont$$else$Menlo, Monaco, 'Lucida Console', Consolas, monospace$endif$;
78+$if(monobackgroundcolor)$
79+ background-color: $monobackgroundcolor$;
80+ padding: .2em .4em;
81+$endif$
82+ font-size: 85%;
83+ margin: 0;
84+}
85+pre {
86+ margin: 1em 0;
87+$if(monobackgroundcolor)$
88+ background-color: $monobackgroundcolor$;
89+ padding: 1em;
90+$endif$
91+ overflow: auto;
92+}
93+pre code {
94+ padding: 0;
95+ overflow: visible;
96+ overflow-wrap: normal;
97+}
98+.sourceCode {
99+ background-color: transparent;
100+ overflow: visible;
101+}
102+hr {
103+ background-color: #1a1a1a;
104+ border: none;
105+ height: 1px;
106+ margin: 1em 0;
107+}
108+table {
109+ margin: 1em 0;
110+ border-collapse: collapse;
111+ width: 100%;
112+ overflow-x: auto;
113+ display: block;
114+ font-variant-numeric: lining-nums tabular-nums;
115+}
116+table caption {
117+ margin-bottom: 0.75em;
118+}
119+tbody {
120+ margin-top: 0.5em;
121+ border-top: 1px solid $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
122+ border-bottom: 1px solid $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
123+}
124+th {
125+ border-top: 1px solid $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
126+ padding: 0.25em 0.5em 0.25em 0.5em;
127+}
128+td {
129+ padding: 0.125em 0.5em 0.25em 0.5em;
130+}
131+header {
132+ margin-bottom: 4em;
133+ text-align: center;
134+}
135+#TOC li {
136+ list-style: none;
137+}
138+#TOC a:not(:hover) {
139+ text-decoration: none;
140+}
141+$endif$
1142code{white-space: pre-wrap;}
2143span.smallcaps{font-variant: small-caps;}
3144span.underline{text-decoration: underline;}
@@ -13,3 +154,27 @@ $endif$
13154$if(displaymath-css)$
14155.display.math{display: block; text-align: center; margin: 0.5rem auto;}
15156$endif$
157+$if(csl-css)$
158+div.csl-bib-body { }
159+div.csl-entry {
160+ clear: both;
161+$if(csl-entry-spacing)$
162+ margin-bottom: $csl-entry-spacing$;
163+$endif$
164+}
165+.hanging div.csl-entry {
166+ margin-left:2em;
167+ text-indent:-2em;
168+}
169+div.csl-left-margin {
170+ min-width:2em;
171+ float:left;
172+}
173+div.csl-right-inline {
174+ margin-left:2em;
175+ padding-left:1em;
176+}
177+div.csl-indent {
178+ margin-left: 2em;
179+}
180+$endif$
data/translations/zh-Hans.yamlnew file+22
@@ -0,0 +1,22 @@
1+Abstract: 摘要
2+Appendix: 附录
3+Bibliography: 文献目录
4+Cc: 副本
5+Chapter: 章
6+Contents: 目录
7+Encl: 附件
8+Figure: 图
9+Glossary: 术语
10+Index: 索引
11+Listing: 列表
12+ListOfFigures: 附图目录
13+ListOfTables: 表格索引
14+Page: 页
15+Part: 段
16+Preface: 序
17+Proof: 校对
18+References: 参考文献
19+See: 见
20+SeeAlso: 参见
21+Table: 表
22+To: 到
data/translations/zh-Hant.yamlnew file+22
@@ -0,0 +1,22 @@
1+Abstract: 摘要
2+Appendix: 附錄
3+Bibliography: 文獻目錄
4+Cc: 副本
5+Chapter: 章
6+Contents: 目錄
7+Encl: 附件
8+Figure: 圖
9+Glossary: 術語
10+Index: 索引
11+Listing: 列表
12+ListOfFigures: 附圖目錄
13+ListOfTables: 表格索引
14+Page: 頁
15+Part: 段
16+Preface: 序
17+Proof: 校對
18+References: 參考文獻
19+See: 見
20+SeeAlso: 參見
21+Table: 表
22+To: 到
data/vimwiki.cssdeleted−82
@@ -1,82 +0,0 @@
1−pre{
2− font-size: 1.5em
3−}
4−
5−img {vertical-align: middle}
6−
7−body {font-family: Tahoma, Geneva, sans-serif; margin: 1em 2em 1em 2em; font-size: 120%; line-height: 130%;}
8−h1, h2, h3, h4, h5, h6 {font-family: Trebuchet MS, Helvetica, sans-serif; font-weight: bold; line-height:100%; margin-top: 1.5em; margin-bottom: 0.5em;}
9−h1 {font-size: 2.6em; color: #000000;}
10−h2 {font-size: 2.2em; color: #404040;}
11−h3 {font-size: 1.8em; color: #707070;}
12−h4 {font-size: 1.4em; color: #909090;}
13−h5 {font-size: 1.3em; color: #989898;}
14−h6 {font-size: 1.2em; color: #9c9c9c;}
15−p, pre, blockquote, table, ul, ol, dl {margin-top: 1em; margin-bottom: 1em;}
16−ul ul, ul ol, ol ol, ol ul {margin-top: 0.5em; margin-bottom: 0.5em;}
17−li {margin: 0.3em auto;}
18−ul {margin-left: 2em; padding-left: 0.5em;}
19−dt {font-weight: bold;}
20−img {border: none;}
21−pre {border-left: 1px solid #ccc; margin-left: 2em; padding-left: 0.5em;}
22−blockquote {padding: 0.4em; background-color: #f6f5eb;}
23−th, td {border: 1px solid #ccc; padding: 0.3em;}
24−th {background-color: #f0f0f0;}
25−hr {border: none; border-top: 1px solid #ccc; width: 100%;}
26−del {text-decoration: line-through; color: #777777;}
27−.toc li {list-style-type: none;}
28−.todo {font-weight: bold; background-color: #f0ece8; color: #a03020;}
29−.justleft {text-align: left;}
30−.justright {text-align: right;}
31−.justcenter {text-align: center;}
32−.center {margin-left: auto; margin-right: auto;}
33−div.center > table {margin-left: auto; margin-right: auto;}
34−.tag {background-color: #eeeeee; font-family: monospace; padding: 2px;}
35−
36−/* classes for items of todo lists */
37−.done0 {
38− /* list-style: none; */
39− background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAA7SURBVCiR7dMxEgAgCANBI3yVRzF5KxNbW6wsuH7LQ2YKQK1mkswBVERYF5Os3UV3gwd/jF2SkXy66gAZkxS6BniubAAAAABJRU5ErkJggg==);
40− background-repeat: no-repeat;
41− background-position: 0 .2em;
42− padding-left: 1.5em;
43−}
44−.done1 {
45− background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABtSURBVCiR1ZO7DYAwDER9BDmTeZQMFXmUbGYpOjrEryA0wOvO8itOslFrJYAug5BMM4BeSkmjsrv3aVTa8p48Xw1JSkSsWVUFwD05IqS1tmYzk5zzae9jnVVVzGyXb8sALjse+euRkEzu/uirFomVIdDGOLjuAAAAAElFTkSuQmCC);
46− background-repeat: no-repeat;
47− background-position: 0 .15em;
48− padding-left: 1.5em;
49−}
50−.done2 {
51− background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAB1SURBVCiRzdO5DcAgDAVQGxjAYgTvxlDIu1FTIRYAp8qlFISkSH7l5kk+ZIwxKiI2mIyqWoeILYRgZ7GINDOLjnmF3VqklKCUMgTee2DmM661Qs55iI3Zm/1u5h9sm4ig9z4ERHTFzLyd4G4+nFlVrYg8+qoF/c0kdpeMsmcAAAAASUVORK5CYII=);
52− background-repeat: no-repeat;
53− background-position: 0 .15em;
54− padding-left: 1.5em;
55−}
56−.done3 {
57− background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABoSURBVCiR7dOxDcAgDATA/0DtUdiKoZC3YhLkHjkVKF3idJHiztKfvrHZWnOSE8Fx95RJzlprimJVnXktvXeY2S0SEZRSAAAbmxnGGKH2I5T+8VfxPhIReQSuuY3XyYWa3T2p6quvOgGrvSFGlewuUAAAAABJRU5ErkJggg==);
58− background-repeat: no-repeat;
59− background-position: 0 .15em;
60− padding-left: 1.5em;
61−}
62−.done4 {
63− background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAQCAYAAAAbBi9cAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAzgAAAM4BlP6ToAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAIISURBVDiNnZQ9SFtRFMd/773kpTaGJoQk1im4VDpWQcTNODhkFBcVTCNCF0NWyeDiIIiCm82QoIMIUkHUxcFBg1SEQoZszSat6cdTn1qNue92CMbEr9Sey+XC/Z/zu+f8h6ukUil3sVg0+M+4cFxk42/jH2wAqqqKSCSiPQdwcHHAnDHH9s/tN1h8V28ETdP+eU8fT9Nt62ancYdIPvJNtsu87bmjrJlrTDVM4RROJs1JrHPrD4Bar7A6cpc54iKOaTdJXCUI2UMVrQZ0Js7YPN18ECKkYNQcJe/OE/4dZsw7VqNXQMvHy3QZXQypQ6ycrtwDjf8aJ+PNEDSCzLpn7+m2pD8ZKHlKarYhy6XjEoCYGcN95qansQeA3fNdki+SaJZGTMQIOoL3W/Z89rxv+tokubNajlvk/vm+LFpF2XnUKZHI0I+QrI7Dw0OZTqdzUkpsM7mZTyfy5OPGyw1tK7AFSvmB/Ks8w8YwbUYbe6/3QEKv0vugfxWPnMLJun+d/kI/WLdizpNjMbAIKrhMF4OuwadBALqqs+RfInwUvuNi+fBd+wjogfogAFVRmffO02q01mZZ0HHdgXIzdz0QQLPezIQygX6llxNKKgOFARYCC49CqhoHIUTlss/Vx2phlYwjw8j1CAlfAiwQiJpiy7o1VHnsG5FISkoJu7Q/2YmmaV+i0ei7v38L2CBguSi5AAAAAElFTkSuQmCC);
64− background-repeat: no-repeat;
65− background-position: 0 .15em;
66− padding-left: 1.5em;
67−}
68−
69−*:not(pre) > code {
70− font-family: Monaco,"Courier New","DejaVu Sans Mono","Bitstream Vera Sans Mono",monospace;
71− -webkit-border-radius: 1px;
72− -moz-border-radius: 1px;
73− border-radius: 1px;
74− -moz-background-clip: padding;
75− -webkit-background-clip: padding-box;
76− background-clip: padding-box;
77− padding: 0px 3px;
78− display: inline-block;
79− color: #52595d;
80− border: 1px solid #ccc;
81− background-color: #f9f9f9;
82−}
default.nixnew file+13
@@ -0,0 +1,13 @@
1+# default.nix
2+let
3+ pkgs = import <nixpkgs> { };
4+in
5+ pkgs.haskellPackages.developPackage {
6+ root = ./.;
7+ modifier = drv:
8+ pkgs.haskell.lib.addBuildTools drv (with pkgs.haskellPackages;
9+ [ cabal-install
10+ ghcid
11+ ]);
12+ }
13+
doc/epub.md+9−2
@@ -141,8 +141,15 @@ Pandoc has an EPUB3 writer. It renders LaTeX math into MathML, which
141141EPUB3 readers are supposed to support (but unfortunately few do).
142142
143143Of course, this isn't much help if you want EPUB2 output (`pandoc -t epub2`)
144−or target readers that don't support MathML. Then you should try using the
145−`--webtex` option, which will use a web service to convert the TeX to an image.
144+or target readers that don't support MathML. Then you have two options:
145+
146+1. Use the [`--webtex`](https://pandoc.org/MANUAL.html#option--webtex) option,
147+ which will use a web service to convert the TeX to an image.
148+2. Use the [`--gladtex`](https://pandoc.org/MANUAL.html#option--gladtex) option
149+ to convert maths into SVG images on your local machine.
150+
151+Both GladTeX and WebTeX add the LaTeX source of the formula as alternative text
152+of the image, increasing accessibility for blind users.
146153
147154[KindleGen]: https://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211
148155[EPUB]: https://en.wikipedia.org/wiki/EPUB
doc/faqs.mdnew file+128
@@ -0,0 +1,128 @@
1+% FAQs
2+
3+::: faqs
4+
5+## How can I convert a whole directory of files from Markdown to RTF?
6+
7+On linux or OSX:
8+
9+ for f in *.txt; do pandoc "$f" -s -o "${f%.txt}.rtf"; done
10+
11+
12+In Windows Powershell:
13+
14+ gci -r -i *.txt |foreach{$rtf=$_.directoryname+"\"+$_.basename+".rtf";pandoc -f markdown -s $_.name -o $rtf}
15+
16+## I used pandoc to convert a document to ICML (or OPML or RTF), and when I try to open it I'm told it's invalid. What have I done wrong?
17+
18+Be sure to use the `-s` or `--standalone` flag, or you just get a
19+fragment, not a full document with the required header:
20+
21+ pandoc -s -f markdown -t icml -o my.icml my.md
22+
23+## I get a blank document when I try to convert a markdown document in Chinese to PDF.
24+
25+By default, pandoc uses pdflatex to generate the PDF, and pdflatex
26+doesn't handle Chinese characters. But you can change the default to
27+use xelatex instead. You should also make sure you're using a font
28+with Chinese glyphs. For example:
29+
30+ pandoc -o c.pdf --pdf-engine=xelatex -V mainfont='Adobe Ming Std'
31+
32+## The Windows installer does a single user install, rather than installing pandoc for all users. How can I install pandoc for all users?
33+
34+Run the following command as admin:
35+
36+ msiexec /i pandoc-VERSION.msi ALLUSERS=1
37+
38+This will put pandoc in `C:\Program Files\Pandoc`.
39+You can install Pandoc to a different directory by setting APPLICATIONFOLDER parameter,
40+for example:
41+
42+ msiexec /i pandoc-1.11.1.msi ALLUSERS=1 APPLICATIONFOLDER="C:\Pandoc"
43+
44+## How do I change the margins in PDF output?
45+
46+The option
47+
48+ -V geometry:margin=1in
49+
50+will set the margins to one inch on each side. If you don't want uniform
51+margins, you can do something like
52+
53+ -V geometry:"top=2cm, bottom=1.5cm, left=1cm, right=1cm"
54+
55+Or
56+
57+ -V geometry:"left=3cm, width=10cm"
58+
59+For more options, see the documentation for the LaTeX [geometry
60+package](https://www.ctan.org/pkg/geometry).
61+
62+## How does pandoc compare to multimarkdown?
63+
64+Here is a [wiki
65+page](https://github.com/jgm/pandoc/wiki/Pandoc-vs-Multimarkdown)
66+comparing the two.
67+
68+## When I specify an image width of 50% and convert to LaTeX, pandoc sets the height to textheight and the aspect ratio isn't preserved. How can I prevent this?
69+
70+For example, if you convert an image with `{width="50%"}`, the LaTeX produced
71+will be `\includegraphics[width=0.5\textwidth,height=\textheight]`.
72+
73+This output presupposes the following code in pandoc's default latex
74+template:
75+
76+```
77+% Scale images if necessary, so that they will not overflow the page
78+% margins by default, and it is still possible to overwrite the defaults
79+% using explicit options in \includegraphics[width, height, ...]{}
80+\setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio}
81+```
82+
83+If you don't have this in your custom template, you should
84+add it. If we didn't set the `height` explicitly in this way,
85+the image would not be resized correctly unless it was
86+being resized to smaller than its original size.
87+
88+## Pandoc sometimes uses too much memory. How can I limit the memory used by pandoc?
89+
90+`pandoc +RTS -M30m -RTS` will limit heap memory to 30MB.
91+When converting a document requires more than this, an out of
92+memory error will be issued.
93+
94+## When using `--include-in-header` with PDF or LaTeX output, how do I reference tex declarations coming after `$header-includes$` in the default template?
95+
96+For various reasons, the `$header-includes$` are not at the very
97+end of the LaTeX preamble. This poses a problem when the code
98+you are inserting depends on declarations in the preamble coming
99+after the `$header-includes$` location. For example, you might
100+want to reference the `\author` and `\title` metadata values
101+(set at the very bottom of the preamble) and present them in
102+margins. In that case you can wrap your code in `etoolbox`'s
103+`\AtEndPreamble`. The technique is demonstrated in [this
104+gist](https://gist.github.com/JohnLukeBentley/9dda6166b9ee5c4127afd2b8cd16b70a).
105+When using `\AtEndPreamble`, keep any `makeatletter` or
106+`makeatother` outside of the `\AtEndPreamble`, as shown in the
107+example.
108+
109+## How can I convert PDFs to other formats using pandoc?
110+
111+You can't. You can try opening the PDF in Word or Google Docs
112+and saving in a format from which pandoc can convert directly.
113+
114+## Do I really need to install a 1 GB TeX installation to produce a PDF using pandoc?
115+
116+No. You can get by with a relatively small TeX installation,
117+for example, by starting with MacTeX's Basic TeX distribution
118+and using the `tlmgr` tool to install a few packages required by pandoc
119+(see https://pandoc.org/MANUAL.html#creating-a-pdf).
120+
121+Or, you can produce PDFs via HTML and `wkhtmltopdf`,
122+or via groff ms and `pdfroff`. (These don't produce as nice
123+topography as TeX, particularly when it comes to math, but they
124+may be fine for many purposes.)
125+
126+
127+:::
128+
doc/filters.md+91−6
@@ -253,12 +253,15 @@ repository](https://github.com/jgm/pandocfilters).
253253
254254For a more Pythonic alternative to pandocfilters, see
255255the [panflute](https://pypi.org/project/panflute) library.
256−Don't like Python? There are also ports of pandocfilters in
257−[PHP](https://github.com/vinai/pandocfilters-php),
258−[perl](https://metacpan.org/pod/Pandoc::Filter),
259−[javascript/node.js](https://github.com/mvhenderson/pandoc-filter-node),
260−[Groovy](https://github.com/dfrommi/groovy-pandoc), and
261−[Ruby](https://heerdebeer.org/Software/markdown/paru/).
256+Don't like Python? There are also ports of pandocfilters in
257+
258+- [PHP](https://github.com/vinai/pandocfilters-php),
259+- [perl](https://metacpan.org/pod/Pandoc::Filter),
260+- TypeScript/JavaScript via Node.js
261+ - [pandoc-filter](https://github.com/mvhenderson/pandoc-filter-node),
262+ - [node-pandoc-filter](https://github.com/mu-io/node-pandoc-filter),
263+- [Groovy](https://github.com/dfrommi/groovy-pandoc), and
264+- [Ruby](https://heerdebeer.org/Software/markdown/paru/).
262265
263266Starting with pandoc 2.0, pandoc includes built-in support for
264267writing filters in lua. The lua interpreter is built in to
@@ -391,6 +394,8 @@ automatically assign it `Just` the target format or `Nothing`.
391394
392395We compile our script:
393396
397+ # first, make sure pandoc-types is installed:
398+ cabal install --lib pandoc-types --package-env .
394399 ghc --make handleRuby
395400
396401Then run it:
@@ -425,3 +430,83 @@ the Japanese characters (e.g. "Noto Sans CJK TC"), and add
4254305. Find all code blocks with class `python` and run them
426431 using the python interpreter, printing the results to the console.
427432
433+# Technical details of JSON filters
434+
435+A JSON filter is any program which can consume and produce a
436+valid pandoc JSON document representation. This section describes
437+the technical details surrounding the invocation of filters.
438+
439+## Arguments
440+
441+The program will always be called with the target format as the
442+only argument. A pandoc invocation like
443+
444+ pandoc --filter demo --to=html
445+
446+will cause pandoc to call the program `demo` with argument `html`.
447+
448+## Environment variables
449+
450+Pandoc sets additional environment variables before calling a
451+filter.
452+
453+`PANDOC_VERSION`
454+: The version of the pandoc binary used to process the document.
455+ Example: `2.11.1`.
456+
457+`PANDOC_READER_OPTIONS`
458+: JSON object representation of the options passed to the input
459+ parser.
460+
461+ Object fields:
462+
463+ `readerAbbreviations`
464+ : set of known abbreviations (array of strings).
465+
466+ `readerColumns`
467+ : number of columns in terminal; an integer.
468+
469+ `readerDefaultImageExtension`
470+ : default extension for images; a string.
471+
472+ `readerExtensions`
473+ : integer representation of the syntax extensions bit
474+ field.
475+
476+ `readerIndentedCodeClasses`
477+ : default classes for indented code blocks; array of
478+ strings.
479+
480+ `readerStandalone`
481+ : whether the input was a standalone document with header;
482+ either `true` or `false`.
483+
484+ `readerStripComments`
485+ : HTML comments are stripped instead of parsed as raw HTML;
486+ either `true` or `false`.
487+
488+ `readerTabStop`
489+ : width (i.e. equivalent number of spaces) of tab stops;
490+ integer.
491+
492+ `readerTrackChanges`
493+ : track changes setting for docx; one of
494+ `"accept-changes"`, `"reject-changes"`, and
495+ `"all-changes"`.
496+
497+## Supported interpreters
498+
499+Files passed to the `--filter`/`-F` parameter are expected to be
500+executable. However, if the executable bit is not set, then
501+pandoc tries to guess a suitable interpreter from the file
502+extension.
503+
504+ file extension interpreter
505+ ---------------- --------------
506+ .py `python`
507+ .hs `runhaskell`
508+ .pl `perl`
509+ .rb `ruby`
510+ .php `php`
511+ .js `node`
512+ .r `Rscript`
doc/jats.mdnew file+414
@@ -0,0 +1,414 @@
1+---
2+title: JATS
3+author: Albert Krewinkel
4+---
5+
6+This document describes pandoc's handling of JATS.
7+
8+Metadata Values
9+===============
10+
11+`abstract`
12+: Article summary. Added via the document's front matter via the
13+ [`<abstract>`][elem:abstract] element.
14+
15+`author`
16+: list of article contributors. Each author should have a surname
17+ and a given name listed in the entry; if the author has no
18+ `surname` value, then the item will be used as the contributors
19+ [`string-name`][elem:string-name].
20+
21+ `orcid`
22+ : the contributor's ORCID identifier.
23+
24+ `surname`
25+ : surname of the contributor. Usually the family name in
26+ western names.
27+
28+ See [`<surname>`][elem:surname].
29+
30+ `given-names`
31+ : personal names of the contributor; this includes middle
32+ names (if any) in western-style names.
33+
34+ See [`<given-names>`][elem:given-names].
35+
36+ `name`
37+ : full name of the author; included only as a fallback if
38+ `author.surname` is not available. Tagged with
39+ [`<string-name>`][elem:string-name].
40+
41+ `email`
42+ : the contributor's email address.
43+
44+ Used as the contents of the [`<email>`][elem:given-names]
45+ element.
46+
47+ `affiliation`
48+ : list of affiliation identifiers; marks the organizations
49+ with which an author is affiliated. Each identifier in this
50+ list must also occur as the `id` of an affiliation listed in
51+ the top-level `affiliation` list.
52+
53+ `equal-contrib`
54+ : boolean attribute used to mark authors who contributed
55+ equally to the work. The
56+ [`equal-contrib`][attr:equal-contrib] attribute is added
57+ to the author's [`<contrib>`] element if this is set to a
58+ truthy value.
59+
60+ `cor-id`
61+ : identifier linking to the contributor's correspondence
62+ information. The info itself must be stored in as an item in
63+ `article.author-notes.corresp`. If the `cor-id` value is
64+ then, an [`<xref>`][elem:xref] link of
65+ [`ref-type`][attr:ref-type] `corresp` is added. The
66+ [`rid`][attr:rid] attribute is set to `cor-<ID>`, where
67+ `<ID>` is the stringified value of this attribute.
68+
69+`affiliation`
70+: the list of organizations with which contributors are
71+ affiliated. Each institution is added as an [`<aff>`] element to
72+ the author's contrib-group.
73+
74+ The fields are given in the order in which they are included in
75+ the output.
76+
77+ `id`
78+ : internal identifier; used as the [`<aff>`] element's `id`
79+ value, prefixed with `aff-`.
80+
81+ `group`
82+ : name of the research group or other low-level organizational
83+ structure; used as value of an [`<institution>`] element with
84+ [`content-type`][attr:content-type] set to `group`.
85+
86+ `department`
87+ : name of the department or other mid-level organizational
88+ structure; used as value of an [`<institution>`] element with
89+ [`content-type`][attr:content-type] set to `dept`.
90+
91+ `organization`
92+ : name of the company, university, or other top-level
93+ organizational structure; used as value of an
94+ [`<institution>`] element. The institution element is wrapped
95+ in an [`<institution-wrap>`] element; any identifiers, like
96+ `ringgold` or `ror`, are added to the wrapper and must hence
97+ belong to this organization (not the department or group).
98+
99+ `isni`
100+ : International Standard Name Identifier of the organization.
101+ Added via an [`<institution-id>`] element with
102+ [`institution-id-type`](attr:institution-id-type) set to
103+ `ISNI`.
104+
105+ `ringgold`
106+ : [Ringgold] identifier of the organization. Added via an
107+ [`<institution-id>`] element with
108+ [`institution-id-type`](attr:institution-id-type) set to
109+ `Ringgold`.
110+
111+ `ror`
112+ : Research Organization Registry identifier of the
113+ organization. Added via an [`<institution-id>`] element with
114+ [`institution-id-type`](attr:institution-id-type) set to
115+ `ROR`.
116+
117+ `pid`
118+ : Array of persistent identifiers which are added as
119+ [`<institution-id>`] elements. Each item must contain a map
120+ with keys `type`, used as
121+ [`institution-id-type`](attr:institution-id-type), and `id`,
122+ used as element content.
123+
124+ `street-address`
125+ : The organization's street address; each list item is wrapped
126+ in an [`<addr-line>`] element, separated by a comma and
127+ space (`, `).
128+
129+ `city`
130+ : City in which the organization is located; used only if
131+ `street-address` is not given, in which case the value is
132+ wrapped in a [`<city>`] element.
133+
134+ `country`
135+ : Country in which the organization is located; used as the
136+ value of a [`<country>`] element.
137+
138+ `country-code`
139+ : Two letter ISO-3166-1 country identifier; used as the
140+ [`country`][attr:country] attribute in element [`<country>`]
141+ (if the latter is present).
142+
143+`copyright`
144+: Licensing and copyright information. This information is
145+ rendered via the [`<permissions>`][elem:permissions] element.
146+
147+ The variables `type`, `link`, and `text` should always be used
148+ together.
149+
150+ `statement`
151+ : the year of copyright; used as content of the
152+ [`<copyright-statement>`][elem:copyright-statement]
153+
154+ `year`
155+ : the year of copyright; used as content of the
156+ [`<copyright-year>`][elem:copyright-year]
157+
158+ `holder`
159+ : the copyright holder; included via the
160+ [`<copyright-holder>`][elem:copyright-holder] element.
161+
162+ `text`
163+ : inline text setting the license under which the text is
164+ published; included via the
165+ [`<license-p>`][elem:copyright-holder] element.
166+
167+ `type`
168+ : type of the license; used as value of the
169+ [`license-type`][attr:license-type] attribute.
170+
171+ `link`
172+ : external link describing the license; used as value of a
173+ `xlink:href` attribute in the `<license>` element.
174+
175+`date`
176+: publication date. This value should usually be a string
177+ representation of a date. Pandoc will parse and deconstruct the
178+ date into the components given below. It is also possible to
179+ pass these components directly.
180+
181+ The publication date is recorded in the document via the
182+ [`<pub-date>`] element and its sub-elements. The
183+ [`publication-format`][attr:publication-format] attribute is
184+ always set to `electronic`.
185+
186+ `iso-8601`
187+ : ISO-8601 representation of the publication date. Used as the
188+ value of the [`<pub-date>`] element's
189+ [`iso-8601-date`][attr:iso-8601-date] attribute.
190+
191+ This value is set automatically if pandoc can parse the
192+ `date` value as a date.
193+
194+ `day`, `month`, `year`
195+ : Day, month, and year of the publication date. Only the
196+ publication year is required. The values are used as the
197+ contents of the elements with the respective names.
198+
199+ The values are set automatically if pandoc can parse the
200+ `date` value as a date.
201+
202+ `type`
203+ : The type of event marked by this date. The value is set as
204+ the [`date-type`][attr:date-type] attribute on the
205+ [`<pub-date>`] element and defaults to "pub" if not
206+ specified.
207+
208+`article`
209+: information concerning the article that identifies or describes
210+ it. The key-value pairs within this map are typically used
211+ within the [`<article-meta>`][elem:article-meta] element.
212+
213+ `publisher-id`
214+ : external article identifier assigned by the publisher. Used
215+ as the content of the [`<article-id>`][elem:article-id]
216+ element with attribute [`pub-id-type`][attr:pub-id-type] set
217+ to `publisher-id`.
218+
219+ `doi`
220+ : Digital Object Identifier (DOI) assigned to the article.
221+ Used as the content of the [`<article-id>`][elem:article-id]
222+ element with attribute [`pub-id-type`][attr:pub-id-type] set
223+ to `doi`.
224+
225+ `pmid`
226+ : PubMed Identifier (PubMed ID) assigned to the article. Used
227+ as the content of the [`<article-id>`][elem:article-id]
228+ element with attribute [`pub-id-type`][attr:pub-id-type] set
229+ to `pmid`.
230+
231+ `pmcid`
232+ : PubMed Central Identifier assigned to the article. Used as
233+ the content of the [`<article-id>`][elem:article-id] element
234+ with attribute [`pub-id-type`][attr:pub-id-type] set to
235+ `pmcid`.
236+
237+ `art-access-id`
238+ : generic article accession identifier. Used as the content of
239+ the [`<article-id>`][elem:article-id] element with attribute
240+ [`pub-id-type`][attr:pub-id-type] set to `art-access-id`.
241+
242+ `heading`
243+ : name of a subject or topic describing the article. Used as
244+ the content of the [`<subject>`][elem:subject] element,
245+ nested in a [`<subj-group>`][elem:subj-group] element which
246+ has `heading` as its
247+ [`subj-group-type`][attr:subj-group-type] attribute.
248+
249+ `categories`
250+ : list a subject or topic describing the article. Items are
251+ each used as the content a the [`<subject>`][elem:subject]
252+ element, grouped in a single
253+ [`<subj-group>`][elem:subj-group] element with its
254+ [`subj-group-type`][attr:subj-group-type] attribute set to
255+ `categories`.
256+
257+ `author-notes`
258+ : Additional information about authors, like conflict of
259+ interest statements and corresponding author contact info.
260+ Wrapped in an [`<author-notes>`][elem:author-notes] element.
261+
262+ `conflict`
263+ : Conflict of interest statement. Rendered as a footnote
264+ ([`<fn>`][elem:fn]) of [`fn-type`](attr:fn-type)
265+ `conflict`.
266+
267+ `con`
268+ : Contributed-by information. Rendered as a footnote
269+ ([`<fn>`][elem:fn]) of [`fn-type`](attr:fn-type) `con`.
270+
271+ `corresp`
272+ : Correspondence information. This must be a list of
273+ contributor correspondence items, where each item must
274+ have the properties `id` and `email`. The info is then
275+ rendered via a [`<corresp>`][elem:corresp] element.
276+
277+ `funding-statement`
278+ : Prose describing the funding. Added to the article's
279+ frontmatter via the
280+ [`funding-statement`][elem:funding-statement] element.
281+
282+`journal`
283+: information on the journal in which the article is published.
284+ This must be a map; the following key/value pairs are
285+ recognized.
286+
287+ `publisher-id`
288+ : journal identifier assigned by the publisher. Used as
289+ content of element [`<journal-id>`][elem:journal-id] with
290+ attribute [`journal-id-type`][attr:journal-id-type] set to
291+ `publisher-id`.
292+
293+ `nlm-ta`
294+ : journal identifier assigned by PubMed. Used as content of
295+ element [`<journal-id>`][elem:journal-id] with attribute
296+ [`journal-id-type`][attr:journal-id-type] set to `nlm-ta`.
297+
298+ `pmc`
299+ : journal identifier assigned by PubMed Central. Used as
300+ content of element [`<journal-id>`][elem:journal-id] with
301+ attribute [`journal-id-type`][attr:journal-id-type] set to
302+ `pmc`.
303+
304+ `title`
305+ : full title of the journal in which the article is published.
306+ Used as content of the
307+ [`<journal-title>`][elem:journal-title] element.
308+
309+ `abbrev-title`
310+ : short form of the journal title. Used as content of the
311+ [`<abbrev-journal-title>`][elem:abbrev-journal-title]
312+ element.
313+
314+ `pissn`
315+ : ISSN identifier of the publication's print version. Used as
316+ content of the [`<issn>`][elem:issn] element with the
317+ [`publication-format`][attr:publication-format] attribute
318+ set to `print`.
319+
320+ `eissn`
321+ : ISSN identifier of the publication's electronic version.
322+ Used as content of the [`<issn>`][elem:issn] element with
323+ the [`publication-format`][attr:publication-format]
324+ attribute set to `electronic`.
325+
326+ `publisher-name`
327+ : name of the publishing entity (person, company, or other).
328+ Used as the content of the
329+ [`<publisher-name>`][elem:publisher-name] element.
330+
331+ `publisher-loc`
332+ : place of publication. Used as the content of the
333+ [`<publisher-loc>`][elem:publisher-loc] element.
334+
335+`notes`
336+: Additional notes concerning the whole article. Added to the
337+ article's frontmatter via the [`<notes>`][elem:notes] element.
338+
339+`tags`
340+: list of keywords. Items are used as contents of the
341+ [`<kwd>`][elem:kwd] element; the elements are grouped in a
342+ [`<kwd-group>`][elem:kwd-group] with the
343+ [`kwd-group-type`][attr:kwd-group-type] value `author`.
344+
345+Required Metadata
346+-----------------
347+
348+Pandoc will try to generate a valid JATS document even when
349+information is missing, filling in placeholders or using empty
350+values. This circumvents the intend to ensure a minimum set of
351+information being present in documents of a certain tag set. It is
352+hence recommended to always provide the information listed below.
353+
354+### Publishing Tag Set
355+
356+Required metadata values:
357+
358+- One or more of `journal.publisher-id`, `journal.nlm-ta`,
359+ `journal.pmc`.
360+- One or more of `journal.pissn`, `journal.eissn`.
361+
362+[Ringgold]: https://ringgold.com/
363+[attr:content-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/content-type.html
364+[attr:date-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/date-type.html
365+[attr:equal-contrib]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/equal-contrib.html
366+[attr:fn-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/fn-type.html
367+[attr:institution-id-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/institution-id-type.html
368+[attr:iso-8601-date]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/iso-8601-date.html
369+[attr:journal-id-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/journal-id-type.html
370+[attr:kwd-group-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/kwd-group-type.html
371+[attr:license-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/license-type.html
372+[attr:pub-id-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/pub-id-type.html
373+[attr:publication-format]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/publication-format.html
374+[attr:ref-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/ref-type.html
375+[attr:rid]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/rid.html
376+[attr:subj-group-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/subj-group-type.html
377+[elem:abbrev-journal-title]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/abbrev-journal-title.html
378+[elem:abstract]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/abstract.html
379+[elem:article-id]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/article-id.html
380+[elem:article-meta]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/article-meta.html
381+[elem:copyright-holder]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/copyright-holder.html
382+[elem:copyright-statement]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/copyright-statement.html
383+[elem:copyright-year]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/copyright-year.html
384+[elem:corresp]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/corresp.html
385+[elem:email]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/email.html
386+[elem:fn]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/fn.html
387+[elem:funding-statement]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/funding-statement.html
388+[elem:given-names]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/given-names.html
389+[elem:issn]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/issn.html
390+[elem:journal-id]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/journal-id.html
391+[elem:journal-title]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/journal-title.html
392+[elem:kwd-group]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/kwd-group.html
393+[elem:kwd]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/kwd.html
394+[elem:license-p]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/license-p.html
395+[elem:license]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/license.html
396+[elem:notes]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/notes.html
397+[elem:permissions]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/permissions.html
398+[elem:publisher-loc]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/publisher-loc.html
399+[elem:publisher-name]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/publisher-name.html
400+[elem:string-name]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/string-name.html
401+[elem:subj-group]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/subj-group.html
402+[elem:subject]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/subject.html
403+[elem:surname]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/surname.html
404+[elem:xref]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/xref.html
405+
406+[`<addr-line>`]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/addr-line.html
407+[`<aff>`]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/aff.html
408+[`<city>`]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/city.html
409+[`<contrib>`]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/contrib.html
410+[`<country>`]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/country.html
411+[`<institution-id>`]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/institution-id.html
412+[`<institution-wrap>`]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/institution-wrap.html
413+[`<institution>`]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/institution.html
414+[`<pub-date>`]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/pub-date.html
doc/libraries.mdnew file+63
@@ -0,0 +1,63 @@
1+---
2+title: The pandoc family of libraries
3+author: John MacFarlane
4+---
5+
6+The following Haskell libraries have been developed to support
7+pandoc:
8+
9+[skylighting-core] and [skylighting]
10+: Syntax highlighting engine supporting over 140 languages.
11+
12+[citeproc]
13+: Citation processing using CSL stylesheets.
14+
15+[texmath]
16+: Conversion of math between tex, Word equation, MathML, and GNU eqn.
17+
18+[unicode-collation]
19+: Proper Unicode collation (sorting).
20+
21+[doclayout]
22+: Combinators for laying out a textual document, with support
23+ for line wrapping, tabular layout, and more.
24+
25+[doctemplates]
26+: Supports pandoc's templates.
27+
28+[commonmark], [commonmark-extensions], and [commonmark-pandoc]
29+: Efficient, standards-compliant parser for commonmark and extensions.
30+
31+[ipynb]
32+: Representation of Jupyter notebooks and conversion to and
33+ from JSON.
34+
35+[zip-archive]
36+: A pure zip file creator and extractor, used by pandoc for
37+ docx, ODT, and EPUB.
38+
39+[rfc5051]
40+: Simple unicode collation (used for citation sorting).
41+
42+[emojis]
43+: Conversion between emoji characters and aliases.
44+
45+[jira-wiki-markup]
46+: Support for parsing Jira wiki syntax.
47+
48+[skylighting]: https://hackage.haskell.org/package/skylighting
49+[skylighting-core]: https://hackage.haskell.org/package/skylighting-core
50+[citeproc]: https://hackage.haskell.org/package/citeproc
51+[texmath]: https://hackage.haskell.org/package/texmath
52+[doclayout]: https://hackage.haskell.org/package/doclayout
53+[doctemplates]: https://hackage.haskell.org/package/doctemplates
54+[commonmark]: https://hackage.haskell.org/package/commonmark
55+[commonmark-extensions]: https://hackage.haskell.org/package/commonmark-extensions
56+[commonmark-pandoc]: https://hackage.haskell.org/package/commonmark-pandoc
57+[ipynb]: https://hackage.haskell.org/package/ipynb
58+[zip-archive]: https://hackage.haskell.org/package/zip-archive
59+[rfc5051]: https://hackage.haskell.org/package/rfc5051
60+[emojis]: https://hackage.haskell.org/package/emojis
61+[jira-wiki-markup]: https://hackage.haskell.org/package/jira-wiki-markup
62+[unicode-collation]: https://hackage.haskell.org/package/unicode-collation
63+
doc/lua-filters.md+525−77
@@ -32,7 +32,7 @@ Starting with version 2.0, pandoc makes it possible to write
3232filters in Lua without any external dependencies at all. A Lua
3333interpreter (version 5.3) and a Lua library for creating pandoc
3434filters is built into the pandoc executable. Pandoc data types
35−are marshalled to Lua directly, avoiding the overhead of writing
35+are marshaled to Lua directly, avoiding the overhead of writing
3636JSON to stdout and reading it from stdin.
3737
3838Here is an example of a Lua filter that converts strong emphasis
@@ -75,7 +75,7 @@ Python (`smallcaps.py`):
7575 `pandoc --lua-filter ./smallcaps.lua` 1.03s
7676
7777As you can see, the Lua filter avoids the substantial overhead
78−associated with marshalling to and from JSON over a pipe.
78+associated with marshaling to and from JSON over a pipe.
7979
8080# Lua filter structure
8181
@@ -109,7 +109,7 @@ element filtering function. In other words, filter entries will
109109be called for each corresponding element in the document,
110110getting the respective element as input.
111111
112−The return of a filter function must one of the following:
112+The return of a filter function must be one of the following:
113113
114114- nil: this means that the object should remain unchanged.
115115- a pandoc object: this must be of the same type as the input
@@ -138,7 +138,7 @@ elements.
138138
139139## Filters on element sequences
140140
141−For some filtering tasks, the it is necessary to know the order
141+For some filtering tasks, it is necessary to know the order
142142in which elements occur in the document. It is not enough then to
143143inspect a single element at a time.
144144
@@ -292,7 +292,7 @@ use-case would be to load additional modules, or even to alter
292292default modules.
293293
294294The following snippet is an example of code that might be useful
295−when added to `init.lua`. The snippet adds all unicode-aware
295+when added to `init.lua`. The snippet adds all Unicode-aware
296296functions defined in the [`text` module](#module-text) to the
297297default `string` module, prefixed with the string `uc_`.
298298
@@ -305,6 +305,29 @@ end
305305This makes it possible to apply these functions on strings using
306306colon syntax (`mystring:uc_upper()`).
307307
308+# Debugging Lua filters
309+
310+It is possible to use a debugging interface to halt execution and
311+step through a Lua filter line by line as it is run inside Pandoc.
312+This is accomplished using the remote-debugging interface of the
313+package [`mobdebug`](https://github.com/pkulchenko/MobDebug).
314+Although mobdebug can be run from the terminal, it is more useful
315+run within the donation-ware Lua editor and IDE,
316+[ZeroBrane](https://studio.zerobrane.com/). ZeroBrane offers a
317+REPL console and UI to step-through and view all variables and
318+state.
319+
320+If you already have Lua 5.3 installed, you can add
321+[`mobdebug`](https://luarocks.org/modules/paulclinger/mobdebug)
322+and its dependency
323+[`luasocket`](https://luarocks.org/modules/luasocket/luasocket)
324+using [`luarocks`](https://luarocks.org), which should then be
325+available on the path. ZeroBrane also includes both of these in
326+its package, so if you don't want to install Lua separately, you
327+should add/modify your `LUA_PATH` and `LUA_CPATH` to include the
328+correct locations; [see detailed instructions
329+here](https://studio.zerobrane.com/doc-remote-debugging).
330+
308331# Examples
309332
310333The following filters are presented as examples. A repository of
@@ -362,48 +385,14 @@ end
362385## Setting the date in the metadata
363386
364387This filter sets the date in the document's metadata to the
365−current date:
388+current date, if a date isn't already set:
366389
367390``` lua
368391function Meta(m)
369− m.date = os.date("%B %e, %Y")
370− return m
371−end
372−```
373−
374−## Extracting information about links
375−
376−This filter prints a table of all the URLs linked to in the
377−document, together with the number of links to that URL.
378−
379−``` lua
380−links = {}
381−
382−function Link (el)
383− if links[el.target] then
384− links[el.target] = links[el.target] + 1
385− else
386− links[el.target] = 1
392+ if m.date == nil then
393+ m.date = os.date("%B %e, %Y")
394+ return m
387395 end
388− return el
389−end
390−
391−function Doc (blocks, meta)
392− function strCell(str)
393− return {pandoc.Plain{pandoc.Str(str)}}
394− end
395− local caption = {pandoc.Str "Link", pandoc.Space(), pandoc.Str "count"}
396− local aligns = {pandoc.AlignDefault, pandoc.AlignLeft}
397− local widths = {0.8, 0.2}
398− local headers = {strCell "Target", strCell "Count"}
399− local rows = {}
400− for link, count in pairs(links) do
401− rows[#rows + 1] = {strCell(link), strCell(count)}
402− end
403− return pandoc.Doc(
404− {pandoc.Table(caption, aligns, widths, headers, rows)},
405− meta
406− )
407396end
408397```
409398
@@ -1104,21 +1093,33 @@ Values of this type can be created with the
11041093
11051094Fields:
11061095
1096+`attr`
1097+: table attributes ([Attr])
1098+
11071099`caption`
1108−: table caption ([List] of [Inlines])
1100+: table caption ([Caption])
11091101
1110−`aligns`
1111−: column alignments ([List] of [Alignment]s)
1102+`colspecs`
1103+: column specifications, i.e., alignments and widths ([List] of
1104+ [ColSpec]s)
11121105
1113−`widths`
1114−: column widths (number)
1106+`head`
1107+: table head ([TableHead])
11151108
1116−`headers`
1117−: header row ([List] of [table cells](#type-table-cell))
1109+`bodies`
1110+: table bodies ([List] of [TableBody]s)
11181111
1119−`rows`
1120−: table rows ([List] of [List]s of [table
1121− cells](#type-table-cell))
1112+`foot`
1113+: table foot ([TableFoot])
1114+
1115+`identifier`
1116+: alias for `attr.identifier` (string)
1117+
1118+`classes`
1119+: alias for `attr.classes` ([List] of strings)
1120+
1121+`attributes`
1122+: alias for `attr.attributes` ([Attributes])
11221123
11231124`tag`, `t`
11241125: the literal `Table` (string)
@@ -1127,7 +1128,7 @@ A [table cell]{#type-table-cell} is a list of blocks.
11271128
11281129*[Alignment]{#type-alignment}* is a string value indicating the
11291130horizontal alignment of a table column. `AlignLeft`,
1130−`AlignRight`, and `AlignCenter` leads cell content tob be
1131+`AlignRight`, and `AlignCenter` leads cell content to be
11311132left-aligned, right-aligned, and centered, respectively. The
11321133default alignment is `AlignDefault` (often equivalent to
11331134centered).
@@ -1259,6 +1260,9 @@ Fields:
12591260`target`
12601261: the link target (string)
12611262
1263+`title`
1264+: brief link description
1265+
12621266`identifier`
12631267: alias for `attr.identifier` (string)
12641268
@@ -1484,6 +1488,22 @@ Fields:
14841488`tag`, `t`
14851489: the literal `Superscript` (string)
14861490
1491+### Underline {#type-underline}
1492+
1493+Underlined text
1494+
1495+Values of this type can be created with the
1496+[`pandoc.Underline`](#pandoc.underline) constructor.
1497+
1498+Fields:
1499+
1500+`content`
1501+: inline content ([List] of [Inlines])
1502+
1503+`tag`, `t`
1504+: the literal `Underline` (string)
1505+
1506+
14871507## Element components
14881508
14891509### Attr {#type-attr}
@@ -1493,7 +1513,7 @@ with the [`pandoc.Attr`](#pandoc.attr) constructor. For
14931513convenience, it is usually not necessary to construct the value
14941514directly if it is part of an element, and it is sufficient to
14951515pass an HTML-like table. E.g., to create a span with identifier
1496−"text" and classes "a" and "b", on can write:
1516+"text" and classes "a" and "b", one can write:
14971517
14981518 local span = pandoc.Span('text', {id = 'text', class = 'a b'})
14991519
@@ -1520,6 +1540,41 @@ Fields:
15201540List of key/value pairs. Values can be accessed by using keys as
15211541indices to the list table.
15221542
1543+### Caption {#type-caption}
1544+
1545+The caption of a table, with an optional short caption.
1546+
1547+Fields:
1548+
1549+`long`
1550+: long caption (list of [Blocks])
1551+
1552+`short`
1553+: short caption (list of [Inlines])
1554+
1555+### Cell {#type-cell}
1556+
1557+A table cell.
1558+
1559+Fields:
1560+
1561+`attr`
1562+: cell attributes
1563+
1564+`alignment`
1565+: individual cell alignment ([Alignment]).
1566+
1567+`contents`
1568+: cell contents (list of [Blocks]).
1569+
1570+`col_span`
1571+: number of columns occupied by the cell; the height of the cell
1572+ (integer).
1573+
1574+`row_span`
1575+: number of rows occupied by the cell; the height of the cell
1576+ (integer).
1577+
15231578### Citation {#type-citation}
15241579
15251580Single citation entry
@@ -1550,6 +1605,17 @@ Fields:
15501605`hash`
15511606: hash (integer)
15521607
1608+### ColSpec {#type-colspec}
1609+
1610+Column alignment and width specification for a single table
1611+column.
1612+
1613+This is a pair with the following components:
1614+
1615+1. cell alignment ([Alignment]).
1616+2. table column width, as a fraction of the total table width
1617+ (number).
1618+
15531619### ListAttributes {#type-listattributes}
15541620
15551621List attributes
@@ -1573,6 +1639,53 @@ Fields:
15731639: delimiter of list numbers; one of `DefaultDelim`, `Period`,
15741640 `OneParen`, and `TwoParens` (string)
15751641
1642+### Row {#type-row}
1643+
1644+A table row.
1645+
1646+Tuple fields:
1647+
1648+1. row attributes
1649+2. row cells (list of [Cells])
1650+
1651+### TableBody {#type-tablebody}
1652+
1653+A body of a table, with an intermediate head and the specified
1654+number of row header columns.
1655+
1656+Fields:
1657+
1658+`attr`
1659+: table body attributes ([Attr])
1660+
1661+`body`
1662+: table body rows (list of [Rows])
1663+
1664+`head`
1665+: intermediate head (list of [Rows])
1666+
1667+`row_head_columns`
1668+: number of columns taken up by the row head of each row of a
1669+ [TableBody]. The row body takes up the remaining columns.
1670+
1671+### TableFoot {#type-tablefoot}
1672+
1673+The foot of a table.
1674+
1675+This is a pair with the following components:
1676+
1677+1. attributes
1678+2. foot rows ([Rows])
1679+
1680+### TableHead {#type-tablehead}
1681+
1682+The head of a table.
1683+
1684+This is a pair with the following components:
1685+
1686+1. attributes
1687+2. head rows ([Rows])
1688+
15761689## ReaderOptions {#type-readeroptions}
15771690
15781691Pandoc reader options
@@ -1656,7 +1769,7 @@ A list is any Lua table with integer indices. Indices start at
16561769one, so if `alist = {'value'}` then `alist[1] == 'value'`.
16571770
16581771Lists, when part of an element, or when generated during
1659−marshalling, are made instances of the `pandoc.List` type for
1772+marshaling, are made instances of the `pandoc.List` type for
16601773convenience. The `pandoc.List` type is defined in the
16611774[*pandoc.List*](#module-pandoc.list) module. See there for
16621775available methods.
@@ -1670,6 +1783,36 @@ table into a List.
16701783A pandoc log message. Objects have no fields, but can be
16711784converted to a string via `tostring`.
16721785
1786+## SimpleTable {#type-simpletable}
1787+
1788+A simple table is a table structure which resembles the old (pre
1789+pandoc 2.10) Table type. Bi-directional conversion from and to
1790+[Tables](#type-table) is possible with the
1791+[`pandoc.utils.to_simple_table`](#pandoc.utils.to_simple_table)
1792+and
1793+[`pandoc.utils.from_simple_table`](#pandoc.utils.from_simple_table)
1794+function, respectively. Instances of this type can also be created
1795+directly with the [`pandoc.SimpleTable`](#pandoc.simpletable)
1796+constructor.
1797+
1798+Fields:
1799+
1800+`caption`:
1801+: [List] of [Inlines]
1802+
1803+`aligns`:
1804+: column alignments ([List] of [Alignments](#type-alignment))
1805+
1806+`widths`:
1807+: column widths; a ([List] of numbers)
1808+
1809+`headers`:
1810+: table header row ([List] of lists of [Blocks])
1811+
1812+`rows`:
1813+: table rows ([List] of rows, where a row is a list of lists of
1814+ [Blocks])
1815+
16731816## Version {#type-version}
16741817
16751818A version object. This represents a software version like
@@ -1723,8 +1866,11 @@ Usage:
17231866[Attributes]: #type-attributes
17241867[Block]: #type-block
17251868[Blocks]: #type-block
1869+[Caption]: #type-caption
1870+[Cells]: #type-cell
17261871[Citation]: #type-citation
17271872[Citations]: #type-citation
1873+[ColSpec]: #type-colspec
17281874[CommonState]: #type-commonstate
17291875[Image]: #type-image
17301876[Inline]: #type-inline
@@ -1738,6 +1884,12 @@ Usage:
17381884[LogMessage]: #type-logmessage
17391885[Pandoc]: #type-pandoc
17401886[Para]: #type-para
1887+[Rows]: #type-row
1888+[SimpleTable]: #type-simpletable
1889+[Table]: #type-table
1890+[TableBody]: #type-tablebody
1891+[TableFoot]: #type-tablefoot
1892+[TableHead]: #type-tablehead
17411893[Version]: #type-version
17421894[`pandoc.utils.equals`]: #pandoc.utils.equals
17431895
@@ -2044,26 +2196,29 @@ format, and functions to filter and modify a subtree.
20442196
20452197 Returns: [RawBlock](#type-rawblock) object
20462198
2047−[`Table (caption, aligns, widths, headers, rows)`]{#pandoc.table}
2199+[`Table (caption, colspecs, head, bodies, foot[, attr])`]{#pandoc.table}
20482200
20492201: Creates a table element.
20502202
20512203 Parameters:
20522204
20532205 `caption`:
2054− : table caption
2206+ : table [caption](#type-caption)
20552207
2056− `aligns`:
2057− : alignments
2208+ `colspecs`:
2209+ : column alignments and widths (list of [ColSpec](#type-colspec)s)
20582210
2059− `widths`:
2060− : column widths
2211+ `head`:
2212+ : [table head](#type-tablehead)
20612213
2062− `headers`:
2063− : header row
2214+ `bodies`:
2215+ : [table bodies](#type-tablebody)
20642216
2065− `rows`:
2066− : table rows
2217+ `foot`:
2218+ : [table foot](#type-tablefoot)
2219+
2220+ `attr`:
2221+ : element attributes
20672222
20682223 Returns: [Table](#type-table) object
20692224
@@ -2099,7 +2254,7 @@ format, and functions to filter and modify a subtree.
20992254
21002255[`Emph (content)`]{#pandoc.emph}
21012256
2102−: Creates an inline element representing emphasised text.
2257+: Creates an inline element representing emphasized text.
21032258
21042259 Parameters:
21052260
@@ -2302,7 +2457,7 @@ format, and functions to filter and modify a subtree.
23022457
23032458[`Strikeout (content)`]{#pandoc.strikeout}
23042459
2305−: Creates text which is striked out.
2460+: Creates text which is struck out.
23062461
23072462 Parameters:
23082463
@@ -2345,6 +2500,17 @@ format, and functions to filter and modify a subtree.
23452500
23462501 Returns: [Superscript](#type-superscript) object
23472502
2503+[`Underline (content)`]{#pandoc.underline}
2504+
2505+: Creates an Underline inline element
2506+
2507+ Parameters:
2508+
2509+ `content`:
2510+ : inline content
2511+
2512+ Returns: [Underline](#type-underline) object
2513+
23482514## Element components
23492515
23502516[`Attr ([identifier[, classes[, attributes]]])`]{#pandoc.attr}
@@ -2407,6 +2573,52 @@ format, and functions to filter and modify a subtree.
24072573
24082574 Returns: [ListAttributes](#type-listattributes) object
24092575
2576+## Legacy types
2577+
2578+[`SimpleTable (caption, aligns, widths, headers, rows)`]{#pandoc.simpletable}
2579+
2580+: Creates a simple table resembling the old (pre pandoc 2.10)
2581+ table type.
2582+
2583+ Parameters:
2584+
2585+ `caption`:
2586+ : [List] of [Inlines]
2587+
2588+ `aligns`:
2589+ : column alignments ([List] of [Alignments](#type-alignment))
2590+
2591+ `widths`:
2592+ : column widths; a ([List] of numbers)
2593+
2594+ `headers`:
2595+ : table header row ([List] of lists of [Blocks])
2596+
2597+ `rows`:
2598+ : table rows ([List] of rows, where a row is a list of lists
2599+ of [Blocks])
2600+
2601+ Returns: [SimpleTable] object
2602+
2603+ Usage:
2604+
2605+ local caption = "Overview"
2606+ local aligns = {pandoc.AlignDefault, pandoc.AlignDefault}
2607+ local widths = {0, 0} -- let pandoc determine col widths
2608+ local headers = {{pandoc.Plain({pandoc.Str "Language"})},
2609+ {pandoc.Plain({pandoc.Str "Typing"})}}
2610+ local rows = {
2611+ {{pandoc.Plain "Haskell"}, {pandoc.Plain "static"}},
2612+ {{pandoc.Plain "Lua"}, {pandoc.Plain "Dynamic"}},
2613+ }
2614+ simple_table = pandoc.SimpleTable(
2615+ caption,
2616+ aligns,
2617+ widths,
2618+ headers,
2619+ rows
2620+ )
2621+
24102622## Constants
24112623
24122624[`AuthorInText`]{#pandoc.authorintext}
@@ -2531,9 +2743,21 @@ format, and functions to filter and modify a subtree.
25312743Runs command with arguments, passing it some input, and returns
25322744the output.
25332745
2746+Parameters:
2747+
2748+`command`
2749+: program to run; the executable will be resolved using default
2750+ system methods (string).
2751+
2752+`args`
2753+: list of arguments to pass to the program (list of strings).
2754+
2755+`input`
2756+: data which is piped into the program via stdin (string).
2757+
25342758Returns:
25352759
2536−- Output of command.
2760+- Output of command, i.e. data printed to stdout (string)
25372761
25382762Raises:
25392763
@@ -2669,11 +2893,31 @@ Returns:
26692893
26702894- Whether the two objects represent the same element (boolean)
26712895
2896+### from\_simple\_table {#pandoc.utils.from_simple_table}
2897+
2898+`from_simple_table (table)`
2899+
2900+Creates a [Table] block element from a [SimpleTable]. This is
2901+useful for dealing with legacy code which was written for pandoc
2902+versions older than 2.10.
2903+
2904+Returns:
2905+
2906+- table block element ([Table])
2907+
2908+Usage:
2909+
2910+ local simple = pandoc.SimpleTable(table)
2911+ -- modify, using pre pandoc 2.10 methods
2912+ simple.caption = pandoc.SmallCaps(simple.caption)
2913+ -- create normal table block again
2914+ table = pandoc.utils.from_simple_table(simple)
2915+
26722916### make\_sections {#pandoc.utils.make_sections}
26732917
26742918`make_sections (number_sections, base_level, blocks)`
26752919
2676−Converst list of [Blocks](#type-block) into sections.
2920+Converts list of [Blocks](#type-block) into sections.
26772921`Div`s will be created beginning at each `Header`
26782922and containing following content until the next `Header`
26792923of comparable level. If `number_sections` is true,
@@ -2788,6 +3032,24 @@ Usage:
27883032 local pandoc_birth_year = to_roman_numeral(2006)
27893033 -- pandoc_birth_year == 'MMVI'
27903034
3035+### to\_simple\_table {#pandoc.utils.to_simple_table}
3036+
3037+`to_simple_table (table)`
3038+
3039+Creates a [SimpleTable] out of a [Table] block.
3040+
3041+Returns:
3042+
3043+- a simple table object ([SimpleTable])
3044+
3045+Usage:
3046+
3047+ local simple = pandoc.utils.to_simple_table(table)
3048+ -- modify, using pre pandoc 2.10 methods
3049+ simple.caption = pandoc.SmallCaps(simple.caption)
3050+ -- create normal table block again
3051+ table = pandoc.utils.from_simple_table(simple)
3052+
27913053# Module pandoc.mediabag
27923054
27933055The `pandoc.mediabag` module allows accessing pandoc's media
@@ -2822,7 +3084,8 @@ Clear-out the media bag, deleting all items.
28223084
28233085`insert (filepath, mime_type, contents)`
28243086
2825−Adds a new entry to pandoc's media bag.
3087+Adds a new entry to pandoc's media bag. Replaces any existing
3088+mediabag entry with the same `filepath`.
28263089
28273090Parameters:
28283091
@@ -2830,7 +3093,7 @@ Parameters:
28303093: filename and path relative to the output folder.
28313094
28323095`mime_type`:
2833−: the file's MIME type
3096+: the file's MIME type; use `nil` if unknown or unavailable.
28343097
28353098`contents`:
28363099: the binary contents of the file.
@@ -2914,12 +3177,22 @@ Usage:
29143177
29153178### fetch {#pandoc.mediabag.fetch}
29163179
2917−`fetch (source, base_url)`
3180+`fetch (source)`
29183181
29193182Fetches the given source from a URL or local file. Returns two
29203183values: the contents of the file and the MIME type (or an empty
29213184string).
29223185
3186+The function will first try to retrieve `source` from the
3187+mediabag; if that fails, it will try to download it or read it
3188+from the local file system while respecting pandoc's "resource
3189+path" setting.
3190+
3191+Parameters:
3192+
3193+`source`:
3194+: path to a resource; either a local file path or URI
3195+
29233196Returns:
29243197
29253198- the entries MIME type, or nil if the file was not found.
@@ -2928,11 +3201,11 @@ Returns:
29283201Usage:
29293202
29303203 local diagram_url = "https://pandoc.org/diagram.jpg"
2931− local mt, contents = pandoc.mediabag.fetch(diagram_url, ".")
3204+ local mt, contents = pandoc.mediabag.fetch(diagram_url)
29323205
29333206# Module pandoc.List
29343207
2935−The this module defines pandoc's list type. It comes with useful
3208+This module defines pandoc's list type. It comes with useful
29363209methods and convenience functions.
29373210
29383211## Constructor
@@ -3035,7 +3308,7 @@ methods and convenience functions.
30353308[`pandoc.List:insert ([pos], value)`]{#pandoc.list:insert}
30363309
30373310: Inserts element `value` at position `pos` in list, shifting
3038− elements to the next-greater indix if necessary.
3311+ elements to the next-greater index if necessary.
30393312
30403313 This function is identical to
30413314 [`table.insert`](https://www.lua.org/manual/5.3/manual.html#6.6).
@@ -3082,7 +3355,7 @@ methods and convenience functions.
30823355 Parameters:
30833356
30843357 `pos`:
3085− : position of the list value that will be remove; defaults
3358+ : position of the list value that will be removed; defaults
30863359 to the index of the last element
30873360
30883361 Returns: the removed element
@@ -3114,6 +3387,181 @@ methods and convenience functions.
31143387 `comp`:
31153388 : Comparison function as described above.
31163389
3390+# Module pandoc.path
3391+
3392+Module for file path manipulations.
3393+
3394+## Static Fields {#pandoc.path-fields}
3395+
3396+### separator {#pandoc.path.separator}
3397+
3398+The character that separates directories.
3399+
3400+### search_path_separator {#pandoc.path.search_path_separator}
3401+
3402+The character that is used to separate the entries in the `PATH`
3403+environment variable.
3404+
3405+## Functions {#pandoc.path-functions}
3406+
3407+### directory (filepath) {#pandoc.path.directory}
3408+
3409+Gets the directory name, i.e., removes the last directory
3410+separator and everything after from the given path.
3411+
3412+Parameters:
3413+
3414+filepath
3415+: path (string)
3416+
3417+Returns:
3418+
3419+- The filepath up to the last directory separator. (string)
3420+
3421+### filename (filepath) {#pandoc.path.filename}
3422+
3423+Get the file name.
3424+
3425+Parameters:
3426+
3427+filepath
3428+: path (string)
3429+
3430+Returns:
3431+
3432+- File name part of the input path. (string)
3433+
3434+### is_absolute (filepath) {#pandoc.path.is_absolute}
3435+
3436+Checks whether a path is absolute, i.e. not fixed to a root.
3437+
3438+Parameters:
3439+
3440+filepath
3441+: path (string)
3442+
3443+Returns:
3444+
3445+- `true` iff `filepath` is an absolute path, `false` otherwise.
3446+ (boolean)
3447+
3448+### is_relative (filepath) {#pandoc.path.is_relative}
3449+
3450+Checks whether a path is relative or fixed to a root.
3451+
3452+Parameters:
3453+
3454+filepath
3455+: path (string)
3456+
3457+Returns:
3458+
3459+- `true` iff `filepath` is a relative path, `false` otherwise.
3460+ (boolean)
3461+
3462+### join (filepaths) {#pandoc.path.join}
3463+
3464+Join path elements back together by the directory separator.
3465+
3466+Parameters:
3467+
3468+filepaths
3469+: path components (list of strings)
3470+
3471+Returns:
3472+
3473+- The joined path. (string)
3474+
3475+### make_relative (path, root[, unsafe]) {#pandoc.path.make_relative}
3476+
3477+Contract a filename, based on a relative path. Note that the
3478+resulting path will usually not introduce `..` paths, as the
3479+presence of symlinks means `../b` may not reach `a/b` if it starts
3480+from `a/c`. For a worked example see [this blog
3481+post](https://neilmitchell.blogspot.co.uk/2015/10/filepaths-are-subtle-symlinks-are-hard.html).
3482+
3483+Set `unsafe` to a truthy value to a allow `..` in paths.
3484+
3485+Parameters:
3486+
3487+path
3488+: path to be made relative (string)
3489+
3490+root
3491+: root path (string)
3492+
3493+unsafe
3494+: whether to allow `..` in the result. (boolean)
3495+
3496+Returns:
3497+
3498+- contracted filename (string)
3499+
3500+### normalize (filepath) {#pandoc.path.normalize}
3501+
3502+Normalizes a path.
3503+
3504+- `//` makes sense only as part of a (Windows) network drive;
3505+ elsewhere, multiple slashes are reduced to a single
3506+ `path.separator` (platform dependent).
3507+- `/` becomes `path.separator` (platform dependent)
3508+- `./` -\> ''
3509+- an empty path becomes `.`
3510+
3511+Parameters:
3512+
3513+filepath
3514+: path (string)
3515+
3516+Returns:
3517+
3518+- The normalized path. (string)
3519+
3520+### split (filepath) {#pandoc.path.split}
3521+
3522+Splits a path by the directory separator.
3523+
3524+Parameters:
3525+
3526+filepath
3527+: path (string)
3528+
3529+Returns:
3530+
3531+- List of all path components. (list of strings)
3532+
3533+### split_extension (filepath) {#pandoc.path.split_extension}
3534+
3535+Splits the last extension from a file path and returns the parts. The
3536+extension, if present, includes the leading separator; if the path has
3537+no extension, then the empty string is returned as the extension.
3538+
3539+Parameters:
3540+
3541+filepath
3542+: path (string)
3543+
3544+Returns:
3545+
3546+- filepath without extension (string)
3547+
3548+- extension or empty string (string)
3549+
3550+### split_search_path (search_path) {#pandoc.path.split_search_path}
3551+
3552+Takes a string and splits it on the `search_path_separator` character.
3553+Blank items are ignored on Windows, and converted to `.` on Posix. On
3554+Windows path elements are stripped of quotes.
3555+
3556+Parameters:
3557+
3558+search_path
3559+: platform-specific search path (string)
3560+
3561+Returns:
3562+
3563+- list of directories in search path (list of strings)
3564+
31173565# Module pandoc.system
31183566
31193567Access to system information and functionality.
doc/org.md+96−4
@@ -22,10 +22,10 @@ The following export keywords are supported:
2222- EMAIL: author email address; passed as plain-text metadata
2323 field `email`, but not used by any default templates.
2424
25−- LANGUAGE: currently unsupported; use `#+LANG:` instead.
25+- LANGUAGE: document language; included as plain-text metadata
26+ field `lang`. The value should be a [BCP47 language tag].
2627
27−- SELECT_TAGS: tags which select a tree for export. Currently
28− *unsupported*.
28+- SELECT_TAGS: tags which select a tree for export.
2929
3030- EXCLUDE\_TAGS: tags which prevent a subtree from being
3131 exported. Fully supported.
@@ -36,6 +36,23 @@ The following export keywords are supported:
3636 defaults to stdout unless a target has to be given as a command
3737 line option.
3838
39+::: {.alert .alert-info}
40+Pandoc tries to be compatible with org-mode when exporting an org document. If
41+you find some behavior confusing, please do refer to org-mode
42+[Export-Settings](https://orgmode.org/manual/Export-Settings.html)
43+documentation. For example, a common confusion
44+([#3214](https://github.com/jgm/pandoc/issues/3214 "Problem with headers lower
45+then 3 in org-mode reader"), [#5169](https://github.com/jgm/pandoc/issues/5169
46+"org mode headings past level three converted to numbered outline list"),
47+[#6145](https://github.com/jgm/pandoc/issues/6145 "Headers 4 levels deep render
48+differently"), [#7236](https://github.com/jgm/pandoc/issues/7236 "In Org mode,
49+Header with level > 3 are not recognized as headers")) is treatment of headers
50+with level > 3 differently because org-mode sets `org-export-headline-levels`
51+(configurable with `#+OPTIONS: H:3`) to 3 by default.
52+:::
53+
54+[BCP47 language tag]: https://tools.ietf.org/html/bcp47
55+
3956Format-specific options
4057-----------------------
4158
@@ -102,6 +119,53 @@ Pandoc recognizes some export options not used by Emacs Org.
102119 field is included by default on the title slide of beamer
103120 presentations.
104121
122+Other options
123+-------------
124+
125+Any export option or directive not listed above has no effect when
126+parsing with pandoc. However, the information is retained as a
127+*raw block*. It can be accessed through a
128+[filter](https://pandoc.org/filters.html) and will be included in
129+org output.
130+
131+### Directives as metadata
132+
133+As an example, we will restore an old behavior of pandoc versions
134+prior to 2.10. Unknown keywords were treated as variable
135+definitions, and were added the document's metadata. Typing
136+`#+key: value` in the org-file used to have the same effect as
137+running pandoc with the `--metadata key=value` option.
138+
139+Since pandoc 2.10, each unhandled line starting with `#+` is kept
140+internally as a raw block with format `org`. This block can be
141+inspected and processed by a filter. Below is a [Lua
142+filter](https://pandoc.org/lua-filters.html) which converts these
143+unhandled lines into metadata key-value pairs.
144+
145+``` lua
146+-- intermediate store for variables and their values
147+local variables = {}
148+
149+--- Function called for each raw block element.
150+function RawBlock (raw)
151+ -- Don't do anything unless the block contains *org* markup.
152+ if raw.format ~= 'org' then return nil end
153+
154+ -- extract variable name and value
155+ local name, value = raw.text:match '#%+(%w+):%s*(.+)$'
156+ if name and value then
157+ variables[name] = value
158+ end
159+end
160+
161+-- Add the extracted variables to the document's metadata.
162+function Meta (meta)
163+ for name, value in pairs(variables) do
164+ meta[name] = value
165+ end
166+ return meta
167+end
168+```
105169
106170Citations
107171=========
@@ -159,7 +223,7 @@ Example:
159223
160224### Parenthetical citation
161225
162−Citations surrounded by parantheses. The syntax is identical to
226+Citations surrounded by parentheses. The syntax is identical to
163227in-text citations, except for the additional parentheses enclosing
164228the initial `cite` tag.
165229
@@ -217,6 +281,34 @@ Use normal latex citation commands like `\cite{x}` or
217281[org-ref]: https://github.com/jkitchin/org-ref
218282[John Kitchen]: https://kitchingroup.cheme.cmu.edu/
219283
284+Tables
285+======
286+
287+Pandoc supports normal org tables (sometimes called "pipe tables")
288+and grid tables (tables created by [table.el]).
289+
290+Column widths
291+-------------
292+
293+Org mode tables don't allow line-breaks within cells, and lines
294+which contain text can get very long. This often leads to tables
295+which run off the page when exporting, especially when exporting
296+to PDF via LaTeX. Overlong lines in the source text are this is
297+usually hidden by setting a [column width], but the default Emacs
298+exporters ignore that setting. Pandoc deviates from Emacs's
299+behavior and uses this information to resize the table columns
300+when exporting.
301+
302+Limitations
303+-----------
304+
305+There is no support yet for cells spanning multiple columns or
306+rows. The table.el grid tables allows rowspans and colspans and so
307+does pandoc's internal structure since 2.10, but the parser has
308+not been updated yet.
309+
310+[table.el]: http://table.sourceforge.net/
311+[column width]: https://orgmode.org/manual/Column-Width-and-Alignment.html
220312
221313Emphasis rules
222314==============
doc/using-the-pandoc-api.md+30−16
@@ -14,7 +14,7 @@ and types is available at
1414Pandoc is structured as a set of *readers*, which translate
1515various input formats into an abstract syntax tree (the
1616Pandoc AST) representing a structured document, and a set of
17−*writers*, which render this AST into various input formats.
17+*writers*, which render this AST into various output formats.
1818Pictorially:
1919
2020```
@@ -90,8 +90,14 @@ Some notes:
9090Let's look at the types of `readMarkdown` and `writeRST`:
9191
9292```haskell
93−readMarkdown :: PandocMonad m => ReaderOptions -> Text -> m Pandoc
94−writeRST :: PandocMonad m => WriterOptions -> Pandoc -> m Text
93+readMarkdown :: (PandocMonad m, ToSources a)
94+ => ReaderOptions
95+ -> a
96+ -> m Pandoc
97+writeRST :: PandocMonad m
98+ => WriterOptions
99+ -> Pandoc
100+ -> m Text
95101```
96102
97103The `PandocMonad m =>` part is a typeclass constraint.
@@ -120,7 +126,7 @@ getVerbosity :: PandocMonad m => m Verbosity
120126-- | Set the verbosity level.
121127setVerbosity :: PandocMonad m => Verbosity -> m ()
122128
123−-- Get the accomulated log messages (in temporal order).
129+-- Get the accumulated log messages (in temporal order).
124130getLog :: PandocMonad m => m [LogMessage]
125131getLog = reverse <$> getsCommonState stLog
126132
@@ -133,7 +139,7 @@ report :: PandocMonad m => LogMessage -> m ()
133139-- | Fetch an image or other item from the local filesystem or the net.
134140-- Returns raw content and maybe mime type.
135141fetchItem :: PandocMonad m
136− => String
142+ => Text
137143 -> m (B.ByteString, Maybe MimeType)
138144
139145-- Set the resource path searched by 'fetchItem'.
@@ -155,6 +161,13 @@ Note that `PandocIO` is an instance of `MonadIO`, so you can
155161use `liftIO` to perform arbitrary IO operations inside a pandoc
156162conversion chain.
157163
164+`readMarkdown` is polymorphic in its second argument, which
165+can be any type that is an instance of the `ToSources`
166+typeclass. You can use `Text`, as in the example above.
167+But you can also use `[(FilePath, Text)]`, if the input comes
168+from multiple files and you want to track source positions
169+accurately.
170+
158171# Options
159172
160173The first argument of each reader or writer is for
@@ -177,7 +190,8 @@ Some particularly important options to know about:
1771901. `writerTemplate`: By default, this is `Nothing`, which
178191 means that a document fragment will be produced. If you
179192 want a full document, you need to specify `Just template`,
180− where `template` is a String containing the template's
193+ where `template` is a `Template Text` from
194+ [Text.Pandoc.Templates] containing the template's
181195 contents (not the path).
182196
1831972. `readerExtensions` and `writerExtensions`: These specify
@@ -199,8 +213,8 @@ of the Monoid typeclass and can easily be concatenated:
199213import Text.Pandoc.Builder
200214
201215mydoc :: Pandoc
202−mydoc = doc $ header 1 (text "Hello!")
203− <> para (emph (text "hello world") <> text ".")
216+mydoc = doc $ header 1 (text (T.pack "Hello!"))
217+ <> para (emph (text (T.pack "hello world")) <> text (T.pack "."))
204218
205219main :: IO ()
206220main = print mydoc
@@ -247,16 +261,16 @@ import qualified Data.Text as T
247261import Data.List (intersperse)
248262
249263data Station = Station{
250− address :: String
251− , name :: String
252− , cardsAccepted :: [String]
264+ address :: T.Text
265+ , name :: T.Text
266+ , cardsAccepted :: [T.Text]
253267 } deriving Show
254268
255269instance FromJSON Station where
256270 parseJSON (Object v) = Station <$>
257271 v .: "street_address" <*>
258272 v .: "station_name" <*>
259− (words <$> (v .:? "cards_accepted" .!= ""))
273+ (T.words <$> (v .:? "cards_accepted" .!= ""))
260274 parseJSON _ = mzero
261275
262276createLetter :: [Station] -> Pandoc
@@ -314,7 +328,7 @@ users to override the system defaults. If you want to disable
314328this behavior, use `setUserDataDir Nothing`.
315329
316330To render a template, use `renderTemplate'`, which takes two
317−arguments, a template (String) and a context (any instance
331+arguments, a template (Text) and a context (any instance
318332of ToJSON). If you want to create a context from the metadata
319333part of a Pandoc document, use `metaToJSON'` from
320334[Text.Pandoc.Writers.Shared]. If you also want to incorporate
@@ -336,7 +350,7 @@ use `throwError`.
336350In addition to errors, which stop execution of the conversion
337351pipeline, one can generate informational messages.
338352Use `report` from [Text.Pandoc.Class] to issue a `LogMessage`.
339−For a list of cosntructors for `LogMessage`, see
353+For a list of constructors for `LogMessage`, see
340354[Text.Pandoc.Logging]. Note that each type of log message
341355is associated with a verbosity level. The verbosity level
342356(`setVerbosity`/`getVerbosity`) determines whether the report
@@ -412,7 +426,7 @@ concatenated together. Here's an example that returns a
412426list of the URLs linked to in a document:
413427
414428```haskell
415−listURLs :: Pandoc -> [String]
429+listURLs :: Pandoc -> [Text]
416430listURLs = query urls
417431 where urls (Link _ _ (src, _)) = [src]
418432 urls _ = []
@@ -431,7 +445,7 @@ structure and calling this function.
4314451. Pandoc's parsers can exhibit pathological behavior on some
432446 inputs. So it is always a good idea to wrap uses of pandoc
433447 in a timeout function (e.g. `System.Timeout.timeout` from `base`)
434− to prevent DOS attacks.
448+ to prevent DoS attacks.
435449
4364502. If pandoc generates HTML from untrusted user input, it is
437451 always a good idea to filter the generated HTML through
linux/Dockerfiledeleted−30
@@ -1,30 +0,0 @@
1−# USE ALPINE LINUX
2−FROM alpine:3.11
3−RUN apk --no-cache add \
4− alpine-sdk \
5− bash \
6− ca-certificates \
7− cabal \
8− dpkg \
9− fakeroot \
10− ghc \
11− git \
12− gmp-dev \
13− xz \
14− zlib-dev \
15− zlib-static
16−RUN mkdir -p /usr/src/ && \
17− git clone https://github.com/jgm/pandoc /usr/src/pandoc
18−WORKDIR /usr/src/pandoc
19−CMD cabal --version && \
20− ghc --version && \
21− git pull && \
22− git checkout -b work $TREE && \
23− cabal new-update && \
24− cabal new-clean && \
25− cabal new-configure --enable-tests -f-export-dynamic -fstatic -fembed_data_files -fbibutils --ghc-options '-optc-Os -optl=-pthread -optl=-static -fPIC -split-sections' . pandoc-citeproc && \
26− cabal new-build . pandoc-citeproc && \
27− cabal new-test -j1 . pandoc-citeproc && \
28− for f in $(find dist-newstyle -name 'pandoc*' -type f -perm +400); do cp $f /artifacts/; done && \
29− bash linux/make_deb.sh && \
30− bash linux/make_tarball.sh
linux/Makefiledeleted−18
@@ -1,18 +0,0 @@
1−TREE?=HEAD
2−ARTIFACTS=`pwd`/artifacts
3−REVISION?=1
4−
5−build:
6− mkdir -p $(ARTIFACTS)
7− docker build -t alpine-pandoc .
8− docker run --env TREE=$(TREE) --env REVISION=$(REVISION) \
9− -v $(ARTIFACTS):/artifacts alpine-pandoc
10−
11−interact:
12− docker run --env TREE=$(TREE) --env REVISION=$(REVISION) \
13− -v $(ARTIFACTS):/artifacts -it alpine-pandoc bash
14−
15−setup:
16− docker pull alpine:edge
17−
18−.PHONY: build setup interact
linux/control.in+1−1
@@ -5,7 +5,7 @@ Priority: optional
55Architecture: ARCHITECTURE
66Installed-Size: INSTALLED_SIZE
77Depends: libc6 (>= 2.13), libgmp10, zlib1g (>= 1:1.1.4)
8−Replaces: pandoc-data, pandoc-citeproc
8+Replaces: pandoc-data
99Suggests: texlive-latex-recommended, texlive-xetex,
1010 texlive-fonts-recommended
1111Maintainer: John MacFarlane <jgm@berkeley.edu>
linux/make_artifacts.shnew file+84
@@ -0,0 +1,84 @@
1+set -e
2+
3+MACHINE=$(uname -m)
4+case "$MACHINE" in
5+ x86_64) ARCHITECTURE=amd64;;
6+ i686) ARCHITECTURE=i386;;
7+ i386) ARCHITECTURE=i386;;
8+ aarch64) ARCHITECTURE=arm64;;
9+ *) ARCHITECTURE=unknown;;
10+esac
11+
12+ARTIFACTS="${ARTIFACTS:-/artifacts}"
13+
14+# This is our sentinel that tells us when we're done.
15+rm -f $ARTIFACTS/DONE
16+
17+clean_up() {
18+ echo "All done!" > "$ARTIFACTS/DONE"
19+}
20+trap clean_up EXIT
21+
22+# build binaries
23+
24+cabal --version
25+ghc --version
26+
27+cabal v2-update
28+cabal v2-clean
29+cabal v2-configure --enable-tests -f-export-dynamic -fembed_data_files --enable-executable-static --ghc-options '-j4 +RTS -A256m -RTS -split-sections -optc-Os -optl=-pthread' pandoc
30+cabal v2-build -j4
31+cabal v2-test -j4
32+for f in $(find dist-newstyle -name 'pandoc' -type f -perm /400); do cp $f /artifacts/; done
33+
34+# make deb
35+
36+VERSION=`$ARTIFACTS/pandoc --version | awk '{print $2; exit;}'`
37+REVISION=${REVISION:-1}
38+DEBVER=$VERSION-$REVISION
39+BASE=pandoc-$DEBVER-$ARCHITECTURE
40+DIST=`pwd`/$BASE
41+DEST=$DIST/usr
42+COPYRIGHT=$DEST/share/doc/pandoc/copyright
43+
44+mkdir -p $DEST/bin
45+mkdir -p $DEST/share/man/man1
46+mkdir -p $DEST/share/doc/pandoc
47+
48+find $DIST -type d | xargs chmod 755
49+cp $ARTIFACTS/pandoc $DEST/bin/
50+strip $DEST/bin/pandoc
51+cp /mnt/man/pandoc.1 $DEST/share/man/man1/pandoc.1
52+gzip -9 $DEST/share/man/man1/pandoc.1
53+
54+cp /mnt/COPYRIGHT $COPYRIGHT
55+echo "" >> $COPYRIGHT
56+
57+INSTALLED_SIZE=$(du -k -s $DEST | awk '{print $1}')
58+mkdir $DIST/DEBIAN
59+perl -pe "s/VERSION/$DEBVER/" linux/control.in | \
60+ perl -pe "s/ARCHITECTURE/$ARCHITECTURE/" | \
61+ perl -pe "s/INSTALLED_SIZE/$INSTALLED_SIZE/" \
62+ > $DIST/DEBIAN/control
63+
64+# we limit compression to avoid OOM error
65+fakeroot dpkg-deb -Zgzip -z9 --build $DIST
66+rm -rf $DIST
67+cp $BASE.deb $ARTIFACTS/
68+
69+# Make tarball
70+
71+TARGET=pandoc-$VERSION
72+cd $ARTIFACTS
73+rm -rf $TARGET
74+mkdir $TARGET
75+mkdir $TARGET/bin $TARGET/share $TARGET/share/man $TARGET/share/man/man1
76+cp /mnt/man/pandoc.1 $TARGET/share/man/man1
77+mv pandoc $TARGET/bin
78+strip $TARGET/bin/pandoc
79+gzip -9 $TARGET/share/man/man1/pandoc.1
80+
81+tar cvzf $TARGET-linux-$ARCHITECTURE.tar.gz $TARGET
82+rm -r $TARGET
83+
84+exit 0
linux/make_deb.shdeleted−51
@@ -1,51 +0,0 @@
1−set -e
2−
3−MACHINE=$(uname -m)
4−case "$MACHINE" in
5− x86_64) ARCHITECTURE=amd64;;
6− i686) ARCHITECTURE=i386;;
7− i386) ARCHITECTURE=i386;;
8−esac
9−
10−ARTIFACTS="${ARTIFACTS:-/artifacts}"
11−
12−VERSION=`$ARTIFACTS/pandoc --version | awk '{print $2; exit;}'`
13−REVISION=${REVISION:-1}
14−DEBVER=$VERSION-$REVISION
15−BASE=pandoc-$DEBVER-$ARCHITECTURE
16−DIST=`pwd`/$BASE
17−DEST=$DIST/usr
18−COPYRIGHT=$DEST/share/doc/pandoc/copyright
19−
20−PANDOC_CITEPROC_VERSION=`$ARTIFACTS/pandoc-citeproc --version | awk '{print $2;}'`
21−
22−mkdir -p $DEST/bin
23−mkdir -p $DEST/share/man/man1
24−mkdir -p $DEST/share/doc/pandoc
25−
26−mkdir -p $DEST/share/doc/pandoc-citeproc
27−find $DIST -type d | xargs chmod 755
28−cp $ARTIFACTS/pandoc $DEST/bin/
29−cp $ARTIFACTS/pandoc-citeproc $DEST/bin/
30−strip $DEST/bin/pandoc
31−strip $DEST/bin/pandoc-citeproc
32−cp man/pandoc.1 $DEST/share/man/man1/pandoc.1
33−$ARTIFACTS/pandoc-citeproc --man > $DEST/share/man/man1/pandoc-citeproc.1
34−gzip -9 $DEST/share/man/man1/pandoc.1
35−gzip -9 $DEST/share/man/man1/pandoc-citeproc.1
36−
37−cp COPYRIGHT $COPYRIGHT
38−echo "" >> $COPYRIGHT
39−echo "pandoc-citeproc" >> $COPYRIGHT
40−$ARTIFACTS/pandoc-citeproc --license >> $COPYRIGHT
41−
42−INSTALLED_SIZE=$(du -k -s $DEST | awk '{print $1}')
43−mkdir $DIST/DEBIAN
44−perl -pe "s/VERSION/$DEBVER/" linux/control.in | \
45− perl -pe "s/ARCHITECTURE/$ARCHITECTURE/" | \
46− perl -pe "s/INSTALLED_SIZE/$INSTALLED_SIZE/" \
47− > $DIST/DEBIAN/control
48−
49−fakeroot dpkg-deb --build $DIST
50−rm -rf $DIST
51−cp $BASE.deb $ARTIFACTS/
linux/make_tarball.shdeleted−19
@@ -1,19 +0,0 @@
1−set -e
2−
3−ARTIFACTS="${ARTIFACTS:-/artifacts}"
4−VERSION=`$ARTIFACTS/pandoc --version | awk '{print $2; exit;}'`
5−TARGET=pandoc-$VERSION
6−
7−cd $ARTIFACTS
8−rm -rf $TARGET
9−mkdir $TARGET
10−mkdir $TARGET/bin $TARGET/share $TARGET/share/man $TARGET/share/man/man1
11−./pandoc-citeproc --man > $TARGET/share/man/man1/pandoc-citeproc.1
12−cp /usr/src/pandoc/man/pandoc.1 $TARGET/share/man/man1
13−mv pandoc pandoc-citeproc $TARGET/bin
14−strip $TARGET/bin/pandoc
15−strip $TARGET/bin/pandoc-citeproc
16−gzip -9 $TARGET/share/man/man1/pandoc.1
17−gzip -9 $TARGET/share/man/man1/pandoc-citeproc.1
18−tar cvzf $TARGET-linux-amd64.tar.gz $TARGET
19−rm -r $TARGET
macos/Makefile+1−2
@@ -6,9 +6,8 @@ ALL=$(BASE)-macOS.pkg $(BASE)-macOS.zip
66all: $(ALL) notarize
77
88signed.txt: $(DEST)
9− chmod +x $(DEST)/bin/pandoc $(DEST)/bin/pandoc-citeproc
9+ chmod +x $(DEST)/bin/pandoc
1010 codesign --force --options runtime -s "5U2WKE6DES" $(DEST)/bin/pandoc
11− codesign --force --options runtime -s "5U2WKE6DES" $(DEST)/bin/pandoc-citeproc
1211 echo "SIGNED" > signed.txt
1312
1413pandoc.pkg: signed.txt
man/pandoc.1+1206−676
@@ -1,13 +1,13 @@
1−.\"t
2−.\" Automatically generated by Pandoc 2.10
1+'\" t
2+.\" Automatically generated by Pandoc 2.14.0.1
33.\"
4−.TH "Pandoc User\[aq]s Guide" "" "June 29, 2020" "pandoc 2.10" ""
4+.TH "Pandoc User\[cq]s Guide" "" "June 20, 2021" "pandoc 2.14.0.3" ""
55.hy
66.SH NAME
77pandoc - general markup converter
88.SH SYNOPSIS
99.PP
10−\f[C]pandoc\f[R] [\f[I]options\f[R]] [\f[I]input-file\f[R]]...
10+\f[C]pandoc\f[R] [\f[I]options\f[R]] [\f[I]input-file\f[R]]\&...
1111.SH DESCRIPTION
1212.PP
1313Pandoc is a Haskell library for converting from one markup format to
@@ -20,10 +20,10 @@ For the full lists of input and output formats, see the \f[C]--from\f[R]
2020and \f[C]--to\f[R] options below.
2121Pandoc can also produce PDF output: see creating a PDF, below.
2222.PP
23−Pandoc\[aq]s enhanced version of Markdown includes syntax for tables,
23+Pandoc\[cq]s enhanced version of Markdown includes syntax for tables,
2424definition lists, metadata blocks, footnotes, citations, math, and much
2525more.
26−See below under Pandoc\[aq]s Markdown.
26+See below under Pandoc\[cq]s Markdown.
2727.PP
2828Pandoc has a modular design: it consists of a set of readers, which
2929parse text in a given format and produce a native representation of the
@@ -33,15 +33,15 @@ Thus, adding an input or output format requires only adding a reader or
3333writer.
3434Users can also run custom pandoc filters to modify the intermediate AST.
3535.PP
36−Because pandoc\[aq]s intermediate representation of a document is less
36+Because pandoc\[cq]s intermediate representation of a document is less
3737expressive than many of the formats it converts between, one should not
3838expect perfect conversions between every format and every other.
3939Pandoc attempts to preserve the structural elements of a document, but
4040not formatting details such as margin size.
4141And some document elements, such as complex tables, may not fit into
42−pandoc\[aq]s simple document model.
43−While conversions from pandoc\[aq]s Markdown to all formats aspire to be
44−perfect, conversions from formats more expressive than pandoc\[aq]s
42+pandoc\[cq]s simple document model.
43+While conversions from pandoc\[cq]s Markdown to all formats aspire to be
44+perfect, conversions from formats more expressive than pandoc\[cq]s
4545Markdown can be expected to be lossy.
4646.SS Using pandoc
4747.PP
@@ -57,9 +57,9 @@ pandoc -o output.html input.txt
5757.fi
5858.PP
5959By default, pandoc produces a document fragment.
60−To produce a standalone document (e.g.
61−a valid HTML file including \f[C]<head>\f[R] and \f[C]<body>\f[R]), use
62−the \f[C]-s\f[R] or \f[C]--standalone\f[R] flag:
60+To produce a standalone document (e.g.\ a valid HTML file including
61+\f[C]<head>\f[R] and \f[C]<body>\f[R]), use the \f[C]-s\f[R] or
62+\f[C]--standalone\f[R] flag:
6363.IP
6464.nf
6565\f[C]
@@ -115,10 +115,10 @@ pandoc -o hello.tex hello.txt
115115.PP
116116will convert \f[C]hello.txt\f[R] from Markdown to LaTeX.
117117If no output file is specified (so that output goes to
118−\f[I]stdout\f[R]), or if the output file\[aq]s extension is unknown, the
118+\f[I]stdout\f[R]), or if the output file\[cq]s extension is unknown, the
119119output format will default to HTML.
120120If no input file is specified (so that input comes from
121−\f[I]stdin\f[R]), or if the input files\[aq] extensions are unknown, the
121+\f[I]stdin\f[R]), or if the input files\[cq] extensions are unknown, the
122122input format will be assumed to be Markdown.
123123.SS Character encoding
124124.PP
@@ -172,15 +172,15 @@ You can then test it with \f[C]pdflatex test.tex\f[R].
172172When using LaTeX, the following packages need to be available (they are
173173included with all recent versions of TeX Live): \f[C]amsfonts\f[R],
174174\f[C]amsmath\f[R], \f[C]lm\f[R], \f[C]unicode-math\f[R],
175−\f[C]ifxetex\f[R], \f[C]ifluatex\f[R], \f[C]listings\f[R] (if the
176−\f[C]--listings\f[R] option is used), \f[C]fancyvrb\f[R],
177−\f[C]longtable\f[R], \f[C]booktabs\f[R], \f[C]graphicx\f[R] (if the
178−document contains images), \f[C]hyperref\f[R], \f[C]xcolor\f[R],
179−\f[C]ulem\f[R], \f[C]geometry\f[R] (with the \f[C]geometry\f[R] variable
180−set), \f[C]setspace\f[R] (with \f[C]linestretch\f[R]), and
181−\f[C]babel\f[R] (with \f[C]lang\f[R]).
175+\f[C]iftex\f[R], \f[C]listings\f[R] (if the \f[C]--listings\f[R] option
176+is used), \f[C]fancyvrb\f[R], \f[C]longtable\f[R], \f[C]booktabs\f[R],
177+\f[C]graphicx\f[R] (if the document contains images),
178+\f[C]hyperref\f[R], \f[C]xcolor\f[R], \f[C]ulem\f[R], \f[C]geometry\f[R]
179+(with the \f[C]geometry\f[R] variable set), \f[C]setspace\f[R] (with
180+\f[C]linestretch\f[R]), and \f[C]babel\f[R] (with \f[C]lang\f[R]).
182181The use of \f[C]xelatex\f[R] or \f[C]lualatex\f[R] as the PDF engine
183182requires \f[C]fontspec\f[R].
183+\f[C]lualatex\f[R] uses \f[C]selnolig\f[R].
184184\f[C]xelatex\f[R] uses \f[C]polyglossia\f[R] (with \f[C]lang\f[R]),
185185\f[C]xecjk\f[R], and \f[C]bidi\f[R] (with the \f[C]dir\f[R] variable
186186set).
@@ -227,10 +227,18 @@ Specify input format.
227227\f[I]FORMAT\f[R] can be:
228228.RS
229229.IP \[bu] 2
230+\f[C]bibtex\f[R] (BibTeX bibliography)
231+.IP \[bu] 2
232+\f[C]biblatex\f[R] (BibLaTeX bibliography)
233+.IP \[bu] 2
230234\f[C]commonmark\f[R] (CommonMark Markdown)
231235.IP \[bu] 2
236+\f[C]commonmark_x\f[R] (CommonMark Markdown with extensions)
237+.IP \[bu] 2
232238\f[C]creole\f[R] (Creole 1.0)
233239.IP \[bu] 2
240+\f[C]csljson\f[R] (CSL JSON bibliography)
241+.IP \[bu] 2
234242\f[C]csv\f[R] (CSV table)
235243.IP \[bu] 2
236244\f[C]docbook\f[R] (DocBook)
@@ -261,7 +269,7 @@ if you need extensions not supported in \f[C]gfm\f[R].
261269.IP \[bu] 2
262270\f[C]latex\f[R] (LaTeX)
263271.IP \[bu] 2
264−\f[C]markdown\f[R] (Pandoc\[aq]s Markdown)
272+\f[C]markdown\f[R] (Pandoc\[cq]s Markdown)
265273.IP \[bu] 2
266274\f[C]markdown_mmd\f[R] (MultiMarkdown)
267275.IP \[bu] 2
@@ -311,10 +319,18 @@ Specify output format.
311319.IP \[bu] 2
312320\f[C]beamer\f[R] (LaTeX beamer slide show)
313321.IP \[bu] 2
322+\f[C]bibtex\f[R] (BibTeX bibliography)
323+.IP \[bu] 2
324+\f[C]biblatex\f[R] (BibLaTeX bibliography)
325+.IP \[bu] 2
314326\f[C]commonmark\f[R] (CommonMark Markdown)
315327.IP \[bu] 2
328+\f[C]commonmark_x\f[R] (CommonMark Markdown with extensions)
329+.IP \[bu] 2
316330\f[C]context\f[R] (ConTeXt)
317331.IP \[bu] 2
332+\f[C]csljson\f[R] (CSL JSON bibliography)
333+.IP \[bu] 2
318334\f[C]docbook\f[R] or \f[C]docbook4\f[R] (DocBook 4)
319335.IP \[bu] 2
320336\f[C]docbook5\f[R] (DocBook 5)
@@ -335,8 +351,8 @@ if you need extensions not supported in \f[C]gfm\f[R].
335351.IP \[bu] 2
336352\f[C]haddock\f[R] (Haddock markup)
337353.IP \[bu] 2
338−\f[C]html\f[R] or \f[C]html5\f[R] (HTML, i.e.
339−HTML5/XHTML polyglot markup)
354+\f[C]html\f[R] or \f[C]html5\f[R] (HTML, i.e.\ HTML5/XHTML polyglot
355+markup)
340356.IP \[bu] 2
341357\f[C]html4\f[R] (XHTML 1.0 Transitional)
342358.IP \[bu] 2
@@ -360,7 +376,7 @@ HTML5/XHTML polyglot markup)
360376.IP \[bu] 2
361377\f[C]man\f[R] (roff man)
362378.IP \[bu] 2
363−\f[C]markdown\f[R] (Pandoc\[aq]s Markdown)
379+\f[C]markdown\f[R] (Pandoc\[cq]s Markdown)
364380.IP \[bu] 2
365381\f[C]markdown_mmd\f[R] (MultiMarkdown)
366382.IP \[bu] 2
@@ -441,16 +457,15 @@ On *nix and macOS systems this will be the \f[C]pandoc\f[R] subdirectory
441457of the XDG data directory (by default, \f[C]$HOME/.local/share\f[R],
442458overridable by setting the \f[C]XDG_DATA_HOME\f[R] environment
443459variable).
444−If that directory does not exist, \f[C]$HOME/.pandoc\f[R] will be used
445−(for backwards compatibility).
446−In Windows the default user data directory is
460+If that directory does not exist and \f[C]$HOME/.pandoc\f[R] exists, it
461+will be used (for backwards compatibility).
462+On Windows the default user data directory is
447463\f[C]C:\[rs]Users\[rs]USERNAME\[rs]AppData\[rs]Roaming\[rs]pandoc\f[R].
448464You can find the default user data directory on your system by looking
449465at the output of \f[C]pandoc --version\f[R].
450−A \f[C]reference.odt\f[R], \f[C]reference.docx\f[R], \f[C]epub.css\f[R],
451−\f[C]templates\f[R], \f[C]slidy\f[R], \f[C]slideous\f[R], or
452−\f[C]s5\f[R] directory placed in this directory will override
453−pandoc\[aq]s normal defaults.
466+Data files placed in this directory (for example,
467+\f[C]reference.odt\f[R], \f[C]reference.docx\f[R], \f[C]epub.css\f[R],
468+\f[C]templates\f[R]) will override pandoc\[cq]s normal defaults.
454469.TP
455470\f[B]\f[CB]-d\f[B]\f[R] \f[I]FILE\f[R], \f[B]\f[CB]--defaults=\f[B]\f[R]\f[I]FILE\f[R]
456471Specify a set of default option settings.
@@ -503,7 +518,7 @@ List supported output formats, one per line.
503518List supported extensions for \f[I]FORMAT\f[R], one per line, preceded
504519by a \f[C]+\f[R] or \f[C]-\f[R] indicating whether it is enabled by
505520default in \f[I]FORMAT\f[R].
506−If \f[I]FORMAT\f[R] is not specified, defaults for pandoc\[aq]s Markdown
521+If \f[I]FORMAT\f[R] is not specified, defaults for pandoc\[cq]s Markdown
507522are given.
508523.TP
509524\f[B]\f[CB]--list-highlight-languages\f[B]\f[R]
@@ -548,7 +563,7 @@ This option is useful for converting word processing documents where
548563users have used empty paragraphs to create inter-paragraph space.
549564.TP
550565\f[B]\f[CB]--indented-code-classes=\f[B]\f[R]\f[I]CLASSES\f[R]
551−Specify classes to use for indented code blocks--for example,
566+Specify classes to use for indented code blocks\[en]for example,
552567\f[C]perl,numberLines\f[R] or \f[C]haskell\f[R].
553568Multiple classes may be separated by spaces or commas.
554569.TP
@@ -570,7 +585,7 @@ Reading binary files (docx, odt, epub) implies \f[C]--file-scope\f[R].
570585Specify an executable to be used as a filter transforming the pandoc AST
571586after the input is parsed and before the output is written.
572587The executable should read JSON from stdin and write JSON to stdout.
573−The JSON must be formatted like pandoc\[aq]s own JSON input and output.
588+The JSON must be formatted like pandoc\[cq]s own JSON input and output.
574589The name of the output format will be passed to the filter as the first
575590argument.
576591Hence,
@@ -610,13 +625,13 @@ above).
610625.IP "3." 3
611626\f[C]$PATH\f[R] (executable only)
612627.PP
613−Filters and Lua-filters are applied in the order specified on the
614−command line.
628+Filters, Lua-filters, and citeproc processing are applied in the order
629+specified on the command line.
615630.RE
616631.TP
617632\f[B]\f[CB]-L\f[B]\f[R] \f[I]SCRIPT\f[R], \f[B]\f[CB]--lua-filter=\f[B]\f[R]\f[I]SCRIPT\f[R]
618633Transform the document in a similar fashion as JSON filters (see
619−\f[C]--filter\f[R]), but use pandoc\[aq]s build-in Lua filtering system.
634+\f[C]--filter\f[R]), but use pandoc\[cq]s built-in Lua filtering system.
620635The given Lua script is expected to return a list of Lua filters which
621636will be applied in order.
622637Each Lua filter must contain element-transforming functions indexed by
@@ -626,31 +641,19 @@ applied.
626641.PP
627642The \f[C]pandoc\f[R] Lua module provides helper functions for element
628643creation.
629−It is always loaded into the script\[aq]s Lua environment.
644+It is always loaded into the script\[cq]s Lua environment.
630645.PP
631−The following is an example Lua script for macro-expansion:
632−.IP
633−.nf
634−\f[C]
635−function expand_hello_world(inline)
636− if inline.c == \[aq]{{helloworld}}\[aq] then
637− return pandoc.Emph{ pandoc.Str \[dq]Hello, World\[dq] }
638− else
639− return inline
640− end
641−end
642−
643−return {{Str = expand_hello_world}}
644−\f[R]
645−.fi
646+See the Lua filters documentation for further details.
646647.PP
647648In order of preference, pandoc will look for Lua filters in
648649.IP "1." 3
649−a specified full or relative path (executable or non-executable)
650+a specified full or relative path
650651.IP "2." 3
651−\f[C]$DATADIR/filters\f[R] (executable or non-executable) where
652−\f[C]$DATADIR\f[R] is the user data directory (see \f[C]--data-dir\f[R],
653−above).
652+\f[C]$DATADIR/filters\f[R] where \f[C]$DATADIR\f[R] is the user data
653+directory (see \f[C]--data-dir\f[R], above).
654+.PP
655+Filters, Lua filters, and citeproc processing are applied in the order
656+specified on the command line.
654657.RE
655658.TP
656659\f[B]\f[CB]-M\f[B]\f[R] \f[I]KEY\f[R][\f[B]\f[CB]=\f[B]\f[R]\f[I]VAL\f[R]], \f[B]\f[CB]--metadata=\f[B]\f[R]\f[I]KEY\f[R][\f[B]\f[CB]:\f[B]\f[R]\f[I]VAL\f[R]]
@@ -690,13 +693,13 @@ Specify the number of spaces per tab (default is 4).
690693.TP
691694\f[B]\f[CB]--track-changes=accept\f[B]\f[R]|\f[B]\f[CB]reject\f[B]\f[R]|\f[B]\f[CB]all\f[B]\f[R]
692695Specifies what to do with insertions, deletions, and comments produced
693−by the MS Word \[dq]Track Changes\[dq] feature.
694−\f[C]accept\f[R] (the default), inserts all insertions, and ignores all
696+by the MS Word \[lq]Track Changes\[rq] feature.
697+\f[C]accept\f[R] (the default) processes all the insertions and
695698deletions.
696−\f[C]reject\f[R] inserts all deletions and ignores insertions.
699+\f[C]reject\f[R] ignores them.
697700Both \f[C]accept\f[R] and \f[C]reject\f[R] ignore comments.
698−\f[C]all\f[R] puts in insertions, deletions, and comments, wrapped in
699−spans with \f[C]insertion\f[R], \f[C]deletion\f[R],
701+\f[C]all\f[R] includes all insertions, deletions, and comments, wrapped
702+in spans with \f[C]insertion\f[R], \f[C]deletion\f[R],
700703\f[C]comment-start\f[R], and \f[C]comment-end\f[R] classes,
701704respectively.
702705The author and time of change is included.
@@ -713,11 +716,11 @@ Extract images and other media contained in or linked from the source
713716document to the path \f[I]DIR\f[R], creating it if necessary, and adjust
714717the images references in the document so they point to the extracted
715718files.
716−If the source format is a binary container (docx, epub, or odt), the
717−media is extracted from the container and the original filenames are
718−used.
719−Otherwise the media is read from the file system or downloaded, and new
720−filenames are constructed based on SHA1 hashes of the contents.
719+Media are downloaded, read from the file system, or extracted from a
720+binary container (e.g.\ docx), as needed.
721+The original file paths are used if they are relative paths not
722+containing \f[C]..\f[R].
723+Otherwise filenames are constructed from the SHA1 hash of the contents.
721724.TP
722725\f[B]\f[CB]--abbreviations=\f[B]\f[R]\f[I]FILE\f[R]
723726Specifies a custom abbreviations file, with abbreviations one to a line.
@@ -727,14 +730,14 @@ system default.
727730To see the system default, use
728731\f[C]pandoc --print-default-data-file=abbreviations\f[R].
729732The only use pandoc makes of this list is in the Markdown reader.
730−Strings ending in a period that are found in this list will be followed
731−by a nonbreaking space, so that the period will not produce
732−sentence-ending space in formats like LaTeX.
733+Strings found in this list will be followed by a nonbreaking space, and
734+the period will not produce sentence-ending space in formats like LaTeX.
735+The strings may not contain spaces.
733736.SS General writer options
734737.TP
735738\f[B]\f[CB]-s\f[B]\f[R], \f[B]\f[CB]--standalone\f[B]\f[R]
736−Produce output with an appropriate header and footer (e.g.
737−a standalone HTML, LaTeX, TEI, or RTF file, not a fragment).
739+Produce output with an appropriate header and footer (e.g.\ a standalone
740+HTML, LaTeX, TEI, or RTF file, not a fragment).
738741This option is set automatically for \f[C]pdf\f[R], \f[C]epub\f[R],
739742\f[C]epub3\f[R], \f[C]fb2\f[R], \f[C]docx\f[R], and \f[C]odt\f[R]
740743output.
@@ -894,8 +897,7 @@ Implies \f[C]--standalone\f[R].
894897.TP
895898\f[B]\f[CB]-B\f[B]\f[R] \f[I]FILE\f[R], \f[B]\f[CB]--include-before-body=\f[B]\f[R]\f[I]FILE\f[R]|\f[I]URL\f[R]
896899Include contents of \f[I]FILE\f[R], verbatim, at the beginning of the
897−document body (e.g.
898−after the \f[C]<body>\f[R] tag in HTML, or the
900+document body (e.g.\ after the \f[C]<body>\f[R] tag in HTML, or the
899901\f[C]\[rs]begin{document}\f[R] command in LaTeX).
900902This can be used to include navigation bars or banners in HTML
901903documents.
@@ -921,22 +923,20 @@ Note that, if \f[C]--resource-path\f[R] is specified, the working
921923directory must be explicitly listed or it will not be searched.
922924For example: \f[C]--resource-path=.:test\f[R] will search the working
923925directory and the \f[C]test\f[R] subdirectory, in that order.
924−.RS
925−.PP
926−\f[C]--resource-path\f[R] only has an effect if (a) the output format
927−embeds images (for example, \f[C]docx\f[R], \f[C]pdf\f[R], or
928−\f[C]html\f[R] with \f[C]--self-contained\f[R]) or (b) it is used
929−together with \f[C]--extract-media\f[R].
930−.RE
926+This option can be used repeatedly.
927+Search path components that come later on the command line will be
928+searched before those that come earlier, so
929+\f[C]--resource-path foo:bar --resource-path baz:bim\f[R] is equivalent
930+to \f[C]--resource-path baz:bim:foo:bar\f[R].
931931.TP
932932\f[B]\f[CB]--request-header=\f[B]\f[R]\f[I]NAME\f[R]\f[B]\f[CB]:\f[B]\f[R]\f[I]VAL\f[R]
933933Set the request header \f[I]NAME\f[R] to the value \f[I]VAL\f[R] when
934934making HTTP requests (for example, when a URL is given on the command
935935line, or when resources used in a document must be downloaded).
936−If you\[aq]re behind a proxy, you also need to set the environment
936+If you\[cq]re behind a proxy, you also need to set the environment
937937variable \f[C]http_proxy\f[R] to \f[C]http://...\f[R].
938938.TP
939−\[ga]--no-check-certificate
939+\f[B]\f[CB]--no-check-certificate\f[B]\f[R]
940940Disable the certificate verification to allow access to unsecure HTTP
941941resources (for example when the certificate is no longer valid or self
942942signed).
@@ -947,7 +947,7 @@ Produce a standalone HTML file with no external dependencies, using
947947\f[C]data:\f[R] URIs to incorporate the contents of linked scripts,
948948stylesheets, images, and videos.
949949Implies \f[C]--standalone\f[R].
950−The resulting file should be \[dq]self-contained,\[dq] in the sense that
950+The resulting file should be \[lq]self-contained,\[rq] in the sense that
951951it needs no external files and no net access to be displayed properly by
952952a browser.
953953This option works only with HTML output formats, including
@@ -963,12 +963,14 @@ left alone; the documents they link to will not be incorporated in the
963963document.
964964Limitation: resources that are loaded dynamically through JavaScript
965965cannot be incorporated; as a result, \f[C]--self-contained\f[R] does not
966−work with \f[C]--mathjax\f[R], and some advanced features (e.g.
967−zoom or speaker notes) may not work in an offline
968−\[dq]self-contained\[dq] \f[C]reveal.js\f[R] slide show.
966+work with \f[C]--mathjax\f[R], and some advanced features (e.g.\ zoom or
967+speaker notes) may not work in an offline \[lq]self-contained\[rq]
968+\f[C]reveal.js\f[R] slide show.
969969.TP
970970\f[B]\f[CB]--html-q-tags\f[B]\f[R]
971971Use \f[C]<q>\f[R] tags for quotes in HTML.
972+(This option only has an effect if the \f[C]smart\f[R] extension is
973+enabled for the input format used.)
972974.TP
973975\f[B]\f[CB]--ascii\f[B]\f[R]
974976Use only ASCII characters in output.
@@ -986,21 +988,24 @@ By default inline links are used.
986988The placement of link references is affected by the
987989\f[C]--reference-location\f[R] option.
988990.TP
989−\f[B]\f[CB]--reference-location = block\f[B]\f[R]|\f[B]\f[CB]section\f[B]\f[R]|\f[B]\f[CB]document\f[B]\f[R]
991+\f[B]\f[CB]--reference-location=block\f[B]\f[R]|\f[B]\f[CB]section\f[B]\f[R]|\f[B]\f[CB]document\f[B]\f[R]
990992Specify whether footnotes (and references, if \f[C]reference-links\f[R]
991993is set) are placed at the end of the current (top-level) block, the
992994current section, or the document.
993995The default is \f[C]document\f[R].
994996Currently only affects the markdown writer.
995997.TP
998+\f[B]\f[CB]--markdown-headings=setext\f[B]\f[R]|\f[B]\f[CB]atx\f[B]\f[R]
999+Specify whether to use ATX-style (\f[C]#\f[R]-prefixed) or Setext-style
1000+(underlined) headings for level 1 and 2 headings in Markdown output.
1001+(The default is \f[C]atx\f[R].) ATX-style headings are always used for
1002+levels 3+.
1003+This option also affects Markdown cells in \f[C]ipynb\f[R] output.
1004+.TP
9961005\f[B]\f[CB]--atx-headers\f[B]\f[R]
997−Use ATX-style headings in Markdown output.
998−The default is to use setext-style headings for levels 1 to 2, and then
999−ATX headings.
1000−(Note: for \f[C]gfm\f[R] output, ATX headings are always used.) This
1001−option also affects markdown cells in \f[C]ipynb\f[R] output.
1006+\f[I]Deprecated synonym for \f[CI]--markdown-headings=atx\f[I].\f[R]
10021007.TP
1003−\f[B]\f[CB]--top-level-division=[default|section|chapter|part]\f[B]\f[R]
1008+\f[B]\f[CB]--top-level-division=default\f[B]\f[R]|\f[B]\f[CB]section\f[B]\f[R]|\f[B]\f[CB]chapter\f[B]\f[R]|\f[B]\f[CB]part\f[B]\f[R]
10041009Treat top-level headings as the given division type in LaTeX, ConTeXt,
10051010DocBook, and TEI output.
10061011The hierarchy order is part, chapter, then section; all headings are
@@ -1017,21 +1022,22 @@ become \f[C]\[rs]part{..}\f[R], while second-level headings remain as
10171022their default type.
10181023.TP
10191024\f[B]\f[CB]-N\f[B]\f[R], \f[B]\f[CB]--number-sections\f[B]\f[R]
1020−Number section headings in LaTeX, ConTeXt, HTML, or EPUB output.
1025+Number section headings in LaTeX, ConTeXt, HTML, Docx, ms, or EPUB
1026+output.
10211027By default, sections are not numbered.
10221028Sections with class \f[C]unnumbered\f[R] will never be numbered, even if
10231029\f[C]--number-sections\f[R] is specified.
10241030.TP
1025−\f[B]\f[CB]--number-offset=\f[B]\f[R]\f[I]NUMBER\f[R][\f[B]\f[CB],\f[B]\f[R]\f[I]NUMBER\f[R]\f[B]\f[CB],\f[B]\f[R]\f[I]...\f[R]]
1031+\f[B]\f[CB]--number-offset=\f[B]\f[R]\f[I]NUMBER\f[R][\f[B]\f[CB],\f[B]\f[R]\f[I]NUMBER\f[R]\f[B]\f[CB],\f[B]\f[R]\f[I]\&...\f[R]]
10261032Offset for section headings in HTML output (ignored in other output
10271033formats).
10281034The first number is added to the section number for top-level headings,
10291035the second for second-level headings, and so on.
10301036So, for example, if you want the first top-level heading in your
1031−document to be numbered \[dq]6\[dq], specify
1037+document to be numbered \[lq]6\[rq], specify
10321038\f[C]--number-offset=5\f[R].
10331039If your document starts with a level-2 heading which you want to be
1034−numbered \[dq]1.5\[dq], specify \f[C]--number-offset=1,4\f[R].
1040+numbered \[lq]1.5\[rq], specify \f[C]--number-offset=1,4\f[R].
10351041Offsets are 0 by default.
10361042Implies \f[C]--number-sections\f[R].
10371043.TP
@@ -1196,6 +1202,8 @@ Verbatim Char
11961202Footnote Reference
11971203.IP \[bu] 2
11981204Hyperlink
1205+.IP \[bu] 2
1206+Section Number
11991207.PP
12001208Table style:
12011209.IP \[bu] 2
@@ -1328,7 +1336,7 @@ body { font-family: \[dq]DejaVuSans\[dq]; }
13281336.TP
13291337\f[B]\f[CB]--epub-chapter-level=\f[B]\f[R]\f[I]NUMBER\f[R]
13301338Specify the heading level at which to split the EPUB into separate
1331−\[dq]chapter\[dq] files.
1339+\[lq]chapter\[rq] files.
13321340The default is to split into chapters at level-1 headings.
13331341This option only affects the internal composition of the EPUB, not the
13341342way chapters and sections are displayed to users.
@@ -1380,47 +1388,69 @@ introduction to PDF generation from HTML/CSS.)
13801388Use the given string as a command-line argument to the
13811389\f[C]pdf-engine\f[R].
13821390For example, to use a persistent directory \f[C]foo\f[R] for
1383−\f[C]latexmk\f[R]\[aq]s auxiliary files, use
1391+\f[C]latexmk\f[R]\[cq]s auxiliary files, use
13841392\f[C]--pdf-engine-opt=-outdir=foo\f[R].
13851393Note that no check for duplicate options is done.
13861394.SS Citation rendering
13871395.TP
1396+\f[B]\f[CB]-C\f[B]\f[R], \f[B]\f[CB]--citeproc\f[B]\f[R]
1397+Process the citations in the file, replacing them with rendered
1398+citations and adding a bibliography.
1399+Citation processing will not take place unless bibliographic data is
1400+supplied, either through an external file specified using the
1401+\f[C]--bibliography\f[R] option or the \f[C]bibliography\f[R] field in
1402+metadata, or via a \f[C]references\f[R] section in metadata containing a
1403+list of citations in CSL YAML format with Markdown formatting.
1404+The style is controlled by a CSL stylesheet specified using the
1405+\f[C]--csl\f[R] option or the \f[C]csl\f[R] field in metadata.
1406+(If no stylesheet is specified, the \f[C]chicago-author-date\f[R] style
1407+will be used by default.) The citation processing transformation may be
1408+applied before or after filters or Lua filters (see \f[C]--filter\f[R],
1409+\f[C]--lua-filter\f[R]): these transformations are applied in the order
1410+they appear on the command line.
1411+For more information, see the section on Citations.
1412+.TP
13881413\f[B]\f[CB]--bibliography=\f[B]\f[R]\f[I]FILE\f[R]
1389−Set the \f[C]bibliography\f[R] field in the document\[aq]s metadata to
1390−\f[I]FILE\f[R], overriding any value set in the metadata, and process
1391−citations using \f[C]pandoc-citeproc\f[R].
1392−(This is equivalent to
1393−\f[C]--metadata bibliography=FILE --filter pandoc-citeproc\f[R].) If
1394−\f[C]--natbib\f[R] or \f[C]--biblatex\f[R] is also supplied,
1395−\f[C]pandoc-citeproc\f[R] is not used, making this equivalent to
1396−\f[C]--metadata bibliography=FILE\f[R].
1414+Set the \f[C]bibliography\f[R] field in the document\[cq]s metadata to
1415+\f[I]FILE\f[R], overriding any value set in the metadata.
13971416If you supply this argument multiple times, each \f[I]FILE\f[R] will be
13981417added to bibliography.
1418+If \f[I]FILE\f[R] is a URL, it will be fetched via HTTP.
1419+If \f[I]FILE\f[R] is not found relative to the working directory, it
1420+will be sought in the resource path (see \f[C]--resource-path\f[R]).
13991421.TP
14001422\f[B]\f[CB]--csl=\f[B]\f[R]\f[I]FILE\f[R]
1401−Set the \f[C]csl\f[R] field in the document\[aq]s metadata to
1423+Set the \f[C]csl\f[R] field in the document\[cq]s metadata to
14021424\f[I]FILE\f[R], overriding any value set in the metadata.
1403−(This is equivalent to \f[C]--metadata csl=FILE\f[R].) This option is
1404−only relevant with \f[C]pandoc-citeproc\f[R].
1425+(This is equivalent to \f[C]--metadata csl=FILE\f[R].) If \f[I]FILE\f[R]
1426+is a URL, it will be fetched via HTTP.
1427+If \f[I]FILE\f[R] is not found relative to the working directory, it
1428+will be sought in the resource path (see \f[C]--resource-path\f[R]) and
1429+finally in the \f[C]csl\f[R] subdirectory of the pandoc user data
1430+directory.
14051431.TP
14061432\f[B]\f[CB]--citation-abbreviations=\f[B]\f[R]\f[I]FILE\f[R]
1407−Set the \f[C]citation-abbreviations\f[R] field in the document\[aq]s
1433+Set the \f[C]citation-abbreviations\f[R] field in the document\[cq]s
14081434metadata to \f[I]FILE\f[R], overriding any value set in the metadata.
14091435(This is equivalent to
1410−\f[C]--metadata citation-abbreviations=FILE\f[R].) This option is only
1411−relevant with \f[C]pandoc-citeproc\f[R].
1436+\f[C]--metadata citation-abbreviations=FILE\f[R].) If \f[I]FILE\f[R] is
1437+a URL, it will be fetched via HTTP.
1438+If \f[I]FILE\f[R] is not found relative to the working directory, it
1439+will be sought in the resource path (see \f[C]--resource-path\f[R]) and
1440+finally in the \f[C]csl\f[R] subdirectory of the pandoc user data
1441+directory.
14121442.TP
14131443\f[B]\f[CB]--natbib\f[B]\f[R]
14141444Use \f[C]natbib\f[R] for citations in LaTeX output.
1415−This option is not for use with the \f[C]pandoc-citeproc\f[R] filter or
1416−with PDF output.
1445+This option is not for use with the \f[C]--citeproc\f[R] option or with
1446+PDF output.
14171447It is intended for use in producing a LaTeX file that can be processed
14181448with \f[C]bibtex\f[R].
14191449.TP
14201450\f[B]\f[CB]--biblatex\f[B]\f[R]
14211451Use \f[C]biblatex\f[R] for citations in LaTeX output.
1422−This option is not for use with the \f[C]pandoc-citeproc\f[R] filter or
1423−with PDF output.
1452+This option is not for use with the \f[C]--citeproc\f[R] option or with
1453+PDF output.
14241454It is intended for use in producing a LaTeX file that can be processed
14251455with \f[C]bibtex\f[R] or \f[C]biber\f[R].
14261456.SS Math rendering in HTML
@@ -1461,7 +1491,7 @@ For SVG images you can for example use
14611491If no URL is specified, the CodeCogs URL generating PNGs will be used
14621492(\f[C]https://latex.codecogs.com/png.latex?\f[R]).
14631493Note: the \f[C]--webtex\f[R] option will affect Markdown output as well
1464−as HTML, which is useful if you\[aq]re targeting a version of Markdown
1494+as HTML, which is useful if you\[cq]re targeting a version of Markdown
14651495without native math support.
14661496.TP
14671497\f[B]\f[CB]--katex\f[B]\f[R][\f[B]\f[CB]=\f[B]\f[R]\f[I]URL\f[R]]
@@ -1474,16 +1504,16 @@ inserted.
14741504.TP
14751505\f[B]\f[CB]--gladtex\f[B]\f[R]
14761506Enclose TeX math in \f[C]<eq>\f[R] tags in HTML output.
1477−The resulting HTML can then be processed by GladTeX to produce images of
1478−the typeset formulas and an HTML file with links to these images.
1479−So, the procedure is:
1507+The resulting HTML can then be processed by GladTeX to produce SVG
1508+images of the typeset formulas and an HTML file with these images
1509+embedded.
14801510.RS
14811511.IP
14821512.nf
14831513\f[C]
14841514pandoc -s --gladtex input.md -o myfile.htex
1485−gladtex -d myfile-images myfile.htex
1486−# produces myfile.html and images in myfile-images
1515+gladtex -d image_dir myfile.htex
1516+# produces myfile.html and images in image_dir
14871517\f[R]
14881518.fi
14891519.RE
@@ -1572,6 +1602,11 @@ T}@T{
15721602PandocUnsupportedExtensionError
15731603T}
15741604T{
1605+24
1606+T}@T{
1607+PandocCiteprocError
1608+T}
1609+T{
1575161031
15761611T}@T{
15771612PandocEpubSubdirectoryError
@@ -1582,6 +1617,11 @@ T}@T{
15821617PandocPDFError
15831618T}
15841619T{
1620+44
1621+T}@T{
1622+PandocXMLError
1623+T}
1624+T{
1585162547
15861626T}@T{
15871627PandocPDFProgramNotFoundError
@@ -1642,6 +1682,11 @@ T}@T{
16421682PandocIpynbDecodingError
16431683T}
16441684T{
1685+94
1686+T}@T{
1687+PandocUnsupportedCharsetError
1688+T}
1689+T{
1645169097
16461691T}@T{
16471692PandocCouldNotFindDataFileError
@@ -1674,6 +1719,16 @@ input-files:
16741719- content.md
16751720# or you may use input-file: with a single value
16761721
1722+# Include options from the specified defaults files.
1723+# The files will be searched for first in the working directory
1724+# and then in the defaults subdirectory of the user data directory.
1725+# The files are included in the same order in which they appear in
1726+# the list. Options specified in this defaults file always have
1727+# priority over the included ones.
1728+defaults:
1729+- defsA
1730+- defsB
1731+
16771732template: letter
16781733standalone: true
16791734self-contained: false
@@ -1701,11 +1756,24 @@ include-after-body: []
17011756include-in-header: []
17021757resource-path: [\[dq].\[dq]]
17031758
1704−# filters will be assumed to be Lua filters if they have
1759+# turn on built-in citation processing. Note that if you need
1760+# control over when the citeproc processing is done relative
1761+# to other filters, you should instead use \[ga]citeproc\[ga] in the
1762+# list of \[ga]filters\[ga] (see below).
1763+citeproc: true
1764+csl: ieee
1765+bibliography:
1766+- foobar.bib
1767+- barbaz.json
1768+citation-abbreviations: abbrevs.json
1769+
1770+# Filters will be assumed to be Lua filters if they have
17051771# the .lua extension, and json filters otherwise. But
1706−# the filter type can also be specified explicitly, as shown:
1772+# the filter type can also be specified explicitly, as shown.
1773+# Filters are run in the order specified.
1774+# To include the built-in citeproc filter, use either \[ga]citeproc\[ga]
1775+# or \[ga]{type: citeproc}\[ga].
17071776filters:
1708−- pandoc-citeproc
17091777- wordcount.lua
17101778- type: json
17111779 path: foo.lua
@@ -1718,8 +1786,11 @@ data-dir:
17181786verbosity: INFO
17191787log-file: log.json
17201788
1721−# citeproc, natbib, or biblatex
1789+# citeproc, natbib, or biblatex. This only affects LaTeX
1790+# output. If you want to use citeproc to format citations,
1791+# you should also set \[aq]citeproc: true\[aq] (see above).
17221792cite-method: citeproc
1793+
17231794# part, chapter, section, or default:
17241795top-level-division: chapter
17251796abbreviations:
@@ -1788,7 +1859,7 @@ epub-cover-image: cover.jpg
17881859reference-links: true
17891860# block, section, or document
17901861reference-location: block
1791−atx-headers: false
1862+markdown-headings: setext
17921863
17931864# accept, reject, or all
17941865track-changes: accept
@@ -1820,6 +1891,38 @@ verbosity: INFO
18201891\f[R]
18211892.fi
18221893.PP
1894+In fields that expect a file path (or list of file paths), the following
1895+syntax may be used to interpolate environment variables:
1896+.IP
1897+.nf
1898+\f[C]
1899+csl: ${HOME}/mycsldir/special.csl
1900+\f[R]
1901+.fi
1902+.PP
1903+\f[C]${USERDATA}\f[R] may also be used; this will always resolve to the
1904+user data directory that is current when the defaults file is parsed,
1905+regardless of the setting of the environment variable
1906+\f[C]USERDATA\f[R].
1907+.PP
1908+\f[C]${.}\f[R] will resolve to the directory containing the default file
1909+itself.
1910+This allows you to refer to resources contained in that directory:
1911+.IP
1912+.nf
1913+\f[C]
1914+epub-cover-image: ${.}/cover.jpg
1915+epub-metadata: ${.}/meta.xml
1916+resource-path:
1917+- . # the working directory from which pandoc is run
1918+- ${.}/images # the images subdirectory of the directory
1919+ # containing this defaults file
1920+\f[R]
1921+.fi
1922+.PP
1923+This environment variable interpolation syntax \f[I]only\f[R] works in
1924+fields that expect file paths.
1925+.PP
18231926Default files can be placed in the \f[C]defaults\f[R] subdirectory of
18241927the user data directory and used from any directory.
18251928For example, one could create a file specifying defaults for writing
@@ -1876,10 +1979,10 @@ arbitrary information at any point in the file.
18761979They may be set at the command line using the \f[C]-V/--variable\f[R]
18771980option.
18781981If a variable is not set, pandoc will look for the key in the
1879−document\[aq]s metadata, which can be set using either YAML metadata
1982+document\[cq]s metadata, which can be set using either YAML metadata
18801983blocks or with the \f[C]-M/--metadata\f[R] option.
18811984In addition, some variables are given default values by pandoc.
1882−See Variables below for a list of variables used in pandoc\[aq]s default
1985+See Variables below for a list of variables used in pandoc\[cq]s default
18831986templates.
18841987.PP
18851988If you use custom templates, you may need to revise them as pandoc
@@ -1896,8 +1999,8 @@ be treated as a comment and omitted from the output.
18961999.SS Delimiters
18972000.PP
18982001To mark variables and control structures in the template, either
1899−\f[C]$\f[R]...\f[C]$\f[R] or \f[C]${\f[R]...\f[C]}\f[R] may be used as
1900−delimiters.
2002+\f[C]$\f[R]\&...\f[C]$\f[R] or \f[C]${\f[R]\&...\f[C]}\f[R] may be used
2003+as delimiters.
19012004The styles may also be mixed in the same template, but the opening and
19022005closing delimiter must match in each case.
19032006The opening delimiter may be followed by one or more spaces or tabs,
@@ -2079,9 +2182,9 @@ ${ styles.html() }
20792182\f[R]
20802183.fi
20812184.PP
2082−(If a partial is not found in the directory of the template, it will
2083−also be sought in the \f[C]templates\f[R] subdirectory of the user data
2084−directory.)
2185+(If a partial is not found in the directory of the template and the
2186+template path is given as a relative path, it will also be sought in the
2187+\f[C]templates\f[R] subdirectory of the user data directory.)
20852188.PP
20862189Partials may optionally be applied to variables using a colon:
20872190.IP
@@ -2130,7 +2233,7 @@ an explicit \f[C]for\f[R] loop) cannot contain interpolated variables or
21302233other template directives.
21312234.SS Nesting
21322235.PP
2133−To ensure that content is \[dq]nested,\[dq] that is, subsequent lines
2236+To ensure that content is \[lq]nested,\[rq] that is, subsequent lines
21342237indented, use the \f[C]\[ha]\f[R] directive:
21352238.IP
21362239.nf
@@ -2172,7 +2275,7 @@ will produce
21722275.PP
21732276If a variable occurs by itself on a line, preceded by whitespace and not
21742277followed by further text or directives on the same line, and the
2175−variable\[aq]s value contains multiple lines, it will be nested
2278+variable\[cq]s value contains multiple lines, it will be nested
21762279automatically.
21772280.SS Breakable spaces
21782281.PP
@@ -2314,7 +2417,8 @@ including a title block in the document itself, you can set the
23142417\f[C]title-meta\f[R], \f[C]author-meta\f[R], and \f[C]date-meta\f[R]
23152418variables.
23162419(By default these are set automatically, based on \f[C]title\f[R],
2317−\f[C]author\f[R], and \f[C]date\f[R].)
2420+\f[C]author\f[R], and \f[C]date\f[R].) The page title in HTML is set by
2421+\f[C]pagetitle\f[R], which is equal to \f[C]title\f[R] by default.
23182422.RE
23192423.TP
23202424\f[B]\f[CB]subtitle\f[B]\f[R]
@@ -2404,13 +2508,81 @@ For bidirectional documents, native pandoc \f[C]span\f[R]s and
24042508\f[C]div\f[R]s with the \f[C]dir\f[R] attribute (value \f[C]rtl\f[R] or
24052509\f[C]ltr\f[R]) can be used to override the base direction in some output
24062510formats.
2407−This may not always be necessary if the final renderer (e.g.
2408−the browser, when generating HTML) supports the Unicode Bidirectional
2511+This may not always be necessary if the final renderer (e.g.\ the
2512+browser, when generating HTML) supports the Unicode Bidirectional
24092513Algorithm.
24102514.PP
24112515When using LaTeX for bidirectional documents, only the \f[C]xelatex\f[R]
24122516engine is fully supported (use \f[C]--pdf-engine=xelatex\f[R]).
24132517.RE
2518+.SS Variables for HTML
2519+.TP
2520+\f[B]\f[CB]document-css\f[B]\f[R]
2521+Enables inclusion of most of the CSS in the \f[C]styles.html\f[R]
2522+partial (have a look with
2523+\f[C]pandoc --print-default-data-file=templates/styles.html\f[R]).
2524+Unless you use \f[C]--css\f[R], this variable is set to \f[C]true\f[R]
2525+by default.
2526+You can disable it with e.g.\ \f[C]pandoc -M document-css=false\f[R].
2527+.TP
2528+\f[B]\f[CB]mainfont\f[B]\f[R]
2529+sets the CSS \f[C]font-family\f[R] property on the \f[C]html\f[R]
2530+element.
2531+.TP
2532+\f[B]\f[CB]fontsize\f[B]\f[R]
2533+sets the base CSS \f[C]font-size\f[R], which you\[cq]d usually set to
2534+e.g.\ \f[C]20px\f[R], but it also accepts \f[C]pt\f[R] (12pt = 16px in
2535+most browsers).
2536+.TP
2537+\f[B]\f[CB]fontcolor\f[B]\f[R]
2538+sets the CSS \f[C]color\f[R] property on the \f[C]html\f[R] element.
2539+.TP
2540+\f[B]\f[CB]linkcolor\f[B]\f[R]
2541+sets the CSS \f[C]color\f[R] property on all links.
2542+.TP
2543+\f[B]\f[CB]monofont\f[B]\f[R]
2544+sets the CSS \f[C]font-family\f[R] property on \f[C]code\f[R] elements.
2545+.TP
2546+\f[B]\f[CB]monobackgroundcolor\f[B]\f[R]
2547+sets the CSS \f[C]background-color\f[R] property on \f[C]code\f[R]
2548+elements and adds extra padding.
2549+.TP
2550+\f[B]\f[CB]linestretch\f[B]\f[R]
2551+sets the CSS \f[C]line-height\f[R] property on the \f[C]html\f[R]
2552+element, which is preferred to be unitless.
2553+.TP
2554+\f[B]\f[CB]backgroundcolor\f[B]\f[R]
2555+sets the CSS \f[C]background-color\f[R] property on the \f[C]html\f[R]
2556+element.
2557+.TP
2558+\f[B]\f[CB]margin-left\f[B]\f[R], \f[B]\f[CB]margin-right\f[B]\f[R], \f[B]\f[CB]margin-top\f[B]\f[R], \f[B]\f[CB]margin-bottom\f[B]\f[R]
2559+sets the corresponding CSS \f[C]padding\f[R] properties on the
2560+\f[C]body\f[R] element.
2561+.PP
2562+To override or extend some CSS for just one document, include for
2563+example:
2564+.IP
2565+.nf
2566+\f[C]
2567+---
2568+header-includes: |
2569+ <style>
2570+ blockquote {
2571+ font-style: italic;
2572+ }
2573+ tr.even {
2574+ background-color: #f0f0f0;
2575+ }
2576+ td, th {
2577+ padding: 0.5em 2em 0.5em 0.5em;
2578+ }
2579+ tbody {
2580+ border-bottom: none;
2581+ }
2582+ </style>
2583+---
2584+\f[R]
2585+.fi
24142586.SS Variables for HTML math
24152587.TP
24162588\f[B]\f[CB]classoption\f[B]\f[R]
@@ -2418,11 +2590,10 @@ when using KaTeX, you can render display math equations flush left using
24182590YAML metadata or with \f[C]-M classoption=fleqn\f[R].
24192591.SS Variables for HTML slides
24202592.PP
2421−These affect HTML output when producing slide shows with pandoc.
2422−.PP
2423−All reveal.js configuration options are available as variables.
2424−To turn off boolean flags that default to true in reveal.js, use
2425−\f[C]0\f[R].
2593+These affect HTML output when [producing slide shows with pandoc].
2594+.TP
2595+\f[B]\f[CB]institute\f[B]\f[R]
2596+author affiliations: can be a list when there are multiple authors
24262597.TP
24272598\f[B]\f[CB]revealjs-url\f[B]\f[R]
24282599base URL for reveal.js documents (defaults to
@@ -2441,6 +2612,10 @@ base URL for Slideous documents (defaults to \f[C]slideous\f[R])
24412612\f[B]\f[CB]title-slide-attributes\f[B]\f[R]
24422613additional attributes for the title slide of reveal.js slide shows.
24432614See background in reveal.js and beamer for an example.
2615+.PP
2616+All reveal.js configuration options are available as variables.
2617+To turn off boolean flags that default to true in reveal.js, use
2618+\f[C]0\f[R].
24442619.SS Variables for Beamer slides
24452620.PP
24462621These variables change the appearance of PDF slides using
@@ -2469,7 +2644,7 @@ navigation symbols; other valid values are \f[C]frame\f[R],
24692644\f[C]vertical\f[R], and \f[C]horizontal\f[R])
24702645.TP
24712646\f[B]\f[CB]section-titles\f[B]\f[R]
2472−enables \[dq]title pages\[dq] for new sections (default is true)
2647+enables \[lq]title pages\[rq] for new sections (default is true)
24732648.TP
24742649\f[B]\f[CB]theme\f[B]\f[R], \f[B]\f[CB]colortheme\f[B]\f[R], \f[B]\f[CB]fonttheme\f[B]\f[R], \f[B]\f[CB]innertheme\f[B]\f[R], \f[B]\f[CB]outertheme\f[B]\f[R]
24752650beamer themes
@@ -2521,8 +2696,8 @@ header-includes: |
25212696.RE
25222697.TP
25232698\f[B]\f[CB]classoption\f[B]\f[R]
2524−option for document class, e.g.
2525−\f[C]oneside\f[R]; repeat for multiple options:
2699+option for document class, e.g.\ \f[C]oneside\f[R]; repeat for multiple
2700+options:
25262701.RS
25272702.IP
25282703.nf
@@ -2543,8 +2718,8 @@ document class: usually one of the standard classes, \f[C]article\f[R],
25432718default to smaller margins; or \f[C]memoir\f[R]
25442719.TP
25452720\f[B]\f[CB]geometry\f[B]\f[R]
2546−option for \f[C]geometry\f[R] package, e.g.
2547−\f[C]margin=1in\f[R]; repeat for multiple options:
2721+option for \f[C]geometry\f[R] package, e.g.\ \f[C]margin=1in\f[R];
2722+repeat for multiple options:
25482723.RS
25492724.IP
25502725.nf
@@ -2560,8 +2735,8 @@ geometry:
25602735.RE
25612736.TP
25622737\f[B]\f[CB]hyperrefoptions\f[B]\f[R]
2563−option for \f[C]hyperref\f[R] package, e.g.
2564−\f[C]linktoc=all\f[R]; repeat for multiple options:
2738+option for \f[C]hyperref\f[R] package, e.g.\ \f[C]linktoc=all\f[R];
2739+repeat for multiple options:
25652740.RS
25662741.IP
25672742.nf
@@ -2577,12 +2752,13 @@ hyperrefoptions:
25772752.RE
25782753.TP
25792754\f[B]\f[CB]indent\f[B]\f[R]
2580−uses document class settings for indentation (the default LaTeX template
2581−otherwise removes indentation and adds space between paragraphs)
2755+if true, pandoc will use document class settings for indentation (the
2756+default LaTeX template otherwise removes indentation and adds space
2757+between paragraphs)
25822758.TP
25832759\f[B]\f[CB]linestretch\f[B]\f[R]
2584−adjusts line spacing using the \f[C]setspace\f[R] package, e.g.
2585−\f[C]1.25\f[R], \f[C]1.5\f[R]
2760+adjusts line spacing using the \f[C]setspace\f[R] package,
2761+e.g.\ \f[C]1.25\f[R], \f[C]1.5\f[R]
25862762.TP
25872763\f[B]\f[CB]margin-left\f[B]\f[R], \f[B]\f[CB]margin-right\f[B]\f[R], \f[B]\f[CB]margin-top\f[B]\f[R], \f[B]\f[CB]margin-bottom\f[B]\f[R]
25882764sets margins if \f[C]geometry\f[R] is not used (otherwise
@@ -2594,8 +2770,7 @@ control \f[C]\[rs]pagestyle{}\f[R]: the default article class supports
25942770numbers), and \f[C]headings\f[R] (section titles in running heads)
25952771.TP
25962772\f[B]\f[CB]papersize\f[B]\f[R]
2597−paper size, e.g.
2598−\f[C]letter\f[R], \f[C]a4\f[R]
2773+paper size, e.g.\ \f[C]letter\f[R], \f[C]a4\f[R]
25992774.TP
26002775\f[B]\f[CB]secnumdepth\f[B]\f[R]
26012776numbering depth for sections (with \f[C]--number-sections\f[R] option or
@@ -2720,35 +2895,32 @@ list of options for natbib
27202895Pandoc uses these variables when creating a PDF with ConTeXt.
27212896.TP
27222897\f[B]\f[CB]fontsize\f[B]\f[R]
2723−font size for body text (e.g.
2724−\f[C]10pt\f[R], \f[C]12pt\f[R])
2898+font size for body text (e.g.\ \f[C]10pt\f[R], \f[C]12pt\f[R])
27252899.TP
27262900\f[B]\f[CB]headertext\f[B]\f[R], \f[B]\f[CB]footertext\f[B]\f[R]
27272901text to be placed in running header or footer (see ConTeXt Headers and
27282902Footers); repeat up to four times for different placement
27292903.TP
27302904\f[B]\f[CB]indenting\f[B]\f[R]
2731−controls indentation of paragraphs, e.g.
2732−\f[C]yes,small,next\f[R] (see ConTeXt Indentation); repeat for multiple
2733−options
2905+controls indentation of paragraphs, e.g.\ \f[C]yes,small,next\f[R] (see
2906+ConTeXt Indentation); repeat for multiple options
27342907.TP
27352908\f[B]\f[CB]interlinespace\f[B]\f[R]
2736−adjusts line spacing, e.g.
2737−\f[C]4ex\f[R] (using \f[C]setupinterlinespace\f[R]); repeat for multiple
2738−options
2909+adjusts line spacing, e.g.\ \f[C]4ex\f[R] (using
2910+\f[C]setupinterlinespace\f[R]); repeat for multiple options
27392911.TP
27402912\f[B]\f[CB]layout\f[B]\f[R]
27412913options for page margins and text arrangement (see ConTeXt Layout);
27422914repeat for multiple options
27432915.TP
27442916\f[B]\f[CB]linkcolor\f[B]\f[R], \f[B]\f[CB]contrastcolor\f[B]\f[R]
2745−color for links outside and inside a page, e.g.
2746−\f[C]red\f[R], \f[C]blue\f[R] (see ConTeXt Color)
2917+color for links outside and inside a page, e.g.\ \f[C]red\f[R],
2918+\f[C]blue\f[R] (see ConTeXt Color)
27472919.TP
27482920\f[B]\f[CB]linkstyle\f[B]\f[R]
2749−typeface style for links, e.g.
2750−\f[C]normal\f[R], \f[C]bold\f[R], \f[C]slanted\f[R],
2751−\f[C]boldslanted\f[R], \f[C]type\f[R], \f[C]cap\f[R], \f[C]small\f[R]
2921+typeface style for links, e.g.\ \f[C]normal\f[R], \f[C]bold\f[R],
2922+\f[C]slanted\f[R], \f[C]boldslanted\f[R], \f[C]type\f[R], \f[C]cap\f[R],
2923+\f[C]small\f[R]
27522924.TP
27532925\f[B]\f[CB]lof\f[B]\f[R], \f[B]\f[CB]lot\f[B]\f[R]
27542926include list of figures, list of tables
@@ -2766,16 +2938,13 @@ page number style and location (using \f[C]setuppagenumbering\f[R]);
27662938repeat for multiple options
27672939.TP
27682940\f[B]\f[CB]papersize\f[B]\f[R]
2769−paper size, e.g.
2770−\f[C]letter\f[R], \f[C]A4\f[R], \f[C]landscape\f[R] (see ConTeXt Paper
2771−Setup); repeat for multiple options
2941+paper size, e.g.\ \f[C]letter\f[R], \f[C]A4\f[R], \f[C]landscape\f[R]
2942+(see ConTeXt Paper Setup); repeat for multiple options
27722943.TP
27732944\f[B]\f[CB]pdfa\f[B]\f[R]
27742945adds to the preamble the setup necessary to generate PDF/A of the type
2775−specified, e.g.
2776−\f[C]1a:2005\f[R], \f[C]2a\f[R].
2777−If no type is specified (i.e.
2778−the value is set to True, by e.g.
2946+specified, e.g.\ \f[C]1a:2005\f[R], \f[C]2a\f[R].
2947+If no type is specified (i.e.\ the value is set to True, by e.g.
27792948\f[C]--metadata=pdfa\f[R] or \f[C]pdfa: true\f[R] in a YAML metadata
27802949block), \f[C]1b:2005\f[R] will be used as default, for reasons of
27812950backwards compatibility.
@@ -2790,8 +2959,7 @@ See also ConTeXt PDFA for more details.
27902959.TP
27912960\f[B]\f[CB]pdfaiccprofile\f[B]\f[R]
27922961when used in conjunction with \f[C]pdfa\f[R], specifies the ICC profile
2793−to use in the PDF, e.g.
2794−\f[C]default.cmyk\f[R].
2962+to use in the PDF, e.g.\ \f[C]default.cmyk\f[R].
27952963If left unspecified, \f[C]sRGB.icc\f[R] is used as default.
27962964May be repeated to include multiple profiles.
27972965Note that the profiles have to be available on the system.
@@ -2799,17 +2967,17 @@ They can be obtained from ConTeXt ICC Profiles.
27992967.TP
28002968\f[B]\f[CB]pdfaintent\f[B]\f[R]
28012969when used in conjunction with \f[C]pdfa\f[R], specifies the output
2802−intent for the colors, e.g.
2803−\f[C]ISO coated v2 300\[rs]letterpercent\[rs]space (ECI)\f[R] If left
2804−unspecified, \f[C]sRGB IEC61966-2.1\f[R] is used as default.
2970+intent for the colors,
2971+e.g.\ \f[C]ISO coated v2 300\[rs]letterpercent\[rs]space (ECI)\f[R] If
2972+left unspecified, \f[C]sRGB IEC61966-2.1\f[R] is used as default.
28052973.TP
28062974\f[B]\f[CB]toc\f[B]\f[R]
28072975include table of contents (can also be set using
28082976\f[C]--toc/--table-of-contents\f[R])
28092977.TP
28102978\f[B]\f[CB]whitespace\f[B]\f[R]
2811−spacing between paragraphs, e.g.
2812−\f[C]none\f[R], \f[C]small\f[R] (using \f[C]setupwhitespace\f[R])
2979+spacing between paragraphs, e.g.\ \f[C]none\f[R], \f[C]small\f[R] (using
2980+\f[C]setupwhitespace\f[R])
28132981.TP
28142982\f[B]\f[CB]includesource\f[B]\f[R]
28152983include all source documents as file attachments in the PDF file
@@ -2847,20 +3015,16 @@ section number in man pages
28473015.SS Variables for ms
28483016.TP
28493017\f[B]\f[CB]fontfamily\f[B]\f[R]
2850−font family (e.g.
2851−\f[C]T\f[R] or \f[C]P\f[R])
3018+font family (e.g.\ \f[C]T\f[R] or \f[C]P\f[R])
28523019.TP
28533020\f[B]\f[CB]indent\f[B]\f[R]
2854−paragraph indent (e.g.
2855−\f[C]2m\f[R])
3021+paragraph indent (e.g.\ \f[C]2m\f[R])
28563022.TP
28573023\f[B]\f[CB]lineheight\f[B]\f[R]
2858−line height (e.g.
2859−\f[C]12p\f[R])
3024+line height (e.g.\ \f[C]12p\f[R])
28603025.TP
28613026\f[B]\f[CB]pointsize\f[B]\f[R]
2862−point size (e.g.
2863−\f[C]10p\f[R])
3027+point size (e.g.\ \f[C]10p\f[R])
28643028.SS Variables set automatically
28653029.PP
28663030Pandoc sets these variables automatically in response to options or
@@ -2876,10 +3040,9 @@ in all HTML based formats (dzslides, epub, html, html4, html5, revealjs,
28763040s5, slideous, slidy).
28773041The recognized formats for \f[C]date\f[R] are: \f[C]mm/dd/yyyy\f[R],
28783042\f[C]mm/dd/yy\f[R], \f[C]yyyy-mm-dd\f[R] (ISO 8601),
2879−\f[C]dd MM yyyy\f[R] (e.g.
2880−either \f[C]02 Apr 2018\f[R] or \f[C]02 April 2018\f[R]),
2881−\f[C]MM dd, yyyy\f[R] (e.g.
2882−\f[C]Apr. 02, 2018\f[R] or
3043+\f[C]dd MM yyyy\f[R] (e.g.\ either \f[C]02 Apr 2018\f[R] or
3044+\f[C]02 April 2018\f[R]), \f[C]MM dd, yyyy\f[R]
3045+(e.g.\ \f[C]Apr. 02, 2018\f[R] or
28833046\f[C]April 02, 2018),\f[R]yyyy[mm[dd]]]\f[C](e.g.\f[R]20180402,
28843047\f[C]201804\f[R] or \f[C]2018\f[R]).
28853048.TP
@@ -2896,7 +3059,7 @@ contents specified by \f[C]-A/--include-after-body\f[R] (may have
28963059multiple values)
28973060.TP
28983061\f[B]\f[CB]meta-json\f[B]\f[R]
2899−JSON representation of all of the document\[aq]s metadata.
3062+JSON representation of all of the document\[cq]s metadata.
29003063Field values are transformed to the selected output format.
29013064.TP
29023065\f[B]\f[CB]numbersections\f[B]\f[R]
@@ -2924,8 +3087,7 @@ $endif$
29243087Similarly, \f[C]outputfile\f[R] can be \f[C]-\f[R] if output goes to the
29253088terminal.
29263089.PP
2927−If you need absolute paths, use e.g.
2928−\f[C]$curdir$/$sourcefile$\f[R].
3090+If you need absolute paths, use e.g.\ \f[C]$curdir$/$sourcefile$\f[R].
29293091.RE
29303092.TP
29313093\f[B]\f[CB]curdir\f[B]\f[R]
@@ -2946,12 +3108,12 @@ An extension can be enabled by adding \f[C]+EXTENSION\f[R] to the format
29463108name and disabled by adding \f[C]-EXTENSION\f[R].
29473109For example, \f[C]--from markdown_strict+footnotes\f[R] is strict
29483110Markdown with footnotes enabled, while
2949−\f[C]--from markdown-footnotes-pipe_tables\f[R] is pandoc\[aq]s Markdown
3111+\f[C]--from markdown-footnotes-pipe_tables\f[R] is pandoc\[cq]s Markdown
29503112without footnotes or pipe tables.
29513113.PP
29523114The markdown reader and writer make by far the most use of extensions.
29533115Extensions only used by them are therefore covered in the section
2954−Pandoc\[aq]s Markdown below (See Markdown variants for
3116+Pandoc\[cq]s Markdown below (See Markdown variants for
29553117\f[C]commonmark\f[R] and \f[C]gfm\f[R].) In the following, extensions
29563118that also work for other formats are covered.
29573119.PP
@@ -2964,7 +3126,7 @@ Markdown cells in Jupyter notebooks (as do command-line options like
29643126Interpret straight quotes as curly quotes, \f[C]---\f[R] as em-dashes,
29653127\f[C]--\f[R] as en-dashes, and \f[C]...\f[R] as ellipses.
29663128Nonbreaking spaces are inserted after certain abbreviations, such as
2967−\[dq]Mr.\[dq]
3129+\[lq]Mr.\[rq]
29683130.PP
29693131This extension can be enabled/disabled for the following formats:
29703132.TP
@@ -3114,7 +3276,7 @@ letters are omitted.
31143276.SS Extension: \f[C]gfm_auto_identifiers\f[R]
31153277.PP
31163278Changes the algorithm used by \f[C]auto_identifiers\f[R] to conform to
3117−GitHub\[aq]s method.
3279+GitHub\[cq]s method.
31183280Spaces are converted to dashes (\f[C]-\f[R]), uppercase characters to
31193281lowercase characters, and punctuation characters other than \f[C]-\f[R]
31203282and \f[C]_\f[R] are removed.
@@ -3124,32 +3286,29 @@ Emojis are replaced by their names.
31243286The extensions \f[C]tex_math_dollars\f[R],
31253287\f[C]tex_math_single_backslash\f[R], and
31263288\f[C]tex_math_double_backslash\f[R] are described in the section about
3127−Pandoc\[aq]s Markdown.
3289+Pandoc\[cq]s Markdown.
31283290.PP
31293291However, they can also be used with HTML input.
31303292This is handy for reading web pages formatted using MathJax, for
31313293example.
31323294.SS Raw HTML/TeX
31333295.PP
3134−The following extensions (especially how they affect Markdown
3135−input/output) are also described in more detail in their respective
3136−sections of Pandoc\[aq]s Markdown.
3137−.SS Extension: \f[C]raw_html\f[R]
3138−.PP
3139−When converting from HTML, parse elements to raw HTML which are not
3140−representable in pandoc\[aq]s AST.
3296+The following extensions are described in more detail in their
3297+respective sections of Pandoc\[cq]s Markdown:
3298+.IP \[bu] 2
3299+\f[C]raw_html\f[R] allows HTML elements which are not representable in
3300+pandoc\[cq]s AST to be parsed as raw HTML.
31413301By default, this is disabled for HTML input.
3142−.SS Extension: \f[C]raw_tex\f[R]
3143−.PP
3144−Allows raw LaTeX, TeX, and ConTeXt to be included in a document.
3145−.PP
3302+.IP \[bu] 2
3303+\f[C]raw_tex\f[R] allows raw LaTeX, TeX, and ConTeXt to be included in a
3304+document.
31463305This extension can be enabled/disabled for the following formats (in
31473306addition to \f[C]markdown\f[R]):
3307+.RS 2
31483308.TP
31493309input formats
3150−\f[C]latex\f[R], \f[C]org\f[R], \f[C]textile\f[R], \f[C]html\f[R]
3151−(environments, \f[C]\[rs]ref\f[R], and \f[C]\[rs]eqref\f[R] only),
3152−\f[C]ipynb\f[R]
3310+\f[C]latex\f[R], \f[C]textile\f[R], \f[C]html\f[R] (environments,
3311+\f[C]\[rs]ref\f[R], and \f[C]\[rs]eqref\f[R] only), \f[C]ipynb\f[R]
31533312.TP
31543313output formats
31553314\f[C]textile\f[R], \f[C]commonmark\f[R]
@@ -3160,26 +3319,22 @@ with mime type \f[C]text/html\f[R] in output cells.
31603319Since the \f[C]ipynb\f[R] reader attempts to preserve the richest
31613320possible outputs when several options are given, you will get best
31623321results if you disable \f[C]raw_html\f[R] and \f[C]raw_tex\f[R] when
3163−converting to formats like \f[C]docx\f[R] which don\[aq]t allow raw
3322+converting to formats like \f[C]docx\f[R] which don\[cq]t allow raw
31643323\f[C]html\f[R] or \f[C]tex\f[R].
3165−.SS Extension: \f[C]native_divs\f[R]
3166−.PP
3167−This extension is enabled by default for HTML input.
3168−This means that \f[C]div\f[R]s are parsed to pandoc native elements.
3169−(Alternatively, you can parse them to raw HTML using
3170−\f[C]-f html-native_divs+raw_html\f[R].)
3171−.PP
3172−When converting HTML to Markdown, for example, you may want to drop all
3173−\f[C]div\f[R]s and \f[C]span\f[R]s:
3174−.IP
3175−.nf
3176−\f[C]
3177−pandoc -f html-native_divs-native_spans -t markdown
3178−\f[R]
3179−.fi
3180−.SS Extension: \f[C]native_spans\f[R]
3181−.PP
3182−Analogous to \f[C]native_divs\f[R] above.
3324+.RE
3325+.IP \[bu] 2
3326+\f[C]native_divs\f[R] causes HTML \f[C]div\f[R] elements to be parsed as
3327+native pandoc Div blocks.
3328+If you want them to be parsed as raw HTML, use
3329+\f[C]-f html-native_divs+raw_html\f[R].
3330+.IP \[bu] 2
3331+\f[C]native_spans\f[R] causes HTML \f[C]span\f[R] elements to be parsed
3332+as native pandoc Span inlines.
3333+If you want them to be parsed as raw HTML, use
3334+\f[C]-f html-native_spans+raw_html\f[R].
3335+If you want to drop all \f[C]div\f[R]s and \f[C]span\f[R]s when
3336+converting HTML to Markdown, you can use
3337+\f[C]pandoc -f html-native_divs-native_spans -t markdown\f[R].
31833338.SS Literate Haskell support
31843339.SS Extension: \f[C]literate_haskell\f[R]
31853340.PP
@@ -3198,23 +3353,22 @@ the formats above, pandoc will treat the document as literate Haskell
31983353source.
31993354This means that
32003355.IP \[bu] 2
3201−In Markdown input, \[dq]bird track\[dq] sections will be parsed as
3356+In Markdown input, \[lq]bird track\[rq] sections will be parsed as
32023357Haskell code rather than block quotations.
32033358Text between \f[C]\[rs]begin{code}\f[R] and \f[C]\[rs]end{code}\f[R]
32043359will also be treated as Haskell code.
3205−For ATX-style headings the character \[aq]=\[aq] will be used instead of
3206−\[aq]#\[aq].
3360+For ATX-style headings the character `=' will be used instead of `#'.
32073361.IP \[bu] 2
32083362In Markdown output, code blocks with classes \f[C]haskell\f[R] and
32093363\f[C]literate\f[R] will be rendered using bird tracks, and block
32103364quotations will be indented one space, so they will not be treated as
32113365Haskell code.
32123366In addition, headings will be rendered setext-style (with underlines)
3213−rather than ATX-style (with \[aq]#\[aq] characters).
3214−(This is because ghc treats \[aq]#\[aq] characters in column 1 as
3215−introducing line numbers.)
3367+rather than ATX-style (with `#' characters).
3368+(This is because ghc treats `#' characters in column 1 as introducing
3369+line numbers.)
32163370.IP \[bu] 2
3217−In restructured text input, \[dq]bird track\[dq] sections will be parsed
3371+In restructured text input, \[lq]bird track\[rq] sections will be parsed
32183372as Haskell code.
32193373.IP \[bu] 2
32203374In restructured text output, code blocks with class \f[C]haskell\f[R]
@@ -3250,9 +3404,8 @@ writes HTML with the Haskell code in bird tracks, so it can be copied
32503404and pasted as literate Haskell source.
32513405.PP
32523406Note that GHC expects the bird tracks in the first column, so indented
3253−literate code blocks (e.g.
3254−inside an itemized environment) will not be picked up by the Haskell
3255−compiler.
3407+literate code blocks (e.g.\ inside an itemized environment) will not be
3408+picked up by the Haskell compiler.
32563409.SS Other extensions
32573410.SS Extension: \f[C]empty_paragraphs\f[R]
32583411.PP
@@ -3275,7 +3428,44 @@ This extension can be enabled/disabled for the following formats:
32753428.TP
32763429output formats
32773430\f[C]odt\f[R], \f[C]opendocument\f[R]
3278−.SS Extension: \f[C]styles\f[R] {#ext-styles}
3431+.SS Extension: \f[C]xrefs_name\f[R]
3432+.PP
3433+Links to headings, figures and tables inside the document are
3434+substituted with cross-references that will use the name or caption of
3435+the referenced item.
3436+The original link text is replaced once the generated document is
3437+refreshed.
3438+This extension can be combined with \f[C]xrefs_number\f[R] in which case
3439+numbers will appear before the name.
3440+.PP
3441+Text in cross-references is only made consistent with the referenced
3442+item once the document has been refreshed.
3443+.PP
3444+This extension can be enabled/disabled for the following formats:
3445+.TP
3446+output formats
3447+\f[C]odt\f[R], \f[C]opendocument\f[R]
3448+.SS Extension: \f[C]xrefs_number\f[R]
3449+.PP
3450+Links to headings, figures and tables inside the document are
3451+substituted with cross-references that will use the number of the
3452+referenced item.
3453+The original link text is discarded.
3454+This extension can be combined with \f[C]xrefs_name\f[R] in which case
3455+the name or caption numbers will appear after the number.
3456+.PP
3457+For the \f[C]xrefs_number\f[R] to be useful heading numbers must be
3458+enabled in the generated document, also table and figure captions must
3459+be enabled using for example the \f[C]native_numbering\f[R] extension.
3460+.PP
3461+Numbers in cross-references are only visible in the final document once
3462+it has been refreshed.
3463+.PP
3464+This extension can be enabled/disabled for the following formats:
3465+.TP
3466+output formats
3467+\f[C]odt\f[R], \f[C]opendocument\f[R]
3468+.SS Extension: \f[C]styles\f[R]
32793469.PP
32803470When converting from docx, read all docx styles as divs (for paragraph
32813471styles) and spans (for character styles) regardless of whether pandoc
@@ -3289,20 +3479,33 @@ input formats
32893479.PP
32903480In the \f[C]muse\f[R] input format, this enables Text::Amuse extensions
32913481to Emacs Muse markup.
3482+.SS Extension: \f[C]raw_markdown\f[R]
3483+.PP
3484+In the \f[C]ipynb\f[R] input format, this causes Markdown cells to be
3485+included as raw Markdown blocks (allowing lossless round-tripping)
3486+rather than being parsed.
3487+Use this only when you are targeting \f[C]ipynb\f[R] or a markdown-based
3488+output format.
32923489.SS Extension: \f[C]citations\f[R]
32933490.PP
3294−Some aspects of Pandoc\[aq]s Markdown citation syntax are also accepted
3491+Some aspects of Pandoc\[cq]s Markdown citation syntax are also accepted
32953492in \f[C]org\f[R] input.
3493+.SS Extension: \f[C]element_citations\f[R]
3494+.PP
3495+In the \f[C]jats\f[R] output formats, this causes reference items to be
3496+replaced with \f[C]<element-citation>\f[R] elements.
3497+These elements are not influenced by CSL styles, but all information on
3498+the item is included in tags.
32963499.SS Extension: \f[C]ntb\f[R]
32973500.PP
32983501In the \f[C]context\f[R] output format this enables the use of Natural
32993502Tables (TABLE) instead of the default Extreme Tables (xtables).
33003503Natural tables allow more fine-grained global customization but come at
33013504a performance penalty compared to extreme tables.
3302−.SH PANDOC\[aq]S MARKDOWN
3505+.SH PANDOC\[cq]S MARKDOWN
33033506.PP
33043507Pandoc understands an extended and slightly revised version of John
3305−Gruber\[aq]s Markdown syntax.
3508+Gruber\[cq]s Markdown syntax.
33063509This document explains the syntax, noting differences from standard
33073510Markdown.
33083511Except where noted, these differences can be suppressed by using the
@@ -3319,15 +3522,15 @@ easy to read:
33193522.RS
33203523.PP
33213524A Markdown-formatted document should be publishable as-is, as plain
3322−text, without looking like it\[aq]s been marked up with tags or
3525+text, without looking like it\[cq]s been marked up with tags or
33233526formatting instructions.
3324−-- John Gruber
3527+\[en] John Gruber
33253528.RE
33263529.PP
3327−This principle has guided pandoc\[aq]s decisions in finding syntax for
3530+This principle has guided pandoc\[cq]s decisions in finding syntax for
33283531tables, footnotes, and other extensions.
33293532.PP
3330−There is, however, one respect in which pandoc\[aq]s aims are different
3533+There is, however, one respect in which pandoc\[cq]s aims are different
33313534from the original aims of Markdown.
33323535Whereas Markdown was originally designed with HTML generation in mind,
33333536pandoc is designed for multiple output formats.
@@ -3352,7 +3555,7 @@ a hard line break, since trailing spaces in the cells are ignored.
33523555There are two kinds of headings: Setext and ATX.
33533556.SS Setext-style headings
33543557.PP
3355−A setext-style heading is a line of text \[dq]underlined\[dq] with a row
3558+A setext-style heading is a line of text \[lq]underlined\[rq] with a row
33563559of \f[C]=\f[R] signs (for a level-one heading) or \f[C]-\f[R] signs (for
33573560a level-two heading):
33583561.IP
@@ -3443,7 +3646,7 @@ My other heading {#foo}
34433646(This syntax is compatible with PHP Markdown Extra.)
34443647.PP
34453648Note that although this syntax allows assignment of classes and
3446−key/value attributes, writers generally don\[aq]t use all of this
3649+key/value attributes, writers generally don\[cq]t use all of this
34473650information.
34483651Identifiers, classes, and key/value attributes are used in HTML and
34493652HTML-based formats such as EPUB and slidy.
@@ -3558,7 +3761,7 @@ indented more than three spaces.)
35583761\f[R]
35593762.fi
35603763.PP
3561−A \[dq]lazy\[dq] form, which requires the \f[C]>\f[R] character only on
3764+A \[lq]lazy\[rq] form, which requires the \f[C]>\f[R] character only on
35623765the first line of each block, is also allowed:
35633766.IP
35643767.nf
@@ -3776,6 +3979,9 @@ begin with a space.
37763979\f[R]
37773980.fi
37783981.PP
3982+Inline formatting (such as emphasis) is allowed in the content, but not
3983+block-level formatting (such as block quotes or lists).
3984+.PP
37793985This syntax is borrowed from reStructuredText.
37803986.SS Lists
37813987.SS Bullet lists
@@ -3793,8 +3999,8 @@ Here is a simple example:
37933999\f[R]
37944000.fi
37954001.PP
3796−This will produce a \[dq]compact\[dq] list.
3797−If you want a \[dq]loose\[dq] list, in which each item is formatted as a
4002+This will produce a \[lq]compact\[rq] list.
4003+If you want a \[lq]loose\[rq] list, in which each item is formatted as a
37984004paragraph, put spaces between the items:
37994005.IP
38004006.nf
@@ -3822,7 +4028,7 @@ List items look best if subsequent lines are flush with the first line
38224028\f[R]
38234029.fi
38244030.PP
3825−But Markdown also allows a \[dq]lazy\[dq] format:
4031+But Markdown also allows a \[lq]lazy\[rq] format:
38264032.IP
38274033.nf
38284034\f[C]
@@ -3885,7 +4091,7 @@ character after the list marker of the containing list item.
38854091.fi
38864092.PP
38874093As noted above, Markdown allows you to write list items
3888−\[dq]lazily,\[dq] instead of indenting continuation lines.
4094+\[lq]lazily,\[rq] instead of indenting continuation lines.
38894095However, if there are multiple paragraphs or other blocks in a list
38904096item, the first line of each must be indented.
38914097.IP
@@ -3939,8 +4145,8 @@ They must be separated from the text that follows by at least one space,
39394145and, if the list marker is a capital letter with a period, by at least
39404146two spaces.
39414147.PP
3942−The \f[C]fancy_lists\f[R] extension also allows \[aq]\f[C]#\f[R]\[aq] to
3943−be used as an ordered list marker in place of a numeral:
4148+The \f[C]fancy_lists\f[R] extension also allows `\f[C]#\f[R]' to be used
4149+as an ordered list marker in place of a numeral:
39444150.IP
39454151.nf
39464152\f[C]
@@ -4033,7 +4239,7 @@ one or more block elements (paragraph, code block, list, etc.), each
40334239indented four spaces or one tab stop.
40344240The body of the definition (including the first line, aside from the
40354241colon or tilde) should be indented four spaces.
4036−However, as with other Markdown lists, you can \[dq]lazily\[dq] omit
4242+However, as with other Markdown lists, you can \[lq]lazily\[rq] omit
40374243indentation except at the beginning of a paragraph or other block
40384244element:
40394245.IP
@@ -4067,16 +4273,16 @@ Term 2
40674273.fi
40684274.PP
40694275Note that space between items in a definition list is required.
4070−(A variant that loosens this requirement, but disallows \[dq]lazy\[dq]
4276+(A variant that loosens this requirement, but disallows \[lq]lazy\[rq]
40714277hard wrapping, can be activated with \f[C]compact_definition_lists\f[R]:
4072−see Non-pandoc extensions, below.)
4278+see Non-default extensions, below.)
40734279.SS Numbered example lists
40744280.SS Extension: \f[C]example_lists\f[R]
40754281.PP
40764282The special list marker \f[C]\[at]\f[R] can be used for sequentially
40774283numbered examples.
4078−The first list item with a \f[C]\[at]\f[R] marker will be numbered
4079−\[aq]1\[aq], the next \[aq]2\[aq], and so on, throughout the document.
4284+The first list item with a \f[C]\[at]\f[R] marker will be numbered `1',
4285+the next `2', and so on, throughout the document.
40804286The numbered examples need not occur in a single list; each new list
40814287using \f[C]\[at]\f[R] will take up where the last stopped.
40824288So, for example:
@@ -4112,39 +4318,6 @@ That is, example lists always behave as if the \f[C]four_space_rule\f[R]
41124318extension is set.
41134319This is because example labels tend to be long, and indenting content to
41144320the first non-space character after the label would be awkward.
4115−.SS Compact and loose lists
4116−.PP
4117−Pandoc behaves differently from \f[C]Markdown.pl\f[R] on some \[dq]edge
4118−cases\[dq] involving lists.
4119−Consider this source:
4120−.IP
4121−.nf
4122−\f[C]
4123−+ First
4124−+ Second:
4125− - Fee
4126− - Fie
4127− - Foe
4128−
4129−+ Third
4130−\f[R]
4131−.fi
4132−.PP
4133−Pandoc transforms this into a \[dq]compact list\[dq] (with no
4134−\f[C]<p>\f[R] tags around \[dq]First\[dq], \[dq]Second\[dq], or
4135−\[dq]Third\[dq]), while Markdown puts \f[C]<p>\f[R] tags around
4136−\[dq]Second\[dq] and \[dq]Third\[dq] (but not \[dq]First\[dq]), because
4137−of the blank space around \[dq]Third\[dq].
4138−Pandoc follows a simple rule: if the text is followed by a blank line,
4139−it is treated as a paragraph.
4140−Since \[dq]Second\[dq] is followed by a list, and not a blank line, it
4141−isn\[aq]t treated as a paragraph.
4142−The fact that the list is followed by a blank line is irrelevant.
4143−(Note: Pandoc works this way even when the \f[C]markdown_strict\f[R]
4144−format is specified.
4145−This behavior is consistent with the official Markdown syntax
4146−description, even though it is different from that of
4147−\f[C]Markdown.pl\f[R].)
41484321.SS Ending a list
41494322.PP
41504323What if you want to put an indented code block after a list?
@@ -4162,8 +4335,8 @@ Trouble! Here pandoc (like other Markdown implementations) will treat
41624335\f[C]{ my code block }\f[R] as the second paragraph of item two, and not
41634336as a code block.
41644337.PP
4165−To \[dq]cut off\[dq] the list after item two, you can insert some
4166−non-indented content, like an HTML comment, which won\[aq]t produce
4338+To \[lq]cut off\[rq] the list after item two, you can insert some
4339+non-indented content, like an HTML comment, which won\[cq]t produce
41674340visible output in any format:
41684341.IP
41694342.nf
@@ -4359,7 +4532,7 @@ can be omitted for a headerless table.
43594532The cells of grid tables may contain arbitrary block elements (multiple
43604533paragraphs, code blocks, lists, etc.).
43614534Cells that span multiple columns or rows are not supported.
4362−Grid tables can be created easily using Emacs\[aq] table-mode
4535+Grid tables can be created easily using Emacs\[cq] table-mode
43634536(\f[C]M-x table-insert\f[R]).
43644537.PP
43654538Alignments can be specified as with pipe tables, by putting colons at
@@ -4443,7 +4616,7 @@ lines are wider than column width, then cell contents will not be
44434616wrapped, and the cells will be sized to their contents.
44444617.PP
44454618Note: pandoc also recognizes pipe tables of the following form, as can
4446−be produced by Emacs\[aq] orgtbl-mode:
4619+be produced by Emacs\[cq] orgtbl-mode:
44474620.IP
44484621.nf
44494622\f[C]
@@ -4456,7 +4629,7 @@ be produced by Emacs\[aq] orgtbl-mode:
44564629.PP
44574630The difference is that \f[C]+\f[R] is used instead of \f[C]|\f[R].
44584631Other orgtbl features are not supported.
4459−In particular, to get non-default column alignment, you\[aq]ll need to
4632+In particular, to get non-default column alignment, you\[cq]ll need to
44604633add colons as above.
44614634.SS Metadata blocks
44624635.SS Extension: \f[C]pandoc_title_block\f[R]
@@ -4534,13 +4707,13 @@ All three metadata fields may contain standard inline formatting
45344707.PP
45354708Title blocks will always be parsed, but they will affect the output only
45364709when the \f[C]--standalone\f[R] (\f[C]-s\f[R]) option is chosen.
4537−In HTML output, titles will appear twice: once in the document head --
4538−this is the title that will appear at the top of the window in a browser
4539−-- and once at the beginning of the document body.
4710+In HTML output, titles will appear twice: once in the document head
4711+\[en] this is the title that will appear at the top of the window in a
4712+browser \[en] and once at the beginning of the document body.
45404713The title in the document head can have an optional prefix attached
45414714(\f[C]--title-prefix\f[R] or \f[C]-T\f[R] option).
45424715The title in the body appears as an H1 element with class
4543−\[dq]title\[dq], so it can be suppressed or reformatted with CSS.
4716+\[lq]title\[rq], so it can be suppressed or reformatted with CSS.
45444717If a title prefix is specified with \f[C]-T\f[R] and no title block
45454718appears in the document, the title prefix will be used by itself as the
45464719HTML title.
@@ -4569,7 +4742,7 @@ will yield a man page with the title \f[C]PANDOC\f[R] and section 1.
45694742\f[R]
45704743.fi
45714744.PP
4572−will also have \[dq]Pandoc User Manuals\[dq] in the footer.
4745+will also have \[lq]Pandoc User Manuals\[rq] in the footer.
45734746.IP
45744747.nf
45754748\f[C]
@@ -4577,7 +4750,7 @@ will also have \[dq]Pandoc User Manuals\[dq] in the footer.
45774750\f[R]
45784751.fi
45794752.PP
4580−will also have \[dq]Version 4.0\[dq] in the header.
4753+will also have \[lq]Version 4.0\[rq] in the header.
45814754.SS Extension: \f[C]yaml_metadata_block\f[R]
45824755.PP
45834756A YAML metadata block is a valid YAML object, delimited by a line of
@@ -4623,7 +4796,9 @@ All of the metadata will appear in a single block at the beginning of
46234796the document.
46244797.PP
46254798Note that YAML escaping rules must be followed.
4626−Thus, for example, if a title contains a colon, it must be quoted.
4799+Thus, for example, if a title contains a colon, it must be quoted, and
4800+if it contains a backslash escape, then it must be ensured that it is
4801+not treated as a YAML escape sequence.
46274802The pipe character (\f[C]|\f[R]) can be used to begin an indented block
46284803that will be interpreted literally, without need for escaping.
46294804This form is necessary when the field contains blank lines or
@@ -4645,6 +4820,13 @@ abstract: |
46454820\f[R]
46464821.fi
46474822.PP
4823+The literal block after the \f[C]|\f[R] must be indented relative to the
4824+line containing the \f[C]|\f[R].
4825+If it is not, the YAML will be invalid and pandoc will not interpret it
4826+as metadata.
4827+For an overview of the complex rules governing YAML, see the Wikipedia
4828+entry on YAML syntax.
4829+.PP
46484830Template variables will be set automatically from the metadata.
46494831Thus, for example, in writing HTML, the variable \f[C]abstract\f[R] will
46504832be set to the HTML equivalent of the Markdown in the \f[C]abstract\f[R]
@@ -4693,7 +4875,7 @@ $endfor$
46934875\f[R]
46944876.fi
46954877.PP
4696−Raw content to include in the document\[aq]s header may be specified
4878+Raw content to include in the document\[cq]s header may be specified
46974879using \f[C]header-includes\f[R]; however, it is important to mark up
46984880this content as raw code for a particular output format, using the
46994881\f[C]raw_attribute\f[R] extension), or it will be interpreted as
@@ -4710,6 +4892,21 @@ header-includes:
47104892 \[ga]\[ga]\[ga]
47114893\f[R]
47124894.fi
4895+.PP
4896+Note: the \f[C]yaml_metadata_block\f[R] extension works with
4897+\f[C]commonmark\f[R] as well as \f[C]markdown\f[R] (and it is enabled by
4898+default in \f[C]gfm\f[R] and \f[C]commonmark_x\f[R]).
4899+However, in these formats the following restrictions apply:
4900+.IP \[bu] 2
4901+The YAML metadata block must occur at the beginning of the document (and
4902+there can be only one).
4903+If multiple files are given as arguments to pandoc, only the first can
4904+be a YAML metadata block.
4905+.IP \[bu] 2
4906+The leaf nodes of the YAML structure are parsed in isolation from each
4907+other and from the rest of the document.
4908+So, for example, you can\[cq]t use a reference link in these contexts if
4909+the link definition is somewhere else in the document.
47134910.SS Backslash escapes
47144911.SS Extension: \f[C]all_symbols_escapable\f[R]
47154912.PP
@@ -4740,7 +4937,7 @@ instead of
47404937\f[R]
47414938.fi
47424939.PP
4743−This rule is easier to remember than standard Markdown\[aq]s rule, which
4940+This rule is easier to remember than standard Markdown\[cq]s rule, which
47444941allows only the following characters to be backslash-escaped:
47454942.IP
47464943.nf
@@ -4756,16 +4953,15 @@ A backslash-escaped space is parsed as a nonbreaking space.
47564953In TeX output, it will appear as \f[C]\[ti]\f[R].
47574954In HTML and XML output, it will appear as a literal unicode nonbreaking
47584955space character (note that it will thus actually look
4759−\[dq]invisible\[dq] in the generated HTML source; you can still use the
4956+\[lq]invisible\[rq] in the generated HTML source; you can still use the
47604957\f[C]--ascii\f[R] command-line option to make it appear as an explicit
47614958entity).
47624959.PP
4763−A backslash-escaped newline (i.e.
4764−a backslash occurring at the end of a line) is parsed as a hard line
4765−break.
4960+A backslash-escaped newline (i.e.\ a backslash occurring at the end of a
4961+line) is parsed as a hard line break.
47664962It will appear in TeX output as \f[C]\[rs]\[rs]\f[R] and in HTML as
47674963\f[C]<br />\f[R].
4768−This is a nice alternative to Markdown\[aq]s \[dq]invisible\[dq] way of
4964+This is a nice alternative to Markdown\[cq]s \[lq]invisible\[rq] way of
47694965indicating hard line breaks using two trailing spaces on a line.
47704966.PP
47714967Backslash escapes do not work in verbatim contexts.
@@ -4842,8 +5038,8 @@ If the superscripted or subscripted text contains spaces, these spaces
48425038must be escaped with backslashes.
48435039(This is to prevent accidental superscripting and subscripting through
48445040the ordinary use of \f[C]\[ti]\f[R] and \f[C]\[ha]\f[R], and also bad
4845−interactions with footnotes.) Thus, if you want the letter P with \[aq]a
4846−cat\[aq] in subscripts, use \f[C]P\[ti]a\[rs] cat\[ti]\f[R], not
5041+interactions with footnotes.) Thus, if you want the letter P with `a
5042+cat' in subscripts, use \f[C]P\[ti]a\[rs] cat\[ti]\f[R], not
48475043\f[C]P\[ti]a cat\[ti]\f[R].
48485044.SS Verbatim
48495045.PP
@@ -4923,14 +5119,16 @@ The opening \f[C]$\f[R] must have a non-space character immediately to
49235119its right, while the closing \f[C]$\f[R] must have a non-space character
49245120immediately to its left, and must not be followed immediately by a
49255121digit.
4926−Thus, \f[C]$20,000 and $30,000\f[R] won\[aq]t parse as math.
5122+Thus, \f[C]$20,000 and $30,000\f[R] won\[cq]t parse as math.
49275123If for some reason you need to enclose text in literal \f[C]$\f[R]
4928−characters, backslash-escape them and they won\[aq]t be treated as math
5124+characters, backslash-escape them and they won\[cq]t be treated as math
49295125delimiters.
49305126.PP
49315127For display math, use \f[C]$$\f[R] delimiters.
49325128(In this case, the delimiters may be separated from the formula by
4933−whitespace.)
5129+whitespace.
5130+However, there can be no blank lines betwen the opening and closing
5131+\f[C]$$\f[R] delimiters.)
49345132.PP
49355133TeX math will be printed in all output formats.
49365134How it is rendered depends on the output format:
@@ -4961,7 +5159,7 @@ Texinfo
49615159It will be rendered inside a \f[C]\[at]math\f[R] command.
49625160.TP
49635161roff man, Jira markup
4964−It will be rendered verbatim without \f[C]$\f[R]\[aq]s.
5162+It will be rendered verbatim without \f[C]$\f[R]\[cq]s.
49655163.TP
49665164MediaWiki, DokuWiki
49675165It will be rendered inside \f[C]<math>\f[R] tags.
@@ -5019,7 +5217,7 @@ Note that even if \f[C]raw_html\f[R] is disabled, tables will be
50195217rendered with HTML syntax if they cannot use pipe syntax.
50205218.SS Extension: \f[C]markdown_in_html_blocks\f[R]
50215219.PP
5022−Standard Markdown allows you to include HTML \[dq]blocks\[dq]: blocks of
5220+Standard Markdown allows you to include HTML \[lq]blocks\[rq]: blocks of
50235221HTML between balanced tags that are separated from the surrounding text
50245222with blank lines, and start and end at the left margin.
50255223Within these blocks, everything is interpreted as HTML, not Markdown; so
@@ -5056,8 +5254,9 @@ into
50565254.PP
50575255whereas \f[C]Markdown.pl\f[R] will preserve it as is.
50585256.PP
5059−There is one exception to this rule: text between \f[C]<script>\f[R] and
5060−\f[C]<style>\f[R] tags is not interpreted as Markdown.
5257+There is one exception to this rule: text between \f[C]<script>\f[R],
5258+\f[C]<style>\f[R], and \f[C]<textarea>\f[R] tags is not interpreted as
5259+Markdown.
50615260.PP
50625261This departure from standard Markdown should make it easier to mix
50635262Markdown with HTML block elements.
@@ -5357,7 +5556,7 @@ slide shows and EPUB), LaTeX, and ConTeXt.
53575556.PP
53585557A link immediately preceded by a \f[C]!\f[R] will be treated as an
53595558image.
5360−The link text will be used as the image\[aq]s alt text:
5559+The link text will be used as the image\[cq]s alt text:
53615560.IP
53625561.nf
53635562\f[C]
@@ -5372,7 +5571,7 @@ The link text will be used as the image\[aq]s alt text:
53725571.PP
53735572An image with nonempty alt text, occurring by itself in a paragraph,
53745573will be rendered as a figure with a caption.
5375−The image\[aq]s alt text will be used as the caption.
5574+The image\[cq]s alt text will be used as the caption.
53765575.IP
53775576.nf
53785577\f[C]
@@ -5381,9 +5580,8 @@ The image\[aq]s alt text will be used as the caption.
53815580.fi
53825581.PP
53835582How this is rendered depends on the output format.
5384−Some output formats (e.g.
5385−RTF) do not yet support figures.
5386−In those formats, you\[aq]ll just get an image in a paragraph by itself,
5583+Some output formats (e.g.\ RTF) do not yet support figures.
5584+In those formats, you\[cq]ll just get an image in a paragraph by itself,
53875585with no caption.
53885586.PP
53895587If you just want a regular inline image, just make sure it is not the
@@ -5454,7 +5652,7 @@ HTML:
54545652.IP \[bu] 2
54555653LaTeX:
54565654\f[C]\[rs]includegraphics[width=0.5\[rs]textwidth,height=\[rs]textheight]{file.jpg}\f[R]
5457−(If you\[aq]re using a custom template, you need to configure
5655+(If you\[cq]re using a custom template, you need to configure
54585656\f[C]graphicx\f[R] as in the default template.)
54595657.IP \[bu] 2
54605658ConTeXt:
@@ -5537,7 +5735,7 @@ immediately by attributes:
55375735.SS Footnotes
55385736.SS Extension: \f[C]footnotes\f[R]
55395737.PP
5540−Pandoc\[aq]s Markdown allows footnotes, using the following syntax:
5738+Pandoc\[cq]s Markdown allows footnotes, using the following syntax:
55415739.IP
55425740.nf
55435741\f[C]
@@ -5586,198 +5784,73 @@ note.]
55865784.fi
55875785.PP
55885786Inline and regular footnotes may be mixed freely.
5589−.SS Citations
5787+.SS Citation syntax
55905788.SS Extension: \f[C]citations\f[R]
55915789.PP
5592−Using an external filter, \f[C]pandoc-citeproc\f[R], pandoc can
5593−automatically generate citations and a bibliography in a number of
5594−styles.
5595−Basic usage is
5790+To cite a bibliographic item with an identifier foo, use the syntax
5791+\f[C]\[at]foo\f[R].
5792+Normal citations should be included in square brackets, with semicolons
5793+separating distinct items:
55965794.IP
55975795.nf
55985796\f[C]
5599−pandoc --filter pandoc-citeproc myinput.txt
5797+Blah blah [\[at]doe99; \[at]smith2000; \[at]smith2004].
56005798\f[R]
56015799.fi
56025800.PP
5603−In order to use this feature, you will need to specify a bibliography
5604−file using the \f[C]bibliography\f[R] metadata field in a YAML metadata
5605−section, or \f[C]--bibliography\f[R] command line argument.
5606−You can supply multiple \f[C]--bibliography\f[R] arguments or set
5607−\f[C]bibliography\f[R] metadata field to YAML array, if you want to use
5608−multiple bibliography files.
5609−The bibliography may have any of these formats:
5610−.PP
5611−.TS
5612−tab(@);
5613−l l.
5614−T{
5615−Format
5616−T}@T{
5617−File extension
5618−T}
5619−_
5620−T{
5621−BibLaTeX
5622−T}@T{
5623−\&.bib
5624−T}
5625−T{
5626−BibTeX
5627−T}@T{
5628−\&.bibtex
5629−T}
5630−T{
5631−Copac
5632−T}@T{
5633−\&.copac
5634−T}
5635−T{
5636−CSL JSON
5637−T}@T{
5638−\&.json
5639−T}
5640−T{
5641−CSL YAML
5642−T}@T{
5643−\&.yaml
5644−T}
5645−T{
5646−EndNote
5647−T}@T{
5648−\&.enl
5649−T}
5650−T{
5651−EndNote XML
5652−T}@T{
5653−\&.xml
5654−T}
5655−T{
5656−ISI
5657−T}@T{
5658−\&.wos
5659−T}
5660−T{
5661−MEDLINE
5662−T}@T{
5663−\&.medline
5664−T}
5665−T{
5666−MODS
5667−T}@T{
5668−\&.mods
5669−T}
5670−T{
5671−RIS
5672−T}@T{
5673−\&.ris
5674−T}
5675−.TE
5676−.PP
5677−Note that \f[C].bib\f[R] can be used with both BibTeX and BibLaTeX
5678−files; use \f[C].bibtex\f[R] to force BibTeX.
5801+How this is rendered depends on the citation style.
5802+In an author-date style, it might render as
5803+.IP
5804+.nf
5805+\f[C]
5806+Blah blah (Doe 1999, Smith 2000, 2004).
5807+\f[R]
5808+.fi
56795809.PP
5680−Note that \f[C]pandoc-citeproc --bib2json\f[R] and
5681−\f[C]pandoc-citeproc --bib2yaml\f[R] can produce \f[C].json\f[R] and
5682−\f[C].yaml\f[R] files from any of the supported formats.
5810+In a footnote style, it might render as
5811+.IP
5812+.nf
5813+\f[C]
5814+Blah blah.[\[ha]1]
5815+
5816+[\[ha]1]: John Doe, \[dq]Frogs,\[dq] *Journal of Amphibians* 44 (1999);
5817+Susan Smith, \[dq]Flies,\[dq] *Journal of Insects* (2000);
5818+Susan Smith, \[dq]Bees,\[dq] *Journal of Insects* (2004).
5819+\f[R]
5820+.fi
56835821.PP
5684−In-field markup: In BibTeX and BibLaTeX databases, pandoc-citeproc
5685−parses a subset of LaTeX markup; in CSL YAML databases, pandoc Markdown;
5686−and in CSL JSON databases, an HTML-like markup:
5687−.TP
5688−\f[B]\f[CB]<i>...</i>\f[B]\f[R]
5689−italics
5690−.TP
5691−\f[B]\f[CB]<b>...</b>\f[B]\f[R]
5692−bold
5693−.TP
5694−\f[B]\f[CB]<span style=\[dq]font-variant:small-caps;\[dq]>...</span>\f[B]\f[R] or \f[B]\f[CB]<sc>...</sc>\f[B]\f[R]
5695−small capitals
5696−.TP
5697−\f[B]\f[CB]<sub>...</sub>\f[B]\f[R]
5698−subscript
5699−.TP
5700−\f[B]\f[CB]<sup>...</sup>\f[B]\f[R]
5701−superscript
5702−.TP
5703−\f[B]\f[CB]<span class=\[dq]nocase\[dq]>...</span>\f[B]\f[R]
5704−prevent a phrase from being capitalized as title case
5822+See the CSL user documentation for more information about CSL styles and
5823+how they affect rendering.
57055824.PP
5706−\f[C]pandoc-citeproc -j\f[R] and \f[C]-y\f[R] interconvert the CSL JSON
5707−and CSL YAML formats as far as possible.
5825+Unless a citation key start with a letter, digit, or \f[C]_\f[R], and
5826+contains only alphanumerics and internal punctuation characters
5827+(\f[C]:.#$%&-+?<>\[ti]/\f[R]), it must be surrounded by curly braces,
5828+which are not considered part of the key.
5829+In \f[C]\[at]Foo_bar.baz.\f[R], the key is \f[C]Foo_bar.baz\f[R].
5830+The final period is not \f[I]internal\f[R] punctuation, so it is not
5831+included in the key.
5832+In \f[C]\[at]{Foo_bar.baz.}\f[R], the key is \f[C]Foo_bar.baz.\f[R],
5833+including the final period.
5834+The curly braces are recommended if you use URLs as keys:
5835+\f[C][\[at]{https://example.com/bib?name=foobar&date=2000}, p. 33]\f[R].
57085836.PP
5709−As an alternative to specifying a bibliography file using
5710−\f[C]--bibliography\f[R] or the YAML metadata field
5711−\f[C]bibliography\f[R], you can include the citation data directly in
5712−the \f[C]references\f[R] field of the document\[aq]s YAML metadata.
5713−The field should contain an array of YAML-encoded references, for
5714−example:
5837+Citation items may optionally include a prefix, a locator, and a suffix.
5838+In
57155839.IP
57165840.nf
57175841\f[C]
5718−---
5719−references:
5720−- type: article-journal
5721− id: WatsonCrick1953
5722− author:
5723− - family: Watson
5724− given: J. D.
5725− - family: Crick
5726− given: F. H. C.
5727− issued:
5728− date-parts:
5729− - - 1953
5730− - 4
5731− - 25
5732− title: \[aq]Molecular structure of nucleic acids: a structure for deoxyribose
5733− nucleic acid\[aq]
5734− title-short: Molecular structure of nucleic acids
5735− container-title: Nature
5736− volume: 171
5737− issue: 4356
5738− page: 737-738
5739− DOI: 10.1038/171737a0
5740− URL: https://www.nature.com/articles/171737a0
5741− language: en-GB
5742−\&...
5842+Blah blah [see \[at]doe99, pp. 33-35 and *passim*; \[at]smith04, chap. 1].
57435843\f[R]
57445844.fi
57455845.PP
5746−(\f[C]pandoc-citeproc --bib2yaml\f[R] can produce these from a
5747−bibliography file in one of the supported formats.)
5748−.PP
5749−Citations and references can be formatted using any style supported by
5750−the Citation Style Language, listed in the Zotero Style Repository.
5751−These files are specified using the \f[C]--csl\f[R] option or the
5752−\f[C]csl\f[R] metadata field.
5753−By default, \f[C]pandoc-citeproc\f[R] will use the Chicago Manual of
5754−Style author-date format.
5755−The CSL project provides further information on finding and editing
5756−styles.
5757−.PP
5758−To make your citations hyperlinks to the corresponding bibliography
5759−entries, add \f[C]link-citations: true\f[R] to your YAML metadata.
5760−.PP
5761−Citations go inside square brackets and are separated by semicolons.
5762−Each citation must have a key, composed of \[aq]\[at]\[aq] + the
5763−citation identifier from the database, and may optionally have a prefix,
5764−a locator, and a suffix.
5765−The citation key must begin with a letter, digit, or \f[C]_\f[R], and
5766−may contain alphanumerics, \f[C]_\f[R], and internal punctuation
5767−characters (\f[C]:.#$%&-+?<>\[ti]/\f[R]).
5768−Here are some examples:
5769−.IP
5770−.nf
5771−\f[C]
5772−Blah blah [see \[at]doe99, pp. 33-35; also \[at]smith04, chap. 1].
5773−
5774−Blah blah [\[at]doe99, pp. 33-35, 38-39 and *passim*].
5775−
5776−Blah blah [\[at]smith04; \[at]doe99].
5777−\f[R]
5778−.fi
5846+The first item (\f[C]doe99\f[R]) has prefix \f[C]see\f[R], locator
5847+\f[C]pp. 33-35\f[R], and suffix \f[C]and *passim*\f[R].
5848+The second item (\f[C]smith04\f[R]) has locator \f[C]chap. 1\f[R] and no
5849+prefix or suffix.
57795850.PP
5780−\f[C]pandoc-citeproc\f[R] detects locator terms in the CSL locale files.
5851+Pandoc uses some heuristics to separate the locator from the rest of the
5852+subject.
5853+It is sensitive to the locator terms defined in the CSL locale files.
57815854Either abbreviated or unabbreviated forms are accepted.
57825855In the \f[C]en-US\f[R] locale, locator terms can be written in either
57835856singular or plural forms, as \f[C]book\f[R],
@@ -5797,17 +5870,17 @@ singular or plural forms, as \f[C]book\f[R],
57975870\f[C]v.\f[R]/\f[C]vv.\f[R]; \f[C]volume\f[R],
57985871\f[C]vol.\f[R]/\f[C]vols.\f[R]; \f[C]\[ps]\f[R]/\f[C]\[ps]\[ps]\f[R];
57995872\f[C]\[sc]\f[R]/\f[C]\[sc]\[sc]\f[R].
5800−If no locator term is used, \[dq]page\[dq] is assumed.
5873+If no locator term is used, \[lq]page\[rq] is assumed.
58015874.PP
5802−\f[C]pandoc-citeproc\f[R] will use heuristics to distinguish the locator
5803−from the suffix.
5804−In complex cases, the locator can be enclosed in curly braces (using
5805−\f[C]pandoc-citeproc\f[R] 0.15 and higher only):
5875+In complex cases, you can force something to be treated as a locator by
5876+enclosing it in curly braces or prevent parsing the suffix as locator by
5877+prepending curly braces:
58065878.IP
58075879.nf
58085880\f[C]
58095881[\[at]smith{ii, A, D-Z}, with a suffix]
58105882[\[at]smith, {pp. iv, vi-xi, (xv)-(xvii)} with suffix here]
5883+[\[at]smith{}, 99 years later]
58115884\f[R]
58125885.fi
58135886.PP
@@ -5821,7 +5894,8 @@ Smith says blah [-\[at]smith04].
58215894\f[R]
58225895.fi
58235896.PP
5824−You can also write an in-text citation, as follows:
5897+You can also write an author-in-text citation, by omitting the square
5898+brackets:
58255899.IP
58265900.nf
58275901\f[C]
@@ -5831,84 +5905,96 @@ You can also write an in-text citation, as follows:
58315905\f[R]
58325906.fi
58335907.PP
5834−If the style calls for a list of works cited, it will be placed in a div
5835−with id \f[C]refs\f[R], if one exists:
5836−.IP
5837−.nf
5838−\f[C]
5839−::: {#refs}
5840−:::
5841−\f[R]
5842−.fi
5908+This will cause the author\[cq]s name to be rendered, followed by the
5909+bibliographical details.
5910+Use this form when you want to make the citation the subject of a
5911+sentence.
58435912.PP
5844−Otherwise, it will be placed at the end of the document.
5845−Generation of the bibliography can be suppressed by setting
5846−\f[C]suppress-bibliography: true\f[R] in the YAML metadata.
5913+When you are using a note style, it is usually better to let citeproc
5914+create the footnotes from citations rather than writing an explicit
5915+note.
5916+If you do write an explicit note that contains a citation, note that
5917+normal citations will be put in parentheses, while author-in-text
5918+citations will not.
5919+For this reason, it is sometimes preferable to use the author-in-text
5920+style inside notes when using a note style.
5921+.SS Non-default extensions
58475922.PP
5848−If you wish the bibliography to have a section heading, you can set
5849−\f[C]reference-section-title\f[R] in the metadata, or put the heading at
5850−the beginning of the div with id \f[C]refs\f[R] (if you are using it) or
5851−at the end of your document:
5852−.IP
5853−.nf
5854−\f[C]
5855−last paragraph...
5856−
5857−# References
5858−\f[R]
5859−.fi
5923+The following Markdown syntax extensions are not enabled by default in
5924+pandoc, but may be enabled by adding \f[C]+EXTENSION\f[R] to the format
5925+name, where \f[C]EXTENSION\f[R] is the name of the extension.
5926+Thus, for example, \f[C]markdown+hard_line_breaks\f[R] is Markdown with
5927+hard line breaks.
5928+.SS Extension: \f[C]rebase_relative_paths\f[R]
58605929.PP
5861−The bibliography will be inserted after this heading.
5862−Note that the \f[C]unnumbered\f[R] class will be added to this heading,
5863−so that the section will not be numbered.
5930+Rewrite relative paths for Markdown links and images, depending on the
5931+path of the file containing the link or image link.
5932+For each link or image, pandoc will compute the directory of the
5933+containing file, relative to the working directory, and prepend the
5934+resulting path to the link or image path.
58645935.PP
5865−If you want to include items in the bibliography without actually citing
5866−them in the body text, you can define a dummy \f[C]nocite\f[R] metadata
5867−field and put the citations there:
5936+The use of this extension is best understood by example.
5937+Suppose you have a a subdirectory for each chapter of a book,
5938+\f[C]chap1\f[R], \f[C]chap2\f[R], \f[C]chap3\f[R].
5939+Each contains a file \f[C]text.md\f[R] and a number of images used in
5940+the chapter.
5941+You would like to have \f[C]![image](spider.jpg)\f[R] in
5942+\f[C]chap1/text.md\f[R] refer to \f[C]chap1/spider.jpg\f[R] and
5943+\f[C]![image](spider.jpg)\f[R] in \f[C]chap2/text.md\f[R] refer to
5944+\f[C]chap2/spider.jpg\f[R].
5945+To do this, use
58685946.IP
58695947.nf
58705948\f[C]
5871−---
5872−nocite: |
5873− \[at]item1, \[at]item2
5874−\&...
5875−
5876−\[at]item3
5949+pandoc chap*/*.md -f markdown+rebase_relative_paths
58775950\f[R]
58785951.fi
58795952.PP
5880−In this example, the document will contain a citation for
5881−\f[C]item3\f[R] only, but the bibliography will contain entries for
5882−\f[C]item1\f[R], \f[C]item2\f[R], and \f[C]item3\f[R].
5953+Without this extension, you would have to use
5954+\f[C]![image](chap1/spider.jpg)\f[R] in \f[C]chap1/text.md\f[R] and
5955+\f[C]![image](chap2/spider.jpg)\f[R] in \f[C]chap2/text.md\f[R].
5956+Links with relative paths will be rewritten in the same way as images.
58835957.PP
5884−It is possible to create a bibliography with all the citations, whether
5885−or not they appear in the document, by using a wildcard:
5886−.IP
5887−.nf
5888−\f[C]
5889−---
5890−nocite: |
5891− \[at]*
5892−\&...
5893−\f[R]
5894−.fi
5958+Absolute paths and URLs are not changed.
5959+Neither are empty paths or paths consisting entirely of a fragment,
5960+e.g., \f[C]#foo\f[R].
58955961.PP
5896−For LaTeX output, you can also use \f[C]natbib\f[R] or
5897−\f[C]biblatex\f[R] to render the bibliography.
5898−In order to do so, specify bibliography files as outlined above, and add
5899−\f[C]--natbib\f[R] or \f[C]--biblatex\f[R] argument to \f[C]pandoc\f[R]
5900−invocation.
5901−Bear in mind that bibliography files have to be in respective format
5902−(either BibTeX or BibLaTeX).
5962+Note that relative paths in reference links and images will be rewritten
5963+relative to the file containing the link reference definition, not the
5964+file containing the reference link or image itself, if these differ.
5965+.SS Extension: \f[C]attributes\f[R]
59035966.PP
5904−For more information, see the pandoc-citeproc man page.
5905−.SS Non-pandoc extensions
5967+Allows attributes to be attached to any inline or block-level element.
5968+The syntax for the attributes is the same as that used in
5969+\f[C]header_attributes\f[R].
5970+.IP \[bu] 2
5971+Attributes that occur immediately after an inline element affect that
5972+element.
5973+If they follow a space, then they belong to the space.
5974+(Hence, this option subsumes \f[C]inline_code_attributes\f[R] and
5975+\f[C]link_attributes\f[R].)
5976+.IP \[bu] 2
5977+Attributes that occur immediately before a block element, on a line by
5978+themselves, affect that element.
5979+.IP \[bu] 2
5980+Consecutive attribute specifiers may be used, either for blocks or for
5981+inlines.
5982+Their attributes will be combined.
5983+.IP \[bu] 2
5984+Attributes that occur at the end of the text of a Setext or ATX heading
5985+(separated by whitespace from the text) affect the heading element.
5986+(Hence, this option subsumes \f[C]header_attributes\f[R].)
5987+.IP \[bu] 2
5988+Attributes that occur after the opening fence in a fenced code block
5989+affect the code block element.
5990+(Hence, this option subsumes \f[C]fenced_code_attributes\f[R].)
5991+.IP \[bu] 2
5992+Attributes that occur at the end of a reference link definition affect
5993+links that refer to that definition.
59065994.PP
5907−The following Markdown syntax extensions are not enabled by default in
5908−pandoc, but may be enabled by adding \f[C]+EXTENSION\f[R] to the format
5909−name, where \f[C]EXTENSION\f[R] is the name of the extension.
5910−Thus, for example, \f[C]markdown+hard_line_breaks\f[R] is Markdown with
5911−hard line breaks.
5995+Note that pandoc\[cq]s AST does not currently allow attributes to be
5996+attached to arbitrary elements.
5997+Hence a Span or Div container will be added if needed.
59125998.SS Extension: \f[C]old_dashes\f[R]
59135999.PP
59146000Selects the pandoc <= 1.8.2.1 behavior for parsing smart dashes:
@@ -5920,7 +6006,7 @@ It is selected automatically for \f[C]textile\f[R] input.
59206006.PP
59216007Allow \f[C]<\f[R] and \f[C]>\f[R] to be backslash-escaped, as they can
59226008be in GitHub flavored Markdown but not original Markdown.
5923−This is implied by pandoc\[aq]s default \f[C]all_symbols_escapable\f[R].
6009+This is implied by pandoc\[cq]s default \f[C]all_symbols_escapable\f[R].
59246010.SS Extension: \f[C]lists_without_preceding_blankline\f[R]
59256011.PP
59266012Allow a list to occur right after a paragraph, with no intervening blank
@@ -6044,7 +6130,7 @@ in several respects:
60446130No blank line is required between consecutive items of the definition
60456131list.
60466132.IP \[bu] 2
6047−To get a \[dq]tight\[dq] or \[dq]compact\[dq] list, omit space between
6133+To get a \[lq]tight\[rq] or \[lq]compact\[rq] list, omit space between
60486134consecutive items; the space between a term and its definition does not
60496135affect anything.
60506136.IP \[bu] 2
@@ -6055,64 +6141,489 @@ be indented four spaces.
60556141Use Project Gutenberg conventions for \f[C]plain\f[R] output: all-caps
60566142for strong emphasis, surround by underscores for regular emphasis, add
60576143extra blank space around headings.
6144+.SS Extension: \f[C]sourcepos\f[R]
6145+.PP
6146+Include source position attributes when parsing \f[C]commonmark\f[R].
6147+For elements that accept attributes, a \f[C]data-pos\f[R] attribute is
6148+added; other elements are placed in a surrounding Div or Span elemnet
6149+with a \f[C]data-pos\f[R] attribute.
60586150.SS Markdown variants
60596151.PP
6060−In addition to pandoc\[aq]s extended Markdown, the following Markdown
6152+In addition to pandoc\[cq]s extended Markdown, the following Markdown
60616153variants are supported:
6154+.IP \[bu] 2
6155+\f[C]markdown_phpextra\f[R] (PHP Markdown Extra)
6156+.IP \[bu] 2
6157+\f[C]markdown_github\f[R] (deprecated GitHub-Flavored Markdown)
6158+.IP \[bu] 2
6159+\f[C]markdown_mmd\f[R] (MultiMarkdown)
6160+.IP \[bu] 2
6161+\f[C]markdown_strict\f[R] (Markdown.pl)
6162+.IP \[bu] 2
6163+\f[C]commonmark\f[R] (CommonMark)
6164+.IP \[bu] 2
6165+\f[C]gfm\f[R] (Github-Flavored Markdown)
6166+.IP \[bu] 2
6167+\f[C]commonmark_x\f[R] (CommonMark with many pandoc extensions)
6168+.PP
6169+To see which extensions are supported for a given format, and which are
6170+enabled by default, you can use the command
6171+.IP
6172+.nf
6173+\f[C]
6174+pandoc --list-extensions=FORMAT
6175+\f[R]
6176+.fi
6177+.PP
6178+where \f[C]FORMAT\f[R] is replaced with the name of the format.
6179+.PP
6180+Note that the list of extensions for \f[C]commonmark\f[R],
6181+\f[C]gfm\f[R], and \f[C]commonmark_x\f[R] are defined relative to
6182+default commonmark.
6183+So, for example, \f[C]backtick_code_blocks\f[R] does not appear as an
6184+extension, since it is enabled by default and cannot be disabled.
6185+.SH CITATIONS
6186+.PP
6187+When the \f[C]--citeproc\f[R] option is used, pandoc can automatically
6188+generate citations and a bibliography in a number of styles.
6189+Basic usage is
6190+.IP
6191+.nf
6192+\f[C]
6193+pandoc --citeproc myinput.txt
6194+\f[R]
6195+.fi
6196+.PP
6197+To use this feature, you will need to have
6198+.IP \[bu] 2
6199+a document containing citations (see Extension: \f[C]citations\f[R]);
6200+.IP \[bu] 2
6201+a source of bibliographic data: either an external bibliography file or
6202+a list of \f[C]references\f[R] in the document\[cq]s YAML metadata
6203+.IP \[bu] 2
6204+optionally, a CSL citation style.
6205+.SS Specifying bibliographic data
6206+.PP
6207+You can specify an external bibliography using the
6208+\f[C]bibliography\f[R] metadata field in a YAML metadata section or the
6209+\f[C]--bibliography\f[R] command line argument.
6210+If you want to use multiple bibliography files, you can supply multiple
6211+\f[C]--bibliography\f[R] arguments or set \f[C]bibliography\f[R]
6212+metadata field to YAML array.
6213+A bibliography may have any of these formats:
6214+.PP
6215+.TS
6216+tab(@);
6217+l l.
6218+T{
6219+Format
6220+T}@T{
6221+File extension
6222+T}
6223+_
6224+T{
6225+BibLaTeX
6226+T}@T{
6227+\&.bib
6228+T}
6229+T{
6230+BibTeX
6231+T}@T{
6232+\&.bibtex
6233+T}
6234+T{
6235+CSL JSON
6236+T}@T{
6237+\&.json
6238+T}
6239+T{
6240+CSL YAML
6241+T}@T{
6242+\&.yaml
6243+T}
6244+.TE
6245+.PP
6246+Note that \f[C].bib\f[R] can be used with both BibTeX and BibLaTeX
6247+files; use the extension \f[C].bibtex\f[R] to force interpretation as
6248+BibTeX.
6249+.PP
6250+In BibTeX and BibLaTeX databases, pandoc parses LaTeX markup inside
6251+fields such as \f[C]title\f[R]; in CSL YAML databases, pandoc Markdown;
6252+and in CSL JSON databases, an HTML-like markup:
6253+.TP
6254+\f[B]\f[CB]<i>...</i>\f[B]\f[R]
6255+italics
6256+.TP
6257+\f[B]\f[CB]<b>...</b>\f[B]\f[R]
6258+bold
6259+.TP
6260+\f[B]\f[CB]<span style=\[dq]font-variant:small-caps;\[dq]>...</span>\f[B]\f[R] or \f[B]\f[CB]<sc>...</sc>\f[B]\f[R]
6261+small capitals
6262+.TP
6263+\f[B]\f[CB]<sub>...</sub>\f[B]\f[R]
6264+subscript
60626265.TP
6063−\f[B]\f[CB]markdown_phpextra\f[B]\f[R] (PHP Markdown Extra)
6064−\f[C]footnotes\f[R], \f[C]pipe_tables\f[R], \f[C]raw_html\f[R],
6065−\f[C]markdown_attribute\f[R], \f[C]fenced_code_blocks\f[R],
6066−\f[C]definition_lists\f[R], \f[C]intraword_underscores\f[R],
6067−\f[C]header_attributes\f[R], \f[C]link_attributes\f[R],
6068−\f[C]abbreviations\f[R], \f[C]shortcut_reference_links\f[R],
6069−\f[C]spaced_reference_links\f[R].
6070−.TP
6071−\f[B]\f[CB]markdown_github\f[B]\f[R] (deprecated GitHub-Flavored Markdown)
6072−\f[C]pipe_tables\f[R], \f[C]raw_html\f[R], \f[C]fenced_code_blocks\f[R],
6073−\f[C]auto_identifiers\f[R], \f[C]gfm_auto_identifiers\f[R],
6074−\f[C]backtick_code_blocks\f[R], \f[C]autolink_bare_uris\f[R],
6075−\f[C]space_in_atx_header\f[R], \f[C]intraword_underscores\f[R],
6076−\f[C]strikeout\f[R], \f[C]task_lists\f[R], \f[C]emoji\f[R],
6077−\f[C]shortcut_reference_links\f[R], \f[C]angle_brackets_escapable\f[R],
6078−\f[C]lists_without_preceding_blankline\f[R].
6079−.TP
6080−\f[B]\f[CB]markdown_mmd\f[B]\f[R] (MultiMarkdown)
6081−\f[C]pipe_tables\f[R], \f[C]raw_html\f[R], \f[C]markdown_attribute\f[R],
6082−\f[C]mmd_link_attributes\f[R], \f[C]tex_math_double_backslash\f[R],
6083−\f[C]intraword_underscores\f[R], \f[C]mmd_title_block\f[R],
6084−\f[C]footnotes\f[R], \f[C]definition_lists\f[R],
6085−\f[C]all_symbols_escapable\f[R], \f[C]implicit_header_references\f[R],
6086−\f[C]auto_identifiers\f[R], \f[C]mmd_header_identifiers\f[R],
6087−\f[C]shortcut_reference_links\f[R], \f[C]implicit_figures\f[R],
6088−\f[C]superscript\f[R], \f[C]subscript\f[R],
6089−\f[C]backtick_code_blocks\f[R], \f[C]spaced_reference_links\f[R],
6090−\f[C]raw_attribute\f[R].
6091−.TP
6092−\f[B]\f[CB]markdown_strict\f[B]\f[R] (Markdown.pl)
6093−\f[C]raw_html\f[R], \f[C]shortcut_reference_links\f[R],
6094−\f[C]spaced_reference_links\f[R].
6095−.PP
6096−We also support \f[C]commonmark\f[R] and \f[C]gfm\f[R] (GitHub-Flavored
6097−Markdown, which is implemented as a set of extensions on
6098−\f[C]commonmark\f[R]).
6099−.PP
6100−Note, however, that \f[C]commonmark\f[R] and \f[C]gfm\f[R] have limited
6101−support for extensions.
6102−Only those listed below (and \f[C]smart\f[R], \f[C]raw_tex\f[R], and
6103−\f[C]hard_line_breaks\f[R]) will work.
6104−The extensions can, however, all be individually disabled.
6105−Also, \f[C]raw_tex\f[R] only affects \f[C]gfm\f[R] output, not input.
6106−.TP
6107−\f[B]\f[CB]gfm\f[B]\f[R] (GitHub-Flavored Markdown)
6108−\f[C]pipe_tables\f[R], \f[C]raw_html\f[R], \f[C]fenced_code_blocks\f[R],
6109−\f[C]auto_identifiers\f[R], \f[C]gfm_auto_identifiers\f[R],
6110−\f[C]backtick_code_blocks\f[R], \f[C]autolink_bare_uris\f[R],
6111−\f[C]space_in_atx_header\f[R], \f[C]intraword_underscores\f[R],
6112−\f[C]strikeout\f[R], \f[C]task_lists\f[R], \f[C]emoji\f[R],
6113−\f[C]shortcut_reference_links\f[R], \f[C]angle_brackets_escapable\f[R],
6114−\f[C]lists_without_preceding_blankline\f[R].
6115−.SH PRODUCING SLIDE SHOWS WITH PANDOC
6266+\f[B]\f[CB]<sup>...</sup>\f[B]\f[R]
6267+superscript
6268+.TP
6269+\f[B]\f[CB]<span class=\[dq]nocase\[dq]>...</span>\f[B]\f[R]
6270+prevent a phrase from being capitalized as title case
6271+.PP
6272+As an alternative to specifying a bibliography file using
6273+\f[C]--bibliography\f[R] or the YAML metadata field
6274+\f[C]bibliography\f[R], you can include the citation data directly in
6275+the \f[C]references\f[R] field of the document\[cq]s YAML metadata.
6276+The field should contain an array of YAML-encoded references, for
6277+example:
6278+.IP
6279+.nf
6280+\f[C]
6281+---
6282+references:
6283+- type: article-journal
6284+ id: WatsonCrick1953
6285+ author:
6286+ - family: Watson
6287+ given: J. D.
6288+ - family: Crick
6289+ given: F. H. C.
6290+ issued:
6291+ date-parts:
6292+ - - 1953
6293+ - 4
6294+ - 25
6295+ title: \[aq]Molecular structure of nucleic acids: a structure for
6296+ deoxyribose nucleic acid\[aq]
6297+ title-short: Molecular structure of nucleic acids
6298+ container-title: Nature
6299+ volume: 171
6300+ issue: 4356
6301+ page: 737-738
6302+ DOI: 10.1038/171737a0
6303+ URL: https://www.nature.com/articles/171737a0
6304+ language: en-GB
6305+\&...
6306+\f[R]
6307+.fi
6308+.PP
6309+If both an external bibliography and inline (YAML metadata) references
6310+are provided, both will be used.
6311+In case of conflicting \f[C]id\f[R]s, the inline references will take
6312+precedence.
6313+.PP
6314+Note that \f[C]pandoc\f[R] can be used to produce such a YAML metadata
6315+section from a BibTeX, BibLaTeX, or CSL JSON bibliography:
6316+.IP
6317+.nf
6318+\f[C]
6319+pandoc chem.bib -s -f biblatex -t markdown
6320+pandoc chem.json -s -f csljson -t markdown
6321+\f[R]
6322+.fi
6323+.PP
6324+Indeed, \f[C]pandoc\f[R] can convert between any of these citation
6325+formats:
6326+.IP
6327+.nf
6328+\f[C]
6329+pandoc chem.bib -s -f biblatex -t csljson
6330+pandoc chem.yaml -s -f markdown -t biblatex
6331+\f[R]
6332+.fi
6333+.PP
6334+Running pandoc on a bibliography file with the \f[C]--citeproc\f[R]
6335+option will create a formatted bibliography in the format of your
6336+choice:
6337+.IP
6338+.nf
6339+\f[C]
6340+pandoc chem.bib -s --citeproc -o chem.html
6341+pandoc chem.bib -s --citeproc -o chem.pdf
6342+\f[R]
6343+.fi
6344+.SS Capitalization in titles
6345+.PP
6346+If you are using a bibtex or biblatex bibliography, then observe the
6347+following rules:
6348+.IP \[bu] 2
6349+English titles should be in title case.
6350+Non-English titles should be in sentence case, and the \f[C]langid\f[R]
6351+field in biblatex should be set to the relevant language.
6352+(The following values are treated as English: \f[C]american\f[R],
6353+\f[C]british\f[R], \f[C]canadian\f[R], \f[C]english\f[R],
6354+\f[C]australian\f[R], \f[C]newzealand\f[R], \f[C]USenglish\f[R], or
6355+\f[C]UKenglish\f[R].)
6356+.IP \[bu] 2
6357+As is standard with bibtex/biblatex, proper names should be protected
6358+with curly braces so that they won\[cq]t be lowercased in styles that
6359+call for sentence case.
6360+For example:
6361+.RS 2
6362+.IP
6363+.nf
6364+\f[C]
6365+title = {My Dinner with {Andre}}
6366+\f[R]
6367+.fi
6368+.RE
6369+.IP \[bu] 2
6370+In addition, words that should remain lowercase (or camelCase) should be
6371+protected:
6372+.RS 2
6373+.IP
6374+.nf
6375+\f[C]
6376+title = {Spin Wave Dispersion on the {nm} Scale}
6377+\f[R]
6378+.fi
6379+.PP
6380+Though this is not necessary in bibtex/biblatex, it is necessary with
6381+citeproc, which stores titles internally in sentence case, and converts
6382+to title case in styles that require it.
6383+Here we protect \[lq]nm\[rq] so that it doesn\[cq]t get converted to
6384+\[lq]Nm\[rq] at this stage.
6385+.RE
6386+.PP
6387+If you are using a CSL bibliography (either JSON or YAML), then observe
6388+the following rules:
6389+.IP \[bu] 2
6390+All titles should be in sentence case.
6391+.IP \[bu] 2
6392+Use the \f[C]language\f[R] field for non-English titles to prevent their
6393+conversion to title case in styles that call for this.
6394+(Conversion happens only if \f[C]language\f[R] begins with \f[C]en\f[R]
6395+or is left empty.)
6396+.IP \[bu] 2
6397+Protect words that should not be converted to title case using this
6398+syntax:
6399+.RS 2
6400+.IP
6401+.nf
6402+\f[C]
6403+Spin wave dispersion on the <span class=\[dq]nocase\[dq]>nm</span> scale
6404+\f[R]
6405+.fi
6406+.RE
6407+.SS Conference Papers, Published vs.\ Unpublished
6408+.PP
6409+For a formally published conference paper, use the biblatex entry type
6410+\f[C]inproceedings\f[R] (which will be mapped to CSL
6411+\f[C]paper-conference\f[R]).
6412+.PP
6413+For an unpublished manuscript, use the biblatex entry type
6414+\f[C]unpublished\f[R] without an \f[C]eventtitle\f[R] field (this entry
6415+type will be mapped to CSL \f[C]manuscript\f[R]).
6416+.PP
6417+For a talk, an unpublished conference paper, or a poster presentation,
6418+use the biblatex entry type \f[C]unpublished\f[R] with an
6419+\f[C]eventtitle\f[R] field (this entry type will be mapped to CSL
6420+\f[C]speech\f[R]).
6421+Use the biblatex \f[C]type\f[R] field to indicate the type,
6422+e.g.\ \[lq]Paper\[rq], or \[lq]Poster\[rq].
6423+\f[C]venue\f[R] and \f[C]eventdate\f[R] may be useful too, though
6424+\f[C]eventdate\f[R] will not be rendered by most CSL styles.
6425+Note that \f[C]venue\f[R] is for the event\[cq]s venue, unlike
6426+\f[C]location\f[R] which describes the publisher\[cq]s location; do not
6427+use the latter for an unpublished conference paper.
6428+.SS Specifying a citation style
6429+.PP
6430+Citations and references can be formatted using any style supported by
6431+the Citation Style Language, listed in the Zotero Style Repository.
6432+These files are specified using the \f[C]--csl\f[R] option or the
6433+\f[C]csl\f[R] (or \f[C]citation-style\f[R]) metadata field.
6434+By default, pandoc will use the Chicago Manual of Style author-date
6435+format.
6436+(You can override this default by copying a CSL style of your choice to
6437+\f[C]default.csl\f[R] in your user data directory.) The CSL project
6438+provides further information on finding and editing styles.
6439+.PP
6440+The \f[C]--citation-abbreviations\f[R] option (or the
6441+\f[C]citation-abbreviations\f[R] metadata field) may be used to specify
6442+a JSON file containing abbreviations of journals that should be used in
6443+formatted bibliographies when \f[C]form=\[dq]short\[dq]\f[R] is
6444+specified.
6445+The format of the file can be illustrated with an example:
6446+.IP
6447+.nf
6448+\f[C]
6449+{ \[dq]default\[dq]: {
6450+ \[dq]container-title\[dq]: {
6451+ \[dq]Lloyd\[aq]s Law Reports\[dq]: \[dq]Lloyd\[aq]s Rep\[dq],
6452+ \[dq]Estates Gazette\[dq]: \[dq]EG\[dq],
6453+ \[dq]Scots Law Times\[dq]: \[dq]SLT\[dq]
6454+ }
6455+ }
6456+}
6457+\f[R]
6458+.fi
6459+.SS Citations in note styles
6460+.PP
6461+Pandoc\[cq]s citation processing is designed to allow you to move
6462+between author-date, numerical, and note styles without modifying the
6463+markdown source.
6464+When you\[cq]re using a note style, avoid inserting footnotes manually.
6465+Instead, insert citations just as you would in an author-date
6466+style\[em]for example,
6467+.IP
6468+.nf
6469+\f[C]
6470+Blah blah [\[at]foo, p. 33].
6471+\f[R]
6472+.fi
6473+.PP
6474+The footnote will be created automatically.
6475+Pandoc will take care of removing the space and moving the note before
6476+or after the period, depending on the setting of
6477+\f[C]notes-after-punctuation\f[R], as described below in Other relevant
6478+metadata fields.
6479+.PP
6480+In some cases you may need to put a citation inside a regular footnote.
6481+Normal citations in footnotes (such as \f[C][\[at]foo, p. 33]\f[R]) will
6482+be rendered in parentheses.
6483+In-text citations (such as \f[C]\[at]foo [p. 33]\f[R]) will be rendered
6484+without parentheses.
6485+(A comma will be added if appropriate.) Thus:
6486+.IP
6487+.nf
6488+\f[C]
6489+[\[ha]1]: Some studies [\[at]foo; \[at]bar, p. 33] show that
6490+frubulicious zoosnaps are quantical. For a survey
6491+of the literature, see \[at]baz [chap. 1].
6492+\f[R]
6493+.fi
6494+.SS Raw content in a style
6495+.PP
6496+To include raw content in a prefix, suffix, delimiter, or term, surround
6497+it with these tags indicating the format:
6498+.IP
6499+.nf
6500+\f[C]
6501+{{jats}}&lt;ref&gt;{{/jats}}
6502+\f[R]
6503+.fi
6504+.PP
6505+Without the tags, the string will be interpreted as a string and escaped
6506+in the output, rather than being passed through raw.
6507+.PP
6508+This feature allows stylesheets to be customized to give different
6509+output for different output formats.
6510+However, stylesheets customized in this way will not be usable by other
6511+CSL implementations.
6512+.SS Placement of the bibliography
6513+.PP
6514+If the style calls for a list of works cited, it will be placed in a div
6515+with id \f[C]refs\f[R], if one exists:
6516+.IP
6517+.nf
6518+\f[C]
6519+::: {#refs}
6520+:::
6521+\f[R]
6522+.fi
6523+.PP
6524+Otherwise, it will be placed at the end of the document.
6525+Generation of the bibliography can be suppressed by setting
6526+\f[C]suppress-bibliography: true\f[R] in the YAML metadata.
6527+.PP
6528+If you wish the bibliography to have a section heading, you can set
6529+\f[C]reference-section-title\f[R] in the metadata, or put the heading at
6530+the beginning of the div with id \f[C]refs\f[R] (if you are using it) or
6531+at the end of your document:
6532+.IP
6533+.nf
6534+\f[C]
6535+last paragraph...
6536+
6537+# References
6538+\f[R]
6539+.fi
6540+.PP
6541+The bibliography will be inserted after this heading.
6542+Note that the \f[C]unnumbered\f[R] class will be added to this heading,
6543+so that the section will not be numbered.
6544+.SS Including uncited items in the bibliography
6545+.PP
6546+If you want to include items in the bibliography without actually citing
6547+them in the body text, you can define a dummy \f[C]nocite\f[R] metadata
6548+field and put the citations there:
6549+.IP
6550+.nf
6551+\f[C]
6552+---
6553+nocite: |
6554+ \[at]item1, \[at]item2
6555+\&...
6556+
6557+\[at]item3
6558+\f[R]
6559+.fi
6560+.PP
6561+In this example, the document will contain a citation for
6562+\f[C]item3\f[R] only, but the bibliography will contain entries for
6563+\f[C]item1\f[R], \f[C]item2\f[R], and \f[C]item3\f[R].
6564+.PP
6565+It is possible to create a bibliography with all the citations, whether
6566+or not they appear in the document, by using a wildcard:
6567+.IP
6568+.nf
6569+\f[C]
6570+---
6571+nocite: |
6572+ \[at]*
6573+\&...
6574+\f[R]
6575+.fi
6576+.PP
6577+For LaTeX output, you can also use \f[C]natbib\f[R] or
6578+\f[C]biblatex\f[R] to render the bibliography.
6579+In order to do so, specify bibliography files as outlined above, and add
6580+\f[C]--natbib\f[R] or \f[C]--biblatex\f[R] argument to \f[C]pandoc\f[R]
6581+invocation.
6582+Bear in mind that bibliography files have to be in either BibTeX (for
6583+\f[C]--natbib\f[R]) or BibLaTeX (for \f[C]--biblatex\f[R]) format.
6584+.SS Other relevant metadata fields
6585+.PP
6586+A few other metadata fields affect bibliography formatting:
6587+.TP
6588+\f[B]\f[CB]link-citations\f[B]\f[R]
6589+If true, citations will be hyperlinked to the corresponding bibliography
6590+entries (for author-date and numerical styles only).
6591+.TP
6592+\f[B]\f[CB]lang\f[B]\f[R]
6593+The \f[C]lang\f[R] field will affect how the style is localized, for
6594+example in the translation of labels, the use of quotation marks, and
6595+the way items are sorted.
6596+(For backwards compatibility, \f[C]locale\f[R] may be used instead of
6597+\f[C]lang\f[R], but this use is deprecated.)
6598+.RS
6599+.PP
6600+A BCP 47 language tag is expected: for example, \f[C]en\f[R],
6601+\f[C]de\f[R], \f[C]en-US\f[R], \f[C]fr-CA\f[R], \f[C]ug-Cyrl\f[R].
6602+The unicode extension syntax (after \f[C]-u-\f[R]) may be used to
6603+specify options for collation (sorting) more precisely.
6604+Here are some examples:
6605+.IP \[bu] 2
6606+\f[C]zh-u-co-pinyin\f[R] \[en] Chinese with the Pinyin collation.
6607+.IP \[bu] 2
6608+\f[C]es-u-co-trad\f[R] \[en] Spanish with the traditional collation
6609+(with \f[C]Ch\f[R] sorting after \f[C]C\f[R]).
6610+.IP \[bu] 2
6611+\f[C]fr-u-kb\f[R] \[en] French with \[lq]backwards\[rq] accent sorting
6612+(with \f[C]cot\['e]\f[R] sorting after \f[C]c\[^o]te\f[R]).
6613+.IP \[bu] 2
6614+\f[C]en-US-u-kf-upper\f[R] \[en] English with uppercase letters sorting
6615+before lower (default is lower before upper).
6616+.RE
6617+.TP
6618+\f[B]\f[CB]notes-after-punctuation\f[B]\f[R]
6619+If true (the default), pandoc will put footnote citations after
6620+following punctuation.
6621+For example, if the source contains \f[C]blah blah [\[at]jones99].\f[R],
6622+the result will look like \f[C]blah blah.[\[ha]1]\f[R], with the note
6623+moved after the period and the space collapsed.
6624+If false, the space will still be collapsed, but the footnote will not
6625+be moved after the punctuation.
6626+.SH SLIDE SHOWS
61166627.PP
61176628You can use pandoc to produce an HTML + JavaScript slide presentation
61186629that can be viewed via a web browser.
@@ -6121,7 +6632,7 @@ reveal.js.
61216632You can also produce a PDF slide show using LaTeX \f[C]beamer\f[R], or
61226633slides shows in Microsoft PowerPoint format.
61236634.PP
6124−Here\[aq]s the Markdown source for a simple slide show,
6635+Here\[cq]s the Markdown source for a simple slide show,
61256636\f[C]habits.txt\f[R]:
61266637.IP
61276638.nf
@@ -6223,21 +6734,26 @@ A heading at the slide level always starts a new slide.
62236734.IP \[bu] 2
62246735Headings \f[I]below\f[R] the slide level in the hierarchy create
62256736headings \f[I]within\f[R] a slide.
6737+(In beamer, a \[lq]block\[rq] will be created.
6738+If the heading has the class \f[C]example\f[R], an
6739+\f[C]exampleblock\f[R] environment will be used; if it has the class
6740+\f[C]alert\f[R], an \f[C]alertblock\f[R] will be used; otherwise a
6741+regular \f[C]block\f[R] will be used.)
62266742.IP \[bu] 2
62276743Headings \f[I]above\f[R] the slide level in the hierarchy create
6228−\[dq]title slides,\[dq] which just contain the section title and help to
6744+\[lq]title slides,\[rq] which just contain the section title and help to
62296745break the slide show into sections.
62306746Non-slide content under these headings will be included on the title
62316747slide (for HTML slide shows) or in a subsequent slide with the same
62326748title (for beamer).
62336749.IP \[bu] 2
6234−A title page is constructed automatically from the document\[aq]s title
6750+A title page is constructed automatically from the document\[cq]s title
62356751block, if present.
62366752(In the case of beamer, this can be disabled by commenting out some
62376753lines in the default template.)
62386754.PP
62396755These rules are designed to support many different styles of slide show.
6240−If you don\[aq]t care about structuring your slides into sections and
6756+If you don\[cq]t care about structuring your slides into sections and
62416757subsections, you can just use level-1 headings for all each slide.
62426758(In that case, level-1 will be the slide level.) But you can also
62436759structure the slide show into sections, as in the example above.
@@ -6249,8 +6765,8 @@ It is not recommended that you use deeper nesting of section levels with
62496765reveal.js.
62506766.SS Incremental lists
62516767.PP
6252−By default, these writers produce lists that display \[dq]all at
6253−once.\[dq] If you want your lists to display incrementally (one item at
6768+By default, these writers produce lists that display \[lq]all at
6769+once.\[rq] If you want your lists to display incrementally (one item at
62546770a time), use the \f[C]-i\f[R] option.
62556771If you want a particular list to depart from the default, put it in a
62566772\f[C]div\f[R] block with class \f[C]incremental\f[R] or
@@ -6303,7 +6819,7 @@ Note: Neither the \f[C]-i/--incremental\f[R] option nor any of the
63036819methods described here currently works for PowerPoint output.
63046820.SS Inserting pauses
63056821.PP
6306−You can add \[dq]pauses\[dq] within a slide by including a paragraph
6822+You can add \[lq]pauses\[rq] within a slide by including a paragraph
63076823containing three dots, separated by spaces:
63086824.IP
63096825.nf
@@ -6326,7 +6842,7 @@ in \f[C]$DATADIR/s5/default\f[R] (for S5), \f[C]$DATADIR/slidy\f[R] (for
63266842Slidy), or \f[C]$DATADIR/slideous\f[R] (for Slideous), where
63276843\f[C]$DATADIR\f[R] is the user data directory (see \f[C]--data-dir\f[R],
63286844above).
6329−The originals may be found in pandoc\[aq]s system data directory
6845+The originals may be found in pandoc\[cq]s system data directory
63306846(generally \f[C]$CABALDIR/pandoc-VERSION/s5/default\f[R]).
63316847Pandoc will look there for any files it does not find in the user data
63326848directory.
@@ -6456,7 +6972,7 @@ contents...
64566972The class \f[C]onlytextwidth\f[R] sets the \f[C]totalwidth\f[R] to
64576973\f[C]\[rs]textwidth\f[R].
64586974.PP
6459−See Section 12.7 of the Beamer User\[aq]s Guide for more details.
6975+See Section 12.7 of the Beamer User\[cq]s Guide for more details.
64606976.SS Frame attributes in beamer
64616977.PP
64626978Sometimes it is necessary to add the LaTeX \f[C][fragile]\f[R] option to
@@ -6472,7 +6988,7 @@ introducing the slide:
64726988.fi
64736989.PP
64746990All of the other frame attributes described in Section 8.1 of the Beamer
6475−User\[aq]s Guide may also be used: \f[C]allowdisplaybreaks\f[R],
6991+User\[cq]s Guide may also be used: \f[C]allowdisplaybreaks\f[R],
64766992\f[C]allowframebreaks\f[R], \f[C]b\f[R], \f[C]c\f[R], \f[C]t\f[R],
64776993\f[C]environment\f[R], \f[C]label\f[R], \f[C]plain\f[R],
64786994\f[C]shrink\f[R], \f[C]standout\f[R], \f[C]noframenumbering\f[R].
@@ -6497,7 +7013,7 @@ To set an image for a particular reveal.js slide, add
64977013\f[C]{data-background-image=\[dq]/path/to/image\[dq]}\f[R] to the first
64987014slide-level heading on the slide (which may even be empty).
64997015.PP
6500−In reveal.js\[aq]s overview mode, the parallaxBackgroundImage will show
7016+In reveal.js\[cq]s overview mode, the parallaxBackgroundImage will show
65017017up only on the first slide.
65027018.PP
65037019Other reveal.js background settings also work on individual slides,
@@ -6533,7 +7049,7 @@ Slide 1 has background_image.png as its background.
65337049Slide 2 has a special image for its background, even though the heading has no content.
65347050\f[R]
65357051.fi
6536−.SH CREATING EPUBS WITH PANDOC
7052+.SH EPUBS
65377053.SS EPUB Metadata
65387054.PP
65397055EPUB metadata may be specified using the \f[C]--epub-metadata\f[R]
@@ -6587,8 +7103,8 @@ Valid values for \f[C]type\f[R] are \f[C]main\f[R], \f[C]subtitle\f[R],
65877103Either a string value, or an object with fields \f[C]role\f[R],
65887104\f[C]file-as\f[R], and \f[C]text\f[R], or a list of such objects.
65897105Valid values for \f[C]role\f[R] are MARC relators, but pandoc will
6590−attempt to translate the human-readable versions (like \[dq]author\[dq]
6591−and \[dq]editor\[dq]) to the appropriate marc relators.
7106+attempt to translate the human-readable versions (like \[lq]author\[rq]
7107+and \[lq]editor\[rq]) to the appropriate marc relators.
65927108.TP
65937109\f[B]\f[CB]contributor\f[B]\f[R]
65947110Same format as \f[C]creator\f[R].
@@ -6623,6 +7139,16 @@ A string value.
66237139\f[B]\f[CB]rights\f[B]\f[R]
66247140A string value.
66257141.TP
7142+\f[B]\f[CB]belongs-to-collection\f[B]\f[R]
7143+A string value.
7144+identifies the name of a collection to which the EPUB Publication
7145+belongs.
7146+.TP
7147+\f[B]\f[CB]group-position\f[B]\f[R]
7148+The \f[C]group-position\f[R] field indicates the numeric position in
7149+which the EPUB Publication belongs relative to other works belonging to
7150+the same \f[C]belongs-to-collection\f[R] field.
7151+.TP
66267152\f[B]\f[CB]cover-image\f[B]\f[R]
66277153A string value (path to cover image).
66287154.TP
@@ -6777,16 +7303,6 @@ T}@T{
67777303frontmatter
67787304T}
67797305T{
6780−seriespage
6781−T}@T{
6782−frontmatter
6783−T}
6784−T{
6785−titlepage
6786−T}@T{
6787−frontmatter
6788−T}
6789−T{
67907306appendix
67917307T}@T{
67927308backmatter
@@ -6827,7 +7343,7 @@ For example:
68277343</audio>
68287344\f[R]
68297345.fi
6830−.SH CREATING JUPYTER NOTEBOOKS WITH PANDOC
7346+.SH JUPYTER NOTEBOOKS
68317347.PP
68327348When creating a Jupyter notebook, pandoc will try to infer the notebook
68337349structure.
@@ -6942,7 +7458,7 @@ hello
69427458If you include raw HTML or TeX in an output cell, use the [raw
69437459attribute][Extension: \f[C]fenced_attribute\f[R]], as shown in the last
69447460cell of the example above.
6945−Although pandoc can process \[dq]bare\[dq] raw HTML and TeX, the result
7461+Although pandoc can process \[lq]bare\[rq] raw HTML and TeX, the result
69467462is often interspersed raw elements and normal textual elements, and in
69477463an output cell pandoc expects a single, connected raw block.
69487464To avoid using raw HTML or TeX except when marked explicitly using raw
@@ -6995,10 +7511,10 @@ pandoc --highlight-style my.theme
69957511.fi
69967512.PP
69977513If you are not satisfied with the built-in highlighting, or you want
6998−highlight a language that isn\[aq]t supported, you can use the
7514+highlight a language that isn\[cq]t supported, you can use the
69997515\f[C]--syntax-definition\f[R] option to load a KDE-style XML syntax
70007516definition file.
7001−Before writing your own, have a look at KDE\[aq]s repository of syntax
7517+Before writing your own, have a look at KDE\[cq]s repository of syntax
70027518definitions.
70037519.PP
70047520To disable highlighting, use the \f[C]--no-highlight\f[R] option.
@@ -7007,7 +7523,7 @@ To disable highlighting, use the \f[C]--no-highlight\f[R] option.
70077523Custom styles can be used in the docx and ICML formats.
70087524.SS Output
70097525.PP
7010−By default, pandoc\[aq]s docx and ICML output applies a predefined set
7526+By default, pandoc\[cq]s docx and ICML output applies a predefined set
70117527of styles for blocks such as paragraphs and block quotes, and uses
70127528largely default formatting (italics, bold) for inlines.
70137529This will work for most purposes, especially alongside a
@@ -7028,7 +7544,7 @@ So, for example, using the \f[C]bracketed_spans\f[R] syntax,
70287544\f[R]
70297545.fi
70307546.PP
7031−would produce a docx file with \[dq]Get out\[dq] styled with character
7547+would produce a docx file with \[lq]Get out\[rq] styled with character
70327548style \f[C]Emphatically\f[R].
70337549Similarly, using the \f[C]fenced_divs\f[R] syntax,
70347550.IP
@@ -7059,13 +7575,13 @@ character style (perhaps to change their color), you can write a filter
70597575which will transform all italicized inlines to inlines within an
70607576\f[C]Emphasis\f[R] custom-style \f[C]span\f[R].
70617577.PP
7062−For docx output, you don\[aq]t need to enable any extensions for custom
7578+For docx output, you don\[cq]t need to enable any extensions for custom
70637579styles to work.
70647580.SS Input
70657581.PP
70667582The docx reader, by default, only reads those styles that it can convert
70677583into pandoc elements, either by direct conversion or interpreting the
7068−derivation of the input document\[aq]s styles.
7584+derivation of the input document\[cq]s styles.
70697585.PP
70707586By enabling the \f[C]styles\f[R] extension in the docx reader
70717587(\f[C]-f docx+styles\f[R]), you can produce output that maintains the
@@ -7148,6 +7664,20 @@ need to specify a template manually using \f[C]--template\f[R] or add a
71487664new default template with the name
71497665\f[C]default.NAME_OF_CUSTOM_WRITER.lua\f[R] to the \f[C]templates\f[R]
71507666subdirectory of your user data directory (see Templates).
7667+.SH REPRODUCIBLE BUILDS
7668+.PP
7669+Some of the document formats pandoc targets (such as EPUB, docx, and
7670+ODT) include build timestamps in the generated document.
7671+That means that the files generated on successive builds will differ,
7672+even if the source does not.
7673+To avoid this, set the \f[C]SOURCE_DATE_EPOCH\f[R] environment variable,
7674+and the timestamp will be taken from it instead of the current time.
7675+\f[C]SOURCE_DATE_EPOCH\f[R] should contain an integer unix timestamp
7676+(specifying the number of second since midnight UTC January 1, 1970).
7677+.PP
7678+Some document formats also include a unique identifier.
7679+For EPUB, this can be set explicitly by setting the \f[C]identifier\f[R]
7680+metadata field (see EPUB Metadata, above).
71517681.SH A NOTE ON SECURITY
71527682.PP
71537683If you use pandoc to convert user-contributed content in a web
@@ -7166,7 +7696,7 @@ fully isolates pandoc from your file system, by running the pandoc
71667696operations in the \f[C]PandocPure\f[R] monad.
71677697See the document Using the pandoc API for more details.
71687698.IP "3." 3
7169−Pandoc\[aq]s parsers can exhibit pathological performance on some corner
7699+Pandoc\[cq]s parsers can exhibit pathological performance on some corner
71707700cases.
71717701It is wise to put any pandoc operations under a timeout, to avoid DOS
71727702attacks that exploit these issues.
@@ -7178,16 +7708,16 @@ The HTML generated by pandoc is not guaranteed to be safe.
71787708If \f[C]raw_html\f[R] is enabled for the Markdown input, users can
71797709inject arbitrary HTML.
71807710Even if \f[C]raw_html\f[R] is disabled, users can include dangerous
7181−content in attributes for headings, spans, and code blocks.
7711+content in URLs and attributes.
71827712To be safe, you should run all the generated HTML through an HTML
71837713sanitizer.
71847714.SH AUTHORS
71857715.PP
7186−Copyright 2006--2020 John MacFarlane (jgm\[at]berkeley.edu).
7716+Copyright 2006\[en]2021 John MacFarlane (jgm\[at]berkeley.edu).
71877717Released under the GPL, version 2 or greater.
71887718This software carries no warranty of any kind.
71897719(See COPYRIGHT for full copyright and warranty notices.) For a full list
71907720of contributors, see the file AUTHORS.md in the pandoc source code.
71917721.PP
71927722The Pandoc source code and all documentation may be downloaded
7193−from <http://pandoc.org>.
7723+from <https://pandoc.org>.
man/pandoc.1.after+1−1
@@ -1,3 +1,3 @@
11.PP
22The Pandoc source code and all documentation may be downloaded
3−from <http://pandoc.org>.
3+from <https://pandoc.org>.
pandoc.cabal+222−240
@@ -1,18 +1,18 @@
11cabal-version: 2.2
22name: pandoc
3−version: 2.10
3+version: 2.14.0.3
44build-type: Simple
55license: GPL-2.0-or-later
66license-file: COPYING.md
7−copyright: (c) 2006-2020 John MacFarlane
7+copyright: (c) 2006-2021 John MacFarlane
88author: John MacFarlane <jgm@berkeley.edu>
99maintainer: John MacFarlane <jgm@berkeley.edu>
1010bug-reports: https://github.com/jgm/pandoc/issues
1111stability: alpha
1212homepage: https://pandoc.org
1313category: Text
14−tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5,
15− GHC == 8.8.3, GHC == 8.10.1
14+tested-with: GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5,
15+ GHC == 8.8.4, GHC == 8.10.2, GHC == 9.0.1
1616synopsis: Conversion between markup formats
1717description: Pandoc is a Haskell library for converting from one markup
1818 format to another, and a command-line tool that uses
@@ -22,14 +22,15 @@ description: Pandoc is a Haskell library for converting from one markup
2222 TikiWiki markup, Jira markup, Creole 1.0, Haddock markup,
2323 OPML, Emacs Org-Mode, Emacs Muse, txt2tags, ipynb (Jupyter
2424 notebooks), Vimwiki, Word Docx, ODT, EPUB, FictionBook2,
25− roff man, Textile, and CSV, and it can write Markdown,
25+ roff man, Textile, BibTeX, BibLaTeX, CSL JSON,
26+ , and CSV, and it can write Markdown,
2627 reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, DocBook,
2728 JATS, OPML, TEI, OpenDocument, ODT, Word docx,
2829 PowerPoint pptx, RTF, MediaWiki, DokuWiki, XWiki,
2930 ZimWiki, Textile, Jira, roff man, roff ms, plain text,
3031 Emacs Org-Mode, AsciiDoc, Haddock markup,
3132 EPUB (v2 and v3), ipynb, FictionBook2,
32− InDesign ICML, Muse, LaTeX beamer slides,
33+ InDesign ICML, Muse, CSL JSON, LaTeX beamer slides,
3334 and several kinds of HTML/JavaScript slide shows
3435 (S5, Slidy, Slideous, DZSlides, reveal.js).
3536 .
@@ -55,6 +56,8 @@ data-files:
5556 data/templates/default.icml
5657 data/templates/default.opml
5758 data/templates/default.latex
59+ data/templates/default.bibtex
60+ data/templates/default.biblatex
5861 data/templates/default.context
5962 data/templates/default.texinfo
6063 data/templates/default.jira
@@ -83,6 +86,7 @@ data-files:
8386 data/templates/default.epub2
8487 data/templates/default.epub3
8588 data/templates/article.jats_publishing
89+ data/templates/affiliations.jats
8690 -- translations
8791 data/translations/*.yaml
8892 -- source files for reference.docx
@@ -178,8 +182,9 @@ data-files:
178182 data/pandoc.List.lua
179183 -- bash completion template
180184 data/bash_completion.tpl
181− -- jats csl
182− data/jats.csl
185+ -- citeproc
186+ data/default.csl
187+ citeproc/biblatex-localization/*.lbx.strings
183188 -- documentation
184189 MANUAL.txt, COPYRIGHT
185190extra-source-files:
@@ -201,12 +206,27 @@ extra-source-files:
201206 test/bodybg.gif
202207 test/*.native
203208 test/command/*.md
209+ test/command/*.csl
210+ test/command/biblio.bib
211+ test/command/averroes.bib
204212 test/command/A.txt
205213 test/command/B.txt
206214 test/command/C.txt
207215 test/command/D.txt
216+ test/command/01.csv
217+ test/command/chap1/spider.png
218+ test/command/chap2/spider.png
219+ test/command/chap1/text.md
220+ test/command/chap2/text.md
208221 test/command/defaults1.yaml
209222 test/command/defaults2.yaml
223+ test/command/defaults3.yaml
224+ test/command/defaults4.yaml
225+ test/command/defaults5.yaml
226+ test/command/defaults6.yaml
227+ test/command/defaults7.yaml
228+ test/command/defaults8.yaml
229+ test/command/defaults9.yaml
210230 test/command/3533-rst-csv-tables.csv
211231 test/command/3880.txt
212232 test/command/5182.txt
@@ -278,6 +298,7 @@ extra-source-files:
278298 test/tables.opendocument
279299 test/tables.org
280300 test/tables.asciidoc
301+ test/tables.asciidoctor
281302 test/tables.haddock
282303 test/tables.texinfo
283304 test/tables.rst
@@ -287,6 +308,11 @@ extra-source-files:
287308 test/tables.muse
288309 test/tables.custom
289310 test/tables.xwiki
311+ test/tables/*.html4
312+ test/tables/*.html5
313+ test/tables/*.latex
314+ test/tables/*.native
315+ test/tables/*.jats_archiving
290316 test/testsuite.txt
291317 test/writer.latex
292318 test/writer.context
@@ -307,6 +333,7 @@ extra-source-files:
307333 test/writer.opendocument
308334 test/writer.org
309335 test/writer.asciidoc
336+ test/writer.asciidoctor
310337 test/writer.haddock
311338 test/writer.rst
312339 test/writer.icml
@@ -365,10 +392,6 @@ source-repository head
365392 type: git
366393 location: git://github.com/jgm/pandoc.git
367394
368−flag static
369− Description: Use static linking for pandoc executable.
370− Default: False
371−
372395flag embed_data_files
373396 Description: Embed data files in binary for relocatable executable.
374397 Default: False
@@ -377,101 +400,116 @@ flag trypandoc
377400 Description: Build trypandoc cgi executable.
378401 Default: False
379402
380−library
381− build-depends: base >= 4.9 && < 5,
382− syb >= 0.1 && < 0.8,
383− containers >= 0.4.2.1 && < 0.7,
384− unordered-containers >= 0.2 && < 0.3,
385− parsec >= 3.1 && < 3.2,
386− mtl >= 2.2 && < 2.3,
387− exceptions >= 0.8 && < 0.11,
388− filepath >= 1.1 && < 1.5,
389− process >= 1.2.3 && < 1.7,
390− directory >= 1.2.3 && < 1.4,
391− bytestring >= 0.9 && < 0.11,
392− text >= 1.1.1.0 && < 1.3,
393− time >= 1.5 && < 1.10,
394− safe >= 0.3 && < 0.4,
395− zip-archive >= 0.2.3.4 && < 0.5,
396− HTTP >= 4000.0.5 && < 4000.4,
397− texmath >= 0.12.0.2 && < 0.13,
398− xml >= 1.3.12 && < 1.4,
399− split >= 0.2 && < 0.3,
400− random >= 1 && < 1.2,
401− pandoc-types >= 1.21 && < 1.22,
402− aeson >= 0.7 && < 1.6,
403− scientific >= 0.3 && < 0.4,
404− aeson-pretty >= 0.8.5 && < 0.9,
405− tagsoup >= 0.14.6 && < 0.15,
406− base64-bytestring >= 0.1 && < 1.2,
407− zlib >= 0.5 && < 0.7,
408− skylighting >= 0.8.5 && < 0.9,
409− skylighting-core >= 0.8.5 && < 0.9,
410− data-default >= 0.4 && < 0.8,
411− temporary >= 1.1 && < 1.4,
412− blaze-html >= 0.9 && < 0.10,
413− blaze-markup >= 0.8 && < 0.9,
414− jira-wiki-markup >= 1.3.2 && < 1.4,
415− hslua >= 1.1 && < 1.2,
416− hslua-module-system >= 0.2 && < 0.3,
417− hslua-module-text >= 0.2.1 && < 0.3,
418− binary >= 0.5 && < 0.11,
419− SHA >= 1.6 && < 1.7,
420− haddock-library >= 1.8 && < 1.10,
421− deepseq >= 1.3 && < 1.5,
422− JuicyPixels >= 3.1.6.1 && < 3.4,
423− Glob >= 0.7 && < 0.11,
424− cmark-gfm >= 0.2 && < 0.3,
425− doctemplates >= 0.8.2 && < 0.9,
426− network-uri >= 2.6 && < 2.7,
427− network >= 2.6,
428− connection >= 0.3.1,
429− http-client >= 0.4.30 && < 0.8,
430− http-client-tls >= 0.2.4 && < 0.4,
431− http-types >= 0.8 && < 0.13,
432− case-insensitive >= 1.2 && < 1.3,
433− unicode-transforms >= 0.3 && < 0.4,
434− HsYAML >= 0.2 && < 0.3,
435− doclayout >= 0.3 && < 0.4,
436− ipynb >= 0.1 && < 0.2,
437− attoparsec >= 0.12 && < 0.14,
438− text-conversions >= 0.3 && < 0.4,
439− emojis >= 0.1 && < 0.2
440− if os(windows) && arch(i386)
441− build-depends: basement >= 0.0.10,
442− foundation >= 0.0.23
443− -- basement 0.0.9 won't build on 32-bit windows.
403+common common-options
404+ default-language: Haskell2010
405+ build-depends: base >= 4.9 && < 5
406+ ghc-options: -Wall -fno-warn-unused-do-bind
407+ -Wincomplete-record-updates
408+ -Wnoncanonical-monad-instances
409+
444410 if impl(ghc < 8.4)
445− hs-source-dirs: prelude
446− other-modules: Prelude
447− build-depends: base-compat >= 0.9
448− if os(windows)
449− cpp-options: -D_WINDOWS
450− else
451− build-depends: unix >= 2.4 && < 2.8
452− if flag(embed_data_files)
453− cpp-options: -DEMBED_DATA_FILES
454− build-depends: file-embed >= 0.0 && < 0.1
455− other-modules: Text.Pandoc.Data
411+ hs-source-dirs: prelude
412+ other-modules: Prelude
413+ build-depends: base-compat >= 0.9
414+ other-extensions: NoImplicitPrelude
415+
456416 if os(windows)
457417 cpp-options: -D_WINDOWS
458− ghc-options: -Wall -fno-warn-unused-do-bind
459− -Wincomplete-record-updates
460− -Wnoncanonical-monad-instances
418+
461419 -- Later:
462420 -- -Wpartial-fields (currently used in Powerpoint writer)
463421 -- -Wmissing-export-lists (currently some Odt modules violate this)
464422 -- -Wredundant-constraints (problematic if we want to support older base)
465423 if impl(ghc >= 8.2)
466− ghc-options: -Wcpp-undef
424+ ghc-options: -Wcpp-undef
467425 if impl(ghc >= 8.4)
468− ghc-options: -Wincomplete-uni-patterns
469− -Widentities
470− -Werror=missing-home-modules
471− -fhide-source-paths
426+ ghc-options: -Wincomplete-uni-patterns
427+ -Widentities
428+ -fhide-source-paths
472429
473− default-language: Haskell2010
474− other-extensions: NoImplicitPrelude
430+common common-executable
431+ import: common-options
432+ build-depends: pandoc
433+ ghc-options: -rtsopts -with-rtsopts=-A8m -threaded
434+
435+
436+library
437+ import: common-options
438+ build-depends: Glob >= 0.7 && < 0.11,
439+ HTTP >= 4000.0.5 && < 4000.4,
440+ HsYAML >= 0.2 && < 0.3,
441+ JuicyPixels >= 3.1.6.1 && < 3.4,
442+ SHA >= 1.6 && < 1.7,
443+ aeson >= 0.7 && < 1.6,
444+ aeson-pretty >= 0.8.5 && < 0.9,
445+ array >= 0.5 && < 0.6,
446+ attoparsec >= 0.12 && < 0.15,
447+ base64-bytestring >= 0.1 && < 1.3,
448+ binary >= 0.7 && < 0.11,
449+ blaze-html >= 0.9 && < 0.10,
450+ blaze-markup >= 0.8 && < 0.9,
451+ bytestring >= 0.9 && < 0.12,
452+ case-insensitive >= 1.2 && < 1.3,
453+ citeproc >= 0.4.0.1 && < 0.4.1,
454+ commonmark >= 0.2.1 && < 0.3,
455+ commonmark-extensions >= 0.2.1.2 && < 0.3,
456+ commonmark-pandoc >= 0.2.1.1 && < 0.3,
457+ connection >= 0.3.1,
458+ containers >= 0.4.2.1 && < 0.7,
459+ data-default >= 0.4 && < 0.8,
460+ deepseq >= 1.3 && < 1.5,
461+ directory >= 1.2.3 && < 1.4,
462+ doclayout >= 0.3.0.1 && < 0.4,
463+ doctemplates >= 0.9 && < 0.10,
464+ emojis >= 0.1 && < 0.2,
465+ exceptions >= 0.8 && < 0.11,
466+ file-embed >= 0.0 && < 0.1,
467+ filepath >= 1.1 && < 1.5,
468+ haddock-library >= 1.10 && < 1.11,
469+ hslua >= 1.1 && < 1.4,
470+ hslua-module-path >= 0.1.0 && < 0.2.0,
471+ hslua-module-system >= 0.2 && < 0.3,
472+ hslua-module-text >= 0.2.1 && < 0.4,
473+ http-client >= 0.4.30 && < 0.8,
474+ http-client-tls >= 0.2.4 && < 0.4,
475+ http-types >= 0.8 && < 0.13,
476+ ipynb >= 0.1 && < 0.2,
477+ jira-wiki-markup >= 1.4 && < 1.5,
478+ mtl >= 2.2 && < 2.3,
479+ network >= 2.6,
480+ network-uri >= 2.6 && < 2.8,
481+ pandoc-types >= 1.22 && < 1.23,
482+ parsec >= 3.1 && < 3.2,
483+ process >= 1.2.3 && < 1.7,
484+ random >= 1 && < 1.3,
485+ safe >= 0.3.18 && < 0.4,
486+ scientific >= 0.3 && < 0.4,
487+ skylighting >= 0.10.5.2 && < 0.10.6,
488+ skylighting-core >= 0.10.5.2 && < 0.10.6,
489+ split >= 0.2 && < 0.3,
490+ syb >= 0.1 && < 0.8,
491+ tagsoup >= 0.14.6 && < 0.15,
492+ temporary >= 1.1 && < 1.4,
493+ texmath >= 0.12.3 && < 0.12.4,
494+ text >= 1.1.1.0 && < 1.3,
495+ text-conversions >= 0.3 && < 0.4,
496+ time >= 1.5 && < 1.12,
497+ unicode-transforms >= 0.3 && < 0.4,
498+ unordered-containers >= 0.2 && < 0.3,
499+ xml >= 1.3.12 && < 1.4,
500+ xml-conduit >= 1.9.1.1 && < 1.10,
501+ unicode-collation >= 0.1.1 && < 0.2,
502+ zip-archive >= 0.2.3.4 && < 0.5,
503+ zlib >= 0.5 && < 0.7
504+ if os(windows) && arch(i386)
505+ build-depends: basement >= 0.0.10,
506+ foundation >= 0.0.23
507+ -- basement 0.0.9 won't build on 32-bit windows.
508+ if !os(windows)
509+ build-depends: unix >= 2.4 && < 2.8
510+ if flag(embed_data_files)
511+ cpp-options: -DEMBED_DATA_FILES
512+ other-modules: Text.Pandoc.Data
475513 hs-source-dirs: src
476514
477515 exposed-modules: Text.Pandoc,
@@ -479,16 +517,18 @@ library
479517 Text.Pandoc.Options,
480518 Text.Pandoc.Extensions,
481519 Text.Pandoc.Shared,
520+ Text.Pandoc.Sources,
482521 Text.Pandoc.MediaBag,
483522 Text.Pandoc.Error,
484523 Text.Pandoc.Filter,
485524 Text.Pandoc.Readers,
486525 Text.Pandoc.Readers.HTML,
487526 Text.Pandoc.Readers.LaTeX,
488− Text.Pandoc.Readers.LaTeX.Types,
489527 Text.Pandoc.Readers.Markdown,
490528 Text.Pandoc.Readers.CommonMark,
491529 Text.Pandoc.Readers.Creole,
530+ Text.Pandoc.Readers.BibTeX,
531+ Text.Pandoc.Readers.CslJson,
492532 Text.Pandoc.Readers.MediaWiki,
493533 Text.Pandoc.Readers.Vimwiki,
494534 Text.Pandoc.Readers.RST,
@@ -547,9 +587,12 @@ library
547587 Text.Pandoc.Writers.FB2,
548588 Text.Pandoc.Writers.TEI,
549589 Text.Pandoc.Writers.Muse,
590+ Text.Pandoc.Writers.CslJson,
550591 Text.Pandoc.Writers.Math,
551592 Text.Pandoc.Writers.Shared,
552593 Text.Pandoc.Writers.OOXML,
594+ Text.Pandoc.Writers.AnnotatedTable,
595+ Text.Pandoc.Writers.BibTeX,
553596 Text.Pandoc.Lua,
554597 Text.Pandoc.PDF,
555598 Text.Pandoc.UTF8,
@@ -564,8 +607,8 @@ library
564607 Text.Pandoc.Asciify,
565608 Text.Pandoc.Emoji,
566609 Text.Pandoc.ImageSize,
567− Text.Pandoc.BCP47,
568− Text.Pandoc.Class
610+ Text.Pandoc.Class,
611+ Text.Pandoc.Citeproc
569612 other-modules: Text.Pandoc.App.CommandLineOptions,
570613 Text.Pandoc.App.FormatHeuristics,
571614 Text.Pandoc.App.Opt,
@@ -584,8 +627,19 @@ library
584627 Text.Pandoc.Readers.Docx.Parse.Styles,
585628 Text.Pandoc.Readers.Docx.Util,
586629 Text.Pandoc.Readers.Docx.Fields,
587− Text.Pandoc.Readers.LaTeX.Parsing,
630+ Text.Pandoc.Readers.HTML.Parsing,
631+ Text.Pandoc.Readers.HTML.Table,
632+ Text.Pandoc.Readers.HTML.TagCategories,
633+ Text.Pandoc.Readers.HTML.Types,
634+ Text.Pandoc.Readers.LaTeX.Inline,
635+ Text.Pandoc.Readers.LaTeX.Citation,
588636 Text.Pandoc.Readers.LaTeX.Lang,
637+ Text.Pandoc.Readers.LaTeX.Macro,
638+ Text.Pandoc.Readers.LaTeX.Math,
639+ Text.Pandoc.Readers.LaTeX.Parsing,
640+ Text.Pandoc.Readers.LaTeX.SIunitx,
641+ Text.Pandoc.Readers.LaTeX.Table,
642+ Text.Pandoc.Readers.LaTeX.Types,
589643 Text.Pandoc.Readers.Odt.Base,
590644 Text.Pandoc.Readers.Odt.Namespaces,
591645 Text.Pandoc.Readers.Odt.StyleReader,
@@ -609,6 +663,21 @@ library
609663 Text.Pandoc.Readers.Metadata,
610664 Text.Pandoc.Readers.Roff,
611665 Text.Pandoc.Writers.Docx.StyleMap,
666+ Text.Pandoc.Writers.Docx.Table,
667+ Text.Pandoc.Writers.Docx.Types,
668+ Text.Pandoc.Writers.GridTable
669+ Text.Pandoc.Writers.JATS.References,
670+ Text.Pandoc.Writers.JATS.Table,
671+ Text.Pandoc.Writers.JATS.Types,
672+ Text.Pandoc.Writers.LaTeX.Caption,
673+ Text.Pandoc.Writers.LaTeX.Notes,
674+ Text.Pandoc.Writers.LaTeX.Table,
675+ Text.Pandoc.Writers.LaTeX.Lang,
676+ Text.Pandoc.Writers.LaTeX.Types,
677+ Text.Pandoc.Writers.LaTeX.Citation,
678+ Text.Pandoc.Writers.LaTeX.Util,
679+ Text.Pandoc.Writers.Markdown.Types,
680+ Text.Pandoc.Writers.Markdown.Inline,
612681 Text.Pandoc.Writers.Roff,
613682 Text.Pandoc.Writers.Powerpoint.Presentation,
614683 Text.Pandoc.Writers.Powerpoint.Output,
@@ -625,6 +694,7 @@ library
625694 Text.Pandoc.Lua.Marshaling.MediaBag,
626695 Text.Pandoc.Lua.Marshaling.PandocError,
627696 Text.Pandoc.Lua.Marshaling.ReaderOptions,
697+ Text.Pandoc.Lua.Marshaling.SimpleTable,
628698 Text.Pandoc.Lua.Marshaling.Version,
629699 Text.Pandoc.Lua.Module.MediaBag,
630700 Text.Pandoc.Lua.Module.Pandoc,
@@ -635,6 +705,10 @@ library
635705 Text.Pandoc.Lua.PandocLua,
636706 Text.Pandoc.Lua.Util,
637707 Text.Pandoc.Lua.Walk,
708+ Text.Pandoc.XML.Light,
709+ Text.Pandoc.XML.Light.Types,
710+ Text.Pandoc.XML.Light.Proc,
711+ Text.Pandoc.XML.Light.Output,
638712 Text.Pandoc.CSS,
639713 Text.Pandoc.CSV,
640714 Text.Pandoc.RoffChar,
@@ -642,127 +716,61 @@ library
642716 Text.Pandoc.Translations,
643717 Text.Pandoc.Slides,
644718 Text.Pandoc.Image,
719+ Text.Pandoc.Citeproc.BibTeX,
720+ Text.Pandoc.Citeproc.CslJson,
721+ Text.Pandoc.Citeproc.Data,
722+ Text.Pandoc.Citeproc.Locator,
723+ Text.Pandoc.Citeproc.MetaValue,
724+ Text.Pandoc.Citeproc.Util,
645725 Paths_pandoc
646726 autogen-modules: Paths_pandoc
647727 buildable: True
648728
649729executable pandoc
650− build-depends: pandoc, base >= 4.8 && < 5
651− if impl(ghc < 8.4)
652− hs-source-dirs: prelude
653− other-modules: Prelude
654− build-depends: base-compat >= 0.9
655− if flag(static)
656− ld-options: -static
657− default-language: Haskell2010
658− other-extensions: NoImplicitPrelude
659− hs-source-dirs: .
730+ import: common-executable
731+ hs-source-dirs: app
660732 main-is: pandoc.hs
661733 buildable: True
662734 other-modules: Paths_pandoc
663− ghc-options: -rtsopts -with-rtsopts=-K16m -threaded
664− -Wall -fno-warn-unused-do-bind
665− -Wincomplete-record-updates
666− -Wnoncanonical-monad-instances
667− if impl(ghc >= 8.2)
668− ghc-options: -Wcpp-undef
669− if impl(ghc >= 8.4)
670− ghc-options: -Wincomplete-uni-patterns
671− -Widentities
672− -Werror=missing-home-modules
673− -fhide-source-paths
674735
675736executable trypandoc
737+ import: common-executable
676738 main-is: trypandoc.hs
677739 hs-source-dirs: trypandoc
678− default-language: Haskell2010
679− other-extensions: NoImplicitPrelude
680740 if flag(trypandoc)
681− build-depends: base, aeson, pandoc,
682− text, wai-extra, wai >= 0.3, http-types
741+ build-depends: aeson, http-types, text, wai >= 0.3, wai-extra >= 3.0.24
683742 buildable: True
684743 else
685744 buildable: False
686− if impl(ghc < 8.4)
687− hs-source-dirs: prelude
688− other-modules: Prelude
689− build-depends: base-compat >= 0.9
690− ghc-options: -rtsopts -with-rtsopts=-K16m -threaded
691− -Wall -fno-warn-unused-do-bind
692− -Wincomplete-record-updates
693− -Wnoncanonical-monad-instances
694− if impl(ghc >= 8.2)
695− ghc-options: -Wcpp-undef
696− if impl(ghc >= 8.4)
697− ghc-options: -Wincomplete-uni-patterns
698− -Widentities
699− -Werror=missing-home-modules
700− -fhide-source-paths
701−
702−benchmark weigh-pandoc
703− type: exitcode-stdio-1.0
704− main-is: weigh-pandoc.hs
705− hs-source-dirs: benchmark
706− build-depends: pandoc,
707− base >= 4.8 && < 5,
708− text,
709− weigh >= 0.0 && < 0.1,
710− mtl >= 2.2 && < 2.3
711− if impl(ghc < 8.4)
712− hs-source-dirs: prelude
713− other-modules: Prelude
714− build-depends: base-compat >= 0.9
715− default-language: Haskell2010
716− other-extensions: NoImplicitPrelude
717− ghc-options: -rtsopts -with-rtsopts=-K16m -threaded
718− -Wall -fno-warn-unused-do-bind
719− -Wincomplete-record-updates
720− -Wnoncanonical-monad-instances
721− if impl(ghc >= 8.2)
722− ghc-options: -Wcpp-undef
723− if impl(ghc >= 8.4)
724− ghc-options: -Wincomplete-uni-patterns
725− -Widentities
726− -Werror=missing-home-modules
727− -fhide-source-paths
728−
729745
730746test-suite test-pandoc
747+ import: common-executable
731748 type: exitcode-stdio-1.0
732749 main-is: test-pandoc.hs
733750 hs-source-dirs: test
734− build-depends: base >= 4.8 && < 5,
735− pandoc,
736− pandoc-types >= 1.21 && < 1.22,
737− mtl >= 2.2 && < 2.3,
738− bytestring >= 0.9 && < 0.11,
739− base64-bytestring >= 0.1 && < 1.2,
740− exceptions >= 0.8 && < 0.11,
741− text >= 1.1.1.0 && < 1.3,
742− time >= 1.5 && < 1.10,
743− directory >= 1.2.3 && < 1.4,
744− exceptions >= 0.8 && < 0.11,
745− filepath >= 1.1 && < 1.5,
746− hslua >= 1.1 && < 1.2,
747− process >= 1.2.3 && < 1.7,
748− temporary >= 1.1 && < 1.4,
749− Diff >= 0.2 && < 0.5,
750− tasty >= 0.11 && < 1.4,
751− tasty-hunit >= 0.9 && < 0.11,
752− tasty-lua >= 0.2 && < 0.3,
753− tasty-quickcheck >= 0.8 && < 0.11,
754− tasty-golden >= 2.3 && < 2.4,
755− QuickCheck >= 2.4 && < 2.15,
756− containers >= 0.4.2.1 && < 0.7,
757− executable-path >= 0.0 && < 0.1,
758− zip-archive >= 0.2.3.4 && < 0.5,
759− xml >= 1.3.12 && < 1.4,
760− doctemplates >= 0.8.2 && < 0.9,
761− Glob >= 0.7 && < 0.11
762− if impl(ghc < 8.4)
763− hs-source-dirs: prelude
764− other-modules: Prelude
765− build-depends: base-compat >= 0.9
751+ build-depends: pandoc,
752+ Diff >= 0.2 && < 0.5,
753+ Glob >= 0.7 && < 0.11,
754+ QuickCheck >= 2.4 && < 2.15,
755+ bytestring >= 0.9 && < 0.12,
756+ containers >= 0.4.2.1 && < 0.7,
757+ directory >= 1.2.3 && < 1.4,
758+ doctemplates >= 0.9 && < 0.10,
759+ exceptions >= 0.8 && < 0.11,
760+ filepath >= 1.1 && < 1.5,
761+ hslua >= 1.1 && < 1.4,
762+ mtl >= 2.2 && < 2.3,
763+ pandoc-types >= 1.22 && < 1.23,
764+ process >= 1.2.3 && < 1.7,
765+ tasty >= 0.11 && < 1.5,
766+ tasty-golden >= 2.3 && < 2.4,
767+ tasty-hunit >= 0.9 && < 0.11,
768+ tasty-lua >= 0.2 && < 0.3,
769+ tasty-quickcheck >= 0.8 && < 0.11,
770+ text >= 1.1.1.0 && < 1.3,
771+ time >= 1.5 && < 1.12,
772+ xml >= 1.3.12 && < 1.4,
773+ zip-archive >= 0.2.3.4 && < 0.5
766774 other-modules: Tests.Old
767775 Tests.Command
768776 Tests.Helpers
@@ -816,47 +824,21 @@ test-suite test-pandoc
816824 Tests.Writers.FB2
817825 Tests.Writers.Powerpoint
818826 Tests.Writers.OOXML
819− if os(windows)
820− cpp-options: -D_WINDOWS
821− default-language: Haskell2010
822− other-extensions: NoImplicitPrelude
823− ghc-options: -rtsopts -with-rtsopts=-K16m -threaded
824− -Wall -fno-warn-unused-do-bind
825− -Wincomplete-record-updates
826− -Wnoncanonical-monad-instances
827− if impl(ghc >= 8.2)
828− ghc-options: -Wcpp-undef
829− if impl(ghc >= 8.4)
830− ghc-options: -Wincomplete-uni-patterns
831− -Widentities
832− -Werror=missing-home-modules
833− -fhide-source-paths
834−
827+ Tests.Writers.Ms
828+ Tests.Writers.AnnotatedTable
835829
836830benchmark benchmark-pandoc
831+ import: common-executable
837832 type: exitcode-stdio-1.0
838833 main-is: benchmark-pandoc.hs
839834 hs-source-dirs: benchmark
840− build-depends: pandoc,
841− time, bytestring, containers,
842− base >= 4.8 && < 5,
843− text >= 1.1.1.0 && < 1.3,
844− mtl >= 2.2 && < 2.3,
845− criterion >= 1.0 && < 1.6
846− if impl(ghc < 8.4)
847− hs-source-dirs: prelude
848− other-modules: Prelude
849− build-depends: base-compat >= 0.9
850− default-language: Haskell2010
851− other-extensions: NoImplicitPrelude
852− ghc-options: -rtsopts -with-rtsopts=-K16m -threaded
853− -Wall -fno-warn-unused-do-bind
854− -Wincomplete-record-updates
855− -Wnoncanonical-monad-instances
856− if impl(ghc >= 8.2)
857− ghc-options: -Wcpp-undef
858− if impl(ghc >= 8.4)
859− ghc-options: -Wincomplete-uni-patterns
860− -Widentities
861− -Werror=missing-home-modules
862− -fhide-source-paths
835+ build-depends: bytestring,
836+ containers,
837+ -- gauge >= 0.2 && < 0.3,
838+ tasty-bench >= 0.2 && <= 0.3,
839+ mtl >= 2.2 && < 2.3,
840+ text >= 1.1.1.0 && < 1.3,
841+ time,
842+ deepseq
843+ -- we increase heap size to avoid benchmarking garbage collection:
844+ ghc-options: -rtsopts -with-rtsopts=-A8m -threaded
release.nixnew file+4
@@ -0,0 +1,4 @@
1+let
2+ pkgs = import <nixpkgs> { };
3+in
4+ pkgs.haskellPackages.callPackage ./project.nix { }
shell.nixnew file+106
@@ -0,0 +1,106 @@
1+{nixpkgs ? import <nixpkgs> {} }:
2+let
3+ inherit (nixpkgs) pkgs;
4+ inherit (pkgs) haskellPackages;
5+
6+ haskellDeps = ps: with ps; [
7+ Diff
8+ Glob
9+ HTTP
10+ HTTP
11+ HsYAML
12+ JuicyPixels
13+ QuickCheck
14+ SHA
15+ aeson
16+ aeson-pretty
17+ attoparsec
18+ base
19+ base-compat
20+ base64-bytestring
21+ binary
22+ blaze-html
23+ blaze-markup
24+ bytestring
25+ case-insensitive
26+ citeproc
27+ commonmark
28+ commonmark-extensions
29+ commonmark-pandoc
30+ conduit-extra
31+ connection
32+ connection
33+ containers
34+ data-default
35+ deepseq
36+ directory
37+ doclayout
38+ doctemplates
39+ emojis
40+ exceptions
41+ file-embed
42+ filepath
43+ haddock-library
44+ hsc2hs
45+ hslua
46+ hslua-module-system
47+ hslua-module-text
48+ http-client
49+ http-client
50+ http-client-tls
51+ http-client-tls
52+ http-types
53+ ipynb
54+ jira-wiki-markup
55+ mtl
56+ network
57+ network
58+ network-uri
59+ pandoc-types
60+ parsec
61+ process
62+ random
63+ safe
64+ scientific
65+ skylighting
66+ skylighting-core
67+ socks
68+ split
69+ streaming-commons
70+ syb
71+ tagsoup
72+ tasty
73+ tasty-golden
74+ tasty-hunit
75+ tasty-lua
76+ tasty-quickcheck
77+ temporary
78+ texmath
79+ text
80+ text-conversions
81+ time
82+ tls
83+ unicode-transforms
84+ unordered-containers
85+ weigh
86+ xml
87+ xml-conduit
88+ zip-archive
89+ zlib
90+ ];
91+
92+ ghc = haskellPackages.ghcWithPackages haskellDeps;
93+
94+ nixPackages = [
95+ pkgs.zlib
96+ ghc
97+ pkgs.gdb
98+ haskellPackages.ghcid
99+ haskellPackages.cabal2nix
100+ haskellPackages.cabal-install
101+ ];
102+in
103+pkgs.stdenv.mkDerivation {
104+ name = "env";
105+ buildInputs = nixPackages;
106+}
src/Text/Pandoc.hs+1−1
@@ -3,7 +3,7 @@
33{-# LANGUAGE ScopedTypeVariables #-}
44{- |
55 Module : Text.Pandoc
6− Copyright : Copyright (C) 2006-2020 John MacFarlane
6+ Copyright : Copyright (C) 2006-2021 John MacFarlane
77 License : GNU GPL, version 2 or above
88
99 Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/App.hs+98−66
@@ -1,9 +1,10 @@
1+{-# LANGUAGE LambdaCase #-}
12{-# LANGUAGE OverloadedStrings #-}
23{-# LANGUAGE CPP #-}
34{-# LANGUAGE ScopedTypeVariables #-}
45{- |
56 Module : Text.Pandoc.App
6− Copyright : Copyright (C) 2006-2020 John MacFarlane
7+ Copyright : Copyright (C) 2006-2021 John MacFarlane
78 License : GNU GPL, version 2 or above
89
910 Maintainer : John MacFarlane <jgm@berkeley@edu>
@@ -19,14 +20,16 @@ module Text.Pandoc.App (
1920 , Filter(..)
2021 , defaultOpts
2122 , parseOptions
23+ , parseOptionsFromArgs
2224 , options
2325 , applyFilters
2426 ) where
2527import qualified Control.Exception as E
26−import Control.Monad
27−import Control.Monad.Trans
28+import Control.Monad ( (>=>), when )
29+import Control.Monad.Trans ( MonadIO(..) )
2830import Control.Monad.Except (throwError)
2931import qualified Data.ByteString as BS
32+import qualified Data.ByteString.Char8 as B8
3033import qualified Data.ByteString.Lazy as BL
3134import Data.Char (toLower)
3235import Data.Maybe (fromMaybe, isJust, isNothing)
@@ -40,23 +43,25 @@ import qualified Data.Text.Encoding.Error as TSE
4043import Network.URI (URI (..), parseURI)
4144import System.Directory (doesDirectoryExist)
4245import System.Exit (exitSuccess)
43−import System.FilePath
46+import System.FilePath ( takeBaseName, takeExtension )
4447import System.IO (nativeNewline, stdout)
4548import qualified System.IO as IO (Newline (..))
4649import Text.Pandoc
50+import Text.Pandoc.Builder (setMeta)
51+import Text.Pandoc.MIME (getCharset)
4752import Text.Pandoc.App.FormatHeuristics (formatFromFilePaths)
4853import Text.Pandoc.App.Opt (Opt (..), LineEnding (..), defaultOpts,
49− IpynbOutput (..) )
50−import Text.Pandoc.App.CommandLineOptions (parseOptions, options)
54+ IpynbOutput (..))
55+import Text.Pandoc.App.CommandLineOptions (parseOptions, parseOptionsFromArgs,
56+ options)
5157import Text.Pandoc.App.OutputSettings (OutputSettings (..), optToOutputSettings)
52−import Text.Pandoc.BCP47 (Lang (..), parseBCP47)
53−import Text.Pandoc.Builder (setMeta)
58+import Text.Collate.Lang (Lang (..), parseLang)
5459import Text.Pandoc.Filter (Filter (JSONFilter, LuaFilter), applyFilters)
5560import Text.Pandoc.PDF (makePDF)
56−import Text.Pandoc.SelfContained (makeDataURI, makeSelfContained)
61+import Text.Pandoc.SelfContained (makeSelfContained)
5762import Text.Pandoc.Shared (eastAsianLineBreakFilter, stripEmptyParagraphs,
5863 headerShift, isURI, tabFilter, uriPathToPath, filterIpynbOutput,
59− defaultUserDataDirs, tshow, findM)
64+ defaultUserDataDir, tshow)
6065import Text.Pandoc.Writers.Shared (lookupMetaString)
6166import Text.Pandoc.Readers.Markdown (yamlToMeta)
6267import qualified Text.Pandoc.UTF8 as UTF8
@@ -67,34 +72,29 @@ import System.Posix.Terminal (queryTerminal)
6772
6873convertWithOpts :: Opt -> IO ()
6974convertWithOpts opts = do
75+ datadir <- case optDataDir opts of
76+ Nothing -> do
77+ d <- defaultUserDataDir
78+ exists <- doesDirectoryExist d
79+ return $ if exists
80+ then Just d
81+ else Nothing
82+ Just _ -> return $ optDataDir opts
83+
7084 let outputFile = fromMaybe "-" (optOutputFile opts)
7185 let filters = optFilters opts
7286 let verbosity = optVerbosity opts
7387
7488 when (optDumpArgs opts) $
75− do UTF8.hPutStrLn stdout outputFile
76− mapM_ (UTF8.hPutStrLn stdout) (fromMaybe ["-"] $ optInputFiles opts)
89+ do UTF8.hPutStrLn stdout (T.pack outputFile)
90+ mapM_ (UTF8.hPutStrLn stdout . T.pack)
91+ (fromMaybe ["-"] $ optInputFiles opts)
7792 exitSuccess
7893
79− let isPandocCiteproc (JSONFilter f) = takeBaseName f == "pandoc-citeproc"
80− isPandocCiteproc _ = False
81− -- --bibliography implies -F pandoc-citeproc for backwards compatibility:
82− let needsCiteproc = isJust (lookupMeta "bibliography"
83− (optMetadata opts)) &&
84− optCiteMethod opts `notElem` [Natbib, Biblatex] &&
85− not (any isPandocCiteproc filters)
86− let filters' = filters ++ [ JSONFilter "pandoc-citeproc" | needsCiteproc ]
87−
8894 let sources = case optInputFiles opts of
8995 Just xs | not (optIgnoreArgs opts) -> xs
9096 _ -> ["-"]
9197
92− datadir <- case optDataDir opts of
93− Nothing -> do
94− ds <- defaultUserDataDirs
95− findM doesDirectoryExist ds
96− Just _ -> return $ optDataDir opts
97−
9898 let runIO' :: PandocIO a -> IO a
9999 runIO' f = do
100100 (res, reports) <- runIOorExplode $ do
@@ -140,9 +140,10 @@ convertWithOpts opts = do
140140 (map (T.pack . takeExtension) sources) "markdown"
141141 return "markdown"
142142
143+ let readerNameBase = T.takeWhile (\c -> c /= '+' && c /= '-') readerName
143144 let pdfOutput = map toLower (takeExtension outputFile) == ".pdf"
144145
145− when (pdfOutput && readerName == "latex") $
146+ when (pdfOutput && readerNameBase == "latex") $
146147 case optInputFiles opts of
147148 Just (inputFile:_) -> report $ UnusualConversion $ T.pack $
148149 "to convert a .tex file to PDF, you get better results by using pdflatex "
@@ -153,24 +154,34 @@ convertWithOpts opts = do
153154 (reader :: Reader PandocIO, readerExts) <- getReader readerName
154155
155156 let convertTabs = tabFilter (if optPreserveTabs opts ||
156− readerName == "t2t" ||
157− readerName == "man"
157+ readerNameBase == "t2t" ||
158+ readerNameBase == "man"
158159 then 0
159160 else optTabStop opts)
160161
161162
162− let readSources :: [FilePath] -> PandocIO Text
163− readSources srcs = convertTabs . T.intercalate (T.pack "\n") <$>
164− mapM readSource srcs
163+ let readSources :: [FilePath] -> PandocIO [(FilePath, Text)]
164+ readSources srcs =
165+ mapM (\fp -> do
166+ t <- readSource fp
167+ return (if fp == "-" then "" else fp, convertTabs t)) srcs
165168
166169
167170 outputSettings <- optToOutputSettings opts
168171 let format = outputFormat outputSettings
169172 let writer = outputWriter outputSettings
170173 let writerName = outputWriterName outputSettings
174+ let writerNameBase = T.takeWhile (\c -> c /= '+' && c /= '-') writerName
171175 let writerOptions = outputWriterOptions outputSettings
172176
173− let standalone = optStandalone opts || not (isTextFormat format) || pdfOutput
177+ let bibOutput = writerNameBase == "bibtex" ||
178+ writerNameBase == "biblatex" ||
179+ writerNameBase == "csljson"
180+
181+ let standalone = optStandalone opts ||
182+ not (isTextFormat format) ||
183+ pdfOutput ||
184+ bibOutput
174185
175186 -- We don't want to send output to the terminal if the user
176187 -- does 'pandoc -t docx input.txt'; though we allow them to
@@ -190,20 +201,9 @@ convertWithOpts opts = do
190201 Nothing -> readDataFile "abbreviations"
191202 Just f -> readFileStrict f
192203
193− metadata <- if format == "jats" &&
194− isNothing (lookupMeta "csl" (optMetadata opts)) &&
195− isNothing (lookupMeta "citation-style"
196− (optMetadata opts))
197− then do
198− jatsCSL <- readDataFile "jats.csl"
199− let jatsEncoded = makeDataURI
200− ("application/xml", jatsCSL)
201− return $ setMeta "csl" jatsEncoded $ optMetadata opts
202− else return $ optMetadata opts
203−
204204 case lookupMetaString "lang" (optMetadata opts) of
205− "" -> setTranslations $ Lang "en" "" "US" []
206− l -> case parseBCP47 l of
205+ "" -> setTranslations $ Lang "en" Nothing (Just "US") [] [] []
206+ l -> case parseLang l of
207207 Left _ -> report $ InvalidLang l
208208 Right l' -> setTranslations l'
209209
@@ -223,8 +223,9 @@ convertWithOpts opts = do
223223 metadataFromFile <-
224224 case optMetadataFiles opts of
225225 [] -> return mempty
226− paths -> mapM readFileLazy paths >>=
227− fmap mconcat . mapM (yamlToMeta readerOpts)
226+ paths -> mconcat <$>
227+ mapM (\path -> do raw <- readFileLazy path
228+ yamlToMeta readerOpts (Just path) raw) paths
228229
229230 let transforms = (case optShiftHeadingLevelBy opts of
230231 0 -> id
@@ -240,6 +241,7 @@ convertWithOpts opts = do
240241 then (eastAsianLineBreakFilter :)
241242 else id) .
242243 (case optIpynbOutput opts of
244+ _ | readerNameBase /= "ipynb" -> id
243245 IpynbOutputAll -> id
244246 IpynbOutputNone -> (filterIpynbOutput Nothing :)
245247 IpynbOutputBest -> (filterIpynbOutput (Just $
@@ -255,31 +257,51 @@ convertWithOpts opts = do
255257 let sourceToDoc :: [FilePath] -> PandocIO Pandoc
256258 sourceToDoc sources' =
257259 case reader of
258− TextReader r
259− | optFileScope opts || readerName == "json" ->
260− mconcat <$> mapM (readSource >=> r readerOpts) sources'
261− | otherwise ->
262− readSources sources' >>= r readerOpts
263− ByteStringReader r ->
264− mconcat <$> mapM (readFile' >=> r readerOpts) sources'
265−
266−
267− when (readerName == "markdown_github" ||
268− writerName == "markdown_github") $
260+ TextReader r
261+ | readerNameBase == "json" ->
262+ mconcat <$> mapM (readSource >=> r readerOpts) sources'
263+ | optFileScope opts ->
264+ -- Read source and convert tabs (see #6709)
265+ let readSource' = fmap convertTabs . readSource
266+ in mconcat <$> mapM (readSource' >=> r readerOpts) sources'
267+ | otherwise ->
268+ readSources sources' >>= r readerOpts
269+ ByteStringReader r ->
270+ mconcat <$> mapM (readFile' >=> r readerOpts) sources'
271+
272+
273+ when (readerNameBase == "markdown_github" ||
274+ writerNameBase == "markdown_github") $
269275 report $ Deprecated "markdown_github" "Use gfm instead."
270276
271277 mapM_ (uncurry setRequestHeader) (optRequestHeaders opts)
272278
273279 setNoCheckCertificate (optNoCheckCertificate opts)
274280
281+ let isPandocCiteproc (JSONFilter f) = takeBaseName f == "pandoc-citeproc"
282+ isPandocCiteproc _ = False
283+
284+ when (any isPandocCiteproc filters) $
285+ report $ Deprecated "pandoc-citeproc filter"
286+ "Use --citeproc instead."
287+
288+ let cslMetadata =
289+ maybe id (setMeta "csl") (optCSL opts) .
290+ (case optBibliography opts of
291+ [] -> id
292+ xs -> setMeta "bibliography" xs) .
293+ maybe id (setMeta "citation-abbreviations")
294+ (optCitationAbbreviations opts) $ mempty
295+
275296 doc <- sourceToDoc sources >>=
276297 ( (if isJust (optExtractMedia opts)
277298 then fillMediaBag
278299 else return)
279300 >=> return . adjustMetadata (metadataFromFile <>)
280− >=> return . adjustMetadata (<> metadata)
301+ >=> return . adjustMetadata (<> optMetadata opts)
302+ >=> return . adjustMetadata (<> cslMetadata)
281303 >=> applyTransforms transforms
282− >=> applyFilters readerOpts filters' [T.unpack format]
304+ >=> applyFilters readerOpts filters [T.unpack format]
283305 >=> maybe return extractMedia (optExtractMedia opts)
284306 )
285307
@@ -344,7 +366,18 @@ readSource src = case parseURI src of
344366 _ -> PandocAppError (tshow e))
345367
346368readURI :: FilePath -> PandocIO Text
347−readURI src = UTF8.toText . fst <$> openURL (T.pack src)
369+readURI src = do
370+ (bs, mt) <- openURL (T.pack src)
371+ case mt >>= getCharset of
372+ Just "UTF-8" -> return $ UTF8.toText bs
373+ Just "ISO-8859-1" -> return $ T.pack $ B8.unpack bs
374+ Just charset -> throwError $ PandocUnsupportedCharsetError charset
375+ Nothing -> liftIO $ -- try first as UTF-8, then as latin1
376+ E.catch (return $! UTF8.toText bs)
377+ (\case
378+ TSE.DecodeError{} ->
379+ return $ T.pack $ B8.unpack bs
380+ e -> E.throwIO e)
348381
349382readFile' :: MonadIO m => FilePath -> m BL.ByteString
350383readFile' "-" = liftIO BL.getContents
@@ -355,6 +388,5 @@ writeFnBinary "-" = liftIO . BL.putStr
355388writeFnBinary f = liftIO . BL.writeFile (UTF8.encodePath f)
356389
357390writerFn :: MonadIO m => IO.Newline -> FilePath -> Text -> m ()
358−-- TODO this implementation isn't maximally efficient:
359−writerFn eol "-" = liftIO . UTF8.putStrWith eol . T.unpack
360−writerFn eol f = liftIO . UTF8.writeFileWith eol f . T.unpack
391+writerFn eol "-" = liftIO . UTF8.putStrWith eol
392+writerFn eol f = liftIO . UTF8.writeFileWith eol f
src/Text/Pandoc/App/CommandLineOptions.hs+123−77
@@ -1,11 +1,12 @@
11{-# LANGUAGE CPP #-}
2+{-# LANGUAGE LambdaCase #-}
23{-# LANGUAGE ScopedTypeVariables #-}
34{-# LANGUAGE TupleSections #-}
45{-# LANGUAGE OverloadedStrings #-}
56{-# LANGUAGE FlexibleContexts #-}
67{- |
78 Module : Text.Pandoc.App.CommandLineOptions
8− Copyright : Copyright (C) 2006-2020 John MacFarlane
9+ Copyright : Copyright (C) 2006-2021 John MacFarlane
910 License : GNU GPL, version 2 or above
1011
1112 Maintainer : John MacFarlane <jgm@berkeley@edu>
@@ -16,6 +17,7 @@ Does a pandoc conversion based on command-line options.
1617-}
1718module Text.Pandoc.App.CommandLineOptions (
1819 parseOptions
20+ , parseOptionsFromArgs
1921 , options
2022 , engines
2123 , lookupHighlightStyle
@@ -24,11 +26,12 @@ module Text.Pandoc.App.CommandLineOptions (
2426import Control.Monad
2527import Control.Monad.Trans
2628import Control.Monad.Except (throwError)
29+import Control.Monad.State.Strict
2730import Data.Aeson.Encode.Pretty (encodePretty', Config(..), keyOrder,
2831 defConfig, Indent(..), NumberFormat(..))
2932import Data.Bifunctor (second)
3033import Data.Char (toLower)
31−import Data.List (intercalate, sort)
34+import Data.List (intercalate, sort, foldl')
3235#ifdef _WINDOWS
3336#if MIN_VERSION_base(4,12,0)
3437import Data.List (isPrefixOf)
@@ -45,10 +48,13 @@ import System.FilePath
4548import System.IO (stdout)
4649import Text.DocTemplates (Context (..), ToContext (toVal), Val (..))
4750import Text.Pandoc
48−import Text.Pandoc.App.Opt (Opt (..), LineEnding (..), IpynbOutput (..), addMeta)
51+import Text.Pandoc.Builder (setMeta)
52+import Text.Pandoc.App.Opt (Opt (..), LineEnding (..), IpynbOutput (..),
53+ DefaultsState (..), applyDefaults,
54+ fullDefaultsPath)
4955import Text.Pandoc.Filter (Filter (..))
5056import Text.Pandoc.Highlighting (highlightingStyles)
51−import Text.Pandoc.Shared (ordNub, elemText, safeStrRead, defaultUserDataDirs, findM)
57+import Text.Pandoc.Shared (ordNub, elemText, safeStrRead, defaultUserDataDir)
5258import Text.Printf
5359
5460#ifdef EMBED_DATA_FILES
@@ -63,16 +69,19 @@ import qualified Data.ByteString as BS
6369import qualified Data.ByteString.Lazy as B
6470import qualified Data.Map as M
6571import qualified Data.Text as T
66−import qualified Data.YAML as Y
6772import qualified Text.Pandoc.UTF8 as UTF8
6873
6974parseOptions :: [OptDescr (Opt -> IO Opt)] -> Opt -> IO Opt
7075parseOptions options' defaults = do
7176 rawArgs <- map UTF8.decodeArg <$> getArgs
7277 prg <- getProgName
78+ parseOptionsFromArgs options' defaults prg rawArgs
7379
80+parseOptionsFromArgs
81+ :: [OptDescr (Opt -> IO Opt)] -> Opt -> String -> [String] -> IO Opt
82+parseOptionsFromArgs options' defaults prg rawArgs = do
7483 let (actions, args, unrecognizedOpts, errors) =
75− getOpt' Permute options' rawArgs
84+ getOpt' Permute options' (map UTF8.decodeArg rawArgs)
7685
7786 let unknownOptionErrors =
7887 foldr (handleUnrecognizedOption . takeWhile (/= '=')) []
@@ -84,7 +93,7 @@ parseOptions options' defaults = do
8493 ("Try " ++ prg ++ " --help for more information.")
8594
8695 -- thread option data structure through all supplied option actions
87− opts <- foldl (>>=) (return defaults) actions
96+ opts <- foldl' (>>=) (return defaults) actions
8897 let mbArgs = case args of
8998 [] -> Nothing
9099 xs -> Just xs
@@ -165,7 +174,11 @@ options =
165174
166175 , Option "d" ["defaults"]
167176 (ReqArg
168− (\arg opt -> applyDefaults opt arg
177+ (\arg opt -> runIOorExplode $ do
178+ let defsState = DefaultsState { curDefaults = Nothing,
179+ inheritanceGraph = [] }
180+ fp <- fullDefaultsPath (optDataDir opt) arg
181+ evalStateT (applyDefaults opt fp) defsState
169182 )
170183 "FILE")
171184 ""
@@ -275,28 +288,32 @@ options =
275288 , Option "" ["resource-path"]
276289 (ReqArg
277290 (\arg opt -> return opt { optResourcePath =
278− splitSearchPath arg })
291+ splitSearchPath arg ++
292+ optResourcePath opt })
279293 "SEARCHPATH")
280294 "" -- "Paths to search for images and other resources"
281295
282296 , Option "H" ["include-in-header"]
283297 (ReqArg
284298 (\arg opt -> return opt{ optIncludeInHeader =
285− optIncludeInHeader opt ++ [arg] })
299+ optIncludeInHeader opt ++
300+ [normalizePath arg] })
286301 "FILE")
287302 "" -- "File to include at end of header (implies -s)"
288303
289304 , Option "B" ["include-before-body"]
290305 (ReqArg
291306 (\arg opt -> return opt{ optIncludeBeforeBody =
292− optIncludeBeforeBody opt ++ [arg] })
307+ optIncludeBeforeBody opt ++
308+ [normalizePath arg] })
293309 "FILE")
294310 "" -- "File to include before document body"
295311
296312 , Option "A" ["include-after-body"]
297313 (ReqArg
298314 (\arg opt -> return opt{ optIncludeAfterBody =
299− optIncludeAfterBody opt ++ [arg] })
315+ optIncludeAfterBody opt ++
316+ [normalizePath arg] })
300317 "FILE")
301318 "" -- "File to include after document body"
302319
@@ -308,7 +325,8 @@ options =
308325 , Option "" ["highlight-style"]
309326 (ReqArg
310327 (\arg opt ->
311− return opt{ optHighlightStyle = Just $ T.pack arg })
328+ return opt{ optHighlightStyle = Just $
329+ T.pack $ normalizePath arg })
312330 "STYLE|FILE")
313331 "" -- "Style for highlighted code"
314332
@@ -396,7 +414,7 @@ options =
396414 , Option "" ["reference-doc"]
397415 (ReqArg
398416 (\arg opt ->
399− return opt { optReferenceDoc = Just arg })
417+ return opt { optReferenceDoc = Just $ normalizePath arg })
400418 "FILE")
401419 "" -- "Path of custom reference doc"
402420
@@ -421,7 +439,8 @@ options =
421439
422440 , Option "" ["abbreviations"]
423441 (ReqArg
424− (\arg opt -> return opt { optAbbreviations = Just arg })
442+ (\arg opt -> return opt { optAbbreviations =
443+ Just $ normalizePath arg })
425444 "FILE")
426445 "" -- "Specify file for custom abbreviations"
427446
@@ -523,9 +542,26 @@ options =
523542
524543 , Option "" ["atx-headers"]
525544 (NoArg
526− (\opt -> return opt { optSetextHeaders = False } ))
545+ (\opt -> do
546+ deprecatedOption "--atx-headers"
547+ "Use --markdown-headings=atx instead."
548+ return opt { optSetextHeaders = False } ))
527549 "" -- "Use atx-style headers for markdown"
528550
551+ , Option "" ["markdown-headings"]
552+ (ReqArg
553+ (\arg opt -> do
554+ headingFormat <- case arg of
555+ "setext" -> pure True
556+ "atx" -> pure False
557+ _ -> E.throwIO $ PandocOptionError $ T.pack
558+ ("Unknown markdown heading format: " ++ arg ++
559+ ". Expecting atx or setext")
560+ pure opt { optSetextHeaders = headingFormat }
561+ )
562+ "setext|atx")
563+ ""
564+
529565 , Option "" ["listings"]
530566 (NoArg
531567 (\opt -> return opt { optListings = True }))
@@ -606,21 +642,24 @@ options =
606642 (ReqArg
607643 (\arg opt ->
608644 return opt { optVariables =
609− setVariable "epub-cover-image" (T.pack arg) $
645+ setVariable "epub-cover-image"
646+ (T.pack $ normalizePath arg) $
610647 optVariables opt })
611648 "FILE")
612649 "" -- "Path of epub cover image"
613650
614651 , Option "" ["epub-metadata"]
615652 (ReqArg
616− (\arg opt -> return opt { optEpubMetadata = Just arg })
653+ (\arg opt -> return opt { optEpubMetadata = Just $
654+ normalizePath arg })
617655 "FILE")
618656 "" -- "Path of epub metadata file"
619657
620658 , Option "" ["epub-embed-font"]
621659 (ReqArg
622660 (\arg opt ->
623− return opt{ optEpubFonts = arg : optEpubFonts opt })
661+ return opt{ optEpubFonts = normalizePath arg :
662+ optEpubFonts opt })
624663 "FILE")
625664 "" -- "Directory of fonts to embed"
626665
@@ -647,10 +686,17 @@ options =
647686 "all|none|best")
648687 "" -- "Starting number for sections, subsections, etc."
649688
689+ , Option "C" ["citeproc"]
690+ (NoArg
691+ (\opt -> return opt { optFilters =
692+ optFilters opt ++ [CiteprocFilter] }))
693+ "" -- "Process citations"
694+
650695 , Option "" ["bibliography"]
651696 (ReqArg
652697 (\arg opt -> return opt{ optMetadata =
653− addMeta "bibliography" arg $
698+ addMeta "bibliography"
699+ (normalizePath arg) $
654700 optMetadata opt })
655701 "FILE")
656702 ""
@@ -659,7 +705,8 @@ options =
659705 (ReqArg
660706 (\arg opt ->
661707 return opt{ optMetadata =
662− addMeta "csl" arg $ optMetadata opt })
708+ addMeta "csl" (normalizePath arg) $
709+ optMetadata opt })
663710 "FILE")
664711 ""
665712
@@ -667,8 +714,8 @@ options =
667714 (ReqArg
668715 (\arg opt ->
669716 return opt{ optMetadata =
670− addMeta "citation-abbreviations" arg $
671− optMetadata opt })
717+ addMeta "citation-abbreviations"
718+ (normalizePath arg) $ optMetadata opt })
672719 "FILE")
673720 ""
674721
@@ -699,8 +746,7 @@ options =
699746 , Option "" ["mathjax"]
700747 (OptArg
701748 (\arg opt -> do
702− let url' = maybe (defaultMathJaxURL <>
703− "tex-mml-chtml.js") T.pack arg
749+ let url' = maybe defaultMathJaxURL T.pack arg
704750 return opt { optHTMLMathMethod = MathJax url'})
705751 "URL")
706752 "" -- "Use MathJax for HTML math"
@@ -752,7 +798,8 @@ options =
752798
753799 , Option "" ["log"]
754800 (ReqArg
755− (\arg opt -> return opt{ optLogFile = Just arg })
801+ (\arg opt -> return opt{ optLogFile = Just $
802+ normalizePath arg })
756803 "FILE")
757804 "" -- "Log messages in JSON format to this file."
758805
@@ -767,10 +814,10 @@ options =
767814 map (\c -> ['-',c]) shorts ++
768815 map ("--" ++) longs
769816 let allopts = unwords (concatMap optnames options)
770− UTF8.hPutStrLn stdout $ printf tpl allopts
771− (unwords readersNames)
772− (unwords writersNames)
773− (unwords $ map (T.unpack . fst) highlightingStyles)
817+ UTF8.hPutStrLn stdout $ T.pack $ printf tpl allopts
818+ (T.unpack $ T.unwords readersNames)
819+ (T.unpack $ T.unwords writersNames)
820+ (T.unpack $ T.unwords $ map fst highlightingStyles)
774821 (unwords datafiles)
775822 exitSuccess ))
776823 "" -- "Print bash completion script"
@@ -809,7 +856,7 @@ options =
809856 else if extensionEnabled x allExts
810857 then '-'
811858 else ' ') : drop 4 (show x)
812− mapM_ (UTF8.hPutStrLn stdout . showExt)
859+ mapM_ (UTF8.hPutStrLn stdout . T.pack . showExt)
813860 [ex | ex <- extList, extensionEnabled ex allExts]
814861 exitSuccess )
815862 "FORMAT")
@@ -823,14 +870,14 @@ options =
823870 , sShortname s `notElem`
824871 [T.pack "Alert", T.pack "Alert_indent"]
825872 ]
826− mapM_ (UTF8.hPutStrLn stdout) langs
873+ mapM_ (UTF8.hPutStrLn stdout . T.pack) (sort langs)
827874 exitSuccess ))
828875 ""
829876
830877 , Option "" ["list-highlight-styles"]
831878 (NoArg
832879 (\_ -> do
833− mapM_ (UTF8.hPutStrLn stdout . T.unpack . fst) highlightingStyles
880+ mapM_ (UTF8.hPutStrLn stdout . fst) highlightingStyles
834881 exitSuccess ))
835882 ""
836883
@@ -848,7 +895,7 @@ options =
848895 | T.null t -> -- e.g. for docx, odt, json:
849896 E.throwIO $ PandocCouldNotFindDataFileError $ T.pack
850897 ("templates/default." ++ arg)
851− | otherwise -> write . T.unpack $ t
898+ | otherwise -> write t
852899 Left e -> E.throwIO e
853900 exitSuccess)
854901 "FORMAT")
@@ -869,9 +916,7 @@ options =
869916 , Option "" ["print-highlight-style"]
870917 (ReqArg
871918 (\arg opt -> do
872− let write = case optOutputFile opt of
873− Just f -> B.writeFile f
874− Nothing -> B.putStr
919+ let write = maybe B.putStr B.writeFile $ optOutputFile opt
875920 sty <- runIOorExplode $ lookupHighlightStyle arg
876921 write $ encodePretty'
877922 defConfig{confIndent = Spaces 4
@@ -896,11 +941,13 @@ options =
896941 (NoArg
897942 (\_ -> do
898943 prg <- getProgName
899− defaultDatadirs <- defaultUserDataDirs
900− UTF8.hPutStrLn stdout (prg ++ " " ++ T.unpack pandocVersion ++
901− compileInfo ++ "\nDefault user data directory: " ++
902− intercalate " or " defaultDatadirs ++
903− ('\n':copyrightMessage))
944+ defaultDatadir <- defaultUserDataDir
945+ UTF8.hPutStrLn stdout
946+ $ T.pack
947+ $ prg ++ " " ++ T.unpack pandocVersion ++
948+ compileInfo ++
949+ "\nUser data directory: " ++ defaultDatadir ++
950+ ('\n':copyrightMessage)
904951 exitSuccess ))
905952 "" -- "Print version"
906953
@@ -908,7 +955,7 @@ options =
908955 (NoArg
909956 (\_ -> do
910957 prg <- getProgName
911− UTF8.hPutStr stdout (usageMessage prg options)
958+ UTF8.hPutStr stdout (T.pack $ usageMessage prg options)
912959 exitSuccess ))
913960 "" -- "Show help"
914961 ]
@@ -929,16 +976,16 @@ usageMessage programName = usageInfo (programName ++ " [OPTIONS] [FILES]")
929976
930977copyrightMessage :: String
931978copyrightMessage = intercalate "\n" [
932− "Copyright (C) 2006-2020 John MacFarlane",
933− "Web: https://pandoc.org",
934− "This is free software; see the source for copying conditions.",
935− "There is no warranty, not even for merchantability or fitness",
936− "for a particular purpose." ]
979+ "Copyright (C) 2006-2021 John MacFarlane. Web: https://pandoc.org",
980+ "This is free software; see the source for copying conditions. There is no",
981+ "warranty, not even for merchantability or fitness for a particular purpose." ]
937982
938983compileInfo :: String
939984compileInfo =
940− "\nCompiled with pandoc-types " ++ VERSION_pandoc_types ++ ", texmath " ++
941− VERSION_texmath ++ ", skylighting " ++ VERSION_skylighting
985+ "\nCompiled with pandoc-types " ++ VERSION_pandoc_types ++
986+ ", texmath " ++ VERSION_texmath ++ ", skylighting " ++
987+ VERSION_skylighting ++ ",\nciteproc " ++ VERSION_citeproc ++
988+ ", ipynb " ++ VERSION_ipynb
942989
943990handleUnrecognizedOption :: String -> [String] -> [String]
944991handleUnrecognizedOption "--smart" =
@@ -969,38 +1016,16 @@ handleUnrecognizedOption "-R" = handleUnrecognizedOption "--parse-raw"
9691016handleUnrecognizedOption x =
9701017 (("Unknown option " ++ x ++ ".") :)
9711018
972−readersNames :: [String]
973−readersNames = sort (map (T.unpack . fst) (readers :: [(Text, Reader PandocIO)]))
1019+readersNames :: [Text]
1020+readersNames = sort (map fst (readers :: [(Text, Reader PandocIO)]))
9741021
975−writersNames :: [String]
1022+writersNames :: [Text]
9761023writersNames = sort
977− ("pdf" : map (T.unpack . fst) (writers :: [(Text, Writer PandocIO)]))
1024+ ("pdf" : map fst (writers :: [(Text, Writer PandocIO)]))
9781025
9791026splitField :: String -> (String, String)
9801027splitField = second (tailDef "true") . break (`elemText` ":=")
9811028
982−-- | Apply defaults from --defaults file.
983−applyDefaults :: Opt -> FilePath -> IO Opt
984−applyDefaults opt file = runIOorExplode $ do
985− let fp = if null (takeExtension file)
986− then addExtension file "yaml"
987− else file
988− setVerbosity $ optVerbosity opt
989− dataDirs <- liftIO defaultUserDataDirs
990− let fps = fp : case optDataDir opt of
991− Nothing -> map (</> ("defaults" </> fp))
992− dataDirs
993− Just dd -> [dd </> "defaults" </> fp]
994− fp' <- fromMaybe fp <$> findM fileExists fps
995− inp <- readFileLazy fp'
996− case Y.decode1 inp of
997− Right (f :: Opt -> Opt) -> return $ f opt
998− Left (errpos, errmsg) -> throwError $
999− PandocParseError $ T.pack $
1000− "Error parsing " ++ fp' ++ " line " ++
1001− show (Y.posLine errpos) ++ " column " ++
1002− show (Y.posColumn errpos) ++ ":\n" ++ errmsg
1003−
10041029lookupHighlightStyle :: PandocMonad m => String -> m Style
10051030lookupHighlightStyle s
10061031 | takeExtension s == ".theme" = -- attempt to load KDE theme
@@ -1018,7 +1043,7 @@ lookupHighlightStyle s
10181043deprecatedOption :: String -> String -> IO ()
10191044deprecatedOption o msg =
10201045 runIO (report $ Deprecated (T.pack o) (T.pack msg)) >>=
1021− \r -> case r of
1046+ \case
10221047 Right () -> return ()
10231048 Left e -> E.throwIO e
10241049
@@ -1029,6 +1054,27 @@ setVariable key val (Context ctx) = Context $ M.alter go key ctx
10291054 go (Just (ListVal xs)) = Just $ ListVal $ xs ++ [toVal val]
10301055 go (Just x) = Just $ ListVal [x, toVal val]
10311056
1057+addMeta :: String -> String -> Meta -> Meta
1058+addMeta k v meta =
1059+ case lookupMeta k' meta of
1060+ Nothing -> setMeta k' v' meta
1061+ Just (MetaList xs) ->
1062+ setMeta k' (MetaList (xs ++ [v'])) meta
1063+ Just x -> setMeta k' (MetaList [x, v']) meta
1064+ where
1065+ v' = readMetaValue v
1066+ k' = T.pack k
1067+
1068+readMetaValue :: String -> MetaValue
1069+readMetaValue s
1070+ | s == "true" = MetaBool True
1071+ | s == "True" = MetaBool True
1072+ | s == "TRUE" = MetaBool True
1073+ | s == "false" = MetaBool False
1074+ | s == "False" = MetaBool False
1075+ | s == "FALSE" = MetaBool False
1076+ | otherwise = MetaString $ T.pack s
1077+
10321078-- On Windows with ghc 8.6+, we need to rewrite paths
10331079-- beginning with \\ to \\?\UNC\. -- See #5127.
10341080normalizePath :: FilePath -> FilePath
src/Text/Pandoc/App/FormatHeuristics.hs+20−8
@@ -1,7 +1,7 @@
11{-# LANGUAGE OverloadedStrings #-}
22{- |
33 Module : Text.Pandoc.App.FormatHeuristics
4− Copyright : Copyright (C) 2006-2020 John MacFarlane
4+ Copyright : Copyright (C) 2006-2021 John MacFarlane
55 License : GNU GPL, version 2 or above
66
77 Maintainer : John MacFarlane <jgm@berkeley@edu>
@@ -15,18 +15,24 @@ module Text.Pandoc.App.FormatHeuristics
1515 ) where
1616
1717import Data.Char (toLower)
18+import Data.Foldable (asum)
1819import Data.Text (Text)
1920import System.FilePath (takeExtension)
2021
21−-- Determine default format based on file extensions.
22+-- | Determines default format based on file extensions; uses the format
23+-- of the first extension that's associated with a format.
24+--
25+-- Examples:
26+--
27+-- > formatFromFilePaths ["text.unknown", "no-extension"]
28+-- Nothing
29+--
30+-- > formatFromFilePaths ["my.md", "other.rst"]
31+-- Just "markdown"
2232formatFromFilePaths :: [FilePath] -> Maybe Text
23−formatFromFilePaths [] = Nothing
24−formatFromFilePaths (x:xs) =
25− case formatFromFilePath x of
26− Just f -> Just f
27− Nothing -> formatFromFilePaths xs
33+formatFromFilePaths = asum . map formatFromFilePath
2834
29−-- Determine format based on file extension
35+-- | Determines format based on file extension.
3036formatFromFilePath :: FilePath -> Maybe Text
3137formatFromFilePath x =
3238 case takeExtension (map toLower x) of
@@ -48,6 +54,11 @@ formatFromFilePath x =
4854 ".lhs" -> Just "markdown+lhs"
4955 ".ltx" -> Just "latex"
5056 ".markdown" -> Just "markdown"
57+ ".mkdn" -> Just "markdown"
58+ ".mkd" -> Just "markdown"
59+ ".mdwn" -> Just "markdown"
60+ ".mdown" -> Just "markdown"
61+ ".Rmd" -> Just "markdown"
5162 ".md" -> Just "markdown"
5263 ".ms" -> Just "ms"
5364 ".muse" -> Just "muse"
@@ -74,5 +85,6 @@ formatFromFilePath x =
7485 ".xhtml" -> Just "html"
7586 ".ipynb" -> Just "ipynb"
7687 ".csv" -> Just "csv"
88+ ".bib" -> Just "biblatex"
7789 ['.',y] | y `elem` ['1'..'9'] -> Just "man"
7890 _ -> Nothing
src/Text/Pandoc/App/Opt.hs+274−48
@@ -7,7 +7,7 @@
77{-# LANGUAGE FlexibleContexts #-}
88{- |
99 Module : Text.Pandoc.App.Opt
10− Copyright : Copyright (C) 2006-2020 John MacFarlane
10+ Copyright : Copyright (C) 2006-2021 John MacFarlane
1111 License : GNU GPL, version 2 or above
1212
1313 Maintainer : John MacFarlane <jgm@berkeley@edu>
@@ -20,21 +20,31 @@ module Text.Pandoc.App.Opt (
2020 Opt(..)
2121 , LineEnding (..)
2222 , IpynbOutput (..)
23+ , DefaultsState (..)
2324 , defaultOpts
24− , addMeta
25+ , applyDefaults
26+ , fullDefaultsPath
2527 ) where
28+import Control.Monad.Except (MonadIO, liftIO, throwError, (>=>), foldM)
29+import Control.Monad.State.Strict (StateT, modify, gets)
30+import System.FilePath ( addExtension, (</>), takeExtension, takeDirectory )
31+import System.Directory ( canonicalizePath )
2632import Data.Char (isLower, toLower)
33+import Data.Maybe (fromMaybe)
2734import GHC.Generics hiding (Meta)
28−import Text.Pandoc.Builder (setMeta)
2935import Text.Pandoc.Filter (Filter (..))
30−import Text.Pandoc.Logging (Verbosity (WARNING))
36+import Text.Pandoc.Logging (Verbosity (WARNING), LogMessage(..))
3137import Text.Pandoc.Options (TopLevelDivision (TopLevelDefault),
3238 TrackChanges (AcceptChanges),
3339 WrapOption (WrapAuto), HTMLMathMethod (PlainMath),
3440 ReferenceLocation (EndOfDocument),
3541 ObfuscationMethod (NoObfuscation),
3642 CiteMethod (Citeproc))
37−import Text.Pandoc.Shared (camelCaseStrToHyphenated)
43+import Text.Pandoc.Class (readFileLazy, fileExists, setVerbosity, report,
44+ PandocMonad(lookupEnv), getUserDataDir)
45+import Text.Pandoc.Error (PandocError (PandocParseError, PandocSomeError))
46+import Text.Pandoc.Shared (camelCaseStrToHyphenated, defaultUserDataDir,
47+ findM, ordNub)
3848import qualified Text.Pandoc.Parsing as P
3949import Text.Pandoc.Readers.Metadata (yamlMap)
4050import Text.Pandoc.Class.PandocPure
@@ -43,7 +53,7 @@ import Data.Text (Text, unpack)
4353import Data.Default (def)
4454import qualified Data.Text as T
4555import qualified Data.Map as M
46−import Text.Pandoc.Definition (Meta(..), MetaValue(..), lookupMeta)
56+import Text.Pandoc.Definition (Meta(..), MetaValue(..))
4757import Data.Aeson (defaultOptions, Options(..))
4858import Data.Aeson.TH (deriveJSON)
4959import Control.Applicative ((<|>))
@@ -147,19 +157,194 @@ data Opt = Opt
147157 , optNoCheckCertificate :: Bool -- ^ Disable certificate validation
148158 , optEol :: LineEnding -- ^ Style of line-endings to use
149159 , optStripComments :: Bool -- ^ Skip HTML comments
160+ , optCSL :: Maybe FilePath -- ^ CSL stylesheet
161+ , optBibliography :: [FilePath] -- ^ Bibliography files
162+ , optCitationAbbreviations :: Maybe FilePath -- ^ Citation abbreviations
150163 } deriving (Generic, Show)
151164
152165instance FromYAML (Opt -> Opt) where
153− parseYAML (Mapping _ _ m) =
154− foldr (.) id <$> mapM doOpt (M.toList m)
166+ parseYAML (Mapping _ _ m) = chain doOpt (M.toList m)
155167 parseYAML n = failAtNode n "Expected a mapping"
156168
169+data DefaultsState = DefaultsState
170+ {
171+ curDefaults :: Maybe FilePath -- currently parsed file
172+ , inheritanceGraph :: [[FilePath]] -- defaults file inheritance graph
173+ } deriving (Show)
174+
175+instance (PandocMonad m, MonadIO m)
176+ => FromYAML (Opt -> StateT DefaultsState m Opt) where
177+ parseYAML (Mapping _ _ m) = do
178+ let opts = M.mapKeys toText m
179+ dataDir <- case M.lookup "data-dir" opts of
180+ Nothing -> return Nothing
181+ Just v -> Just . unpack <$> parseYAML v
182+ f <- parseOptions (M.toList m)
183+ case M.lookup "defaults" opts of
184+ Just v -> do
185+ g <- parseDefaults v dataDir
186+ return $ g >=> f >=> resolveVarsInOpt
187+ Nothing -> return $ f >=> resolveVarsInOpt
188+ where
189+ toText (Scalar _ (SStr s)) = s
190+ toText _ = ""
191+ parseYAML n = failAtNode n "Expected a mapping"
192+
193+resolveVarsInOpt :: forall m. (PandocMonad m, MonadIO m)
194+ => Opt -> StateT DefaultsState m Opt
195+resolveVarsInOpt
196+ opt@Opt
197+ { optTemplate = oTemplate
198+ , optMetadataFiles = oMetadataFiles
199+ , optOutputFile = oOutputFile
200+ , optInputFiles = oInputFiles
201+ , optSyntaxDefinitions = oSyntaxDefinitions
202+ , optAbbreviations = oAbbreviations
203+ , optReferenceDoc = oReferenceDoc
204+ , optEpubMetadata = oEpubMetadata
205+ , optEpubFonts = oEpubFonts
206+ , optEpubCoverImage = oEpubCoverImage
207+ , optLogFile = oLogFile
208+ , optFilters = oFilters
209+ , optDataDir = oDataDir
210+ , optExtractMedia = oExtractMedia
211+ , optCss = oCss
212+ , optIncludeBeforeBody = oIncludeBeforeBody
213+ , optIncludeAfterBody = oIncludeAfterBody
214+ , optIncludeInHeader = oIncludeInHeader
215+ , optResourcePath = oResourcePath
216+ , optCSL = oCSL
217+ , optBibliography = oBibliography
218+ , optCitationAbbreviations = oCitationAbbreviations
219+ }
220+ = do
221+ oTemplate' <- mapM resolveVars oTemplate
222+ oMetadataFiles' <- mapM resolveVars oMetadataFiles
223+ oOutputFile' <- mapM resolveVars oOutputFile
224+ oInputFiles' <- mapM (mapM resolveVars) oInputFiles
225+ oSyntaxDefinitions' <- mapM resolveVars oSyntaxDefinitions
226+ oAbbreviations' <- mapM resolveVars oAbbreviations
227+ oReferenceDoc' <- mapM resolveVars oReferenceDoc
228+ oEpubMetadata' <- mapM resolveVars oEpubMetadata
229+ oEpubFonts' <- mapM resolveVars oEpubFonts
230+ oEpubCoverImage' <- mapM resolveVars oEpubCoverImage
231+ oLogFile' <- mapM resolveVars oLogFile
232+ oFilters' <- mapM resolveVarsInFilter oFilters
233+ oDataDir' <- mapM resolveVars oDataDir
234+ oExtractMedia' <- mapM resolveVars oExtractMedia
235+ oCss' <- mapM resolveVars oCss
236+ oIncludeBeforeBody' <- mapM resolveVars oIncludeBeforeBody
237+ oIncludeAfterBody' <- mapM resolveVars oIncludeAfterBody
238+ oIncludeInHeader' <- mapM resolveVars oIncludeInHeader
239+ oResourcePath' <- mapM resolveVars oResourcePath
240+ oCSL' <- mapM resolveVars oCSL
241+ oBibliography' <- mapM resolveVars oBibliography
242+ oCitationAbbreviations' <- mapM resolveVars oCitationAbbreviations
243+ return opt{ optTemplate = oTemplate'
244+ , optMetadataFiles = oMetadataFiles'
245+ , optOutputFile = oOutputFile'
246+ , optInputFiles = oInputFiles'
247+ , optSyntaxDefinitions = oSyntaxDefinitions'
248+ , optAbbreviations = oAbbreviations'
249+ , optReferenceDoc = oReferenceDoc'
250+ , optEpubMetadata = oEpubMetadata'
251+ , optEpubFonts = oEpubFonts'
252+ , optEpubCoverImage = oEpubCoverImage'
253+ , optLogFile = oLogFile'
254+ , optFilters = oFilters'
255+ , optDataDir = oDataDir'
256+ , optExtractMedia = oExtractMedia'
257+ , optCss = oCss'
258+ , optIncludeBeforeBody = oIncludeBeforeBody'
259+ , optIncludeAfterBody = oIncludeAfterBody'
260+ , optIncludeInHeader = oIncludeInHeader'
261+ , optResourcePath = oResourcePath'
262+ , optCSL = oCSL'
263+ , optBibliography = oBibliography'
264+ , optCitationAbbreviations = oCitationAbbreviations'
265+ }
266+
267+ where
268+ resolveVars :: FilePath -> StateT DefaultsState m FilePath
269+ resolveVars [] = return []
270+ resolveVars ('$':'{':xs) =
271+ let (ys, zs) = break (=='}') xs
272+ in if null zs
273+ then return $ '$':'{':xs
274+ else do
275+ val <- lookupEnv' ys
276+ (val ++) <$> resolveVars (drop 1 zs)
277+ resolveVars (c:cs) = (c:) <$> resolveVars cs
278+ lookupEnv' :: String -> StateT DefaultsState m String
279+ lookupEnv' "." = do
280+ mbCurDefaults <- gets curDefaults
281+ maybe (return "")
282+ (fmap takeDirectory . liftIO . canonicalizePath)
283+ mbCurDefaults
284+ lookupEnv' "USERDATA" = do
285+ mbodatadir <- mapM resolveVars oDataDir
286+ mbdatadir <- getUserDataDir
287+ defdatadir <- liftIO defaultUserDataDir
288+ return $ fromMaybe defdatadir (mbodatadir <|> mbdatadir)
289+ lookupEnv' v = do
290+ mbval <- fmap T.unpack <$> lookupEnv (T.pack v)
291+ case mbval of
292+ Nothing -> do
293+ report $ EnvironmentVariableUndefined (T.pack v)
294+ return mempty
295+ Just x -> return x
296+ resolveVarsInFilter (JSONFilter fp) =
297+ JSONFilter <$> resolveVars fp
298+ resolveVarsInFilter (LuaFilter fp) =
299+ LuaFilter <$> resolveVars fp
300+ resolveVarsInFilter CiteprocFilter = return CiteprocFilter
301+
302+
303+
304+parseDefaults :: (PandocMonad m, MonadIO m)
305+ => Node Pos
306+ -> Maybe FilePath
307+ -> Parser (Opt -> StateT DefaultsState m Opt)
308+parseDefaults n dataDir = parseDefsNames n >>= \ds -> return $ \o -> do
309+ -- get parent defaults:
310+ defsParent <- gets $ fromMaybe "" . curDefaults
311+ -- get child defaults:
312+ defsChildren <- mapM (fullDefaultsPath dataDir) ds
313+ -- expand parent in defaults inheritance graph by children:
314+ defsGraph <- gets inheritanceGraph
315+ let defsGraphExp = expand defsGraph defsChildren defsParent
316+ modify $ \defsState -> defsState{ inheritanceGraph = defsGraphExp }
317+ -- check for cyclic inheritance:
318+ if cyclic defsGraphExp
319+ then throwError $
320+ PandocSomeError $ T.pack $
321+ "Error: Circular defaults file reference in " ++
322+ "'" ++ defsParent ++ "'"
323+ else foldM applyDefaults o defsChildren
324+ where parseDefsNames x = (parseYAML x >>= \xs -> return $ map unpack xs)
325+ <|> (parseYAML x >>= \x' -> return [unpack x'])
326+
327+parseOptions :: Monad m
328+ => [(Node Pos, Node Pos)]
329+ -> Parser (Opt -> StateT DefaultsState m Opt)
330+parseOptions ns = do
331+ f <- chain doOpt' ns
332+ return $ return . f
333+
334+chain :: Monad m => (a -> m (b -> b)) -> [a] -> m (b -> b)
335+chain f = foldM g id
336+ where g o n = f n >>= \o' -> return $ o' . o
337+
338+doOpt' :: (Node Pos, Node Pos) -> Parser (Opt -> Opt)
339+doOpt' (k',v) = do
340+ k <- parseStringKey k'
341+ case k of
342+ "defaults" -> return id
343+ _ -> doOpt (k',v)
344+
157345doOpt :: (Node Pos, Node Pos) -> Parser (Opt -> Opt)
158346doOpt (k',v) = do
159− k <- case k' of
160− Scalar _ (SStr t) -> return t
161− Scalar _ _ -> failAtNode k' "Non-string key"
162− _ -> failAtNode k' "Non-scalar key"
347+ k <- parseStringKey k'
163348 case k of
164349 "tab-stop" ->
165350 parseYAML v >>= \x -> return (\o -> o{ optTabStop = x })
@@ -294,6 +479,11 @@ doOpt (k',v) = do
294479 parseYAML v >>= \x -> return (\o -> o{ optColumns = x })
295480 "filters" ->
296481 parseYAML v >>= \x -> return (\o -> o{ optFilters = optFilters o <> x })
482+ "citeproc" ->
483+ parseYAML v >>= \x ->
484+ if x
485+ then return (\o -> o{ optFilters = CiteprocFilter : optFilters o })
486+ else return id
297487 "email-obfuscation" ->
298488 parseYAML v >>= \x -> return (\o -> o{ optEmailObfuscation = x })
299489 "identifier-prefix" ->
@@ -325,6 +515,12 @@ doOpt (k',v) = do
325515 parseYAML v >>= \x -> return (\o -> o{ optSlideLevel = x })
326516 "atx-headers" ->
327517 parseYAML v >>= \x -> return (\o -> o{ optSetextHeaders = not x })
518+ "markdown-headings" ->
519+ parseYAML v >>= \x -> return (\o ->
520+ case T.toLower x of
521+ "atx" -> o{ optSetextHeaders = False }
522+ "setext" -> o{ optSetextHeaders = True }
523+ _ -> o)
328524 "ascii" ->
329525 parseYAML v >>= \x -> return (\o -> o{ optAscii = x })
330526 "default-image-extension" ->
@@ -347,21 +543,18 @@ doOpt (k',v) = do
347543 (parseYAML v >>= \x -> return (\o -> o{ optCss = optCss o <>
348544 [unpack x] }))
349545 "bibliography" ->
350− do let addItem x o = o{ optMetadata =
351− addMeta "bibliography" (T.unpack x)
352− (optMetadata o) }
353− (parseYAML v >>= \(xs :: [Text]) -> return $ \o ->
354− foldr addItem o xs)
355− <|>
356− (parseYAML v >>= \(x :: Text) -> return $ \o -> addItem x o)
546+ (parseYAML v >>= \x -> return (\o ->
547+ o{ optBibliography = optBibliography o <>
548+ map unpack x }))
549+ <|>
550+ (parseYAML v >>= \x -> return (\o ->
551+ o{ optBibliography = optBibliography o <>
552+ [unpack x] }))
357553 "csl" ->
358− do let addItem x o = o{ optMetadata =
359− addMeta "csl" (T.unpack x)
360− (optMetadata o) }
361− (parseYAML v >>= \(xs :: [Text]) -> return $ \o ->
362− foldr addItem o xs)
363− <|>
364− (parseYAML v >>= \(x :: Text) -> return $ \o -> addItem x o)
554+ parseYAML v >>= \x -> return (\o -> o{ optCSL = unpack <$> x })
555+ "citation-abbreviations" ->
556+ parseYAML v >>= \x -> return (\o -> o{ optCitationAbbreviations =
557+ unpack <$> x })
365558 "ipynb-output" ->
366559 parseYAML v >>= \x -> return (\o -> o{ optIpynbOutput = x })
367560 "include-before-body" ->
@@ -390,7 +583,8 @@ doOpt (k',v) = do
390583 optIncludeInHeader o <> [unpack x] }))
391584 "resource-path" ->
392585 parseYAML v >>= \x ->
393− return (\o -> o{ optResourcePath = map unpack x })
586+ return (\o -> o{ optResourcePath = map unpack x <>
587+ optResourcePath o })
394588 "request-headers" ->
395589 parseYAML v >>= \x ->
396590 return (\o -> o{ optRequestHeaders = x })
@@ -459,7 +653,7 @@ defaultOpts = Opt
459653 , optPdfEngine = Nothing
460654 , optPdfEngineOpts = []
461655 , optSlideLevel = Nothing
462− , optSetextHeaders = True
656+ , optSetextHeaders = False
463657 , optAscii = False
464658 , optDefaultImageExtension = ""
465659 , optExtractMedia = Nothing
@@ -476,38 +670,70 @@ defaultOpts = Opt
476670 , optNoCheckCertificate = False
477671 , optEol = Native
478672 , optStripComments = False
673+ , optCSL = Nothing
674+ , optBibliography = []
675+ , optCitationAbbreviations = Nothing
479676 }
480677
678+parseStringKey :: Node Pos -> Parser Text
679+parseStringKey k = case k of
680+ Scalar _ (SStr t) -> return t
681+ Scalar _ _ -> failAtNode k "Non-string key"
682+ _ -> failAtNode k "Non-scalar key"
683+
481684yamlToMeta :: Node Pos -> Parser Meta
482685yamlToMeta (Mapping _ _ m) =
483686 either (fail . show) return $ runEverything (yamlMap pMetaString m)
484687 where
485688 pMetaString = pure . MetaString <$> P.manyChar P.anyChar
486− runEverything p = runPure (P.readWithM p def "")
689+ runEverything p =
690+ runPure (P.readWithM p (def :: P.ParserState) ("" :: Text))
487691 >>= fmap (Meta . flip P.runF def)
488692yamlToMeta _ = return mempty
489693
490−addMeta :: String -> String -> Meta -> Meta
491−addMeta k v meta =
492− case lookupMeta k' meta of
493− Nothing -> setMeta k' v' meta
494− Just (MetaList xs) ->
495− setMeta k' (MetaList (xs ++ [v'])) meta
496− Just x -> setMeta k' (MetaList [x, v']) meta
497− where
498− v' = readMetaValue v
499− k' = T.pack k
694+-- | Apply defaults from --defaults file.
695+applyDefaults :: (PandocMonad m, MonadIO m)
696+ => Opt
697+ -> FilePath
698+ -> StateT DefaultsState m Opt
699+applyDefaults opt file = do
700+ setVerbosity $ optVerbosity opt
701+ modify $ \defsState -> defsState{ curDefaults = Just file }
702+ inp <- readFileLazy file
703+ case decode1 inp of
704+ Right f -> f opt
705+ Left (errpos, errmsg) -> throwError $
706+ PandocParseError $ T.pack $
707+ "Error parsing " ++ file ++ " line " ++
708+ show (posLine errpos) ++ " column " ++
709+ show (posColumn errpos) ++ ":\n" ++ errmsg
500710
501−readMetaValue :: String -> MetaValue
502−readMetaValue s
503− | s == "true" = MetaBool True
504− | s == "True" = MetaBool True
505− | s == "TRUE" = MetaBool True
506− | s == "false" = MetaBool False
507− | s == "False" = MetaBool False
508− | s == "FALSE" = MetaBool False
509− | otherwise = MetaString $ T.pack s
711+fullDefaultsPath :: (PandocMonad m, MonadIO m)
712+ => Maybe FilePath
713+ -> FilePath
714+ -> m FilePath
715+fullDefaultsPath dataDir file = do
716+ let fp = if null (takeExtension file)
717+ then addExtension file "yaml"
718+ else file
719+ defaultDataDir <- liftIO defaultUserDataDir
720+ let defaultFp = fromMaybe defaultDataDir dataDir </> "defaults" </> fp
721+ fromMaybe fp <$> findM fileExists [fp, defaultFp]
510722
723+-- | In a list of lists, append another list in front of every list which
724+-- starts with specific element.
725+expand :: Ord a => [[a]] -> [a] -> a -> [[a]]
726+expand [] ns n = fmap (\x -> x : [n]) ns
727+expand ps ns n = concatMap (ext n ns) ps
728+ where
729+ ext x xs p = case p of
730+ (l : _) | x == l -> fmap (: p) xs
731+ _ -> [p]
732+
733+cyclic :: Ord a => [[a]] -> Bool
734+cyclic = any hasDuplicate
735+ where
736+ hasDuplicate xs = length (ordNub xs) /= length xs
511737
512738-- see https://github.com/jgm/pandoc/pull/4083
513739-- using generic deriving caused long compilation times
src/Text/Pandoc/App/OutputSettings.hs+3−3
@@ -5,7 +5,7 @@
55{-# LANGUAGE TupleSections #-}
66{- |
77 Module : Text.Pandoc.App
8− Copyright : Copyright (C) 2006-2020 John MacFarlane
8+ Copyright : Copyright (C) 2006-2021 John MacFarlane
99 License : GNU GPL, version 2 or above
1010
1111 Maintainer : John MacFarlane <jgm@berkeley@edu>
@@ -59,8 +59,8 @@ optToOutputSettings opts = do
5959 let outputFile = fromMaybe "-" (optOutputFile opts)
6060
6161 when (optDumpArgs opts) . liftIO $ do
62− UTF8.hPutStrLn stdout outputFile
63− mapM_ (UTF8.hPutStrLn stdout) (fromMaybe [] $ optInputFiles opts)
62+ UTF8.hPutStrLn stdout (T.pack outputFile)
63+ mapM_ (UTF8.hPutStrLn stdout . T.pack) (fromMaybe [] $ optInputFiles opts)
6464 exitSuccess
6565
6666 epubMetadata <- traverse readUtf8File $ optEpubMetadata opts
src/Text/Pandoc/Asciify.hs+14−391
@@ -1,6 +1,6 @@
11{- |
22 Module : Text.Pandoc.Asciify
3− Copyright : Copyright (C) 2013-2020 John MacFarlane
3+ Copyright : Copyright (C) 2013-2021 John MacFarlane
44 License : GNU GPL, version 2 or above
55
66 Maintainer : John MacFarlane <jgm@berkeley.edu>
@@ -10,396 +10,19 @@
1010Function to convert accented latin letters to their unaccented
1111ascii equivalents (used in constructing HTML identifiers).
1212-}
13−module Text.Pandoc.Asciify (toAsciiChar)
13+module Text.Pandoc.Asciify (toAsciiChar, toAsciiText)
1414where
15−import Data.Char (isAscii)
16−import qualified Data.Map as M
15+import Data.Char (isAscii, isMark)
16+import qualified Data.Text.Normalize as TN
17+import Data.Text (Text)
18+import qualified Data.Text as T
1719
18−toAsciiChar :: Char -> Maybe Char
19−toAsciiChar c | isAscii c = Just c
20− | otherwise = M.lookup c asciiMap
20+toAsciiText :: Text -> Text
21+toAsciiText = T.filter isAscii . TN.normalize (TN.NFD)
2122
22−asciiMap :: M.Map Char Char
23−asciiMap = M.fromList
24− [('\192','A')
25− ,('\193','A')
26− ,('\194','A')
27− ,('\195','A')
28− ,('\196','A')
29− ,('\197','A')
30− ,('\199','C')
31− ,('\200','E')
32− ,('\201','E')
33− ,('\202','E')
34− ,('\203','E')
35− ,('\204','I')
36− ,('\205','I')
37− ,('\206','I')
38− ,('\207','I')
39− ,('\209','N')
40− ,('\210','O')
41− ,('\211','O')
42− ,('\212','O')
43− ,('\213','O')
44− ,('\214','O')
45− ,('\217','U')
46− ,('\218','U')
47− ,('\219','U')
48− ,('\220','U')
49− ,('\221','Y')
50− ,('\224','a')
51− ,('\225','a')
52− ,('\226','a')
53− ,('\227','a')
54− ,('\228','a')
55− ,('\229','a')
56− ,('\231','c')
57− ,('\232','e')
58− ,('\233','e')
59− ,('\234','e')
60− ,('\235','e')
61− ,('\236','i')
62− ,('\237','i')
63− ,('\238','i')
64− ,('\239','i')
65− ,('\241','n')
66− ,('\242','o')
67− ,('\243','o')
68− ,('\244','o')
69− ,('\245','o')
70− ,('\246','o')
71− ,('\249','u')
72− ,('\250','u')
73− ,('\251','u')
74− ,('\252','u')
75− ,('\253','y')
76− ,('\255','y')
77− ,('\256','A')
78− ,('\257','a')
79− ,('\258','A')
80− ,('\259','a')
81− ,('\260','A')
82− ,('\261','a')
83− ,('\262','C')
84− ,('\263','c')
85− ,('\264','C')
86− ,('\265','c')
87− ,('\266','C')
88− ,('\267','c')
89− ,('\268','C')
90− ,('\269','c')
91− ,('\270','D')
92− ,('\271','d')
93− ,('\274','E')
94− ,('\275','e')
95− ,('\276','E')
96− ,('\277','e')
97− ,('\278','E')
98− ,('\279','e')
99− ,('\280','E')
100− ,('\281','e')
101− ,('\282','E')
102− ,('\283','e')
103− ,('\284','G')
104− ,('\285','g')
105− ,('\286','G')
106− ,('\287','g')
107− ,('\288','G')
108− ,('\289','g')
109− ,('\290','G')
110− ,('\291','g')
111− ,('\292','H')
112− ,('\293','h')
113− ,('\296','I')
114− ,('\297','i')
115− ,('\298','I')
116− ,('\299','i')
117− ,('\300','I')
118− ,('\301','i')
119− ,('\302','I')
120− ,('\303','i')
121− ,('\304','I')
122− ,('\305','i')
123− ,('\308','J')
124− ,('\309','j')
125− ,('\310','K')
126− ,('\311','k')
127− ,('\313','L')
128− ,('\314','l')
129− ,('\315','L')
130− ,('\316','l')
131− ,('\317','L')
132− ,('\318','l')
133− ,('\323','N')
134− ,('\324','n')
135− ,('\325','N')
136− ,('\326','n')
137− ,('\327','N')
138− ,('\328','n')
139− ,('\332','O')
140− ,('\333','o')
141− ,('\334','O')
142− ,('\335','o')
143− ,('\336','O')
144− ,('\337','o')
145− ,('\340','R')
146− ,('\341','r')
147− ,('\342','R')
148− ,('\343','r')
149− ,('\344','R')
150− ,('\345','r')
151− ,('\346','S')
152− ,('\347','s')
153− ,('\348','S')
154− ,('\349','s')
155− ,('\350','S')
156− ,('\351','s')
157− ,('\352','S')
158− ,('\353','s')
159− ,('\354','T')
160− ,('\355','t')
161− ,('\356','T')
162− ,('\357','t')
163− ,('\360','U')
164− ,('\361','u')
165− ,('\362','U')
166− ,('\363','u')
167− ,('\364','U')
168− ,('\365','u')
169− ,('\366','U')
170− ,('\367','u')
171− ,('\368','U')
172− ,('\369','u')
173− ,('\370','U')
174− ,('\371','u')
175− ,('\372','W')
176− ,('\373','w')
177− ,('\374','Y')
178− ,('\375','y')
179− ,('\376','Y')
180− ,('\377','Z')
181− ,('\378','z')
182− ,('\379','Z')
183− ,('\380','z')
184− ,('\381','Z')
185− ,('\382','z')
186− ,('\416','O')
187− ,('\417','o')
188− ,('\431','U')
189− ,('\432','u')
190− ,('\461','A')
191− ,('\462','a')
192− ,('\463','I')
193− ,('\464','i')
194− ,('\465','O')
195− ,('\466','o')
196− ,('\467','U')
197− ,('\468','u')
198− ,('\486','G')
199− ,('\487','g')
200− ,('\488','K')
201− ,('\489','k')
202− ,('\490','O')
203− ,('\491','o')
204− ,('\496','j')
205− ,('\500','G')
206− ,('\501','g')
207− ,('\504','N')
208− ,('\505','n')
209− ,('\512','A')
210− ,('\513','a')
211− ,('\514','A')
212− ,('\515','a')
213− ,('\516','E')
214− ,('\517','e')
215− ,('\518','E')
216− ,('\519','e')
217− ,('\520','I')
218− ,('\521','i')
219− ,('\522','I')
220− ,('\523','i')
221− ,('\524','O')
222− ,('\525','o')
223− ,('\526','O')
224− ,('\527','o')
225− ,('\528','R')
226− ,('\529','r')
227− ,('\530','R')
228− ,('\531','r')
229− ,('\532','U')
230− ,('\533','u')
231− ,('\534','U')
232− ,('\535','u')
233− ,('\536','S')
234− ,('\537','s')
235− ,('\538','T')
236− ,('\539','t')
237− ,('\542','H')
238− ,('\543','h')
239− ,('\550','A')
240− ,('\551','a')
241− ,('\552','E')
242− ,('\553','e')
243− ,('\558','O')
244− ,('\559','o')
245− ,('\562','Y')
246− ,('\563','y')
247− ,('\894',';')
248− ,('\7680','A')
249− ,('\7681','a')
250− ,('\7682','B')
251− ,('\7683','b')
252− ,('\7684','B')
253− ,('\7685','b')
254− ,('\7686','B')
255− ,('\7687','b')
256− ,('\7690','D')
257− ,('\7691','d')
258− ,('\7692','D')
259− ,('\7693','d')
260− ,('\7694','D')
261− ,('\7695','d')
262− ,('\7696','D')
263− ,('\7697','d')
264− ,('\7698','D')
265− ,('\7699','d')
266− ,('\7704','E')
267− ,('\7705','e')
268− ,('\7706','E')
269− ,('\7707','e')
270− ,('\7710','F')
271− ,('\7711','f')
272− ,('\7712','G')
273− ,('\7713','g')
274− ,('\7714','H')
275− ,('\7715','h')
276− ,('\7716','H')
277− ,('\7717','h')
278− ,('\7718','H')
279− ,('\7719','h')
280− ,('\7720','H')
281− ,('\7721','h')
282− ,('\7722','H')
283− ,('\7723','h')
284− ,('\7724','I')
285− ,('\7725','i')
286− ,('\7728','K')
287− ,('\7729','k')
288− ,('\7730','K')
289− ,('\7731','k')
290− ,('\7732','K')
291− ,('\7733','k')
292− ,('\7734','L')
293− ,('\7735','l')
294− ,('\7738','L')
295− ,('\7739','l')
296− ,('\7740','L')
297− ,('\7741','l')
298− ,('\7742','M')
299− ,('\7743','m')
300− ,('\7744','M')
301− ,('\7745','m')
302− ,('\7746','M')
303− ,('\7747','m')
304− ,('\7748','N')
305− ,('\7749','n')
306− ,('\7750','N')
307− ,('\7751','n')
308− ,('\7752','N')
309− ,('\7753','n')
310− ,('\7754','N')
311− ,('\7755','n')
312− ,('\7764','P')
313− ,('\7765','p')
314− ,('\7766','P')
315− ,('\7767','p')
316− ,('\7768','R')
317− ,('\7769','r')
318− ,('\7770','R')
319− ,('\7771','r')
320− ,('\7774','R')
321− ,('\7775','r')
322− ,('\7776','S')
323− ,('\7777','s')
324− ,('\7778','S')
325− ,('\7779','s')
326− ,('\7786','T')
327− ,('\7787','t')
328− ,('\7788','T')
329− ,('\7789','t')
330− ,('\7790','T')
331− ,('\7791','t')
332− ,('\7792','T')
333− ,('\7793','t')
334− ,('\7794','U')
335− ,('\7795','u')
336− ,('\7796','U')
337− ,('\7797','u')
338− ,('\7798','U')
339− ,('\7799','u')
340− ,('\7804','V')
341− ,('\7805','v')
342− ,('\7806','V')
343− ,('\7807','v')
344− ,('\7808','W')
345− ,('\7809','w')
346− ,('\7810','W')
347− ,('\7811','w')
348− ,('\7812','W')
349− ,('\7813','w')
350− ,('\7814','W')
351− ,('\7815','w')
352− ,('\7816','W')
353− ,('\7817','w')
354− ,('\7818','X')
355− ,('\7819','x')
356− ,('\7820','X')
357− ,('\7821','x')
358− ,('\7822','Y')
359− ,('\7823','y')
360− ,('\7824','Z')
361− ,('\7825','z')
362− ,('\7826','Z')
363− ,('\7827','z')
364− ,('\7828','Z')
365− ,('\7829','z')
366− ,('\7830','h')
367− ,('\7831','t')
368− ,('\7832','w')
369− ,('\7833','y')
370− ,('\7840','A')
371− ,('\7841','a')
372− ,('\7842','A')
373− ,('\7843','a')
374− ,('\7864','E')
375− ,('\7865','e')
376− ,('\7866','E')
377− ,('\7867','e')
378− ,('\7868','E')
379− ,('\7869','e')
380− ,('\7880','I')
381− ,('\7881','i')
382− ,('\7882','I')
383− ,('\7883','i')
384− ,('\7884','O')
385− ,('\7885','o')
386− ,('\7886','O')
387− ,('\7887','o')
388− ,('\7908','U')
389− ,('\7909','u')
390− ,('\7910','U')
391− ,('\7911','u')
392− ,('\7922','Y')
393− ,('\7923','y')
394− ,('\7924','Y')
395− ,('\7925','y')
396− ,('\7926','Y')
397− ,('\7927','y')
398− ,('\7928','Y')
399− ,('\7929','y')
400− ,('\8175','`')
401− ,('\8490','K')
402− ,('\8800','=')
403− ,('\8814','<')
404− ,('\8815','>')
405− ]
23+toAsciiChar :: Char -> Maybe Char
24+toAsciiChar c = case T.unpack (TN.normalize TN.NFD (T.singleton c)) of
25+ (x:xs) | isAscii x
26+ , all isMark xs
27+ -> Just x
28+ _ -> Nothing
src/Text/Pandoc/BCP47.hsdeleted−112

This diff is too big to show here.

src/Text/Pandoc/CSS.hs+24−25

This diff is too big to show here.

src/Text/Pandoc/CSV.hs+2−3

This diff is too big to show here.

src/Text/Pandoc/Citeproc.hsnew file+661

This diff is too big to show here.

src/Text/Pandoc/Citeproc/BibTeX.hsnew file+1476

This diff is too big to show here.

src/Text/Pandoc/Citeproc/CslJson.hsnew file+37

This diff is too big to show here.

src/Text/Pandoc/Citeproc/Data.hsnew file+32

This diff is too big to show here.

src/Text/Pandoc/Citeproc/Locator.hsnew file+295

This diff is too big to show here.

src/Text/Pandoc/Citeproc/MetaValue.hsnew file+255

This diff is too big to show here.

src/Text/Pandoc/Citeproc/Util.hsnew file+70

This diff is too big to show here.

src/Text/Pandoc/Class/CommonState.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Class/IO.hs+24−24

This diff is too big to show here.

src/Text/Pandoc/Class/PandocMonad.hs+52−45

This diff is too big to show here.

src/Text/Pandoc/Data.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Error.hs+111−53

This diff is too big to show here.

src/Text/Pandoc/Extensions.hs+107−18

This diff is too big to show here.

src/Text/Pandoc/Filter.hs+18−7

This diff is too big to show here.

src/Text/Pandoc/Filter/JSON.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Filter/Lua.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Filter/Path.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Highlighting.hs+6−6

This diff is too big to show here.

src/Text/Pandoc/Image.hs+1−2

This diff is too big to show here.

src/Text/Pandoc/ImageSize.hs+61−341

This diff is too big to show here.

src/Text/Pandoc/Logging.hs+88−57

This diff is too big to show here.

src/Text/Pandoc/Lua.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Lua/ErrorConversion.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Lua/Filter.hs+7−4

This diff is too big to show here.

src/Text/Pandoc/Lua/Global.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Lua/Init.hs+16−5

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling.hs+2−2

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/AST.hs+81−85

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/AnyValue.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/CommonState.hs+2−2

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/Context.hs+3−2

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/List.hs+2−2

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/MediaBag.hs+3−3

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/PandocError.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/ReaderOptions.hs+2−2

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/SimpleTable.hsnew file+59

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/Version.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Lua/Module/MediaBag.hs+18−17

This diff is too big to show here.

src/Text/Pandoc/Lua/Module/Pandoc.hs+29−23

This diff is too big to show here.

src/Text/Pandoc/Lua/Module/System.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Lua/Module/Types.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Lua/Module/Utils.hs+47−9

This diff is too big to show here.

src/Text/Pandoc/Lua/Packages.hs+10−27

This diff is too big to show here.

src/Text/Pandoc/Lua/PandocLua.hs+20−13

This diff is too big to show here.

src/Text/Pandoc/Lua/Util.hs+3−3

This diff is too big to show here.

src/Text/Pandoc/Lua/Walk.hs+2−2

This diff is too big to show here.

src/Text/Pandoc/MIME.hs+26−3

This diff is too big to show here.

src/Text/Pandoc/MediaBag.hs+46−15

This diff is too big to show here.

src/Text/Pandoc/Options.hs+25−21

This diff is too big to show here.

src/Text/Pandoc/PDF.hs+40−19

This diff is too big to show here.

src/Text/Pandoc/Parsing.hs+426−276

This diff is too big to show here.

src/Text/Pandoc/Process.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Readers.hs+61−45

This diff is too big to show here.

src/Text/Pandoc/Readers/BibTeX.hsnew file+77

This diff is too big to show here.

src/Text/Pandoc/Readers/CSV.hs+10−10

This diff is too big to show here.

src/Text/Pandoc/Readers/CommonMark.hs+91−197

This diff is too big to show here.

src/Text/Pandoc/Readers/Creole.hs+6−7

This diff is too big to show here.

src/Text/Pandoc/Readers/CslJson.hsnew file+54

This diff is too big to show here.

src/Text/Pandoc/Readers/DocBook.hs+274−141

This diff is too big to show here.

src/Text/Pandoc/Readers/Docx.hs+119−104

This diff is too big to show here.

src/Text/Pandoc/Readers/Docx/Combine.hs+44−67

This diff is too big to show here.

src/Text/Pandoc/Readers/Docx/Parse.hs+221−130

This diff is too big to show here.

src/Text/Pandoc/Readers/Docx/Parse/Styles.hs+44−31

This diff is too big to show here.

src/Text/Pandoc/Readers/Docx/Util.hs+28−26

This diff is too big to show here.

src/Text/Pandoc/Readers/DokuWiki.hs+11−10

This diff is too big to show here.

src/Text/Pandoc/Readers/EPUB.hs+46−39

This diff is too big to show here.

src/Text/Pandoc/Readers/FB2.hs+57−51

This diff is too big to show here.

src/Text/Pandoc/Readers/HTML.hs+266−563

This diff is too big to show here.

src/Text/Pandoc/Readers/HTML/Parsing.hsnew file+225

This diff is too big to show here.

src/Text/Pandoc/Readers/HTML/Table.hsnew file+283

This diff is too big to show here.

src/Text/Pandoc/Readers/HTML/TagCategories.hsnew file+78

This diff is too big to show here.

src/Text/Pandoc/Readers/HTML/Types.hsnew file+97

This diff is too big to show here.

src/Text/Pandoc/Readers/Haddock.hs+12−8

This diff is too big to show here.

src/Text/Pandoc/Readers/Ipynb.hs+12−7

This diff is too big to show here.

src/Text/Pandoc/Readers/JATS.hs+54−68

This diff is too big to show here.

src/Text/Pandoc/Readers/Jira.hs+14−10

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX.hs+291−1511

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX/Citation.hsnew file+210

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX/Inline.hsnew file+397

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX/Lang.hs+201−122

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX/Macro.hsnew file+184

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX/Math.hsnew file+221

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX/Parsing.hs+361−54

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX/SIunitx.hsnew file+434

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX/Table.hsnew file+378

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX/Types.hs+15−2

This diff is too big to show here.

src/Text/Pandoc/Readers/Man.hs+39−18

This diff is too big to show here.

src/Text/Pandoc/Readers/Markdown.hs+389−265

This diff is too big to show here.

src/Text/Pandoc/Readers/MediaWiki.hs+24−17

This diff is too big to show here.

src/Text/Pandoc/Readers/Metadata.hs+115−34

This diff is too big to show here.

src/Text/Pandoc/Readers/Muse.hs+11−10

This diff is too big to show here.

src/Text/Pandoc/Readers/Native.hs+8−6

This diff is too big to show here.

src/Text/Pandoc/Readers/OPML.hs+22−36

This diff is too big to show here.

src/Text/Pandoc/Readers/Odt.hs+28−25

This diff is too big to show here.

src/Text/Pandoc/Readers/Odt/Arrows/State.hs+2−2

This diff is too big to show here.

src/Text/Pandoc/Readers/Odt/ContentReader.hs+25−18

This diff is too big to show here.

src/Text/Pandoc/Readers/Odt/Generic/Namespaces.hs+2−1

This diff is too big to show here.

src/Text/Pandoc/Readers/Odt/Generic/Utils.hs+10−26

This diff is too big to show here.

src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs+15−15

This diff is too big to show here.

src/Text/Pandoc/Readers/Odt/Namespaces.hs+6−5

This diff is too big to show here.

src/Text/Pandoc/Readers/Odt/StyleReader.hs+21−17

This diff is too big to show here.

src/Text/Pandoc/Readers/Org.hs+5−8

This diff is too big to show here.

src/Text/Pandoc/Readers/Org/BlockStarts.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Readers/Org/Blocks.hs+84−47

This diff is too big to show here.

src/Text/Pandoc/Readers/Org/DocumentTree.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Readers/Org/ExportSettings.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Readers/Org/Inlines.hs+13−13

This diff is too big to show here.

src/Text/Pandoc/Readers/Org/Meta.hs+13−5

This diff is too big to show here.

src/Text/Pandoc/Readers/Org/ParserState.hs+2−2

This diff is too big to show here.

src/Text/Pandoc/Readers/Org/Parsing.hs+6−6

This diff is too big to show here.

src/Text/Pandoc/Readers/Org/Shared.hs+2−4

This diff is too big to show here.

src/Text/Pandoc/Readers/RST.hs+102−122

This diff is too big to show here.

src/Text/Pandoc/Readers/Roff.hs+16−18

This diff is too big to show here.

src/Text/Pandoc/Readers/TWiki.hs+14−34

This diff is too big to show here.

src/Text/Pandoc/Readers/Textile.hs+99−93

This diff is too big to show here.

src/Text/Pandoc/Readers/TikiWiki.hs+6−6

This diff is too big to show here.

src/Text/Pandoc/Readers/Txt2Tags.hs+50−24

This diff is too big to show here.

src/Text/Pandoc/Readers/Vimwiki.hs+12−7

This diff is too big to show here.

src/Text/Pandoc/RoffChar.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/SelfContained.hs+16−12

This diff is too big to show here.

src/Text/Pandoc/Shared.hs+56−107

This diff is too big to show here.

src/Text/Pandoc/Slides.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Sources.hsnew file+195

This diff is too big to show here.

src/Text/Pandoc/Templates.hs+7−1

This diff is too big to show here.

src/Text/Pandoc/Translations.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/UTF8.hs+21−24

This diff is too big to show here.

src/Text/Pandoc/UUID.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Writers.hs+13−4

This diff is too big to show here.

src/Text/Pandoc/Writers/AnnotatedTable.hsnew file+323

This diff is too big to show here.

src/Text/Pandoc/Writers/AsciiDoc.hs+84−38

This diff is too big to show here.

src/Text/Pandoc/Writers/BibTeX.hsnew file+61

This diff is too big to show here.

src/Text/Pandoc/Writers/CommonMark.hs+2−352

This diff is too big to show here.

src/Text/Pandoc/Writers/ConTeXt.hs+47−41

This diff is too big to show here.

src/Text/Pandoc/Writers/CslJson.hsnew file+91

This diff is too big to show here.

src/Text/Pandoc/Writers/Custom.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Writers/Docbook.hs+118−37

This diff is too big to show here.

src/Text/Pandoc/Writers/Docx.hs+286−404

This diff is too big to show here.

src/Text/Pandoc/Writers/Docx/StyleMap.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Writers/Docx/Table.hsnew file+227

This diff is too big to show here.

src/Text/Pandoc/Writers/Docx/Types.hsnew file+185

This diff is too big to show here.

src/Text/Pandoc/Writers/DokuWiki.hs+29−16

This diff is too big to show here.

src/Text/Pandoc/Writers/EPUB.hs+280−225

This diff is too big to show here.

src/Text/Pandoc/Writers/FB2.hs+62−78

This diff is too big to show here.

src/Text/Pandoc/Writers/GridTable.hsnew file+157

This diff is too big to show here.

src/Text/Pandoc/Writers/HTML.hs+412−127

This diff is too big to show here.

src/Text/Pandoc/Writers/Haddock.hs+14−3

This diff is too big to show here.

src/Text/Pandoc/Writers/ICML.hs+102−61

This diff is too big to show here.

src/Text/Pandoc/Writers/Ipynb.hs+3−6

This diff is too big to show here.

src/Text/Pandoc/Writers/JATS.hs+115−122

This diff is too big to show here.

src/Text/Pandoc/Writers/JATS/References.hsnew file+164

This diff is too big to show here.

src/Text/Pandoc/Writers/JATS/Table.hsnew file+268

This diff is too big to show here.

src/Text/Pandoc/Writers/JATS/Types.hsnew file+57

This diff is too big to show here.

src/Text/Pandoc/Writers/Jira.hs+54−27

This diff is too big to show here.

src/Text/Pandoc/Writers/LaTeX.hs+128−805

This diff is too big to show here.

src/Text/Pandoc/Writers/LaTeX/Caption.hsnew file+47

This diff is too big to show here.

src/Text/Pandoc/Writers/LaTeX/Citation.hsnew file+181

This diff is too big to show here.

src/Text/Pandoc/Writers/LaTeX/Lang.hsnew file+192

This diff is too big to show here.

src/Text/Pandoc/Writers/LaTeX/Notes.hsnew file+34

This diff is too big to show here.

src/Text/Pandoc/Writers/LaTeX/Table.hsnew file+307

This diff is too big to show here.

src/Text/Pandoc/Writers/LaTeX/Types.hsnew file+83

This diff is too big to show here.

src/Text/Pandoc/Writers/LaTeX/Util.hsnew file+275

This diff is too big to show here.

src/Text/Pandoc/Writers/Man.hs+5−5

This diff is too big to show here.

src/Text/Pandoc/Writers/Markdown.hs+173−681

This diff is too big to show here.

src/Text/Pandoc/Writers/Markdown/Inline.hsnew file+616

This diff is too big to show here.

src/Text/Pandoc/Writers/Markdown/Types.hsnew file+81

This diff is too big to show here.

src/Text/Pandoc/Writers/MediaWiki.hs+10−3

This diff is too big to show here.

src/Text/Pandoc/Writers/Ms.hs+96−24

This diff is too big to show here.

src/Text/Pandoc/Writers/Muse.hs+6−3

This diff is too big to show here.

src/Text/Pandoc/Writers/Native.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Writers/ODT.hs+29−23

This diff is too big to show here.

src/Text/Pandoc/Writers/OOXML.hs+22−22

This diff is too big to show here.

src/Text/Pandoc/Writers/OPML.hs+2−2

This diff is too big to show here.

src/Text/Pandoc/Writers/OpenDocument.hs+269−115

This diff is too big to show here.

src/Text/Pandoc/Writers/Org.hs+67−43

This diff is too big to show here.

src/Text/Pandoc/Writers/Powerpoint.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Writers/Powerpoint/Output.hs+186−163

This diff is too big to show here.

src/Text/Pandoc/Writers/Powerpoint/Presentation.hs+6−7

This diff is too big to show here.

src/Text/Pandoc/Writers/RST.hs+38−22

This diff is too big to show here.

src/Text/Pandoc/Writers/RTF.hs+20−14

This diff is too big to show here.

src/Text/Pandoc/Writers/Roff.hs+2−2

This diff is too big to show here.

src/Text/Pandoc/Writers/Shared.hs+41−13

This diff is too big to show here.

src/Text/Pandoc/Writers/TEI.hs+8−7

This diff is too big to show here.

src/Text/Pandoc/Writers/Texinfo.hs+23−16

This diff is too big to show here.

src/Text/Pandoc/Writers/Textile.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Writers/XWiki.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Writers/ZimWiki.hs+5−3

This diff is too big to show here.

src/Text/Pandoc/XML.hs+44−21

This diff is too big to show here.

src/Text/Pandoc/XML/Light.hsnew file+89

This diff is too big to show here.

src/Text/Pandoc/XML/Light/Output.hsnew file+234

This diff is too big to show here.

src/Text/Pandoc/XML/Light/Proc.hsnew file+139

This diff is too big to show here.

src/Text/Pandoc/XML/Light/Types.hsnew file+193

This diff is too big to show here.

stack.yaml+11−23

This diff is too big to show here.

test/Tests/Command.hs+74−47

This diff is too big to show here.

test/Tests/Helpers.hs+25−37

This diff is too big to show here.

test/Tests/Lua.hs+2−4

This diff is too big to show here.

test/Tests/Lua/Module.hs+3−1

This diff is too big to show here.

test/Tests/Old.hs+39−34

This diff is too big to show here.

test/Tests/Readers/Creole.hs+1−3

This diff is too big to show here.

test/Tests/Readers/Docx.hs+30−8

This diff is too big to show here.

test/Tests/Readers/DokuWiki.hs−2

This diff is too big to show here.

test/Tests/Readers/EPUB.hs+2−4

This diff is too big to show here.

test/Tests/Readers/FB2.hs−2

This diff is too big to show here.

test/Tests/Readers/HTML.hs+24−19

This diff is too big to show here.

test/Tests/Readers/JATS.hs+1−2

This diff is too big to show here.

test/Tests/Readers/Jira.hs+22−2

This diff is too big to show here.

test/Tests/Readers/LaTeX.hs+93−24

This diff is too big to show here.

test/Tests/Readers/Man.hs+2−3

This diff is too big to show here.

test/Tests/Readers/Markdown.hs+8−10

This diff is too big to show here.

test/Tests/Readers/Muse.hs+1−3

This diff is too big to show here.

test/Tests/Readers/Odt.hs+2−3

This diff is too big to show here.

test/Tests/Readers/Org.hs+1−1

This diff is too big to show here.

test/Tests/Readers/Org/Block.hs+22−24

This diff is too big to show here.

test/Tests/Readers/Org/Block/CodeBlock.hs+36−38

This diff is too big to show here.

test/Tests/Readers/Org/Block/Figure.hs+9−11

This diff is too big to show here.

test/Tests/Readers/Org/Block/Header.hs+4−6

This diff is too big to show here.

test/Tests/Readers/Org/Block/List.hs+14−3

This diff is too big to show here.

test/Tests/Readers/Org/Block/Table.hs+4−6

This diff is too big to show here.

test/Tests/Readers/Org/Directive.hs+2−4

This diff is too big to show here.

test/Tests/Readers/Org/Inline.hs+5−7

This diff is too big to show here.

test/Tests/Readers/Org/Inline/Citation.hs+41−3

This diff is too big to show here.

test/Tests/Readers/Org/Inline/Note.hs+1−3

This diff is too big to show here.

test/Tests/Readers/Org/Inline/Smart.hs+1−3

This diff is too big to show here.

test/Tests/Readers/Org/Meta.hs+44−30

This diff is too big to show here.

test/Tests/Readers/Org/Shared.hs+1−3

This diff is too big to show here.

test/Tests/Readers/RST.hs+1−3

This diff is too big to show here.

test/Tests/Readers/Txt2Tags.hs+2−4

This diff is too big to show here.

test/Tests/Shared.hs+19−21

This diff is too big to show here.

test/Tests/Writers/AnnotatedTable.hsnew file+253

This diff is too big to show here.

test/Tests/Writers/AsciiDoc.hs−2

This diff is too big to show here.

test/Tests/Writers/ConTeXt.hs+122−115

This diff is too big to show here.

test/Tests/Writers/Docbook.hs+103−2

This diff is too big to show here.

test/Tests/Writers/Docx.hs+25−2

This diff is too big to show here.

test/Tests/Writers/FB2.hs−2

This diff is too big to show here.

test/Tests/Writers/HTML.hs+57−54

This diff is too big to show here.

test/Tests/Writers/JATS.hs+135−93

This diff is too big to show here.

test/Tests/Writers/Jira.hs+60−1

This diff is too big to show here.

test/Tests/Writers/LaTeX.hs−2

This diff is too big to show here.

test/Tests/Writers/Markdown.hs+3−3

This diff is too big to show here.

test/Tests/Writers/Ms.hsnew file+35

This diff is too big to show here.

test/Tests/Writers/Muse.hs−1

This diff is too big to show here.

test/Tests/Writers/Native.hs−2

This diff is too big to show here.

test/Tests/Writers/OOXML.hs+6−5

This diff is too big to show here.

test/Tests/Writers/Org.hs+46−13

This diff is too big to show here.

test/Tests/Writers/Plain.hs−2

This diff is too big to show here.

test/Tests/Writers/Powerpoint.hs−2

This diff is too big to show here.

test/Tests/Writers/RST.hs−2

This diff is too big to show here.

test/Tests/Writers/TEI.hs−2

This diff is too big to show here.

test/command/01.csvnew file+4

This diff is too big to show here.

test/command/1279.md+1−1

This diff is too big to show here.

test/command/1608.mdnew file+41

This diff is too big to show here.

test/command/1881.md+13−13

This diff is too big to show here.

test/command/2103.mdnew file+8

This diff is too big to show here.

test/command/2378.md+3−3

This diff is too big to show here.

test/command/2874.md+2−2

This diff is too big to show here.

test/command/3516.md+1−5

This diff is too big to show here.

test/command/3577.md+3−3

This diff is too big to show here.

test/command/3587.md+98−8

This diff is too big to show here.

test/command/3674.md+1−1

This diff is too big to show here.

test/command/3706.md+8−8

This diff is too big to show here.

test/command/3734.md+1−1

This diff is too big to show here.

test/command/3736.md+3−6

This diff is too big to show here.

test/command/3752.mdnew file+60

This diff is too big to show here.

test/command/3792.md+1−1

This diff is too big to show here.

test/command/3824.md+1

This diff is too big to show here.

test/command/4063.mdnew file+29

This diff is too big to show here.

test/command/4164.md+5−9

This diff is too big to show here.

test/command/4186.md+8−8

This diff is too big to show here.

test/command/4420.md−11

This diff is too big to show here.

test/command/4442.md+1−1

This diff is too big to show here.

test/command/4465.mdnew file+15

This diff is too big to show here.

test/command/4528.md+1−1

This diff is too big to show here.

test/command/4677.md+1−1

This diff is too big to show here.

test/command/4742.md+2−2

This diff is too big to show here.

test/command/5099.md+1−1

This diff is too big to show here.

test/command/5121.md+2−3

This diff is too big to show here.

test/command/5178.md+10−10

This diff is too big to show here.

test/command/5304.md+1−1

This diff is too big to show here.

test/command/5321.md+2−2

This diff is too big to show here.

test/command/5367.md+9−10

This diff is too big to show here.

test/command/5519.md+1−1

This diff is too big to show here.

test/command/5541-localLink.mdnew file+149

This diff is too big to show here.

test/command/5541-nesting.mdnew file+98

This diff is too big to show here.

test/command/5541-urlLink.mdnew file+112

This diff is too big to show here.

test/command/5627.md+4−4

This diff is too big to show here.

test/command/5642.md+1−1

This diff is too big to show here.

test/command/5650.md+4−4

This diff is too big to show here.

test/command/5686.md+1−1

This diff is too big to show here.

test/command/5708.md+1−5

This diff is too big to show here.

test/command/5849-prefix.md+5−6

This diff is too big to show here.

test/command/5986.md+3−2

This diff is too big to show here.

test/command/6026.mdnew file+19

This diff is too big to show here.

test/command/6324.mdnew file+17

This diff is too big to show here.

test/command/6388.mdnew file+16

This diff is too big to show here.

test/command/6541.mdnew file+27

This diff is too big to show here.

test/command/6549.mdnew file+26

This diff is too big to show here.

test/command/6620.mdnew file+18

This diff is too big to show here.

test/command/6658.mdnew file+75

This diff is too big to show here.

test/command/6675.mdnew file+134

This diff is too big to show here.

test/command/6699.mdnew file+13

This diff is too big to show here.

test/command/6709.mdnew file+11

This diff is too big to show here.

test/command/6719.mdnew file+18

This diff is too big to show here.

test/command/6723.mdnew file+32

This diff is too big to show here.

test/command/6739.mdnew file+21

This diff is too big to show here.

test/command/6740.mdnew file+7

This diff is too big to show here.

test/command/6741.mdnew file+145

This diff is too big to show here.

test/command/6752.mdnew file+36

This diff is too big to show here.

test/command/6755.mdnew file+11

This diff is too big to show here.

test/command/6765.mdnew file+31

This diff is too big to show here.

test/command/6768.mdnew file+21

This diff is too big to show here.

test/command/6774.mdnew file+63

This diff is too big to show here.

test/command/6783.mdnew file+26

This diff is too big to show here.

test/command/6791.mdnew file+32

This diff is too big to show here.

test/command/6792.mdnew file+66

This diff is too big to show here.

test/command/6796.mdnew file+16

This diff is too big to show here.

test/command/6802.mdnew file+9

This diff is too big to show here.

test/command/6836.mdnew file+17

This diff is too big to show here.

test/command/6837.mdnew file+29

This diff is too big to show here.

test/command/6844.mdnew file+27

This diff is too big to show here.

test/command/6855.mdnew file+12

This diff is too big to show here.

test/command/6858.mdnew file+52

This diff is too big to show here.

test/command/6869.mdnew file+6

This diff is too big to show here.

test/command/6873.mdnew file+7

This diff is too big to show here.

test/command/6890.mdnew file+36

This diff is too big to show here.

test/command/6925.mdnew file+34

This diff is too big to show here.

test/command/6948.mdnew file+31

This diff is too big to show here.

test/command/6951.mdnew file+18

This diff is too big to show here.

test/command/6958.mdnew file+10

This diff is too big to show here.

test/command/6993.mdnew file+21

This diff is too big to show here.

test/command/7003.mdnew file+37

This diff is too big to show here.

test/command/7006.mdnew file+20

This diff is too big to show here.

test/command/7009.mdnew file+8

This diff is too big to show here.

test/command/7016.mdnew file+48

This diff is too big to show here.

test/command/7041.mdnew file+23

This diff is too big to show here.

test/command/7042.mdnew file+146

This diff is too big to show here.

test/command/7058.mdnew file+6

This diff is too big to show here.

test/command/7064.mdnew file+32

This diff is too big to show here.

test/command/7067.mdnew file+90

This diff is too big to show here.

test/command/7080.mdnew file+8

This diff is too big to show here.

test/command/7092.mdnew file+8

This diff is too big to show here.

test/command/7099.mdnew file+18

This diff is too big to show here.

test/command/7112.mdnew file+15

This diff is too big to show here.

test/command/7129.mdnew file+27

This diff is too big to show here.

test/command/7132.mdnew file+10

This diff is too big to show here.

test/command/7134.mdnew file+16

This diff is too big to show here.

test/command/7145.mdnew file+12

This diff is too big to show here.

test/command/7155.mdnew file+15

This diff is too big to show here.

test/command/7173.mdnew file+137

This diff is too big to show here.

test/command/7208.mdnew file+6

This diff is too big to show here.

test/command/7214.mdnew file+28

This diff is too big to show here.

test/command/7216.mdnew file+19

This diff is too big to show here.

test/command/7266.mdnew file+10

This diff is too big to show here.

test/command/7272.mdnew file+27

This diff is too big to show here.

test/command/7278.mdnew file+38

This diff is too big to show here.

test/command/7282.mdnew file+7

This diff is too big to show here.

test/command/7288.mdnew file+40

This diff is too big to show here.

test/command/7299.mdnew file+23

This diff is too big to show here.

test/command/7321.mdnew file+24

This diff is too big to show here.

test/command/7323.mdnew file+29

This diff is too big to show here.

test/command/7324.mdnew file+25

This diff is too big to show here.

test/command/7339.mdnew file+11

This diff is too big to show here.

test/command/7340.mdnew file+6

This diff is too big to show here.

test/command/7376.mdnew file+16

This diff is too big to show here.

test/command/7394.mdnew file+85

This diff is too big to show here.

test/command/7397.mdnew file+14

This diff is too big to show here.

test/command/7400.mdnew file+9

This diff is too big to show here.

test/command/7416.mdnew file+19

This diff is too big to show here.

test/command/advanced-optical-materials.cslnew file+155

This diff is too big to show here.

test/command/annales.cslnew file+334

This diff is too big to show here.

test/command/apa.cslnew file+474

This diff is too big to show here.

test/command/archeologie-medievale.cslnew file+291

This diff is too big to show here.

test/command/averroes.bibnew file+95

This diff is too big to show here.

test/command/biblatex-266.mdnew file+34

This diff is too big to show here.

test/command/biblatex-aksin.mdnew file+78

This diff is too big to show here.

test/command/biblatex-almendro.mdnew file+71

This diff is too big to show here.

test/command/biblatex-angenendt.mdnew file+66

This diff is too big to show here.

test/command/biblatex-aristotle-anima.mdnew file+62

This diff is too big to show here.

test/command/biblatex-aristotle-physics.mdnew file+63

This diff is too big to show here.

test/command/biblatex-aristotle-poetics.mdnew file+65

This diff is too big to show here.

test/command/biblatex-aristotle-rhetoric.mdnew file+80

This diff is too big to show here.

test/command/biblatex-article.mdnew file+128

This diff is too big to show here.

test/command/biblatex-augustine.mdnew file+56

This diff is too big to show here.

test/command/biblatex-averroes-bland.mdnew file+85

This diff is too big to show here.

test/command/biblatex-averroes-hannes.mdnew file+84

This diff is too big to show here.

test/command/biblatex-averroes-hercz.mdnew file+85

This diff is too big to show here.

test/command/biblatex-baez-article.mdnew file+76

This diff is too big to show here.

test/command/biblatex-baez-online.mdnew file+69

This diff is too big to show here.

test/command/biblatex-basic.mdnew file+71

This diff is too big to show here.

test/command/biblatex-bertram.mdnew file+66

This diff is too big to show here.

test/command/biblatex-bibstring-resolution.mdnew file+20

This diff is too big to show here.

test/command/biblatex-book-averroes.mdnew file+129

This diff is too big to show here.

test/command/biblatex-book-coleridge.mdnew file+59

This diff is too big to show here.

test/command/biblatex-book-title-maintitle-series.mdnew file+39

This diff is too big to show here.

test/command/biblatex-book-vazques-de-parga.mdnew file+48

This diff is too big to show here.

test/command/biblatex-brandt.mdnew file+88

This diff is too big to show here.

test/command/biblatex-britannica.mdnew file+85

This diff is too big to show here.

test/command/biblatex-chiu.mdnew file+77

This diff is too big to show here.

test/command/biblatex-cicero.mdnew file+82

This diff is too big to show here.

test/command/biblatex-cms.mdnew file+81

This diff is too big to show here.

test/command/biblatex-coleridge.mdnew file+86

This diff is too big to show here.

test/command/biblatex-companion.mdnew file+70

This diff is too big to show here.

test/command/biblatex-cotton.mdnew file+69

This diff is too big to show here.

test/command/biblatex-crossref-inbook-mvbook.mdnew file+58

This diff is too big to show here.

test/command/biblatex-crossref-nested.mdnew file+100

This diff is too big to show here.

test/command/biblatex-ctan.mdnew file+73

This diff is too big to show here.

test/command/biblatex-dates.mdnew file+162

This diff is too big to show here.

test/command/biblatex-doody.mdnew file+101

This diff is too big to show here.

test/command/biblatex-edtf-date.mdnew file+72

This diff is too big to show here.

test/command/biblatex-escapedquotes.mdnew file+51

This diff is too big to show here.

test/command/biblatex-formatting.mdnew file+23

This diff is too big to show here.

test/command/biblatex-gaonkar-in.mdnew file+62

This diff is too big to show here.

test/command/biblatex-gaonkar.mdnew file+59

This diff is too big to show here.

test/command/biblatex-geer.mdnew file+70

This diff is too big to show here.

test/command/biblatex-gerhardt.mdnew file+64

This diff is too big to show here.

test/command/biblatex-gillies.mdnew file+69

This diff is too big to show here.

test/command/biblatex-glashow.mdnew file+51

This diff is too big to show here.

test/command/biblatex-gonzalez.mdnew file+62

This diff is too big to show here.

test/command/biblatex-hammond.mdnew file+63

This diff is too big to show here.

test/command/biblatex-herrmann.mdnew file+70

This diff is too big to show here.

test/command/biblatex-hyman.mdnew file+79

This diff is too big to show here.

test/command/biblatex-iliad.mdnew file+68

This diff is too big to show here.

test/command/biblatex-inbook-title-booktitle-maintitle-series-2.mdnew file+48

This diff is too big to show here.

test/command/biblatex-inbook-title-booktitle-maintitle-series.mdnew file+44

This diff is too big to show here.

test/command/biblatex-inbook.mdnew file+147

This diff is too big to show here.

test/command/biblatex-incollection-2.mdnew file+98

This diff is too big to show here.

test/command/biblatex-incollection.mdnew file+130

This diff is too big to show here.

test/command/biblatex-inproceedings.mdnew file+88

This diff is too big to show here.

test/command/biblatex-issue288.mdnew file+35

This diff is too big to show here.

test/command/biblatex-itzhaki.mdnew file+82

This diff is too big to show here.

test/command/biblatex-jaffe.mdnew file+82

This diff is too big to show here.

test/command/biblatex-jcg.mdnew file+54

This diff is too big to show here.

test/command/biblatex-kant-kpv.mdnew file+90

This diff is too big to show here.

test/command/biblatex-kant-ku.mdnew file+82

This diff is too big to show here.

test/command/biblatex-kastenholz.mdnew file+126

This diff is too big to show here.

test/command/biblatex-knuth-ct-a.mdnew file+78

This diff is too big to show here.

test/command/biblatex-knuth-ct-b.mdnew file+70

This diff is too big to show here.

test/command/biblatex-knuth-ct-c.mdnew file+69

This diff is too big to show here.

test/command/biblatex-knuth-ct-d.mdnew file+71

This diff is too big to show here.

test/command/biblatex-knuth-ct-e.mdnew file+66

This diff is too big to show here.

test/command/biblatex-knuth-ct-related.mdnew file+72

This diff is too big to show here.

test/command/biblatex-knuth-ct.mdnew file+66

This diff is too big to show here.

test/command/biblatex-kowalik.mdnew file+68

This diff is too big to show here.

test/command/biblatex-kullback-related.mdnew file+62

This diff is too big to show here.

test/command/biblatex-kullback-reprint.mdnew file+71

This diff is too big to show here.

test/command/biblatex-kullback.mdnew file+52

This diff is too big to show here.

test/command/biblatex-laufenberg.mdnew file+109

This diff is too big to show here.

test/command/biblatex-loh.mdnew file+65

This diff is too big to show here.

test/command/biblatex-malinowski.mdnew file+67

This diff is too big to show here.

test/command/biblatex-manual.mdnew file+51

This diff is too big to show here.

test/command/biblatex-markey.mdnew file+65

This diff is too big to show here.

test/command/biblatex-maron.mdnew file+70

This diff is too big to show here.

test/command/biblatex-massa.mdnew file+56

This diff is too big to show here.

test/command/biblatex-moore-related.mdnew file+66

This diff is too big to show here.

test/command/biblatex-moore.mdnew file+56

This diff is too big to show here.

test/command/biblatex-moraux.mdnew file+94

This diff is too big to show here.

test/command/biblatex-murray.mdnew file+105

This diff is too big to show here.

test/command/biblatex-nietzsche-historie.mdnew file+100

This diff is too big to show here.

test/command/biblatex-nietzsche-ksa.mdnew file+89

This diff is too big to show here.

test/command/biblatex-nietzsche-ksa1.mdnew file+95

This diff is too big to show here.

test/command/biblatex-online.mdnew file+64

This diff is too big to show here.

test/command/biblatex-options-url-false-doi-false.mdnew file+57

This diff is too big to show here.

test/command/biblatex-padhye.mdnew file+117

This diff is too big to show here.

test/command/biblatex-patent.mdnew file+158

This diff is too big to show here.

test/command/biblatex-periodical.mdnew file+31

This diff is too big to show here.

test/command/biblatex-piccato.mdnew file+59

This diff is too big to show here.

test/command/biblatex-pines.mdnew file+77

This diff is too big to show here.

test/command/biblatex-quotes.mdnew file+44

This diff is too big to show here.

test/command/biblatex-reese.mdnew file+71

This diff is too big to show here.

test/command/biblatex-report.mdnew file+119

This diff is too big to show here.

test/command/biblatex-salam.mdnew file+69

This diff is too big to show here.

test/command/biblatex-sarfraz.mdnew file+65

This diff is too big to show here.

test/command/biblatex-shore.mdnew file+66

This diff is too big to show here.

test/command/biblatex-sigfridsson.mdnew file+106

This diff is too big to show here.

test/command/biblatex-sorace.mdnew file+65

This diff is too big to show here.

test/command/biblatex-spiegelberg.mdnew file+74

This diff is too big to show here.

test/command/biblatex-springer.mdnew file+58

This diff is too big to show here.

test/command/biblatex-strings.mdnew file+46

This diff is too big to show here.

test/command/biblatex-test-case-conversion.mdnew file+73

This diff is too big to show here.

test/command/biblatex-textnormal.mdnew file+17

This diff is too big to show here.

test/command/biblatex-thesis.mdnew file+68

This diff is too big to show here.

test/command/biblatex-title-and-shorttitle.mdnew file+76

This diff is too big to show here.

test/command/biblatex-vangennep-related.mdnew file+69

This diff is too big to show here.

test/command/biblatex-vangennep-trans.mdnew file+69

This diff is too big to show here.

test/command/biblatex-vangennep.mdnew file+61

This diff is too big to show here.

test/command/biblatex-vazques-de-parga-mvbook.mdnew file+75

This diff is too big to show here.

test/command/biblatex-vazques-de-parga.mdnew file+74

This diff is too big to show here.

test/command/biblatex-video.mdnew file+19

This diff is too big to show here.

test/command/biblatex-vizedom-related.mdnew file+68

This diff is too big to show here.

test/command/biblatex-wassenberg.mdnew file+83

This diff is too big to show here.

test/command/biblatex-weinberg.mdnew file+52

This diff is too big to show here.

test/command/biblatex-westfahl-frontier.mdnew file+60

This diff is too big to show here.

test/command/biblatex-westfahl-space.mdnew file+106

This diff is too big to show here.

test/command/biblatex-wilde.mdnew file+65

This diff is too big to show here.

test/command/biblatex-worman.mdnew file+60

This diff is too big to show here.

test/command/biblatex-yoon.mdnew file+67

This diff is too big to show here.

test/command/biblio.bibnew file+26

This diff is too big to show here.

test/command/bibtex-basic.mdnew file+71

This diff is too big to show here.

test/command/bioethics.cslnew file+226

This diff is too big to show here.

test/command/chap1/spider.pngnew file

Binary file not shown.

test/command/chap1/text.mdnew file+17

This diff is too big to show here.

test/command/chap2/spider.pngnew file

Binary file not shown.

test/command/chap2/text.mdnew file+5

This diff is too big to show here.

test/command/chicago-annotated-bibliography.cslnew file+1207

This diff is too big to show here.

test/command/chicago-author-date-with-original-date-and-status.cslnew file+575

This diff is too big to show here.

test/command/chicago-fullnote-bibliography.cslnew file+1430

This diff is too big to show here.

test/command/chicago-note-bibliography.cslnew file+1005

This diff is too big to show here.

test/command/chinese-gb7714-2005-numeric.cslnew file+213

This diff is too big to show here.

test/command/cite-in-inline-note.md+1−1

This diff is too big to show here.

test/command/citeproc-17.mdnew file+17

This diff is too big to show here.

test/command/citeproc-20.mdnew file+25

This diff is too big to show here.

test/command/citeproc-7a.mdnew file+42

This diff is too big to show here.

test/command/citeproc-7b.mdnew file+36

This diff is too big to show here.

test/command/citeproc-author-in-text-suffix.mdnew file+6

This diff is too big to show here.

test/command/custom-attributes.htmldeleted−16

This diff is too big to show here.

test/command/defaults-inheritance-1.mdnew file+6

This diff is too big to show here.

test/command/defaults-inheritance-2.mdnew file+5

This diff is too big to show here.

test/command/defaults-inheritance-3.mdnew file+6

This diff is too big to show here.

test/command/defaults3.yamlnew file+4

This diff is too big to show here.

test/command/defaults4.yamlnew file+3

This diff is too big to show here.

test/command/defaults5.yamlnew file+2

This diff is too big to show here.

test/command/defaults6.yamlnew file+2

This diff is too big to show here.

test/command/defaults7.yamlnew file+2

This diff is too big to show here.

test/command/defaults8.yamlnew file+2

This diff is too big to show here.

test/command/defaults9.yamlnew file+1

This diff is too big to show here.

test/command/din-1505-2.cslnew file+406

This diff is too big to show here.

test/command/docbook-bibliography.mdnew file+20

This diff is too big to show here.

test/command/duplicate_attributes.mdnew file+7

This diff is too big to show here.

test/command/empty-inline-code.txtdeleted−6

This diff is too big to show here.

test/command/gfm.md+4−4

This diff is too big to show here.

test/command/harvard-university-of-kent.cslnew file+253

This diff is too big to show here.

test/command/ieee.cslnew file+339

This diff is too big to show here.

test/command/issue160.cslnew file+28

This diff is too big to show here.

test/command/issue437.cslnew file+26

This diff is too big to show here.

test/command/issue58.cslnew file+553

This diff is too big to show here.

data/jats.csl → test/command/jats.cslrenamed+12−7

This diff is too big to show here.

test/command/latex-center.mdnew file+13

This diff is too big to show here.

test/command/le-tapuscrit-note.cslnew file+496

This diff is too big to show here.

test/command/lists-inside-definition.mdnew file+67

This diff is too big to show here.

test/command/locators.cslnew file+68

This diff is too big to show here.

test/command/mmd-metadata.mdnew file+20

This diff is too big to show here.

test/command/modern-humanities-research-association.cslnew file+445

This diff is too big to show here.

test/command/nested-table-to-asciidoc-6942.mdnew file+82

This diff is too big to show here.

test/command/newif.mdnew file+55

This diff is too big to show here.

test/command/oscola.cslnew file+680

This diff is too big to show here.

test/command/pandoc-citeproc-118.mdnew file+28

This diff is too big to show here.

test/command/pandoc-citeproc-119.mdnew file+38

This diff is too big to show here.

test/command/pandoc-citeproc-13.mdnew file+29

This diff is too big to show here.

test/command/pandoc-citeproc-136.mdnew file+23

This diff is too big to show here.

test/command/pandoc-citeproc-14.mdnew file+77

This diff is too big to show here.

test/command/pandoc-citeproc-152.mdnew file+63

This diff is too big to show here.

test/command/pandoc-citeproc-160.mdnew file+44

This diff is too big to show here.

test/command/pandoc-citeproc-175.mdnew file+43

This diff is too big to show here.

test/command/pandoc-citeproc-197.mdnew file+31

This diff is too big to show here.

test/command/pandoc-citeproc-213.mdnew file+33

This diff is too big to show here.

test/command/pandoc-citeproc-25.mdnew file+30

This diff is too big to show here.

test/command/pandoc-citeproc-250.mdnew file+21

This diff is too big to show here.

test/command/pandoc-citeproc-27.mdnew file+38

This diff is too big to show here.

test/command/pandoc-citeproc-292.mdnew file+43

This diff is too big to show here.

test/command/pandoc-citeproc-301.mdnew file+25

This diff is too big to show here.

test/command/pandoc-citeproc-307.mdnew file+31

This diff is too big to show here.

test/command/pandoc-citeproc-31.mdnew file+48

This diff is too big to show here.

test/command/pandoc-citeproc-312.mdnew file+171

This diff is too big to show here.

test/command/pandoc-citeproc-320.mdnew file+254

This diff is too big to show here.

test/command/pandoc-citeproc-320a.mdnew file+87

This diff is too big to show here.

test/command/pandoc-citeproc-322.mdnew file+35

This diff is too big to show here.

test/command/pandoc-citeproc-325.mdnew file+30

This diff is too big to show here.

test/command/pandoc-citeproc-327.mdnew file+51

This diff is too big to show here.

test/command/pandoc-citeproc-338.mdnew file+35

This diff is too big to show here.

test/command/pandoc-citeproc-351.mdnew file+27

This diff is too big to show here.

test/command/pandoc-citeproc-356.mdnew file+20

This diff is too big to show here.

test/command/pandoc-citeproc-360.mdnew file+35

This diff is too big to show here.

test/command/pandoc-citeproc-361.mdnew file+80

This diff is too big to show here.

test/command/pandoc-citeproc-365.mdnew file+39

This diff is too big to show here.

test/command/pandoc-citeproc-371.mdnew file+40

This diff is too big to show here.

test/command/pandoc-citeproc-38.mdnew file+29

This diff is too big to show here.

test/command/pandoc-citeproc-386.mdnew file+35

This diff is too big to show here.

test/command/pandoc-citeproc-392.mdnew file+29

This diff is too big to show here.

test/command/pandoc-citeproc-399.mdnew file+45

This diff is too big to show here.

test/command/pandoc-citeproc-401.mdnew file+59

This diff is too big to show here.

test/command/pandoc-citeproc-408.mdnew file+39

This diff is too big to show here.

test/command/pandoc-citeproc-416.mdnew file+60

This diff is too big to show here.

test/command/pandoc-citeproc-437.mdnew file+23

This diff is too big to show here.

test/command/pandoc-citeproc-47.mdnew file+112

This diff is too big to show here.

test/command/pandoc-citeproc-51.mdnew file+45

This diff is too big to show here.

test/command/pandoc-citeproc-53.mdnew file+56

This diff is too big to show here.

test/command/pandoc-citeproc-57.mdnew file+37

This diff is too big to show here.

test/command/pandoc-citeproc-58.mdnew file+32

This diff is too big to show here.

test/command/pandoc-citeproc-61.mdnew file+77

This diff is too big to show here.

test/command/pandoc-citeproc-64.mdnew file+24

This diff is too big to show here.

test/command/pandoc-citeproc-65.mdnew file+38

This diff is too big to show here.

test/command/pandoc-citeproc-68.mdnew file+56

This diff is too big to show here.

test/command/pandoc-citeproc-7.mdnew file+31

This diff is too big to show here.

test/command/pandoc-citeproc-70.mdnew file+73

This diff is too big to show here.

test/command/pandoc-citeproc-75.mdnew file+67

This diff is too big to show here.

test/command/pandoc-citeproc-76.mdnew file+64

This diff is too big to show here.

test/command/pandoc-citeproc-77.mdnew file+67

This diff is too big to show here.

test/command/pandoc-citeproc-82.mdnew file+39

This diff is too big to show here.

test/command/pandoc-citeproc-87.mdnew file+156

This diff is too big to show here.

test/command/pandoc-citeproc-chicago-author-date.mdnew file+109

This diff is too big to show here.

test/command/pandoc-citeproc-chicago-fullnote-bibliography.mdnew file+134

This diff is too big to show here.

test/command/pandoc-citeproc-ieee.mdnew file+113

This diff is too big to show here.

test/command/pandoc-citeproc-locators-delimited.mdnew file+127

This diff is too big to show here.

test/command/pandoc-citeproc-locators-integrated.mdnew file+159

This diff is too big to show here.

test/command/pandoc-citeproc-move-period-inside-quote.mdnew file+52

This diff is too big to show here.

test/command/pandoc-citeproc-no-author.mdnew file+73

This diff is too big to show here.

test/command/pandoc-citeproc-number-of-volumes.mdnew file+29

This diff is too big to show here.

test/command/pandoc-citeproc-page-range.mdnew file+32

This diff is too big to show here.

test/command/sage-harvard.cslnew file+202

This diff is too big to show here.

test/command/science.cslnew file+245

This diff is too big to show here.

test/command/style399.cslnew file+12

This diff is too big to show here.

test/command/svg.md+17−15

This diff is too big to show here.

test/command/table-with-cell-align.mdnew file+82

This diff is too big to show here.

test/command/table-with-column-span.mdnew file+276

This diff is too big to show here.

test/command/toc.md+11−20

This diff is too big to show here.

test/command/unicode-collation.mdnew file+130

This diff is too big to show here.

test/command/vancouver.cslnew file+351

This diff is too big to show here.

test/command/yaml-metadata-blocks.md+3−3

This diff is too big to show here.

test/command/zeitschrift-fur-kunstgeschichte.cslnew file+346

This diff is too big to show here.

test/docbook-reader.docbook+9−2

This diff is too big to show here.

test/docx/0_level_headers.native+2−2

This diff is too big to show here.

test/docx/golden/block_quotes.docx

Binary file not shown.

test/docx/golden/codeblock.docx

Binary file not shown.

test/docx/golden/comments.docx

Binary file not shown.

test/docx/golden/custom_style_no_reference.docx

Binary file not shown.

test/docx/golden/custom_style_preserve.docx

Binary file not shown.

test/docx/golden/custom_style_reference.docx

Binary file not shown.

test/docx/golden/definition_list.docx

Binary file not shown.

test/docx/golden/document-properties-short-desc.docx

Binary file not shown.

test/docx/golden/document-properties.docx

Binary file not shown.

test/docx/golden/headers.docx

Binary file not shown.

test/docx/golden/image.docx

Binary file not shown.

test/docx/golden/inline_code.docx

Binary file not shown.

test/docx/golden/inline_formatting.docx

Binary file not shown.

test/docx/golden/inline_images.docx

Binary file not shown.

test/docx/golden/link_in_notes.docx

Binary file not shown.

test/docx/golden/links.docx

Binary file not shown.

test/docx/golden/lists.docx

Binary file not shown.

test/docx/golden/lists_continuing.docx

Binary file not shown.

test/docx/golden/lists_multiple_initial.docxnew file

Binary file not shown.

test/docx/golden/lists_restarting.docx

Binary file not shown.

test/docx/golden/nested_anchors_in_header.docx

Binary file not shown.

test/docx/golden/notes.docx

Binary file not shown.

test/docx/golden/raw-blocks.docxnew file

Binary file not shown.

test/docx/golden/raw-bookmarks.docxnew file

Binary file not shown.

test/docx/golden/table_one_row.docx

Binary file not shown.

test/docx/golden/table_with_list_cell.docx

Binary file not shown.

test/docx/golden/tables-default-widths.docxnew file

Binary file not shown.

test/docx/golden/tables.docx

Binary file not shown.

test/docx/golden/track_changes_deletion.docx

Binary file not shown.

test/docx/golden/track_changes_insertion.docx

Binary file not shown.

test/docx/golden/track_changes_move.docx

Binary file not shown.

test/docx/golden/track_changes_scrubbed_metadata.docxnew file

Binary file not shown.

test/docx/golden/unicode.docx

Binary file not shown.

test/docx/golden/verbatim_subsuper.docx

Binary file not shown.

test/docx/image_vml_as_object.docxnew file

Binary file not shown.

test/docx/image_vml_as_object.nativenew file+2

This diff is too big to show here.

test/docx/inline_formatting.native+1−1

This diff is too big to show here.

test/docx/lists_multiple_initial.nativenew file+8

This diff is too big to show here.

test/docx/raw-blocks.nativenew file+6

This diff is too big to show here.

test/docx/raw-bookmarks.nativenew file+3

This diff is too big to show here.

test/docx/sdt_elements.native+9−10

This diff is too big to show here.

test/docx/table_captions_no_field.docxnew file

Binary file not shown.

test/docx/table_captions_no_field.nativenew file+34

This diff is too big to show here.

test/docx/table_captions_with_field.docxnew file

Binary file not shown.

test/docx/table_captions_with_field.nativenew file+54

This diff is too big to show here.

test/docx/table_header_rowspan.docxnew file

Binary file not shown.

test/docx/table_header_rowspan.nativenew file+189

This diff is too big to show here.

test/docx/table_one_header_row.docxnew file

Binary file not shown.

test/docx/table_one_header_row.nativenew file+18

This diff is too big to show here.

test/docx/table_one_row.docx

Binary file not shown.

test/docx/table_one_row.native+4−4

This diff is too big to show here.

test/docx/table_variable_width.native+12−17

This diff is too big to show here.

test/docx/table_with_list_cell.native+3−3

This diff is too big to show here.

test/docx/tables-default-widths.nativenew file+92

This diff is too big to show here.

test/docx/tables.native+9−9

This diff is too big to show here.

test/docx/track_changes_scrubbed_metadata.docxnew file

Binary file not shown.

test/docx/track_changes_scrubbed_metadata.nativenew file+9

This diff is too big to show here.

test/epub/features.epub

Binary file not shown.

test/epub/features.native+3−3

This diff is too big to show here.

test/epub/wasteland.epub

Binary file not shown.

test/epub/wasteland.native+4−4

This diff is too big to show here.

test/fb2/images.fb2+1−1

This diff is too big to show here.

test/fb2/test.jpg

Binary file not shown.

test/grofftest.shdeleted−26

This diff is too big to show here.

test/html-reader.html+76

This diff is too big to show here.

test/html-reader.native+148−37

This diff is too big to show here.

test/ipynb/simple.out.native+3−3

This diff is too big to show here.

test/jats-reader.native+1−1

This diff is too big to show here.

test/jats-reader.xml+1

This diff is too big to show here.

test/jira-reader.native+1−1

This diff is too big to show here.

test/latex-reader.native+26−13

This diff is too big to show here.

test/lhs-test.html+135−3

This diff is too big to show here.

test/lhs-test.html+lhs+135−3

This diff is too big to show here.

test/lhs-test.latex+6−3

This diff is too big to show here.

test/lhs-test.latex+lhs+6−3

This diff is too big to show here.

test/lua/module/pandoc-path.luanew file+44

This diff is too big to show here.

test/lua/module/pandoc-utils.lua+66

This diff is too big to show here.

test/markdown-citations.native+14−14

This diff is too big to show here.

test/markdown-reader-more.native+6−34

This diff is too big to show here.

test/odt/native/tab.nativenew file+1

This diff is too big to show here.

test/odt/odt/tab.odtnew file

Binary file not shown.

test/org-select-tags.org+2−2

This diff is too big to show here.

test/pipe-tables.native+2−10

This diff is too big to show here.

test/pptx/code-custom.pptx

Binary file not shown.

test/pptx/code-custom_templated.pptx

Binary file not shown.

test/pptx/code.pptx

Binary file not shown.

test/pptx/code_templated.pptx

Binary file not shown.

test/pptx/document-properties-short-desc.pptx

Binary file not shown.

test/pptx/document-properties-short-desc_templated.pptx

Binary file not shown.

test/pptx/document-properties.pptx

Binary file not shown.

test/pptx/document-properties_templated.pptx

Binary file not shown.

test/pptx/endnotes.pptx

Binary file not shown.

test/pptx/endnotes_templated.pptx

Binary file not shown.

test/pptx/endnotes_toc.pptx

Binary file not shown.

test/pptx/endnotes_toc_templated.pptx

Binary file not shown.

test/pptx/images.pptx

Binary file not shown.

test/pptx/images_templated.pptx

Binary file not shown.

test/pptx/inline_formatting.pptx

Binary file not shown.

test/pptx/inline_formatting_templated.pptx

Binary file not shown.

test/pptx/lists.pptx

Binary file not shown.

test/pptx/lists_templated.pptx

Binary file not shown.

test/pptx/raw_ooxml.native+1−1

This diff is too big to show here.

test/pptx/raw_ooxml.pptx

Binary file not shown.

test/pptx/raw_ooxml_templated.pptx

Binary file not shown.

test/pptx/reference_depth.pptx

Binary file not shown.

test/pptx/remove_empty_slides.pptx

Binary file not shown.

test/pptx/remove_empty_slides_templated.pptx

Binary file not shown.

test/pptx/slide_breaks.pptx

Binary file not shown.

test/pptx/slide_breaks_slide_level_1.pptx

Binary file not shown.

test/pptx/slide_breaks_slide_level_1_templated.pptx

Binary file not shown.

test/pptx/slide_breaks_templated.pptx

Binary file not shown.

test/pptx/slide_breaks_toc.pptx

Binary file not shown.

test/pptx/slide_breaks_toc_templated.pptx

Binary file not shown.

test/pptx/speaker_notes.pptx

Binary file not shown.

test/pptx/speaker_notes_after_metadata.pptx

Binary file not shown.

test/pptx/speaker_notes_after_metadata_templated.pptx

Binary file not shown.

test/pptx/speaker_notes_afterheader.pptx

Binary file not shown.

test/pptx/speaker_notes_afterheader_templated.pptx

Binary file not shown.

test/pptx/speaker_notes_afterseps.pptx

Binary file not shown.

test/pptx/speaker_notes_afterseps_templated.pptx

Binary file not shown.

test/pptx/speaker_notes_templated.pptx

Binary file not shown.

test/pptx/start_numbering_at.pptx

Binary file not shown.

test/pptx/start_numbering_at_templated.pptx

Binary file not shown.

test/pptx/tables.pptx

Binary file not shown.

test/pptx/tables_templated.pptx

Binary file not shown.

test/pptx/two_column.pptx

Binary file not shown.

test/pptx/two_column_templated.pptx

Binary file not shown.

test/rst-reader.native+3−21

This diff is too big to show here.

test/s5-fancy.html+1−1

This diff is too big to show here.

test/tables-rstsubset.native+1−9

This diff is too big to show here.

test/tables.jats_archiving+156−156

This diff is too big to show here.

test/tables.jats_articleauthoring+156−156

This diff is too big to show here.

test/tables.jats_publishing+156−156

This diff is too big to show here.

test/tables.latex+65−101

This diff is too big to show here.

test/tables.ms+44

This diff is too big to show here.

test/tables.org+3−3

This diff is too big to show here.

test/tables/nordics.html4new file+59

This diff is too big to show here.

test/tables/nordics.html5new file+59

This diff is too big to show here.

test/tables/nordics.jats_archivingnew file+58

This diff is too big to show here.

test/tables/nordics.latexnew file+42

This diff is too big to show here.

test/tables/nordics.nativenew file+73

This diff is too big to show here.

test/tables/planets.html4new file+133

This diff is too big to show here.

test/tables/planets.html5new file+133

This diff is too big to show here.

test/tables/planets.jats_archivingnew file+128

This diff is too big to show here.

test/tables/planets.latexnew file+30

This diff is too big to show here.

test/tables/planets.nativenew file+241

This diff is too big to show here.

test/tables/students.html4new file+55

This diff is too big to show here.

test/tables/students.html5new file+55

This diff is too big to show here.

test/tables/students.jats_archivingnew file+56

This diff is too big to show here.

test/tables/students.latexnew file+31

This diff is too big to show here.

test/tables/students.nativenew file+54

This diff is too big to show here.

test/test-pandoc.hs+22−8

This diff is too big to show here.

test/textile-reader.native+1−1

This diff is too big to show here.

test/textile-reader.textile+1−1

This diff is too big to show here.

test/txt2tags.native+1−1

This diff is too big to show here.

test/txt2tags.t2t+1−1

This diff is too big to show here.

test/writer.asciidoc+1−1

This diff is too big to show here.

test/writer.asciidoctor+1−1

This diff is too big to show here.

test/writer.context+45−43

This diff is too big to show here.

test/writer.custom+2−2

This diff is too big to show here.

test/writer.dokuwiki+11

This diff is too big to show here.

test/writer.html4+131

This diff is too big to show here.

test/writer.html5+132−1

This diff is too big to show here.

test/writer.icml+65−29

This diff is too big to show here.

test/writer.jats_archiving+12−8

This diff is too big to show here.

test/writer.jats_articleauthoring+1−1

This diff is too big to show here.

test/writer.jats_publishing+12−8

This diff is too big to show here.

test/writer.jira+25−37

This diff is too big to show here.

test/writer.latex+6−3

This diff is too big to show here.

test/writer.markdown+28−55

This diff is too big to show here.

test/writer.ms+1−1

This diff is too big to show here.

test/writer.opml+1−1

This diff is too big to show here.

test/writer.org+91−118

This diff is too big to show here.

test/writer.zimwiki+3−3

This diff is too big to show here.

test/writers-lang-and-dir.context+7−5

This diff is too big to show here.

test/writers-lang-and-dir.latex+13−7

This diff is too big to show here.

tools/build-arm.shnew file+110

This diff is too big to show here.

tools/changelog-helper.sh+11−4

This diff is too big to show here.

tools/parseTimings.plnew file+33

This diff is too big to show here.

trypandoc/index.html+1−1

This diff is too big to show here.

trypandoc/trypandoc.hs+4−10

This diff is too big to show here.

windows/Makefile+1−1

This diff is too big to show here.

windows/pandoc.wxs+2−4

This diff is too big to show here.