summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/etbb/ETbb.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-07-02 21:43:35 +0000
committerKarl Berry <karl@freefriends.org>2020-07-02 21:43:35 +0000
commitfed87c2d746629366811de126bfa863e301ec049 (patch)
tree775c95006d348cb3e81a021b69ace909e027850c /Master/texmf-dist/tex/latex/etbb/ETbb.sty
parent63baeff02fd19f54fcfdf472f9b29d79bd58674a (diff)
etbb (2jul20)
git-svn-id: svn://tug.org/texlive/trunk@55727 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/etbb/ETbb.sty')
-rw-r--r--Master/texmf-dist/tex/latex/etbb/ETbb.sty62
1 files changed, 37 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/etbb/ETbb.sty b/Master/texmf-dist/tex/latex/etbb/ETbb.sty
index 476ee84a82b..bcdc8844094 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.04}
-\def\filedate{2020/06/27}
+\def\fileversion{1.05}
+\def\filedate{2020/07/01}
\ProvidesPackage{ETbb}
[\filedate\space v\fileversion. Style file for ETbb.]
-\RequirePackage[T1,LY1]{fontenc}
+\RequirePackage[LY1,T1]{fontenc}
\RequirePackage[full]{textcomp}
\RequirePackage{ifetex}
\ifetex\RequirePackage{etoolbox}\fi %etoolbox loads etex.sty
@@ -13,23 +13,35 @@
\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
\IfFileExists{fontaxes.sty}{
\RequirePackage{fontaxes}
- \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
+ \DeclareRobustCommand\swshape{\not@math@alphabet\swshape\relax
+ \fontprimaryshape\itdefault\fontsecondaryshape\swdefault\selectfont}
+ \fa@naming@exception{shape}{{n}{sw}}{nw}
+ \fa@naming@exception{shape}{{it}{sw}}{sw}\fa@naming@exception{figures}{{superior}{proportional}}{Sup}
\fa@naming@exception{figures}{{superior}{tabular}}{Sup}
- \def\sufigures{\@nomath\sufigures
- \fontfigurestyle{superior}\selectfont}
- \DeclareTextFontCommand{\textsu}{\sufigures}
- \let\textsuperior\textsu
-
\fa@naming@exception{figures}{{inferior}{proportional}}{Inf}
\fa@naming@exception{figures}{{inferior}{tabular}}{Inf}
- \def\infigures{\@nomath\infigures
+ \def\supfigures{\@nomath\supfigures
+ \fontfigurestyle{superior}\selectfont}
+ \let\sufigures\supfigures
+ \DeclareTextFontCommand{\textsup}{\supfigures}
+ \let\textsu\textsup
+ \let\textsuperior\textsup
+ \def\inffigures{\@nomath\inffigures
\fontfigurestyle{inferior}\selectfont}
- \DeclareTextFontCommand{\textin}{\infigures}
- \let\textinferior\textin
-% \providecommand*{\textfrac}[3][\ETbb@raisefrac]{%
-% \raise ##1 \hbox{\textsu{##2}\kern \ETbb@foresolidus \textfractionsolidus\kern \ETbb@aftsolidus \textin{##3}}}
+ \let\infigures\inffigures
+ \DeclareTextFontCommand{\textinf}{\inffigures}
+ \let\textin\textinf
+ \let\textinferior\textinf
+ \fa@naming@exception{figures}{{denominators}{proportional}}{Dnom}
+ \fa@naming@exception{figures}{{denominators}{tabular}}{Dnom}
+ \def\denomfigures{\@nomath\denomfigures
+ \fontfigurestyle{denominators}\selectfont}
+ \let\defigures\denomfigures
+ \DeclareTextFontCommand{\textdenom}{\denomfigures}
+ \let\textde\textdenom
+ \let\textdenominator\textdenom
+
}{}
-\def\textde#1{\leavevmode\raise .112em \hbox{\textin{#1}}} % aligned with baseline
\newcommand{\textfrac}[3][]{% like \textfrac[1]{7}{8}
\mbox{%
\ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
@@ -62,16 +74,11 @@
}%
}
-\IfFileExists{xkeyval.sty}{
- \newcommand*{\ETbb@scale}{1}
- \RequirePackage{xkeyval}
- \DeclareOptionX{scale}{\renewcommand*{\ETbb@scale}{##1}}
- \DeclareOptionX{scaled}{\renewcommand*{\ETbb@scale}{##1}}
-}{
- \let\DeclareOptionX\DeclareOption
- \let\ExecuteOptionsX\ExecuteOptions
- \let\ProcessOptionsX\ProcessOptions
-}
+\newcommand*{\ETbb@scale}{1}
+\RequirePackage{xkeyval}
+\DeclareOptionX{scale}{\renewcommand*{\ETbb@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\ETbb@scale}{#1}}
+
\let\orig@footnote=\thefootnote
\let\orig@makefnmark=\@makefnmark
%\def\bfseries@rm{b}
@@ -80,6 +87,7 @@
\@onlypreamble\useosf
\def\useproportional{\edef\ETbb@figurealign{}}
\@onlypreamble\useproportional
+\def\ETbb@@swashQ{}
\newif\if@ETbb@sharpS
\newif\if@ETbb@sups
\newif\if@ETbb@scosf
@@ -101,6 +109,7 @@
\DeclareOptionX{proportional}{\useproportional}
\DeclareOptionX{p}{\useproportional}
\DeclareOptionX{sharpS}{\@ETbb@sharpStrue}
+\DeclareOptionX{swashQ}{\edef\ETbb@@swashQ{-swash}}
\DeclareOptionX{mainfont}{
\renewcommand{\familydefault}{\rmdefault}
}
@@ -153,6 +162,9 @@
{\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