From 71fd3749ed2ec982d2ef2863bf8e99760d33b562 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 27 Jan 2021 03:00:30 +0000 Subject: CTAN sync 202101270300 --- macros/latex/contrib/asmeconf/README.md | 6 +- .../latex/contrib/asmeconf/asmeconf-template.pdf | Bin 637772 -> 637547 bytes .../latex/contrib/asmeconf/asmeconf-template.tex | 4 +- macros/latex/contrib/asmeconf/asmeconf.cls | 175 +++--- macros/latex/contrib/footnotehyper/README.md | 4 +- .../latex/contrib/footnotehyper/footnotehyper.dtx | 86 ++- .../latex/contrib/footnotehyper/footnotehyper.pdf | Bin 61195 -> 65912 bytes macros/latex/contrib/media4svg/ChangeLog | 4 + macros/latex/contrib/media4svg/README.md | 4 +- .../contrib/media4svg/example/beamer-example-1.svg | 172 +++--- .../contrib/media4svg/example/beamer-example-2.svg | 62 +-- .../contrib/media4svg/example/beamer-example-3.svg | 45 +- .../contrib/media4svg/example/beamer-example-4.svg | 611 +++++++++++---------- .../contrib/media4svg/example/beamer-example.tex | 26 +- macros/latex/contrib/media4svg/media4svg.sty | 58 +- macros/latex/required/babel/base/README.md | 20 +- macros/latex/required/babel/base/babel.dtx | 455 ++++++++------- macros/latex/required/babel/base/babel.ins | 4 +- macros/latex/required/babel/base/babel.pdf | Bin 819029 -> 815772 bytes macros/latex/required/babel/base/bbcompat.dtx | 2 +- 20 files changed, 937 insertions(+), 801 deletions(-) (limited to 'macros') diff --git a/macros/latex/contrib/asmeconf/README.md b/macros/latex/contrib/asmeconf/README.md index caa2ea960b..70d8dd097f 100644 --- a/macros/latex/contrib/asmeconf/README.md +++ b/macros/latex/contrib/asmeconf/README.md @@ -1,7 +1,7 @@ #asmeconf: A template for ASME conference papers# - Version 1.23 dated 2021/01/18. + Version 1.24 dated 2021/01/26. ####Overview#### This class provides a template to format ASME Conference papers according to @@ -77,6 +77,10 @@ ####Change log#### + v1.24 (2021/01/26): + - fix issue with math accents in headings & captions (Thanks to Beomjun Kye for reporting the problem) + - adjust code for sans-serif upright Greek letters + v1.23 (2021/01/18): - Several minor edits and corrections diff --git a/macros/latex/contrib/asmeconf/asmeconf-template.pdf b/macros/latex/contrib/asmeconf/asmeconf-template.pdf index 7749450f4c..917c11e071 100644 Binary files a/macros/latex/contrib/asmeconf/asmeconf-template.pdf and b/macros/latex/contrib/asmeconf/asmeconf-template.pdf differ diff --git a/macros/latex/contrib/asmeconf/asmeconf-template.tex b/macros/latex/contrib/asmeconf/asmeconf-template.tex index 728d9b7d51..90d45ed9b0 100644 --- a/macros/latex/contrib/asmeconf/asmeconf-template.tex +++ b/macros/latex/contrib/asmeconf/asmeconf-template.tex @@ -4,7 +4,7 @@ %% This file is asmeconf-template.tex, a template to format ASME Conference papers according to %% the requirements on ASME's conference web pages, and including hypertext support for the pdf. %% -%% This file is version 1.23 dated 2021/1/18 +%% This file is version 1.24 dated 2021/1/26 %% %% As of version 1.11, this template follows ASME's newer conference guidelines first posted July 2019. %% The new guidelines have changed the requested author block formatting to be inline. @@ -251,7 +251,7 @@ Sections may either be numbered or left unnumbered. Simple mathematical expressions can be used in either captions or section headings. For a section heading that includes more complicated math (and macros), you may use the optional argument of \verb|\section[..]{..}| to create a pdf bookmark without losing characters or producing warnings or errors. See the \texttt{asmeconf-template.tex} source file for examples of this procedure. These bookmarks should usually be text expressions, although some math is supported. -If you wish to override the default math format in captions, put \verb|\mathversion{normal}| in the caption. +To override the \texttt{sansbold} math version in captions, put \verb|\NoCaseChange{\mathversion{normal}}| in the caption. \subsection{Subsection and Sub-subsection Headings} Subsections and sub-subsection headings should be entered in title case, with the first letter of primary words capitalized. Sub-subsections (i.e., paragraphs) are never numbered. diff --git a/macros/latex/contrib/asmeconf/asmeconf.cls b/macros/latex/contrib/asmeconf/asmeconf.cls index c5b01acb43..0b151ded5f 100644 --- a/macros/latex/contrib/asmeconf/asmeconf.cls +++ b/macros/latex/contrib/asmeconf/asmeconf.cls @@ -5,8 +5,8 @@ %% ASME conference requirements as represented on ASME's conference web pages in 2020. %% %% This file's version and date: - \def\versionno{1.23} - \def\versiondate{2021/01/18\space} + \def\versionno{1.24} + \def\versiondate{2021/01/26\space} %% %% Author: John H. Lienhard, V %% Department of Mechanical Engineering @@ -751,15 +751,19 @@ %\renewcommand\footnotesize{\@setfontsize\footnotesize{8}{9.5}} % same as default -%% This provides sans serif italic and sans serif bold italic math. -%% These fonts are for use in the figure captions and section headings. Use \mathbf{..}, \mathversion{bold}, or \bm{..} elsewhere. +%% This provides sans-serif italic and sans-serif bold italic math. +%% These fonts are for use in the figure captions and section headings. +%% Use \mathbf{..}, \mathversion{bold}, or \bm{..} elsewhere. \DeclareMathVersion{sansbold} \SetSymbolFont{letters}{sansbold}{OML}{ntxsfmi}{b}{it} \SetSymbolFont{lettersA}{sansbold}{U}{ntxsfmia}{b}{it} \SetSymbolFont{symbols}{sansbold}{LMS}{ntxsy}{b}{n} +\SetSymbolFont{largesymbols}{sansbold}{LMX}{ntxexx}{b}{n}% added 25 Jan 2021 +\SetSymbolFont{largesymbolsTXA}{sansbold}{U}{ntxexa}{b}{n}% added 25 Jan 2021 \SetSymbolFont{operators}{sansbold}{\encodingdefault}{\sfdefault}{\bfdefault}{n} \SetMathAlphabet{\mathsf}{sansbold}{\encodingdefault}{\sfdefault}{b}{it} + % Nice solution from DPC to prevent aux file errors (due to active characters from babel) when switching from pdflatex to lualatex. \ifx\directlua\undefined \AtBeginDocument{\immediate\write\@auxout{\detokenize{% @@ -1417,97 +1421,92 @@ \RenewDocumentCommand{\date}{m}{\versionfootnote{#1}}% if one wants to use \date this same way; fixed bug 14/01/2021 -%%%%%%%%%%%%%% Special font definitions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%% Sans serif upright greek and sans mathversion %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Provide sans serif upright Greek letters, following a suggestion by Michael Sharpe (March 2019). +%% Provide sans-serif *upright* Greek letters, following a suggestion by Michael Sharpe (March 2019). %% Following Sharpe's newtxsf implementation of the STIX fonts, under the LaTeX Project Public License. +%% (Note that \mathversion{sansbold} provides sans-serif *italic* Greek letters.) Various edits 25 Jan 2021 \DeclareSymbolFont{lettersAB}{U}{ntxsfmia}{m}{it} +\SetSymbolFont{lettersAB}{normal}{U}{ntxsfmia}{m}{it} \SetSymbolFont{lettersAB}{bold}{U}{ntxsfmia}{b}{it} +\SetSymbolFont{lettersAB}{sansbold}{U}{ntxsfmia}{b}{it}% added 25/01/2021, to get this bold in captions, etc. \DeclareFontSubstitution{U}{ntxsfmia}{m}{it} -\DeclareMathSymbol{\Gammaup}{\mathalpha}{lettersAB}{0} -\newcommand*{\sfGamma}{\text{\ensuremath\Gammaup}} - -\DeclareMathSymbol{\Deltaup}{\mathalpha}{lettersAB}{1} -\newcommand*{\sfDelta}{\text{\ensuremath\Deltaup}} -\DeclareMathSymbol{\Thetaup}{\mathalpha}{lettersAB}{2} -\newcommand*{\sfTheta}{\text{\ensuremath\Thetaup}} -\DeclareMathSymbol{\Lambdaup}{\mathalpha}{lettersAB}{3} -\newcommand*{\sfLambda}{\text{\ensuremath\Lambdaup}} -\DeclareMathSymbol{\Xiup}{\mathalpha}{lettersAB}{4} -\newcommand*{\sfXi}{\text{\ensuremath\Xiup}} -\DeclareMathSymbol{\Piup}{\mathalpha}{lettersAB}{5} -\newcommand*{\sfPi}{\text{\ensuremath\Piup}} - -\DeclareMathSymbol{\Sigmaup}{\mathalpha}{lettersAB}{6} -\newcommand*{\sfSigma}{\text{\ensuremath\Sigmaup}} -\DeclareMathSymbol{\Upsilonup}{\mathalpha}{lettersAB}{7} -\newcommand*{\sfUpsilon}{\text{\ensuremath\Upsilonup}} -\DeclareMathSymbol{\Phiup}{\mathalpha}{lettersAB}{8} -\newcommand*{\sfPhi}{\text{\ensuremath\Phiup}} -\DeclareMathSymbol{\Psiup}{\mathalpha}{lettersAB}{9} -\newcommand*{\sfPsi}{\text{\ensuremath\Psiup}} -\DeclareMathSymbol{\Omegaup}{\mathalpha}{lettersAB}{10} -\newcommand*{\sfOmega}{\text{\ensuremath\Omegaup}} - -\DeclareMathSymbol{\alphaup}{\mathalpha}{lettersAB}{11} -\newcommand*{\sfalpha}{\text{\ensuremath\alphaup}} -\DeclareMathSymbol{\betaup}{\mathalpha}{lettersAB}{12} -\newcommand*{\sfbeta}{\text{\ensuremath\betaup}} -\DeclareMathSymbol{\gammaup}{\mathalpha}{lettersAB}{13} -\newcommand*{\sfgamma}{\text{\ensuremath\gammaup}} -\DeclareMathSymbol{\deltaup}{\mathalpha}{lettersAB}{14} -\newcommand*{\sfdelta}{\text{\ensuremath\deltaup}} -\DeclareMathSymbol{\epsilonup}{\mathalpha}{lettersAB}{15} -\newcommand*{\sfepsilon}{\text{\ensuremath\epsilonup}} - -\DeclareMathSymbol{\zetaup}{\mathalpha}{lettersAB}{16} -\newcommand*{\sfzeta}{\text{\ensuremath\zetaup}} -\DeclareMathSymbol{\etaup}{\mathalpha}{lettersAB}{17} -\newcommand*{\sfeta}{\text{\ensuremath\etaup}} -\DeclareMathSymbol{\thetaup}{\mathalpha}{lettersAB}{18} -\newcommand*{\sftheta}{\text{\ensuremath\thetaup}} -\DeclareMathSymbol{\iotaup}{\mathalpha}{lettersAB}{19} -\newcommand*{\sfiota}{\text{\ensuremath\iotaup}} -\DeclareMathSymbol{\kappaup}{\mathalpha}{lettersAB}{20} -\newcommand*{\sfkappa}{\text{\ensuremath\kappaup}} - -\DeclareMathSymbol{\lambdaup}{\mathalpha}{lettersAB}{21} -\newcommand*{\sflambda}{\text{\ensuremath\lambdaup}} -\DeclareMathSymbol{\muup}{\mathalpha}{lettersAB}{22} -\newcommand*{\sfmu}{\text{\ensuremath\muup}} -\DeclareMathSymbol{\nuup}{\mathalpha}{lettersAB}{23} -\newcommand*{\sfnu}{\text{\ensuremath\nuup}} -\DeclareMathSymbol{\xiup}{\mathalpha}{lettersAB}{24} -\newcommand*{\sfxi}{\text{\ensuremath\xiup}} -\DeclareMathSymbol{\piup}{\mathalpha}{lettersAB}{25} -\newcommand*{\sfpi}{\text{\ensuremath\piup}} - -\DeclareMathSymbol{\rhoup}{\mathalpha}{lettersAB}{26} -\newcommand*{\sfrho}{\text{\ensuremath\rhoup}} -\DeclareMathSymbol{\sigmaup}{\mathalpha}{lettersAB}{27} -\newcommand*{\sfsigma}{\text{\ensuremath\sigmaup}} -\DeclareMathSymbol{\tauup}{\mathalpha}{lettersAB}{28} -\newcommand*{\sftau}{\text{\ensuremath\tauup}} -\DeclareMathSymbol{\upsilonup}{\mathalpha}{lettersAB}{29} -\newcommand*{\sfupsilon}{\text{\ensuremath\upsilonup}} -\DeclareMathSymbol{\phiup}{\mathalpha}{lettersAB}{30} -\newcommand*{\sfphi}{\text{\ensuremath\phiup}} - -\DeclareMathSymbol{\chiup}{\mathalpha}{lettersAB}{31} -\newcommand*{\sfchi}{\text{\ensuremath\chiup}} -\DeclareMathSymbol{\psiup}{\mathalpha}{lettersAB}{32} -\newcommand*{\sfpsi}{\text{\ensuremath\psiup}} -\DeclareMathSymbol{\omegaup}{\mathalpha}{lettersAB}{33} -\newcommand*{\sfomega}{\text{\ensuremath\omegaup}} - -\DeclareMathSymbol{\varepsilonup}{\mathalpha}{lettersAB}{34} -\newcommand*{\sfvarepsilon}{\text{\ensuremath\varepsilonup}} -\DeclareMathSymbol{\varthetaup}{\mathalpha}{lettersAB}{35} -\newcommand*{\sfvartheta}{\text{\ensuremath\varthetaup}} -\DeclareMathSymbol{\varomegaup}{\mathalpha}{lettersAB}{36} -\newcommand*{\sfvaromega}{\text{\ensuremath\varomegaup}} +\DeclareMathSymbol{\sfGamma}{\mathalpha}{lettersAB}{0}% adjust to avoid overwriting newtxmath commands 25/01/2021 +\DeclareMathSymbol{\sfDelta}{\mathalpha}{lettersAB}{1} +\DeclareMathSymbol{\sfTheta}{\mathalpha}{lettersAB}{2} +\DeclareMathSymbol{\sfLambda}{\mathalpha}{lettersAB}{3} +\DeclareMathSymbol{\sfXi}{\mathalpha}{lettersAB}{4} +\DeclareMathSymbol{\sfPi}{\mathalpha}{lettersAB}{5} + +\DeclareMathSymbol{\sfSigma}{\mathalpha}{lettersAB}{6} +\DeclareMathSymbol{\sfUpsilon}{\mathalpha}{lettersAB}{7} +\DeclareMathSymbol{\sfPhi}{\mathalpha}{lettersAB}{8} +\DeclareMathSymbol{\sfPsi}{\mathalpha}{lettersAB}{9} +\DeclareMathSymbol{\sfOmega}{\mathalpha}{lettersAB}{10} + +\DeclareMathSymbol{\sfalpha}{\mathalpha}{lettersAB}{11} +\DeclareMathSymbol{\sfbeta}{\mathalpha}{lettersAB}{12} +\DeclareMathSymbol{\sfgamma}{\mathalpha}{lettersAB}{13} +\DeclareMathSymbol{\sfdelta}{\mathalpha}{lettersAB}{14} +\DeclareMathSymbol{\sfepsilon}{\mathalpha}{lettersAB}{15} + +\DeclareMathSymbol{\sfzeta}{\mathalpha}{lettersAB}{16} +\DeclareMathSymbol{\sfeta}{\mathalpha}{lettersAB}{17} +\DeclareMathSymbol{\sftheta}{\mathalpha}{lettersAB}{18} +\DeclareMathSymbol{\sfiota}{\mathalpha}{lettersAB}{19} +\DeclareMathSymbol{\sfkappa}{\mathalpha}{lettersAB}{20} + +\DeclareMathSymbol{\sflambda}{\mathalpha}{lettersAB}{21} +\DeclareMathSymbol{\sfmu}{\mathalpha}{lettersAB}{22} +\DeclareMathSymbol{\sfnu}{\mathalpha}{lettersAB}{23} +\DeclareMathSymbol{\sfxi}{\mathalpha}{lettersAB}{24} +\DeclareMathSymbol{\sfpi}{\mathalpha}{lettersAB}{25} + +\DeclareMathSymbol{\sfrho}{\mathalpha}{lettersAB}{26} +\DeclareMathSymbol{\sfsigma}{\mathalpha}{lettersAB}{27} +\DeclareMathSymbol{\sftau}{\mathalpha}{lettersAB}{28} +\DeclareMathSymbol{\sfUpsilon}{\mathalpha}{lettersAB}{29} +\DeclareMathSymbol{\sfphi}{\mathalpha}{lettersAB}{30} + +\DeclareMathSymbol{\sfchi}{\mathalpha}{lettersAB}{31} +\DeclareMathSymbol{\sfpsi}{\mathalpha}{lettersAB}{32} +\DeclareMathSymbol{\sfomega}{\mathalpha}{lettersAB}{33} +\DeclareMathSymbol{\sfvarepsilon}{\mathalpha}{lettersAB}{34} +\DeclareMathSymbol{\sfvartheta}{\mathalpha}{lettersAB}{35} + +\DeclareMathSymbol{\sfvarpi}{\mathord}{lettersAB}{36}% added these 25/01/2021 +\DeclareMathSymbol{\sfvarrho}{\mathord}{lettersAB}{37} +\DeclareMathSymbol{\sfvarsigma}{\mathord}{lettersAB}{38} +\DeclareMathSymbol{\sfvarphi}{\mathord}{lettersAB}{39} +\DeclareMathSymbol{\sfitvarkappa}{\mathalpha}{lettersAB}{40} +\DeclareMathSymbol{\sfvarkappa}{\mathalpha}{lettersAB}{40} +\DeclareMathSymbol{\sfitnabla}{\mathalpha}{lettersAB}{42} +\DeclareMathSymbol{\sfnabla}{\mathalpha}{lettersAB}{43} +\DeclareMathSymbol{\sfhslash}{\mathalpha}{lettersAB}{52}% this is not upright +\DeclareMathSymbol{\sfhbar}{\mathalpha}{lettersAB}{53}% this is not upright + +\DeclareMathAccent{\grave}{\mathord}{lettersAB}{254}% added these after bug report 24/01/2021 +\DeclareMathAccent{\acute}{\mathord}{lettersAB}{255} +\DeclareMathAccent{\check}{\mathord}{lettersAB}{186} +\DeclareMathAccent{\breve}{\mathord}{lettersAB}{187} +\DeclareMathAccent{\bar}{\mathord}{lettersAB}{221} +\DeclareMathAccent{\mathring}{\mathord}{lettersAB}{222} +\DeclareMathAccent{\hat}{\mathord}{lettersAB}{223} +\DeclareMathAccent{\dot}{\mathord}{lettersAB}{224} +\DeclareMathAccent{\tilde}{\mathord}{lettersAB}{219} + +%%% sans math version, potential value with PGFPlots, e.g., not for use in main text. 25/01/2021 %%% +\DeclareMathVersion{sans} +\SetSymbolFont{letters}{sans}{OML}{ntxsfmi}{m}{it} +\SetSymbolFont{lettersA}{sans}{U}{ntxsfmia}{m}{it} +\SetSymbolFont{lettersAB}{sans}{U}{ntxsfmia}{m}{it} +\SetSymbolFont{symbols}{sans}{LMS}{ntxsy}{m}{n} +\SetSymbolFont{largesymbols}{sans}{LMX}{ntxexx}{m}{n} +\SetSymbolFont{largesymbolsTXA}{sans}{U}{ntxexa}{m}{n} +\SetSymbolFont{operators}{sans}{\encodingdefault}{\sfdefault}{m}{n} +\SetMathAlphabet{\mathsf}{sans}{\encodingdefault}{\sfdefault}{m}{it} %%%%%%%%%%%%%%%%%% Times-like fonts for specific languages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/macros/latex/contrib/footnotehyper/README.md b/macros/latex/contrib/footnotehyper/README.md index 8dc69945ef..7cf88f8b68 100644 --- a/macros/latex/contrib/footnotehyper/README.md +++ b/macros/latex/contrib/footnotehyper/README.md @@ -1,10 +1,10 @@ - Source: footnotehyper.dtx (v1.1a 2019/11/07) + Source: footnotehyper.dtx (v1.1b 2021/01/26) Author: Jean-Francois Burnol Info: hyperref aware footnote.sty License: LPPL 1.3c - Copyright (C) 2016-2019 Jean-Francois Burnol . + Copyright (C) 2016-2021 Jean-Francois Burnol . ABSTRACT ======== diff --git a/macros/latex/contrib/footnotehyper/footnotehyper.dtx b/macros/latex/contrib/footnotehyper/footnotehyper.dtx index 204c40a2bc..ec75e28285 100644 --- a/macros/latex/contrib/footnotehyper/footnotehyper.dtx +++ b/macros/latex/contrib/footnotehyper/footnotehyper.dtx @@ -1,20 +1,20 @@ % -*- coding: utf-8; time-stamp-format: "%02d-%02m-%:y at %02H:%02M:%02S %Z" -*- %<*none> -\def\dtxtimestamp {Time-stamp: <07-11-2019 at 17:09:56 CET>} +\def\dtxtimestamp {Time-stamp: <26-01-2021 at 15:33:03 CET>} % %<*!readme> %% %% Package: footnotehyper -%% Version: 1.1a (2019/11/07) +%% Version: 1.1b (2021/01/26) %% License: LPPL 1.3c -%% Copyright (C) 2016-2019 Jean-Francois Burnol . +%% Copyright (C) 2016-2021 Jean-Francois Burnol . %% % %<*tex> \def\pkgname {footnotehyper} -\def\pkgdate {2019/11/07} -\def\docdate {2019/11/07} -\def\pkgversion {v1.1a} +\def\pkgdate {2021/01/26} +\def\docdate {2021/01/26} +\def\pkgversion {v1.1b} \def\pkgdescription {hyperref aware footnote.sty (JFB)} % %<*none> @@ -25,9 +25,9 @@ \catcode32=13\catcode`\\=12^^Brelax^^A ^^Bfirstofone{^^Bendgroup^^Bdef^^BpkgLicense^^A {% Package: footnotehyper -% Version: 1.1a (2019/11/07) +% Version: 1.1b (2021/01/26) % License: LPPL 1.3c -% Copyright (C) 2016-2019 Jean-Francois Burnol . +% Copyright (C) 2016-2021 Jean-Francois Burnol . % % This Work may be distributed and/or modified under the conditions % of the LaTeX Project Public License, version 1.3c. This version of @@ -54,11 +54,11 @@ %<*readme> - Source: footnotehyper.dtx (v1.1a 2019/11/07) + Source: footnotehyper.dtx (v1.1b 2021/01/26) Author: Jean-Francois Burnol Info: hyperref aware footnote.sty License: LPPL 1.3c - Copyright (C) 2016-2019 Jean-Francois Burnol . + Copyright (C) 2016-2021 Jean-Francois Burnol . ABSTRACT @@ -387,6 +387,31 @@ on how |\@makefntext| has been customized by the class or other packages; a warning is issued if the situation appears to be desperate.\footnote{original |footnote.sty| could end up in a low level \TeX\ error.} +\begin{framed} + Some details: \fnh inherits from |footnote| original package the aim to + convert the macro |\@makefntext| into two parts, the first one to be inserted + at the start of a footnote in environment form, the second one at its end. + It thus hopes that the replacement text of |\@makefntext| contains only once + its parameter token |#1|, and that it is used unbraced. + + \fnh has a more robust, but still naive, way of analysing this than the + original package. But even seemingly innocent redefinitions such as the one + of |beamer| which was last time I checked (that was in 2019): +\begin{verbatim} +macro:#1->\def \insertfootnotetext {#1}\def \insertfootnotemark +{\@makefnmark } +\usebeamertemplate ***{footnote} +\end{verbatim} + is not compatible. Since |v1.1a|, \fnh simply aborts under |beamer| class. + + The package could possibly be much improved here, but at update |v1.1b| it + simply adds a specific fix to handle a problem of another type arising with + |memoir| together with |babel-french|. This specific fix uses a bit daring + |\scantokens| so we have limited it to these exact circumstances. It has not + been thoroughly tested, please make bug reports if needed. +\end{framed} + + It should be recalled that in case of |\footnotemark[N]| and |\footnotetext[N]{...}| mark-up |hyperref| creates no hyperlink. This is not changed by \fnh and applies also to the |\begin{footnotetext}[N]| case. @@ -954,6 +979,10 @@ A few items worth of mention: % of |\@makefntext| is not visible at top level in its meaning or is used % there multiple times. We also insert here some code to handle especially % the case of |babel-frenchb|. +% +% As |\ifFBFrenchFootnotes| is not a \TeX\ boolean if |babel-frenchb| isn't +% loaded, we have to work around this for |\if..\fi| pairs. +% % \begin{macrocode} \AtBeginDocument{\let\FNH@@makefntext\@makefntext \ifx\@makefntextFB\undefined @@ -963,10 +992,41 @@ A few items worth of mention: \expandafter\FNH@check@a\FNH@@makefntext{1.2!3?4,}% \FNH@@@1.2!3?4,\FNH@@@\relax }% +% \end{macrocode} +% ``Daring analysis'' is un understatement. At |v1.1b| we add a dangerous +% twist to fix a memoir + frenchb triggered issue: if the +% |\@makefntext|, as in memoir + frenchb situation, uses |\def| syntax to +% define a macro with parameter we had a problem with the |#| token not +% being doubled in the replacement fetched by +% |\FNH@check@a|. As expedient work-around we fix this by adding a +% |\scantokens| wrapper. The induced end of line space will only be from +% loading of \fnh itself, so we can ignore. Problem is we +% assume here |\@makefntext| does not rely on weird catcodes. Very +% problematic if LaTeX3 syntax is used. So I add a layer a security to do +% this \emph{only} under memoir + frenchb situation. Which is a pity +% as it could be more generally useful. But let's wait for bug reports if +% really needed. +% +% Maybe I should add some user interface to customize directly what +% |\FNH@prefntext| and |\FNH@postfntext| do, but I am aiming today for a +% quick bug fix, as we are |2021/01/26| and first heard of the bug on +% |2020/06/15|. +% \begin{macrocode} \long\def\FNH@check@a #11.2!3?4,#2\FNH@@@#3{% - \ifx\relax#3\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi - \FNH@bad@makefntext@alert - {\def\FNH@prefntext{#1}\def\FNH@postfntext{#2}\FNH@check@b}% + \ifx\relax#3\FNH@bad@makefntext@alert + \else + \edef\FNH@restore@{\catcode`\noexpand\@\the\catcode`\@\relax}% + \makeatletter + \ifx\@makefntextFB\undefined + \expandafter\@gobble\else\expandafter\@firstofone\fi + {\@ifclassloaded{memoir}% + {\ifFBFrenchFootnotes\expandafter\@gobble\fi}% + {}}% + \@secondoftwo + \scantokens{\def\FNH@prefntext{#1}\def\FNH@postfntext{#2}}% + \FNH@restore@ + \expandafter\FNH@check@b + \fi }% \def\FNH@check@b #1\relax{% \expandafter\expandafter\expandafter\FNH@check@c diff --git a/macros/latex/contrib/footnotehyper/footnotehyper.pdf b/macros/latex/contrib/footnotehyper/footnotehyper.pdf index 13b98643f0..aee31fd386 100644 Binary files a/macros/latex/contrib/footnotehyper/footnotehyper.pdf and b/macros/latex/contrib/footnotehyper/footnotehyper.pdf differ diff --git a/macros/latex/contrib/media4svg/ChangeLog b/macros/latex/contrib/media4svg/ChangeLog index 706011c153..df819583a4 100644 --- a/macros/latex/contrib/media4svg/ChangeLog +++ b/macros/latex/contrib/media4svg/ChangeLog @@ -1,3 +1,7 @@ +2021-01-25 + * v0.5 + * fix: migrating to lthooks (2020/10/01 latex format) + 2020-04-16 * v0.4 * new: F11 for toggling video full-screen diff --git a/macros/latex/contrib/media4svg/README.md b/macros/latex/contrib/media4svg/README.md index 542c4e56d1..e1031e975f 100644 --- a/macros/latex/contrib/media4svg/README.md +++ b/macros/latex/contrib/media4svg/README.md @@ -1,6 +1,6 @@ # The `media4svg` LaTeX Package -Version 0.4, 2020/04/16 +Version 0.5, 2021/01/25 © 2020--today, Alexander Grahn @@ -53,7 +53,7 @@ which is much slower. There are a number of `dvisvgm` commandline options that should be used in general: ````latex -dvisvgm --zoom=-1 --exact --pages=1,- --font-format=woff2 +dvisvgm --zoom=-1 --exact --page=1,- --font-format=woff2 ```` For exporting `beamer`-class documents to SVG, option `--box=papersize` should also be added. Refer to the manual page, `man dvisvgm`, for additional diff --git a/macros/latex/contrib/media4svg/example/beamer-example-1.svg b/macros/latex/contrib/media4svg/example/beamer-example-1.svg index e481cc0ee9..e090301cde 100644 --- a/macros/latex/contrib/media4svg/example/beamer-example-1.svg +++ b/macros/latex/contrib/media4svg/example/beamer-example-1.svg @@ -1,6 +1,6 @@ - - + +