CTAN sync 202001040301

10 files changed, 63 insertions, 50 deletions

diff --git a/fonts/libertine/README b/fonts/libertine/README
index 5b87fe1175..5677923608 100644
--- a/fonts/libertine/README
+++ b/fonts/libertine/README
@@ -1,4 +1,4 @@
-This is the README for libertine, version 5.3.0 (2019-05-20).
+This is the README for libertine, version 5.3.0 (2020-01-03).
 
 This package provides support for use of the Linux Libertine and Linux
 Biolinum families of fonts with LaTeX. Most features are usable with
diff --git a/fonts/libertine/latex/libertine.sty b/fonts/libertine/latex/libertine.sty
index 6c29af2316..d8ecfc6dda 100644
--- a/fonts/libertine/latex/libertine.sty
+++ b/fonts/libertine/latex/libertine.sty
@@ -1,5 +1,5 @@
 \ProvidesPackage{libertine}[%
-  2019/02/27 (Bob Tennent) Supports Libertine and Biolinum fonts for all LaTeX engines.] 
+  2019/07/01 (Bob Tennent) Supports Libertine and Biolinum fonts for all LaTeX engines.] 
 
 %  with (partial) compatibilty with libertine-type1, biolinum-type1,    
 %  libertine, libertine-legacy and libertineotf packages                
@@ -274,6 +274,10 @@
 
 \iflibertine@otf
   \RequirePackage{fontspec}
+  \ifluatex  % avoid possibly uncorrected "system" fonts
+    \directlua{fonts.names.set_location_precedence{
+        "local", "texmf", "system" }}
+  \fi
 \else
   \RequirePackage{mweights}
   \RequirePackage{fontenc,fontaxes}
diff --git a/fonts/libertine/opentype/LinBiolinum_RBO.otf b/fonts/libertine/opentype/LinBiolinum_RBO.otf
index 21ef11b25a..26e6588f3a 100644
--- a/fonts/libertine/opentype/LinBiolinum_RBO.otf
+++ b/fonts/libertine/opentype/LinBiolinum_RBO.otf
diff --git a/fonts/scholax/README b/fonts/scholax/README
index 37b03e5283..c34a15ce7b 100644
--- a/fonts/scholax/README
+++ b/fonts/scholax/README
@@ -8,7 +8,12 @@ The licence of fourier-GUTenberg is LPPL (Latex Public
 Project Licence) and the licence for TeXGyre fonts is equivalent to the LPPL, so this package is released under the LPPL. 
 
 
-Current version: 1.01 2020-01-01
+Current version: 1.02 2020-01-02
+
+Changes in version 1.02
+1. Corrected ScholaX.map entries. (Thanks Marcel Krueger.)
+2. Simplified code and documentation for theoremfont under various theorem packages.
+3. Small documentation fixes.
 
 Changes in version 1.01
 Corrected theoremfont code in scholax.sty and modified documentation accordingly.
diff --git a/fonts/scholax/doc/scholax-doc.pdf b/fonts/scholax/doc/scholax-doc.pdf
index 50a1860f83..bdc7d70e75 100644
--- a/fonts/scholax/doc/scholax-doc.pdf
+++ b/fonts/scholax/doc/scholax-doc.pdf
diff --git a/fonts/scholax/doc/scholax-doc.tex b/fonts/scholax/doc/scholax-doc.tex
index ffb3d1fc06..9ae02ce370 100644
--- a/fonts/scholax/doc/scholax-doc.tex
+++ b/fonts/scholax/doc/scholax-doc.tex
@@ -68,7 +68,7 @@ Slanted and Bold Slanted styles are provided in addition to the basic Regular, B
 {\tt scaled, scale:}\\
 Rescales every font in the package. E.g.,
 \begin{verbatim}
-\usepackage[scaled=1.15}{scholax}
+\usepackage[scaled=1.15]{scholax}
 \end{verbatim}
 scales everything up by 15\%.
 
@@ -88,31 +88,34 @@ This option makes use of a new text font family, {\tt thfamily}, amounting to It
 There are two ways to make use of \verb|\thfamily| for body text in theorem-like text.
 \begin{itemize}
 \item
-\textbf{(for {\tt amsthm} only)}---add the option {\tt theoremfont} to {\tt scholax}, which will patch the \verb|\th@plain| command which stores the definition of the plain theorem format, replacing \verb|\itshape| by \verb|\thfamily|. Then, in your document preamble, make the usual theorem specifications, like
+\textbf{(for {\tt amsthm} and {\tt theorem} only)}---add the option {\tt theoremfont} to {\tt scholax}, which will patch the \verb|\th@plain| command which stores the definition of the plain theorem format, replacing \verb|\itshape| by \verb|\thfamily|. Then, in your document preamble, make the usual theorem specifications, like
 \begin{verbatim}
 \theoremstyle{plain}
 \newtheorem{thm}{Theorem}[section]
+etc
 \end{verbatim}
 \item
-In your document preamble, make a new definition of the plain theorem format. For {\tt amsthm}, this would be like
-\begin{verbatim}
-\newtheoremstyle{plain}
-  {\medskipamount}   % ABOVESPACE
-  {\medskipamount}   % BELOWSPACE
-  {\thfamily}  % BODYFONT <<<<<<<<<NOTE THE CHANGE FROM \itshape
-  {}       % INDENT (empty value is the same as 0pt)
-  {\bfseries} % HEADFONT
-  {.}         % HEADPUNCT
-  {5pt plus 1pt minus 1pt} % HEADSPACE
-  {}          % CUSTOM-HEAD-SPEC
-\end{verbatim}
-and then proceed as above with
+\textbf{(for {\tt ntheorem} only)} The {\tt theoremfont} option has no effect but will cause no harm. 
+%\begin{verbatim}
+%\newtheoremstyle{plain}
+%  {\medskipamount}   % ABOVESPACE
+%  {\medskipamount}   % BELOWSPACE
+%  {\thfamily}  % BODYFONT <<<<<<<<<NOTE THE CHANGE FROM \itshape
+%  {}       % INDENT (empty value is the same as 0pt)
+%  {\bfseries} % HEADFONT
+%  {.}         % HEADPUNCT
+%  {5pt plus 1pt minus 1pt} % HEADSPACE
+%  {}          % CUSTOM-HEAD-SPEC
+%\end{verbatim}
+Simply replace the theorem specifications described above for the {\tt plain} theorem style with
 \begin{verbatim}
 \theoremstyle{plain}
+\theorembodyfont{\thfamily}
 \newtheorem{thm}{Theorem}[section]
+etc
 \end{verbatim}
-If you are using another theorem package (e.g., {\tt ntheorem, theorem}) you will have instead to to add your own descriptors as specified in the its documentation and set the body font to \verb|\thfamily|. The {\tt theoremfont} option is useless in this case.
 \end{itemize}
+
 After doing this, you should get output like  this:
 
 \begin{thm}
diff --git a/fonts/scholax/map/ScholaX.map b/fonts/scholax/map/ScholaX.map
index 31d190df90..0af52947a1 100644
--- a/fonts/scholax/map/ScholaX.map
+++ b/fonts/scholax/map/ScholaX.map
@@ -204,13 +204,12 @@ TeXGyreScholaX-Slanted-lf-sc-ot1--base TeXGyreScholaX-Slanted "AutoEnc_cpzha2rjz
 TeXGyreScholaX-Slanted-lf-sc-ly1--base TeXGyreScholaX-Slanted "AutoEnc_dodlyjs2j6s5jsmywryamwqrwh ReEncodeFont" <[zcs_dodlyj.enc <TeXGyreScholaX-Slanted.pfb
 TeXGyreScholaX-Slanted-lf-sc-t1--base TeXGyreScholaX-Slanted "AutoEnc_x5uxyb4kvkfg4q23aej7tnic5a ReEncodeFont" <[zcs_x5uxyb.enc <TeXGyreScholaX-Slanted.pfb
 TeXGyreScholaX-Slanted-lf-ts1--base TeXGyreScholaX-Slanted "AutoEnc_zwynmlymc3bfzra6tcycixeqaa ReEncodeFont" <[zcs_zwynml.enc <TeXGyreScholaX-Slanted.pfb
-zcs-Italic-tlf-th-t1 TeXGyreScholaX-Italic  enczcs-ecth-tlf ReEncodeFont  <zcs-ecth-tlf.enc <TeXGyreScholaX-Italic.pfb
-zcs-Italic-tlf-th-ot1 TeXGyreScholaX-Italic  enczcs-ot1-th-tlf ReEncodeFont  <zcs-ot1-th-tlf.enc <TeXGyreScholaX-Italic.pfb
-zcs-Italic-osf-th-ot1 TeXGyreScholaX-Italic  enczcs-ot1-th-osf ReEncodeFont  <zcs-ot1-th-osf.enc <TeXGyreScholaX-Italic.pfb
-zcs-Italic-tlf-th-ly1 TeXGyreScholaX-Italic  enczcs-texnansi-th-tlf ReEncodeFont  <zcs-texnansi-th-tlf.enc <TeXGyreScholaX-Italic.pfb
-zcs-Italic-osf-th-ly1 TeXGyreScholaX-Italic  enczcs-texnansi-th-osf ReEncodeFont  <zcs-texnansi-th-osf.enc <TeXGyreScholaX-Italic.pfb
-zcs-Italic-tlf-th-t1 TeXGyreScholaX-Italic  enczcs-ecth-tlf ReEncodeFont  <zcs-ecth-tlf.enc <TeXGyreScholaX-Italic.pfb
-
+zcs-Italic-osf-th-ly1 TeXGyreScholaX-Italic "enczcs-texnansi-th-osf ReEncodeFont" <zcs-texnansi-th-osf.enc <TeXGyreScholaX-Italic.pfb
+zcs-Italic-osf-th-ot1 TeXGyreScholaX-Italic "enczcs-ot1-th-osf ReEncodeFont" <zcs-ot1-th-osf.enc <TeXGyreScholaX-Italic.pfb
+zcs-Italic-tlf-th-ly1 TeXGyreScholaX-Italic "enczcs-texnansi-th-tlf ReEncodeFont" <zcs-texnansi-th-tlf.enc <TeXGyreScholaX-Italic.pfb
+zcs-Italic-tlf-th-ot1 TeXGyreScholaX-Italic "enczcs-ot1-th-tlf ReEncodeFont" <zcs-ot1-th-tlf.enc <TeXGyreScholaX-Italic.pfb
+zcs-Italic-tlf-th-t1 TeXGyreScholaX-Italic "enczcs-ecth-tlf ReEncodeFont" <zcs-ecth-tlf.enc <TeXGyreScholaX-Italic.pfb
+zcs-Italic-osf-th-t1 TeXGyreScholaX-Italic "enczcs-ecth-osf ReEncodeFont" <zcs-ecth-osf.enc <TeXGyreScholaX-Italic.pfb
 NCMathRM NCMathRM <NCMathRM.pfb
 NCMathBRM NCMathBRM <NCMathBRM
 NCMathBMI NCMathBMI <NCMathBMI
diff --git a/fonts/scholax/tex/newtx-nc-subs.tex b/fonts/scholax/tex/newtx-nc-subs.tex
index e88ea8eb7c..4f8e5cd42f 100644
--- a/fonts/scholax/tex/newtx-nc-subs.tex
+++ b/fonts/scholax/tex/newtx-nc-subs.tex
@@ -1,8 +1,7 @@
-{f}{-2}
+{f}{-.5}
 {j}{-2}
-{p}{-1.5}
-{y}{-1.5}
-{A}{-1.5}
+{p}{-.5}
+{A}{-1}
 {B}{-1}
 {D}{-1}
 {H}{-1}
@@ -13,5 +12,6 @@
 {N}{-0.5}
 {P}{-1}
 {X}{-1}
-{\rho}{-1}
-{\beta}{-1}
\ No newline at end of file
+{\rho}{-2.5}
+{\beta}{-1}
+{\mu}{-2}
diff --git a/fonts/scholax/tex/newtx-ncf-subs.tex b/fonts/scholax/tex/newtx-ncf-subs.tex
index e88ea8eb7c..83b9eb292d 100644
--- a/fonts/scholax/tex/newtx-ncf-subs.tex
+++ b/fonts/scholax/tex/newtx-ncf-subs.tex
@@ -1,8 +1,7 @@
-{f}{-2}
+{f}{-.5}
 {j}{-2}
-{p}{-1.5}
-{y}{-1.5}
-{A}{-1.5}
+{p}{-.5}
+{A}{-1}
 {B}{-1}
 {D}{-1}
 {H}{-1}
@@ -13,5 +12,6 @@
 {N}{-0.5}
 {P}{-1}
 {X}{-1}
-{\rho}{-1}
-{\beta}{-1}
\ No newline at end of file
+{\rho}{-5}
+{\beta}{-3}
+{\mu}{-1.5}
diff --git a/fonts/scholax/tex/scholax.sty b/fonts/scholax/tex/scholax.sty
index cfe25b49e5..369573adfe 100644
--- a/fonts/scholax/tex/scholax.sty
+++ b/fonts/scholax/tex/scholax.sty
@@ -1,7 +1,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.01}
-\def\filedate{2020/01/01}
+\def\fileversion{1.02}
+\def\filedate{2020/01/02}
 \ProvidesPackage{scholax}
     [\filedate\space v\fileversion]
 
@@ -188,16 +188,18 @@ OsF}\fontshape{sc}\selectfont #1}%
 
 \AtEndPreamble{%
 \ifzcs@thrm%
-	\newtheoremstyle{plain}
-		{\medskipamount}   % ABOVESPACE, was \topsep
-    	{\medskipamount}   % BELOWSPACE, was \topsep
-    	{\thfamily}  % BODYFONT--\thfamily is defined to be \itshape with upright figures and punctuation
-    	{}       % INDENT (empty value is the same as 0pt)
-    	{\bfseries} % HEADFONT--you may want to add \tlfstyle so the number is tab lining, regardless of text figure selection
-    	{.}         % HEADPUNCT
-    	{5pt plus 1pt minus 1pt} % HEADSPACE
-    	{}          % CUSTOM-HEAD-SPEC[
-\fi%
+	\patchcmd{\th@plain}{\itshape}{\thfamily}{\message{Replaced itshape by thfamily in theorem style plain.}}{\message{Unable to replace itshape by thfamily in theorem style plain.}}
+\fi
+%	\newtheoremstyle{plain}
+%		{\medskipamount}   % ABOVESPACE, was \topsep
+%    	{\medskipamount}   % BELOWSPACE, was \topsep
+%    	{\thfamily}  % BODYFONT--\thfamily is defined to be \itshape with upright figures and punctuation
+%    	{}       % INDENT (empty value is the same as 0pt)
+%    	{\bfseries} % HEADFONT--you may want to add \tlfstyle so the number is tab lining, regardless of text figure selection
+%    	{.}         % HEADPUNCT
+%    	{5pt plus 1pt minus 1pt} % HEADSPACE
+%    	{}          % CUSTOM-HEAD-SPEC[
+%\fi%
 \renewcommand*{\rmdefault}%
  {TeXGyreScholaX-\TeXGyreScholaX@figurealign\TeXGyreScholaX@figurestyle}
 \newcommand*{\thdefault}{zcsth-\TeXGyreScholaX@figurestyle}