From f2eb58cedc65eb309f9886084b630aa9038e692d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 4 Feb 2022 22:17:39 +0000 Subject: etbb (4feb22) git-svn-id: svn://tug.org/texlive/trunk@61872 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/etbb/ETbb.sty | 59 ++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 20 deletions(-) (limited to 'Master/texmf-dist/tex/latex/etbb') diff --git a/Master/texmf-dist/tex/latex/etbb/ETbb.sty b/Master/texmf-dist/tex/latex/etbb/ETbb.sty index c46fd4bfdb7..4ef6dc50f59 100644 --- a/Master/texmf-dist/tex/latex/etbb/ETbb.sty +++ b/Master/texmf-dist/tex/latex/etbb/ETbb.sty @@ -1,11 +1,11 @@ %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{1.051} -\def\filedate{2020/09/20} +\def\fileversion{1.052} +\def\filedate{2022/02/04} \ProvidesPackage{ETbb} [\filedate\space v\fileversion. Style file for ETbb.] -\RequirePackage[LY1,T1]{fontenc} +\RequirePackage[T1]{fontenc} \RequirePackage[full]{textcomp} \RequirePackage{ifetex} \ifetex\RequirePackage{etoolbox}\fi %etoolbox loads etex.sty @@ -27,6 +27,8 @@ \DeclareTextFontCommand{\textsup}{\supfigures} \let\textsu\textsup \let\textsuperior\textsup + \let\nustyle\sufigures + \def\inffigures{\@nomath\inffigures \fontfigurestyle{inferior}\selectfont} \let\infigures\inffigures @@ -41,7 +43,7 @@ \DeclareTextFontCommand{\textdenom}{\denomfigures} \let\textde\textdenom \let\textdenominator\textdenom - + \let\destyle\defigures }{} \newcommand{\textfrac}[3][]{% like \textfrac[1]{7}{8} \mbox{% @@ -64,17 +66,18 @@ % look for 1, 4, 5, 7 \ifcase\@digit@% 0 \or\kern -.02em% 1 - \or\kern .01em% 2 + \or\kern -.01em% 2 \or\kern -.02em% 3 \or\kern -.08em% 4 - \or\kern -.01em% 5 + \or\kern -.03em% 5 \or\kern -.03em% 6 - \or\kern .04em% 7 + \or\kern .02em% 7 \fi% \textde{#3}% denominator [#3] }% } +%\newcommand*{\ETbb@First}[2]{\def#2{\StrLeft \newcommand*{\ETbb@scale}{1} \RequirePackage{xkeyval} \DeclareOptionX{scale}{\renewcommand*{\ETbb@scale}{#1}} @@ -89,11 +92,12 @@ \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 -\def\ETbb@foresolidus{-.04em} -\def\ETbb@aftsolidus{-.03em} +\def\ETbb@foresolidus{-.05em} +\def\ETbb@aftsolidus{-.05em} \def\ETbb@raisefrac{.112em} \DeclareOptionX{foresolidus}{\gdef\ETbb@foresolidus{#1}} \DeclareOptionX{aftsolidus}{\gdef\ETbb@aftsolidus{#1}} @@ -105,17 +109,17 @@ \DeclareOptionX{oldstyle}{\useosf} \DeclareOptionX{osf}{\useosf} \DeclareOptionX{useosf}{\useosf} -\DeclareOptionX{tabular}{\edef\ETbb@figurealign{T}} -\DeclareOptionX{t}{\edef\ETbb@figurealign{T}} +\DeclareOptionX{tabular}{\def\ETbb@figurealign{T}} +\DeclareOptionX{t}{\def\ETbb@figurealign{T}} \DeclareOptionX{proportional}{\useproportional} \DeclareOptionX{p}{\useproportional} \DeclareOptionX{sharpS}{\@ETbb@sharpStrue} -\DeclareOptionX{swashQ}{\edef\ETbb@@swashQ{-swash}} +\DeclareOptionX{swashQ}{\def\ETbb@@swashQ{-swash}\def\ETbb@swashID{1}} \DeclareOptionX{mainfont}{ \renewcommand{\familydefault}{\rmdefault} } -\DeclareOptionX{bold}{\edef\bfseries@rm{bold}} -\DeclareOptionX{regular}{\edef\mdseries@rm{regular}} +\DeclareOptionX{bold}{\def\bfseries@rm{bold}} +\DeclareOptionX{regular}{\def\mdseries@rm{regular}} \DeclareOptionX{sups}{\@ETbb@supstrue} \DeclareOptionX{scosf}{\@ETbb@scosftrue} \ExecuteOptionsX{lining,tabular,bold,regular,mainfont} @@ -170,10 +174,6 @@ {\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,8 +189,27 @@ \fi}% \fi% \fi +\def\Qswash{Q} +\def\Qnoswash{Q} +\def\altQ{Q} \AtEndPreamble{\renewcommand*{\rmdefault}{ETbb-\ETbb@figurealign\ETbb@figurestyle} -\normalfont} - +\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 \endinput -- cgit v1.2.3