CTAN sync 201909220301

27 files changed, 349 insertions, 169 deletions

diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-phys/biblatex-phys.bib b/macros/latex/contrib/biblatex-contrib/biblatex-phys/biblatex-phys.bib
index 36023fa101..3f6af13bdd 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-phys/biblatex-phys.bib
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-phys/biblatex-phys.bib
@@ -54,6 +54,28 @@
   edition     = {5},
 }
 
+@Article{Arneodo2008,
+  title         = {Universal Intermittent Properties of Particle Trajectories in
+                   Highly Turbulent Flows},
+  author        = {Arnèodo, A. and Benzi, R. and Berg, J. and Biferale, L. and
+                   Bodenschatz, E. and Busse, A. and Calzavarini, E. and
+                   Castaing, B.  and Cencini, M. and Chevillard, L. and Fisher,
+                   R. T. and Grauer, R.  and Homann, H. and Lamb, D. and
+                   Lanotte, A. S. and Lévèque, E. and Lüthi, B. and Mann, J. and
+                   Mordant, N. and Müller, W.-C. and Ott, S.  and Ouellette, N.
+                   T. and Pinton, J.-F. and Pope, S. B. and Roux, S.  G. and
+                   Toschi, F. and Xu, H. and Yeung, P. K.},
+  collaboration = {International Collaboration for Turbulence Research},
+  journal       = {Phys. Rev. Lett.},
+  volume        = {100},
+  issue         = {25},
+  pages         = {254504},
+  year          = {2008},
+  month         = {Jun},
+  publisher     = {American Physical Society},
+  doi           = {10.1103/PhysRevLett.100.254504},
+}
+
 @Book{Augustine1995,
   hyphenation = {american},
   author	     = {Augustine, Robert L.},
@@ -401,9 +423,10 @@
 %% 
 %% This work consists of the files biblatex-phys.bib,
 %%                                 biblatex-phys.tex,
-%%                                 phys.bbx and
-%%                                 phys.cbx,
+%%                                 phys.bbx,
+%%                                 phys.cbx and
+%%                                 phys.dbx,
 %%           and the derived file  biblatex-phys.pdf.
 %% 
 %%
-%% End of file `biblatex-phys.bbx'.
\ No newline at end of file
+%% End of file `biblatex-phys.bbx'.
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-phys/biblatex-phys.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-phys/biblatex-phys.pdf
index d97c2b0f41..0de0fe144e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-phys/biblatex-phys.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-phys/biblatex-phys.pdf
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-phys/biblatex-phys.tex b/macros/latex/contrib/biblatex-contrib/biblatex-phys/biblatex-phys.tex
index bd9d6793e5..984b04402f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-phys/biblatex-phys.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-phys/biblatex-phys.tex
@@ -25,8 +25,8 @@
   {\texttt{joseph.wright@morningstar2.co.uk}}}}
 \title{\pkg{biblatex-phys} -- A \pkg{biblatex} implementation of the
   \textsc{aip} and \textsc{aps} bibliography style%
-  \footnote{This file describes v1.1, last revised 2018/10/19.}}
-\date{Released 2018/10/19}
+  \footnote{This file describes v1.1a, last revised 2019/09/21.}}
+\date{Released 2019/09/21}
 
 \providecommand*{\opt}[1]{\texttt{#1}}
 \providecommand*{\pkg}[1]{\textsf{#1}}
@@ -200,13 +200,14 @@ be sent by e-mail to
 \changes{v1.0c}{2018/10/19}{Update internals to follow standard \pkg{biblatex}
   style changes}
 \changes{v1.1}{2018/10/19}{Support for \texttt{collaboration} field}
+\changes{v1.1a}{2019-09-20}{Biber support for \texttt{collaboration} field}
 
 \PrintChanges
 
 \end{document}
 
 %% 
-%% Copyright (C) 2012-2014,2016,2018 by
+%% Copyright (C) 2012-2014,2016,2018,2019 by
 %%   Joseph Wright <joseph.wright@morningstar2.co.uk>
 %% 
 %% It may be distributed and/or modified under the conditions of
@@ -222,8 +223,9 @@ be sent by e-mail to
 %% This work consists of the files biblatex-phys.bib,
 %%                                 biblatex-phys.tex,
 %%                                 biblatex-phys.tex,
-%%                                 phys.bbx and
-%%                                 phys.cbx,
+%%                                 phys.bbx,
+%%                                 phys.cbx and
+%%                                 phys.dbx,
 %%           and the derived file  biblatex-phys.pdf.
 %%
 %% End of file `biblatex-phys.tex'.
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-phys/phys.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-phys/phys.bbx
index 7b69506a5d..439bdd6bcf 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-phys/phys.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-phys/phys.bbx
@@ -8,7 +8,7 @@
 %% ---------------------------------------------------------------
 %% 
 
-\ProvidesFile{phys.bbx}[2018/10/19 v1.1 biblatex bibliography style]
+\ProvidesFile{phys.bbx}[2019/09/21 v1.1a biblatex bibliography style]
 
 % Load the standard style to avoid copy-pasting unnecessary material
 \RequireBibliographyStyle{numeric-comp}
@@ -434,7 +434,9 @@
         }%
       \iffieldundef{collaboration}
         {}
-        {\printfield[parens]{collaboration}}}
+        {%
+          \setunit{\addspace}%
+          \printfield[parens]{collaboration}}}
     {}%
 }
 
@@ -477,7 +479,7 @@
 
 
 %% 
-%% Copyright (C) 2012-2014,2016,2018 by
+%% Copyright (C) 2012-2014,2016,2018,2019 by
 %%   Joseph Wright <joseph.wright@morningstar2.co.uk>
 %% 
 %% It may be distributed and/or modified under the conditions of
@@ -492,8 +494,9 @@
 %% 
 %% This work consists of the files biblatex-phys.bib,
 %%                                 biblatex-phys.tex,
-%%                                 phys.bbx and
-%%                                 phys.cbx,
+%%                                 phys.bbx,
+%%                                 phys.cbx and
+%%                                 phys.dbx,
 %%           and the derived file  biblatex-phys.pdf.
 %% 
 %%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-phys/phys.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-phys/phys.cbx
index dcc687d59f..946b36614c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-phys/phys.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-phys/phys.cbx
@@ -8,7 +8,7 @@
 %% ---------------------------------------------------------------
 %% 
 
-\ProvidesFile{phys.cbx}[2018/10/19 v1.1 biblatex citation style]
+\ProvidesFile{phys.cbx}[2019/09/21 v1.1a biblatex citation style]
 
 \RequireCitationStyle{numeric-comp}
 
@@ -20,7 +20,7 @@
   }
 
 %% 
-%% Copyright (C) 2012-2014,2016,2018 by
+%% Copyright (C) 2012-2014,2016,2018,2019 by
 %%   Joseph Wright <joseph.wright@morningstar2.co.uk>
 %% 
 %% It may be distributed and/or modified under the conditions of
@@ -35,8 +35,9 @@
 %% 
 %% This work consists of the files biblatex-phys.bib,
 %%                                 biblatex-phys.tex,
-%%                                 phys.bbx and
-%%                                 phys.cbx,
+%%                                 phys.bbx,
+%%                                 phys.cbx and
+%%                                 phys.dbx,
 %%           and the derived file  biblatex-phys.pdf.
 %% 
 %%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-phys/phys.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-phys/phys.dbx
new file mode 100644
index 0000000000..d7ed7e17dc
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-phys/phys.dbx
@@ -0,0 +1,37 @@
+%% ---------------------------------------------------------------
+%% biblatex-phys --- A biblatex implementation of the AIP and APS 
+%%   bibliography style
+%% Maintained by Joseph Wright
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ---------------------------------------------------------------
+%% 
+
+\ProvidesFile{phys.dbx}[2019/09/21 v1.1a biblatex database model extension]
+
+\DeclareDatamodelFields[type=field, datatype=literal]{collaboration}
+
+%% 
+%% Copyright (C) 2012-2014,2016,2018,2019 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the files biblatex-phys.bib,
+%%                                 biblatex-phys.tex,
+%%                                 phys.bbx,
+%%                                 phys.cbx and
+%%                                 phys.dbx,
+%%           and the derived file  biblatex-phys.pdf.
+%% 
+%%
+%% End of file `phys.cbx'.
diff --git a/macros/latex/contrib/derivative/README.md b/macros/latex/contrib/derivative/README.md
index 0208052909..a70b528243 100644
--- a/macros/latex/contrib/derivative/README.md
+++ b/macros/latex/contrib/derivative/README.md
@@ -1,4 +1,4 @@
-## README for derivative package v0.95 dated 2019-09-18
+## README for derivative package v0.95b dated 2019-09-21
 
 The package provides a set of commands `\NewOdvVariant`, `\NewPdvVariant` etc. that can be used to define a variant of a derivative. The package have already defined several derivatives:
 
@@ -21,7 +21,7 @@ The latest version of this license is in
 and version 1.3 or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
-This work has the LPPL maintenance status `maintained'.
+This work has the LPPL maintenance status `maintained`.
 
 The Current Maintainer of this work is Simon Jensen.
 
diff --git a/macros/latex/contrib/derivative/derivative.pdf b/macros/latex/contrib/derivative/derivative.pdf
index 735d2fc7ca..d7088c0cfb 100644
--- a/macros/latex/contrib/derivative/derivative.pdf
+++ b/macros/latex/contrib/derivative/derivative.pdf
diff --git a/macros/latex/contrib/derivative/derivative.sty b/macros/latex/contrib/derivative/derivative.sty
index de10a6dd5f..2305aa9d6b 100644
--- a/macros/latex/contrib/derivative/derivative.sty
+++ b/macros/latex/contrib/derivative/derivative.sty
@@ -16,7 +16,7 @@
 \NeedsTeXFormat{LaTeX2e}
 
 \RequirePackage{xparse}[2018/05/09]
-\ProvidesExplPackage{derivative}{2018/06/14}{1.0}{Nice and easy derivatives}
+\ProvidesExplPackage{derivative}{2019/09/21}{0.95b}{Nice and easy derivatives}
 
 %%%%%  Useful conditionals  %%%%%
 
@@ -490,8 +490,8 @@
 		\exp_args:Nnc \bool_xor:nnTF {##5} { l__deriv_#1_switch_slash_bool }
 		{
 			\exp_args:Nnc \bool_xor:nnTF {##1} { l__deriv_#1_switch_star_bool }
-			{ \__deriv_pdv_both:nnnnnnnn  #4 {#1} {##2} {##3} {##4} {##6} {##7} {##8} }
-			{ \__deriv_pdv_slash:nnnnnnnn #4 {#1} {##2} {##3} {##4} {##6} {##7} {##8} }
+			{ \__deriv_pdv_both:nnnnnnnn  {#4} {#1} {##2} {##3} {##4} {##6} {##7} {##8} }
+			{ \__deriv_pdv_slash:nnnnnnnn {#4} {#1} {##2} {##3} {##4} {##6} {##7} {##8} }
 		}
 		{
 			\exp_args:Nnc \bool_xor:nnTF {##1} { l__deriv_#1_switch_star_bool }
@@ -504,6 +504,7 @@
 % dv
 \cs_new_protected:Npn \__deriv_d_variables:n #1
 {
+	\__deriv_new:nnnn { tl     } {#1} { style  } { inf, frac, frac_slash }
 	\__deriv_new:nnnn { tl     } {#1} { scale  } { eval, eval_slash, fun, var, frac, frac_slash }
 	\__deriv_new:nnnn { tl     } {#1} { delims } { eval, eval_slash, fun, var, frac, frac_slash }
 	\__deriv_new:nnnn { muskip } {#1} { sep    } { inf_ord, inf_fun, ord_fun, var_ord, inf_var, eval_sb, eval_sp }
@@ -513,6 +514,7 @@
 % dv
 \cs_new_protected:Npn \__deriv_p_variables:n #1
 {
+	\__deriv_new:nnnn { tl     } {#1} { style  } { inf, frac, frac_slash }
 	\__deriv_new:nnnn { tl     } {#1} { scale  } { eval, eval_slash, fun, var, frac, frac_slash }
 	\__deriv_new:nnnn { tl     } {#1} { delims } { eval, eval_slash, fun, var, frac, frac_slash }
 	\__deriv_new:nnnn { muskip } {#1} { sep    } { inf_ord, inf_fun, ord_fun, inf_var, var_ord, var_inf, ord_inf, eval_sb, eval_sp }
diff --git a/macros/latex/contrib/derivative/derivative.tex b/macros/latex/contrib/derivative/derivative.tex
index d538bc8566..687c023d41 100644
--- a/macros/latex/contrib/derivative/derivative.tex
+++ b/macros/latex/contrib/derivative/derivative.tex
@@ -46,8 +46,6 @@
 
 \RequirePackage{mleftright}
 \RequirePackage{xfrac}
-\RequirePackage{derivative}
-	\derivset{all}[scale-auto = mleftmright]
 
 \RequirePackage[unicode]{hyperref}
 \RequirePackage[nameinlink]{cleveref}
@@ -57,17 +55,17 @@
 
 \tl_new:N \pakkenavn
 \tl_new:N \titel
-\tl_new:N \g_deriv_email
+\tl_new:N \email
 \tl_new:N \forfatter
-\tl_new:N \g_deriv_dato
-\tl_new:N \g_deriv_version
+\tl_new:N \dato
+\tl_new:N \version
 
 \NewDocumentCommand{\Pakkenavn}{ m }{ \tl_gset:Nf \pakkenavn { \tl_trim_spaces:n { #1 } } }
 \NewDocumentCommand{\Titel}    { m }{ \tl_gset:Nf \titel     { \tl_trim_spaces:n { #1 } } }
 \NewDocumentCommand{\Forfatter}{ m }{ \tl_gset:Nf \forfatter { \tl_trim_spaces:n { #1 } } }
-\NewDocumentCommand{\Email}    { m }{ \tl_gset:Nf \g_deriv_email    { \tl_trim_spaces:n { #1 } } }
-\NewDocumentCommand{\Dato}     { m }{ \tl_gset:Nf \g_deriv_dato     { \tl_trim_spaces:n { #1 } } }
-\NewDocumentCommand{\Version}  { m }{ \tl_gset:Nf \g_deriv_version  { \tl_trim_spaces:n { #1 } } }
+\NewDocumentCommand{\Email}    { m }{ \tl_gset:Nf \email { \tl_trim_spaces:n { #1 } } }
+\NewDocumentCommand{\Dato}     { m }{ \tl_gset:Nf \dato  { \tl_trim_spaces:n { #1 } } }
+\NewDocumentCommand{\Version}  { m }{ \tl_gset:Nf \version  { \tl_trim_spaces:n { #1 } } }
 
 \NewDocumentCommand{\mypackage}{ } {  \pkg{\pakkenavn}  }
 
@@ -90,14 +88,14 @@
 		\centering
 		\textsl{Written~by:} \par
 		{ \color{RoyalRed} \forfatter \par }
-		{ \color{RoyalRed} \g_deriv_email \par }
+		{ \color{RoyalRed} \email \par }
 	\end{minipage}
 	\hfill
 	\begin{minipage}[t]{0.5\textwidth}
 		\centering
 		\textsl{Released:} \par
-		{ \color{RoyalRed} \g_deriv_version \par }
-		{ \color{RoyalRed} \g_deriv_dato \par }
+		{ \color{RoyalRed} v\version \par }
+		{ \color{RoyalRed}  \dato \par }
 	\end{minipage}
 	
 	\par \vspace{20mm} \noindent
@@ -1085,8 +1083,11 @@
 \Titel{The \pakkenavn{} package}
 \Forfatter{Simon Jensen}
 \Email{sjelatex@gmail.com}
-\Dato{2019-09-18}
-\Version{v0.95}
+\Dato{2019/09/21}
+\Version{0.95b}
+
+\RequirePackage{derivative}[\dato]
+\derivset{all}[scale-auto = mleftmright]
 
 \hypersetup
 {
@@ -2273,11 +2274,16 @@
 		\end{change}
 		\bigskip
 		\begin{change}[version = 0.95, date = 2019-09-18, beta = true]
+			\item \emph{Please ignore this version, since it contained the \pkg{.sty} and \pkg{.pdf} files for version} \texttt{0.9} \texttt{:(}.
 			\item Second beta release of the package.
 			\item Removed the single token restriction of the infinitesimal since it made no sense.
 			\item Fixed the documentation errors and typos.
 			\item Minor fixes to the code.
 		\end{change}
+		\begin{change}[version = 0.95b, date = 2019-09-21, beta = true]
+			\item Contains the correct \pkg{.sty} and \pkg{.pdf} files \texttt{:)}.
+			\item One minor code fix.
+		\end{change}
 	\end{changelog}
 	
 \end{document}
\ No newline at end of file
diff --git a/macros/latex/contrib/etoolbox/etoolbox.def b/macros/latex/contrib/etoolbox/etoolbox.def
index 59ebf9e1f4..641fe191ea 100644
--- a/macros/latex/contrib/etoolbox/etoolbox.def
+++ b/macros/latex/contrib/etoolbox/etoolbox.def
@@ -1,5 +1,5 @@
 \ProvidesFile{etoolbox.def}
-  [2019/09/09 v2.5g etoolbox debug messages (JAW)]
+  [2019/09/21 v2.5h etoolbox debug messages (JAW)]
 
 \begingroup
 \makeatletter
diff --git a/macros/latex/contrib/etoolbox/etoolbox.pdf b/macros/latex/contrib/etoolbox/etoolbox.pdf
index 4d69fa3b4f..a2e0c6fd18 100644
--- a/macros/latex/contrib/etoolbox/etoolbox.pdf
+++ b/macros/latex/contrib/etoolbox/etoolbox.pdf
diff --git a/macros/latex/contrib/etoolbox/etoolbox.sty b/macros/latex/contrib/etoolbox/etoolbox.sty
index 189653133f..7d6f4502ec 100644
--- a/macros/latex/contrib/etoolbox/etoolbox.sty
+++ b/macros/latex/contrib/etoolbox/etoolbox.sty
@@ -12,7 +12,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{etoolbox}
-  [2019/09/09 v2.5g e-TeX tools for LaTeX (JAW)]
+  [2019/09/21 v2.5h e-TeX tools for LaTeX (JAW)]
 
 \begingroup
 \@ifundefined{eTeXversion}
@@ -888,6 +888,7 @@
 % {<cstoken>}
 
 \newrobustcmd{\undef}[1]{\let#1\etb@undefined}
+\newrobustcmd{\gundef}[1]{\global\let#1\etb@undefined}
 
 % {<csname>}
 
diff --git a/macros/latex/contrib/etoolbox/etoolbox.tex b/macros/latex/contrib/etoolbox/etoolbox.tex
index 3d54711838..813690fae2 100644
--- a/macros/latex/contrib/etoolbox/etoolbox.tex
+++ b/macros/latex/contrib/etoolbox/etoolbox.tex
@@ -12,8 +12,8 @@
   url={http://www.ctan.org/pkg/etoolbox/},
   author={Philipp Lehman, Joseph Wright},
   email={joseph.wright@morningstar2.co.uk},
-  revision={v2.5g},
-  date={2019/09/09}}
+  revision={v2.5h},
+  date={2019/09/21}}
 
 \hypersetup{%
   pdftitle={The etoolbox Package},
@@ -1297,6 +1297,10 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \begin{changelog}
 
+\begin{release}{2.5h}{2019-09-21}
+\item Add missing \cmd{gundef}
+\end{release}
+
 \begin{release}{2.5g}{2019-09-09}
 \item Update patching of \cmd{begin} and \cmd{end} in advance of \LaTeX{}
   kernel changes
diff --git a/macros/latex/contrib/filecontents/README b/macros/latex/contrib/filecontents/README
index 4c62bef626..e325af4476 100644
--- a/macros/latex/contrib/filecontents/README
+++ b/macros/latex/contrib/filecontents/README
@@ -36,7 +36,7 @@ information on installing packages.
 Copyright and license
 ---------------------
 
-Copyright (C) 2018 Scott Pakin, scott+fc@pakin.org
+Copyright (C) 2011-2019 Scott Pakin, scott+fc@pakin.org
 
 This package may be distributed and/or modified under the conditions
 of the LaTeX Project Public License, either version 1.3c of this
diff --git a/macros/latex/contrib/filecontents/filecontents.dtx b/macros/latex/contrib/filecontents/filecontents.dtx
index 0fc96c45a1..40ad96f26d 100644
--- a/macros/latex/contrib/filecontents/filecontents.dtx
+++ b/macros/latex/contrib/filecontents/filecontents.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2018 Scott Pakin <scott+fc@pakin.org>
-% -------------------------------------------------------
+% Copyright (C) 2001-2019 Scott Pakin <scott+fc@pakin.org>
+% --------------------------------------------------------
 %
 % This package may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
@@ -22,11 +22,12 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{filecontents}
 %<*package>
-    [2018/05/30 v1.4 Create an external file from within a LaTeX document]
+    [2019/09/20 v1.5 Create an external file from within a LaTeX document]
 %</package>
 %
 %<*driver>
 \documentclass{ltxdoc}
+\usepackage{color}
 \EnableCrossrefs
 \CodelineIndex
 \RecordChanges
@@ -38,7 +39,7 @@
 %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% \CheckSum{184}
+% \CheckSum{191}
 %
 % \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
@@ -123,6 +124,21 @@
 %   }^^A
 % }
 %
+% \begin{center}
+%   \color{red}
+%   \fbox{^^A
+%     \begin{minipage}{0.75\linewidth}
+%       \centerline{\textsc{Notice}}
+%       \smallskip
+%       The version of \LaTeX\ released in Fall 2019 incorporates all of
+%       this package's functionality (and more) into the \LaTeX\ kernel
+%       itself.  As a result, there is no longer a need for the
+%       |filecontents| package.  Please use the new, built-in
+%       |filecontents| environment instead.
+%     \end{minipage}^^A
+%   }
+% \end{center}
+%
 %
 % \section{Introduction}
 %
@@ -233,9 +249,9 @@
 %<*package>
 %    \end{macrocode}
 %
-% \begin{macro}{\filec@ntents}
+% \begin{macro}{\filec@ntents@old@kernel}
 % Except where indicated, the source---including comments---to the
-% |\filec@ntents| macro was taken verbatim from |ltclass.dtx|.
+% |\filec@ntents| macro---was taken verbatim from |ltclass.dtx|.
 %    \begin{macrocode}
 \begingroup%
 \catcode`\*=11 %
@@ -245,7 +261,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\gdef\filec@ntents#1{%
+\gdef\filec@ntents@old@kernel#1{%
   \openin\@inputcheck#1 %
 %    \end{macrocode}
 %
@@ -366,11 +382,10 @@
   \catcode`\^^M\active%
   \edef^^M##1^^M{%
     \noexpand\reserved@b##1\E\E\relax}}%
-\endgroup%
+\endgroup
 %    \end{macrocode}
 % \end{macro}
 %
-%
 % \begin{macro}{\fc@no@preamblecmds}
 % \LaTeXe\ declares |\filecontents|, |\filecontents*|, and all of the
 % related helper macros as |\@onlypreamble|, meaning they become invalid
@@ -383,10 +398,36 @@
 %    \begin{macrocode}
 \def\fc@no@preamblecmds#1\do\filecontents#2\do\filec@ntents#3\relax{%
   \gdef\@preamblecmds{#1#3}}
-\expandafter\fc@no@preamblecmds\@preamblecmds\relax
 %    \end{macrocode}
 % \end{macro}
 %
+% Newer \LaTeX\ kernels define a most sophisticated |filecontents|
+% environment than what this package provides.  We currently use the
+% existence of |\filec@ntents@opt| as indication that the new
+% |filecontents| environment is available.
+% \changes{v1.5}{2019/09/20}{Declare the package obsolete when running
+% under newer \LaTeX\ kernels}
+%    \begin{macrocode}
+\@ifundefined{filec@ntents@opt}{%
+%    \end{macrocode}
+% Older kernel: Install this package's version of the |filecontents|
+% environment.
+%    \begin{macrocode}
+  \let\filec@ntents=\filec@ntents@old@kernel
+  \expandafter\fc@no@preamblecmds\@preamblecmds\relax
+}{%
+%    \end{macrocode}
+% Newer kernel: Issue a warning and do not install this package's
+% version of |filecontents|.
+%    \begin{macrocode}
+  \PackageWarningNoLine{filecontents}{%
+    This package is obsolete.  Disabling it and\MessageBreak
+    passing control to the filecontents environment\MessageBreak
+    defined by the LaTeX kernel%
+  }%
+}
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 %</package>
 %    \end{macrocode}
diff --git a/macros/latex/contrib/filecontents/filecontents.ins b/macros/latex/contrib/filecontents/filecontents.ins
index 6471069dcf..70b05b0a13 100644
--- a/macros/latex/contrib/filecontents/filecontents.ins
+++ b/macros/latex/contrib/filecontents/filecontents.ins
@@ -3,8 +3,8 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright (C) 2018 Scott Pakin <scott+fc@pakin.org>
-%% -------------------------------------------------------
+%% Copyright (C) 2011-2019 Scott Pakin <scott+fc@pakin.org>
+%% --------------------------------------------------------
 %%
 %% This package may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3c of this
@@ -28,8 +28,8 @@
 
 This is a generated file.
 
-Copyright (C) 2018 Scott Pakin <scott+fc@pakin.org>
--------------------------------------------------------
+Copyright (C) 2011-2019 Scott Pakin <scott+fc@pakin.org>
+--------------------------------------------------------
 
 This package may be distributed and/or modified under the conditions
 of the LaTeX Project Public License, either version 1.3c of this
diff --git a/macros/latex/contrib/filecontents/filecontents.pdf b/macros/latex/contrib/filecontents/filecontents.pdf
index a2340ef345..bc264af7fd 100644
--- a/macros/latex/contrib/filecontents/filecontents.pdf
+++ b/macros/latex/contrib/filecontents/filecontents.pdf
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
index 6f7655d174..735084e1e5 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
diff --git a/macros/latex/contrib/nicematrix/nicematrix.dtx b/macros/latex/contrib/nicematrix/nicematrix.dtx
index 6c750cab7f..684b34c5b4 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.dtx
+++ b/macros/latex/contrib/nicematrix/nicematrix.dtx
@@ -1,4 +1,4 @@
-% \iffalse meta-comment
+% \iffalse meta-comment
 %
 % Copyright (C) 2018-2019 by F. Pantigny
 % -----------------------------------
@@ -15,8 +15,8 @@
 %
 % \fi
 % \iffalse
-\def\myfileversion{3.2}
-\def\myfiledate{2019/09/19}
+\def\myfileversion{3.2a}
+\def\myfiledate{2019/09/21}
 %
 %
 %<*batchfile>
@@ -88,13 +88,15 @@ c & c & b & a & e
 % \title{The package \pkg{nicematrix}\thanks{This document corresponds to the version~\myfileversion\space of \pkg{nicematrix},
 % at the date of~\myfiledate.}} \author{F. Pantigny \\ \texttt{fpantigny@wanadoo.fr}}
 %
-% \hypersetup{
-%   pdfinfo = {
-%      Title = { The extension 'nicematrix' },
-%      Subject = { A LaTeX extension } ,
-%      Author = { F. Pantigny }
+% \hypersetup
+%   {
+%     pdfinfo = 
+%      {
+%        Title = { The extension 'nicematrix' } ,
+%        Subject = { A LaTeX extension } ,
+%        Author = { F. Pantigny }
+%      }
 %   }
-% }
 %
 %
 % \maketitle
@@ -3041,7 +3043,8 @@ c & c & b & a & e
 %
 % \bigskip
 %    \begin{macrocode}
-    unknown .code:n  = \@@_error:n { Unknown~key~for~NiceMatrixOptions } }
+    unknown .code:n  = \@@_error:n { Unknown~key~for~NiceMatrixOptions } 
+  }
 %    \end{macrocode}
 %
 %
@@ -3199,7 +3202,7 @@ c & c & b & a & e
     \hbox_set_end:
 %    \end{macrocode}
 %
-% We want to compute in |\l_@@_max_cell_width_dim| the width of the widest cell
+% We want to compute in |\g_@@_max_cell_width_dim| the width of the widest cell
 % of the array (except the cells of the ``first column'' and the ``last
 % column''). 
 % 
@@ -6964,6 +6967,12 @@ c & c & b & a & e
 % of an array when |pdflatex| was used with \pkg{french-babel} (because
 % \pkg{french-babel} activates the colon in the beginning of the document).
 % 
+%
+% \subsection*{Changes between version 3.1 and 3.2 (and 3.2a)}
+%
+% Option |small|.
+%
+%
 % \PrintIndex
 % 
 % \tableofcontents
diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf
index 28f11a261c..690f05bce7 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix.pdf
diff --git a/macros/latex/contrib/pdfpages/pdfpages.dtx b/macros/latex/contrib/pdfpages/pdfpages.dtx
index 35f1ff86cd..d73bd1226f 100644
--- a/macros/latex/contrib/pdfpages/pdfpages.dtx
+++ b/macros/latex/contrib/pdfpages/pdfpages.dtx
@@ -27,12 +27,12 @@
 %<*dtx>
 \makeatletter
 %</dtx>
-\def\AM@fileversion{v0.5l}
+\def\AM@fileversion{v0.5n}
 \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
 \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
 \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2017-10-31 14:12:08 +0100 $
-\AM@Git@SHA@process$SHA-1: 9deefd6c8c22356ce47773245098390089885925 $
+\AM@Git@Date@process$Date: 2019-09-21 22:35:13 +0200 $
+\AM@Git@SHA@process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $
 %</!(example1,example2,example3,installer)>
 %
 %
@@ -84,7 +84,7 @@
 %
 %    \GetFileInfo{pdfpages.dtx}
 %
-%    \CheckSum{4930}
+%    \CheckSum{4964}
 %
 % \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
@@ -1181,8 +1181,8 @@
 }
 %    \end{macrocode}
 %    Let's save the original meaning of |\includegraphics|, because
-%    graphicx.sty in demo mode (`demo' option) will overwrite |\includegraphics|
-%    \emph{after} |\begin{document}|.
+%    graphicx.sty in demo mode (`demo' option) will overwrite the definition of
+%    |\includegraphics| \emph{after} |\begin{document}|.
 %    \begin{macrocode}
 \let\AM@Ginclude@graphics\Ginclude@graphics
 %    \end{macrocode}
@@ -1256,18 +1256,29 @@
 %    \end{macrocode}
 %    \macro{\AM@checkinteger}
 %    Check, if |#1| is a positive integer.
+%    (Note: |\AM@checkinteger| was not reliable in older versions (<0.5n) of
+%    this package. Let's use the definition from \emph{biblatex.sty} which seems
+%    to be much better.)
 %    \begin{macrocode}
 \newif\ifAM@integer
-\begingroup
-\@makeother_
-\gdef\AM@checkinteger#1{%
-  \ifcat _\ifnum9<1#1_\else A\fi
-    \AM@integertrue
+\def\AM@checkinteger#1{%
+  \expandafter\AM@checkinteger@\expandafter{#1}}
+%    \end{macrocode}
+%    \begin{macrocode}
+\def\AM@checkinteger@#1{%
+  \begingroup
+  \def\do##1{\uccode`##1=`\%}%
+  \do\0\do\1\do\2\do\3\do\4\do\5\do\6\do\7\do\8\do\9%
+  \makeatletter
+  \catcode`\%=9
+  \endlinechar\m@ne
+  \uppercase{\scantokens{\def\AM@temp{#1}}}%
+  \ifx\AM@temp\@empty
+    \global\AM@integertrue
   \else
-    \AM@integerfalse
+    \global\AM@integerfalse
   \fi
-}
-\endgroup
+  \endgroup}
 %    \end{macrocode}
 %    \macro{\AM@findfile}
 %    Find file and set |\AM@currentdocname|.
@@ -2041,8 +2052,11 @@
 %    \end{macrocode}
 %    \macro{\AM@readlist}
 %    \macro{\AM@readlisti}
+%    \macro{\AM@range@or@docname}
 %    \macro{\AM@checkrange}
-%    \macro{\AM@checklast}
+%    \macro{\AM@expand@range}
+%    \macro{\AM@check@valid@pagenumber}
+%    \macro{\AM@strip@slash}
 %    \macro{\AM@checkpagenumber}
 %    \macro{\AM@setnewdocname}
 %    \macro{\AM@append}
@@ -2075,82 +2089,105 @@
   \def\AM@temp{#1}%
   \ifx\END#1
   \else
-    \AM@checkrange#1-\END
+    \AM@range@or@docname{#1}%
     \expandafter\AM@readlisti
   \fi
 }
 %    \end{macrocode}
 %    \begin{macrocode}
-\newcommand{\AM@checkrange}{}
-\def\AM@checkrange#1-#2\END{%
-  \edef\AM@tempi{\AM@trim@space{#1}}%
-  \ifx\\#2\\%
-    \AM@checkinteger{\AM@tempi}%
-    \ifAM@integer
-      \AM@checkpagenumber{\AM@tempi}%
-      \AM@append{\AM@tempi}%
+\def\AM@range@or@docname#1{%
+  \edef\AM@arg{\AM@trim@space{#1}}%
+  \expandafter\AM@checkrange\AM@arg-\END
+  \ifAM@isrange
+    \ifx\AM@currentdocname\relax
+      \AM@setnewdocname{\AM@arg}%
     \else
-      \expandafter\ifx\expandafter\\\AM@tempi\\\AM@append{}%
-      \else\AM@setnewdocname{\AM@tempi}\fi
+      \AM@expand@range\AM@i\AM@ii
     \fi
   \else
-    \expandafter\ifx\expandafter\\\AM@tempi\\%
-      \@tempcnta=1\relax
-      \AM@checklast#2\END
+    \AM@setnewdocname{\AM@arg}%
+  \fi
+}
+%    \end{macrocode}
+%    \begin{macrocode}
+\def\AM@last{last}
+\def\AM@empty{}
+\newif\ifAM@isrange
+%    \end{macrocode}
+%    \begin{macrocode}
+\def\AM@checkrange#1-#2\END{%
+  \AM@israngefalse
+  \AM@check@valid@pagenumber{#1}%
+  \ifx\\#1\\%
+    \def\AM@i{1}%
+  \else
+    \edef\AM@i{#1}%
+  \fi
+  \def\AM@ii{}%
+  \ifAM@isrange
+    \ifx\\#2\\%
     \else
-      \def\AM@cmp{last}%
-      \ifx\AM@cmp\AM@tempi
-        \@tempcnta=\AM@pagecount\relax
-        \AM@checklast#2\END
-      \else
-        \AM@checkinteger{\AM@tempi}%
-        \ifAM@integer
-          \@tempcnta=\AM@tempi\relax
-          \AM@checkpagenumber{\the\@tempcnta}%
-          \AM@checklast#2\END
-        \else
-          \AM@setnewdocname{\AM@temp}%
-        \fi
+      \edef\AM@ii{\AM@strip@slash#2\END}%
+      \AM@check@valid@pagenumber{\AM@ii}%
+      \ifx\AM@ii\AM@empty
+        \let\AM@ii\AM@last
       \fi
     \fi
   \fi
 }
 %    \end{macrocode}
 %    \begin{macrocode}
-\newcommand{\AM@checklast}{}
-\def\AM@checklast#1-\END{%
-  \edef\AM@tempii{\AM@trim@space{#1}}%
-  \expandafter\ifx\expandafter\\\AM@tempii\\
-    \@tempcntb=\AM@pagecount\relax
-    \ifAM@DVIoutput
-      \ifnum\AM@pagecount=1
-        \@tempcntb\@tempcnta
-      \fi
-    \fi
-    \advance\@tempcntb\@ne
-    \whiledo{\@tempcnta<\@tempcntb}{%
-      \AM@append{\the\@tempcnta}%
-      \advance\@tempcnta\@ne
-    }%
+\def\AM@expand@range#1#2{%
+  \edef\AM@i{#1}%
+  \edef\AM@ii{#2}%
+  \ifx\AM@i\AM@last
+    \let\AM@i\AM@lastpage
+    \let\AM@i\AM@pagecount
+  \fi
+  \ifx\AM@ii\AM@last
+    \let\AM@ii\AM@lastpage
+    \let\AM@ii\AM@pagecount
+  \fi
+  \ifx\AM@ii\AM@empty
+    \let\AM@ii\AM@i
+  \fi
+  \@tempcnta=\AM@i\relax
+  \@tempcntb=\AM@ii\relax
+  \ifnum\@tempcnta<\@tempcntb
+    \def\AM@rel{<}%
+    \let\AM@inc\@ne
   \else
-    \def\AM@cmp{last}%
-    \ifx\AM@cmp\AM@tempii
-      \let\AM@tempii\AM@pagecount
-    \fi
-    \AM@checkinteger{\AM@tempii}%
-    \ifAM@integer
-      \@tempcntb=\AM@tempii\relax
-      \AM@checkpagenumber{\the\@tempcntb}%
-      \ifnum\@tempcnta<\@tempcntb \def\AM@rel{<}\def\AM@inc{\@ne}%
-      \else \def\AM@rel{>}\def\AM@inc{\m@ne}\fi
-      \advance\@tempcntb\AM@inc
-      \whiledo{\@tempcnta\AM@rel\@tempcntb}{%
-        \AM@append{\the\@tempcnta}%
-        \advance\@tempcnta\AM@inc
-      }%
-    \else
-      \AM@setnewdocname{\AM@temp}%
-    \fi
+    \def\AM@rel{>}%
+    \let\AM@inc\m@ne
+  \fi
+  \advance\@tempcntb\AM@inc
+  \whiledo{\@tempcnta\AM@rel\@tempcntb}{%
+    \AM@checkpagenumber{\the\@tempcnta}%  
+    \AM@append{\the\@tempcnta}%
+    \advance\@tempcnta\AM@inc
+  }%
+}
+%    \end{macrocode}
+%    \begin{macrocode}
+\def\AM@check@valid@pagenumber#1{%
+  \AM@checkinteger{#1}%
+  \ifAM@integer
+    \AM@israngetrue
+  \else
+    \AM@israngefalse
+  \fi
+  \edef\AM@tmp{#1}%
+  \ifx\AM@tmp\AM@last
+    \AM@israngetrue
+  \fi
+}
+%    \end{macrocode}
+%    \begin{macrocode}
+\def\AM@strip@slash#1-#2\END{%
+  \ifx\\#2\\%
+    #1%
+  \else
+    #1-#2%
   \fi
 }
 %    \end{macrocode}
@@ -2891,11 +2928,11 @@
 \newtoks\AM@toc@title
 \newcommand{\AM@parse@toclisti}{}
 \def\AM@parse@toclisti#1,#2,#3,#4,#5,#6\END{%
-  \def\AM@toc@page{\AM@trim@space{#1}}%
-  \def\AM@toc@section{\AM@trim@space{#2}}%
-  \def\AM@toc@level{\AM@trim@space{#3}}%
+  \edef\AM@toc@page{\AM@trim@space{#1}}%
+  \edef\AM@toc@section{\AM@trim@space{#2}}%
+  \edef\AM@toc@level{\AM@trim@space{#3}}%
   \AM@toc@title{\ignorespaces #4}%
-  \def\AM@toc@label{\AM@trim@space{#5}}%
+  \edef\AM@toc@label{\AM@trim@space{#5}}%
   \AM@checkinteger{\AM@toc@page}%
   \ifAM@integer\else
     \PackageError{pdfpages}
@@ -2960,10 +2997,10 @@
 %    \begin{macrocode}
 \newcommand{\AM@parse@loflisti}{}
 \def\AM@parse@loflisti#1,#2,#3,#4,#5\END{%
-  \def\AM@lof@page{\AM@trim@space{#1}}%
-  \def\AM@lof@list{\AM@trim@space{#2}}%
+  \edef\AM@lof@page{\AM@trim@space{#1}}%
+  \edef\AM@lof@list{\AM@trim@space{#2}}%
   \def\AM@lof@heading{\ignorespaces #3}%
-  \def\AM@lof@label{\AM@trim@space{#4}}%
+  \edef\AM@lof@label{\AM@trim@space{#4}}%
   \AM@checkinteger{\AM@lof@page}%
   \ifAM@integer\else 
     \PackageError{pdfpages}
@@ -3078,7 +3115,7 @@
 %    \begin{macrocode}
 \def\AM@CheckValue#1#2{%
   \ifx\\#2\\\PackageError{pdfpages}
-             {Option `#1' must have a non-empty value}%
+             {Option `#1' must have a non-empty value}{}%
   \fi
 }
 %    \end{macrocode}
@@ -3091,7 +3128,7 @@
   \AM@CheckValue{pages}{#1}%
   \def\AM@pagestemp{#1}}
 \define@key{pdfpages}{pages}{\AM@CheckValue{pages}{#1}%
-                             \def\AM@pagestemp{#1}}
+                             \edef\AM@pagestemp{#1}}
 \define@key{pdfpages}{nup}{\AM@parse@nup#1x\END}
 \define@key{pdfpages}{deltax}{\AM@parse@deltax#1 \\}
 \define@key{pdfpages}{deltay}{\AM@parse@deltay#1 \\}
@@ -4279,10 +4316,9 @@
 %    \begin{macrocode}
 \AM@DVIoutputtrue
 \PackageWarningNoLine{pdfpages}{%
-  I will use a dummy \string\includepdf\space command which\MessageBreak
-  will insert empty pages instead of the actual PDF,\MessageBreak
-  because we are running in
-  \ifAM@pkg@demo `demo' mode%
+  I will use a dummy \string\includepdf\space command\MessageBreak
+  which will insert empty pages instead of the actual\MessageBreak
+  PDF file because we are running in \ifAM@pkg@demo `demo' mode%
   \else DVI mode or with\MessageBreak dvips driver%
   \fi}
 %    \end{macrocode}
@@ -4662,6 +4698,19 @@
 %      |signature*| and |landscape| together.
 %    \end{itemize}
 %
+%    \subsection*{2019/09/19 v0.5m}
+%    \begin{itemize}
+%      \item Expanding argument for |pages| option: \par
+%      |\def\foo{1-4}\includepdf[pages=\foo]{dummy.pdf}|
+%    \end{itemize}
+%
+%    \subsection*{2019/09/21 v0.5n}
+%    \begin{itemize}
+%      \item |\AM@checkinteger| rewritten.
+%      \item File names like `1.pdf' or `1-2.pdf' are now handled correctly by |\includepdfmerge|.
+%       Rewritten |\AM@range@or@docname|, |\AM@checkrange|, |\AM@expand@range|, ...
+%    \end{itemize}
+%
 %    \Finale
 %    
 %    \iffalse
diff --git a/macros/latex/contrib/pdfpages/pdfpages.pdf b/macros/latex/contrib/pdfpages/pdfpages.pdf
index 231079964c..3ef941395f 100644
--- a/macros/latex/contrib/pdfpages/pdfpages.pdf
+++ b/macros/latex/contrib/pdfpages/pdfpages.pdf
diff --git a/macros/latex/contrib/xfakebold/Changes b/macros/latex/contrib/xfakebold/Changes
index 64af8d5c42..923320521b 100644
--- a/macros/latex/contrib/xfakebold/Changes
+++ b/macros/latex/contrib/xfakebold/Changes
@@ -1,5 +1,6 @@
 xfakebold.sty ----------------
 
+v 0.05 2019-09-21  fix pdflatex
 v 0.04 2018-08-21  typo in \fake@bold
 v 0.03 2018-08-07  small fixes and typos in the documentation
 v 0.02 2018-07-25  fix bug in pdflatex part
diff --git a/macros/latex/contrib/xfakebold/doc/xfakebold-doc.pdf b/macros/latex/contrib/xfakebold/doc/xfakebold-doc.pdf
index 6732fcabe7..d9b058589a 100644
--- a/macros/latex/contrib/xfakebold/doc/xfakebold-doc.pdf
+++ b/macros/latex/contrib/xfakebold/doc/xfakebold-doc.pdf
diff --git a/macros/latex/contrib/xfakebold/doc/xfakebold-doc.tex b/macros/latex/contrib/xfakebold/doc/xfakebold-doc.tex
index 710a6fa7a2..d2bd92ef2b 100644
--- a/macros/latex/contrib/xfakebold/doc/xfakebold-doc.tex
+++ b/macros/latex/contrib/xfakebold/doc/xfakebold-doc.tex
@@ -1,4 +1,4 @@
-% $Id: xfakebold-doc.tex 793 2018-08-06 16:39:25Z herbert $
+% $Id: xfakebold-doc.tex 1087 2019-09-21 11:53:40Z herbert $
 \listfiles
 \documentclass[english]{article}
 \usepackage{dejavu-otf}
@@ -8,7 +8,7 @@
 \usepackage{babel}
 \usepackage[a4paper,tmargin=1cm,bmargin=1.5cm,includeheadfoot]{geometry}
 \usepackage{listings}
-\title{\texttt{xfakebold}, v. 0.04\\ using bold characters with \texttt{pdflatex} or \texttt{lualatex}}
+\title{\texttt{xfakebold}, v. 0.05\\ using bold characters with \texttt{pdflatex} or \texttt{lualatex}}
 \author{Herbert Voß}
 
 \lstset{basicstyle=\ttfamily\small,language={[LaTeX]TeX},frame=lrtb}
diff --git a/macros/latex/contrib/xfakebold/latex/xfakebold.sty b/macros/latex/contrib/xfakebold/latex/xfakebold.sty
index 70dc0e678c..51d030dedf 100644
--- a/macros/latex/contrib/xfakebold/latex/xfakebold.sty
+++ b/macros/latex/contrib/xfakebold/latex/xfakebold.sty
@@ -1,8 +1,8 @@
-% $Id: xfakebold.sty 793 2018-08-06 16:39:25Z herbert $
+% $Id: xfakebold.sty 1087 2019-09-21 11:53:40Z herbert $
 %%
 %% This is file `xfakebold.sty', 
 %%
-%%   Copyright (C) 2018  Herbert Voss
+%%   Copyright (C) 2019  Herbert Voss
 %% 
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
@@ -13,40 +13,41 @@
 %% version 2005/12/01 or later.
 %% 
 %%
-\ProvidesPackage{xfakebold}[2018/08/21 v0.04 using bold characters]
+\ProvidesPackage{xfakebold}[2019/09/21 v0.05 using bold characters]
 \RequirePackage{ifluatex,ifxetex,xkeyval}
 
 \def\setBold{}
 \def\unsetBold{}
-\def\fake@bold{0.3}%
+\def\fake@bold{0.4}%
 
 \DeclareOptionX{bold}{%
   \def\fake@bold{#1}% 
-  \ifdim\fake@bold pt > \p@
+  \ifdim\fake@bold pt > 0pt
   \else 
     \PackageWarning{fakebold}{The value must be greater than 0. Will chooose 0.3}%
     \def\fake@bold{0.3}%
   \fi}
 
 \ProcessOptionsX
-
+\typeout{We use fakebold with factor \fake@bold}%
 \ifxetex
   \typeout{We have XeTeX}% 
   \PackageWarning{fakebold}%
   {^^J    No LuaTeX or PDFTeX running!
    ^^J    For Xe(La)TeX use the FakeBold option from package fontspec!
    \def\fake@bold{-1}}%
-\fi
-
-\ifluatex
+\else
+  \ifluatex
     \def\setBold{\pdfextension literal direct { 2 Tr \fake@bold\space w }\relax}
     \def\unsetBold{\pdfextension literal direct { 0 Tr 0 w }\relax}
     \typeout{We have LuaTeX}% 
-\else
-  \ifdim\fake@bold pt < \p@ \else
-    \def\setBold{\pdfliteral direct { 2 Tr \fake@bold\space w }\relax}
-    \def\unsetBold{\pdfliteral direct { 0 Tr 0 w }\relax}
-    \typeout{We have pdfTeX}% 
+  \else
+    \ifdim\fake@bold pt < \z@ \else
+      \def\setBold{\pdfliteral direct { 2 Tr \fake@bold\space w }\relax}
+      \def\unsetBold{\pdfliteral direct { 0 Tr 0 w }\relax}
+      \typeout{We have pdfTeX}% 
+    \fi
   \fi
 \fi
 
+\endinput
\ No newline at end of file