diff options
Diffstat (limited to 'macros')
99 files changed, 126 insertions, 26 deletions
diff --git a/macros/latex/contrib/changes/changes.drv b/macros/latex/contrib/changes/changes.drv index 1f7edaa71e..aedf4d2c22 100644 --- a/macros/latex/contrib/changes/changes.drv +++ b/macros/latex/contrib/changes/changes.drv @@ -1,6 +1,6 @@ %%% % driver file of changes package -\newcommand{\docversion}{4.2.0} +\newcommand{\docversion}{4.2.1} \documentclass[titlepage, parskip=half, toc=flat, cleardoublepage=empty, captions=nooneline, origlongtable, english]{scrartcl} diff --git a/macros/latex/contrib/changes/changes.dtx b/macros/latex/contrib/changes/changes.dtx index f2388c9b4a..fb9131f908 100644 --- a/macros/latex/contrib/changes/changes.dtx +++ b/macros/latex/contrib/changes/changes.dtx @@ -1,4 +1,4 @@ -% \CheckSum{1357} +% \CheckSum{1361} % % \iffalse meta-comment % @@ -69,6 +69,7 @@ % \changes{v4.0.4}{2021/05/13}{bugfix: added missing regression.dtx to ctan archive; no code change} % \changes{v4.1.0}{2021/05/30}{clickable list of changes} % \changes{v4.2.0}{2021/07/07}{new macro for setting anonymous name; french translations} +% \changes{v4.2.1}{2021/07/15}{bugfix: missing babel package produces error} % \GetFileInfo{changes.dtx} % \RecordChanges % @@ -108,8 +109,8 @@ % Type some information to the console. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{changes}[2021/07/07 v4.2.0 changes package] -\typeout{*** changes package 2021/07/07 v4.2.0 ***} +\ProvidesPackage{changes}[2021/07/15 v4.2.1 changes package] +\typeout{*** changes package 2021/07/15 v4.2.1 ***} % \end{macrocode} % % Package \docpackage{xkeyval} provides options with key-value-pairs. @@ -1786,7 +1787,9 @@ % \end{macrocode} % Deactivate semicolon as shorthand in order to avoid problems reading the semicolon separated lines. % \begin{macrocode} - \ifbabelshorthand{;}{\shorthandoff{;}}{} + \ifdef{\ifbabelshorthand}{% + \ifbabelshorthand{;}{\shorthandoff{;}}{}% + }{}% \newread\Changes@InFile% \openin\Changes@InFile = \jobname.\Changes@socextension% % \end{macrocode} @@ -1854,7 +1857,9 @@ % \end{macrocode} % Reactivate semicolon as shorthand. % \begin{macrocode} - \ifbabelshorthand{;}{\shorthandon{;}}{} + \ifdef{\ifbabelshorthand}{% + \ifbabelshorthand{;}{\shorthandon{;}}{}% + }{}% }{% \emph{\changesnosoc}% \PackageWarning{changes}{LaTeX rerun needed for summary of changes}% diff --git a/macros/latex/contrib/changes/changes.english.pdf b/macros/latex/contrib/changes/changes.english.pdf Binary files differindex 41fc213efc..4a3473925b 100644 --- a/macros/latex/contrib/changes/changes.english.pdf +++ b/macros/latex/contrib/changes/changes.english.pdf diff --git a/macros/latex/contrib/changes/changes.english.withcode.pdf b/macros/latex/contrib/changes/changes.english.withcode.pdf Binary files differindex bb7d43763a..6160b41f18 100644 --- a/macros/latex/contrib/changes/changes.english.withcode.pdf +++ b/macros/latex/contrib/changes/changes.english.withcode.pdf diff --git a/macros/latex/contrib/changes/changes.ins b/macros/latex/contrib/changes/changes.ins index 02fb69a16a..6c9261ffbd 100644 --- a/macros/latex/contrib/changes/changes.ins +++ b/macros/latex/contrib/changes/changes.ins @@ -1,6 +1,6 @@ %% This file creates the needed files from changes.dtx %% -\def\filedate{2021/07/07} +\def\filedate{2021/07/15} \def\batchfile{changes.ins} \input docstrip @@ -169,7 +169,9 @@ Copyright 2007-2021 Ekkart Kleinod % \file{regression/changes.regression.draft.id.tex}{\from{regression.dtx}{regression:draft:id}} \file{regression/changes.regression.draft.name.tex}{\from{regression.dtx}{regression:draft:name}} + \file{regression/changes.regression.draft.nobabel.tex}{\from{regression.dtx}{regression:draft:nobabel}} \file{regression/changes.regression.final.tex}{\from{regression.dtx}{regression:final}} + \file{regression/changes.regression.final.nobabel.tex}{\from{regression.dtx}{regression:final:nobabel}} } \endinput diff --git a/macros/latex/contrib/changes/changes.ngerman.pdf b/macros/latex/contrib/changes/changes.ngerman.pdf Binary files differindex 9fce930e6f..0b7028391d 100644 --- a/macros/latex/contrib/changes/changes.ngerman.pdf +++ b/macros/latex/contrib/changes/changes.ngerman.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.bf.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.bf.pdf Binary files differindex e0c6d10c09..a9a6d79ee4 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.bf.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.bf.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.colored.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.colored.pdf Binary files differindex 7bbda99bf5..7164c43346 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.colored.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.colored.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dashuline.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dashuline.pdf Binary files differindex edd71fa785..10e5ce16c5 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dashuline.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dashuline.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dotuline.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dotuline.pdf Binary files differindex f38cdec1bb..101fd3a89a 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dotuline.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dotuline.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.em.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.em.pdf Binary files differindex 4c0ffa99f3..5d0cf280c5 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.em.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.em.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.it.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.it.pdf Binary files differindex 1f5c5effeb..c30a9f6ba5 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.it.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.it.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.sl.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.sl.pdf Binary files differindex 964e5f8d21..753adaae80 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.sl.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.sl.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uline.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uline.pdf Binary files differindex 4fdbf3e207..71e0b81597 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uline.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uline.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uuline.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uuline.pdf Binary files differindex ea44909e53..9d223bd838 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uuline.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uuline.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uwave.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uwave.pdf Binary files differindex 94d47e27b3..99ed9d5404 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uwave.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uwave.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.wrong.pdf Binary files differindex cf90151fa8..3fdca44a6b 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.wrong.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.wrong.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkup.brackets.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkup.brackets.pdf Binary files differindex 1a1e00cce8..59337021f6 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkup.brackets.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkup.brackets.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkup.footnote.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkup.footnote.pdf Binary files differindex bcf0e897e0..e158486f2d 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkup.footnote.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkup.footnote.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkup.none.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkup.none.pdf Binary files differindex 9fa744ba69..62afa2647f 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkup.none.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkup.none.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkup.subscript.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkup.subscript.pdf Binary files differindex 3b582b0314..2b4b533429 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkup.subscript.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkup.subscript.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkup.superscript.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkup.superscript.pdf Binary files differindex 53e02198e2..d2dcc361e5 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkup.superscript.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkup.superscript.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkup.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkup.wrong.pdf Binary files differindex 53d32b3cd1..f1b1767c76 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkup.wrong.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkup.wrong.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.left.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.left.pdf Binary files differindex d395848a66..221c4a3129 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.left.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.left.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.right.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.right.pdf Binary files differindex 9bdbfae650..e1e5ddbc0b 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.right.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.right.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.wrong.pdf Binary files differindex 2a9a6d32b2..afa18b14c2 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.wrong.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.wrong.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.id.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.id.pdf Binary files differindex 91693ae5f1..b34aa6d046 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.id.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.id.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.name.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.name.pdf Binary files differindex 068bc51dc7..71cc0d8b5a 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.name.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.name.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.wrong.pdf Binary files differindex fb11dfe0e4..a819f91427 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.wrong.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.wrong.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.always.pdf b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.always.pdf Binary files differindex 67f443b3cc..94d498a3fe 100644 --- a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.always.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.always.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.ifneeded.pdf b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.ifneeded.pdf Binary files differindex f84a04b533..403ee9ac76 100644 --- a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.ifneeded.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.ifneeded.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.none.pdf b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.none.pdf Binary files differindex 0827a3fdec..8edf37cb84 100644 --- a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.none.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.none.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.wrong.pdf Binary files differindex 5bad61f4fa..7170b4674e 100644 --- a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.wrong.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.wrong.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.footnote.pdf b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.footnote.pdf Binary files differindex 0a4892da73..73fdaebd09 100644 --- a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.footnote.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.footnote.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.margin.pdf b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.margin.pdf Binary files differindex ce0b7f363c..6103237f6e 100644 --- a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.margin.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.margin.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.todo.pdf b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.todo.pdf Binary files differindex d381ef6673..bdfe6dbc63 100644 --- a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.todo.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.todo.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.uwave.pdf b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.uwave.pdf Binary files differindex 7e0ed13aed..467544b794 100644 --- a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.uwave.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.uwave.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.wrong.pdf Binary files differindex 9d4b7b82a7..dff22da595 100644 --- a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.wrong.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.wrong.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.defaultcolor.pdf b/macros/latex/contrib/changes/examples/changes.example.defaultcolor.pdf Binary files differindex d5544acad1..a0570d99ac 100644 --- a/macros/latex/contrib/changes/examples/changes.example.defaultcolor.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.defaultcolor.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.bf.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.bf.pdf Binary files differindex ce49d867fd..dd095f9317 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.bf.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.bf.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.colored.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.colored.pdf Binary files differindex 7fc1f98632..6f2ec71017 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.colored.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.colored.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dashuline.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dashuline.pdf Binary files differindex 0bb484a72d..0cd7f2bece 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dashuline.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dashuline.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dotuline.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dotuline.pdf Binary files differindex 9023118c91..66225e7439 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dotuline.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dotuline.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.em.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.em.pdf Binary files differindex 0c681ba3cc..1e3291a20b 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.em.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.em.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.it.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.it.pdf Binary files differindex 43de825753..3fcd8f4ca9 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.it.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.it.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sl.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sl.pdf Binary files differindex b29b4ab93e..6b1c4323f1 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sl.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sl.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sout.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sout.pdf Binary files differindex cdd9fe5074..1df07d4f3a 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sout.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sout.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uline.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uline.pdf Binary files differindex 6bff407c02..1e3503d83a 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uline.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uline.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uuline.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uuline.pdf Binary files differindex 317e85615f..3bfc5c731a 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uuline.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uuline.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uwave.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uwave.pdf Binary files differindex 455ac2e596..65f6b1ee86 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uwave.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uwave.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.wrong.pdf Binary files differindex 8e37435fb0..8b0c20fe4e 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.wrong.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.wrong.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.xout.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.xout.pdf Binary files differindex 9e3403f0a4..7f1527d4f2 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.xout.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.xout.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.draft.pdf b/macros/latex/contrib/changes/examples/changes.example.draft.pdf Binary files differindex f5367acf62..fc2fc0bba6 100644 --- a/macros/latex/contrib/changes/examples/changes.example.draft.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.draft.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.final.pdf b/macros/latex/contrib/changes/examples/changes.example.final.pdf Binary files differindex 9367a3ab84..2793cac01f 100644 --- a/macros/latex/contrib/changes/examples/changes.example.final.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.final.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.background.pdf b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.background.pdf Binary files differindex 6b3d3e4c7d..ab4355c6aa 100644 --- a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.background.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.background.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uuline.pdf b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uuline.pdf Binary files differindex ca3d3f6de7..3786670847 100644 --- a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uuline.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uuline.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uwave.pdf b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uwave.pdf Binary files differindex 5b97d2b2f1..c5e1090b7c 100644 --- a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uwave.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uwave.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.wrong.pdf Binary files differindex a5ff1da6f0..e1b500bff0 100644 --- a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.wrong.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.wrong.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.language.british.pdf b/macros/latex/contrib/changes/examples/changes.example.language.british.pdf Binary files differindex eb83c213b0..c64aa09f6c 100644 --- a/macros/latex/contrib/changes/examples/changes.example.language.british.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.language.british.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.language.english.pdf b/macros/latex/contrib/changes/examples/changes.example.language.english.pdf Binary files differindex f7646a44d1..57480a307e 100644 --- a/macros/latex/contrib/changes/examples/changes.example.language.english.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.language.english.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.language.french.pdf b/macros/latex/contrib/changes/examples/changes.example.language.french.pdf Binary files differindex aead17f817..ffba855f0a 100644 --- a/macros/latex/contrib/changes/examples/changes.example.language.french.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.language.french.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.language.german.pdf b/macros/latex/contrib/changes/examples/changes.example.language.german.pdf Binary files differindex a6dafea904..6350650278 100644 --- a/macros/latex/contrib/changes/examples/changes.example.language.german.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.language.german.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.language.italian.pdf b/macros/latex/contrib/changes/examples/changes.example.language.italian.pdf Binary files differindex d3307197de..27588b74ea 100644 --- a/macros/latex/contrib/changes/examples/changes.example.language.italian.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.language.italian.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.language.ngerman.pdf b/macros/latex/contrib/changes/examples/changes.example.language.ngerman.pdf Binary files differindex cc8e0df3f1..e3e90c4dde 100644 --- a/macros/latex/contrib/changes/examples/changes.example.language.ngerman.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.language.ngerman.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.all.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.all.pdf Binary files differindex 31711d28ff..a80b0d04c1 100644 --- a/macros/latex/contrib/changes/examples/changes.example.listofchanges.all.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.listofchanges.all.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.compactsummary.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.compactsummary.pdf Binary files differindex 63ee73bd04..24dab96ea1 100644 --- a/macros/latex/contrib/changes/examples/changes.example.listofchanges.compactsummary.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.listofchanges.compactsummary.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.list.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.list.pdf Binary files differindex 58af7d6120..b88e4290bd 100644 --- a/macros/latex/contrib/changes/examples/changes.example.listofchanges.list.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.listofchanges.list.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.show.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.show.pdf Binary files differindex 9bf7089513..4021de3f7d 100644 --- a/macros/latex/contrib/changes/examples/changes.example.listofchanges.show.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.listofchanges.show.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.summary.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.summary.pdf Binary files differindex 97bc88e8e2..6baa480e07 100644 --- a/macros/latex/contrib/changes/examples/changes.example.listofchanges.summary.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.listofchanges.summary.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.title.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.title.pdf Binary files differindex 3b80440f49..9c62edd701 100644 --- a/macros/latex/contrib/changes/examples/changes.example.listofchanges.title.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.listofchanges.title.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.wrong.pdf Binary files differindex 0d1d3d89ba..6f2fb0d95d 100644 --- a/macros/latex/contrib/changes/examples/changes.example.listofchanges.wrong.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.listofchanges.wrong.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.markup.bfit.pdf b/macros/latex/contrib/changes/examples/changes.example.markup.bfit.pdf Binary files differindex f5cf815a2e..36e7e14681 100644 --- a/macros/latex/contrib/changes/examples/changes.example.markup.bfit.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.markup.bfit.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.markup.default.pdf b/macros/latex/contrib/changes/examples/changes.example.markup.default.pdf Binary files differindex 84fb0874d0..7dcd4f3f61 100644 --- a/macros/latex/contrib/changes/examples/changes.example.markup.default.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.markup.default.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.markup.nocolor.pdf b/macros/latex/contrib/changes/examples/changes.example.markup.nocolor.pdf Binary files differindex 1033e78620..33dbc35b03 100644 --- a/macros/latex/contrib/changes/examples/changes.example.markup.nocolor.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.markup.nocolor.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.markup.underlined.pdf b/macros/latex/contrib/changes/examples/changes.example.markup.underlined.pdf Binary files differindex d5d95e6730..42099c4b9e 100644 --- a/macros/latex/contrib/changes/examples/changes.example.markup.underlined.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.markup.underlined.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.markup.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.markup.wrong.pdf Binary files differindex 72fedbbb78..cb96b65cfe 100644 --- a/macros/latex/contrib/changes/examples/changes.example.markup.wrong.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.markup.wrong.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.package.hyperref.pdf b/macros/latex/contrib/changes/examples/changes.example.package.hyperref.pdf Binary files differindex b04759d782..aaabb6485e 100644 --- a/macros/latex/contrib/changes/examples/changes.example.package.hyperref.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.package.hyperref.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.packageoptions.todonotes.pdf b/macros/latex/contrib/changes/examples/changes.example.packageoptions.todonotes.pdf Binary files differindex b1f73c57a5..01a61ad1fc 100644 --- a/macros/latex/contrib/changes/examples/changes.example.packageoptions.todonotes.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.packageoptions.todonotes.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.packageoptions.truncate.pdf b/macros/latex/contrib/changes/examples/changes.example.packageoptions.truncate.pdf Binary files differindex b38b4d563f..fa6007e9df 100644 --- a/macros/latex/contrib/changes/examples/changes.example.packageoptions.truncate.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.packageoptions.truncate.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.packageoptions.ulem.pdf b/macros/latex/contrib/changes/examples/changes.example.packageoptions.ulem.pdf Binary files differindex bc5cff239e..49a67392b9 100644 --- a/macros/latex/contrib/changes/examples/changes.example.packageoptions.ulem.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.packageoptions.ulem.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.packageoptions.xcolor.pdf b/macros/latex/contrib/changes/examples/changes.example.packageoptions.xcolor.pdf Binary files differindex 531b08ec38..6e49023a67 100644 --- a/macros/latex/contrib/changes/examples/changes.example.packageoptions.xcolor.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.packageoptions.xcolor.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.screenshot.pdf b/macros/latex/contrib/changes/examples/changes.example.screenshot.pdf Binary files differindex 3b79f9db64..edb731ca53 100644 --- a/macros/latex/contrib/changes/examples/changes.example.screenshot.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.screenshot.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setaddedmarkup.pdf b/macros/latex/contrib/changes/examples/changes.example.setaddedmarkup.pdf Binary files differindex 74b11dfb78..86ef2ed9b4 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setaddedmarkup.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setaddedmarkup.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setanonymousname.pdf b/macros/latex/contrib/changes/examples/changes.example.setanonymousname.pdf Binary files differindex 50f7cbf56f..a6a30e64ce 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setanonymousname.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setanonymousname.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setauthormarkup.pdf b/macros/latex/contrib/changes/examples/changes.example.setauthormarkup.pdf Binary files differindex 6c791b0ab4..807286899c 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setauthormarkup.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setauthormarkup.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setauthormarkupposition.pdf b/macros/latex/contrib/changes/examples/changes.example.setauthormarkupposition.pdf Binary files differindex 0f21515414..ba9cbae374 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setauthormarkupposition.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setauthormarkupposition.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setauthormarkuptext.pdf b/macros/latex/contrib/changes/examples/changes.example.setauthormarkuptext.pdf Binary files differindex a065d52b42..0c1005759b 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setauthormarkuptext.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setauthormarkuptext.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setcommentmarkup.pdf b/macros/latex/contrib/changes/examples/changes.example.setcommentmarkup.pdf Binary files differindex e2d6ca9bf0..85b500b560 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setcommentmarkup.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setcommentmarkup.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setdeletedmarkup.pdf b/macros/latex/contrib/changes/examples/changes.example.setdeletedmarkup.pdf Binary files differindex 7ec7d0be72..8216148c40 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setdeletedmarkup.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setdeletedmarkup.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.sethighlightmarkup.pdf b/macros/latex/contrib/changes/examples/changes.example.sethighlightmarkup.pdf Binary files differindex c3675f55c3..2e0a5cbb2f 100644 --- a/macros/latex/contrib/changes/examples/changes.example.sethighlightmarkup.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.sethighlightmarkup.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setlocextension.pdf b/macros/latex/contrib/changes/examples/changes.example.setlocextension.pdf Binary files differindex 22e59da403..2e4dd79cfd 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setlocextension.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setlocextension.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setsocextension.pdf b/macros/latex/contrib/changes/examples/changes.example.setsocextension.pdf Binary files differindex c0174f69c0..cebf32a6d7 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setsocextension.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setsocextension.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setsummarytowidth.pdf b/macros/latex/contrib/changes/examples/changes.example.setsummarytowidth.pdf Binary files differindex f9d759a6a4..b1fdd8698c 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setsummarytowidth.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setsummarytowidth.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setsummarywidth.pdf b/macros/latex/contrib/changes/examples/changes.example.setsummarywidth.pdf Binary files differindex 0ee1e39089..451a9577a8 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setsummarywidth.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setsummarywidth.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.settruncatewidth.pdf b/macros/latex/contrib/changes/examples/changes.example.settruncatewidth.pdf Binary files differindex c045054469..b59c788173 100644 --- a/macros/latex/contrib/changes/examples/changes.example.settruncatewidth.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.settruncatewidth.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.simple.pdf b/macros/latex/contrib/changes/examples/changes.example.simple.pdf Binary files differindex 81e1bc5876..dd4b561df0 100644 --- a/macros/latex/contrib/changes/examples/changes.example.simple.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.simple.pdf diff --git a/macros/latex/contrib/changes/regression.dtx b/macros/latex/contrib/changes/regression.dtx index eae6249a42..34425ecec2 100644 --- a/macros/latex/contrib/changes/regression.dtx +++ b/macros/latex/contrib/changes/regression.dtx @@ -40,19 +40,21 @@ % % \begin{macrocode} \documentclass[11pt, a4paper, notitlepage, english]{article} +%<*!regression:draft:nobabel&!regression:final:nobabel> \usepackage{babel} +%</!regression:draft:nobabel&!regression:final:nobabel> % \end{macrocode} % % \begin{macrocode} -%<*regression:draft:id> +%<*regression:draft:id|regression:draft:nobabel> \usepackage[authormarkuptext=id]{changes} -%</regression:draft:id> +%</regression:draft:id|regression:draft:nobabel> %<*regression:draft:name> \usepackage[authormarkuptext=name]{changes} %</regression:draft:name> -%<*regression:final> +%<*regression:final|regression:final:nobabel> \usepackage[final]{changes} -%</regression:final> +%</regression:final|regression:final:nobabel> % % Define some authors. % @@ -65,6 +67,8 @@ % \begin{macrocode} \begin{document} + + %<*regression:draft:id|regression:draft:name> \section{Test empty string} @@ -183,6 +187,69 @@ %</regression:final> + \section{No compile errors in any case} + + \listofchanges + \listofchanges[style=summary] + \listofchanges[style=compactsummary] + + \subsection*{Changes by default author} + + You think water moves fast? + \added{You should see ice.} + It moves like it has a mind. + Like it knows it killed the world once and got a taste for murder. + \deleted[comment={No?}]{After the avalanche, it took us a week to climb out.} + Now, I don't know exactly \added{when} we turned on each other, but I know that seven of us survived the slide... and only five made it out. + \replaced{Now we took an oath, that I'm breaking now.}{We said we'd say it was the snow that killed the other two, but it wasn't.} + Nature is lethal but it doesn't hold a candle to man. + However unreal\comment{speaking of unreal\dots} it may seem, we are connected, you and I. + We're on the same curve, just on opposite ends. + You don't get \highlight[comment={Yes, sick.}]{sick}, I do. + That's also \highlight{clear}. + + \subsection*{Changes by green author} + + The lysine contingency - it's intended to prevent the spread of the animals is case they ever got off the island. + Dr. Wu inserted a gene \replaced[id=Green]{taht}{that} makes a \deleted[id=Green]{single} faulty enzyme in protein metabolism. + The animals can't manufacture the amino acid lysine. + Unless \replaced[id=Green]{they're}{continually} supplied with lysine by us, they'll slip into a coma and die. + We're on the same curve, just on opposite ends. + However unreal\comment[id=Green]{speaking of unreal\dots} it may seem, we are connected, you and I. + You don't get \highlight[id=Green, comment={Yes, sick.}]{sick}, I do. + That's also \highlight[id=Green]{clear}. + + \subsection*{Changes by orange author with some comments} + + Now that we know who you are, I know who I am. + \added[id=OA, comment={Yeah, I like animals better than people sometimes\dots}]{I'm not a mistake!} + It all makes sense! + In a comic, you know how you can tell who the arch-villain's going to be? + \deleted[id=OA, comment={Especially dogs. Dogs are the best.}]{He's the exact opposite of the hero.} + \deleted[id=OA]{And most times they're friends, like you and me!} + I should've known way back when... + You know why, David? + They called me Mr Glass. + However unreal\comment[id=OA]{just nice} it may seem, we are connected, you and I. + We're on the same curve, just on opposite ends. + You don't get \highlight[id=OA, comment={Yes, sick.}]{sick}, I do. + That's also \highlight[id=OA]{clear}. + + \subsection*{No changes} + + Your bones don't break, mine do. + \textbf{That's clear.} + Your cells react to bacteria and viruses differently than mine. + \textsl{You don't get sick, I do.} + That's also clear. + \textit{But for some reason, you and I react the exact same way to water.} + We swallow it too fast, we choke. + \emph{We get some in our lungs, we drown.} + However unreal it may seem, we are connected, you and I. + We're on the same curve, just on opposite ends. + You don't get sick, I do. + That's also clear. + \end{document} % \end{macrocode} % diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 0a212bbb5b..7bcb369515 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -28,7 +28,7 @@ % % \title{\sffamily easybook 文档类手册} % \author{瞿毅} -% \date{2021/07/15\hskip\ccwd\relax v1.27f\thanks{\url{https://gitee.com/texl3/easybook}}} +% \date{2021/07/16\hskip\ccwd\relax v1.27g\thanks{\url{https://gitee.com/texl3/easybook}}} % % \maketitle % \begin{abstract} @@ -148,7 +148,7 @@ % cjkfont = <adobe|fandol|founder|mac|macnew|macold|ubuntu|windows|none> % \end{syntax} % 中文字体采用 \CTeX 宏集包含的字库并与其一致,具体配置方案可以查看 \CTeX 使用手册。它与 \opt{fontset} 选项是等效的,如果没有指定 \opt{cjkfont} 的值,将会自动检测用户的操作系统并选择相应的字体。 -% \changes{v1.27f}{2021/07/12}{新增 \opt{cjkfont} 选项设置中文字体,原 \opt{font} 选项设置英文字体,中文字体使用 \CTeX 的字库。} +% \changes{v1.27g}{2021/07/12}{新增 \opt{cjkfont} 选项设置中文字体,原 \opt{font} 选项设置英文字体,中文字体使用 \CTeX 的字库。} % \end{function} % % 如果需要使用其它中文字体,可以在启用选项 \opt{cjkfont = none} 后,再使用 \pkg{xeCJK} 宏包的相关命令设置字体以及声明字体族: @@ -487,13 +487,24 @@ % % \begin{optdesc} % \item[\tn{printbibliography}] 两种方式 \textbf{均使用} 此命令打印参考文献,不同处理后端此命令的 \meta{键值列表} 不同。使用 \hologo{BibTeX} 处理时选项与节 \ref{sec:document command} 目录的选项相同,使用 \hologo{biber} 处理时常用的选项如下: -% \begin{function}{heading,title} +% \begin{function}{heading,title,prenote,section,type,filter} % \begin{syntax} -% heading = <bibliography|subbibliography|(bibintoc)|subbibintoc> -% title = <参考文献标题名> +% heading = <bibliography|subbibliography|(bibintoc)|subbibintoc> +% title = <参考文献标题名> +% prenote = <参考文献前注> +% section = <整数|(0)> +% type = <条目类型> +% filter = <过滤器名> % \end{syntax} -% \opt{heading} 为参考文献标题的处理方式,\opt{bibliography} 选项以 \opt{chapter} 级别输出参考文献,不加进目录,\opt{subbibliography} 选项以 \opt{section} 级别输出参考文献,不加进目录,\opt{bibintoc} 选项以 \opt{chapter} 级别输出参考文献,加进目录,\opt{subbibintoc} 选项以 \opt{section} 级别输出参考文献,加进目录。\opt{title} 选项覆盖由 \opt{heading} 选项提供的缺省标题名。除此之外其他支持选项可见 \pkg{biblatex} 宏包说明文档。 % \end{function} +% \begin{optdesc} +% \item[heading] 参考文献通常有一个章标题或者节标题,该选项选择由 \tn{defbibheading} 定义的标题名。缺省状态下使用标题名 \opt{bibintoc}。 +% \item[title] 如果标题定义支持的话,该选项覆盖由 \opt{heading} 选项提供的缺省标题名。 +% \item[prenote] 该选项选择由 \tn{defbibnote} 所定义的前注,缺省状态下不打印任何前注。 +% \item[section] 只打印在指定文节中引用的条目。该参考文献节从 1 开始编号,所有在 \env{refsection} 环境外给出的引用标记为第零节。 +% \item[type] 指定条目的打印类型。 +% \item[filter] 使用由 \tn{defbibfilter} 定义的 \opt{filter} 来过滤条目。 +% \end{optdesc} % \item[\tn{BibtexPreSet}] 这是 \pkg{natbib} 宏包的前配置命令,需要与 \pkg{natbib} 配合并放在载入其之前使用,可以重新定义它向 \pkg{natbib} 传递宏包选项。 % \item[\tn{BibtexPostSet}] 这是 \pkg{natbib} 宏包的后配置命令,需要与 \pkg{natbib} 配合并放在载入其之后使用,默认保存了参考文献风格和标题的设置。 % \item[\tn{BiblatexPreSet}] 这是 \pkg{biblatex} 宏包的前配置命令,需要与 \pkg{biblatex} 配合并放在载入其之前使用,默认保存了参考文献风格的设置。若重新定义可使用 \tn{PassOptionsToPackage} 命令向 \pkg{biblatex} 传递它支持的各种参考文献选项。 @@ -566,9 +577,17 @@ % % \begin{optdesc} % \item[\tn{declaretheorem}] 定义新的定理类环境,\tn{newtheorem} 命令与它等效。\meta{键值列表} 中常用的选项如下: +% \begin{function}{name,numbered,numberlike,style} +% \begin{syntax} +% name = <定理环境标题> +% numbered = <no|(yes)|unless unique> +% numberlike = <定理环境名> +% style = <定理样式名> +% \end{syntax} +% \end{function} % \begin{optdesc} -% \item[name] 定理的标题。默认值是环境的名称,并且首字母大写(英文标题)。 -% \item[numbered] 值为 \opt{no}、\opt{yes} 或 \opt{unless unique}。定理可以被编号、不被编号或者只有在文档中多次出现时才被编号。 +% \item[name] 定理标题的默认值是环境的名称,并且首字母大写(英文标题)。 +% \item[numbered] 定理可以被编号、不被编号或者只有在文档中多次出现时才被编号。 % \item[numberlike] 定理将使用此计数器进行编号,通常这是另一个定理环境的名称。 % \item[style] 用 \tn{declaretheoremstyle} 定义的定理样式的名称,定理将使用这种样式的设置。 % \end{optdesc} @@ -665,7 +684,7 @@ % \tn{easyfoot}\oarg{位置}\marg{内容} % \tn{markrule}\oarg{长度|(\tn{textwidth})}\parg{颜色名}\marg{线宽|(0.75pt)}[<上间距>+<下间距>] % \end{syntax} -% 命令 \tn{easyhead} 和 \tn{easyfoot} 的使用方法与 \tn{fancyhead} 和 \tn{fancyfoot} 完全相同,它们需要在 \opt{head-foot} 选项中使用,设置的是一个名为 \opt{fancy} 的页面风格。\pkg{fancyhdr} 将页眉页脚分成了左中右和奇数页(odd)、偶数页(even)共12个部分,可选参数中E、O代表偶数、奇数,L、C、R代表左、中、右部分。单面打印时,含有偶数的选项无效。 +% 命令 \tn{easyhead} 和 \tn{easyfoot} 的使用方法与 \tn{fancyhead} 和 \tn{fancyfoot} 完全相同,它们需要在 \opt{head-foot} 选项中使用,设置的是一个名为 \opt{fancy} 的页面风格。\pkg{fancyhdr} 将页眉页脚分成了左中右和奇数页(odd)、偶数页(even)共12个部分,可选参数中E、O代表偶数、奇数,L、C 和 R 代表左、中和右部分。单面打印时,含有偶数的选项无效。 % \changes{v1.26}{2021/06/14}{增加页眉页脚的横线绘制命令 \tn{markrule}。} % \end{function} % @@ -698,7 +717,7 @@ % \end{syntax} % \ding{229} 以上选项路径为 \opt{hdrset/...} \\ % \changes{v1.25}{2021/05/12}{增加脚注样式设置选项。} -% \changes{v1.27f}{2021/07/14}{增加脚注内容格式选项 \opt{fntext-form} 和脚注类型选项 \opt{footnotetype}。} +% \changes{v1.27g}{2021/07/14}{增加脚注内容格式选项 \opt{fntext-form} 和脚注类型选项 \opt{footnotetype}。} % \end{function} % % \begin{optdesc} @@ -816,7 +835,7 @@ % \ <表格内容> % \tn{end}\marg{环境名} % \end{syntax} -% \pkg{tabularray} 是一个较新的宏包,不仅提供了 \pkg{tabularx}、\pkg{multirow}、和 \pkg{booktabs} 宏包的功能,并且不依赖其它宏包与它们同时使用不会产生冲突,还实现了用简便的键值列表方式设置表格样式。具体用法可见宏包的说明文档。下面演示一个 \env{tblr} 表格的用法: +% \pkg{tabularray} 是一个较新的宏包,不仅提供了 \pkg{tabularx}、\pkg{multirow}、和 \pkg{booktabs} 宏包的功能,并且不依赖其它宏包与它们同时使用不会产生冲突,还实现了用简便的键值列表方式设置表格样式。具体用法可见宏包的说明文档,下面演示一个 \env{tblr} 表格的用法: % \changes{v1.25}{2021/05/17}{使用功能更便捷齐全的 \pkg{tabularray} 宏包设置表格样式。} % \end{function} % @@ -886,7 +905,7 @@ % \tn{end}\{hangparas\} % \end{syntax} % \tn{hangpara} 命令使其后的一个段落保持悬挂缩进,\env{hangparas} 环境使其中的段落均保持悬挂缩进。缩进将以 \meta{缩进长度} 从每个段落的 \meta{缩进开始行数} 开始。 -% \changes{v1.27f}{2021/07/11}{增加悬挂缩进段落命令 \tn{hangpara} 和环境 \env{hangparas}。} +% \changes{v1.27g}{2021/07/11}{增加悬挂缩进段落命令 \tn{hangpara} 和环境 \env{hangparas}。} % \end{function} % % \subsection{代码} @@ -1245,6 +1264,13 @@ % \newblock (2021-06-14) % \urlprefix\url{https://www.ctan.org/pkg/tcolorbox} % +% \bibitem{biblatex} +% Philipp Lehman, Philip Kime. +% \newblock \textit{The \pkg{biblatex} package} [EB/OL]. +% \newblock version 3.16, +% \newblock (2020-12-31) +% \urlprefix\url{https://www.ctan.org/pkg/biblatex} +% % \bibitem{xmuthesis} % Camuse Cao. % \newblock \textit{\pkg{xmuthesis}: 厦门大学论文模板} [EB/OL]. @@ -1264,7 +1290,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/07/15}{1.27f} +\ProvidesExplClass{easybook}{2021/07/16}{1.27g} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -1558,7 +1584,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/07/15}{1.27f} +\ProvidesExplPackage{easybase}{2021/07/16}{1.27g} {Typeset Chinese theses or books} \cs_generate_variant:Nn \int_to_arabic:n { v } @@ -3431,7 +3457,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/07/15}{1.27f} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/07/16}{1.27g} {Customization of tcolorbox for easybook} \cs_new_protected:Npn \eb_tcb_theorem_set:n #1 diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf Binary files differindex fd5bca68db..53edf8c283 100644 --- a/macros/latex/contrib/easybook/easybook.pdf +++ b/macros/latex/contrib/easybook/easybook.pdf |