diff options
Diffstat (limited to 'fonts/scholax/tex/scholax.sty')
-rw-r--r-- | fonts/scholax/tex/scholax.sty | 60 |
1 files changed, 22 insertions, 38 deletions
diff --git a/fonts/scholax/tex/scholax.sty b/fonts/scholax/tex/scholax.sty index 369573adfe..6613c6c0a7 100644 --- a/fonts/scholax/tex/scholax.sty +++ b/fonts/scholax/tex/scholax.sty @@ -1,7 +1,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{1.02} -\def\filedate{2020/01/02} +\def\fileversion{1.00} +\def\filedate{2019/12/27} \ProvidesPackage{scholax} [\filedate\space v\fileversion] @@ -74,7 +74,6 @@ \def\zcs@shrink{.093em} \DeclareOptionX{spacing}{\gdef\zcs@spc{#1}} \DeclareOptionX{stretch}{\gdef\zcs@stretch{#1}} -\DeclareOptionX{shrink}{\gdef\zcs@shrink{#1}} \DeclareOptionX{foresolidus}{\gdef\zcs@foresolidus{#1}} \DeclareOptionX{aftsolidus}{\gdef\zcs@aftsolidus{#1}} \DeclareOptionX{raisefrac}{\gdef\zcs@raisefrac{#1}} @@ -98,13 +97,15 @@ \DeclareOptionX{loosest}{% \gdef\zcs@spc{.333em}\gdef\zcs@stretch{.222em}\gdef\zcs@shrink{.111em}} -\ExecuteOptionsX{tabular,lining,mainfont} -\ProcessOptionsX\relax +\ExecuteOptionsX{lining,tabular} +\ProcessOptionsX \def\zcs@spacing{% \fontdimen2\font=\zcs@spc \fontdimen3\font=\zcs@stretch \fontdimen4\font=\zcs@shrink } +\ExecuteOptionsX{tabular,lining,mainfont} +\ProcessOptionsX\relax \DeclareRobustCommand{\lfstyle}{% \not@math@alphabet\lfstyle\relax @@ -164,42 +165,25 @@ OsF}\fontshape{sc}\selectfont #1}% {\not@math@alphabet\thfamily\relax \fontfamily\thdefault\selectfont} -%\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} - +\ifzcs@thrm + %\RequirePackage{amsmath,amsthm} % in case of theoremfont + \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% - \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} |