summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fbb/fbb.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-07-02 21:45:33 +0000
committerKarl Berry <karl@freefriends.org>2020-07-02 21:45:33 +0000
commit055dac803413ab92ff8506570705e27ba4efee92 (patch)
tree3754a3785840baaeb667e73156d280deeea0c4df /Master/texmf-dist/tex/latex/fbb/fbb.sty
parentfed87c2d746629366811de126bfa863e301ec049 (diff)
fbb (2jul20)
git-svn-id: svn://tug.org/texlive/trunk@55728 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/fbb/fbb.sty')
-rw-r--r--Master/texmf-dist/tex/latex/fbb/fbb.sty46
1 files changed, 26 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/fbb/fbb.sty b/Master/texmf-dist/tex/latex/fbb/fbb.sty
index 5dbadf263a4..298ba98e285 100644
--- a/Master/texmf-dist/tex/latex/fbb/fbb.sty
+++ b/Master/texmf-dist/tex/latex/fbb/fbb.sty
@@ -2,9 +2,9 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.15}
-\def\filedate{2020/06/27}
-\ProvidesPackage{fbb}[\filedate\space v\fileversion]
+\def\fileversion{1.16}
+\def\filedate{2020/07/01}
+\ProvidesPackage{fbb}[\filedate\space v\fileversion\space Style file for fbb fonts.]
\message{`fbb' v\fileversion, \filedate\space Text macros for fbb, a Bembo-like font family (msharpe)}
@@ -13,21 +13,28 @@
\RequirePackage{ifetex}
\ifetex\RequirePackage{etoolbox}\fi %etoolbox loads etex.sty
\RequirePackage{xstring,ifthen} % for \textfrac
-\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
+\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}
\fa@naming@exception{figures}{{inferior}{proportional}}{Inf}
\fa@naming@exception{figures}{{inferior}{tabular}}{Inf}
- \def\sufigures{\@nomath\sufigures
+ \def\supfigures{\@nomath\supfigures
\fontfigurestyle{superior}\selectfont}
- \DeclareTextFontCommand{\textsu}{\sufigures}
- \let\textsuperior\textsu
- \def\infigures{\@nomath\infigures
+ \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
+ \let\infigures\inffigures
+ \DeclareTextFontCommand{\textinf}{\inffigures}
+ \let\textin\textinf
+ \let\textinferior\textinf
% \providecommand*{\textfrac}[3][\fbb@raisefrac]{%
% \leavevmode\raise ##1 \hbox{\textsu{##2}\kern \fbb@foresolidus \textfractionsolidus\kern \fbb@aftsolidus \textin{##3}}}
% \def\@makefnmark{\hbox{\textsu{\@thefnmark}}}
@@ -66,15 +73,9 @@
}
\newcommand*{\fbb@scale}{1}
-\IfFileExists{xkeyval.sty}{
- \RequirePackage{xkeyval}
- \DeclareOptionX{scale}{\renewcommand*{\fbb@scale}{##1}}
- \DeclareOptionX{scaled}{\renewcommand*{\fbb@scale}{##1}}
-}{
- \let\DeclareOptionX\DeclareOption
- \let\ExecuteOptionsX\ExecuteOptions
- \let\ProcessOptionsX\ProcessOptions
-}
+\RequirePackage{xkeyval}
+\DeclareOptionX{scale}{\renewcommand*{\fbb@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\fbb@scale}{#1}}
\let\orig@footnote=\thefootnote
\let\orig@makefnmark=\@makefnmark
@@ -87,6 +88,7 @@
%\newif\iffbb@babel
%\ifdefined\bbl@tempa \fbb@babeltrue\fi
%\ifetex\else\fbb@babeltrue\fi
+\def\fbb@@swashQ{}
\newif\if@fbb@sups
\newif\if@fbb@scosf
\def\fbb@altP{} % should be empty or P
@@ -97,6 +99,7 @@
\DeclareOptionX{aftsolidus}{\gdef\fbb@aftsolidus{#1}}
\DeclareOptionX{raisefrac}{\gdef\fbb@raisefrac{#1}}
\DeclareOptionX{altP}{\xdef\fbb@altP{P}}
+\DeclareOptionX{swashQ}{\edef\fbb@@swashQ{-swash}}
\DeclareOptionX{lining}{\edef\fbb@figurestyle{LF}}
\DeclareOptionX{oldstyle}{\useosf}
\DeclareOptionX{osf}{\useosf}
@@ -154,6 +157,9 @@
{\fontfamily{fbb-\fbb@figurealign OsF}\fontshape{sc}\selectfont #1}%
}\fi
+\newcommand{\Qswash}{{\fontencoding{TS1}\fontfamily{fbb-LF}\selectfont \char59 }}
+\newcommand{\Qnoswash}{{\fontencoding{TS1}\fontfamily{fbb-LF}\selectfont \char58 }}
+
\renewcommand*{\familydefault}{\rmdefault}
\if@fbb@sups %
\ifdefined\sufigures