diff --git a/CHANGELOG.md b/CHANGELOG.md index ea21e11..b77962c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,20 @@ Changelog =============================================================================== -24.10 - Work in Progress +25.03 - Work in Progress ------------------------------------------------------------------------------- __Stack__ +* Ubuntu Noble +* pandoc/extra:3.6 +* Pandoc 3.6 +* Eisvogel 2.5.0 + __Changes__ +* Add silence package (#286) +* Update to pandoc 3.6 24.05 - Simplification and transfer toward upstream pandoc/extra ------------------------------------------------------------------------------- diff --git a/Dockerfile b/Dockerfile index 443b721..c7f9066 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # # STAGE 1: extra variant # -FROM pandoc/extra:3.2-ubuntu as extra +FROM pandoc/extra:3.6-ubuntu AS extra # Set the env variables to non-interactive ENV DEBIAN_FRONTEND noninteractive @@ -113,7 +113,8 @@ RUN git clone ${PANDA_REPO} /tmp/panda && \ ## L A T E X ## ADD packages.txt ./ -RUN tlmgr init-usertree && \ +RUN tlmgr update --self && \ + tlmgr init-usertree && \ tlmgr install `echo $(grep -v '^#' packages.txt )` && \ # update the font map updmap-sys @@ -126,6 +127,8 @@ RUN tlmgr init-usertree && \ # Templates are installed in '/.pandoc'. ARG TEMPLATES_DIR=/.pandoc/templates +RUN mkdir -p ${TEMPLATES_DIR} + # Starting with 24.04, there's a user named `ubuntu` with id=1000 # If docker is run with the `--user 1000` option and $HOME for pandoc # will be `/home/ubuntu` @@ -153,7 +156,7 @@ ENTRYPOINT ["pandoc"] # # STAGE 2: full variant # -FROM extra as full +FROM extra AS full # Set the env variables to non-interactive ENV DEBIAN_FRONTEND noninteractive diff --git a/tests/expected/dokuwiki/syntax.dokuwiki.md b/tests/expected/dokuwiki/syntax.dokuwiki.md index 3cbeaa6..2495d91 100644 --- a/tests/expected/dokuwiki/syntax.dokuwiki.md +++ b/tests/expected/dokuwiki/syntax.dokuwiki.md @@ -4,7 +4,7 @@ markup language, which tries to make the datafiles to be as readable as possible. This page contains all possible syntax you may use when editing the pages. Simply have a look at the source of this page by -pressing \"Edit this page\". If you want to try something, just use the +pressing "Edit this page". If you want to try something, just use the [playground](/playground/playground) page. The simpler markup is easily accessible via [quickbuttons](https://www.dokuwiki.org/toolbar), too. @@ -83,21 +83,21 @@ Section](syntax#internal). Notes: -- Links to [existing pages](syntax) are shown in a different style - from [nonexisting](nonexisting) ones. -- DokuWiki does not use - [CamelCase](https://en.wikipedia.org/wiki/CamelCase) to - automatically create links by default, but this behavior can be - enabled in the [config](https://www.dokuwiki.org/config) file. Hint: - If DokuWiki is a link, then it\'s enabled. -- When a section\'s heading is changed, its bookmark changes, too. So - don\'t rely on section linking too much. +- Links to [existing pages](syntax) are shown in a different style from + [nonexisting](nonexisting) ones. +- DokuWiki does not use + [CamelCase](https://en.wikipedia.org/wiki/CamelCase) to automatically + create links by default, but this behavior can be enabled in the + [config](https://www.dokuwiki.org/config) file. Hint: If DokuWiki is a + link, then it's enabled. +- When a section's heading is changed, its bookmark changes, too. So + don't rely on section linking too much. ### Interwiki DokuWiki supports [Interwiki](https://www.dokuwiki.org/Interwiki) links. These are quick links to other Wikis. For example this is a link to -Wikipedia\'s page about Wikis: +Wikipedia's page about Wikis: [Wiki](https://en.wikipedia.org/wiki/Wiki). DokuWiki supports [[doku>Interwiki]] links. These are quick links to other Wikis. @@ -113,22 +113,22 @@ corporate [Intranet](https://en.wikipedia.org/wiki/Intranet). Notes: -- For security reasons direct browsing of windows shares only works in - Microsoft Internet Explorer per default (and only in the \"local - zone\"). -- For Mozilla and Firefox it can be enabled through different - workaround mentioned in the [Mozilla Knowledge - Base](http://kb.mozillazine.org/Links_to_local_pages_do_not_work). - However, there will still be a JavaScript warning about trying to - open a Windows Share. To remove this warning (for all users), put - the following line in `conf/lang/en/lang.php` (more details at - [localization](https://www.dokuwiki.org/localization#changing_some_localized_texts_and_strings_in_your_installation)): - @@ -309,26 +309,26 @@ equivalents. Those [Smileys](https://www.dokuwiki.org/Smileys) and other images can be configured and extended. Here is an overview of Smileys included in DokuWiki: -- 8-) %% 8-) %% -- 8-O %% 8-O %% -- :-( %% :-( %% -- :-) %% :-) %% -- =) %% =) %% -- :-/ %% :-/ %% -- :-\\ %% :-\\ %% -- :-? %% :-? %% -- :-D %% :-D %% -- :-P %% :-P %% -- :-O %% :-O %% -- :-X %% :-X %% -- :-\| %% :-\| %% -- ;-) %% ;-) %% -- \^\_\^ %% \^\_\^ %% -- :?: %% :?: %% -- :!: %% :!: %% -- LOL %% LOL %% -- FIXME %% FIXME %% -- DELETEME %% DELETEME %% +- 8-) %% 8-) %% +- 8-O %% 8-O %% +- :-( %% :-( %% +- :-) %% :-) %% +- =) %% =) %% +- :-/ %% :-/ %% +- :-\\ %% :-\\ %% +- :-? %% :-? %% +- :-D %% :-D %% +- :-P %% :-P %% +- :-O %% :-O %% +- :-X %% :-X %% +- :-\| %% :-\| %% +- ;-) %% ;-) %% +- \^\_\^ %% \^\_\^ %% +- :?: %% :?: %% +- :!: %% :!: %% +- LOL %% LOL %% +- FIXME %% FIXME %% +- DELETEME %% DELETEME %% ### Text to HTML Conversions @@ -336,8 +336,8 @@ Typography: [DokuWiki](DokuWiki) can convert simple text characters to their typographically correct entities. Here is an example of recognized characters. --\> \<- \<-\> =\> \<= \<=\> \>\> \<\< \-- \-\-- 640x480 (c) (tm) (r) -\"He thought \'It\'s a man\'s world\'\...\" +-\> \<- \<-\> =\> \<= \<=\> \>\> \<\< -- --- 640x480 (c) (tm) (r) "He +thought 'It's a man's world'..." -> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r) "He thought 'It's a man's world'..." @@ -346,13 +346,13 @@ The same can be done to produce any kind of HTML, it just needs to be added to the [pattern file](https://www.dokuwiki.org/entities). There are three exceptions which do not come from that pattern file: -multiplication entity (640x480), \'single\' and \"double quotes\". They -can be turned off through a [config +multiplication entity (640x480), 'single' and "double quotes". They can +be turned off through a [config option](https://www.dokuwiki.org/config:typography). ## Quoting -Some times you want to mark some text to show it\'s a reply or comment. +Some times you want to mark some text to show it's a reply or comment. You can use the following syntax: I think we should do it @@ -369,7 +369,7 @@ You can use the following syntax: I think we should do it -> No we shouldn\'t +> No we shouldn't > > Well, I say we should @@ -410,7 +410,7 @@ Vertical tableheaders are possible, too. Heading 5 Row 2 Col 2 Row 2 Col 3 ----------- ---------------------- ------------- -As you can see, it\'s the cell separator before a cell which decides +As you can see, it's the cell separator before a cell which decides about the formatting: | ^ Heading 1 ^ Heading 2 ^ @@ -498,7 +498,7 @@ Those blocks were created by this source: [DokuWiki](/wiki/DokuWiki) can highlight sourcecode, which makes it easier to read. It uses the [GeSHi](http://qbnz.com/highlighter/) -Generic Syntax Highlighter \-- so any language supported by GeSHi is +Generic Syntax Highlighter -- so any language supported by GeSHi is supported. The syntax uses the same code and file blocks described in the previous section, but this time the name of the language syntax to be highlighted is included inside the tag, e.g. `` or @@ -562,8 +562,8 @@ specifying a file name after language code like this: ``` -If you don\'t want any highlighting but want a downloadable file, -specify a dash (`-`) as the language code: ``. +If you don't want any highlighting but want a downloadable file, specify +a dash (''-'') as the language code: ''\''. ## Embedding HTML and PHP @@ -660,7 +660,7 @@ output it self. The following control macros are availble: ## Syntax Plugins -DokuWiki\'s syntax can be extended by +DokuWiki's syntax can be extended by [Plugins](https://www.dokuwiki.org/plugins). How the installed plugins are used is described on their appropriate description pages. The following syntax plugins are available in this particular DokuWiki @@ -670,6 +670,6 @@ installation: [^1]: This is a footnote -[^2]: when the aspect ratio of the given width and height doesn\'t match +[^2]: when the aspect ratio of the given width and height doesn't match that of the image, it will be cropped to the new ratio before resizing