scholax (4apr21)

git-svn-id: svn://tug.org/texlive/trunk@58733 c570f23f-e606-0410-a88d-b1316a301751

12 files changed, 71 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/fonts/scholax/README b/Master/texmf-dist/doc/fonts/scholax/README
index a7d84694f77..d6db6209c61 100644
--- a/Master/texmf-dist/doc/fonts/scholax/README
+++ b/Master/texmf-dist/doc/fonts/scholax/README
@@ -1,14 +1,18 @@
 The ScholaX Font Package
 ========================
 
-ScholaX is made up of text fonts based on TeXGyreSchola, extended to include a quite full set of superior letters and figures and a set of inferior figures. The italic face has been enhanced wth upright punctuation glyphs so that a special theorem font can be made available. Math support is available via newtxmath using one of two options: option "nc" (for New Century [Schoolbook]) uses the newtx Greek alphabets, while option "ncf" uses Greek math alphabets derived from those in the Fourier package. The additions to TeXGyreSchola, named TeXGyreScholaX, and the revisions/additions to the Fourier Greek alphabets are copyright (c) 2019 by Michael Sharpe. The first release was dated 2019-12-30.
+ScholaX is made up of text fonts based on TeXGyreSchola, extended to include a quite full set of superior letters and figures and a set of inferior figures. The italic face has been enhanced wth upright punctuation glyphs so that a special theorem font can be made available. Math support is available via newtxmath using one of two options: option "nc" (for New Century [Schoolbook]) uses the newtx Greek alphabets, while option "ncf" uses Greek math alphabets derived from those in the Fourier package. The additions to TeXGyreSchola, named TeXGyreScholaX, and the revisions/additions to the Fourier Greek alphabets are copyright (c) 2019--2021 by Michael Sharpe. The first release was dated 2019-12-30.
 
 LICENCE
 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.029 2020-12-19
+Current version: 1.030 2021-03-24
+
+Changes in version 1.030
+1. Brought math blackboard bold alphabets into conformance with additions to newtxmath.
+2. Improved the \textfrac macro along the lines of the one in newtxtext.sty.
 
 Changes in version 1.029
 Added a number of Blackboard Bold Greek glyphs to math family lettersA.
diff --git a/Master/texmf-dist/doc/fonts/scholax/scholax-doc.pdf b/Master/texmf-dist/doc/fonts/scholax/scholax-doc.pdf
index 6b938385b63..4fbfe92a6aa 100644
--- a/Master/texmf-dist/doc/fonts/scholax/scholax-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/scholax/scholax-doc.pdf
diff --git a/Master/texmf-dist/doc/fonts/scholax/scholax-doc.tex b/Master/texmf-dist/doc/fonts/scholax/scholax-doc.tex
index 0a096a88590..ddc29d3c3cb 100644
--- a/Master/texmf-dist/doc/fonts/scholax/scholax-doc.tex
+++ b/Master/texmf-dist/doc/fonts/scholax/scholax-doc.tex
@@ -15,7 +15,7 @@
 %\usepackage{amssymb}% don't use with newtxmath
 %SetFonts
 % scholax+newtxmath
-\usepackage[theoremfont,foresolidus=-.1em,aftsolidus=-.11em]{scholax} % use sb in place of bold
+\usepackage[theoremfont,foresolidus=.05em,aftsolidus=-.11em]{scholax} % use sb in place of bold
 \usepackage[T1]{fontenc}
 \usepackage{textcomp}
 \usepackage[varqu,varl]{zi4}% inconsolata
@@ -51,15 +51,8 @@
 \title{ScholaX}
 \author{Michael Sharpe}
 \date{\today}  % Activate to display a given date or no date
-\makeatletter
-%\renewcommand*{\textnu}[1]{\zcs@raisefrac \hbox{\textsu{#1}}}
-%\newcommand*{\textde}[1]{\zcs@raisefrac \hbox{\textin{#1}}}
-%\renewcommand*{\textfrac}[2]{%
-%    \hbox{\textsu{#1}\kern \zcs@foresolidus \textfractionsolidus\kern \zcs@aftsolidus \textin{#2}}}
-\makeatother
 \begin{document}
 \maketitle
-%\show\thdefault
 \section*{In short}
 
 {\tt ScholaX} has a text part and a math support part that is called with an option to {\tt newtxmath}. The text component has many of the options and macros that are part of the {\tt newtxtext} package, but with Times fonts replaced by {\tt TeXGyreScholaX} fonts, the latter being an an extension of the {\tt TeXGyreSchola} fonts which in turn extended the URW rendering of \emph{New Century Schoolbook} that was donated as open source to the Ghostscript project. The font is based on early nineteenth century ``Scotch'' type, whose dominant features are low contrast as compared to, say, Times and Baskerville, and a relatively tall x-height. Its revivals gained popularity because of studies indicating its readability by children leading to its adoption in many texts for that market. Now that I am approaching the age where second childhood is not uncommon, the font is looking more interesting.
@@ -149,11 +142,11 @@ These macros provide ways to use other figures styles, no matter what defaults m
 %\verb|\textsu{1}\textnu{1}; \textin{1}\textde{1}| \textsu{1}\textnu{1}; \textin{1}\textde{1} \verb|Note the differences in size and baseline|
 %\verb|\textfrac{17}{32}| \textfrac{17}{32} Constructs fractions using \verb|\textnu| and \verb|\textde|.
 \verb|\textsu{1}X\textin{1}| renders as \textsu{1}X\textin{1} \\
-\verb|2\textfrac{19}{32}| renders as 2\textfrac{19}{32} with default settings. Note also \textfrac{1}{2}, \textfrac{1}{4}, \textfrac{3}{4}, \textfrac{7}{8}, \textfrac{3}{16}, the first three of which are hard-coded in the font. There are clear deficiencies in the \verb|\textfrac| macro used in this package, and for a better one, one must use the approach now used in {\tt newtxtext}, which is much more involved.
+\verb|\textfrac[2]{19}{32}| renders as \textfrac[2]{19}{32} with default settings. Note also \textfrac{1}{2}, \textfrac{1}{4}, \textfrac{3}{4}, \textfrac{7}{8}, \textfrac{3}{16}. (The optional argument to \verb|\textfrac| is the integer part.)
 
 The \verb|\textfrac| constructs fractions using \verb|\textsu| and \verb|\textin|, raising the result to align with the text baseline. The behavior is quite configurable, there being three parameters available to control the kerns before and after the fraction solidus, and the amount to raise the resulting box. The three parameters are passed as options to {\tt scholax}, named
 \begin{verbatim}
-foresolidus % default value -.1em
+foresolidus % default value .04em
 aftsolidus  % default value -.11em
 raisefrac   % default value .111em
 \end{verbatim}
@@ -217,7 +210,7 @@ You should normally load {\tt babel} before loading {\tt scholax} in order for {
 Unless you specify in the options a choice (one of {\tt varbb}, {\tt vvarbb} for your blackboard bold alphabet, \verb|\mathbb| will use the default blackboard bold alphabet: $\mathbb{A\dots Z, k}$ (the only lowercase letter available is $\mathbb{k}$), which I find unappealing because the uneven separations between boundaries makes the gray level likewise uneven. There are  two macros which provide access to other alphabets: 
 \begin{itemize}
 \item
-\verb|\vmathbb| gives you $\vmathbb{A\dots Z k 1\imath\jmath}$ ($\vmathbb{k}$  is sole lowercase, $\vmathbb{1\imath\jmath}$ borrowed from \verb|\vvmathbb|);
+\verb|\vmathbb| gives you $\vmathbb{A\dots Z x 1\imath\jmath}$ (full lowercase, \verb|\imath,\jmath|, $\vmathbb{1}$ borrowed from \verb|\vvmathbb|);
 \item \verb|\vvmathbb| gives you $\vvmathbb{A\dots z12\imath\jmath}$ (full lowercase, digits, \verb|\imath,\jmath|).
 \end{itemize}
 For further details, consult the {\tt newtx} documentation.
@@ -430,5 +423,23 @@ $$\max_{1\le n\le m}\log_2P_n \quad \hbox{and} \quad
 
 $$p_1(n)=\lim_{m\to\infty}\sum_{\nu=0}^\infty\bigl(1-\cos^{2m}(\nu!^n\pi/n)\bigr)$$
 
+\newpage
+\section*{Font Tables}
+
+\textsc{Math Letters (option {\tt nc})}
+\fonttable{zncmi}
+
+\newpage
+
+\textsc{Math LettersA (option {\tt nc})}
+\fonttable{zncmia}
+\newpage 
+\textsc{Math Letters (option {\tt ncf})}
+\fonttable{zncfmi}
+
+\newpage
+
+\textsc{Math LettersA (option {\tt ncf})}
+\fonttable{zncfmia}
 
  \end{document}  
\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/tfm/public/scholax/zncbmia.tfm b/Master/texmf-dist/fonts/tfm/public/scholax/zncbmia.tfm
index 720ac343f10..1007dc25701 100644
--- a/Master/texmf-dist/fonts/tfm/public/scholax/zncbmia.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/scholax/zncbmia.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/scholax/zncfbmia.tfm b/Master/texmf-dist/fonts/tfm/public/scholax/zncfbmia.tfm
index 12426666968..84f96d66016 100644
--- a/Master/texmf-dist/fonts/tfm/public/scholax/zncfbmia.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/scholax/zncfbmia.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/scholax/zncfmia.tfm b/Master/texmf-dist/fonts/tfm/public/scholax/zncfmia.tfm
index b2784f16713..269ace9adec 100644
--- a/Master/texmf-dist/fonts/tfm/public/scholax/zncfmia.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/scholax/zncfmia.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/scholax/zncmia.tfm b/Master/texmf-dist/fonts/tfm/public/scholax/zncmia.tfm
index 5d4b5b037ad..f6d06caf419 100644
--- a/Master/texmf-dist/fonts/tfm/public/scholax/zncmia.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/scholax/zncmia.tfm
diff --git a/Master/texmf-dist/fonts/vf/public/scholax/zncbmia.vf b/Master/texmf-dist/fonts/vf/public/scholax/zncbmia.vf
index c0a5b4a4420..8fa903d601b 100644
--- a/Master/texmf-dist/fonts/vf/public/scholax/zncbmia.vf
+++ b/Master/texmf-dist/fonts/vf/public/scholax/zncbmia.vf
diff --git a/Master/texmf-dist/fonts/vf/public/scholax/zncfbmia.vf b/Master/texmf-dist/fonts/vf/public/scholax/zncfbmia.vf
index aa71009df51..e42b3605fad 100644
--- a/Master/texmf-dist/fonts/vf/public/scholax/zncfbmia.vf
+++ b/Master/texmf-dist/fonts/vf/public/scholax/zncfbmia.vf
diff --git a/Master/texmf-dist/fonts/vf/public/scholax/zncfmia.vf b/Master/texmf-dist/fonts/vf/public/scholax/zncfmia.vf
index 439f2b892e1..cad0c3ba23c 100644
--- a/Master/texmf-dist/fonts/vf/public/scholax/zncfmia.vf
+++ b/Master/texmf-dist/fonts/vf/public/scholax/zncfmia.vf
diff --git a/Master/texmf-dist/fonts/vf/public/scholax/zncmia.vf b/Master/texmf-dist/fonts/vf/public/scholax/zncmia.vf
index 25cb520046b..533ffe6820a 100644
--- a/Master/texmf-dist/fonts/vf/public/scholax/zncmia.vf
+++ b/Master/texmf-dist/fonts/vf/public/scholax/zncmia.vf
diff --git a/Master/texmf-dist/tex/latex/scholax/scholax.sty b/Master/texmf-dist/tex/latex/scholax/scholax.sty
index a73208f97b2..ce850acdb08 100644
--- a/Master/texmf-dist/tex/latex/scholax/scholax.sty
+++ b/Master/texmf-dist/tex/latex/scholax/scholax.sty
@@ -1,7 +1,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.028}
-\def\filedate{2020/12/18}
+\def\fileversion{1.030}
+\def\filedate{2021/03/24}
 \ProvidesPackage{scholax}
     [\filedate\space v\fileversion]
 
@@ -9,6 +9,7 @@
 
 \RequirePackage[LY1,T1]{fontenc}
 \RequirePackage{textcomp}
+\RequirePackage{ifthen,xstring}
 \DeclareEncodingSubset{TS1}{TeXGyreScholaX-*}{0}
 \RequirePackage{etoolbox}
 \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
@@ -35,8 +36,8 @@
         \fontfigurestyle{inferior}\selectfont}
     \DeclareTextFontCommand{\textin}{\infigures}
     \let\textinferior\textin
-    \providecommand*{\textfrac}[2]{%
-    \raise \zcs@raisefrac \hbox{\textsu{##1}\kern \zcs@foresolidus \textfractionsolidus\kern \zcs@aftsolidus \textin{##2}}}
+%    \providecommand*{\textfrac}[2]{%
+%    \raise \zcs@raisefrac \hbox{\textsu{##1}\kern \zcs@foresolidus \textfractionsolidus\kern \zcs@aftsolidus \textin{##2}}}
 }{}
 
 
@@ -65,7 +66,7 @@
 \@onlypreamble\useproportional
 \newif\ifzcs@thrm
 
-\def\zcs@foresolidus{-.1em}
+\def\zcs@foresolidus{.04em}
 \def\zcs@aftsolidus{-.11em}
 \def\zcs@raisefrac{.111em}
 \edef\bfseries@rm{b}
@@ -142,6 +143,43 @@
 OsF}\fontshape{sc}\selectfont #1}%
 }\fi% use OsF in small caps
 
+\newcommand{\textfrac}[3][]{% e.g., \textfrac[1]{7}{8}
+  \mbox{%
+    \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
+      {\textlf{#1}\kern.05em}{}%         
+    \raise \zcs@raisefrac \hbox{%
+    \textsu{#2}% numerator
+    \StrRight{#2}{1}[\@digit@]%
+    % look for  1, 2, 6, 7
+    \ifcase\@digit@% 0
+    \or%\kern.03em% 1
+    \or%\kern.02em% 2
+    \or\kern-.02em% 3
+    \or\kern.01em% 4
+    \or\kern-.01em% 5
+    \or%\kern-.01em% 6
+    \or\kern-.08em% 7
+    \or%\kern-.08em% 8
+    \or\kern-.04em% 9
+    \fi%
+    \kern\zcs@foresolidus{\fontencoding{TS1}\selectfont\char"2F}%
+    \kern\zcs@aftsolidus%
+    \StrLeft{#3}{1}[\@digit@]%
+    % look for 1, 4, 7
+    \ifcase\@digit@% 0
+    \or%\kern -.02em% 1
+    \or\kern .01em% 2
+    \or% 3
+    \or\kern -.08em% 4
+    \or\kern -.01em% 5
+    \or\kern -.04em% 6
+    \or%\kern .02em% 7
+    \fi%
+    \textin{#3}%       denominator [#3]
+  }% hbox
+  }
+}
+
 \renewcommand*{\rmdefault}{TeXGyreScholaX-TLF} % always TLF in math
 \renewcommand*{\familydefault}{\rmdefault}