From 75d7b827f2db5e3ca0ad7dd1b62c3fbc658b8a6f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 28 Jun 2020 21:21:52 +0000 Subject: fbb (28jun20) git-svn-id: svn://tug.org/texlive/trunk@55687 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/fbb/OT1fbb-LF.fd | 8 ++--- Master/texmf-dist/tex/latex/fbb/fbb.sty | 46 ++++++++++++++++++++++++++-- 2 files changed, 48 insertions(+), 6 deletions(-) (limited to 'Master/texmf-dist/tex/latex/fbb') diff --git a/Master/texmf-dist/tex/latex/fbb/OT1fbb-LF.fd b/Master/texmf-dist/tex/latex/fbb/OT1fbb-LF.fd index 6baabe2c96c..e1744a874fa 100644 --- a/Master/texmf-dist/tex/latex/fbb/OT1fbb-LF.fd +++ b/Master/texmf-dist/tex/latex/fbb/OT1fbb-LF.fd @@ -21,11 +21,11 @@ }{} \DeclareFontShape{OT1}{fbb-LF}{m}{sc}{ - <-> \fbb@@scale fbb\fbb@@altP-Regular-lf-sc-ot1 + <-> \fbb@@scale fbb\fbb@@alt-Regular-lf-sc-ot1 }{} \DeclareFontShape{OT1}{fbb-LF}{m}{n}{ - <-> \fbb@@scale fbb\fbb@@altP-Regular-lf-ot1 + <-> \fbb@@scale fbb\fbb@@alt-Regular-lf-ot1 }{} \DeclareFontShape{OT1}{fbb-LF}{m}{it}{ @@ -45,7 +45,7 @@ }{} \DeclareFontShape{OT1}{fbb-LF}{b}{sc}{ - <-> \fbb@@scale fbb\fbb@@altP-Bold-lf-sc-ot1 + <-> \fbb@@scale fbb\fbb@@alt-Bold-lf-sc-ot1 }{} \DeclareFontShape{OT1}{fbb-LF}{b}{it}{ @@ -53,7 +53,7 @@ }{} \DeclareFontShape{OT1}{fbb-LF}{b}{n}{ - <-> \fbb@@scale fbb\fbb@@altP-Bold-lf-ot1 + <-> \fbb@@scale fbb\fbb@@alt-Bold-lf-ot1 }{} \DeclareFontShape{OT1}{fbb-LF}{b}{sl}{ diff --git a/Master/texmf-dist/tex/latex/fbb/fbb.sty b/Master/texmf-dist/tex/latex/fbb/fbb.sty index 5513961fade..5dbadf263a4 100644 --- a/Master/texmf-dist/tex/latex/fbb/fbb.sty +++ b/Master/texmf-dist/tex/latex/fbb/fbb.sty @@ -2,8 +2,8 @@ %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{1.13} -\def\filedate{2017/06/24} +\def\fileversion{1.15} +\def\filedate{2020/06/27} \ProvidesPackage{fbb}[\filedate\space v\fileversion] \message{`fbb' v\fileversion, \filedate\space Text macros for fbb, a Bembo-like font family (msharpe)} @@ -12,6 +12,7 @@ \RequirePackage{textcomp} \RequirePackage{ifetex} \ifetex\RequirePackage{etoolbox}\fi %etoolbox loads etex.sty +\RequirePackage{xstring,ifthen} % for \textfrac \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{} \IfFileExists{fontaxes.sty}{ \RequirePackage{fontaxes} @@ -27,8 +28,43 @@ \fontfigurestyle{inferior}\selectfont} \DeclareTextFontCommand{\textin}{\infigures} \let\textinferior\textin +% \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}}} }{} +\def\textde#1{\leavevmode\raise .188em \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] + {\textlf{#1}\kern.05em}{}% + \textsu{#2}% numerator + \StrRight{#2}{1}[\@digit@]% + % look for 1, 2, 3, 4, 7 + \ifcase\@digit@% 0 + \or% 1 + \or\kern.03em% 2 + \or\kern-.02em% 3 + \or\kern-.01em% 4 + \or\kern.01em% 5 + \or\kern.02em% 6 + \or\kern-.09em% 7 + \fi% + \kern\fbb@foresolidus\textfractionsolidus\kern\fbb@aftsolidus% + \StrLeft{#3}{1}[\@digit@]% + % look for 1, 4, 5, 7 + \ifcase\@digit@% 0 + \or\kern -.02em% 1 + \or\kern .01em% 2 + \or% 3 + \or\kern -.08em% 4 + \or\kern -.01em% 5 + \or\kern -.03em% 6 + \or\kern .04em% 7 + \fi% + \textde{#3}% denominator [#3] + }% +} + \newcommand*{\fbb@scale}{1} \IfFileExists{xkeyval.sty}{ \RequirePackage{xkeyval} @@ -54,6 +90,12 @@ \newif\if@fbb@sups \newif\if@fbb@scosf \def\fbb@altP{} % should be empty or P +\def\fbb@foresolidus{.04em} +\def\fbb@aftsolidus{0em} +\def\fbb@raisefrac{.111em} +\DeclareOptionX{foresolidus}{\gdef\fbb@foresolidus{#1}} +\DeclareOptionX{aftsolidus}{\gdef\fbb@aftsolidus{#1}} +\DeclareOptionX{raisefrac}{\gdef\fbb@raisefrac{#1}} \DeclareOptionX{altP}{\xdef\fbb@altP{P}} \DeclareOptionX{lining}{\edef\fbb@figurestyle{LF}} \DeclareOptionX{oldstyle}{\useosf} -- cgit v1.2.3