diff options
Diffstat (limited to 'macros')
-rw-r--r-- | macros/latex/base/README.md | 2 | ||||
-rw-r--r-- | macros/latex/base/alltt.pdf | bin | 178219 -> 178219 bytes | |||
-rw-r--r-- | macros/latex/base/cfgguide.pdf | bin | 226636 -> 226636 bytes | |||
-rw-r--r-- | macros/latex/base/changes.txt | 21 | ||||
-rw-r--r-- | macros/latex/base/classes.pdf | bin | 526206 -> 526206 bytes | |||
-rw-r--r-- | macros/latex/base/clsguide.pdf | bin | 378926 -> 378926 bytes | |||
-rw-r--r-- | macros/latex/base/cmfonts.pdf | bin | 273304 -> 273304 bytes | |||
-rw-r--r-- | macros/latex/base/cyrguide.pdf | bin | 223564 -> 223564 bytes | |||
-rw-r--r-- | macros/latex/base/doc.pdf | bin | 646162 -> 645809 bytes | |||
-rw-r--r-- | macros/latex/base/docstrip.pdf | bin | 469613 -> 469280 bytes | |||
-rw-r--r-- | macros/latex/base/encguide.pdf | bin | 1267972 -> 1267972 bytes | |||
-rw-r--r-- | macros/latex/base/exscale.pdf | bin | 195881 -> 195881 bytes | |||
-rw-r--r-- | macros/latex/base/fix-cm.pdf | bin | 267213 -> 267213 bytes | |||
-rw-r--r-- | macros/latex/base/fntguide.pdf | bin | 367426 -> 367426 bytes | |||
-rw-r--r-- | macros/latex/base/graphpap.pdf | bin | 156288 -> 156288 bytes | |||
-rw-r--r-- | macros/latex/base/ifthen.pdf | bin | 205211 -> 205211 bytes | |||
-rw-r--r-- | macros/latex/base/inputenc.pdf | bin | 299980 -> 299980 bytes | |||
-rw-r--r-- | macros/latex/base/latexchanges.pdf | bin | 395797 -> 396400 bytes | |||
-rw-r--r-- | macros/latex/base/latexchanges.tex | 13 | ||||
-rw-r--r-- | macros/latex/base/latexrelease.pdf | bin | 251282 -> 251282 bytes | |||
-rw-r--r-- | macros/latex/base/latexsym.pdf | bin | 192305 -> 192305 bytes | |||
-rw-r--r-- | macros/latex/base/lb2.pdf | bin | 238183 -> 238183 bytes | |||
-rw-r--r-- | macros/latex/base/letter.pdf | bin | 310456 -> 310116 bytes | |||
-rw-r--r-- | macros/latex/base/lgc2.pdf | bin | 202897 -> 202897 bytes | |||
-rw-r--r-- | macros/latex/base/ltfssaxes.dtx | 18 | ||||
-rw-r--r-- | macros/latex/base/ltfssini.dtx | 107 | ||||
-rw-r--r-- | macros/latex/base/ltluatex.pdf | bin | 304111 -> 304111 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews.pdf | bin | 950047 -> 950047 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews01.pdf | bin | 150027 -> 150027 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews02.pdf | bin | 139901 -> 139901 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews03.pdf | bin | 139882 -> 139882 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews04.pdf | bin | 133913 -> 133913 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews05.pdf | bin | 162314 -> 162314 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews06.pdf | bin | 133140 -> 133140 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews07.pdf | bin | 129172 -> 129172 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews08.pdf | bin | 144478 -> 144478 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews09.pdf | bin | 120216 -> 120216 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews10.pdf | bin | 147946 -> 147946 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews11.pdf | bin | 104948 -> 104948 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews12.pdf | bin | 137925 -> 137925 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews13.pdf | bin | 161072 -> 161072 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews14.pdf | bin | 150928 -> 150928 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews15.pdf | bin | 122094 -> 122094 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews16.pdf | bin | 135839 -> 135839 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews17.pdf | bin | 154995 -> 154995 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews18.pdf | bin | 36010 -> 36010 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews19.pdf | bin | 235074 -> 235074 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews20.pdf | bin | 283330 -> 283330 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews21.pdf | bin | 233496 -> 233496 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews22.pdf | bin | 302843 -> 302843 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews23.pdf | bin | 274461 -> 274461 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews24.pdf | bin | 252646 -> 252646 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews25.pdf | bin | 196332 -> 196332 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews26.pdf | bin | 362843 -> 362843 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews27.pdf | bin | 239763 -> 239763 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews28.pdf | bin | 368236 -> 368236 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews29.pdf | bin | 433013 -> 433013 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews30.pdf | bin | 491252 -> 491252 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews31.pdf | bin | 500193 -> 500193 bytes | |||
-rw-r--r-- | macros/latex/base/ltvers.dtx | 2 | ||||
-rw-r--r-- | macros/latex/base/ltx3info.pdf | bin | 204547 -> 204547 bytes | |||
-rw-r--r-- | macros/latex/base/ltxdoc.pdf | bin | 220731 -> 220731 bytes | |||
-rw-r--r-- | macros/latex/base/makeindx.pdf | bin | 160679 -> 160679 bytes | |||
-rw-r--r-- | macros/latex/base/manual.pdf | bin | 151360 -> 151360 bytes | |||
-rw-r--r-- | macros/latex/base/modguide.pdf | bin | 226894 -> 226894 bytes | |||
-rw-r--r-- | macros/latex/base/nfssfont.pdf | bin | 202434 -> 202434 bytes | |||
-rw-r--r-- | macros/latex/base/proc.pdf | bin | 216907 -> 216907 bytes | |||
-rw-r--r-- | macros/latex/base/slides.pdf | bin | 352157 -> 352157 bytes | |||
-rw-r--r-- | macros/latex/base/slifonts.pdf | bin | 215964 -> 215964 bytes | |||
-rw-r--r-- | macros/latex/base/source2e.pdf | bin | 3111873 -> 3116973 bytes | |||
-rw-r--r-- | macros/latex/base/syntonly.pdf | bin | 181723 -> 181390 bytes | |||
-rw-r--r-- | macros/latex/base/tlc2.pdf | bin | 273653 -> 273653 bytes | |||
-rw-r--r-- | macros/latex/base/tulm.pdf | bin | 156541 -> 156541 bytes | |||
-rw-r--r-- | macros/latex/base/usrguide.pdf | bin | 404292 -> 404292 bytes | |||
-rw-r--r-- | macros/latex/base/utf8ienc.pdf | bin | 339722 -> 339527 bytes | |||
-rw-r--r-- | macros/latex/base/webcomp.pdf | bin | 136159 -> 136159 bytes | |||
-rw-r--r-- | macros/latex/contrib/siunitx/siunitx-code.pdf | bin | 1174016 -> 0 bytes | |||
-rw-r--r-- | macros/latex/contrib/siunitx/siunitx.dtx | 292 | ||||
-rw-r--r-- | macros/latex/contrib/siunitx/siunitx.pdf | bin | 640745 -> 640541 bytes |
79 files changed, 201 insertions, 254 deletions
diff --git a/macros/latex/base/README.md b/macros/latex/base/README.md index 9118efc811..1418aabdd2 100644 --- a/macros/latex/base/README.md +++ b/macros/latex/base/README.md @@ -1,7 +1,7 @@ The LaTeX kernel ================ -Release 2020-02-02 patch level 2 +Release 2020-02-02 patch level 3 Overview -------- diff --git a/macros/latex/base/alltt.pdf b/macros/latex/base/alltt.pdf Binary files differindex 366ab754b7..7213afaaa3 100644 --- a/macros/latex/base/alltt.pdf +++ b/macros/latex/base/alltt.pdf diff --git a/macros/latex/base/cfgguide.pdf b/macros/latex/base/cfgguide.pdf Binary files differindex b39a8ef0f2..b7e4649baa 100644 --- a/macros/latex/base/cfgguide.pdf +++ b/macros/latex/base/cfgguide.pdf diff --git a/macros/latex/base/changes.txt b/macros/latex/base/changes.txt index 846d1f15ba..987702b349 100644 --- a/macros/latex/base/changes.txt +++ b/macros/latex/base/changes.txt @@ -5,6 +5,27 @@ are not part of the distribution. ======================================================================= ######################### +# 2020-02-02 PL 3 Release +######################### + +2020-02-18 Frank Mittelbach <Frank.Mittelbach@latex-project.org> + + * ltfssaxes.dtx: + When \fontseriesforce is used do not auto-update the series if the + family changes (gh/277) + +2020-02-18 Frank Mittelbach <Frank.Mittelbach@latex-project.org> + + * ltfssini.dtx: + Added some debugging code, but not extracted at the moment. + Make the \ifx selection in \bfseries outside + of \fontseries argument so that it is not done several times. + When \fontseriesforce is used do not auto-update the series if the + family changes (gh/277) + Recognize current family if it is not a ``meta'' family and + auto-update series if \mddefault or \bfdefault match (gh/277) + +######################### # 2020-02-02 PL 2 Release ######################### diff --git a/macros/latex/base/classes.pdf b/macros/latex/base/classes.pdf Binary files differindex 4e62cf0f9c..104c48332f 100644 --- a/macros/latex/base/classes.pdf +++ b/macros/latex/base/classes.pdf diff --git a/macros/latex/base/clsguide.pdf b/macros/latex/base/clsguide.pdf Binary files differindex f8674f8bc4..ede1753de7 100644 --- a/macros/latex/base/clsguide.pdf +++ b/macros/latex/base/clsguide.pdf diff --git a/macros/latex/base/cmfonts.pdf b/macros/latex/base/cmfonts.pdf Binary files differindex 60ba5e0fb4..3a30e064c0 100644 --- a/macros/latex/base/cmfonts.pdf +++ b/macros/latex/base/cmfonts.pdf diff --git a/macros/latex/base/cyrguide.pdf b/macros/latex/base/cyrguide.pdf Binary files differindex f1ba018d11..5d8a6dad3e 100644 --- a/macros/latex/base/cyrguide.pdf +++ b/macros/latex/base/cyrguide.pdf diff --git a/macros/latex/base/doc.pdf b/macros/latex/base/doc.pdf Binary files differindex b2b25a9ec0..1e7bdda0df 100644 --- a/macros/latex/base/doc.pdf +++ b/macros/latex/base/doc.pdf diff --git a/macros/latex/base/docstrip.pdf b/macros/latex/base/docstrip.pdf Binary files differindex e8886374e7..a2c7bf521e 100644 --- a/macros/latex/base/docstrip.pdf +++ b/macros/latex/base/docstrip.pdf diff --git a/macros/latex/base/encguide.pdf b/macros/latex/base/encguide.pdf Binary files differindex 5cd183e657..0c4d2ecfc3 100644 --- a/macros/latex/base/encguide.pdf +++ b/macros/latex/base/encguide.pdf diff --git a/macros/latex/base/exscale.pdf b/macros/latex/base/exscale.pdf Binary files differindex 03fc23bd66..c2a0157a26 100644 --- a/macros/latex/base/exscale.pdf +++ b/macros/latex/base/exscale.pdf diff --git a/macros/latex/base/fix-cm.pdf b/macros/latex/base/fix-cm.pdf Binary files differindex 82e1c8a96b..a3ce9a50bc 100644 --- a/macros/latex/base/fix-cm.pdf +++ b/macros/latex/base/fix-cm.pdf diff --git a/macros/latex/base/fntguide.pdf b/macros/latex/base/fntguide.pdf Binary files differindex 863d91a650..d356d1f744 100644 --- a/macros/latex/base/fntguide.pdf +++ b/macros/latex/base/fntguide.pdf diff --git a/macros/latex/base/graphpap.pdf b/macros/latex/base/graphpap.pdf Binary files differindex eb2764bbb7..2f2ceb5cab 100644 --- a/macros/latex/base/graphpap.pdf +++ b/macros/latex/base/graphpap.pdf diff --git a/macros/latex/base/ifthen.pdf b/macros/latex/base/ifthen.pdf Binary files differindex 8ecc96f479..84895896fa 100644 --- a/macros/latex/base/ifthen.pdf +++ b/macros/latex/base/ifthen.pdf diff --git a/macros/latex/base/inputenc.pdf b/macros/latex/base/inputenc.pdf Binary files differindex 2dfb7d9b5f..91cb4fd2ff 100644 --- a/macros/latex/base/inputenc.pdf +++ b/macros/latex/base/inputenc.pdf diff --git a/macros/latex/base/latexchanges.pdf b/macros/latex/base/latexchanges.pdf Binary files differindex f7bb92fd5c..b3efb13591 100644 --- a/macros/latex/base/latexchanges.pdf +++ b/macros/latex/base/latexchanges.pdf diff --git a/macros/latex/base/latexchanges.tex b/macros/latex/base/latexchanges.tex index d80ef3702f..22f162d790 100644 --- a/macros/latex/base/latexchanges.tex +++ b/macros/latex/base/latexchanges.tex @@ -106,6 +106,19 @@ see for example \url{https://github.com/latex3/latex2e/commits/master}. +\section{Changes introduced in 2020-02-02 patch~3} + +Support the following scenario: +\begin{verbatim} +\fontfamily{ptm}\selectfont text \textbf{\sffamily bold sans text} +\end{verbatim} +The default bold series for \texttt{ptm} is \texttt{b} so +\verb=\textbf= switches to that. The \verb=\sffamily= then tried to +find \texttt{OT1/cmss/b/n} which doesn't exist instead of first +altering the series default to use \texttt{bx} as needed for Computer +Modern Sans Serif. This has now been corrected (\ghissue{277}). + + \section{Changes introduced in 2020-02-02 patch~2} Correct \verb=\capitalacute=, etc.\ so that they work in diff --git a/macros/latex/base/latexrelease.pdf b/macros/latex/base/latexrelease.pdf Binary files differindex ce2866f9f7..aed540afe2 100644 --- a/macros/latex/base/latexrelease.pdf +++ b/macros/latex/base/latexrelease.pdf diff --git a/macros/latex/base/latexsym.pdf b/macros/latex/base/latexsym.pdf Binary files differindex 9e8b0202cc..0d007da1a8 100644 --- a/macros/latex/base/latexsym.pdf +++ b/macros/latex/base/latexsym.pdf diff --git a/macros/latex/base/lb2.pdf b/macros/latex/base/lb2.pdf Binary files differindex 1b582b7e14..4814719f4f 100644 --- a/macros/latex/base/lb2.pdf +++ b/macros/latex/base/lb2.pdf diff --git a/macros/latex/base/letter.pdf b/macros/latex/base/letter.pdf Binary files differindex 47daaa85ae..537654eea0 100644 --- a/macros/latex/base/letter.pdf +++ b/macros/latex/base/letter.pdf diff --git a/macros/latex/base/lgc2.pdf b/macros/latex/base/lgc2.pdf Binary files differindex d345792c73..aa8c51ad62 100644 --- a/macros/latex/base/lgc2.pdf +++ b/macros/latex/base/lgc2.pdf diff --git a/macros/latex/base/ltfssaxes.dtx b/macros/latex/base/ltfssaxes.dtx index fcf304d1fa..1a8dbd9cfb 100644 --- a/macros/latex/base/ltfssaxes.dtx +++ b/macros/latex/base/ltfssaxes.dtx @@ -35,7 +35,7 @@ % % \ProvidesFile{ltfssaxes.dtx} - [2020/02/05 v1.0b LaTeX Kernel (NFSS Axes handing)] + [2020/02/18 v1.0c LaTeX Kernel (NFSS Axes handing)] % \iffalse \documentclass{ltxdoc} \begin{document} @@ -682,14 +682,25 @@ % \subsection{Changing to a new series} % +% +% \begin{macro}{\if@forced@series} +% If the series gets forced we need to know that fact later on. +% \changes{v1.0c}{2020/02/10}{Switch \cs{if@forced@series} added} +% \begin{macrocode} +\newif\if@forced@series +% \end{macrocode} +% \end{macro} +% +% % \begin{macro}{\fontseriesforce} % To change unconditionally to a new series you can use % \cs{fontseriesforce}. If course, if the series doesn't exist for % the current family substitution still happens, but there is not % dependency on the current series. +% \changes{v1.0c}{2020/02/10}{Switch \cs{if@forced@series} added} % \begin{macrocode} -\DeclareRobustCommand\fontseriesforce[1]{\edef\f@series{#1}} +\DeclareRobustCommand\fontseriesforce[1]{\@forced@seriestrue\edef\f@series{#1}} % \end{macrocode} % \end{macro} % @@ -700,8 +711,9 @@ % expanded value in \cs{f@series}. Now we do a bit more processing % and look up the final value in the font series data base. This is % done by \cs{merge@font@series}. +% \changes{v1.0c}{2020/02/10}{Switch \cs{if@forced@series} added} % \begin{macrocode} -\DeclareRobustCommand\fontseries[1]{\merge@font@series{#1}} +\DeclareRobustCommand\fontseries[1]{\@forced@seriesfalse\merge@font@series{#1}} % \end{macrocode} % \end{macro} diff --git a/macros/latex/base/ltfssini.dtx b/macros/latex/base/ltfssini.dtx index 27019e6446..98f465ae9b 100644 --- a/macros/latex/base/ltfssini.dtx +++ b/macros/latex/base/ltfssini.dtx @@ -36,7 +36,7 @@ % % \ProvidesFile{ltfssini.dtx} - [2020/02/11 v3.1h LaTeX Kernel (NFSS Initialisation)] + [2020/02/18 v3.1i LaTeX Kernel (NFSS Initialisation)] % \iffalse \documentclass{ltxdoc} \begin{document} @@ -414,18 +414,18 @@ % alternatives and therefore check if the current family % (\cs{f@family}) is the current \cs{rmdef@ult}, \cs{sfdef@ult} or % \cs{ttdef@ult} and the select the correct family default in that case. +% \changes{v3.1i}{2020/02/18}{Make the \cs{ifx} selection outside +% of \cs{fontseries} argument so that it is not done several times} % \begin{macrocode} \expand@font@defaults - \fontseries{% - \ifx\f@family\rmdef@ult \bfseries@rm - \else\ifx\f@family\sfdef@ult \bfseries@sf - \else\ifx\f@family\ttdef@ult \bfseries@tt + \ifx\f@family\rmdef@ult \fontseries\bfseries@rm + \else\ifx\f@family\sfdef@ult \fontseries\bfseries@sf + \else\ifx\f@family\ttdef@ult \fontseries\bfseries@tt % \end{macrocode} % If not \cs{bfdefault} is used. % \begin{macrocode} - \else \bfdefault + \else \fontseries\bfdefault \fi\fi\fi - }% \selectfont } % \end{macrocode} @@ -435,17 +435,17 @@ % \begin{macro}{\mdseries} % This document command switches to the medium series. +% \changes{v3.1i}{2020/02/18}{Make the \cs{ifx} selection outside +% of \cs{fontseries} argument so that it is not done several times} % \begin{macrocode} \DeclareRobustCommand\mdseries{% \not@math@alphabet\mdseries\relax \expand@font@defaults - \fontseries{% - \ifx\f@family\rmdef@ult \mdseries@rm - \else\ifx\f@family\sfdef@ult \mdseries@sf - \else\ifx\f@family\ttdef@ult \mdseries@tt - \else \mddefault + \ifx\f@family\rmdef@ult \fontseries\mdseries@rm + \else\ifx\f@family\sfdef@ult \fontseries\mdseries@sf + \else\ifx\f@family\ttdef@ult \fontseries\mdseries@tt + \else \fontseries\mddefault \fi\fi\fi - }% \selectfont } % \end{macrocode} @@ -615,9 +615,25 @@ % \end{macro} % \end{macro} % \end{macro} - - - +% +% +% +% +% \begin{macro}{\series@change@debug} +% For debugging, but right now none of this code is extracted. The +% idea is to have a separate package with debugging code +% one day. +% \begin{macrocode} +%<*debug> +\let\series@change@debug\typeout +\let\series@change@debug\@gobble +%</debug> +% \end{macrocode} +% \end{macro} +% +% +% +% % \begin{macro}{\prepare@family@series@update} % This is core command that prepares for the family update. The big % difference to the documented code above is that the nested @@ -635,6 +651,15 @@ % % \begin{macrocode} \def\prepare@family@series@update#1#2{% +% \end{macrocode} +% +% \changes{v3.1i}{2020/02/18}{No series auto-update when forced (gh/277)} +% \begin{macrocode} + \if@forced@series +%<+debug> \series@change@debug{No series preparation (forced \f@series)\on@line}% + \fontfamily#2% + \else +%<+debug> \series@change@debug{Prepearing for switching to #1 (#2)\on@line}% \expand@font@defaults % \end{macrocode} % We prepare for changing the current series. We have to find it @@ -643,11 +668,36 @@ \let\target@series@value\@empty \def\target@meta@family@value{#1}% % \end{macrocode} +% As the very last item in the meta family list we add +% \verb=\@elt{??}= and define this pseudo meta family to be the +% current font family. So if none of the real meta families matched then +% this will match. This will cover the following case: +% \begin{itemize} +% \item \cs{bfseries} is called for a family using \texttt{bx} +% (e.g., CMR) +% \item Switch to a font family that is none of the the meta +% families, e.g., via \verb=\fontfamily{ptm}\selectfont= +% \item Then none of the real meta families, match but the final +% \verb=\@elt{??}= will. +% \item Therefore if the current series is \cs{mddefault} or +% \cs{bfdefault} it will be detected and the corresponding target +% series selected. +% \end{itemize} +% \changes{v3.1i}{2020/02/18}{Recognize current family if it is not a +% ``meta'' family and auto-update series using \cs{bfdefault} (gh/277)} +% \begin{macrocode} + \expandafter\edef\csname ??def@ult\endcsname{\f@family}% +% \end{macrocode} % To find it we loop over the meta family list with a suitable % definition of \cs{@elt}. % \begin{macrocode} \let\@elt\update@series@target@value \@meta@family@list +% \end{macrocode} +% Last resort pseudo meta family. Will only be looked at f none of +% the real ones have matched. +% \begin{macrocode} + \@elt{??}% \let\@elt\relax % \end{macrocode} % That will figure out the correct series value to use without updating @@ -659,10 +709,19 @@ % above. % \begin{macrocode} \ifx\target@series@value\@empty +%<+debug> \series@change@debug{Target series still empty ...}% \else - \maybe@load@fontshape - \let\f@series\target@series@value + \ifx \f@series\target@series@value +%<+debug> \series@change@debug{Target series unchanged: +%<+debug> \f@series \space = \target@series@value}% + \else + \maybe@load@fontshape +%<+debug> \series@change@debug{Target series: +%<+debug> \f@series \space -> \target@series@value}% + \let\f@series\target@series@value + \fi \fi + \fi } % \end{macrocode} % \end{macro} @@ -686,6 +745,8 @@ \def\reserved@a{#1}% \ifx\target@meta@family@value\reserved@a % rm -> rm do nothing \else +%<+debug> \series@change@debug{Trying to match #1: \csname#1def@ult\endcsname +%<+debug> \space = \f@family\space ?}% % \end{macrocode} % We only ``do'' something if the current font family matches the % current meta family. @@ -707,6 +768,8 @@ \csname mdseries@\target@meta@family@value\endcsname \expandafter\let\expandafter\reserved@c \csname bfseries@\target@meta@family@value\endcsname +%<+debug>\series@change@debug{Targets for mdseries and bfseries: +%<+debug> \reserved@b\space and \reserved@c}% % \end{macrocode} % This here is now identical to the nested \cs{ifx} block from the % outline, except that it there appeared twice in @@ -714,11 +777,15 @@ % loop when a match was found. % \begin{macrocode} \expandafter\ifx\csname mdseries@#1\endcsname\f@series +%<+debug> \series@change@debug{mdseries@#1 matched -> \reserved@b}% \let\target@series@value\reserved@b \else\expandafter\ifx\csname bfseries@#1\endcsname\f@series +%<+debug> \series@change@debug{bfseries@#1 matched -> \reserved@c}% \let\target@series@value\reserved@c \else\ifx\f@series\mddef@ult \let\target@series@value\reserved@b +%<+debug> \series@change@debug{mddef@ult matched -> \reserved@b}% \else\ifx\f@series\bfdef@ult \let\target@series@value\reserved@c +%<+debug> \series@change@debug{bfdef@ult matched -> \reserved@c}% \fi\fi\fi\fi \fi \fi @@ -730,10 +797,6 @@ % % % -% -% -% -% % \begin{macro}{\init@series@setup} % This is code to be run at begin document \ldots % \begin{macrocode} diff --git a/macros/latex/base/ltluatex.pdf b/macros/latex/base/ltluatex.pdf Binary files differindex 28d8442852..4a2e1faff6 100644 --- a/macros/latex/base/ltluatex.pdf +++ b/macros/latex/base/ltluatex.pdf diff --git a/macros/latex/base/ltnews.pdf b/macros/latex/base/ltnews.pdf Binary files differindex 9be5470314..7318c1aaa8 100644 --- a/macros/latex/base/ltnews.pdf +++ b/macros/latex/base/ltnews.pdf diff --git a/macros/latex/base/ltnews01.pdf b/macros/latex/base/ltnews01.pdf Binary files differindex c1c45b8fc8..f95f3717b4 100644 --- a/macros/latex/base/ltnews01.pdf +++ b/macros/latex/base/ltnews01.pdf diff --git a/macros/latex/base/ltnews02.pdf b/macros/latex/base/ltnews02.pdf Binary files differindex b6aedd8c49..c94e1045d6 100644 --- a/macros/latex/base/ltnews02.pdf +++ b/macros/latex/base/ltnews02.pdf diff --git a/macros/latex/base/ltnews03.pdf b/macros/latex/base/ltnews03.pdf Binary files differindex f3f63c81a5..6af9fa362c 100644 --- a/macros/latex/base/ltnews03.pdf +++ b/macros/latex/base/ltnews03.pdf diff --git a/macros/latex/base/ltnews04.pdf b/macros/latex/base/ltnews04.pdf Binary files differindex dce0f0500b..85d6d4fa87 100644 --- a/macros/latex/base/ltnews04.pdf +++ b/macros/latex/base/ltnews04.pdf diff --git a/macros/latex/base/ltnews05.pdf b/macros/latex/base/ltnews05.pdf Binary files differindex e8af18fd4d..b8994f4eb1 100644 --- a/macros/latex/base/ltnews05.pdf +++ b/macros/latex/base/ltnews05.pdf diff --git a/macros/latex/base/ltnews06.pdf b/macros/latex/base/ltnews06.pdf Binary files differindex af2a5cf8d8..12f564c84e 100644 --- a/macros/latex/base/ltnews06.pdf +++ b/macros/latex/base/ltnews06.pdf diff --git a/macros/latex/base/ltnews07.pdf b/macros/latex/base/ltnews07.pdf Binary files differindex 9205fc1409..4fb8b04747 100644 --- a/macros/latex/base/ltnews07.pdf +++ b/macros/latex/base/ltnews07.pdf diff --git a/macros/latex/base/ltnews08.pdf b/macros/latex/base/ltnews08.pdf Binary files differindex dc3bb052a6..614ab0281f 100644 --- a/macros/latex/base/ltnews08.pdf +++ b/macros/latex/base/ltnews08.pdf diff --git a/macros/latex/base/ltnews09.pdf b/macros/latex/base/ltnews09.pdf Binary files differindex 0f9d31c95c..6821952624 100644 --- a/macros/latex/base/ltnews09.pdf +++ b/macros/latex/base/ltnews09.pdf diff --git a/macros/latex/base/ltnews10.pdf b/macros/latex/base/ltnews10.pdf Binary files differindex a83fc323c6..a6bee038c5 100644 --- a/macros/latex/base/ltnews10.pdf +++ b/macros/latex/base/ltnews10.pdf diff --git a/macros/latex/base/ltnews11.pdf b/macros/latex/base/ltnews11.pdf Binary files differindex 9121cdadae..022f650d12 100644 --- a/macros/latex/base/ltnews11.pdf +++ b/macros/latex/base/ltnews11.pdf diff --git a/macros/latex/base/ltnews12.pdf b/macros/latex/base/ltnews12.pdf Binary files differindex bc6c5d068b..aa69251597 100644 --- a/macros/latex/base/ltnews12.pdf +++ b/macros/latex/base/ltnews12.pdf diff --git a/macros/latex/base/ltnews13.pdf b/macros/latex/base/ltnews13.pdf Binary files differindex dd78c5f265..a3e8f99b75 100644 --- a/macros/latex/base/ltnews13.pdf +++ b/macros/latex/base/ltnews13.pdf diff --git a/macros/latex/base/ltnews14.pdf b/macros/latex/base/ltnews14.pdf Binary files differindex aca6cf9aff..1d15742e9a 100644 --- a/macros/latex/base/ltnews14.pdf +++ b/macros/latex/base/ltnews14.pdf diff --git a/macros/latex/base/ltnews15.pdf b/macros/latex/base/ltnews15.pdf Binary files differindex bd60a570ad..a67a846fcc 100644 --- a/macros/latex/base/ltnews15.pdf +++ b/macros/latex/base/ltnews15.pdf diff --git a/macros/latex/base/ltnews16.pdf b/macros/latex/base/ltnews16.pdf Binary files differindex 85b1cd814a..479e9f93e3 100644 --- a/macros/latex/base/ltnews16.pdf +++ b/macros/latex/base/ltnews16.pdf diff --git a/macros/latex/base/ltnews17.pdf b/macros/latex/base/ltnews17.pdf Binary files differindex a87f9b8241..cf49ce3d39 100644 --- a/macros/latex/base/ltnews17.pdf +++ b/macros/latex/base/ltnews17.pdf diff --git a/macros/latex/base/ltnews18.pdf b/macros/latex/base/ltnews18.pdf Binary files differindex bf6c6bcdc4..78add2d884 100644 --- a/macros/latex/base/ltnews18.pdf +++ b/macros/latex/base/ltnews18.pdf diff --git a/macros/latex/base/ltnews19.pdf b/macros/latex/base/ltnews19.pdf Binary files differindex 4059096cb7..492fab1c48 100644 --- a/macros/latex/base/ltnews19.pdf +++ b/macros/latex/base/ltnews19.pdf diff --git a/macros/latex/base/ltnews20.pdf b/macros/latex/base/ltnews20.pdf Binary files differindex f76fa22495..6d11605ae2 100644 --- a/macros/latex/base/ltnews20.pdf +++ b/macros/latex/base/ltnews20.pdf diff --git a/macros/latex/base/ltnews21.pdf b/macros/latex/base/ltnews21.pdf Binary files differindex 2f08b76211..4274227488 100644 --- a/macros/latex/base/ltnews21.pdf +++ b/macros/latex/base/ltnews21.pdf diff --git a/macros/latex/base/ltnews22.pdf b/macros/latex/base/ltnews22.pdf Binary files differindex 656ae30064..d7160e48c8 100644 --- a/macros/latex/base/ltnews22.pdf +++ b/macros/latex/base/ltnews22.pdf diff --git a/macros/latex/base/ltnews23.pdf b/macros/latex/base/ltnews23.pdf Binary files differindex d3b72f953d..28c252dd16 100644 --- a/macros/latex/base/ltnews23.pdf +++ b/macros/latex/base/ltnews23.pdf diff --git a/macros/latex/base/ltnews24.pdf b/macros/latex/base/ltnews24.pdf Binary files differindex 4ed3cca307..2793520b3d 100644 --- a/macros/latex/base/ltnews24.pdf +++ b/macros/latex/base/ltnews24.pdf diff --git a/macros/latex/base/ltnews25.pdf b/macros/latex/base/ltnews25.pdf Binary files differindex c5908fb280..015ba90157 100644 --- a/macros/latex/base/ltnews25.pdf +++ b/macros/latex/base/ltnews25.pdf diff --git a/macros/latex/base/ltnews26.pdf b/macros/latex/base/ltnews26.pdf Binary files differindex 2e1523db53..794b9b23e9 100644 --- a/macros/latex/base/ltnews26.pdf +++ b/macros/latex/base/ltnews26.pdf diff --git a/macros/latex/base/ltnews27.pdf b/macros/latex/base/ltnews27.pdf Binary files differindex ec9a3db7c7..65a0421ab0 100644 --- a/macros/latex/base/ltnews27.pdf +++ b/macros/latex/base/ltnews27.pdf diff --git a/macros/latex/base/ltnews28.pdf b/macros/latex/base/ltnews28.pdf Binary files differindex f014ac876d..e5628de156 100644 --- a/macros/latex/base/ltnews28.pdf +++ b/macros/latex/base/ltnews28.pdf diff --git a/macros/latex/base/ltnews29.pdf b/macros/latex/base/ltnews29.pdf Binary files differindex eb11ed460e..c3eb998511 100644 --- a/macros/latex/base/ltnews29.pdf +++ b/macros/latex/base/ltnews29.pdf diff --git a/macros/latex/base/ltnews30.pdf b/macros/latex/base/ltnews30.pdf Binary files differindex 78c9738d0d..a3f5373aae 100644 --- a/macros/latex/base/ltnews30.pdf +++ b/macros/latex/base/ltnews30.pdf diff --git a/macros/latex/base/ltnews31.pdf b/macros/latex/base/ltnews31.pdf Binary files differindex 35ff148296..42f5f32304 100644 --- a/macros/latex/base/ltnews31.pdf +++ b/macros/latex/base/ltnews31.pdf diff --git a/macros/latex/base/ltvers.dtx b/macros/latex/base/ltvers.dtx index 5260efa3ff..ce7a5d49d3 100644 --- a/macros/latex/base/ltvers.dtx +++ b/macros/latex/base/ltvers.dtx @@ -115,7 +115,7 @@ {2020-02-02} %</2ekernel|latexrelease> %<*2ekernel> -\def\patch@level{2} +\def\patch@level{3} % \end{macrocode} % % \begin{macro}{\development@branch@name} diff --git a/macros/latex/base/ltx3info.pdf b/macros/latex/base/ltx3info.pdf Binary files differindex 1e5180a19f..315f4ec8ae 100644 --- a/macros/latex/base/ltx3info.pdf +++ b/macros/latex/base/ltx3info.pdf diff --git a/macros/latex/base/ltxdoc.pdf b/macros/latex/base/ltxdoc.pdf Binary files differindex f350355320..ef9537d4ac 100644 --- a/macros/latex/base/ltxdoc.pdf +++ b/macros/latex/base/ltxdoc.pdf diff --git a/macros/latex/base/makeindx.pdf b/macros/latex/base/makeindx.pdf Binary files differindex 570b57464d..8e8f4a7f2b 100644 --- a/macros/latex/base/makeindx.pdf +++ b/macros/latex/base/makeindx.pdf diff --git a/macros/latex/base/manual.pdf b/macros/latex/base/manual.pdf Binary files differindex e4b06fd33b..2fc1392d49 100644 --- a/macros/latex/base/manual.pdf +++ b/macros/latex/base/manual.pdf diff --git a/macros/latex/base/modguide.pdf b/macros/latex/base/modguide.pdf Binary files differindex 41360614c9..23e362c5e5 100644 --- a/macros/latex/base/modguide.pdf +++ b/macros/latex/base/modguide.pdf diff --git a/macros/latex/base/nfssfont.pdf b/macros/latex/base/nfssfont.pdf Binary files differindex 6a6c690cd9..e4007334e3 100644 --- a/macros/latex/base/nfssfont.pdf +++ b/macros/latex/base/nfssfont.pdf diff --git a/macros/latex/base/proc.pdf b/macros/latex/base/proc.pdf Binary files differindex f13a3a670c..772bcef0dc 100644 --- a/macros/latex/base/proc.pdf +++ b/macros/latex/base/proc.pdf diff --git a/macros/latex/base/slides.pdf b/macros/latex/base/slides.pdf Binary files differindex 31312f798e..b6ef175860 100644 --- a/macros/latex/base/slides.pdf +++ b/macros/latex/base/slides.pdf diff --git a/macros/latex/base/slifonts.pdf b/macros/latex/base/slifonts.pdf Binary files differindex d9720fdcd3..48a428d8ab 100644 --- a/macros/latex/base/slifonts.pdf +++ b/macros/latex/base/slifonts.pdf diff --git a/macros/latex/base/source2e.pdf b/macros/latex/base/source2e.pdf Binary files differindex 373d22f43b..011cdad592 100644 --- a/macros/latex/base/source2e.pdf +++ b/macros/latex/base/source2e.pdf diff --git a/macros/latex/base/syntonly.pdf b/macros/latex/base/syntonly.pdf Binary files differindex 65a3a94dde..2abe6dc702 100644 --- a/macros/latex/base/syntonly.pdf +++ b/macros/latex/base/syntonly.pdf diff --git a/macros/latex/base/tlc2.pdf b/macros/latex/base/tlc2.pdf Binary files differindex 9f7ea2d6b4..ce6e947886 100644 --- a/macros/latex/base/tlc2.pdf +++ b/macros/latex/base/tlc2.pdf diff --git a/macros/latex/base/tulm.pdf b/macros/latex/base/tulm.pdf Binary files differindex afab8be6a0..d2ae577ef1 100644 --- a/macros/latex/base/tulm.pdf +++ b/macros/latex/base/tulm.pdf diff --git a/macros/latex/base/usrguide.pdf b/macros/latex/base/usrguide.pdf Binary files differindex 3cb90e7887..29050e863e 100644 --- a/macros/latex/base/usrguide.pdf +++ b/macros/latex/base/usrguide.pdf diff --git a/macros/latex/base/utf8ienc.pdf b/macros/latex/base/utf8ienc.pdf Binary files differindex 21489083ad..8bf64ce898 100644 --- a/macros/latex/base/utf8ienc.pdf +++ b/macros/latex/base/utf8ienc.pdf diff --git a/macros/latex/base/webcomp.pdf b/macros/latex/base/webcomp.pdf Binary files differindex 649143f98d..0748c1fcdb 100644 --- a/macros/latex/base/webcomp.pdf +++ b/macros/latex/base/webcomp.pdf diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf Binary files differdeleted file mode 100644 index 17ca614c6c..0000000000 --- a/macros/latex/contrib/siunitx/siunitx-code.pdf +++ /dev/null diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx index bca4b099ef..7bceb45bf1 100644 --- a/macros/latex/contrib/siunitx/siunitx.dtx +++ b/macros/latex/contrib/siunitx/siunitx.dtx @@ -691,6 +691,12 @@ This work consists of the file siunitx.dtx % angles} % \changes{v2.7t}{2019/10/10}{Fix \opt{round-half} when \opt{even} at zero precision} % \changes{v2.7u}{2020/01/15}{Modified internals to track \pkg{expl3} changes} +% \changes{v2.7v}{2020/02/17}{Fix appearance of superscript decimals with +% comma decimal marker} +% \changes{v2.8}{2020/02/20}{Use companion font symbols (now always loaded by +% the kernel)} +% \changes{v2.8}{2020/02/20}{Allow \cs{ohm} to appear correctly in PDF +% bookmarks} % %\begin{abstract} % Physical quantities have both numbers and units, and each physical @@ -3972,19 +3978,18 @@ This work consists of the file siunitx.dtx % math-arcminute & Literal & \verb={}^{\prime}= \\ % math-arcsecond & Literal & \verb={}^{\prime\prime}= \\ % math-celsius & Literal & \meta{see text} \\ -% math-degree & Literal & \verb={}^{\circ}= \\ -% math-micro & Literal & \meta{see text} \\ -% math-ohm & Literal & \cs{Omega} \\ +% math-degree & Literal & \verb=\text{\textdegree}= \\ +% math-micro & Literal & \verb=\text{\textmu}= \\ +% math-ohm & Literal & \verb=\text{\ensuremath{\Omega}}= \\ % redefine-symbols & Switch & true \\ % text-angstrom & Literal & \cs{AA} \\ % text-arcminute & Literal & \verb=\ensuremath{{}^{\prime}}= \\ % text-arcsecond & Literal & % \verb=\ensuremath{{}^{\prime\prime}}= \\ -% text-celsius & Literal & \verb=\ensuremath{{}^{\circ}}= \\ -% & & \verb=\kern -\scriptspace C= \\ -% text-degree & Literal & \verb=\ensuremath{{}^{\circ}}= \\ -% text-micro & Literal & \meta{see text} \\ -% text-ohm & Literal & \verb=\ensuremath{\Omega}= \\ +% text-celsius & Literal & \verb=\textdegree C= \\ +% text-degree & Literal & \verb=\textdegree= \\ +% text-micro & Literal & \verb=\textmu= \\ +% text-ohm & Literal & \verb=\textohm= \\ % \bottomrule % \end{tabular} %\end{table} @@ -4004,11 +4009,6 @@ This work consists of the file siunitx.dtx % the macro name easier!).\footnote{The function % \cs{SIUnitSymbolAngstrom} uses the name without accents.} % -% \changes{v2.4a}{2011/12/04}{Use UTF-8 symbols with \XeTeX{} and \LuaTeX{} -% if \pkg{fontspec} is loaded} -% When using \XeTeX{} or \LuaTeX{}, if \pkg{fontspec} is loaded these options -% are redefined to use UTF-8 characters directly. -% %\subsection{Other options} % %\DescribeOption{locale} @@ -5221,7 +5221,7 @@ This work consists of the file siunitx.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2020/01/15} {2.7u} +\ProvidesExplPackage {siunitx} {2020/02/20} {2.8} {A comprehensive (SI) units package} % \end{macrocode} % @@ -5331,78 +5331,13 @@ This work consists of the file siunitx.dtx %\end{macro} %\end{macro} % -% Some of the \texttt{TS1} encoding is needed to provide symbols in -% text mode. If the user has not loaded the encoding themselves, it is -% done here. +% Ensure that the companion font is loaded. % \begin{macrocode} \AtBeginDocument { \cs_if_free:cT { T@TS1 } - { - \DeclareFontEncoding { TS1 } { } { } - \DeclareFontSubstitution { TS1 } { cmr } { m } { n } - } -} -% \end{macrocode} -% -%\begin{macro}{ -% \c_@@_minus_tl , -% \c_@@_minus_int -%} -% To allow the correct symbol to appear in text mode: this is the same -% as \cs{textminus} from \pkg{textcomp}. If \pkg{fontspec} is loaded -% then the real character can be used unless there's a good reason -% to suspect -% \begin{macrocode} -\DeclareTextSymbolDefault \c_@@_minus_tl { TS1 } -\DeclareTextSymbol \c_@@_minus_tl { TS1 } { 61 } -\AtBeginDocument { - \@ifpackageloaded { fontspec } - { - \@ifpackageloaded { eulervm } - { } - { - \int_const:Nn \c_@@_minus_int { 8722 } - \tl_set:Nn \c_@@_minus_tl - { \tex_char:D \c_@@_minus_int } - } - } - { } -} -% \end{macrocode} -%\end{macro} -% -%\begin{macro}{ -% \c_@@_mu_tl , -% \c_@@_mu_int -%} -% The lack of an upright mu has to be sorted out. The same consideration -% for \pkg{fontspec} as above. -% \begin{macrocode} -\DeclareTextSymbol \c_@@_mu_tl { TS1 } { 181 } -\DeclareTextSymbolDefault \c_@@_mu_tl { TS1 } -\AtBeginDocument { - \@ifpackageloaded { fontspec } - { - \int_const:Nn \c_@@_mu_int { 181 } - \tl_set:Nn \c_@@_mu_tl { \tex_char:D \c_@@_mu_int } - } - { } -} -% \end{macrocode} -%\end{macro} -% -%\begin{macro}{\g_@@_omega_tl} -% Some package redefine \cs{Omega} to be slanted and move the original -% symbol to \cs{upOmega}. This is handled here. -% \begin{macrocode} -\tl_new:N \g_@@_omega_tl -\tl_gset:Nn \g_@@_omega_tl { \Omega } -\AtBeginDocument { - \cs_if_exist:NT \upOmega - { \tl_set:Nn \g_@@_omega_tl { \upOmega } } + { \RequirePackage { textcomp } } } % \end{macrocode} -%\end{macro} % % \begin{macro} % { @@ -5716,7 +5651,6 @@ This work consists of the file siunitx.dtx \@@_option_unchanged:Nnn \l_@@_qualifier_mode_tl { subscript } { brackets } \keys_set:nn { siunitx } { mode = text } - \tl_set:Nn \c_@@_minus_tl { \HCode { &\#x2212; } } } { } } @@ -6513,7 +6447,7 @@ This work consists of the file siunitx.dtx \cs_new_protected:Npn \@@_print_text: { \tl_replace_all:Nnn \l_@@_print_arg_tl { - } - { \c_@@_minus_tl } + { \textminus } \@@_print_text_aux: \tl_replace_all:Nnn \l_@@_print_arg_tl { \mp } { \ensuremath { \mp } } @@ -6607,7 +6541,7 @@ This work consists of the file siunitx.dtx \cs_new_protected:Npn \@@_print_text_super:n #1 { \tl_set:Nn \l_@@_tmpa_tl {#1} \tl_replace_all:Nnn \l_@@_tmpa_tl { - } - { \c_@@_minus_tl } + { \textminus } \tl_set:Nx \l_@@_tmpa_tl { \exp_not:N \ensuremath @@ -8512,7 +8446,7 @@ This work consists of the file siunitx.dtx \l_@@_process_integer_min_int - \tl_count:N \l_@@_tmpa_tl } - \int_compare:nNnT \l_@@_tmp_int > 0 + \int_compare:nNnT \l_@@_tmp_int > 0 { \tl_set:Nx \l_@@_tmpa_tl { @@ -12462,6 +12396,7 @@ This work consists of the file siunitx.dtx % \@@_unit_format_power_aux: , % \@@_unit_format_power_aux:n , % \@@_unit_format_power_aux:nn , +% \@@_unit_format_power_aux:w , % \@@_unit_format_power_brackets: , % \@@_unit_format_power_per: , % \@@_unit_format_power_repeat: @@ -12505,7 +12440,10 @@ This work consists of the file siunitx.dtx \exp_not:N \PrintSuperscript { \@@_unit_format_power_aux:n - { \exp_not:V \l_@@_tmpa_tl } + { + \exp_after:wN \@@_unit_format_power:w + \l_@@_tmpa_tl . . \q_stop + } } } } @@ -12521,10 +12459,19 @@ This work consists of the file siunitx.dtx { \tl_set:Nn \l_@@_tmpa_tl {#2} \tl_replace_all:Nnn \l_@@_tmpa_tl { - } - { \text { \c_@@_minus_tl } } + { \text { \textminus } } \@@_print:nV {#1} \l_@@_tmpa_tl } } +\cs_new:Npn \@@_unit_format_power:w #1 . #2 . #3 \q_stop + { + \exp_not:n {#1} + \tl_if_blank:nF {#2} + { + \exp_not:V \l_@@_output_decimal_tl + \exp_not:n {#2} + } + } % \end{macrocode} % A check is made for a qualifier with a space, which needs brackets % if there is also a power. @@ -15403,44 +15350,34 @@ This work consists of the file siunitx.dtx { \bool_if:NT \l_@@_redefine_symbols_bool { - \@ifpackageloaded { textcomp } + \@ifpackageloaded { fourier } { - \@@_option_unchanged:Nnn \l_@@_degree_math_tl - { { } ^ { \circ } } - { \text { \textdegree } } - \@@_option_unchanged:Nnn \l_@@_degree_text_tl - { \ensuremath { { } ^ { \circ } } } - { \textdegree } - \@ifpackageloaded { mathptmx } - { } - { - \@@_option_unchanged:Nnn \l_@@_micro_text_tl - { \c_@@_mu_tl } - { \textmu } - \@ifpackageloaded { fourier } - { } - { - \@@_option_unchanged:Nnn \l_@@_ohm_text_tl - { \ensuremath { \g_@@_omega_tl } } - { \textohm } - } - } - \str_if_eq:VnT \encodingdefault { OT1 } - { - \@@_option_unchanged:Nnn \l_@@_angstrom_math_tl - { \text { \AA } } - { \text { \capitalring { A } } } - \@@_option_unchanged:Nnn \l_@@_angstrom_text_tl - { \AA } - { \capitalring { A } } - } + \@@_option_unchanged:Nnn \l_@@_ohm_text_tl + { \textohm } + { \text { \ensuremath { \l_@@_ohm_math_tl } } } + } + { } + \@ifpackageloaded { mathptmx } + { + \@@_option_unchanged:Nnn \l_@@_ohm_text_tl + { \textohm } + { \text { \ensuremath { \l_@@_ohm_math_tl } } } } { } + \str_if_eq:VnT \encodingdefault { OT1 } + { + \@@_option_unchanged:Nnn \l_@@_angstrom_math_tl + { \text { \AA } } + { \text { \capitalring { A } } } + \@@_option_unchanged:Nnn \l_@@_angstrom_text_tl + { \AA } + { \capitalring { A } } + } \@ifpackageloaded { upgreek } { \@@_option_unchanged:Nnn \l_@@_ohm_math_tl - { \text { \ensuremath { \g_@@_omega_tl } } } - { \Upomega } + { \text { \ensuremath { \Omega } } } + { \text { \ensuremath { \Upomega } } } } { } } @@ -15474,10 +15411,10 @@ This work consists of the file siunitx.dtx math-angstrom = \text { \AA }, math-arcminute = { } ^ { \prime }, math-arcsecond = { } ^ { \prime \prime }, - math-celsius = { } ^ { \circ } \kern - \scriptspace \@@_unit_mathrm:n { C } , - math-degree = { } ^ { \circ }, - math-micro = \text { \c_@@_mu_tl }, - math-ohm = \text { \ensuremath { \g_@@_omega_tl } }, + math-celsius = \text { \textdegree } \@@_unit_mathrm:n { C } , + math-degree = \text { \textdegree }, + math-micro = \text { \textmu }, + math-ohm = \text { \ensuremath { \Omega } }, } % \end{macrocode} %\end{macro} @@ -15509,11 +15446,10 @@ This work consists of the file siunitx.dtx text-angstrom = \AA, text-arcminute = \ensuremath { { } ^ { \prime } }, text-arcsecond = \ensuremath { { } ^ { \prime \prime } }, - text-celsius = - \ensuremath { { } ^ { \circ } } \kern -\scriptspace C , - text-degree = \ensuremath { { } ^ { \circ } }, - text-micro = \c_@@_mu_tl , - text-ohm = \ensuremath { \g_@@_omega_tl }, + text-celsius = \text { \textdegree } C, + text-degree = \text { \textdegree }, + text-micro = \textmu , + text-ohm = \textohm } % \end{macrocode} %\end{macro} @@ -15569,104 +15505,6 @@ This work consists of the file siunitx.dtx %\end{macro} %\end{macro} % -% \begin{variable} -% { -% \c_@@_degree_int , -% \c_@@_micro_int , -% \c_@@_angstrom_int , -% \c_@@_ohm_int , -% \c_@@_arcminute_int, -% \c_@@_arcsecond_int -% } -% For UTF-8 engines, it may be possible to use better symbols than those set -% up as standard. Unicode normalises both the ohm and {\aa}ngstr{\"{o}}m -% symbols to the appropriate letters, so these are used directly. -% Technically, we should hae a different slot for micro than for a mu, but -% for the broadest compatibility we go with the latter. -% The single degree Celsius symbol is a compatibility character, and so -% the two separate glyphs \enquote{degree} and \enquote{C} are used. -% \begin{macrocode} -\AtBeginDocument - { - \@ifpackageloaded { fontspec } - { - \int_const:Nn \c_@@_degree_int { 176 } - \int_const:Nn \c_@@_micro_int { "000B5 } - \int_const:Nn \c_@@_angstrom_int { "0212B } - \int_const:Nn \c_@@_ohm_int { "003A9 } - \sys_if_engine_xetex:T - { - \@@_option_unchanged:Nnn \l_@@_angstrom_math_tl - { \text { \AA } } - { \tex_char:D \c_@@_angstrom_int } - } - \@@_option_unchanged:Nnn \l_@@_celsius_math_tl - { { } ^ { \circ } \kern - \scriptspace C } - { - \tex_char:D \c_@@_degree_int - C - } - \@@_option_unchanged:Nnn \l_@@_degree_math_tl - { { } ^ { \circ } } - { \tex_char:D \c_@@_degree_int } - \@@_option_unchanged:Nnn \l_@@_micro_math_tl - { \text { \c_@@_mu_tl } } - { \tex_char:D \c_@@_micro_int } - \@@_option_unchanged:Nnn \l_@@_ohm_math_tl - { \text { \ensuremath { \g_@@_omega_tl } } } - { \tex_char:D \c_@@_ohm_int } - \sys_if_engine_xetex:T - { - \@@_option_unchanged:Nnn \l_@@_angstrom_text_tl - { \AA } - { \tex_char:D \c_@@_angstrom_int } - } - \@@_option_unchanged:Nnn \l_@@_celsius_text_tl - { - \ensuremath - { { } ^ { \circ } \kern - \scriptspace C } - } - { - \tex_char:D \c_@@_degree_int - C - } - \@@_option_unchanged:Nnn \l_@@_degree_text_tl - { \ensuremath { { } ^ { \circ } } } - { \tex_char:D \c_@@_degree_int } - \@@_option_unchanged:Nnn \l_@@_micro_text_tl - { \c_@@_mu_tl } - { \tex_char:D \c_@@_micro_int } - \@@_option_unchanged:Nnn \l_@@_ohm_text_tl - { \ensuremath { \g_@@_omega_tl } } - { \tex_char:D \c_@@_ohm_int } - } - { } -% \end{macrocode} -% Slightly more specialised: these only work in math mode with -% \pkg{unicode-math}. -% \begin{macrocode} - \@ifpackageloaded { unicode-math } - { - \int_const:Nn \c_@@_arcminute_int { 8242 } - \int_const:Nn \c_@@_arcsecond_int { 8243 } - \@@_option_unchanged:Nnn \l_@@_arcminute_math_tl - { { } ^ { \prime } } - { \ensuremath { \tex_char:D \c_@@_arcminute_int } } - \@@_option_unchanged:Nnn \l_@@_arcsecond_math_tl - { { } ^ { \prime \prime } } - { \ensuremath { \tex_char:D \c_@@_arcsecond_int } } - \@@_option_unchanged:Nnn \l_@@_arcminute_text_tl - { \ensuremath { { } ^ { \prime } } } - { \ensuremath { \tex_char:D \c_@@_arcminute_int } } - \@@_option_unchanged:Nnn \l_@@_arcsecond_text_tl - { \ensuremath { { } ^ { \prime \prime } } } - { \ensuremath { \tex_char:D \c_@@_arcsecond_int } } - } - { } - } -% \end{macrocode} -% \end{variable} -% %\subsection{Working with other packages} % %\begin{macro}{\l_@@_pgf_link_clist} @@ -16191,7 +16029,7 @@ This work consists of the file siunitx.dtx \cs_set:Npn \SIUnitSymbolCelsius { \textcelsius } \cs_set:Npn \SIUnitSymbolDegree { \textdegree } \cs_set:Npn \SIUnitSymbolMicro { \textmu } - \cs_set:Npn \SIUnitSymbolOhm { [ohm] } + \cs_set:Npn \SIUnitSymbolOhm { \textohm } } % \end{macrocode} % \end{macro} diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf Binary files differindex affca61c32..8c71ffa425 100644 --- a/macros/latex/contrib/siunitx/siunitx.pdf +++ b/macros/latex/contrib/siunitx/siunitx.pdf |