From a369ff2c1bd7ba6ac1d35b5722e5675bcf32bf04 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 2 Jan 2020 22:10:15 +0000 Subject: scholax (2jan20) git-svn-id: svn://tug.org/texlive/trunk@53301 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/fonts/scholax/README | 5 +- .../texmf-dist/doc/fonts/scholax/newtx-nc-subs.tex | 17 ------ .../doc/fonts/scholax/newtx-ncf-subs.tex | 17 ------ .../texmf-dist/doc/fonts/scholax/scholax-doc.pdf | Bin 309161 -> 362022 bytes .../texmf-dist/doc/fonts/scholax/scholax-doc.tex | 64 +++++++++++++++------ .../public/scholax/TeXGyreScholaX-Bold.otf | Bin 149248 -> 149288 bytes .../public/scholax/TeXGyreScholaX-BoldItalic.otf | Bin 157380 -> 157420 bytes .../public/scholax/TeXGyreScholaX-BoldSlanted.otf | Bin 164844 -> 164884 bytes .../public/scholax/TeXGyreScholaX-Italic.otf | Bin 152108 -> 152148 bytes .../public/scholax/TeXGyreScholaX-Regular.otf | Bin 143048 -> 143088 bytes .../public/scholax/TeXGyreScholaX-Slanted.otf | Bin 163928 -> 163968 bytes .../tfm/public/scholax/TeXGyreScholaX-Bold.tfm | Bin 0 -> 1484 bytes .../public/scholax/TeXGyreScholaX-BoldItalic.tfm | Bin 0 -> 1648 bytes .../public/scholax/TeXGyreScholaX-BoldSlanted.tfm | Bin 0 -> 1688 bytes .../tfm/public/scholax/TeXGyreScholaX-Italic.tfm | Bin 0 -> 1600 bytes .../tfm/public/scholax/TeXGyreScholaX-Regular.tfm | Bin 0 -> 1484 bytes .../tfm/public/scholax/TeXGyreScholaX-Slanted.tfm | Bin 0 -> 1696 bytes .../type1/public/scholax/TeXGyreScholaX-Bold.pfb | Bin 166961 -> 176370 bytes .../public/scholax/TeXGyreScholaX-BoldItalic.pfb | Bin 213702 -> 222065 bytes .../public/scholax/TeXGyreScholaX-BoldSlanted.pfb | Bin 212285 -> 218407 bytes .../type1/public/scholax/TeXGyreScholaX-Italic.pfb | Bin 169142 -> 173832 bytes .../public/scholax/TeXGyreScholaX-Regular.pfb | Bin 154161 -> 163140 bytes .../public/scholax/TeXGyreScholaX-Slanted.pfb | Bin 208150 -> 211859 bytes .../texmf-dist/tex/latex/scholax/newtx-nc-subs.tex | 17 ++++++ .../tex/latex/scholax/newtx-ncf-subs.tex | 17 ++++++ Master/texmf-dist/tex/latex/scholax/scholax.sty | 42 +++++++++----- Master/tlpkg/libexec/ctan2tds | 1 - 27 files changed, 115 insertions(+), 65 deletions(-) delete mode 100644 Master/texmf-dist/doc/fonts/scholax/newtx-nc-subs.tex delete mode 100644 Master/texmf-dist/doc/fonts/scholax/newtx-ncf-subs.tex create mode 100644 Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-Bold.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-BoldItalic.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-BoldSlanted.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-Italic.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-Regular.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-Slanted.tfm create mode 100644 Master/texmf-dist/tex/latex/scholax/newtx-nc-subs.tex create mode 100644 Master/texmf-dist/tex/latex/scholax/newtx-ncf-subs.tex (limited to 'Master') diff --git a/Master/texmf-dist/doc/fonts/scholax/README b/Master/texmf-dist/doc/fonts/scholax/README index 5b48986a845..37b03e5283a 100644 --- a/Master/texmf-dist/doc/fonts/scholax/README +++ b/Master/texmf-dist/doc/fonts/scholax/README @@ -8,6 +8,9 @@ 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.00 2019-12-30 +Current version: 1.01 2020-01-01 + +Changes in version 1.01 +Corrected theoremfont code in scholax.sty and modified documentation accordingly. Please sent bug reports, comments and suggestions to msharpe at ucsd dot edu. \ No newline at end of file diff --git a/Master/texmf-dist/doc/fonts/scholax/newtx-nc-subs.tex b/Master/texmf-dist/doc/fonts/scholax/newtx-nc-subs.tex deleted file mode 100644 index e88ea8eb7c9..00000000000 --- a/Master/texmf-dist/doc/fonts/scholax/newtx-nc-subs.tex +++ /dev/null @@ -1,17 +0,0 @@ -{f}{-2} -{j}{-2} -{p}{-1.5} -{y}{-1.5} -{A}{-1.5} -{B}{-1} -{D}{-1} -{H}{-1} -{I}{-1} -{K}{-1} -{L}{-1} -{M}{-1} -{N}{-0.5} -{P}{-1} -{X}{-1} -{\rho}{-1} -{\beta}{-1} \ No newline at end of file diff --git a/Master/texmf-dist/doc/fonts/scholax/newtx-ncf-subs.tex b/Master/texmf-dist/doc/fonts/scholax/newtx-ncf-subs.tex deleted file mode 100644 index e88ea8eb7c9..00000000000 --- a/Master/texmf-dist/doc/fonts/scholax/newtx-ncf-subs.tex +++ /dev/null @@ -1,17 +0,0 @@ -{f}{-2} -{j}{-2} -{p}{-1.5} -{y}{-1.5} -{A}{-1.5} -{B}{-1} -{D}{-1} -{H}{-1} -{I}{-1} -{K}{-1} -{L}{-1} -{M}{-1} -{N}{-0.5} -{P}{-1} -{X}{-1} -{\rho}{-1} -{\beta}{-1} \ No newline at end of file diff --git a/Master/texmf-dist/doc/fonts/scholax/scholax-doc.pdf b/Master/texmf-dist/doc/fonts/scholax/scholax-doc.pdf index 0e3b77c6bd9..50a1860f832 100644 Binary files a/Master/texmf-dist/doc/fonts/scholax/scholax-doc.pdf and b/Master/texmf-dist/doc/fonts/scholax/scholax-doc.pdf differ diff --git a/Master/texmf-dist/doc/fonts/scholax/scholax-doc.tex b/Master/texmf-dist/doc/fonts/scholax/scholax-doc.tex index 5dd693c125e..ffb3d1fc06f 100644 --- a/Master/texmf-dist/doc/fonts/scholax/scholax-doc.tex +++ b/Master/texmf-dist/doc/fonts/scholax/scholax-doc.tex @@ -17,28 +17,33 @@ \usepackage[T1]{fontenc} \usepackage{textcomp} \usepackage[varqu,varl]{zi4}% inconsolata -\usepackage{amsmath,amsthm} +\usepackage{amsmath,amsthm} \usepackage[scaled=1.075,ncf]{newtxmath} % option vvarbb gives you stix blackboard bold %\useosf % use oldstyle figures except in math -%SetFonts +%SetFonts \newtheoremstyle{oldplain} {\topsep} % ABOVESPACE {\topsep} % BELOWSPACE {\itshape} % BODYFONT {} % INDENT (empty value is the same as 0pt) {\bfseries} % HEADFONT - {.} % HEADPUNCT + {.} % HEADPUNC {5pt plus 1pt minus 1pt} % HEADSPACE {} % CUSTOM-HEAD-SPEC \theoremstyle{oldplain} \newtheorem{oldthm}{Theorem}[section] + +%\newtheoremstyle{plain} +% {\medskipamount} % ABOVESPACE +% {\medskipamount} % BELOWSPACE +% {\thfamily} % BODYFONT +% {} % INDENT (empty value is the same as 0pt) +% {\bfseries} % HEADFONT +% {.} % HEADPUNCT +% {5pt plus 1pt minus 1pt} % HEADSPACE +% {} % CUSTOM-HEAD-SPEC \theoremstyle{plain} -\makeatletter -\let\thm\relax -\let\@thm\relax -\let\c@thm\relax -\makeatother \newtheorem{thm}{Theorem}[section] \usepackage{trace} \title{ScholaX} @@ -54,7 +59,7 @@ \maketitle \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 TeXGyreSchola fonts which in turn extended the URW rendering of 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. +{\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. Slanted and Bold Slanted styles are provided in addition to the basic Regular, Bold, Italic and Bold Italic. @@ -76,22 +81,49 @@ The option {\tt osf} has the same effect as the macro \verb|\useosf|, which must This option makes {\tt osf} the default figure style in small cap text. {\tt theoremfont:}\\ -This option defines a new text family, {\tt thfamily}, amounting to Italic with upright punctuation glyphs. -(This differs from the behaving in earlier packages, which involved redefining the meaning of \verb|\textsl| and substituting it for \verb|\textit| in the definition of the {\tt plain} theorem style.)\\ +This option makes use of a new text font family, {\tt thfamily}, amounting to Italic with upright punctuation glyphs. +(This differs from the behavior in earlier packages, which involved redefining the meaning of \verb|\slshape| and substituting it for \verb|\itshape| in the definition of the {\tt plain} theorem style.)\\ {\thfamily This is how the \verb|\thfamily| looks: it is Italic but has upright punctuation symbols :;!? etc. The figures are not changed, but should in many cases be tabular lining figures, accessed using, e.g.,\/} \verb|\texttlf|. -The {\tt theoremfont} option changes the default font used for the {\tt plain} theorem style of {\tt amsthm} to use \verb|\thfamily|. For example, with this option, you get theorem statements like this: +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 +\begin{verbatim} +\theoremstyle{plain} +\newtheorem{thm}{Theorem}[section] +\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 <<<<<<<<