diff options
Diffstat (limited to 'fonts/etbb/tex/ETbb.sty')
-rw-r--r-- | fonts/etbb/tex/ETbb.sty | 43 |
1 files changed, 13 insertions, 30 deletions
diff --git a/fonts/etbb/tex/ETbb.sty b/fonts/etbb/tex/ETbb.sty index 4ef6dc50f5..6c997b93fa 100644 --- a/fonts/etbb/tex/ETbb.sty +++ b/fonts/etbb/tex/ETbb.sty @@ -1,11 +1,11 @@ %% \NeedsTeXFormat{LaTeX2e} \def\fileversion{1.052} -\def\filedate{2022/02/04} +\def\filedate{2022/02/01} \ProvidesPackage{ETbb} [\filedate\space v\fileversion. Style file for ETbb.] -\RequirePackage[T1]{fontenc} +\RequirePackage[LY1,T1]{fontenc} \RequirePackage[full]{textcomp} \RequirePackage{ifetex} \ifetex\RequirePackage{etoolbox}\fi %etoolbox loads etex.sty @@ -77,7 +77,6 @@ }% } -%\newcommand*{\ETbb@First}[2]{\def#2{\StrLeft \newcommand*{\ETbb@scale}{1} \RequirePackage{xkeyval} \DeclareOptionX{scale}{\renewcommand*{\ETbb@scale}{#1}} @@ -92,7 +91,6 @@ \def\useproportional{\edef\ETbb@figurealign{}} \@onlypreamble\useproportional \def\ETbb@@swashQ{} -\def\ETbb@swashID{0} \newif\if@ETbb@sharpS \newif\if@ETbb@sups \newif\if@ETbb@scosf @@ -109,17 +107,17 @@ \DeclareOptionX{oldstyle}{\useosf} \DeclareOptionX{osf}{\useosf} \DeclareOptionX{useosf}{\useosf} -\DeclareOptionX{tabular}{\def\ETbb@figurealign{T}} -\DeclareOptionX{t}{\def\ETbb@figurealign{T}} +\DeclareOptionX{tabular}{\edef\ETbb@figurealign{T}} +\DeclareOptionX{t}{\edef\ETbb@figurealign{T}} \DeclareOptionX{proportional}{\useproportional} \DeclareOptionX{p}{\useproportional} \DeclareOptionX{sharpS}{\@ETbb@sharpStrue} -\DeclareOptionX{swashQ}{\def\ETbb@@swashQ{-swash}\def\ETbb@swashID{1}} +\DeclareOptionX{swashQ}{\edef\ETbb@@swashQ{-swash}} \DeclareOptionX{mainfont}{ \renewcommand{\familydefault}{\rmdefault} } -\DeclareOptionX{bold}{\def\bfseries@rm{bold}} -\DeclareOptionX{regular}{\def\mdseries@rm{regular}} +\DeclareOptionX{bold}{\edef\bfseries@rm{bold}} +\DeclareOptionX{regular}{\edef\mdseries@rm{regular}} \DeclareOptionX{sups}{\@ETbb@supstrue} \DeclareOptionX{scosf}{\@ETbb@scosftrue} \ExecuteOptionsX{lining,tabular,bold,regular,mainfont} @@ -174,6 +172,10 @@ {\fontfamily{ETbb-\ETbb@figurealign OsF}\fontshape{sc}\selectfont #1}% }\fi +\newcommand{\Qswash}{{\fontencoding{TS1}\fontfamily{ETbb-LF}\selectfont \char59 }} +\newcommand{\Qnoswash}{{\fontencoding{TS1}\fontfamily{ETbb-LF}\selectfont \char58 }} + +%\renewcommand*{\familydefault}{\rmdefault} \if@ETbb@sups % \ifdefined\sufigures \def\f@@tn@te{footnote} @@ -189,27 +191,8 @@ \fi}% \fi% \fi -\def\Qswash{Q} -\def\Qnoswash{Q} -\def\altQ{Q} \AtEndPreamble{\renewcommand*{\rmdefault}{ETbb-\ETbb@figurealign\ETbb@figurestyle} -\normalfont -\def\ETbb@fst#1#2\@nil{#1} % will apply only to expansion of \encodingdefault -\def\ETbb@altQEnc{OT1} -\edef\ETbb@tmpa{\noexpand\ETbb@fst\encodingdefault\noexpand\@nil}% -\edef\ETbb@E{\ETbb@tmpa} -\if O\ETbb@E\def\ETbb@altQEnc{T1}\fi -\ifnum0=\ETbb@swashID - \def\Qswash{{\def\ETbb@@swashQ{-swash}\fontencoding{\ETbb@altQEnc}\selectfont Q}}% - \def\Qnoswash{Q} - \let\altQ=\Qswash% -\else - \def\Qnoswash{{\def\ETbb@@swashQ{}\fontencoding{\ETbb@altQEnc}\selectfont Q}}% - \def\Qswash{Q} - \def\altQ{Q} -\fi} -\AtBeginDocument{% -\setbox0\hbox{\Qswash\Qnoswash\altQ} -} % seems to be required for those glyphs to activate later in document +\normalfont} + \endinput |