From cdbb14de5b1b688b664676f1cf623db2c666235b Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 15 Feb 2020 21:26:29 -0800 Subject: Update changelog and man page. --- man/pandoc.1 | 64 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 28 deletions(-) (limited to 'man') diff --git a/man/pandoc.1 b/man/pandoc.1 index 9dd35f5ce..60fe165a5 100644 --- a/man/pandoc.1 +++ b/man/pandoc.1 @@ -1,7 +1,7 @@ .\"t -.\" Automatically generated by Pandoc 2.9.1 +.\" Automatically generated by Pandoc 2.9.2 .\" -.TH "Pandoc User\[aq]s Guide" "" "January 5, 2020" "pandoc 2.9.1.1" "" +.TH "Pandoc User\[aq]s Guide" "" "February 15, 2020" "pandoc 2.9.2" "" .hy .SH NAME pandoc - general markup converter @@ -206,7 +206,7 @@ In this case pandoc will fetch the content using HTTP: .IP .nf \f[C] -pandoc -f html -t markdown http://www.fsf.org +pandoc -f html -t markdown https://www.fsf.org \f[R] .fi .PP @@ -216,7 +216,7 @@ requesting a document from a URL: .nf \f[C] pandoc -f html -t markdown --request-header User-Agent:\[dq]Mozilla/5.0\[dq] \[rs] - http://www.fsf.org + https://www.fsf.org \f[R] .fi .SH OPTIONS @@ -231,6 +231,8 @@ Specify input format. .IP \[bu] 2 \f[C]creole\f[R] (Creole 1.0) .IP \[bu] 2 +\f[C]csv\f[R] (CSV table) +.IP \[bu] 2 \f[C]docbook\f[R] (DocBook) .IP \[bu] 2 \f[C]docx\f[R] (Word docx) @@ -342,7 +344,13 @@ HTML5/XHTML polyglot markup) .IP \[bu] 2 \f[C]ipynb\f[R] (Jupyter notebook) .IP \[bu] 2 -\f[C]jats\f[R] (JATS XML) +\f[C]jats_archiving\f[R] (JATS XML, Archiving and Interchange Tag Set) +.IP \[bu] 2 +\f[C]jats_articleauthoring\f[R] (JATS XML, Article Authoring Tag Set) +.IP \[bu] 2 +\f[C]jats_publishing\f[R] (JATS XML, Journal Publishing Tag Set) +.IP \[bu] 2 +\f[C]jats\f[R] (alias for \f[C]jats_archiving\f[R]) .IP \[bu] 2 \f[C]jira\f[R] (Jira wiki markup) .IP \[bu] 2 @@ -406,7 +414,7 @@ HTML5/XHTML polyglot markup) .IP \[bu] 2 \f[C]zimwiki\f[R] (ZimWiki markup) .IP \[bu] 2 -the path of a custom lua writer, see Custom writers below +the path of a custom Lua writer, see Custom writers below .PP Note that \f[C]odt\f[R], \f[C]docx\f[R], \f[C]epub\f[R], and \f[C]pdf\f[R] output will not be directed to \f[I]stdout\f[R] unless @@ -603,25 +611,25 @@ above). .IP "3." 3 \f[C]$PATH\f[R] (executable only) .PP -Filters and lua-filters are applied in the order specified on the +Filters and Lua-filters are applied in the order specified on the command line. .RE .TP \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] Transform the document in a similar fashion as JSON filters (see -\f[C]--filter\f[R]), but use pandoc\[aq]s build-in lua filtering system. -The given lua script is expected to return a list of lua filters which +\f[C]--filter\f[R]), but use pandoc\[aq]s build-in Lua filtering system. +The given Lua script is expected to return a list of Lua filters which will be applied in order. -Each lua filter must contain element-transforming functions indexed by +Each Lua filter must contain element-transforming functions indexed by the name of the AST element on which the filter function should be applied. .RS .PP -The \f[C]pandoc\f[R] lua module provides helper functions for element +The \f[C]pandoc\f[R] Lua module provides helper functions for element creation. -It is always loaded into the script\[aq]s lua environment. +It is always loaded into the script\[aq]s Lua environment. .PP -The following is an example lua script for macro-expansion: +The following is an example Lua script for macro-expansion: .IP .nf \f[C] @@ -637,7 +645,7 @@ return {{Str = expand_hello_world}} \f[R] .fi .PP -In order of preference, pandoc will look for lua filters in +In order of preference, pandoc will look for Lua filters in .IP "1." 3 a specified full or relative path (executable or non-executable) .IP "2." 3 @@ -1688,7 +1696,7 @@ include-after-body: [] include-in-header: [] resource-path: [\[dq].\[dq]] -# filters will be assumed to be lua filters if they have +# filters will be assumed to be Lua filters if they have # the .lua extension, and json filters otherwise. But # the filter type can also be specified explicitly, as shown: filters: @@ -4983,7 +4991,7 @@ Thus, for example, pandoc will turn - +
*one*[a link](http://google.com)[a link](https://google.com)
\f[R] @@ -4996,7 +5004,7 @@ into - +
onea linka link
\f[R] @@ -5154,7 +5162,7 @@ a link: .IP .nf \f[C] - + \f[R] .fi @@ -5167,7 +5175,7 @@ the URL in parentheses. .nf \f[C] This is an [inline link](/url), and here\[aq]s [one with -a title](http://fsf.org \[dq]click here for a good time!\[dq]). +a title](https://fsf.org \[dq]click here for a good time!\[dq]). \f[R] .fi .PP @@ -5207,7 +5215,7 @@ Here are some examples: \f[C] [my label 1]: /foo/bar.html \[dq]My title, optional\[dq] [my label 2]: /foo -[my label 3]: http://fsf.org (The free software foundation) +[my label 3]: https://fsf.org (The free software foundation) [my label 4]: /bar#special \[aq]A title in single quotes\[aq] \f[R] .fi @@ -5224,7 +5232,7 @@ The title may go on the next line: .IP .nf \f[C] -[my label 3]: http://fsf.org +[my label 3]: https://fsf.org \[dq]The free software foundation\[dq] \f[R] .fi @@ -5684,7 +5692,7 @@ references: issue: 4356 page: 737-738 DOI: 10.1038/171737a0 - URL: http://www.nature.com/nature/journal/v171/n4356/abs/171737a0.html + URL: https://www.nature.com/articles/171737a0 language: en-GB \&... \f[R] @@ -5973,7 +5981,7 @@ extension. \f[C] This is a reference ![image][ref] with multimarkdown attributes. -[ref]: http://path.to/image \[dq]Image title\[dq] width=20px height=30px +[ref]: https://path.to/image \[dq]Image title\[dq] width=20px height=30px id=myId class=\[dq]myClass1 myClass2\[dq] \f[R] .fi @@ -6723,7 +6731,7 @@ For example: .nf \f[C] @@ -7019,11 +7027,11 @@ reference-doc while creating docx output (see below), and maintain the same styles in your input and output files. .SH CUSTOM WRITERS .PP -Pandoc can be extended with custom writers written in lua. -(Pandoc includes a lua interpreter, so lua need not be installed +Pandoc can be extended with custom writers written in Lua. +(Pandoc includes a Lua interpreter, so Lua need not be installed separately.) .PP -To use a custom writer, simply specify the path to the lua script in +To use a custom writer, simply specify the path to the Lua script in place of the output format. For example: .IP @@ -7033,7 +7041,7 @@ pandoc -t data/sample.lua \f[R] .fi .PP -Creating a custom writer requires writing a lua function for each +Creating a custom writer requires writing a Lua function for each possible element in a pandoc document. To get a documented example which you can modify according to your needs, do -- cgit v1.2.3