diff options
Diffstat (limited to 'macros/latex/contrib')
39 files changed, 210 insertions, 169 deletions
diff --git a/macros/latex/contrib/caption/README b/macros/latex/contrib/caption/README index 832f0f160d..e29c6134aa 100644 --- a/macros/latex/contrib/caption/README +++ b/macros/latex/contrib/caption/README @@ -1,7 +1,7 @@ ========================================================================== The `caption' package bundle -Release 2022-02-20 +Release 2022-02-28 Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) License: LPPL = LaTeX Project Public Licence diff --git a/macros/latex/contrib/caption/bicaption.dtx b/macros/latex/contrib/caption/bicaption.dtx index fba7724ff3..f999ec9455 100644 --- a/macros/latex/contrib/caption/bicaption.dtx +++ b/macros/latex/contrib/caption/bicaption.dtx @@ -1027,7 +1027,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} % \DoNotIndex{\@removeelement,\@restorepar,\@secondoftwo,\@setpar} diff --git a/macros/latex/contrib/caption/caption-ams-smf.dtx b/macros/latex/contrib/caption/caption-ams-smf.dtx index f0f8cebe43..6b3b19ced6 100644 --- a/macros/latex/contrib/caption/caption-ams-smf.dtx +++ b/macros/latex/contrib/caption/caption-ams-smf.dtx @@ -126,7 +126,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/macros/latex/contrib/caption/caption-beamer.dtx b/macros/latex/contrib/caption/caption-beamer.dtx index 64d215bb03..fdbfb57402 100644 --- a/macros/latex/contrib/caption/caption-beamer.dtx +++ b/macros/latex/contrib/caption/caption-beamer.dtx @@ -121,7 +121,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/macros/latex/contrib/caption/caption-elsarticle.dtx b/macros/latex/contrib/caption/caption-elsarticle.dtx index 6fb731cf97..cb7733c9d7 100644 --- a/macros/latex/contrib/caption/caption-elsarticle.dtx +++ b/macros/latex/contrib/caption/caption-elsarticle.dtx @@ -121,7 +121,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/macros/latex/contrib/caption/caption-koma.dtx b/macros/latex/contrib/caption/caption-koma.dtx index 84f2f61d3f..c4daad26fa 100644 --- a/macros/latex/contrib/caption/caption-koma.dtx +++ b/macros/latex/contrib/caption/caption-koma.dtx @@ -125,7 +125,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/macros/latex/contrib/caption/caption-light.dtx b/macros/latex/contrib/caption/caption-light.dtx index 697f8233ab..985c4ee95e 100644 --- a/macros/latex/contrib/caption/caption-light.dtx +++ b/macros/latex/contrib/caption/caption-light.dtx @@ -204,7 +204,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} % \DoNotIndex{\@removeelement,\@restorepar,\@secondoftwo,\@setpar} diff --git a/macros/latex/contrib/caption/caption-memoir.dtx b/macros/latex/contrib/caption/caption-memoir.dtx index 918669964e..6905415fb1 100644 --- a/macros/latex/contrib/caption/caption-memoir.dtx +++ b/macros/latex/contrib/caption/caption-memoir.dtx @@ -31,7 +31,7 @@ % % \fi % -% \CheckSum{66} +% \CheckSum{69} % % \iffalse %<*driver> @@ -121,7 +121,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} @@ -183,7 +183,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesFile{caption-memoir.sto}[2021/06/30 v2.2 Adaption of the caption package to the memoir document class (AR)] +\ProvidesFile{caption-memoir.sto}[2022/02/28 v2.2a Adaption of the caption package to the memoir document class (AR)] % \end{macrocode} % % \section{Adaptions already included in the caption package} @@ -300,7 +300,12 @@ % % \begin{macrocode} \@ifundefined{DeclareCaptionAutoPosition}{}{% - \DeclareCaptionAutoPosition{\ifdim\prevdepth>-99\p@#2\else#1\fi}}% + \DeclareCaptionAutoPosition{% + \ifvmode + \ifdim\prevdepth>-99\p@#2\else#1\fi + \else + #2% + \fi}}% % \end{macrocode} % % \begin{macrocode} diff --git a/macros/latex/contrib/caption/caption-ntg.dtx b/macros/latex/contrib/caption/caption-ntg.dtx index 1285bbab92..782d576a8f 100644 --- a/macros/latex/contrib/caption/caption-ntg.dtx +++ b/macros/latex/contrib/caption/caption-ntg.dtx @@ -123,7 +123,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/macros/latex/contrib/caption/caption-thesis.dtx b/macros/latex/contrib/caption/caption-thesis.dtx index aa0694668b..e91145a307 100644 --- a/macros/latex/contrib/caption/caption-thesis.dtx +++ b/macros/latex/contrib/caption/caption-thesis.dtx @@ -121,7 +121,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/macros/latex/contrib/caption/caption.dtx b/macros/latex/contrib/caption/caption.dtx index 4b59565b22..e56e11633a 100644 --- a/macros/latex/contrib/caption/caption.dtx +++ b/macros/latex/contrib/caption/caption.dtx @@ -31,7 +31,7 @@ % % \fi % -% \CheckSum{2869} +% \CheckSum{2840} % % \iffalse %<*driver> @@ -4481,7 +4481,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} @@ -4593,7 +4593,7 @@ % % Identify the current version of the package. % \begin{macrocode} -\ProvidesPackage{caption}[2022/02/20 v3.6 Customizing captions (AR)] +\ProvidesPackage{caption}[2022/02/28 v3.6a Customizing captions (AR)] % \end{macrocode} % % \subsection{Loading the kernel} @@ -4664,65 +4664,6 @@ #2% \fi}} % \end{macrocode} -% \begin{macrocode} -\def\caption@position@a{\caption@position@auto} % needed by floatrow package, \flrow@cappos -% \end{macrocode} -% -% \begin{macrocode} -\SetCaptionDefault{position}{auto} -% \end{macrocode} -% -% \begin{macro}{\caption@setautoposition} -% \changes{v3.1}{2007/06/10}{This macro added} -% \changes{v3.5}{2020/07/27}{Adapted to current implementation of `auto'} -% \changes{v3.6}{2021/01/03}{Adapted to current implementation of `auto'} -% |\caption@setautoposition|\marg{position}\\ -% replaces the above algorithm by a different one (or a fixed position setting). -% \begin{macrocode} -\newcommand*\caption@setautoposition[1]{% - \renewcommand*\caption@position@auto{% - \@nameuse{caption@position@#1}}} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\caption@autoposition} -% \changes{v3.0a}{2004/01/23}{\cs{ifvmode} added} -% \changes{v3.0b}{2004/05/16}{Split into \cs{caption@fixposition} & \cs{caption@autoposition}} -% \changes{v3.5}{2020/07/27}{Adapted to current implementation of `auto'} -% \changes{v3.6}{2021/01/05}{Adapted to current implementation of `auto'; \cs{ifvmode} moved into definition of `auto'} -% We try to guess the current position of the caption by checking |\prev|\-|depth|. -% -% A different solution would be setting the |\space|\-|factor| to something -% not much less than 1000 (for example 994) in |\caption@start| and -% checking this value here by |\ifnum\space|\-|factor=994|. -% (It's implemented in the \package{threeparttable} package\cite{threeparttable} this way.) -% -% Another idea would be checking |\@if|\-|mini|\-|page|, but since some packages -% typeset the caption within a simple |\vbox| this does not seem to be a good one. -% \begin{macrocode} -\newcommand*\caption@autoposition[2]{% - \edef\caption@tempa{\the\prevdepth}% - \caption@Debug{\string\prevdepth=\caption@tempa}% - \ifdim\prevdepth>-\p@ - #2% position=bottom - \else - #1% position=top - \fi} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\caption@autoposition} -% \changes{v3.6}{2021/01/05}{This macro added} -% |\DeclareCaptionAutoPosition|\marg{code with \#1 and \#2}\\ -% replaces the inner algorithm of |position=auto| with a custom one. -% If \#1 is applied the skip will be typeset below the caption -% (like |position=t|), if \#2 is applied the skip will by typeset -% above the caption (like |position=b|). -% \begin{macrocode} -\newcommand*\DeclareCaptionAutoPosition{% - \renewcommand*\caption@autoposition[2]}% -% \end{macrocode} -% \end{macro} % % \subsection{Declaration of options} % diff --git a/macros/latex/contrib/caption/caption3.dtx b/macros/latex/contrib/caption/caption3.dtx index 5c91c87aa6..2f6e4f113a 100644 --- a/macros/latex/contrib/caption/caption3.dtx +++ b/macros/latex/contrib/caption/caption3.dtx @@ -31,7 +31,7 @@ % % \fi % -% \CheckSum{3781} +% \CheckSum{3814} % % \iffalse %<*driver> @@ -179,7 +179,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} @@ -264,7 +264,7 @@ % % Identify the current version of the package. % \begin{macrocode} -\ProvidesPackage{caption3}[2022/01/07 v2.3 caption3 kernel (AR)] +\ProvidesPackage{caption3}[2022/02/28 v2.3a caption3 kernel (AR)] % \end{macrocode} % % \section{Generic helpers} @@ -2838,12 +2838,15 @@ \def\caption@position@b{\caption@position@bottom} \def\caption@position@below{\caption@position@bottom} % \end{macrocode} +% \begin{macrocode} +\DeclareCaptionPosition{auto}{#2}{\caption@autoposition{#1}{#2}} +\def\caption@position@a{\caption@position@auto} % needed by floatrow package, \flrow@cappos +% \end{macrocode} % % \changes{v1.1}{2007/05/08}{Default position changed from `bottom' to `auto'} -% \changes{v1.3}{2021/01/02}{Default position changed back from `auto' to `bottom'} -% `default' usually maps to `bottom'. +% `default' usually maps to `auto'. % \begin{macrocode} -\SetCaptionDefault{position}{bottom} +\SetCaptionDefault{position}{auto} % \end{macrocode} % % \begin{macro}{\caption@initposition} @@ -2896,6 +2899,63 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\caption@setautoposition} +% \changes{v1.1}{2007/06/10}{This macro added} +% \changes{v2.0}{2020/07/27}{Adapted to current implementation of `auto'} +% \changes{v2.3}{2021/01/03}{Adapted to current implementation of `auto'} +% |\caption@setautoposition|\marg{position}\\ +% replaces the above algorithm by a different one (or a fixed position setting). +% \begin{macrocode} +\newcommand*\caption@setautoposition[1]{% + \renewcommand*\caption@position@auto{% + \@nameuse{caption@position@#1}}} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\caption@autoposition} +% \changes{v1.0a}{2004/01/23}{\cs{ifvmode} added} +% \changes{v1.0b}{2004/05/16}{Split into \cs{caption@fixposition} & \cs{caption@autoposition}} +% \changes{v2.0}{2020/07/27}{Adapted to current implementation of `auto'} +% \changes{v2.3}{2021/01/05}{Adapted to current implementation of `auto'; \cs{ifvmode} moved into definition of `auto'} +% \changes{v2.3a}{2022/02/28}{\cs{ifvmode} moved back into this macro} +% We try to guess the current position of the caption by checking |\prev|\-|depth|. +% +% A different solution would be setting the |\space|\-|factor| to something +% not much less than 1000 (for example 994) in |\caption@start| and +% checking this value here by |\ifnum\space|\-|factor=994|. +% (It's implemented in the \package{threeparttable} package\cite{threeparttable} this way.) +% +% Another idea would be checking |\@if|\-|mini|\-|page|, but since some packages +% typeset the caption within a simple |\vbox| this does not seem to be a good one. +% \begin{macrocode} +\newcommand*\caption@autoposition[2]{% + \ifvmode + \edef\caption@tempa{\the\prevdepth}% + \caption@Debug{\string\prevdepth=\caption@tempa}% + \ifdim\prevdepth>-\p@ + #2% position=bottom + \else + #1% position=top + \fi + \else + #2% position=bottom + \fi} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\DeclareCaptionAutoPosition} +% \changes{v2.3}{2021/01/05}{This macro added} +% |\DeclareCaptionAutoPosition|\marg{code with \#1 and \#2}\\ +% replaces the inner algorithm of |position=auto| with a custom one. +% If \#1 is applied the skip will be typeset below the caption +% (like |position=t|), if \#2 is applied the skip will by typeset +% above the caption (like |position=b|). +% \begin{macrocode} +\newcommand*\DeclareCaptionAutoPosition{% + \renewcommand*\caption@autoposition[2]}% +% \end{macrocode} +% \end{macro} +% % \section{Hooks} % % \begin{macro}{\AtBeginCaption} diff --git a/macros/latex/contrib/caption/fallback/v3.0/caption.dtx b/macros/latex/contrib/caption/fallback/v3.0/caption.dtx index 7f7b4a49d1..bbdedad42c 100644 --- a/macros/latex/contrib/caption/fallback/v3.0/caption.dtx +++ b/macros/latex/contrib/caption/fallback/v3.0/caption.dtx @@ -56,7 +56,7 @@ % \usepackage{caption}[2005/08/24] \DeclareCaptionLabelSeparator{endash}{\space\textendash\space} -\usepackage{hyperref} +\usepackage{hypdoc} % \DeclareCaptionFont{red}{\color{red}} \DeclareCaptionFont{green}{\color{green}} diff --git a/macros/latex/contrib/caption/fallback/v3.1/caption.dtx b/macros/latex/contrib/caption/fallback/v3.1/caption.dtx index 4bc736fdb9..17322ede2b 100644 --- a/macros/latex/contrib/caption/fallback/v3.1/caption.dtx +++ b/macros/latex/contrib/caption/fallback/v3.1/caption.dtx @@ -164,7 +164,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/macros/latex/contrib/caption/fallback/v3.2/caption.dtx b/macros/latex/contrib/caption/fallback/v3.2/caption.dtx index 7f31da44f2..0936d97306 100644 --- a/macros/latex/contrib/caption/fallback/v3.2/caption.dtx +++ b/macros/latex/contrib/caption/fallback/v3.2/caption.dtx @@ -150,7 +150,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/macros/latex/contrib/caption/fallback/v3.2/caption3.dtx b/macros/latex/contrib/caption/fallback/v3.2/caption3.dtx index f61d0be004..47e2c25afc 100644 --- a/macros/latex/contrib/caption/fallback/v3.2/caption3.dtx +++ b/macros/latex/contrib/caption/fallback/v3.2/caption3.dtx @@ -136,7 +136,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/macros/latex/contrib/caption/fallback/v3.3/caption.dtx b/macros/latex/contrib/caption/fallback/v3.3/caption.dtx index 721ca9c371..7ab24aeaac 100644 --- a/macros/latex/contrib/caption/fallback/v3.3/caption.dtx +++ b/macros/latex/contrib/caption/fallback/v3.3/caption.dtx @@ -150,7 +150,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/macros/latex/contrib/caption/fallback/v3.3/caption3.dtx b/macros/latex/contrib/caption/fallback/v3.3/caption3.dtx index bdffdcc66a..645c190d78 100644 --- a/macros/latex/contrib/caption/fallback/v3.3/caption3.dtx +++ b/macros/latex/contrib/caption/fallback/v3.3/caption3.dtx @@ -134,7 +134,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/macros/latex/contrib/caption/fallback/v3.4/caption.dtx b/macros/latex/contrib/caption/fallback/v3.4/caption.dtx index 2c9dc62be3..1e3f79d752 100644 --- a/macros/latex/contrib/caption/fallback/v3.4/caption.dtx +++ b/macros/latex/contrib/caption/fallback/v3.4/caption.dtx @@ -151,7 +151,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/macros/latex/contrib/caption/fallback/v3.4/caption3.dtx b/macros/latex/contrib/caption/fallback/v3.4/caption3.dtx index 2843145c18..5bf40979cb 100644 --- a/macros/latex/contrib/caption/fallback/v3.4/caption3.dtx +++ b/macros/latex/contrib/caption/fallback/v3.4/caption3.dtx @@ -129,7 +129,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/macros/latex/contrib/caption/fallback/v3.5/caption.dtx b/macros/latex/contrib/caption/fallback/v3.5/caption.dtx index c573255554..c1cf692b74 100644 --- a/macros/latex/contrib/caption/fallback/v3.5/caption.dtx +++ b/macros/latex/contrib/caption/fallback/v3.5/caption.dtx @@ -174,7 +174,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/macros/latex/contrib/caption/fallback/v3.5/caption3.dtx b/macros/latex/contrib/caption/fallback/v3.5/caption3.dtx index 5918f4a540..993af95854 100644 --- a/macros/latex/contrib/caption/fallback/v3.5/caption3.dtx +++ b/macros/latex/contrib/caption/fallback/v3.5/caption3.dtx @@ -181,7 +181,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue} % \DoNotIndex{\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} diff --git a/macros/latex/contrib/caption/ltcaption.dtx b/macros/latex/contrib/caption/ltcaption.dtx index 1b6c813a53..5d06fb0845 100644 --- a/macros/latex/contrib/caption/ltcaption.dtx +++ b/macros/latex/contrib/caption/ltcaption.dtx @@ -407,7 +407,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} % \DoNotIndex{\@removeelement,\@restorepar,\@secondoftwo,\@setpar} diff --git a/macros/latex/contrib/caption/subcaption.dtx b/macros/latex/contrib/caption/subcaption.dtx index 38104d18ce..31b76d94fd 100644 --- a/macros/latex/contrib/caption/subcaption.dtx +++ b/macros/latex/contrib/caption/subcaption.dtx @@ -1700,7 +1700,7 @@ % \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs} % \DoNotIndex{\@for,\@firstofone,\@firstoftwo} % \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom} -% \DoNotIndex{\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} +% \DoNotIndex{\if@minipage,\@ifnextchar,\@ifpackagelater,\@ifpackageloaded} % \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@namedef,\@nameuse} % \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist} % \DoNotIndex{\@removeelement,\@restorepar,\@secondoftwo,\@setpar} diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 682a69138b..f2b80e1c53 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2022/02/25}{1.632} +\ProvidesExplClass{easybook}{2022/02/28}{1.633} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -303,7 +303,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2022/02/25}{1.632} +\ProvidesExplPackage{easybase}{2022/02/28}{1.633} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -2272,7 +2272,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2022/02/25}{1.632} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/02/28}{1.633} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf Binary files differindex 77f9802048..de14f6c53f 100644 --- a/macros/latex/contrib/easybook/easybook.pdf +++ b/macros/latex/contrib/easybook/easybook.pdf diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex index 26e858b92e..08c5a5c4fb 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -21,8 +21,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK使用手册, - version = v1.632, - date = 2022/02/25, + version = v1.633, + date = 2022/02/28, authors = 瞿毅, info = 排版简体中文学位论文和书籍, email = q1jx@foxmail.com, @@ -74,17 +74,15 @@ \clist_use:Nn \l_tmpa_clist {#1} } % Add delimiters to parameters -\newcommand{\newsplitarg}[4][\splitmeta] +\newcommand{\newsplitarg}[4][\code{,}] { \newcommand{#2}[1] - {\code{\textcolor{argument}{#3\textnormal{#1{##1}}#4}}} + {\code{\textcolor{argument}{#3\textnormal{\splitmeta[#1]{##1}}#4}}} } \newsplitarg{\splitoarg}{[}{]} \newsplitarg{\splitdarg}{(}{)} \newsplitarg{\splitmarg}{\{}{\}} -% Separator with vertical bar as parameter -\newcommand{\barmeta}{\splitmeta[\code{|}]} -\newsplitarg[\barmeta]{\baroarg}{[}{]} +\newsplitarg[\code{|}]{\baroarg}{[}{]} \newcommand{\harg}{\textcolor{argument}{\code{-}}} % Remove default braces of values \RenewDocumentCommand{\key}{s} @@ -350,7 +348,7 @@ \listoffigures[level = \bichapter,title = {图片索引,List of Figures}] \end{ctexexam} \keyval{multoc}{整数}\Default{2} - 与 \module*{style} 模块的 \option{multoc} 选项具有相同的效果,但是具有优先性且可单独设置不同类型目录的排版栏数。\meta{整数} 为目录栏数,不指定栏数值则默认为双栏。 + 设置目录的排版栏数。\meta{整数} 代表目录栏数,不指定栏数的值则默认为双栏。 \kvsplit{title}{中文目录标题,英文目录标题} 用于更改目录的标题。标题之间用一个英文逗号分开,也可以只有一部分,表示中文目录的标题。当设置了英文目录标题时,英文目录标题将会自动加入文档主目录 \cs*{tableofcontents}\parg{} 命令。 \keychoice{bilist}{mix,new}\Default{new} @@ -465,7 +463,7 @@ \keyval{color-every}{HTML颜色代码} 统一设置主题的各部分颜色。参数是6个十六进制数字组成的 \code{HTML} 颜色代码,任意颜色的代码可以在常见的图片处理工具拾色器中查看。 \keyval{multoc}{整数}\Default{2} - 使目录多栏排版,与\ref{sec:document command} 中目录命令的同名选项有相同效果。 + 设置目录的排版栏数,与\ref{sec:document command} 中目录命令的同名选项有相同效果。 \keybool{withpart}\Default{false} 使章标题跟随部分计数器编号,当开启新的一部分时章编号从1开始。 \keychoice{fntnumwith}{part,chapter,page}\Default{chapter} @@ -892,7 +890,7 @@ \keyval{tocformat}{条目格式}\dtag\smodule{tocset}% 目录中各级别条目的格式。可以设置条目字体和加入垂直间距等,垂直间距最好使用防止垂直间距重合的 \cs*{addvspace} 命令。 \keyval{tocformat+}{条目格式}\dtag - 与 \option{tocformat} 用法一样,只是在已有的格式命令后附加代码。 + 与选项 \option{tocformat} 用法一样,只是在已有的格式命令后附加代码。 \keyval{tocindent}{刚性长度}\dtag 目录条目左边的缩进距离,通常条目级别越低缩进越大。 \keyval{tocrule}{引导线命令}\dtag diff --git a/macros/latex/contrib/hvfloat/Changes b/macros/latex/contrib/hvfloat/Changes index 4084d7eb92..578c9be771 100644 --- a/macros/latex/contrib/hvfloat/Changes +++ b/macros/latex/contrib/hvfloat/Changes @@ -1,4 +1,6 @@ hvfloat.sty: +2.37 2022-02-28 - fix bug for doublepage floats in twoside and twocolumn mode + and captions after the image 2.36 2022-02-22 - fix bug for outer captions (was wrong) 2.35 2021-10-09 - add \parskip for vertical negative space 2.34 2021-09-23 - fix for nonFloat and forceOutput diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf Binary files differindex 79f4e6dfc9..10e1519bf1 100644 --- a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf +++ b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.tex b/macros/latex/contrib/hvfloat/doc/hvfloat.tex index 44b35f8a90..70113c0a7e 100644 --- a/macros/latex/contrib/hvfloat/doc/hvfloat.tex +++ b/macros/latex/contrib/hvfloat/doc/hvfloat.tex @@ -2556,7 +2556,7 @@ even page and following text will be placed \emph{before} the object. \begin{lstlisting} \hvFloat[doubleFULLPAGE,capPos=right,capAngle=90]% {figure}% - {\includegraphics[angle=90,width=2\paperwidth]{images/r+j}}% + {\includegraphics[width=2\paperwidth]{images/r+j2}}% [A doublepage image with a caption on the image.]% {A caption for a double-sided image that will be placed below the right-hand part of the illustration. The illustration begins on the left edge of the paper. @@ -2568,7 +2568,7 @@ even page and following text will be placed \emph{before} the object. \marginnote{Fig.~\ref{fig:doubleFULLPAGE0}} \hvFloat[doubleFULLPAGE,capPos=right,capAngle=90]% {figure}% - {\includegraphics[angle=90,height=\paperheight]{images/r+j}}% + {\includegraphics[height=\paperheight]{images/r+j2}}% [A doublepage image with a caption on the image.]% {A caption for a double-sided image that will be placed on the right-hand part of the illustration. The illustration begins on the left edge of the paper. @@ -2590,7 +2590,7 @@ in the inner margin on both pages. \begin{lstlisting} \hvFloat[doubleFULLPAGE,capPos=right,bindCorr=5mm]% {figure}% - {\includegraphics[angle=90,width=2\paperwidth]{images/r+j}}% + {\includegraphics[width=2\paperwidth]{images/r+j3}}% [A doublepage image with a caption on the image.]% {A caption for a double-sided image that will be placed below the right-hand part of the illustration. The illustration begins on the left edge of the paper. @@ -2602,7 +2602,7 @@ in the inner margin on both pages. \marginnote{Fig.~\ref{fig:doubleFULLPAGE0a}} \hvFloat[doubleFULLPAGE,capPos=right,bindCorr=5mm]% {figure}% - {\includegraphics[height=2\paperwidth,angle=90]{images/r+j}}% + {\includegraphics[height=2\paperwidth]{images/r+j3}}% [A doublepage image with a caption on the image.]% {A caption for a double-sided image that will be placed on the right-hand part of the illustration. The illustration begins on the left edge of the paper. diff --git a/macros/latex/contrib/hvlogos/Changes b/macros/latex/contrib/hvlogos/Changes index 0e3a6e5bb9..f206cbb406 100644 --- a/macros/latex/contrib/hvlogos/Changes +++ b/macros/latex/contrib/hvlogos/Changes @@ -1,4 +1,6 @@ hvlogos.sty: +0.07 2022-02-28 - fix for \dante and \eV +0.06 2022-01-23 - added \BibLaTeXML 0.05 2022-01-08 - added \LuaMetaTeX and \LMTX with alias in lowercase letters 0.04 2021-10-02 - added new macros to user-defined kernings 0.03 2021-09-25 - \tikz in regular font diff --git a/macros/latex/contrib/hvlogos/README b/macros/latex/contrib/hvlogos/README index 5533d66103..540ae523e8 100644 --- a/macros/latex/contrib/hvlogos/README +++ b/macros/latex/contrib/hvlogos/README @@ -1,5 +1,5 @@ - hvlogos + Printing TeX related names as a logo %% This program can be redistributed and/or modified under the terms diff --git a/macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf b/macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf Binary files differindex 7b732b272a..ffcc2d1d71 100644 --- a/macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf +++ b/macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf diff --git a/macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex b/macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex index 81f7731d59..aef5ba2655 100644 --- a/macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex +++ b/macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex @@ -128,6 +128,7 @@ The package \LPack{hvlogos} loads by default the packages \Lcs{XeLaTeX} && \XeLaTeX \\ \Lcs{XeTeX} && \XeTeX \\ +\Lcs{xypic}& \Lcs{XYpic} & \xypic \end{longtable} diff --git a/macros/latex/contrib/hvlogos/latex/hvlogos.sty b/macros/latex/contrib/hvlogos/latex/hvlogos.sty index d6b5e38677..78f8bf3ee0 100644 --- a/macros/latex/contrib/hvlogos/latex/hvlogos.sty +++ b/macros/latex/contrib/hvlogos/latex/hvlogos.sty @@ -10,7 +10,7 @@ % % % ------------------------------------- -\ProvidesPackage{hvlogos}[2022/01/08 v. 0.05 Logos (hv)] +\ProvidesPackage{hvlogos}[2022/02/28 v. 0.07 Logos (hv)] % \newif\if@dtk@newengine \@dtk@newenginetrue % @@ -77,6 +77,13 @@ \def\AmSTeX{\mbox{\textsf{AMS}-\hologo{TeX}}} \DeclareRobustCommand\Biber{\textsf{Biber}} \let\biber\Biber +\DeclareRobustCommand{\BibLaTeXML}{B\kern-.05em% + \hbox{$\m@th$% %% force math size calculations + \csname S@\f@size\endcsname + \fontsize\sf@size\z@ + \math@fontsfalse\selectfont + I\kern-.025emB}% + \kern-.08em\-\LaTeX{}ML} \DeclareRobustCommand\BibTeX{\@ifnextchar8\@@BibTeX\@BibTeX} \def\@BibTeX{{\hologoLogoSetup{BibTeX}{variant=sc}\hologo{BibTeX}}} \def\BibTeXacht{{\hologoLogoSetup{BibTeX8}{variant=sc}\hologo{BibTeX8}}} @@ -124,10 +131,19 @@ % \HOLOGO@discretionary \hologo{TeX}% } +\def\LuaMetaLaTeX{% + \mbox{Lua}% +% \HOLOGO@discretionary +% \mbox{\fontfamily{logo}\fontencoding{U}\selectfont META} + \HoLogoFont@font{METAFONT}{logo}{\mbox{META}}% +% \HOLOGO@discretionary + \hologo{LaTeX}% +} \def\LMTX{\textsf{LMTX}} \let\lmtx\LMTX \def\LyX{\hologo{LyX}} +\def\META{\HoLogoFont@font{METAFONT}{logo}{\mbox{META}}} \def\METAFONT{\hologo{METAFONT}} \let\MF\METAFONT \def\MetaFun{\textffm{METAFUN}} @@ -161,6 +177,8 @@ \def\VTeX{\hologo{VTeX}} \def\XeLaTeX{\hologo{XeLaTeX}} \def\XeTeX{\hologo{XeTeX}} +\DeclareRobustCommand\xypic{\textsf{\hbox{\kern-.1em X\kern-.1em\lower.4ex\hbox{Y\kern-.1em}-pic}}} +\let\XYpic\xypic %% % \newcommand\BibTool{\textsc{Bib\hskip-.1em @@ -170,20 +188,27 @@ \let\TikZ\tikzlogo \def\eV{e.\kern-0.1em V\kern-0.18em.} + +\def\dante{DANTE~e.\kern-0.1em V\kern-0.18em.} + +\iffalse \def\d@nte{\@ifnextchar.% {\mbox{DANTE e.\kern-0.1em V\kern-0.18em}}% - {\mbox{DANTE e.\kern-0.1em V\kern-0.18em.}\xspace}% -} -\def\D@nte{\@ifnextchar.% - {DANTE, Deutschsprachige Anwendervereinigung~\mbox{\TeX~e.\kern-0.1em V\kern-0.18em}}% - {DANTE, Deutschsprachige Anwendervereinigung~\mbox{\TeX~e.\kern-0.1em V\kern-0.18em.}\xspace}% + {\mbox{DANTE e.\kern-0.1em V\kern-0.18em.}}% } + \def\dante#1{% \ifx#1\@empty \d@nte \else \expandafter\d@nte#1% \fi} +\fi + +\def\D@nte{\@ifnextchar.% + {DANTE, Deutschsprachige Anwendervereinigung~\mbox{\TeX~e.\kern-0.1em V\kern-0.18em}}% + {DANTE, Deutschsprachige Anwendervereinigung~\mbox{\TeX~e.\kern-0.1em V\kern-0.18em.}\xspace}% +} \def\Dante#1{% \ifx#1\@empty diff --git a/macros/latex/contrib/lectureslides/README.md b/macros/latex/contrib/lectureslides/README.md index e61eba13b7..81e5a14122 100644 --- a/macros/latex/contrib/lectureslides/README.md +++ b/macros/latex/contrib/lectureslides/README.md @@ -1,8 +1,8 @@ # The `lectureslides` Package -#### Version 0.1 +#### Version 1.0 Taihao Zhang (t@taihao.de) -15 March 2021 +1 March 2022 This package allows for easily combining and indexing individual PDFs into one large PDF. @@ -13,7 +13,11 @@ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA. ____ Changes: - + +* 2022-03-01 / 1.0 + * Improve page range option + * Improve documentation + * Implement `ngerman` for footnote text * 2021-03-15 / 0.1 Initial release diff --git a/macros/latex/contrib/lectureslides/lectureslides-doc.pdf b/macros/latex/contrib/lectureslides/lectureslides-doc.pdf Binary files differindex ccc7d4e35b..934c5e1b1e 100644 --- a/macros/latex/contrib/lectureslides/lectureslides-doc.pdf +++ b/macros/latex/contrib/lectureslides/lectureslides-doc.pdf diff --git a/macros/latex/contrib/lectureslides/lectureslides-doc.tex b/macros/latex/contrib/lectureslides/lectureslides-doc.tex index df1bc17d1d..10e11d48c2 100644 --- a/macros/latex/contrib/lectureslides/lectureslides-doc.tex +++ b/macros/latex/contrib/lectureslides/lectureslides-doc.tex @@ -3,18 +3,18 @@ \usepackage[british]{babel} \usepackage[babel]{microtype} \newcommand{\thispackage}{lectureslides} -\title{The \texttt{\thispackage} Package\footnote{This document corresponds to \texttt{lectureslides} version 0.1 / 2021-03-15.}} -\author{Taihao Zhang\thanks{Technische Universität Darmstadt, t@taihao.de}} -\date{15 March 2021} +\title{The \texttt{\thispackage} Package\footnote{This document corresponds to \texttt{lectureslides} version 1.0 / 2022-03-01.}} +\author{Taihao Zhang\protect\\\ttfamily t@taihao.de} +\date{1st March 2022} \begin{document} \maketitle -% \section{Motivation} +% \subsection*{Motivation} When studying, there frequently occurs the situation where one uses \texttt{Ctrl\,+\,F} many times to search for a keyword in all the lecture slides. Throughout an entire semester, there can be a large number of PDFs that would need to be searched. \par This package allows for easily combining individual PDFs into a large one, indexing each with a title that PDF viewers can display. \verb+lectureslides+ also provides a table of contents. -\section{Usage} +\subsection*{Usage} In general, usage of \texttt{\thispackage} works as follows: \begin{verbatim} \documentclass{article} @@ -30,31 +30,40 @@ In general, usage of \texttt{\thispackage} works as follows: \begin{macro}{\course} Acts as the title on the cover page, used in the form \newline - \verb+\course[]{Engineering Mechanics}+. The optional argument specifies the person compiling the document, which will be typeset as a footnote alongside the current date. For instructions on changing that footnote, see \verb+\createdby+. + \verb+\course[]{Engineering Mechanics}+. The optional argument specifies the footnote text, which otherwise defaults to \textbf{Compiled \textbackslash today}. This text adapts to an \verb+ngerman+ setting in babel.\footnote{This requires that this package is loaded after babel.} \end{macro} + \newpage \begin{macro}{\lecture} Inserts one set of lecture slides. This command takes two mandatory arguments in the following form: \begin{verbatim} \lecture{Title of this lecture}{pdf_file_name} \end{verbatim} - An optional argument can specify the last slide that needs to be included. For example, to include slides 1~--10 of \verb+intro.pdf+: + Two optional arguments can specify the range of slides that need to be included. For example, to include slides 10~--35 of \verb+intro.pdf+: \begin{verbatim} - \lecture{Introduction to EM}[10]{intro} + \lecture{Introduction to EM}[10][35]{intro} + \end{verbatim} + Either optional argument can be left empty. To include slides up to slide number 35: + \begin{verbatim} + \lecture{Introduction to EM}[][35]{intro} + \end{verbatim} + To include slides from slide number 10 til the end: + \begin{verbatim} + \lecture{Introduction to EM}[10][]{intro} \end{verbatim} Internally, this command calls \verb+\lecturetitle+ and \verb+\lectureslides+. \end{macro} \begin{macro}{\tableofcontents} - Prints a table of contents of all lectures. Each \verb+\lecture+ and \verb+\lecturetitle+ gets its own entry here. \verb+\tocline+ customises the appearance. + Prints a table of contents of all lectures. Each \verb+\lecture+ (and consequently \verb+\lecturetitle+) gets its own entry here. \verb+\tocline+ customises the appearance. \end{macro} -\section{Option} +\subsection*{Option} \DescribeMacro{landscape} \DescribeMacro{portrait} \verb+landscape+ is the default orientation if no option is passed, as lecture slides are most often given out in this format. \verb+portrait+ can be used instead to insert slides in portrait orientation. -\section{Advanced} +\subsection*{Advanced} \begin{macro}{\lecturetitle} Declares a new set of slides, but doesn't insert any PDF pages yet. When followed by \verb+\lectureslides+, an actual entry in the table of contents gets created. \begin{verbatim} @@ -63,25 +72,15 @@ In general, usage of \texttt{\thispackage} works as follows: \end{macro} \begin{macro}{\lectureslides} - Inserts a set of slides from a given PDF. Optional argument specifies the last slide to be included. - \begin{verbatim} - \lectureslides[10]{pdf_file_name} - \end{verbatim} - Multiple \verb+\lectureslides+ can be stringed together to include slides from different PDFs which are all organised under the same \verb+\lecturetitle+. - \end{macro} - - \begin{macro}{\createdby} - Determines the sentence in the footnote, which is initiated by the optional argument of \verb+\course+. Putting the following in the preamble redefines the sentence, to fit the desired language for example. + Inserts a set of slides from a given PDF. Optional arguments specify the range of slides to be included. \begin{verbatim} - \renewcommand{\createdby}[1]{% - Created by #1 on \today.% - } + \lectureslides[10][35]{pdf_file_name} \end{verbatim} - \verb+\renewcommand{\createdby}{Created in March 2021.}+ for example gets rid of the name entirely. Note that some kind of non-empty argument is still needed in \verb+\course[]{}+ so the footnote gets printed at all. + Multiple \verb+\lectureslides+ can be stringed together to include slides from different PDFs. These will then all organised under the last preceding \verb+\lecturetitle+. \end{macro} - + \begin{macro}{\tocline} - Determines how the lecture title appears in the ToC. Putting the following in the preambled redefines this, for example: + Determines how the lecture title appears in the table of contents (ToC). Putting the following in the preamble redefines this, for example: \begin{verbatim} \renewcommand{\tocline}[1]{% Semana \arabic{section}: #1% diff --git a/macros/latex/contrib/lectureslides/lectureslides.sty b/macros/latex/contrib/lectureslides/lectureslides.sty index 8c9cfc4899..3bfff0dedb 100644 --- a/macros/latex/contrib/lectureslides/lectureslides.sty +++ b/macros/latex/contrib/lectureslides/lectureslides.sty @@ -1,10 +1,10 @@ % % lectureslides -% version 0.1 -% 2021/03/15 +% version 1.0 +% 2022/03/01 % % Taihao Zhang (taihao.de) -% 15 March, 2021 +% 1 March, 2022 % % This work is licensed under the Creative Commons Attribution 4.0 International License. % To view a copy of this license, visit http://creativecommons.org/licenses/by/4.0/ @@ -16,14 +16,14 @@ \newcommand{\thispackage}{lectureslides} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{\thispackage}[2021/03/14 \thispackage] +\ProvidesPackage{\thispackage}[2022/03/01 \thispackage] \RequirePackage{xparse} \RequirePackage{pdfpages - % , parskip , tocloft - % , tikz - , hyperref} + , hyperref + , babel +} \renewcommand{\cftdot}{} \renewcommand{\cftsecfont}{\mdseries} \renewcommand{\cftsecafterpnum}{\vspace{-3.25mm}} @@ -37,14 +37,23 @@ \DeclareOption*{\PackageWarning{\thispackage}{Unknown option ‘\CurrentOption’}} \ProcessOptions\relax -\newcommand{\createdby}[1]{Zusammengestellt von #1 am \today.} +\newcommand{\createdAt}[1]{Compiled \today.} \NewDocumentCommand{\course}{o m}{% {% \noindent\LARGE\bfseries\sffamily #2% - \IfNoValueTF{#1}% - {}% - {\footnote{\createdby{#1}}}% + \footnote{ + \IfNoValueTF{#1}% + { + % No optional argument passed + \iflanguage{ngerman}{ + Zusammengestellt am \today. + }{ + Compiled \today. + } + }% + {#1}% + }% \par% }% } @@ -57,18 +66,13 @@ \addcontentsline{toc}{\toclevel}{\tocline{#1}}% } -\NewDocumentCommand{\lectureslides}{o m}{% - \IfNoValueTF{#1}% - {\includepdf[pages=- \orientation]{#2}}% - {\includepdf[pages=-#1 \orientation]{#2}}% -} - -\NewDocumentCommand{\lecture}{m o m}{% - \lecturetitle{#1}\lectureslides[#2]{#3}% +\NewDocumentCommand{\lectureslides}{o o m}{% + \includepdf[pages=#1-#2 \orientation]{#3} + % \IfNoValueTF{#1}% + % {\includepdf[pages=- \orientation]{#2}}% + % {\includepdf[pages=-#1 \orientation]{#2}}% } -\newcommand{\infotext}{% -Diese PDF mit Inhaltsverzeichnis und PDF-Kapiteln wurde erstellt, um ein einfacheres Lernen zu ermöglichen indem alle Folien übersichtlich an einem Ort organisiert sind.% -\par% -In geeigneten PDF-Readern wird ein Navigationsbereich angezeigt, sodass einfach zwischen den Kapiteln gewechselt werden kann. Alternativ sind die Überschriften im Inhaltsverzeichnis auch anklickbar.% +\NewDocumentCommand{\lecture}{m o o m}{% + \lecturetitle{#1}\lectureslides[#2][#3]{#4}% } |