diff options
author | Norbert Preining <norbert@preining.info> | 2024-09-08 03:03:42 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2024-09-08 03:03:42 +0000 |
commit | 02b4f3220f1fe1f680dae87bf14e62926b6bf0c5 (patch) | |
tree | ea3167df561d5e0a4bc982ebdacb2101d71ff37f /macros/latex | |
parent | 1dd4f4f27f10b2c18d5d8464f851cb6eb620abb4 (diff) |
Diffstat (limited to 'macros/latex')
-rw-r--r-- | macros/latex/contrib/euromoney/doc/euromoney-doc.pdf | bin | 2284939 -> 2409702 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/doc/euromoney-doc.tex | 37 | ||||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-100euro.pdf (renamed from macros/latex/contrib/euromoney/tex/100euro.pdf) | bin | 955673 -> 955673 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-100eurosimple.pdf (renamed from macros/latex/contrib/euromoney/tex/100eurosimple.pdf) | bin | 62058 -> 62058 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-100eurosimplebw.pdf (renamed from macros/latex/contrib/euromoney/tex/100eurosimplebw.pdf) | bin | 62345 -> 62345 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-10cent.pdf (renamed from macros/latex/contrib/euromoney/tex/10cent.pdf) | bin | 27497 -> 27497 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-10centsimple.pdf (renamed from macros/latex/contrib/euromoney/tex/10centsimple.pdf) | bin | 11617 -> 11617 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-10centsimplebw.pdf (renamed from macros/latex/contrib/euromoney/tex/10centsimplebw.pdf) | bin | 11163 -> 11163 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-10euro.pdf (renamed from macros/latex/contrib/euromoney/tex/10euro.pdf) | bin | 160214 -> 160214 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-10eurosimple.pdf (renamed from macros/latex/contrib/euromoney/tex/10eurosimple.pdf) | bin | 22792 -> 22792 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-10eurosimplebw.pdf (renamed from macros/latex/contrib/euromoney/tex/10eurosimplebw.pdf) | bin | 22996 -> 22996 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-1cent.pdf (renamed from macros/latex/contrib/euromoney/tex/1cent.pdf) | bin | 46257 -> 46257 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-1centsimple.pdf (renamed from macros/latex/contrib/euromoney/tex/1centsimple.pdf) | bin | 2172 -> 2172 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-1centsimplebw.pdf (renamed from macros/latex/contrib/euromoney/tex/1centsimplebw.pdf) | bin | 2164 -> 2164 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-1euro.pdf (renamed from macros/latex/contrib/euromoney/tex/1euro.pdf) | bin | 19980 -> 19980 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-1eurosimple.pdf (renamed from macros/latex/contrib/euromoney/tex/1eurosimple.pdf) | bin | 5894 -> 5894 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-1eurosimplebw.pdf (renamed from macros/latex/contrib/euromoney/tex/1eurosimplebw.pdf) | bin | 5910 -> 5910 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-200euro.pdf (renamed from macros/latex/contrib/euromoney/tex/200euro.pdf) | bin | 354898 -> 354898 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-200eurosimple.pdf (renamed from macros/latex/contrib/euromoney/tex/200eurosimple.pdf) | bin | 22825 -> 22825 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-200eurosimplebw.pdf (renamed from macros/latex/contrib/euromoney/tex/200eurosimplebw.pdf) | bin | 23006 -> 23006 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-20cent.pdf (renamed from macros/latex/contrib/euromoney/tex/20cent.pdf) | bin | 26569 -> 26569 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-20centsimple.pdf (renamed from macros/latex/contrib/euromoney/tex/20centsimple.pdf) | bin | 10164 -> 10164 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-20centsimplebw.pdf (renamed from macros/latex/contrib/euromoney/tex/20centsimplebw.pdf) | bin | 9960 -> 9960 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-20euro.pdf (renamed from macros/latex/contrib/euromoney/tex/20euro.pdf) | bin | 78801 -> 78801 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-20eurosimple.pdf (renamed from macros/latex/contrib/euromoney/tex/20eurosimple.pdf) | bin | 22382 -> 22382 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-20eurosimplebw.pdf (renamed from macros/latex/contrib/euromoney/tex/20eurosimplebw.pdf) | bin | 22394 -> 22394 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-2cent.pdf (renamed from macros/latex/contrib/euromoney/tex/2cent.pdf) | bin | 45967 -> 45967 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-2centsimple.pdf (renamed from macros/latex/contrib/euromoney/tex/2centsimple.pdf) | bin | 2130 -> 2130 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-2centsimplebw.pdf (renamed from macros/latex/contrib/euromoney/tex/2centsimplebw.pdf) | bin | 2122 -> 2122 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-2euro.pdf (renamed from macros/latex/contrib/euromoney/tex/2euro.pdf) | bin | 23244 -> 23244 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-2eurosimple.pdf (renamed from macros/latex/contrib/euromoney/tex/2eurosimple.pdf) | bin | 5941 -> 5941 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-2eurosimplebw.pdf (renamed from macros/latex/contrib/euromoney/tex/2eurosimplebw.pdf) | bin | 5897 -> 5897 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-500euro.pdf (renamed from macros/latex/contrib/euromoney/tex/500euro.pdf) | bin | 231203 -> 231203 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-500eurosimple.pdf (renamed from macros/latex/contrib/euromoney/tex/500eurosimple.pdf) | bin | 22885 -> 22885 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-500eurosimplebw.pdf (renamed from macros/latex/contrib/euromoney/tex/500eurosimplebw.pdf) | bin | 23168 -> 23168 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-50cent.pdf (renamed from macros/latex/contrib/euromoney/tex/50cent.pdf) | bin | 27558 -> 27558 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-50centsimple.pdf (renamed from macros/latex/contrib/euromoney/tex/50centsimple.pdf) | bin | 11748 -> 11748 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-50centsimplebw.pdf (renamed from macros/latex/contrib/euromoney/tex/50centsimplebw.pdf) | bin | 11303 -> 11303 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-50euro.pdf (renamed from macros/latex/contrib/euromoney/tex/50euro.pdf) | bin | 235259 -> 235259 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-50eurosimple.pdf (renamed from macros/latex/contrib/euromoney/tex/50eurosimple.pdf) | bin | 17891 -> 17891 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-50eurosimplebw.pdf (renamed from macros/latex/contrib/euromoney/tex/50eurosimplebw.pdf) | bin | 18128 -> 18128 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-5cent.pdf (renamed from macros/latex/contrib/euromoney/tex/5cent.pdf) | bin | 45981 -> 45981 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-5centsimple.pdf (renamed from macros/latex/contrib/euromoney/tex/5centsimple.pdf) | bin | 2200 -> 2200 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-5centsimplebw.pdf (renamed from macros/latex/contrib/euromoney/tex/5centsimplebw.pdf) | bin | 2181 -> 2181 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-5euro.pdf (renamed from macros/latex/contrib/euromoney/tex/5euro.pdf) | bin | 424391 -> 424391 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-5eurosimple.pdf (renamed from macros/latex/contrib/euromoney/tex/5eurosimple.pdf) | bin | 60083 -> 60083 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney-5eurosimplebw.pdf (renamed from macros/latex/contrib/euromoney/tex/5eurosimplebw.pdf) | bin | 60042 -> 60042 bytes | |||
-rw-r--r-- | macros/latex/contrib/euromoney/tex/euromoney.sty | 37 | ||||
-rw-r--r-- | macros/latex/contrib/fontscale/CHANGELOG.md | 6 | ||||
-rw-r--r-- | macros/latex/contrib/fontscale/beery.cls | 2 | ||||
-rw-r--r-- | macros/latex/contrib/fontscale/fontscale-table-classic.tex | 2 | ||||
-rw-r--r-- | macros/latex/contrib/fontscale/fontscale-table-font-steps.tex | 2 | ||||
-rw-r--r-- | macros/latex/contrib/fontscale/fontscale-table-musical.tex | 2 | ||||
-rw-r--r-- | macros/latex/contrib/fontscale/fontscale.pdf | bin | 105543 -> 105444 bytes | |||
-rw-r--r-- | macros/latex/contrib/fontscale/fontscale.sty | 187 | ||||
-rw-r--r-- | macros/latex/contrib/fontscale/fontscale.tex | 10 |
56 files changed, 102 insertions, 183 deletions
diff --git a/macros/latex/contrib/euromoney/doc/euromoney-doc.pdf b/macros/latex/contrib/euromoney/doc/euromoney-doc.pdf Binary files differindex 917cb7e50e..93668899bf 100644 --- a/macros/latex/contrib/euromoney/doc/euromoney-doc.pdf +++ b/macros/latex/contrib/euromoney/doc/euromoney-doc.pdf diff --git a/macros/latex/contrib/euromoney/doc/euromoney-doc.tex b/macros/latex/contrib/euromoney/doc/euromoney-doc.tex index eeefd182e1..f502604a0b 100644 --- a/macros/latex/contrib/euromoney/doc/euromoney-doc.tex +++ b/macros/latex/contrib/euromoney/doc/euromoney-doc.tex @@ -29,8 +29,8 @@ \hypersetup{pdfborder=0 0 0} \usepackage[margin=2cm]{geometry} \setlength{\parindent}{0pt} -\def\TPversion{0.1.0} -\def\TPdate{06/09/2024} +\def\TPversion{0.1.1} +\def\TPdate{07/09/2024} \usepackage{tcolorbox} \tcbuselibrary{skins,hooks,listingsutf8} %\usepackage{soul} @@ -207,7 +207,7 @@ It's possible to present multiple coins or multiples banknotes : \subsection{Global names} -Each coin or bill is a vectorial pdf and there's three styles : +Each coin or bill is a vectorial pdf, name \texttt{euromoney-<amount><suffix>} and there's three styles : \begin{itemize} \item \MontreCode{full} colored version ; @@ -224,9 +224,9 @@ Available basenames are : \begin{DemoCode}{} %manual insertion -\includegraphics[height=25.75mm]{2euro}% w/o suffix -\includegraphics[height=25.75mm]{2eurosimple}% with simple suffix -\includegraphics[height=25.75mm]{2eurosimplebw}% with simplebw suffix +\includegraphics[height=25.75mm]{euromoney-2euro}% w/o suffix +\includegraphics[height=25.75mm]{euromoney-2eurosimple}% with simple suffix +\includegraphics[height=25.75mm]{euromoney-2eurosimplebw}% with simplebw suffix \end{DemoCode} \subsection{Size of graphics} @@ -267,11 +267,21 @@ List of coins can be given within \MontreCode{3*2+4*1+2*0.2+4*0.1} for example. \end{DemoCode} \begin{DemoCode}{} -%multiple coins, side by side, global height +%multiple coins, side by side, global height, simple style \EuroCoins{2+1+0.5+0.2+0.1+0.05+0.02+0.01} \end{DemoCode} \begin{DemoCode}{} +%multiple coins, side by side, global height, full style +\EuroCoins[Style=full]{2+1+0.5+0.2+0.1+0.05+0.02+0.01} +\end{DemoCode} + +\begin{DemoCode}{} +%multiple coins, side by side, global height, simplebw style +\EuroCoins[Style=bw]{2+1+0.5+0.2+0.1+0.05+0.02+0.01} +\end{DemoCode} + +\begin{DemoCode}{} %stacked coins (b&w), horizontally with correct scaling \EuroCoins[RefHeight=3cm,AutoHeight,OffsetH=7.5mm,Style=bw]{4*2+3*1+4*0.2+1*0.1+2*0.01} \end{DemoCode} @@ -376,11 +386,21 @@ Pour le cas de billets en éventail, la liste pourra être donnée sous la forme \end{DemoCode} \begin{DemoCode}{} -%pièces multiples, côte à côte, taille uniforme +%pièces multiples, côte à côte, taille uniforme, style simple \PiecesEuro{2+1+0.5+0.2+0.1+0.05+0.02+0.01} \end{DemoCode} \begin{DemoCode}{} +%pièces multiples, côte à côte, taille uniforme, style full +\PiecesEuro[Style=full]{2+1+0.5+0.2+0.1+0.05+0.02+0.01} +\end{DemoCode} + +\begin{DemoCode}{} +%pièces multiples, côte à côte, taille uniforme, style simplenb +\PiecesEuro[Style=nb]{2+1+0.5+0.2+0.1+0.05+0.02+0.01} +\end{DemoCode} + +\begin{DemoCode}{} %pièces empilées (n&b) horizontalement et tailles ajustées \PiecesEuro% [HauteurRef=3cm,HauteurAuto,DecalH=7.5mm,Style=nb]{4*2+3*1+4*0.2+1*0.1+2*0.01} @@ -433,6 +453,7 @@ Pour le cas de billets en éventail, la liste pourra être donnée sous la forme \begin{quote} \begin{verbatim} +0.1.1 : New filenames, according to TL rules 0.1.0 : Initial version \end{verbatim} \end{quote} diff --git a/macros/latex/contrib/euromoney/tex/100euro.pdf b/macros/latex/contrib/euromoney/tex/euromoney-100euro.pdf Binary files differindex 6899f2b2d3..6899f2b2d3 100644 --- a/macros/latex/contrib/euromoney/tex/100euro.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-100euro.pdf diff --git a/macros/latex/contrib/euromoney/tex/100eurosimple.pdf b/macros/latex/contrib/euromoney/tex/euromoney-100eurosimple.pdf Binary files differindex b021e90c2b..b021e90c2b 100644 --- a/macros/latex/contrib/euromoney/tex/100eurosimple.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-100eurosimple.pdf diff --git a/macros/latex/contrib/euromoney/tex/100eurosimplebw.pdf b/macros/latex/contrib/euromoney/tex/euromoney-100eurosimplebw.pdf Binary files differindex e3777a5c9d..e3777a5c9d 100644 --- a/macros/latex/contrib/euromoney/tex/100eurosimplebw.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-100eurosimplebw.pdf diff --git a/macros/latex/contrib/euromoney/tex/10cent.pdf b/macros/latex/contrib/euromoney/tex/euromoney-10cent.pdf Binary files differindex ddeac2a07f..ddeac2a07f 100644 --- a/macros/latex/contrib/euromoney/tex/10cent.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-10cent.pdf diff --git a/macros/latex/contrib/euromoney/tex/10centsimple.pdf b/macros/latex/contrib/euromoney/tex/euromoney-10centsimple.pdf Binary files differindex 8fad414db2..8fad414db2 100644 --- a/macros/latex/contrib/euromoney/tex/10centsimple.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-10centsimple.pdf diff --git a/macros/latex/contrib/euromoney/tex/10centsimplebw.pdf b/macros/latex/contrib/euromoney/tex/euromoney-10centsimplebw.pdf Binary files differindex 46bfac9dbc..46bfac9dbc 100644 --- a/macros/latex/contrib/euromoney/tex/10centsimplebw.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-10centsimplebw.pdf diff --git a/macros/latex/contrib/euromoney/tex/10euro.pdf b/macros/latex/contrib/euromoney/tex/euromoney-10euro.pdf Binary files differindex 0c67ef4982..0c67ef4982 100644 --- a/macros/latex/contrib/euromoney/tex/10euro.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-10euro.pdf diff --git a/macros/latex/contrib/euromoney/tex/10eurosimple.pdf b/macros/latex/contrib/euromoney/tex/euromoney-10eurosimple.pdf Binary files differindex b07568d6fb..b07568d6fb 100644 --- a/macros/latex/contrib/euromoney/tex/10eurosimple.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-10eurosimple.pdf diff --git a/macros/latex/contrib/euromoney/tex/10eurosimplebw.pdf b/macros/latex/contrib/euromoney/tex/euromoney-10eurosimplebw.pdf Binary files differindex 24928b831b..24928b831b 100644 --- a/macros/latex/contrib/euromoney/tex/10eurosimplebw.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-10eurosimplebw.pdf diff --git a/macros/latex/contrib/euromoney/tex/1cent.pdf b/macros/latex/contrib/euromoney/tex/euromoney-1cent.pdf Binary files differindex bb9d01c1d4..bb9d01c1d4 100644 --- a/macros/latex/contrib/euromoney/tex/1cent.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-1cent.pdf diff --git a/macros/latex/contrib/euromoney/tex/1centsimple.pdf b/macros/latex/contrib/euromoney/tex/euromoney-1centsimple.pdf Binary files differindex 1b32b89783..1b32b89783 100644 --- a/macros/latex/contrib/euromoney/tex/1centsimple.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-1centsimple.pdf diff --git a/macros/latex/contrib/euromoney/tex/1centsimplebw.pdf b/macros/latex/contrib/euromoney/tex/euromoney-1centsimplebw.pdf Binary files differindex 5db25de626..5db25de626 100644 --- a/macros/latex/contrib/euromoney/tex/1centsimplebw.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-1centsimplebw.pdf diff --git a/macros/latex/contrib/euromoney/tex/1euro.pdf b/macros/latex/contrib/euromoney/tex/euromoney-1euro.pdf Binary files differindex 48f184fa19..48f184fa19 100644 --- a/macros/latex/contrib/euromoney/tex/1euro.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-1euro.pdf diff --git a/macros/latex/contrib/euromoney/tex/1eurosimple.pdf b/macros/latex/contrib/euromoney/tex/euromoney-1eurosimple.pdf Binary files differindex 8c34a15535..8c34a15535 100644 --- a/macros/latex/contrib/euromoney/tex/1eurosimple.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-1eurosimple.pdf diff --git a/macros/latex/contrib/euromoney/tex/1eurosimplebw.pdf b/macros/latex/contrib/euromoney/tex/euromoney-1eurosimplebw.pdf Binary files differindex d5346534b4..d5346534b4 100644 --- a/macros/latex/contrib/euromoney/tex/1eurosimplebw.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-1eurosimplebw.pdf diff --git a/macros/latex/contrib/euromoney/tex/200euro.pdf b/macros/latex/contrib/euromoney/tex/euromoney-200euro.pdf Binary files differindex dc2c56bfb0..dc2c56bfb0 100644 --- a/macros/latex/contrib/euromoney/tex/200euro.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-200euro.pdf diff --git a/macros/latex/contrib/euromoney/tex/200eurosimple.pdf b/macros/latex/contrib/euromoney/tex/euromoney-200eurosimple.pdf Binary files differindex dde3d6f2bb..dde3d6f2bb 100644 --- a/macros/latex/contrib/euromoney/tex/200eurosimple.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-200eurosimple.pdf diff --git a/macros/latex/contrib/euromoney/tex/200eurosimplebw.pdf b/macros/latex/contrib/euromoney/tex/euromoney-200eurosimplebw.pdf Binary files differindex 78f052bd57..78f052bd57 100644 --- a/macros/latex/contrib/euromoney/tex/200eurosimplebw.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-200eurosimplebw.pdf diff --git a/macros/latex/contrib/euromoney/tex/20cent.pdf b/macros/latex/contrib/euromoney/tex/euromoney-20cent.pdf Binary files differindex 28f5f255a4..28f5f255a4 100644 --- a/macros/latex/contrib/euromoney/tex/20cent.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-20cent.pdf diff --git a/macros/latex/contrib/euromoney/tex/20centsimple.pdf b/macros/latex/contrib/euromoney/tex/euromoney-20centsimple.pdf Binary files differindex c101540707..c101540707 100644 --- a/macros/latex/contrib/euromoney/tex/20centsimple.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-20centsimple.pdf diff --git a/macros/latex/contrib/euromoney/tex/20centsimplebw.pdf b/macros/latex/contrib/euromoney/tex/euromoney-20centsimplebw.pdf Binary files differindex 38b77e3671..38b77e3671 100644 --- a/macros/latex/contrib/euromoney/tex/20centsimplebw.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-20centsimplebw.pdf diff --git a/macros/latex/contrib/euromoney/tex/20euro.pdf b/macros/latex/contrib/euromoney/tex/euromoney-20euro.pdf Binary files differindex 2e3f409943..2e3f409943 100644 --- a/macros/latex/contrib/euromoney/tex/20euro.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-20euro.pdf diff --git a/macros/latex/contrib/euromoney/tex/20eurosimple.pdf b/macros/latex/contrib/euromoney/tex/euromoney-20eurosimple.pdf Binary files differindex 4aadb8a293..4aadb8a293 100644 --- a/macros/latex/contrib/euromoney/tex/20eurosimple.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-20eurosimple.pdf diff --git a/macros/latex/contrib/euromoney/tex/20eurosimplebw.pdf b/macros/latex/contrib/euromoney/tex/euromoney-20eurosimplebw.pdf Binary files differindex a855a3128c..a855a3128c 100644 --- a/macros/latex/contrib/euromoney/tex/20eurosimplebw.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-20eurosimplebw.pdf diff --git a/macros/latex/contrib/euromoney/tex/2cent.pdf b/macros/latex/contrib/euromoney/tex/euromoney-2cent.pdf Binary files differindex cee0ca1ffa..cee0ca1ffa 100644 --- a/macros/latex/contrib/euromoney/tex/2cent.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-2cent.pdf diff --git a/macros/latex/contrib/euromoney/tex/2centsimple.pdf b/macros/latex/contrib/euromoney/tex/euromoney-2centsimple.pdf Binary files differindex e68cc46560..e68cc46560 100644 --- a/macros/latex/contrib/euromoney/tex/2centsimple.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-2centsimple.pdf diff --git a/macros/latex/contrib/euromoney/tex/2centsimplebw.pdf b/macros/latex/contrib/euromoney/tex/euromoney-2centsimplebw.pdf Binary files differindex 2857426e69..2857426e69 100644 --- a/macros/latex/contrib/euromoney/tex/2centsimplebw.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-2centsimplebw.pdf diff --git a/macros/latex/contrib/euromoney/tex/2euro.pdf b/macros/latex/contrib/euromoney/tex/euromoney-2euro.pdf Binary files differindex 02ad7cd0e5..02ad7cd0e5 100644 --- a/macros/latex/contrib/euromoney/tex/2euro.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-2euro.pdf diff --git a/macros/latex/contrib/euromoney/tex/2eurosimple.pdf b/macros/latex/contrib/euromoney/tex/euromoney-2eurosimple.pdf Binary files differindex 85ee0ccdba..85ee0ccdba 100644 --- a/macros/latex/contrib/euromoney/tex/2eurosimple.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-2eurosimple.pdf diff --git a/macros/latex/contrib/euromoney/tex/2eurosimplebw.pdf b/macros/latex/contrib/euromoney/tex/euromoney-2eurosimplebw.pdf Binary files differindex bc3d2d8447..bc3d2d8447 100644 --- a/macros/latex/contrib/euromoney/tex/2eurosimplebw.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-2eurosimplebw.pdf diff --git a/macros/latex/contrib/euromoney/tex/500euro.pdf b/macros/latex/contrib/euromoney/tex/euromoney-500euro.pdf Binary files differindex 7c2c721a4e..7c2c721a4e 100644 --- a/macros/latex/contrib/euromoney/tex/500euro.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-500euro.pdf diff --git a/macros/latex/contrib/euromoney/tex/500eurosimple.pdf b/macros/latex/contrib/euromoney/tex/euromoney-500eurosimple.pdf Binary files differindex 719d51c8e7..719d51c8e7 100644 --- a/macros/latex/contrib/euromoney/tex/500eurosimple.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-500eurosimple.pdf diff --git a/macros/latex/contrib/euromoney/tex/500eurosimplebw.pdf b/macros/latex/contrib/euromoney/tex/euromoney-500eurosimplebw.pdf Binary files differindex 0d1bba9565..0d1bba9565 100644 --- a/macros/latex/contrib/euromoney/tex/500eurosimplebw.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-500eurosimplebw.pdf diff --git a/macros/latex/contrib/euromoney/tex/50cent.pdf b/macros/latex/contrib/euromoney/tex/euromoney-50cent.pdf Binary files differindex 12d3a85bd9..12d3a85bd9 100644 --- a/macros/latex/contrib/euromoney/tex/50cent.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-50cent.pdf diff --git a/macros/latex/contrib/euromoney/tex/50centsimple.pdf b/macros/latex/contrib/euromoney/tex/euromoney-50centsimple.pdf Binary files differindex 6fee6a828a..6fee6a828a 100644 --- a/macros/latex/contrib/euromoney/tex/50centsimple.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-50centsimple.pdf diff --git a/macros/latex/contrib/euromoney/tex/50centsimplebw.pdf b/macros/latex/contrib/euromoney/tex/euromoney-50centsimplebw.pdf Binary files differindex 65776d5d24..65776d5d24 100644 --- a/macros/latex/contrib/euromoney/tex/50centsimplebw.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-50centsimplebw.pdf diff --git a/macros/latex/contrib/euromoney/tex/50euro.pdf b/macros/latex/contrib/euromoney/tex/euromoney-50euro.pdf Binary files differindex 9d26259287..9d26259287 100644 --- a/macros/latex/contrib/euromoney/tex/50euro.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-50euro.pdf diff --git a/macros/latex/contrib/euromoney/tex/50eurosimple.pdf b/macros/latex/contrib/euromoney/tex/euromoney-50eurosimple.pdf Binary files differindex 08b128d03f..08b128d03f 100644 --- a/macros/latex/contrib/euromoney/tex/50eurosimple.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-50eurosimple.pdf diff --git a/macros/latex/contrib/euromoney/tex/50eurosimplebw.pdf b/macros/latex/contrib/euromoney/tex/euromoney-50eurosimplebw.pdf Binary files differindex dc2c5acbcf..dc2c5acbcf 100644 --- a/macros/latex/contrib/euromoney/tex/50eurosimplebw.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-50eurosimplebw.pdf diff --git a/macros/latex/contrib/euromoney/tex/5cent.pdf b/macros/latex/contrib/euromoney/tex/euromoney-5cent.pdf Binary files differindex dfd4c98914..dfd4c98914 100644 --- a/macros/latex/contrib/euromoney/tex/5cent.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-5cent.pdf diff --git a/macros/latex/contrib/euromoney/tex/5centsimple.pdf b/macros/latex/contrib/euromoney/tex/euromoney-5centsimple.pdf Binary files differindex c8c4fa6daf..c8c4fa6daf 100644 --- a/macros/latex/contrib/euromoney/tex/5centsimple.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-5centsimple.pdf diff --git a/macros/latex/contrib/euromoney/tex/5centsimplebw.pdf b/macros/latex/contrib/euromoney/tex/euromoney-5centsimplebw.pdf Binary files differindex f108cf065f..f108cf065f 100644 --- a/macros/latex/contrib/euromoney/tex/5centsimplebw.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-5centsimplebw.pdf diff --git a/macros/latex/contrib/euromoney/tex/5euro.pdf b/macros/latex/contrib/euromoney/tex/euromoney-5euro.pdf Binary files differindex 9fdb0301b2..9fdb0301b2 100644 --- a/macros/latex/contrib/euromoney/tex/5euro.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-5euro.pdf diff --git a/macros/latex/contrib/euromoney/tex/5eurosimple.pdf b/macros/latex/contrib/euromoney/tex/euromoney-5eurosimple.pdf Binary files differindex 5608fd3085..5608fd3085 100644 --- a/macros/latex/contrib/euromoney/tex/5eurosimple.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-5eurosimple.pdf diff --git a/macros/latex/contrib/euromoney/tex/5eurosimplebw.pdf b/macros/latex/contrib/euromoney/tex/euromoney-5eurosimplebw.pdf Binary files differindex a670f2ac2f..a670f2ac2f 100644 --- a/macros/latex/contrib/euromoney/tex/5eurosimplebw.pdf +++ b/macros/latex/contrib/euromoney/tex/euromoney-5eurosimplebw.pdf diff --git a/macros/latex/contrib/euromoney/tex/euromoney.sty b/macros/latex/contrib/euromoney/tex/euromoney.sty index 1b7e2bc205..b49337f412 100644 --- a/macros/latex/contrib/euromoney/tex/euromoney.sty +++ b/macros/latex/contrib/euromoney/tex/euromoney.sty @@ -4,10 +4,11 @@ % pdf from domain public svg (user frankes in openclipart), see https://openclipart.org/artist/frankes \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{euromoney}[2024/09/06 0.1.0 Insert Euro coins and banknotes] -% 0.1.0 Initial version +\ProvidesPackage{euromoney}[2024/09/07 0.1.1 Insert Euro coins and banknotes] -%------Option(s) +%------History +% 0.1.1 New filenames, according to TL rules +% 0.1.0 Initial version %------Packages \RequirePackage{xstring} @@ -74,7 +75,7 @@ {full}{\def\monnaiessuffixe{}}% {nb}{\def\monnaiessuffixe{simplebw}}% }% - \includegraphics[#2]{#3euro\monnaiessuffixe}% + \includegraphics[#2]{euromoney-#3euro\monnaiessuffixe}% } \NewDocumentCommand\BilletsEuro{ O{} m }{% @@ -129,7 +130,7 @@ }% \begin{tikzpicture} \foreach \i in {1,...,\tmpnbpieces}{% - \draw (0,{(\i-1)*\tmpoffsetvmonnaies}) node[anchor=south west,inner sep=0pt] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{\monnaiessomme\monnaiessuffixe}} ;% + \draw (0,{(\i-1)*\tmpoffsetvmonnaies}) node[anchor=south west,inner sep=0pt] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}} ;% }% \end{tikzpicture}% }% @@ -170,7 +171,7 @@ \def\monnaiesechellerelative{1}% }% \foreach \ii in {1,...,\tmpnbpieces}{% - \draw ({(\i-1)*\tmpoffsethmonnaies},{(\ii-1)*\tmpoffsetvmonnaies}) node[anchor=south west,inner sep=0pt] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{\monnaiessomme\monnaiessuffixe}} ;% + \draw ({(\i-1)*\tmpoffsethmonnaies},{(\ii-1)*\tmpoffsetvmonnaies}) node[anchor=south west,inner sep=0pt] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}} ;% }% }% \end{tikzpicture}% @@ -218,7 +219,7 @@ {% \def\monnaiesechellerelative{1}% }% - \draw ({-\i*\tmpoffsethmonnaies},{-\i*\tmpoffsetvmonnaies}) node[above right=0pt,inner sep=0pt,outer sep=0pt,rotate={\fpeval{90-0.5*\piecebilletrotation*\nbeventailbillets+(\i-1)*\piecebilletrotation}}] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{\monnaiessomme\monnaiessuffixe}} ;% + \draw ({-\i*\tmpoffsethmonnaies},{-\i*\tmpoffsetvmonnaies}) node[above right=0pt,inner sep=0pt,outer sep=0pt,rotate={\fpeval{90-0.5*\piecebilletrotation*\nbeventailbillets+(\i-1)*\piecebilletrotation}}] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}} ;% }% \end{tikzpicture}% }% @@ -289,7 +290,7 @@ }% \begin{tikzpicture} \foreach \i in {1,...,\tmpnbpieces}{% - \draw (0,{(\i-1)*\tmpoffsetvmonnaies}) node[anchor=south west,inner sep=0pt] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{\monnaiessomme\monnaiessuffixe}} ;% + \draw (0,{(\i-1)*\tmpoffsetvmonnaies}) node[anchor=south west,inner sep=0pt] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}} ;% }% \end{tikzpicture}% }% @@ -330,7 +331,7 @@ \def\monnaiesechellerelative{1}% }% \foreach \ii in {1,...,\tmpnbpieces}{% - \draw ({(\i-1)*\tmpoffsethmonnaies},{(\ii-1)*\tmpoffsetvmonnaies}) node[anchor=south west,inner sep=0pt] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{\monnaiessomme\monnaiessuffixe}} ;% + \draw ({(\i-1)*\tmpoffsethmonnaies},{(\ii-1)*\tmpoffsetvmonnaies}) node[anchor=south west,inner sep=0pt] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}} ;% }% }% \end{tikzpicture}% @@ -378,7 +379,7 @@ {% \def\monnaiesechellerelative{1}% }% - \draw ({-\i*\tmpoffsethmonnaies},{-\i*\tmpoffsetvmonnaies}) node[above right=0pt,inner sep=0pt,outer sep=0pt,rotate={\fpeval{90-0.5*\piecebilletrotation*\nbeventailbillets+(\i-1)*\piecebilletrotation}}] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{\monnaiessomme\monnaiessuffixe}} ;% + \draw ({-\i*\tmpoffsethmonnaies},{-\i*\tmpoffsetvmonnaies}) node[above right=0pt,inner sep=0pt,outer sep=0pt,rotate={\fpeval{90-0.5*\piecebilletrotation*\nbeventailbillets+(\i-1)*\piecebilletrotation}}] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}} ;% }% \end{tikzpicture}% }% @@ -439,16 +440,16 @@ {% \IfSubStr{\tmpempilpieces}{*}% {% - \includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{\monnaiessomme\monnaiessuffixe}% + \includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}% \ifnum\tmpnbpieces=1\else% \foreach \i in {1,...,\inteval{\tmpnbpieces-1}}{% \ifdim\tmpoffsethmonnaies>0pt\relax\hspace*{\dimexpr\tmpoffsethmonnaies-\monnaiesechellerelative\tmphautmonnaies\relax}\fi% - \includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{\monnaiessomme\monnaiessuffixe}% + \includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}% }% \fi% }% {% - \includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{\monnaiessomme\monnaiessuffixe}% + \includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}% }% \ifnum\i<\listetmppieceslen% \ifdim\tmpoffsethmonnaies>0pt\relax\hspace*{\dimexpr\tmpoffsethmonnaies-\monnaiesechellerelative\tmphautmonnaies\relax}% @@ -458,7 +459,7 @@ {% \begin{tikzpicture} \foreach \i in {1,...,\tmpnbpieces}{% - \draw (0,{(\i-1)*\tmpoffsetvmonnaies}) node[inner sep=0pt] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{\monnaiessomme\monnaiessuffixe}} ;% + \draw (0,{(\i-1)*\tmpoffsetvmonnaies}) node[inner sep=0pt] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}} ;% }% \end{tikzpicture}% }% @@ -519,16 +520,16 @@ {% \IfSubStr{\tmpempilpieces}{*}% {% - \includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{\monnaiessomme\monnaiessuffixe}% + \includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}% \ifnum\tmpnbpieces=1\else% \foreach \i in {1,...,\inteval{\tmpnbpieces-1}}{% \ifdim\tmpoffsethmonnaies>0pt\relax\hspace*{\dimexpr\tmpoffsethmonnaies-\monnaiesechellerelative\tmphautmonnaies\relax}\fi% - \includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{\monnaiessomme\monnaiessuffixe}% + \includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}% }% \fi% }% {% - \includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{\monnaiessomme\monnaiessuffixe}% + \includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}% }% \ifnum\i<\listetmppieceslen% \ifdim\tmpoffsethmonnaies>0pt\relax\hspace*{\dimexpr\tmpoffsethmonnaies-\monnaiesechellerelative\tmphautmonnaies\relax}% @@ -538,7 +539,7 @@ {% \begin{tikzpicture} \foreach \i in {1,...,\tmpnbpieces}{% - \draw (0,{(\i-1)*\tmpoffsetvmonnaies}) node[inner sep=0pt] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{\monnaiessomme\monnaiessuffixe}} ;% + \draw (0,{(\i-1)*\tmpoffsetvmonnaies}) node[inner sep=0pt] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}} ;% }% \end{tikzpicture}% }% diff --git a/macros/latex/contrib/fontscale/CHANGELOG.md b/macros/latex/contrib/fontscale/CHANGELOG.md index cb259caa49..3fe4bd247d 100644 --- a/macros/latex/contrib/fontscale/CHANGELOG.md +++ b/macros/latex/contrib/fontscale/CHANGELOG.md @@ -7,6 +7,12 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v2.3.0] - 2024-09-06 + +### Changed +- The package commands no longer check if the font baselineskip is less than + the font size. + ## [v2.2.0] - 2024-08-29 ### Changed diff --git a/macros/latex/contrib/fontscale/beery.cls b/macros/latex/contrib/fontscale/beery.cls index 306ac43588..bd50fc9435 100644 --- a/macros/latex/contrib/fontscale/beery.cls +++ b/macros/latex/contrib/fontscale/beery.cls @@ -4,7 +4,7 @@ \NeedsTeXFormat{LaTeX2e}[2023-11-01] \ProvidesExplClass {beery} - {2024-08-29} + {2024-09-06} {} {} diff --git a/macros/latex/contrib/fontscale/fontscale-table-classic.tex b/macros/latex/contrib/fontscale/fontscale-table-classic.tex index 5f3c727459..3f1b94efa5 100644 --- a/macros/latex/contrib/fontscale/fontscale-table-classic.tex +++ b/macros/latex/contrib/fontscale/fontscale-table-classic.tex @@ -1,6 +1,6 @@ \ProvidesFile {fontscale-table-classic.tex} - [2024-08-29] + [2024-09-06] \begin{table} \centering diff --git a/macros/latex/contrib/fontscale/fontscale-table-font-steps.tex b/macros/latex/contrib/fontscale/fontscale-table-font-steps.tex index 520a681587..eb59309c25 100644 --- a/macros/latex/contrib/fontscale/fontscale-table-font-steps.tex +++ b/macros/latex/contrib/fontscale/fontscale-table-font-steps.tex @@ -1,6 +1,6 @@ \ProvidesFile {fontscale-table-font-steps.tex} - [2024-08-29] + [2024-09-06] \begin{table} \centering diff --git a/macros/latex/contrib/fontscale/fontscale-table-musical.tex b/macros/latex/contrib/fontscale/fontscale-table-musical.tex index 67709ef955..b117653e1f 100644 --- a/macros/latex/contrib/fontscale/fontscale-table-musical.tex +++ b/macros/latex/contrib/fontscale/fontscale-table-musical.tex @@ -1,6 +1,6 @@ \ProvidesFile {fontscale-table-musical.tex} - [2024-08-29] + [2024-09-06] \begin{table} \centering diff --git a/macros/latex/contrib/fontscale/fontscale.pdf b/macros/latex/contrib/fontscale/fontscale.pdf Binary files differindex 6e16d79ccf..34acc01d03 100644 --- a/macros/latex/contrib/fontscale/fontscale.pdf +++ b/macros/latex/contrib/fontscale/fontscale.pdf diff --git a/macros/latex/contrib/fontscale/fontscale.sty b/macros/latex/contrib/fontscale/fontscale.sty index 81a3a828b8..c9356b566c 100644 --- a/macros/latex/contrib/fontscale/fontscale.sty +++ b/macros/latex/contrib/fontscale/fontscale.sty @@ -8,8 +8,8 @@ \NeedsTeXFormat{LaTeX2e}[2023-11-01] \ProvidesExplPackage {fontscale} - {2024-08-29} - {2.2.0} + {2024-09-06} + {2.3.0} {A flexible interface for setting font sizes} % l3kernel version 2023-10-10 added many 'e'-variants. @@ -125,7 +125,6 @@ % SOME FUNCTIONS % Variants of l3kernel functions -\cs_generate_variant:Nn \msg_error:nnnnn { nnVV , nnvv } \cs_generate_variant:Nn \msg_error:nnnn { nnv , nne } % Sets a dimen/skip variable from a dimen/skip expression, appending a default % unit of pt. This also removes extra tokens. @@ -161,7 +160,8 @@ % (1) Takes dimen and skip expressions as arguments. % (2) Avoids the issue where \f@size is set to the new font size before the % second argument is expanded. -% (3) Provides error checking for the font size and font baselineskip. +% (3) Issues a user-friendly error message if the font size is not a positive +% length. \dim_new:N \l__fontscale_fontsize_dim \skip_new:N \l__fontscale_fontsize_skip \cs_new_protected:Npn \__fontscale_fontsize:nn #1#2 @@ -170,16 +170,8 @@ \__fontscale_skip_set_default_pt:Nn \l__fontscale_fontsize_skip {#2} \dim_compare:nNnTF \l__fontscale_fontsize_dim > \c_zero_dim { - \dim_compare:nNnTF \l__fontscale_fontsize_skip < - \l__fontscale_fontsize_dim - { - \msg_error:nnVV { fontscale } { font-baselineskip-out-of-bounds } - \l__fontscale_fontsize_skip \l__fontscale_fontsize_dim - } - { - \fontsize \l__fontscale_fontsize_dim \l__fontscale_fontsize_skip - \selectfont - } + \fontsize \l__fontscale_fontsize_dim \l__fontscale_fontsize_skip + \selectfont } { \msg_error:nnV { fontscale } { font-size-out-of-bounds } @@ -211,12 +203,6 @@ % MESSAGES -\msg_new:nnn { fontscale } { key-baselineskip-size-ratio-out-of-bounds } - { - Invalid~ value~ '#1'~ \msg_line_context:. \\ - The~ value~ of~ the~ key~ 'baselineskip-size-ratio'~ - must~ be~ at~ least~ 1. - } \msg_new:nnn { fontscale } { key-musical-base-out-of-bounds } { Invalid~ value~ '#1'~ \msg_line_context:. \\ @@ -252,26 +238,19 @@ The~ font~ size~ set~ by~ the~ key~ '#1 / scale'~ has~ been~ overwritten~ by~ the~ key~ '#1 / size'~ \msg_line_context:. } -\msg_new:nnn { fontscale } { key-font-baselineskip-out-of-bounds } - { - Invalid~ value~ '#1'~ \msg_line_context:. \\ - The~ value~ of~ the~ key~ '#3 / baselineskip'~ - must~ be~ greater~ than~ or~ equal~ to~ - the~ font~ size~ of~ \iow_char:N \\#3~ '#2'. - } \msg_new:nnn { fontscale } { key-font-sizes-out-of-order } { The~ font~ sizes~ are~ not~ in~ the~ correct~ order~ \msg_line_context:. \\ - The~ lengths~ of~ the~ font~ sizes~ should~ be~ ordered~ from~ - \iow_char:N \\tiny~ to~ \iow_char:N \\Huge. + The~ lengths~ of~ the~ font~ sizes~ + should~ be~ ordered~ from~ \iow_char:N \\tiny~ to~ \iow_char:N \\Huge. } \msg_new:nnn { fontscale } { key-font-baselineskips-out-of-order } { The~ font~ baselineskips~ are~ not~ in~ the~ correct~ order~ \msg_line_context:. \\ - The~ lengths~ of~ the~ font~ baselineskips~ should~ be~ ordered~ from~ - \iow_char:N \\tiny~ to~ \iow_char:N \\Huge. + The~ lengths~ of~ the~ font~ baselineskips~ + should~ be~ ordered~ from~ \iow_char:N \\tiny~ to~ \iow_char:N \\Huge. } \msg_new:nnn { fontscale } { math-mode-warning } @@ -280,11 +259,6 @@ { '#1'~ cannot~ be~ used~ in~ math~ mode~ \msg_line_context:. } \msg_new:nnn { fontscale } { font-size-out-of-bounds } { The~ font~ size~ '#1'~ must~ be~ a~ positive~ length~ \msg_line_context:. } -\msg_new:nnn { fontscale } { font-baselineskip-out-of-bounds } - { - The~ font~ baselineskip~ '#1'~ must~ be~ greater~ than~ or~ equal~ to~ - the~ font~ size~ '#2'~ \msg_line_context:. - } \msg_new:nnn { fontscale } { font-step-out-of-bounds } { Invalid~ font~ step~ '#1'~ \msg_line_context:. \\ @@ -569,13 +543,6 @@ } \cs_new_protected:Npn \__fontscale_keys_process_start: { - \fp_compare:nNnT \l__fontscale_baselineskip_size_ratio_fp < \c_one_fp - { - \msg_error:nne { fontscale } - { key-baselineskip-size-ratio-out-of-bounds } - { \fp_use:N \l__fontscale_baselineskip_size_ratio_fp } - \prg_break: - } \dim_compare:nNnF \l__fontscale_musical_base_dim > \c_zero_dim { \msg_error:nnV { fontscale } { key-musical-base-out-of-bounds } @@ -638,15 +605,6 @@ \__fontscale_skip_set_default_pt:Nn \l_fontscale_normalsize_baselineskip_skip { \l__fontscale_normalsize_baselineskip_tl } - \dim_compare:nNnT \l_fontscale_normalsize_baselineskip_skip < - \l_fontscale_normalsize_size_dim - { - \msg_error:nnVVn { fontscale } - { key-font-baselineskip-out-of-bounds } - \l_fontscale_normalsize_baselineskip_skip - \l_fontscale_normalsize_size_dim { normalsize } - \prg_break: - } } } % Auxiliary functions that expand to the font size depending on the name of the @@ -806,18 +764,6 @@ \__fontscale_skip_set_default_pt:cn { l_fontscale_#1_baselineskip_skip } { \use:c { l__fontscale_#1_baselineskip_tl } } - \dim_compare:nNnT { \use:c { l_fontscale_#1_baselineskip_skip } } < - { \use:c { l_fontscale_#1_size_dim } } - { - \tl_map_break:n - { - \msg_error:nnvvn { fontscale } - { key-font-baselineskip-out-of-bounds } - { l_fontscale_#1_baselineskip_skip } - { l_fontscale_#1_size_dim } {#1} - \prg_break: - } - } } } % Issues a warning if the font sizes or font baselineskips are not in the @@ -1186,65 +1132,20 @@ } \cs_new_protected:Npn \__fontscale_print_all_font_size_parameters: { - \token_to_str:N \tiny \c_colon_str \c_space_tl - step ~=~ -4 ,~ - scale ~=~ \fp_use:N \l_fontscale_tiny_scale_fp ,~ - size ~=~ \dim_use:N \l_fontscale_tiny_size_dim ,~ - baselineskip ~=~ \skip_use:N \l_fontscale_tiny_baselineskip_skip - \newline - \token_to_str:N \scriptsize \c_colon_str \c_space_tl - step ~=~ -3 ,~ - scale ~=~ \fp_use:N \l_fontscale_scriptsize_scale_fp ,~ - size ~=~ \dim_use:N \l_fontscale_scriptsize_size_dim ,~ - baselineskip ~=~ \skip_use:N \l_fontscale_scriptsize_baselineskip_skip - \newline - \token_to_str:N \footnotesize \c_colon_str \c_space_tl - step ~=~ -2 ,~ - scale ~=~ \fp_use:N \l_fontscale_footnotesize_scale_fp ,~ - size ~=~ \dim_use:N \l_fontscale_footnotesize_size_dim ,~ - baselineskip ~=~ \skip_use:N \l_fontscale_footnotesize_baselineskip_skip - \newline - \token_to_str:N \small \c_colon_str \c_space_tl - step ~=~ -1 ,~ - scale ~=~ \fp_use:N \l_fontscale_small_scale_fp ,~ - size ~=~ \dim_use:N \l_fontscale_small_size_dim ,~ - baselineskip ~=~ \skip_use:N \l_fontscale_small_baselineskip_skip - \newline - \token_to_str:N \normalsize \c_colon_str \c_space_tl - step ~=~ 0 ,~ - scale ~=~ 1 ,~ - size ~=~ \dim_use:N \l_fontscale_normalsize_size_dim ,~ - baselineskip ~=~ \skip_use:N \l_fontscale_normalsize_baselineskip_skip - \newline - \token_to_str:N \large \c_colon_str \c_space_tl - step ~=~ 1 ,~ - scale ~=~ \fp_use:N \l_fontscale_large_scale_fp ,~ - size ~=~ \dim_use:N \l_fontscale_large_size_dim ,~ - baselineskip ~=~ \skip_use:N \l_fontscale_large_baselineskip_skip - \newline - \token_to_str:N \Large \c_colon_str \c_space_tl - step ~=~ 2 ,~ - scale ~=~ \fp_use:N \l_fontscale_Large_scale_fp ,~ - size ~=~ \dim_use:N \l_fontscale_Large_size_dim ,~ - baselineskip ~=~ \skip_use:N \l_fontscale_Large_baselineskip_skip - \newline - \token_to_str:N \LARGE \@ \c_colon_str \c_space_tl - step ~=~ 3 ,~ - scale ~=~ \fp_use:N \l_fontscale_LARGE_scale_fp ,~ - size ~=~ \dim_use:N \l_fontscale_LARGE_size_dim ,~ - baselineskip ~=~ \skip_use:N \l_fontscale_LARGE_baselineskip_skip - \newline - \token_to_str:N \huge \c_colon_str \c_space_tl - step ~=~ 4 ,~ - scale ~=~ \fp_use:N \l_fontscale_huge_scale_fp ,~ - size ~=~ \dim_use:N \l_fontscale_huge_size_dim ,~ - baselineskip ~=~ \skip_use:N \l_fontscale_huge_baselineskip_skip - \newline - \token_to_str:N \Huge \c_colon_str \c_space_tl - step ~=~ 5 ,~ - scale ~=~ \fp_use:N \l_fontscale_Huge_scale_fp ,~ - size ~=~ \dim_use:N \l_fontscale_Huge_size_dim ,~ - baselineskip ~=~ \skip_use:N \l_fontscale_Huge_baselineskip_skip + \tl_map_inline:nn + { + {tiny} {scriptsize} {footnotesize} {small} {normalsize} + {large} {Large} {LARGE} {huge} {Huge} + } + { + \token_to_str:c {##1} \@ \c_colon_str \c_space_tl + step ~=~ \fp_use:c { c_fontscale_##1_step_fp } ,~ + scale ~=~ \str_if_eq:nnTF {##1} { normalsize } + { 1 } { \fp_use:c { l_fontscale_##1_scale_fp } } ,~ + size ~=~ \dim_use:c { l_fontscale_##1_size_dim } ,~ + baselineskip ~=~ \skip_use:c { l_fontscale_##1_baselineskip_skip } + \str_if_eq:nnF {##1} { Huge } { \newline } + } } \NewDocumentCommand \PrintSampleText { s +m } @@ -1255,36 +1156,30 @@ { \token_to_str:N \PrintSampleText } } { - \IfBooleanTF #1 - { \__fontscale_print_sample_text_descending_order:n {#2} } - { \__fontscale_print_sample_text_ascending_order:n {#2} } + \group_begin: + \IfBooleanTF #1 + { \__fontscale_print_sample_text_descending_order:n {#2} } + { \__fontscale_print_sample_text_ascending_order:n {#2} } + \group_end: } } \cs_new_protected:Npn \__fontscale_print_sample_text_ascending_order:n #1 { - { \tiny #1 \par } - { \scriptsize #1 \par } - { \footnotesize #1 \par } - { \small #1 \par } - { \normalsize #1 \par } - { \large #1 \par } - { \Large #1 \par } - { \LARGE #1 \par } - { \huge #1 \par } - { \Huge #1 \par } + \tl_map_inline:nn + { + \tiny \scriptsize \footnotesize \small \normalsize + \large \Large \LARGE \huge \Huge + } + { ##1 #1 \par } } \cs_new_protected:Npn \__fontscale_print_sample_text_descending_order:n #1 { - { \Huge #1 \par } - { \huge #1 \par } - { \LARGE #1 \par } - { \Large #1 \par } - { \large #1 \par } - { \normalsize #1 \par } - { \small #1 \par } - { \footnotesize #1 \par } - { \scriptsize #1 \par } - { \tiny #1 \par } + \tl_map_inline:nn + { + \Huge \huge \LARGE \Large \large + \normalsize \small \footnotesize \scriptsize \tiny + } + { ##1 #1 \par } } \NewDocumentCommand \PrintFontSizeCommand { } diff --git a/macros/latex/contrib/fontscale/fontscale.tex b/macros/latex/contrib/fontscale/fontscale.tex index 84cd85c859..bba06bfa20 100644 --- a/macros/latex/contrib/fontscale/fontscale.tex +++ b/macros/latex/contrib/fontscale/fontscale.tex @@ -14,7 +14,7 @@ A flexible interface for setting font sizes Oliver Beery -Version 2.2.0\quad{}29 August 2024 +Version 2.3.0\quad{}6 September 2024 \section{Introduction} @@ -131,8 +131,6 @@ Sets the font size of each font size command from \cs{tiny} to \cs{Huge} using a These are common methods of choosing a set of document font sizes. The keys \Key{classic\-/10pt}, \Key{classic\-/11pt}, \Key{classic\-/12pt}, and \Key{musical} set the key \Key{typographic\-/scale} to the corresponding value. -\input{./fontscale-table-classic.tex} - The classic typographic scale consists of the traditional font sizes \numlist{6;7;8;9;10;11;12;14;16;18;21;24;36;48;60;72}.% \footnote{See \S3.1 of \textit{The Elements of Typographic Style} by Robert Bringhurst.} @@ -142,6 +140,8 @@ The named point size\---\qtylist[list-final-separator={, or }]{10;11;12}{pt}\--- The font sizes of the other font size commands are the adjacent font sizes in the classic typographic scale. Table~\ref{table:classic} displays the font size of each font size command when using a classic typographic scale. +\input{./fontscale-table-classic.tex} + \Key{musical/base}[\meta{dimen expression}][10pt]% \nopagebreak\newline \Key{musical/ratio}[\meta{floating point expression}][2]% @@ -182,7 +182,6 @@ The font baselineskips of the font size commands from \cs{tiny} to \cs{Huge} are Sets the font baselineskip of each font size command from \cs{tiny} to \cs{Huge} equal to its font size \texttimes{} the result of computing the \meta{floating point expression}. Sets the font baselineskip set by \cs{SetFontStep}, \cs{SetFontScale}, and \cs{SetFontSize} (\S\ref{subsec:fontsize}) equal to the new font size \texttimes{} the result of computing the \meta{floating point expression}. -The value of this key must be at least \num{1}. \subsection{Overwriting the previous keys} @@ -210,7 +209,6 @@ Overwrites the font size set by the keys \Key{typographic\-/scale} and \Key{\met \KeepNextPar* Sets the font baselineskip of \meta{font size command} to the value of \meta{skip expression}, appending a default unit of \unit{pt}. -The font baselineskip must be greater than or equal to the font size. Overwrites the font baselineskip set by the key \Key{baselineskip\-/size\-/ratio}. \Key{\meta{font size command}}[\meta{dimen expression}] @@ -327,7 +325,6 @@ Does nothing, except issue a warning, if used in math mode. Sets the font size to the value of \meta{dimen expression}, appending a default unit of \unit{pt}. Sets the font baselineskip to the value of \meta{skip expression}, appending a default unit of \unit{pt}. -The font baselineskip must be greater than or equal to the font size. Does nothing, except issue a warning, if used in math mode. Can be used as an alternative to \cs{fontsize} + \cs{selectfont} as discussed in \S\ref{subsec:expandable}. @@ -339,7 +336,6 @@ Can be used as an alternative to \cs{fontsize} + \cs{selectfont} as discussed in Sets the font baselineskip to the value of \meta{skip expression}, appending a default unit of \unit{pt}. Adding the optional star instead increases the current font baselineskip by the result of \meta{skip expression}, appending a default unit of \unit{pt}. -The font baselineskip must be greater than or equal to the font size. Does not change the font size. Does nothing, except issue a warning, if used in math mode. |