diff --git a/AUTHORS.md b/AUTHORS.md --- a/AUTHORS.md +++ b/AUTHORS.md @@ -95,6 +95,7 @@ - Jesse Rosenthal - Joe Hermaszewski - Joe Hillenbrand +- John KetzerX - John MacFarlane - John Muccigrosso - John Luke Bentley @@ -176,6 +177,7 @@ - Simon Hengel - Stefan Dresselhaus - Sumit Sahrawat +- Tarik Graba - Thenaesh Elango - Thomas Hodgson - Thomas Weißschuh diff --git a/COPYRIGHT b/COPYRIGHT --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,5 +1,5 @@ Pandoc -Copyright (C) 2006-2018 John MacFarlane +Copyright (C) 2006-2019 John MacFarlane With the exceptions noted below, this code is released under the [GPL], version 2 or later: @@ -37,7 +37,7 @@ Text.Pandoc.Builder, Text.Pandoc.Generics, Text.Pandoc.JSON, Text.Pandoc.Walk) are licensed under the BSD 3-clause license: -Copyright (c) 2006-2018, John MacFarlane +Copyright (c) 2006-2019, John MacFarlane All rights reserved. @@ -73,29 +73,29 @@ GPL (v2 or higher, same as pandoc) or (at your option) the BSD 3-clause license. -Copyright (c) 2014--2018, John MacFarlane +Copyright (c) 2014--2019, John MacFarlane ---------------------------------------------------------------------- src/Text/Pandoc/Writers/Muse.hs -Copyright (C) 2017-2018 Alexander Krotov +Copyright (C) 2017-2019 Alexander Krotov Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- src/Text/Pandoc/Writers/Texinfo.hs -Copyright (C) 2008-2018 John MacFarlane and Peter Wang +Copyright (C) 2008-2019 John MacFarlane and Peter Wang Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- src/Text/Pandoc/Writers/OpenDocument.hs -Copyright (C) 2008-2018 Andrea Rossato and John MacFarlane +Copyright (C) 2008-2019 Andrea Rossato and John MacFarlane Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- src/Text/Pandoc/Writers/Org.hs -Copyright (C) 2010-2018 Puneeth Chaganti, John MacFarlane, and +Copyright (C) 2010-2019 Puneeth Chaganti, John MacFarlane, and Albert Krewinkel Released under the GNU General Public License version 2 or later. @@ -109,13 +109,13 @@ ---------------------------------------------------------------------- src/Text/Pandoc/Readers/Docx.hs src/Text/Pandoc/Readers/Docx/* -Copyright (C) 2014-2018 Jesse Rosenthal +Copyright (C) 2014-2019 Jesse Rosenthal Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- src/Text/Pandoc/Readers/Textile.hs -Copyright (C) 2010-2018 Paul Rivier and John MacFarlane +Copyright (C) 2010-2019 Paul Rivier and John MacFarlane Released under the GNU General Public License version 2 or later. @@ -141,7 +141,7 @@ src/Text/Pandoc/Readers/Org.hs src/Text/Pandoc/Readers/Org/* test/Tests/Readers/Org/* -Copyright (C) 2014-2018 Albert Krewinkel +Copyright (C) 2014-2019 Albert Krewinkel Released under the GNU General Public License version 2 or later. @@ -153,7 +153,7 @@ ---------------------------------------------------------------------- data/pandoc.lua -Copyright (C) 2017-2018 Albert Krewinkel +Copyright (C) 2017-2019 Albert Krewinkel Released under the GNU General Public License version 2 or later. diff --git a/MANUAL.txt b/MANUAL.txt --- a/MANUAL.txt +++ b/MANUAL.txt @@ -1,6 +1,6 @@ % Pandoc User's Guide % John MacFarlane -% January 30, 2019 +% March 2, 2019 Synopsis ======== @@ -279,7 +279,7 @@ : Specify output format. *FORMAT* can be: ::: {#output-formats} - - `asciidoc` ([AsciiDoc]) + - `asciidoc` ([AsciiDoc]) or `asciidoctor` ([AsciiDoctor]) - `beamer` ([LaTeX beamer][`beamer`] slide show) - `commonmark` ([CommonMark] Markdown) - `context` ([ConTeXt]) @@ -349,18 +349,13 @@ : Specify the user data directory to search for pandoc data files. If this option is not specified, the default user data directory - will be used. This is, in UNIX: - - $HOME/.pandoc - - in Windows XP: - - C:\Documents And Settings\USERNAME\Application Data\pandoc - - and in Windows Vista or later: - - C:\Users\USERNAME\AppData\Roaming\pandoc - + will be used. On \*nix and macOS systems this will be the `pandoc` + subdirectory of the XDG data directory (by default, + `$HOME/.local/share`, overridable by setting the `XDG_DATA_HOME` + environment variable). If that directory does not exist, + `$HOME/.pandoc` will be used (for backwards compatibility). + In Windows the default user data directory is + `C:\Users\USERNAME\AppData\Roaming\pandoc`. You can find the default user data directory on your system by looking at the output of `pandoc --version`. A `reference.odt`, `reference.docx`, `epub.css`, `templates`, @@ -465,6 +460,7 @@ [GNU Texinfo]: http://www.gnu.org/software/texinfo/ [Emacs Org mode]: http://orgmode.org [AsciiDoc]: http://www.methods.co.nz/asciidoc/ +[AsciiDoctor]: https://asciidoctor.org/ [DZSlides]: http://paulrouget.com/dzslides/ [Word docx]: https://en.wikipedia.org/wiki/Office_Open_XML [PDF]: https://www.adobe.com/pdf/ @@ -1025,9 +1021,9 @@ in Word, modify the styles as you wish, and save the file. For best results, do not make changes to this file other than modifying the styles used by pandoc: - + Paragraph styles: - + - Normal - Body Text - First Paragraph @@ -1057,17 +1053,17 @@ - Figure - Captioned Figure - TOC Heading - + Character styles: - + - Default Paragraph Font - Body Text Char - Verbatim Char - Footnote Reference - Hyperlink - + Table style: - + - Table ODT @@ -1191,17 +1187,29 @@ the EPUB-specific contents. The default is `EPUB`. To put the EPUB contents in the top level, use an empty string. -`--pdf-engine=pdflatex`|`lualatex`|`xelatex`|`wkhtmltopdf`|`weasyprint`|`prince`|`context`|`pdfroff` +`--ipynb-output=all|none|best` +: Determines how ipynb output cells are treated. `all` means + that all of the data formats included in the original are + preserved. `none` means that the contents of data cells + are omitted. `best` causes pandoc to try to pick the + richest data block in each output cell that is compatible + with the output format. The default is `best`. + +`--pdf-engine=`*PROGRAM* + : Use the specified engine when producing PDF output. + Valid values are `pdflatex`, `lualatex`, `xelatex`, `latexmk`, + `wkhtmltopdf`, `weasyprint`, `prince`, `context`, and `pdfroff`. The default is `pdflatex`. If the engine is not in your PATH, the full path of the engine may be specified here. `--pdf-engine-opt=`*STRING* : Use the given string as a command-line argument to the `pdf-engine`. - If used multiple times, the arguments are provided with spaces between - them. Note that no check for duplicate options is done. + For example, to use a persistent directory `foo` for `latexmk`'s + auxiliary files, use `--pdf-engine-opt=-outdir=foo`. + Note that no check for duplicate options is done. [Dublin Core elements]: http://dublincore.org/documents/dces/ [ISO 8601 format]: http://www.w3.org/TR/NOTE-datetime @@ -1393,7 +1401,7 @@ and AsciiDoc metadata; repeat as for `author`, above `subject` -: document subject, included in ODT, docx and pptx metadata +: document subject, included in ODT, PDF, docx and pptx metadata `description` : document description, included in ODT, docx and pptx metadata. Some @@ -1433,10 +1441,10 @@ The [Language subtag lookup] tool can look up or verify these tags. This affects most formats, and controls hyphenation in PDF output when using LaTeX (through [`babel`] and [`polyglossia`]) or ConTeXt. - + Use native pandoc [Divs and Spans] with the `lang` attribute to switch the language: - + --- lang: en-GB ... @@ -1448,7 +1456,7 @@ ::: More text in English. ['Zitat auf Deutsch.']{lang=de} - + `dir` : the base script direction, either `rtl` (right-to-left) or `ltr` (left-to-right). @@ -1588,7 +1596,7 @@ : options for package used as `fontfamily`; repeat for multiple options. For example, to use the Libertine font with proportional lowercase (old-style) figures through the [`libertinus`] package: - + --- fontfamily: libertinus fontfamilyoptions: @@ -1924,6 +1932,8 @@ $author.name$ ($author.affiliation$) +The value of a variable will be indented to the same level as the variable. + If you use custom templates, you may need to revise them as pandoc changes. We recommend tracking the changes in the default templates, and modifying your custom templates accordingly. An easy way to do this @@ -2215,10 +2225,11 @@ #### Extension: `styles` #### {#ext-styles} -Read all docx styles as divs (for paragraph styles) and spans (for -character styles) regardless of whether pandoc understands the meaning -of these styles. This can be used with [docx custom -styles](#custom-styles). Disabled by default. +When converting from docx, read all docx styles as divs (for +paragraph styles) and spans (for character styles) regardless +of whether pandoc understands the meaning of these styles. +This can be used with [docx custom styles](#custom-styles). +Disabled by default. input formats : `docx` @@ -3513,7 +3524,11 @@ ~ It will be rendered using an [interpreted text role `:math:`]. AsciiDoc - ~ It will be rendered as `latexmath:[...]`. + ~ For AsciiDoc output format (`-t asciidoc`) it will appear verbatim + surrounded by `latexmath:[$...$]` (for inline math) or + `[latexmath]++++\[...\]+++` (for display math). + For AsciiDoctor output format (`-t asciidoctor`) the LaTex delimiters + (`$..$` and `\[..\]`) are omitted. Texinfo ~ It will be rendered inside a `@math` command. @@ -4535,9 +4550,9 @@ * Headers *above* the slide level in the hierarchy create "title slides," which just contain the section title and help to break the slide show into sections. - - * Content *above* the slide level will not appear in the slide - show. + Non-slide content under these headers will be included + on the title slide (for HTML slide shows) or in a + subsequent slide with the same title (for beamer). * A title page is constructed automatically from the document's title block, if present. (In the case of beamer, this can be disabled @@ -5056,6 +5071,52 @@ Custom styles can be used in the docx and ICML formats. +Output +------ + +By default, pandoc's docx and ICML output applies a predefined set of styles +for blocks such as paragraphs and block quotes, and uses largely default +formatting (italics, bold) for inlines. This will work for most +purposes, especially alongside a `reference.docx` file. However, if you +need to apply your own styles to blocks, or match a preexisting set of +styles, pandoc allows you to define custom styles for blocks and text +using `div`s and `span`s, respectively. + +If you define a `div` or `span` with the attribute `custom-style`, +pandoc will apply your specified style to the contained elements. So, +for example using the `bracketed_spans` syntax, + + [Get out]{custom-style="Emphatically"}, he said. + +would produce a docx file with "Get out" styled with character +style `Emphatically`. Similarly, using the `fenced_divs` syntax, + + Dickinson starts the poem simply: + + ::: {custom-style="Poetry"} + | A Bird came down the Walk--- + | He did not know I saw--- + ::: + +would style the two contained lines with the `Poetry` paragraph style. + +For docx output, styles will be defined in the output file as inheriting +from normal text, if the styles are not yet in your reference.docx. +If they are already defined, pandoc will not alter the definition. + +This feature allows for greatest customization in conjunction with +[pandoc filters]. If you want all paragraphs after block quotes to be +indented, you can write a filter to apply the styles necessary. If you +want all italics to be transformed to the `Emphasis` character style +(perhaps to change their color), you can write a filter which will +transform all italicized inlines to inlines within an `Emphasis` +custom-style `span`. + +For docx output, you don't need to enable any extensions for +custom styles to work. + +[pandoc filters]: http://pandoc.org/filters.html + Input ----- @@ -5103,49 +5164,6 @@ With these custom styles, you can use your input document as a reference-doc while creating docx output (see below), and maintain the same styles in your input and output files. - -Output ------- - -By default, pandoc's docx and ICML output applies a predefined set of styles -for blocks such as paragraphs and block quotes, and uses largely default -formatting (italics, bold) for inlines. This will work for most -purposes, especially alongside a `reference.docx` file. However, if you -need to apply your own styles to blocks, or match a preexisting set of -styles, pandoc allows you to define custom styles for blocks and text -using `div`s and `span`s, respectively. - -If you define a `div` or `span` with the attribute `custom-style`, -pandoc will apply your specified style to the contained elements. So, -for example using the `bracketed_spans` syntax, - - [Get out]{custom-style="Emphatically"}, he said. - -would produce a docx file with "Get out" styled with character -style `Emphatically`. Similarly, using the `fenced_divs` syntax, - - Dickinson starts the poem simply: - - ::: {custom-style="Poetry"} - | A Bird came down the Walk--- - | He did not know I saw--- - ::: - -would style the two contained lines with the `Poetry` paragraph style. - -For docx output, styles will be defined in the output file as inheriting -from normal text, if the styles are not yet in your reference.docx. -If they are already defined, pandoc will not alter the definition. - -This feature allows for greatest customization in conjunction with -[pandoc filters]. If you want all paragraphs after block quotes to be -indented, you can write a filter to apply the styles necessary. If you -want all italics to be transformed to the `Emphasis` character style -(perhaps to change their color), you can write a filter which will -transform all italicized inlines to inlines within an `Emphasis` -custom-style `span`. - -[pandoc filters]: http://pandoc.org/filters.html Custom writers ============== diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -81,7 +81,8 @@
- - `asciidoc` ([AsciiDoc](http://www.methods.co.nz/asciidoc/)) + - `asciidoc` ([AsciiDoc](http://www.methods.co.nz/asciidoc/)) or + `asciidoctor` ([AsciiDoctor](https://asciidoctor.org/)) - `beamer` ([LaTeX beamer](https://ctan.org/pkg/beamer) slide show) - `commonmark` ([CommonMark](http://commonmark.org) Markdown) - `context` ([ConTeXt](http://www.contextgarden.net/)) diff --git a/benchmark/benchmark-pandoc.hs b/benchmark/benchmark-pandoc.hs --- a/benchmark/benchmark-pandoc.hs +++ b/benchmark/benchmark-pandoc.hs @@ -1,7 +1,7 @@ {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE TupleSections #-} {- -Copyright (C) 2012-2018 John MacFarlane +Copyright (C) 2012-2019 John MacFarlane This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/benchmark/weigh-pandoc.hs b/benchmark/weigh-pandoc.hs --- a/benchmark/weigh-pandoc.hs +++ b/benchmark/weigh-pandoc.hs @@ -1,4 +1,15 @@ {-# LANGUAGE NoImplicitPrelude #-} +{- | + Module : Main + Copyright : © 2016-2019 John MacFarlane + License : GNU GPL, version 2 or above + + Maintainer : John MacFarlane + Stability : alpha + Portability : portable + +Benchmarks to determine resource use of readers and writers. +-} import Prelude import Weigh import Text.Pandoc diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,4 +1,248 @@ -pandoc (2.6) PROVISIONAL +pandoc (2.7) + + * Use XDG data directory for user data directory (#3582). Instead of + `$HOME/.pandoc`, the default user data directory is now + `$XDG_DATA_HOME/pandoc`, where `XDG_DATA_HOME` defaults to + `$HOME/.local/share` but can be overridden by setting the + environment variable. If this directory is missing, then + `$HOME/.pandoc` is searched instead, for backwards compatibility. + However, we recommend moving local pandoc data files from + `$HOME/.pandoc` to `$HOME/.local/share/pandoc`. On Windows the + default user data directory remains the same. + + * Slide show formats behavior change: content under headers + less than slide level is no longer ignored, but included in + the title slide (for HTML slide shows) or in a slide after + the title slide (for beamer). This change makes possible + 2D reveal.js slideshows with content in the top slide on + each stack (#4317, #5237). + + * Add command line option `--ipynb-output=all|none|best` (#5339). + Output cells in ipynb notebooks often contain several different + versions of an output, with different MIME types, e.g. an HTML + table and a plain-text fallback. Specifying `--ipynb-output=best` + (the default) ensures that the best version for the output format + is used. `all` includes all versions, and `none` suppresses them + all, leaving output cells empty. + + * `asciidoctor` is now an output format separate from `asciidoc`, + to accommodate some minor implementation-specific differences + (currently just in the treatment of display math). + + * Add `latexmk` as an option for `--pdf-engine` (#3195). + Note that you can use `--pdf-engine-opt=-outdir=bar` to specify + a persistent temp directory. + + * Markdown reader: + + + Improve tight/loose list handling (#5285). Previously the + algorithm allowed list items with a mix of Para and Plain, which + is never wanted. + + Add newline when parsing blocks in YAML (#5271). Otherwise last + block gets parsed as a Plain rather than a Para. This is a + regression in pandoc 2.x. This patch restores pandoc 1.19 + behavior. + + Make `yamlToMeta` respect extensions (#5272, Mauro Bieg). + This adds a `ReaderOptions` parameter to `yamlToMeta` [API change]. + + Fix bug parsing fenced code blocks (#5304). Previously parsing + would break if the code block contained a string of backticks of + sufficient length followed by something other than end of line. + + * LaTeX reader: don't let `\egroup` match `{`. `braced` now actually + requires nested braces. Otherwise some legitimate command and + environment definitions can break. + + * Docx reader (Jesse Rosenthal): + + + Rename `getDocumentPath` as `getDocumentXmlPath`. + + Use field notation for setting `ReaderEnv`. + + Figure out `document.xml` path once at the beginning of parsing, and + add it to the environment, so we can avoid repeated lookups. + + Dynamically determine main document xml path (#5277). + The desktop Word program places the main document file in + `word/document.xml`, but the online word places it in + `word/document2.xml`. This file path is actually stated in the root + `_rels/.rels` file, in the `Relationship` element with an + `http://../officedocument` type. + + Fix paths in archive to prevent Windows failure (#5277). + Some paths in archives are absolute (have an opening slash) which, for + reasons unknown, produces a failure in the test suite on MS + Windows. This fixes that by removing the leading slash if it exists. + + Add comments to aid code readability. + + Trim space inside the last inline (#5273). + + Unwrap sdt elements in footnotes and comments (#5302). + + * Muse reader (Alexander Krotov): + + + Test that block level markup does not break ``. + + Add secondary note support. + + * ipynb reader: handle images referring to attachments. Previously + we didn't strip off the attachment: prefix, so even though the + attachment was available in the mediabag, pandoc couldn't find it. + + * JATS reader: + + + Fix parsing of figures (#5321). This ensures that a figure + containing a single image is parsed as a pandoc "implicit + figure" (i.e., a Para with a single Image whose title attribute + begins with `fig:`). More complex figures will still be parsed + as divs. + + Support `fig-group` block element (#5317). + + Handle citations with multiple references (#5310). The `rid` + attribute can have a space-separated list of ids. + + * AsciiDoc Writer: Add `writeAsciiDoctor` [API change, Tarik Graba]. + Handle display math appropriately for Asciidoctor. + + * JATS writer: wrap figure caption in `

` to fix validation (#5290, + Mauro Bieg). + + * HTML writer: + + + Implement WAI-ARIA roles for (end)notes, citations, and + bibliography (#4213). Note that doc-biblioref is only used when + link-citations produces links, since it belongs on links. + + Include content (including speaker notes) in title slides + (#4317, #5237). + + * ipynb writer: + + + Ensure final newline. + + Only include metadata under `jupyter` field. + + Don't create attachments for images with absolute URIs, + including data: URIs (#5303). + + Keep plain text fallbacks in output even if a richer format is + included (#5293). We don't know what output format will be needed. + See the `--ipynb-output` command line option for a way to control + what formats are included in the output. + + * Markdown writer: use `markdown="1"` when appropriate for Divs: + when `native_divs` and `markdown_in_html_blocks` are disabled + but `raw_html` and `markdown_attribute` are enabled. + + * LaTeX writer: + + + Use right fold for `escapeString`. This is more elegant than + the explicit recursive code we were using. + + Avoid `{}` after control sequences when escaping. + `\ldots{}.` doesn't behave as well as `\ldots.` with the latex + ellipsis package. This patch causes pandoc to avoid emitting + the `{}` when it is not necessary. Now `\ldots` and other + control sequences used in escaping will be followed by either + a `{}`, a space, or nothing, depending on context. + + For beamer, include contents under headers superordinate to + slidelevel (#4317). Currently we keep the fancy title slide, and + add a new slide with the same title and whatever content was + under the header. + + * Powerpoint writer (Jesse Rosenthal): support underlines. + Use span with single class "underline" as in docx writer. + + * Muse writer: escape secondary notes (Alexander Krotov). + + * FB2 writer: add section identifiers support (#5229, John KetzerX). + + * Make `--fail-if-warnings` work for PDF output (#5343). + + * Lua filters (Albert Krewinkel): + + + Load module `pandoc` before calling `init.lua` (#5287). The file + `init.lua` in pandoc's data directory is run as part of pandoc's + Lua initialization process. Previously, the `pandoc` module was + loaded in `init.lua`, and the structure for marshaling was + set up after. This allowed simple patching of element + marshaling, but made using `init.lua` more difficult. Now, all + required modules are now loaded before calling `init.lua`. The + file can be used entirely for user customization. Patching + marshaling functions, while discouraged, is still possible via + the `debug` module. + + All Lua modules bundled with pandoc, i.e., `pandoc.List`, + `pandoc.mediabag`, `pandoc.utils`, and `text` are re-exported from the + `pandoc` module. They are assigned to the fields `List`, `mediabag`, + `utils`, and `text`, respectively. + + * Text.Pandoc.Lua (Albert Krewinkel): + + + Split `StackInstances` into smaller Marshaling modules. + + Get `CommonState` from Lua global. This allows more control over + the common state from within Lua scripts. + + * LaTeX template: + + + Support the `subject` metadata variable (#5289, Pascal Wagler). + + Add \frontmatter, \mainmatter, \backmatter for book classes (#5306). + + * epub3 template: Add titlepage class to section (#5269). + + * HTML5 template: Add ARIA role `doc-toc` for table of contents (#4213). + + * Make --metadata-file use pandoc-markdown (#5279, #5272, Mauro Bieg). + + * Text.Pandoc.Shared: + + + Remove `withTempDir` [API change]. + + Add new exported function `defaultUserDataDirs` [API change]. + + Add `filterIpynbOutput` [API change]. + + `compactify`: Avoid lists with a mix of Plain and Para elements + (#5285). + + * Text.Pandoc.Translations: reorder alphabetically and remove `Author` + (#5334, Mauro Bieg). + + * Text.Pandoc.Extensions: + + + More carefully groom ipynb default extensions. + + Add `all_symbols_escapable` to `githubMarkdownExtensions`. + + * Text.Pandoc.PDF: + + + Use system temp directory when possible (#1192). Previously we + created temp dirs in the working directory, partly (a) because + there were problems using the system temp directory on Windows, + when their pathnames included tildes, and partly (b) because + programs like `epstopdf.pl` would not be allowed to write to + directories outside the working directory in restricted mode. We + now (a) use the system temp dir except when the path includes + tildes, and (b) set `TEXMFOUTPUT` when creating the PDF, so that + subsidiary programs can use the system temp directory. This + addresses problems that occurred when pandoc was used in a + synced directory (such as Dropbox). + + Change types of subsidiary functions to PandocIO, to allow + warnings to be threaded through (#5343). + + * Text.Pandoc.MIME: add WebP (#5267, Mauro Bieg). + + * Tests: avoid calling `findPandoc` multiple times. + + * Old tests: remove need for temp files by using `pipeProcess`. + + * Added simple ipynb reader/writer tests (#5274). + + * Rearrange `--help` output in a more rational way, with common + options at the beginning and options grouped by function (#5336). + + * trypandoc: Add JATS and other missing formats (Arfon Smith, #5291). + + * Add missing copyright notices and remove license boilerplate (#4592, + Albert Krewinkel). + + * Use latest basement/foundation on 32bit windows. + + * Use latest skylighting (#5328). Custom syntax definitions no + longer try to load `language.dtd`. + + * Require texmath 0.11.2.1 + + * Use latest pandoc-citeproc (0.16.1.1). + + * MANUAL.txt: + + + Clarify variable substitution indentation in templates (#5338, + Agustín Martín Barbero). + + Reorder custom-styles section (#5324, Mauro Bieg). + +pandoc (2.6) * Support ipynb (Jupyter notebook) as input and output format. diff --git a/data/bash_completion.tpl b/data/bash_completion.tpl --- a/data/bash_completion.tpl +++ b/data/bash_completion.tpl @@ -29,8 +29,12 @@ COMPREPLY=( $(compgen -W "references javascript none" -- ${cur}) ) return 0 ;; + --ipynb-output) + COMPREPLY=( $(compgen -W "all none best" -- ${cur}) ) + return 0 + ;; --pdf-engine) - COMPREPLY=( $(compgen -W "pdflatex lualatex xelatex wkhtmltopdf weasyprint prince context pdfroff" -- ${cur}) ) + COMPREPLY=( $(compgen -W "pdflatex lualatex xelatex latexmk wkhtmltopdf weasyprint prince context pdfroff" -- ${cur}) ) return 0 ;; --print-default-data-file) diff --git a/data/init.lua b/data/init.lua --- a/data/init.lua +++ b/data/init.lua @@ -1,7 +1,3 @@ -- This Lua script is run every time the Lua interpreter is started when running -- a Lua filter. It can be customized to load additional modules or to alter the -- default modules. - -pandoc = require 'pandoc' -pandoc.mediabag = require 'pandoc.mediabag' -pandoc.utils = require 'pandoc.utils' diff --git a/data/pandoc.lua b/data/pandoc.lua --- a/data/pandoc.lua +++ b/data/pandoc.lua @@ -1,7 +1,7 @@ --[[ pandoc.lua -Copyright © 2017–2018 Albert Krewinkel +Copyright © 2017–2019 Albert Krewinkel Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice @@ -20,12 +20,20 @@ -- Lua functions for pandoc scripts. -- -- @author Albert Krewinkel --- @copyright © 2017–2018 Albert Krewinkel +-- @copyright © 2017–2019 Albert Krewinkel -- @license MIT local M = {} -local List = require 'pandoc.List' -local utils = require 'pandoc.utils' +-- Re-export bundled modules +M.List = require 'pandoc.List' +M.mediabag = require 'pandoc.mediabag' +M.utils = require 'pandoc.utils' +M.text = require 'text' + +-- Local names for modules which this module depends on. +local List = M.List +local utils = M.utils + ------------------------------------------------------------------------ -- Accessor objects diff --git a/data/templates/default.asciidoctor b/data/templates/default.asciidoctor new file mode 100644 --- /dev/null +++ b/data/templates/default.asciidoctor @@ -0,0 +1,41 @@ +$if(titleblock)$ += $title$ +$if(author)$ +$for(author)$$author$$sep$; $endfor$ +$endif$ +$if(date)$ +$date$ +$endif$ +$if(keywords)$ +:keywords: $for(keywords)$$keywords$$sep$, $endfor$ +$endif$ +$if(lang)$ +:lang: $lang$ +$endif$ +$if(toc)$ +:toc: +$endif$ +$if(math)$ +:stem: latexmath +$endif$ + +$endif$ +$if(abstract)$ +[abstract] +== Abstract +$abstract$ + +$endif$ +$for(header-includes)$ +$header-includes$ + +$endfor$ +$for(include-before)$ +$include-before$ + +$endfor$ +$body$ +$for(include-after)$ + +$include-after$ +$endfor$ diff --git a/data/templates/default.epub3 b/data/templates/default.epub3 --- a/data/templates/default.epub3 +++ b/data/templates/default.epub3 @@ -28,7 +28,7 @@ $if(titlepage)$ -

+
$for(title)$ $if(title.type)$

$title.text$

diff --git a/data/templates/default.html5 b/data/templates/default.html5 --- a/data/templates/default.html5 +++ b/data/templates/default.html5 @@ -60,7 +60,7 @@ $endif$ $if(toc)$ -