Skip to content

[deps] Pandoc 3.7.0.2 #13249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+37 −37
Open

[deps] Pandoc 3.7.0.2 #13249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configuration
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
export DENO=v2.3.1
# TODO figure out where 0.1.41 apple silicon libs are available
export DENO_DOM=v0.1.41-alpha-artifacts
export PANDOC=3.6.3
export PANDOC=3.7.0.2
export DARTSASS=1.87.0
export ESBUILD=0.25.3
export TYPST=0.13.0
Expand Down
24 changes: 22 additions & 2 deletions dev-docs/update-pandoc-checklist.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,30 @@

Carlos needs to run this:

- [ ] Ensure archives are upgraded
- [ ] Run `AWS_PROFILE=... ./package/src/quarto-bld update-pandoc PANDOC_VERSION`
- [x] Ensure archives are upgraded
- [x] Run `AWS_PROFILE=... ./package/src/quarto-bld update-pandoc PANDOC_VERSION`
- [ ] look at `git diff`, specifically for changes in Pandoc templates, and adjust as needed.

As a reminder, our templates are kept in the same directories as Pandoc's templates, but with different names. `git diff` will show the diff in Pandoc's template; we have to manually patch
ours. (We can't just use `patch` because the templates have diverged too much)

### Pandoc templates

The general rule for the naming is that "format.template" indicates Pandoc naming, and "template.format" indicates ours. Examples below:

#### beamer

- Pandoc's: src/resources/formats/beamer/pandoc/beamer.template
- Ours: src/resources/formats/beamer/pandoc/template.tex

Partials:

- Pandoc's:
- src/resources/formats/beamer/pandoc/latex.common
- Ours:
- src/resources/formats/beamer/pandoc/common.latex


## Manual steps

- [ ] Update schemas by inspecting [their changelog](https://github.com/jgm/pandoc/blob/main/changelog.md) for new commands, deprecation removals, etc
Expand Down
11 changes: 3 additions & 8 deletions src/resources/formats/beamer/pandoc/babel-lang.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
$--
$if(lang)$
\ifLuaTeX
\usepackage[bidi=basic$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\usepackage[bidi=basic,shorthands=off,$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\else
\usepackage[bidi=default$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\usepackage[bidi=default,shorthands=off,$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\fi
$if(babel-lang)$
$if(mainfont)$
Expand All @@ -18,12 +18,7 @@
$for(babelfonts/pairs)$
\babelfont[$babelfonts.key$]{rm}{$babelfonts.value$}
$endfor$
% get rid of language-specific shorthands (see #6817):
\let\LanguageShortHands\languageshorthands
\def\languageshorthands#1{}
$if(selnolig-langs)$
\ifLuaTeX
\usepackage[$for(selnolig-langs)$$it$$sep$,$endfor$]{selnolig} % disable illegal ligatures
\usepackage{selnolig} % disable illegal ligatures
\fi
$endif$
$endif$
11 changes: 3 additions & 8 deletions src/resources/formats/beamer/pandoc/latex.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@ $-- Babel language support
$--
$if(lang)$
\ifLuaTeX
\usepackage[bidi=basic$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\usepackage[bidi=basic,shorthands=off,$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\else
\usepackage[bidi=default$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\usepackage[bidi=default,shorthands=off,$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\fi
$if(babel-lang)$
$if(mainfont)$
Expand All @@ -198,15 +198,10 @@ $endif$
$for(babelfonts/pairs)$
\babelfont[$babelfonts.key$]{rm}{$babelfonts.value$}
$endfor$
% get rid of language-specific shorthands (see #6817):
\let\LanguageShortHands\languageshorthands
\def\languageshorthands#1{}
$if(selnolig-langs)$
\ifLuaTeX
\usepackage[$for(selnolig-langs)$$it$$sep$,$endfor$]{selnolig} % disable illegal ligatures
\usepackage{selnolig} % disable illegal ligatures
\fi
$endif$
$endif$
$--
$-- pagestyle
$--
Expand Down
2 changes: 1 addition & 1 deletion src/resources/formats/jats/pandoc/default-templates/article.jats_publishing
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ $if(author.surname)$
<surname>$if(author.non-dropping-particle)$${author.non-dropping-particle} $endif$$author.surname$</surname>
<given-names>$author.given-names$$if(author.dropping-particle)$ ${author.dropping-particle}$endif$</given-names>
$if(author.prefix)$
<prefix>${author.suffix}</prefix>
<prefix>${author.prefix}</prefix>
$endif$
$if(author.suffix)$
<suffix>${author.suffix}</suffix>
Expand Down
2 changes: 1 addition & 1 deletion src/resources/formats/jats/pandoc/default-templates/default.jats_articleauthoring
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ $if(author.surname)$
<surname>$if(author.non-dropping-particle)$${author.non-dropping-particle} $endif$${author.surname}</surname>
<given-names>${author.given-names}$if(author.dropping-particle)$ ${author.dropping-particle}$endif$</given-names>
$if(author.prefix)$
<prefix>${author.suffix}</prefix>
<prefix>${author.prefix}</prefix>
$endif$
$if(author.suffix)$
<suffix>${author.suffix}</suffix>
Expand Down
11 changes: 3 additions & 8 deletions src/resources/formats/pdf/pandoc/babel-lang.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
$--
$if(lang)$
\ifLuaTeX
\usepackage[bidi=basic$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\usepackage[bidi=basic,shorthands=off,$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\else
\usepackage[bidi=default$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\usepackage[bidi=default,shorthands=off,$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\fi
$if(babel-lang)$
$if(mainfont)$
Expand All @@ -18,12 +18,7 @@
$for(babelfonts/pairs)$
\babelfont[$babelfonts.key$]{rm}{$babelfonts.value$}
$endfor$
% get rid of language-specific shorthands (see #6817):
\let\LanguageShortHands\languageshorthands
\def\languageshorthands#1{}
$if(selnolig-langs)$
\ifLuaTeX
\usepackage[$for(selnolig-langs)$$it$$sep$,$endfor$]{selnolig} % disable illegal ligatures
\usepackage{selnolig} % disable illegal ligatures
\fi
$endif$
$endif$
11 changes: 3 additions & 8 deletions src/resources/formats/pdf/pandoc/latex.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@ $-- Babel language support
$--
$if(lang)$
\ifLuaTeX
\usepackage[bidi=basic$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\usepackage[bidi=basic,shorthands=off,$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\else
\usepackage[bidi=default$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\usepackage[bidi=default,shorthands=off,$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\fi
$if(babel-lang)$
$if(mainfont)$
Expand All @@ -198,15 +198,10 @@ $endif$
$for(babelfonts/pairs)$
\babelfont[$babelfonts.key$]{rm}{$babelfonts.value$}
$endfor$
% get rid of language-specific shorthands (see #6817):
\let\LanguageShortHands\languageshorthands
\def\languageshorthands#1{}
$if(selnolig-langs)$
\ifLuaTeX
\usepackage[$for(selnolig-langs)$$it$$sep$,$endfor$]{selnolig} % disable illegal ligatures
\usepackage{selnolig} % disable illegal ligatures
\fi
$endif$
$endif$
$--
$-- pagestyle
$--
Expand Down
Loading