From e5de743200b560ef022e6fb4b6c183179088e3da Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 23 Jul 2020 21:25:07 +0000 Subject: fontaxes (23jul20) git-svn-id: svn://tug.org/texlive/trunk@55917 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/fontaxes/fontaxes.dtx | 19 ++++++++++++------- Master/texmf-dist/source/latex/fontaxes/fontaxes.ins | 4 ++-- 2 files changed, 14 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/source/latex/fontaxes') 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 +% Copyright (c) 2020 by Michael Ummels % % 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] % %\NeedsTeXFormat{LaTeX2e} -%\ProvidesPackage{fontaxes}[2014/03/23 v1.0d Font selection axes] +%\ProvidesPackage{fontaxes}[2020/07/21 v1.0e Font selection axes] %<*driver> \documentclass{ltxdoc} @@ -57,7 +57,7 @@ % %\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 +% Copyright (c) 2020 by Michael Ummels % % 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 +Copyright (c) 2020 by Michael Ummels This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c -- cgit v1.2.3