4 files changed, 14 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/latex/addfont/README b/Master/texmf-dist/doc/latex/addfont/README
index 096f6f493f5..d8b3329ba0e 100644
--- a/Master/texmf-dist/doc/latex/addfont/README
+++ b/Master/texmf-dist/doc/latex/addfont/README
@@ -1,4 +1,6 @@
-addfont is copyright 2016 (c) Palle Jørgensen.
+addfont is copyright 2016-21 (c) Palle Jørgensen.
+
+Version 1.1-
 
 addfont is intended for use by users who know about fonts. It is a
 quick-fix for fonts which does not have genuine LaTeX support. It is
@@ -9,4 +11,5 @@ It is meant as something more useable for LaTeX users than the
 usual LaTeX size selection. Using this package still requires some
 knowledge on how to use fonts with LaTeX.
 
-The license of addfont is GNU General Public License, version 3.
+The license of addfont is GNU General Public License, version 3 or
+later.
diff --git a/Master/texmf-dist/doc/latex/addfont/addfont.pdf b/Master/texmf-dist/doc/latex/addfont/addfont.pdf
index 406e57f5254..72497178015 100644
--- a/Master/texmf-dist/doc/latex/addfont/addfont.pdf
+++ b/Master/texmf-dist/doc/latex/addfont/addfont.pdf
diff --git a/Master/texmf-dist/doc/latex/addfont/addfont.tex b/Master/texmf-dist/doc/latex/addfont/addfont.tex
index 4c8395418af..ac8c916ab9b 100644
--- a/Master/texmf-dist/doc/latex/addfont/addfont.tex
+++ b/Master/texmf-dist/doc/latex/addfont/addfont.tex
@@ -1,11 +1,11 @@
-% Copyright 2016 (c) Palle Joergensen
+% Copyright 2016-21 (c) Palle Joergensen
 %
 % This file is part of addfont.
 
 % addfont is free software: you can redistribute it and/or modify it
 % under the terms of the GNU General Public License as published by
 % the Free Software Foundation, either version 3 of the License, or
-% (at your option) any later version.
+% (at your option) any later version
 
 % addfont is distributed in the hope that it will be useful, but
 % WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,6 +26,7 @@
 \lstset{language={[latex]tex},frame=single,morekeywords={addfont,addshape,*}}
 \addfont[1.2][\hyphenchar\font-1]{OT1}{cmtt5}{\cmtt}
 \addfont{OT1}{cmr5}{\cmr} \addshape{m}{it}{cmti5}
+\date{Version 1.1, \today}
 
 \begin{document}
 \maketitle
@@ -171,7 +172,7 @@ it does not provide all the features of \LaTeX\ font selection.
 \label{sec:license}
 
 \texttt{addfont} i copyright \textcopyright\ Palle Jørgensen,
-\the\year.
+2016-21
 
 \texttt{addfont} is free software: you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
diff --git a/Master/texmf-dist/tex/latex/addfont/addfont.sty b/Master/texmf-dist/tex/latex/addfont/addfont.sty
index 7b25c71c694..74d6bf63a40 100644
--- a/Master/texmf-dist/tex/latex/addfont/addfont.sty
+++ b/Master/texmf-dist/tex/latex/addfont/addfont.sty
@@ -1,4 +1,4 @@
-% Copyright 2016 (c) Palle Joergensen
+% Copyright 2016-21 (c) Palle Joergensen
 %
 % This file is part of addfont.
 %
@@ -15,21 +15,21 @@
 % You should have received a copy of the GNU General Public License
 % along with addfont. If not, see <http://www.gnu.org/licenses/>.
 \ProvidesPackage{addfont}%
-  [2016/09/01 v1.0 Easier usage of fonts without LaTeX support.]
+  [2021/03/20 v. 1.1 Easier usage of fonts without LaTeX support.]
 \newif\ifaddfont@fixed
 \addfont@fixedtrue
 \RequirePackage{twoopt}
 \RequirePackage{ifthen}
-\newcommandtwoopt*\addfont@all[5][][]{% scale, sel-cmd, enc, font, cmd
+\newcommandtwoopt*\addfont@all[5][][]{% #1:scale, #2:sel-cmd, #3:enc, #4:family/font, #5:cmd
   \addfont@fixedfalse
   \def\addfont@latestencoding{#3}%
   \def\addfont@latestfamily{#4}%
   \ifthenelse{\equal{#1}{\@empty}}{\let\addfont@latestscale\@empty}{\def\addfont@latestscale{s*[#1]}}
   \DeclareFontFamily{#3}{#4}{#2}%
-  \DeclareFontShape{#3}{#4}{m}{n}{<->#3}{}%
+  \DeclareFontShape{#3}{#4}{m}{n}{<->#4}{}%
   \def#5{\fontencoding{#3}\fontfamily{#4}\mdseries\upshape}}
 
-\newcommandtwoopt*\addfont@fixed[5][][]{% scale, sel-cmd, enc, font, cmd
+\newcommandtwoopt*\addfont@fixed[5][][]{% #1:scale, #2:sel-cmd, #3:enc, #4:font, #5:cmd
   \addfont@fixedtrue
   \def\addfont@latestencoding{#3}%
   \def\addfont@latestfamily{#4}%