Commit Graph
8318 Commits
Author SHA1 Message Date
John MacFarlane 131f546282 Ensure that automatically set variables ...
`pandoc-version`, `outputfile`, `title-prefix`, `epub-cover-image`,
`curdir`, `dzslides-core` can be overridden by `--variable` on the
command line.

Previously they would create lists in the template Context,
which is not desirable.
2023-01-25 09:51:59 -08:00
John MacFarlane 23178ec96e LaTeX reader: Fix bug in macro resolution for environments.
This is a regression in pandoc 3.0 that affects environments
with arguments.  Closes #8573.
2023-01-23 12:48:49 -08:00
John MacFarlane 14acf8ee68 LaTeX reader: Fix small logic error in macro parsing code. 2023-01-23 12:48:49 -08:00
John MacFarlane 6182f1a81d Fix use of extensions with custom readers.
Closes #8571.
2023-01-21 21:21:49 -08:00
John MacFarlane ee3180160b T.P.Writers.Shared: export setupTranslations [API change].
Use this in HTML and OpenDocument writers.
2023-01-21 10:18:55 -08:00
John MacFarlane dacdd0a56e Chunked HTML writer: Fix handling of images with absolute URLs.
Cloess #8567.
2023-01-20 11:07:14 -08:00
John MacFarlane 6ebabd2118 HTML writer: don't omit newlines in task lists. 2023-01-20 10:29:40 -08:00
John MacFarlane 62e14233cd HTML writer: don't disable checkboxes in task lists.
Closes #8562.
2023-01-20 09:53:33 -08:00
John MacFarlane 8a1f4ad513 Add param to tocToList for numberSections.
Otherwise sections are always numbered in the TOC,
even if `--number-sections` is not used.
2023-01-18 11:15:57 -08:00
Albert Krewinkel 39830e1f61 Fix line lengths in Markdown reader, DocBook writer
Trying to limit lines to 80 chars.
2023-01-18 16:02:57 +01:00
John MacFarlane 2b19d29910 Fix spacing errors. 2023-01-17 21:28:49 -08:00
Albert Krewinkel 6934ba3d24 T.P.Class.IO: export function writeMedia [API change]
This is useful for the `pandoc.mediabag` module.
2023-01-16 10:12:09 -08:00
John MacFarlane c6551433b2 T.P.Chunks changes.
+ Re-use `toTocTree` in constructing `chunkedTOC`.
  Previously we used an entirely different function toTOCTree'.
+ Improve `tocToList` so that it avoids empty lists of
  items that are omitted because they are below the toc depth.

pandoc-lua-engine:

+ Fix structure tests in light of last change.

T.P.Writers.ChunkedHTML:

+ Reuse `tocToList` in `buildTOC`.

T.P.Writers.EPUB:

+ Adjust EPUB writer for Chunks changes.
2023-01-15 22:32:16 -08:00
Albert Krewinkel 89800c3f9e Chunks: export tocToList 2023-01-15 10:47:54 -08:00
Albert Krewinkel ca6d4bfa49 Markdown, CommonMark: add support for wiki links. [API change]
Adds the Markdown/CommonMark extensions `wikilinks_title_after_pipe` and
`wikilinks_title_before_pipe`. The former enables links of style `[[Name
of page|Title]]` and the latter `[[Title|Name of page]]`. Titles are
optional in both variants, so this works for both:
`[[https://example.org]]`, `[[Name of page]]`.

The writer is modified to render links with title `wikilink` as a
wikilink if a respective extension is enabled.

Pandoc will use `wikilinks_title_after_pipe` if both extensions are
enabled.

Closes: #2923
2023-01-15 10:46:55 -08:00
Albert Krewinkel c71d476fa6 ConTeXt writer: support tagging extension [API Change]
Paragraphs are enclosed by `\bpar` and `\epar` commands, and `highlight`
commands are used for emphasis. This results in much better tagging in
PDF output.
2023-01-15 10:03:58 -08:00
Albert Krewinkel 8f394a17f2 Remove Null constructor from docs 2023-01-14 10:10:26 +01:00
John MacFarlane 676a6b1f82 Remove block constructor Null from the code base.
It has been removed from pandoc-types.
2023-01-13 15:20:50 -08:00
Albert Krewinkel 0cc9085198 Org writer: use span attributes tag-name in headers as tags.
This enables round-tripping of tags in Org headings.

Closes: #8513
2023-01-13 19:52:24 +01:00
John MacFarlane 94f23d8aef ChunkedHTML writer: use fetchItem to get resources.
This ensures that they can be gotten from e.g. docx input.
2023-01-13 10:01:26 -08:00
Albert KrewinkelandAner Lucero 909ced5153 Support complex figures. [API change]
Thanks and credit go to Aner Lucero, who laid the groundwork for this
feature in the 2021 GSoC project. He contributed many changes, including
modifications to the readers for HTML, JATS, and LaTeX, and to the HTML
and JATS writers.

Shared (Albert Krewinkel):

- The new function `figureDiv`, exported from `Text.Pandoc.Shared`,
  offers a standardized way to convert a figure into a Div element.

Readers (Aner Lucero):

- HTML reader: `<figure>` elements are parsed as figures, with the
  caption taken from the respective `<figcaption>` elements.

- JATS reader: The `<fig>` and `<caption>` elements are parsed into
  figure elements, even if the contents is more complex.

- LaTeX reader: support for figures with non-image contents and for
  subfigures.

- Markdown reader: paragraphs containing just an image are treated as
  figures if the `implicit_figures` extension is enabled. The identifier
  is used as the figure's identifier and the image description is also
  used as figure caption; all other attributes are treated as belonging
  to the image.

Writers (Aner Lucero, Albert Krewinkel):

- DokuWiki, Haddock, Jira, Man, MediaWiki, Ms, Muse, PPTX, RTF, TEI,
  ZimWiki writers: Figures are rendered like Div elements.

- Asciidoc writer: The figure contents is unwrapped; each image in the
  the figure becomes a separate figure.

- Classic custom writers: Figures are passed to the global function
  `Figure(caption, contents, attr)`, where `caption` and `contents` are
  strings and `attr` is a table of key-value pairs.

- ConTeXt writer: Figures are wrapped in a "placefigure" environment
  with `\startplacefigure`/`\endplacefigure`, adding the features
  caption and listing title as properties. Subfigures are place in a
  single row with the `\startfloatcombination` environment.

- DocBook writer: Uses `mediaobject` elements, unless the figure contains
  subfigures or tables, in which case the figure content is unwrapped.

- Docx writer: figures with multiple content blocks are rendered as
  tables with style `FigureTable`; like before, single-image figures are
  still output as paragraphs with style `Figure` or `Captioned Figure`,
  depending on whether a caption is attached.

- DokuWiki writer: Caption and "alt-text" are no longer combined. The
  alt text of a figure will now be lost in the conversion.

- FB2 writer: The figure caption is added as alt text to the images in
  the figure; pre-existing alt texts are kept.

- ICML writer: Only single-image figures are supported. The contents of
  figures with additional elements gets unwrapped.

- HTML writer: the alt text is no longer constructed from the caption,
  as was the case with implicit figures. This reduces duplication, but
  comes at the risk of images that are missing alt texts. Authors should
  take care to provide alt texts for all images.

  Some readers, most notably the Markdown reader with the
  `implicit_figures` extension, add a caption that's identical to the
  image description. The writer checks for this and adds an
  `aria-hidden` attribute to the `<figcaption>` element in that case.

- JATS writer: The `<fig>` and `<caption>` elements are used write
  figures.

- LaTeX writer: complex figures, e.g. with non-image contents and
  subfigures, are supported. The `subfigure` template variable is set if
  the document contains subfigures, triggering the conditional loading
  of the *subcaption* package. Contants of figures that contain tables
  are become unwrapped, as longtable environments are not allowed within
  figures.

- Markdown writer: figures are output as implicit figures if possible,
  via HTML if the `raw_html` extension is enabled, and as Div elements
  otherwise.

- OpenDocument writer: A separate paragraph is generated for each block
  element in a figure, each with style `FigureWithCaption`. Behavior for
  single-image figures therefore remains unchanged.

- Org writer: Only the first element in a figure is given a caption;
  additional block elements in the figure are appended without any
  caption being added.

- RST writer: Single-image figures are supported as before; the contents
  of more complex images become nested in a container of type `float`.

- Texinfo writer: Figures are rendered as float with type `figure`.

- Textile writer: Figures are rendered with the help of HTML elements.

- XWiki: Figures are placed in a group.

Co-authored-by: Aner Lucero <4rgento@gmail.com>
2023-01-13 09:13:27 -08:00
Ruqi fdfa9fca68 Refine "blending" rules for MediaWiki links
The rules for "blending" characters outside a link into the link are
described here: https://en.wikipedia.org/wiki/Help:Wikitext#Blend_link

These pose a problem for CJK languages, which generally don't have
spaces after links.

However, it turns out that the blending behavior, as implemented on
Wikipedia, is (contrary to the documentation) only for ASCII letters.
This commit implements that restriction, which fixes the problem for
CJK.  (#8525)
2023-01-12 22:02:56 -08:00
lifeunleaded 4746d0c806 Store "unnumbered" class in DocBook role attribute (#8481)
Markdown allows marking a heading as unnumbered, which is stored
as a class token internally. This change will recognize this
particular class token and append it to the role attribute, or
create a role attribute with it if needed. This does not imply
any processing in DocBook but is intended to let customized
stylesheets identify these sections and act accordingly.

Closes #1402
2023-01-12 19:29:53 -08:00
John MacFarlane d7960212c0 Replace --epub-chapter-level with --split-level.
Rationale: we need this splitting level now not just in
EPUB but in chunked HTML.

`--epub-chapter-level` will still function as a deprecated
synonynm. `epub-chapter-level` will also continue to work in
defaults files, ande `epub_chapter_level` will still work for
Lua marshalling.

[API changes]

Text.Pandoc.App.Opt: remove `optEpubChapterLevel`, add
`optSplitLevel`.

Text.Pandoc.Options: remove `writerEpubChapterLevel`, add
`writerSplitLevel`.
2023-01-12 09:04:29 -08:00
John MacFarlane c99cc53024 Remove unnecessary import. 2023-01-11 10:42:24 -08:00
John MacFarlane a9a357b5d9 Allow --reference-doc to take URL argument.
Closes #8535.
2023-01-11 09:55:33 -08:00
John MacFarlane ec23d938e0 Add ChunkedHTML writer.
- Add module Text.Pandoc.Writers.ChunkedHTML,
  exporting writeChunkedHtml [API change].
- Revised API for Text.Pandoc.Chunks.
  `chunkNext`, `chunkPrev`, `chunkUp` are now
  just `Maybe Chunk`.
- Fix assignment of navigation elements of Chunks.
- Strip off anchor portion of next and prev links.
- Remove Ord instances for SecInfo, Chunk.
- Derive Show, Eq, Generic for ChunkDoc.
- Add `chunkSectionNumber`, `chunkUnlisted`.
- Automatically unwrap the zip to a directory
  if an extensionless output file specified.
- Incorporate images with relative paths below working dir.
2023-01-11 09:08:16 -08:00
John MacFarlane 0c453d275d Textile reader: support linked images.
Closes #8541.
2023-01-11 08:35:55 -08:00
John MacFarlane 5ddb61f213 Textile reader: fix strong emph ending with link.
Closes #8540.
2023-01-11 08:35:55 -08:00
Albert Krewinkel 7f5bd4031b Use jira-wiki-markup 1.5.0
Fixed issues with icon-like sequences at the beginning of words.

Fixes: #8511
2023-01-11 14:55:01 +01:00
Albert Krewinkel b55cd83a60 Update copyright years, it's 2023! 2023-01-10 20:28:27 +01:00
John MacFarlane 0d891afab6 isURI: don't require non-ASCII characters to be escaped.
Closes #8508.
2023-01-05 21:14:02 -08:00
John MacFarlane 7a82686adc Use \toprule\noalign{} instead of \toprule() in LaTeX tables.
And similar for `\midrule` and `\bottomrule`.

This facilitates redefining `\toprule`, `\midrule`, and `\bottomrule`
without needing to gobble the ()s.

Closes #8223.
2023-01-04 13:57:41 -08:00
John MacFarlane ce7d1d1c20 Man writer: use UTF-8 by default for non-ascii characters.
Only use groff escapes if `--ascii` has been specified on the
command line (`writerPreferAscii`).

Closes #8507.
2022-12-28 17:16:30 -08:00
John MacFarlane 6c96340bf6 Support "software" type in biblatex <-> CSL conversions.
Closes #8504.
2022-12-22 17:30:44 -08:00
John MacFarlane ee6cf1b8bf Make sure "version" field comes through in biblatex.
See #8504.
2022-12-22 17:08:50 -08:00
John MacFarlane 063480accd T.P.Scripting: Refactor the scripting engine.
The new type CustomComponents is exported from T.P.Scripting, and the
ScriptEngine fields are changed. Instead of separate fields for custom
readers and writers, we now have a single function that loads any number
of "components" from a script: these may be custom readers, custom
writers, templates for writers, or extension configs. (Note: it's
possible to have a custom reader and a custom writer for a format
together in the same file.)

Pandoc now checks the folder `custom` in the user's data directory for a
matching script if it can't find one in the local directory. Previously,
the `readers` and `writers` data directories were search for custom
readers and writers, respectively. Scripts in those directories must be
moved to the `custom` folder.

Custom readers used to implement a fallback behavior that allowed to
consume just a string value as input to the `Reader` function. This has
been removed, the first argument is now always a list of sources. Use
`tostring` on that argument to get a string.

Closes #8417.

Signed-off-by: Albert Krewinkel <albert@zeitkraut.de>
2022-12-20 20:58:44 -08:00
John MacFarlane 8553459f61 T.P.Format: Monoid, Semigroup instance for ExtensionsConfig. 2022-12-20 20:58:44 -08:00
Albert Krewinkel 1328e57f08 Shared: use LineBreak as default block sep in blocksToInlines
This change also affects the `pandoc.utils.blocks_to_inlines` Lua
function.

Closes: #8499
2022-12-20 13:39:16 -08:00
Albert Krewinkel c954dfab59 Markdown writer: avoid HTML fallbacks in the generated TOC.
The generated table of contents usually has IDs for each TOC link,
allowing to link back to specific parts of the TOC. However, this leads
to unidiomatic markup in formats like gfm, which do not support
attributes on links and hence fall back to HTML. The IDs on TOC items
are now removed in that case, leading to more aesthetic TOCs.

Closes: #8131
2022-12-20 18:21:16 +01:00
William RusnackandWilliam Rusnack 20765f41e2 Add Wrapper type documentation to Text.Pandoc.Templates (#8490)
Added more information on the wrappers from the commit
https://github.com/renjianxiongqi/pandoc/commit/f36b5b8a5db8479bcf98827c267840304403bdf0

Co-authored-by: William Rusnack <williamrusnack@gmail.com>
2022-12-18 07:26:12 -08:00
Albert Krewinkel e83120fd2d ConTeXt writer: support syntax highlighting for code. 2022-12-18 15:47:48 +01:00
Albert Krewinkel 8f5af5a06c ConTeXt writer: always use \type for inline code
Inline codes that contained curly braces where previously rendered with
`\mono`; this led to unexpected results when the presentation of `\type`
was customized, as those changes would not have been applied to code
rendered with `\mono`.
2022-12-17 23:53:12 +01:00
Albert Krewinkel db0232fc54 Format: add function diffExtensions. 2022-12-16 10:43:01 -08:00
Albert Krewinkel 038df3b24c Format: use simpler structure for ExtensionsDiff. 2022-12-16 10:43:01 -08:00
Albert Krewinkel 471317f4fe Extensions: add new function disableExtensions.
The function removes all elements in a second set from a base set.
Extensions in the second set that are not in the base set are ignored.
2022-12-16 10:43:01 -08:00
Albert Krewinkel 0d6c2e3e22 ConTeXt writer: fix previous commit for some unlisted sections
Unlist sections even if `--top-level-division` is not defined.
2022-12-16 14:09:09 +01:00
Albert Krewinkel da2d7ce6f5 ConTeXt writer: add support for unlisted, unnumbered headings
Closes: #8486
2022-12-16 13:48:57 +01:00
John MacFarlane 1698af8885 Textile reader: handle empty paragraphs.
Also, if attributes are added explicitly to a paragraph,
put it in a Div with the attributes.

Closes #8487.
2022-12-15 12:38:36 -08:00
Albert Krewinkel 200ad70d9d T.P.App.OutputSettings: remove unused record field outputWriterName 2022-12-14 20:56:33 +01:00