diff options
author | Karl Berry <karl@freefriends.org> | 2023-12-31 21:25:25 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-12-31 21:25:25 +0000 |
commit | 51db2d77a03ce63532ebcdbabbb8e74786dd3253 (patch) | |
tree | 10b2f99276a674eb7cd5727049d5e18855e4c1ae | |
parent | 38e02b045da9f31fa40a688c654791f883d74512 (diff) |
decimalcomma (31dec23)
git-svn-id: svn://tug.org/texlive/trunk@69251 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/decimalcomma/decimalcomma.pdf | bin | 102789 -> 102018 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/decimalcomma/decimalcomma.dtx | 29 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/decimalcomma/decimalcomma.sty | 17 |
3 files changed, 23 insertions, 23 deletions
diff --git a/Master/texmf-dist/doc/latex/decimalcomma/decimalcomma.pdf b/Master/texmf-dist/doc/latex/decimalcomma/decimalcomma.pdf Binary files differindex a7c42c84b72..aa3913d6213 100644 --- a/Master/texmf-dist/doc/latex/decimalcomma/decimalcomma.pdf +++ b/Master/texmf-dist/doc/latex/decimalcomma/decimalcomma.pdf diff --git a/Master/texmf-dist/source/latex/decimalcomma/decimalcomma.dtx b/Master/texmf-dist/source/latex/decimalcomma/decimalcomma.dtx index 5ee720ea2c4..a78b0867bfe 100644 --- a/Master/texmf-dist/source/latex/decimalcomma/decimalcomma.dtx +++ b/Master/texmf-dist/source/latex/decimalcomma/decimalcomma.dtx @@ -20,7 +20,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{decimalcomma} - [2023/12/28 v1.3 .dtx Comma for decimal numbers] + [2023/12/30 v1.4 .dtx Comma for decimal numbers] %</package> %<*driver> \documentclass{ltxdoc} @@ -60,7 +60,7 @@ %</driver> % \fi % -% \CheckSum{24} +% \CheckSum{18} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -82,6 +82,7 @@ % \changes{v1.1}{2023/12/19}{Error message when unicode-math loaded after decimalcomma} % \changes{v1.2}{2023/12/20}{Bug correction: bad typo for the boolean DC@unicodemath} % \changes{v1.3}{2023/12/28}{Loading icomma to avoid babel-french + numprint problems} +% \changes{v1.4}{2023/12/30}{Code improvement, first boolean unnecessary, thanks to J.F. Burnol} % % \GetFileInfo{decimalcomma.sty} % @@ -156,24 +157,24 @@ % This first piece of code aims to generate an appropriate error message, if you load % \textsf{unicode-math} \emph{after} \textsf{decimalcomma}. % To achieve this, first we check if \textsf{unicode-math} has been loaded before. -% In that case, the boolean "DC@unicodemath" will be set to true. -% Then, at the end of the preamble, when all the packages have been loaded, -% we perform a new verification. If \textsf{unicode-math} has been loaded after -% but not before, the appropriate error message is displayed. +% In that case, we do nothing. +% Else, at the end of the preamble, when all the packages have been loaded, +% we perform a new verification. If \textsf{unicode-math} has been loaded at that time, +% the appropriate error message is displayed. +% % Without this code, the compilation would produce an error message mentioning % a problem on "\futurelet", incomprehensible for the novice. % % \begin{macrocode} -\newif\ifDC@unicodemath -\@ifpackageloaded{unicode-math}{\DC@unicodemathtrue} -\AtBeginDocument{\@ifpackageloaded{unicode-math}{ - \ifDC@unicodemath\else - \PackageError{decimalcomma}{decimalcomma must be loaded - after unicode-math}{If you didn't load decimalcomma - yourself, check which package uses it.} - \fi +\@ifpackageloaded{unicode-math}{}{ + \AtBeginDocument{% + \@ifpackageloaded{unicode-math}{ + \PackageError{decimalcomma}{decimalcomma must be loaded + after unicode-math}{If you didn't load decimalcomma + yourself, check which package uses it.} }{} + } } % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/decimalcomma/decimalcomma.sty b/Master/texmf-dist/tex/latex/decimalcomma/decimalcomma.sty index ec66692aea1..60d8483adc8 100644 --- a/Master/texmf-dist/tex/latex/decimalcomma/decimalcomma.sty +++ b/Master/texmf-dist/tex/latex/decimalcomma/decimalcomma.sty @@ -22,17 +22,16 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{decimalcomma} - [2023/12/28 v1.3 .dtx Comma for decimal numbers] + [2023/12/30 v1.4 .dtx Comma for decimal numbers] -\newif\ifDC@unicodemath -\@ifpackageloaded{unicode-math}{\DC@unicodemathtrue} -\AtBeginDocument{\@ifpackageloaded{unicode-math}{ - \ifDC@unicodemath\else - \PackageError{decimalcomma}{decimalcomma must be loaded - after unicode-math}{If you didn't load decimalcomma - yourself, check which package uses it.} - \fi +\@ifpackageloaded{unicode-math}{}{ + \AtBeginDocument{% + \@ifpackageloaded{unicode-math}{ + \PackageError{decimalcomma}{decimalcomma must be loaded + after unicode-math}{If you didn't load decimalcomma + yourself, check which package uses it.} }{} + } } \RequirePackage{icomma} |