summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-07-23 21:25:07 +0000
committerKarl Berry <karl@freefriends.org>2020-07-23 21:25:07 +0000
commite5de743200b560ef022e6fb4b6c183179088e3da (patch)
tree44f40c3991350aaae4b8e9e5294804b7aa111df7
parent34970438942b4448ada18729aebc620ceed2523d (diff)
fontaxes (23jul20)
git-svn-id: svn://tug.org/texlive/trunk@55917 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/fontaxes/fontaxes.pdfbin116269 -> 126590 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontaxes/test-fontaxes.tex2
-rw-r--r--Master/texmf-dist/source/latex/fontaxes/fontaxes.dtx19
-rw-r--r--Master/texmf-dist/source/latex/fontaxes/fontaxes.ins4
-rw-r--r--Master/texmf-dist/tex/latex/fontaxes/fontaxes.sty14
5 files changed, 24 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/latex/fontaxes/fontaxes.pdf b/Master/texmf-dist/doc/latex/fontaxes/fontaxes.pdf
index d45cb172858..fb24df8f907 100644
--- a/Master/texmf-dist/doc/latex/fontaxes/fontaxes.pdf
+++ b/Master/texmf-dist/doc/latex/fontaxes/fontaxes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontaxes/test-fontaxes.tex b/Master/texmf-dist/doc/latex/fontaxes/test-fontaxes.tex
index c60471e2816..8f974f210ac 100644
--- a/Master/texmf-dist/doc/latex/fontaxes/test-fontaxes.tex
+++ b/Master/texmf-dist/doc/latex/fontaxes/test-fontaxes.tex
@@ -7,7 +7,7 @@
%% fontaxes.dtx (with options: `test')
%%
%% Copyright (c) 2007 by Andreas Buehmann
-%% Copyright (c) 2014 by Michael Ummels <michael.ummels@rwth-aachen.de>
+%% Copyright (c) 2020 by Michael Ummels <michael.ummels@rwth-aachen.de>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/source/latex/fontaxes/fontaxes.dtx b/Master/texmf-dist/source/latex/fontaxes/fontaxes.dtx
index d39353339f7..232ff98a775 100644
--- a/Master/texmf-dist/source/latex/fontaxes/fontaxes.dtx
+++ b/Master/texmf-dist/source/latex/fontaxes/fontaxes.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
% Copyright (c) 2007 by Andreas B\"uhmann
-% Copyright (c) 2014 by Michael Ummels <michael.ummels@rwth-aachen.de>
+% Copyright (c) 2020 by Michael Ummels <michael.ummels@rwth-aachen.de>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -22,10 +22,10 @@
%
%\iffalse
%<*driver>
-\ProvidesFile{fontaxes.dtx}[2014/03/23 v1.0d Font selection axes]
+\ProvidesFile{fontaxes.dtx}[2020/07/21 v1.0e Font selection axes]
%</driver>
%<package>\NeedsTeXFormat{LaTeX2e}
-%<package>\ProvidesPackage{fontaxes}[2014/03/23 v1.0d Font selection axes]
+%<package>\ProvidesPackage{fontaxes}[2020/07/21 v1.0e Font selection axes]
%<*driver>
\documentclass{ltxdoc}
@@ -57,7 +57,7 @@
%</driver>
%\fi
%
-% \CheckSum{738}
+% \CheckSum{746}
% \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
% Lower-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
@@ -701,17 +701,22 @@
}
% \end{macrocode}
% Try different naming conventions.
+% \changes{v1.0e}{2020/07/21}{Add another fallback for fonts with only one figure version}
% \begin{macrocode}
\newcommand*\fontaxes@encode@family@default{%
\fontaxes@encode@figures
\edef\fontaxes@code{\fontaxes@family@base-\fontaxes@code}%
\fontaxes@check@family\fontaxes@code
\iffontaxes@exists\else
- \fontaxes@encode@figuresalt
- \edef\fontaxes@code{\fontaxes@family@base\fontaxes@code}%
+ \edef\fontaxes@code{\fontaxes@family@base-LF}%
\fontaxes@check@family\fontaxes@code
\iffontaxes@exists\else
- \edef\fontaxes@code{\fontaxes@family@base}%
+ \fontaxes@encode@figuresalt
+ \edef\fontaxes@code{\fontaxes@family@base\fontaxes@code}%
+ \fontaxes@check@family\fontaxes@code
+ \iffontaxes@exists\else
+ \edef\fontaxes@code{\fontaxes@family@base}%
+ \fi
\fi
\fi
}
diff --git a/Master/texmf-dist/source/latex/fontaxes/fontaxes.ins b/Master/texmf-dist/source/latex/fontaxes/fontaxes.ins
index c6ff8090ed2..69ad880bedf 100644
--- a/Master/texmf-dist/source/latex/fontaxes/fontaxes.ins
+++ b/Master/texmf-dist/source/latex/fontaxes/fontaxes.ins
@@ -1,6 +1,6 @@
%
% Copyright (c) 2007 by Andreas B\"uhmann
-% Copyright (c) 2014 by Michael Ummels <michael.ummels@rwth-aachen.de>
+% Copyright (c) 2020 by Michael Ummels <michael.ummels@rwth-aachen.de>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -23,7 +23,7 @@
\preamble
Copyright (c) 2007 by Andreas Buehmann
-Copyright (c) 2014 by Michael Ummels <michael.ummels@rwth-aachen.de>
+Copyright (c) 2020 by Michael Ummels <michael.ummels@rwth-aachen.de>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/latex/fontaxes/fontaxes.sty b/Master/texmf-dist/tex/latex/fontaxes/fontaxes.sty
index 3c63efb5a1b..d6df209f345 100644
--- a/Master/texmf-dist/tex/latex/fontaxes/fontaxes.sty
+++ b/Master/texmf-dist/tex/latex/fontaxes/fontaxes.sty
@@ -7,7 +7,7 @@
%% fontaxes.dtx (with options: `package')
%%
%% Copyright (c) 2007 by Andreas Buehmann
-%% Copyright (c) 2014 by Michael Ummels <michael.ummels@rwth-aachen.de>
+%% Copyright (c) 2020 by Michael Ummels <michael.ummels@rwth-aachen.de>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -25,7 +25,7 @@
%% the derived files fontaxes.sty, test-fontaxes.tex and fontaxes.pdf.
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fontaxes}[2014/03/23 v1.0d Font selection axes]
+\ProvidesPackage{fontaxes}[2020/07/21 v1.0e Font selection axes]
\DeclareRobustCommand\upshape{\not@math@alphabet\upshape\relax
\fontprimaryshape\updefault\selectfont}
\DeclareRobustCommand\itshape{\not@math@alphabet\itshape\mathit
@@ -206,11 +206,15 @@
\edef\fontaxes@code{\fontaxes@family@base-\fontaxes@code}%
\fontaxes@check@family\fontaxes@code
\iffontaxes@exists\else
- \fontaxes@encode@figuresalt
- \edef\fontaxes@code{\fontaxes@family@base\fontaxes@code}%
+ \edef\fontaxes@code{\fontaxes@family@base-LF}%
\fontaxes@check@family\fontaxes@code
\iffontaxes@exists\else
- \edef\fontaxes@code{\fontaxes@family@base}%
+ \fontaxes@encode@figuresalt
+ \edef\fontaxes@code{\fontaxes@family@base\fontaxes@code}%
+ \fontaxes@check@family\fontaxes@code
+ \iffontaxes@exists\else
+ \edef\fontaxes@code{\fontaxes@family@base}%
+ \fi
\fi
\fi
}