diff options
| author | Karl Berry <karl@freefriends.org> | 2020-01-02 22:10:15 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2020-01-02 22:10:15 +0000 |
| commit | a369ff2c1bd7ba6ac1d35b5722e5675bcf32bf04 (patch) | |
| tree | 2ebac38e6fcf996fcad90c5914be5832364fc2a5 | |
| parent | d71cc75f7e13c0f078222e7349195589b44ce586 (diff) | |
scholax (2jan20)
git-svn-id: svn://tug.org/texlive/trunk@53301 c570f23f-e606-0410-a88d-b1316a301751
25 files changed, 81 insertions, 31 deletions
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/scholax-doc.pdf b/Master/texmf-dist/doc/fonts/scholax/scholax-doc.pdf Binary files differindex 0e3b77c6bd9..50a1860f832 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 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 <<<<<<<<<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 +\begin{verbatim} +\theoremstyle{plain} +\newtheorem{thm}{Theorem}[section] +\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} -This is Theorem Italic: text numbers are upright---12345; punctuation is in many cases upright (also, parens, braces \{\} and brackets []). What about question marks and exclamations? Also upright! [These fit better with math mode punctuation and figures, like: for all $x\in[0,1]$, let $f(x)\coloneq \exp(\alpha x)$]. +This is Theorem Italic: text numbers are upright---12345; punctuation is in many cases upright (also, parens, braces \{\} and brackets []). What about question marks and exclamations? Also upright! [These fit better with math mode punctuation and figures, like: for all $x\in[0,1]$, let $f(x)\coloneq \exp(\alpha x)$.] \end{thm} Compare this to traditional {\tt plain} theorem style of the same text: \begin{oldthm} -This is Theorem Italic: text numbers are upright---12345; punctuation is in many cases upright (also, parens, braces \{\} and brackets []). What about question marks and exclamations? Also upright! [These fit better with math mode punctuation and figures, like: for all $x\in[0,1]$, let $f(x)\coloneq \exp(\alpha x)$]. +This is Theorem Italic: text numbers are upright---12345; punctuation is in many cases upright (also, parens, braces \{\} and brackets []). What about question marks and exclamations? Also upright! [These fit better with math mode punctuation and figures, like: for all $x\in[0,1]$, let $f(x)\coloneq \exp(\alpha x)$.] \end{oldthm} -If you are using another theorem package (e.g., {\tt ntheorem, theorem}) you will have to add your own descriptors as specified in the its documentation and set the body font to \verb|\thfamily|. {\tt sups:}\\ This makes superior figures to be used in footnote markers except in minipages. This option is prevented when using the KOMA classes, with which it may conflict. The option has no effect if you define a non-default handling of footnote markers in your preamble before loading {\tt scholax}. @@ -124,7 +156,7 @@ If you were to change the default behavior with the option \begin{verbatim} raisefrac=0em \end{verbatim} -you would get a fraction with the denominator's baseline at the baseline of the \verb|\textin| figures, namely {\tt .111em}. Those who wish the fractional part to be vertically centered with respect to lining figures should specify +you would get a fraction with the denominator's baseline at the baseline of the \verb|\textin| figures, namely {\tt -.111em}. Those who wish the fractional part to be vertically centered with respect to lining figures should specify \begin{verbatim} raisefrac=.052em \end{verbatim} diff --git a/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-Bold.otf b/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-Bold.otf Binary files differindex c317fbc3bbc..1b8d57fcbb4 100644 --- a/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-Bold.otf +++ b/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-Bold.otf diff --git a/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-BoldItalic.otf b/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-BoldItalic.otf Binary files differindex 07a5fbe77a2..9470ca7743f 100644 --- a/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-BoldItalic.otf +++ b/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-BoldItalic.otf diff --git a/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-BoldSlanted.otf b/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-BoldSlanted.otf Binary files differindex 84c02fb2511..468b88a37c4 100644 --- a/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-BoldSlanted.otf +++ b/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-BoldSlanted.otf diff --git a/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-Italic.otf b/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-Italic.otf Binary files differindex e9774836697..c360bf6406e 100644 --- a/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-Italic.otf +++ b/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-Italic.otf diff --git a/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-Regular.otf b/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-Regular.otf Binary files differindex 9115c618b34..af8b2755e99 100644 --- a/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-Regular.otf +++ b/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-Regular.otf diff --git a/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-Slanted.otf b/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-Slanted.otf Binary files differindex 0e42ec44774..a2ad82b466e 100644 --- a/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-Slanted.otf +++ b/Master/texmf-dist/fonts/opentype/public/scholax/TeXGyreScholaX-Slanted.otf diff --git a/Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-Bold.tfm Binary files differnew file mode 100644 index 00000000000..d176c8cc474 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-Bold.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-BoldItalic.tfm b/Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-BoldItalic.tfm Binary files differnew file mode 100644 index 00000000000..c3c35200d62 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-BoldItalic.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-BoldSlanted.tfm b/Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-BoldSlanted.tfm Binary files differnew file mode 100644 index 00000000000..6e8f63b72dc --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-BoldSlanted.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-Italic.tfm b/Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-Italic.tfm Binary files differnew file mode 100644 index 00000000000..d68b5b0d74b --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-Italic.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-Regular.tfm Binary files differnew file mode 100644 index 00000000000..b09578df4b2 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-Regular.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-Slanted.tfm Binary files differnew file mode 100644 index 00000000000..8e855c9127a --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/scholax/TeXGyreScholaX-Slanted.tfm diff --git a/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-Bold.pfb b/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-Bold.pfb Binary files differindex f50a86605d4..0f01ce303d9 100644 --- a/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-Bold.pfb +++ b/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-Bold.pfb diff --git a/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-BoldItalic.pfb b/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-BoldItalic.pfb Binary files differindex 223486e4c77..f1a1cd7df0e 100644 --- a/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-BoldItalic.pfb +++ b/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-BoldItalic.pfb diff --git a/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-BoldSlanted.pfb b/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-BoldSlanted.pfb Binary files differindex 5ed9c4ba125..e3257948b19 100644 --- a/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-BoldSlanted.pfb +++ b/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-BoldSlanted.pfb diff --git a/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-Italic.pfb b/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-Italic.pfb Binary files differindex 2684e6a2390..b38ef0b622a 100644 --- a/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-Italic.pfb +++ b/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-Italic.pfb diff --git a/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-Regular.pfb b/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-Regular.pfb Binary files differindex 316c49bb747..4bbd13f908d 100644 --- a/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-Regular.pfb +++ b/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-Regular.pfb diff --git a/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-Slanted.pfb b/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-Slanted.pfb Binary files differindex 59f0465480a..077516efa3b 100644 --- a/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-Slanted.pfb +++ b/Master/texmf-dist/fonts/type1/public/scholax/TeXGyreScholaX-Slanted.pfb diff --git a/Master/texmf-dist/doc/fonts/scholax/newtx-nc-subs.tex b/Master/texmf-dist/tex/latex/scholax/newtx-nc-subs.tex index e88ea8eb7c9..e88ea8eb7c9 100644 --- a/Master/texmf-dist/doc/fonts/scholax/newtx-nc-subs.tex +++ b/Master/texmf-dist/tex/latex/scholax/newtx-nc-subs.tex diff --git a/Master/texmf-dist/doc/fonts/scholax/newtx-ncf-subs.tex b/Master/texmf-dist/tex/latex/scholax/newtx-ncf-subs.tex index e88ea8eb7c9..e88ea8eb7c9 100644 --- a/Master/texmf-dist/doc/fonts/scholax/newtx-ncf-subs.tex +++ b/Master/texmf-dist/tex/latex/scholax/newtx-ncf-subs.tex diff --git a/Master/texmf-dist/tex/latex/scholax/scholax.sty b/Master/texmf-dist/tex/latex/scholax/scholax.sty index 98c2043a5ff..cfe25b49e5e 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.00} -\def\filedate{2019/12/30} +\def\fileversion{1.01} +\def\filedate{2020/01/01} \ProvidesPackage{scholax} [\filedate\space v\fileversion] @@ -164,10 +164,31 @@ OsF}\fontshape{sc}\selectfont #1}% {\not@math@alphabet\thfamily\relax \fontfamily\thdefault\selectfont} -\ifzcs@thrm - \ifdefined\newtheoremstyle %amsthm and ntheorem, not theorem.sty - \@ifpackageloaded{ntheorem}\relax{% - \newtheoremstyle{plain} +%\ifzcs@thrm +% \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 + +%\def\thrmplain{\ifzcs@thrm% +% \ifdefined\newtheoremstyle %amsthm and ntheorem, not theorem.sty +% \@ifpackageloaded{ntheorem}\relax{% +% \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\newtheorem{thm}{Theorem}[section] +% } % end @ifpackageloaded +% \fi% +%\fi} + + + +\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 @@ -175,13 +196,8 @@ OsF}\fontshape{sc}\selectfont #1}% {\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\newtheorem{thm}{Theorem}[section] - } % end @ifpackageloaded - \fi% -\fi - - -\AtEndPreamble{% + {} % CUSTOM-HEAD-SPEC[ +\fi% \renewcommand*{\rmdefault}% {TeXGyreScholaX-\TeXGyreScholaX@figurealign\TeXGyreScholaX@figurestyle} \newcommand*{\thdefault}{zcsth-\TeXGyreScholaX@figurestyle} diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 2c3ff616ab4..ddbd7f33577 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1121,7 +1121,6 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`); 'sagetex', "die 'skipping, omitted at author request (25 Jan 2010 19:50:16)'", 'sansmathaccent', "&MAKEflatten", 'sansmathfonts', "&MAKEflatten", - 'scholax', "&MAKEflatten", 'schulschriften', "&MAKEflatten", 'schwell', "die 'skipping, use gothic'", 'scientifixpaper', "die 'skipping, noinfo license'", |