From b25e5ccbc126fd46c07bcf8415a21a3120ef7c38 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 10 Sep 2014 21:14:35 +0000 Subject: fbb (10sep14) git-svn-id: svn://tug.org/texlive/trunk@35144 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/fbb/LY1fbb-LF.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/LY1fbb-OsF.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/LY1fbb-Sup.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/LY1fbb-TLF.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/LY1fbb-TOsF.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/OT1fbb-LF.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/OT1fbb-OsF.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/OT1fbb-Sup.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/OT1fbb-TLF.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/OT1fbb-TOsF.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/T1fbb-LF.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/T1fbb-OsF.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/T1fbb-Sup.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/T1fbb-TLF.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/T1fbb-TOsF.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/TS1fbb-LF.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/TS1fbb-OsF.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/TS1fbb-TLF.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/TS1fbb-TOsF.fd | 4 ++-- Master/texmf-dist/tex/latex/fbb/fbb.sty | 12 +++++++++--- 20 files changed, 47 insertions(+), 41 deletions(-) (limited to 'Master/texmf-dist/tex/latex/fbb') diff --git a/Master/texmf-dist/tex/latex/fbb/LY1fbb-LF.fd b/Master/texmf-dist/tex/latex/fbb/LY1fbb-LF.fd index acd7831e013..289659c98c1 100644 --- a/Master/texmf-dist/tex/latex/fbb/LY1fbb-LF.fd +++ b/Master/texmf-dist/tex/latex/fbb/LY1fbb-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{LY1fbb-LF.fd} - [2013/10/08 (autoinst) Font definitions for LY1/fbb-LF.] + [2014/09/09 (autoinst) Font definitions for LY1/fbb-LF.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/LY1fbb-OsF.fd b/Master/texmf-dist/tex/latex/fbb/LY1fbb-OsF.fd index 5fd93db3acd..a4e42ef0a18 100644 --- a/Master/texmf-dist/tex/latex/fbb/LY1fbb-OsF.fd +++ b/Master/texmf-dist/tex/latex/fbb/LY1fbb-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{LY1fbb-OsF.fd} - [2013/10/08 (autoinst) Font definitions for LY1/fbb-OsF.] + [2014/09/09 (autoinst) Font definitions for LY1/fbb-OsF.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/LY1fbb-Sup.fd b/Master/texmf-dist/tex/latex/fbb/LY1fbb-Sup.fd index f9ad059b582..35dd27d1057 100644 --- a/Master/texmf-dist/tex/latex/fbb/LY1fbb-Sup.fd +++ b/Master/texmf-dist/tex/latex/fbb/LY1fbb-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{LY1fbb-Sup.fd} - [2013/10/08 (autoinst) Font definitions for LY1/fbb-Sup.] + [2014/09/09 (autoinst) Font definitions for LY1/fbb-Sup.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/LY1fbb-TLF.fd b/Master/texmf-dist/tex/latex/fbb/LY1fbb-TLF.fd index eb71742c9e9..1b232e5ffb4 100644 --- a/Master/texmf-dist/tex/latex/fbb/LY1fbb-TLF.fd +++ b/Master/texmf-dist/tex/latex/fbb/LY1fbb-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{LY1fbb-TLF.fd} - [2013/10/08 (autoinst) Font definitions for LY1/fbb-TLF.] + [2014/09/09 (autoinst) Font definitions for LY1/fbb-TLF.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/LY1fbb-TOsF.fd b/Master/texmf-dist/tex/latex/fbb/LY1fbb-TOsF.fd index e3306eb6ce7..eee9151ce85 100644 --- a/Master/texmf-dist/tex/latex/fbb/LY1fbb-TOsF.fd +++ b/Master/texmf-dist/tex/latex/fbb/LY1fbb-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{LY1fbb-TOsF.fd} - [2013/10/08 (autoinst) Font definitions for LY1/fbb-TOsF.] + [2014/09/09 (autoinst) Font definitions for LY1/fbb-TOsF.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/OT1fbb-LF.fd b/Master/texmf-dist/tex/latex/fbb/OT1fbb-LF.fd index ee919723542..ce2c0eac809 100644 --- a/Master/texmf-dist/tex/latex/fbb/OT1fbb-LF.fd +++ b/Master/texmf-dist/tex/latex/fbb/OT1fbb-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{OT1fbb-LF.fd} - [2013/10/08 (autoinst) Font definitions for OT1/fbb-LF.] + [2014/09/09 (autoinst) Font definitions for OT1/fbb-LF.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/OT1fbb-OsF.fd b/Master/texmf-dist/tex/latex/fbb/OT1fbb-OsF.fd index cae3cbfdae4..946304f026e 100644 --- a/Master/texmf-dist/tex/latex/fbb/OT1fbb-OsF.fd +++ b/Master/texmf-dist/tex/latex/fbb/OT1fbb-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{OT1fbb-OsF.fd} - [2013/10/08 (autoinst) Font definitions for OT1/fbb-OsF.] + [2014/09/09 (autoinst) Font definitions for OT1/fbb-OsF.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/OT1fbb-Sup.fd b/Master/texmf-dist/tex/latex/fbb/OT1fbb-Sup.fd index 44f2e971aba..38aa8108848 100644 --- a/Master/texmf-dist/tex/latex/fbb/OT1fbb-Sup.fd +++ b/Master/texmf-dist/tex/latex/fbb/OT1fbb-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{OT1fbb-Sup.fd} - [2013/10/08 (autoinst) Font definitions for OT1/fbb-Sup.] + [2014/09/09 (autoinst) Font definitions for OT1/fbb-Sup.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/OT1fbb-TLF.fd b/Master/texmf-dist/tex/latex/fbb/OT1fbb-TLF.fd index feace2fb45c..a9886de635e 100644 --- a/Master/texmf-dist/tex/latex/fbb/OT1fbb-TLF.fd +++ b/Master/texmf-dist/tex/latex/fbb/OT1fbb-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{OT1fbb-TLF.fd} - [2013/10/08 (autoinst) Font definitions for OT1/fbb-TLF.] + [2014/09/09 (autoinst) Font definitions for OT1/fbb-TLF.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/OT1fbb-TOsF.fd b/Master/texmf-dist/tex/latex/fbb/OT1fbb-TOsF.fd index ab45c26ebfc..7acf074826a 100644 --- a/Master/texmf-dist/tex/latex/fbb/OT1fbb-TOsF.fd +++ b/Master/texmf-dist/tex/latex/fbb/OT1fbb-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{OT1fbb-TOsF.fd} - [2013/10/08 (autoinst) Font definitions for OT1/fbb-TOsF.] + [2014/09/09 (autoinst) Font definitions for OT1/fbb-TOsF.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/T1fbb-LF.fd b/Master/texmf-dist/tex/latex/fbb/T1fbb-LF.fd index 402c4b625e1..198e6131481 100644 --- a/Master/texmf-dist/tex/latex/fbb/T1fbb-LF.fd +++ b/Master/texmf-dist/tex/latex/fbb/T1fbb-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{T1fbb-LF.fd} - [2013/10/08 (autoinst) Font definitions for T1/fbb-LF.] + [2014/09/09 (autoinst) Font definitions for T1/fbb-LF.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/T1fbb-OsF.fd b/Master/texmf-dist/tex/latex/fbb/T1fbb-OsF.fd index 12bd2e57930..8bff60591c7 100644 --- a/Master/texmf-dist/tex/latex/fbb/T1fbb-OsF.fd +++ b/Master/texmf-dist/tex/latex/fbb/T1fbb-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{T1fbb-OsF.fd} - [2013/10/08 (autoinst) Font definitions for T1/fbb-OsF.] + [2014/09/09 (autoinst) Font definitions for T1/fbb-OsF.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/T1fbb-Sup.fd b/Master/texmf-dist/tex/latex/fbb/T1fbb-Sup.fd index fcac7273eb1..227302ac545 100644 --- a/Master/texmf-dist/tex/latex/fbb/T1fbb-Sup.fd +++ b/Master/texmf-dist/tex/latex/fbb/T1fbb-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{T1fbb-Sup.fd} - [2013/10/08 (autoinst) Font definitions for T1/fbb-Sup.] + [2014/09/09 (autoinst) Font definitions for T1/fbb-Sup.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/T1fbb-TLF.fd b/Master/texmf-dist/tex/latex/fbb/T1fbb-TLF.fd index db7792903e3..1975dc1052d 100644 --- a/Master/texmf-dist/tex/latex/fbb/T1fbb-TLF.fd +++ b/Master/texmf-dist/tex/latex/fbb/T1fbb-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{T1fbb-TLF.fd} - [2013/10/08 (autoinst) Font definitions for T1/fbb-TLF.] + [2014/09/09 (autoinst) Font definitions for T1/fbb-TLF.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/T1fbb-TOsF.fd b/Master/texmf-dist/tex/latex/fbb/T1fbb-TOsF.fd index d00f37d9a15..71a8cb671cc 100644 --- a/Master/texmf-dist/tex/latex/fbb/T1fbb-TOsF.fd +++ b/Master/texmf-dist/tex/latex/fbb/T1fbb-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{T1fbb-TOsF.fd} - [2013/10/08 (autoinst) Font definitions for T1/fbb-TOsF.] + [2014/09/09 (autoinst) Font definitions for T1/fbb-TOsF.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/TS1fbb-LF.fd b/Master/texmf-dist/tex/latex/fbb/TS1fbb-LF.fd index 5767d737d72..4e669cdacb8 100644 --- a/Master/texmf-dist/tex/latex/fbb/TS1fbb-LF.fd +++ b/Master/texmf-dist/tex/latex/fbb/TS1fbb-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{TS1fbb-LF.fd} - [2013/10/08 (autoinst) Font definitions for TS1/fbb-LF.] + [2014/09/09 (autoinst) Font definitions for TS1/fbb-LF.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/TS1fbb-OsF.fd b/Master/texmf-dist/tex/latex/fbb/TS1fbb-OsF.fd index b8fea88afb4..54c28a41571 100644 --- a/Master/texmf-dist/tex/latex/fbb/TS1fbb-OsF.fd +++ b/Master/texmf-dist/tex/latex/fbb/TS1fbb-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{TS1fbb-OsF.fd} - [2013/10/08 (autoinst) Font definitions for TS1/fbb-OsF.] + [2014/09/09 (autoinst) Font definitions for TS1/fbb-OsF.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/TS1fbb-TLF.fd b/Master/texmf-dist/tex/latex/fbb/TS1fbb-TLF.fd index 3f20479c652..c4a05927c4a 100644 --- a/Master/texmf-dist/tex/latex/fbb/TS1fbb-TLF.fd +++ b/Master/texmf-dist/tex/latex/fbb/TS1fbb-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{TS1fbb-TLF.fd} - [2013/10/08 (autoinst) Font definitions for TS1/fbb-TLF.] + [2014/09/09 (autoinst) Font definitions for TS1/fbb-TLF.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/TS1fbb-TOsF.fd b/Master/texmf-dist/tex/latex/fbb/TS1fbb-TOsF.fd index e876c6545b9..dfc491fe474 100644 --- a/Master/texmf-dist/tex/latex/fbb/TS1fbb-TOsF.fd +++ b/Master/texmf-dist/tex/latex/fbb/TS1fbb-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/10/08 +%% Generated by autoinst on 2014/09/09 %% \ProvidesFile{TS1fbb-TOsF.fd} - [2013/10/08 (autoinst) Font definitions for TS1/fbb-TOsF.] + [2014/09/09 (autoinst) Font definitions for TS1/fbb-TOsF.] \expandafter\ifx\csname fbb@scale\endcsname\relax \let\fbb@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/fbb/fbb.sty b/Master/texmf-dist/tex/latex/fbb/fbb.sty index aced8218260..09b37024184 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.04} -\def\filedate{2014/06/19} +\def\fileversion{1.06} +\def\filedate{2014/09/09} \ProvidesPackage{fbb}[\filedate\space v\fileversion] \message{`fbb' v\fileversion, \filedate\space Text macros for fbb, a Bembo-like font family (msharpe)} @@ -37,14 +37,17 @@ \let\orig@makefnmark=\@makefnmark \newif\if@fbb@sups +\newif\if@fbb@scosf \DeclareOptionX{lining}{\edef\fbb@figurestyle{LF}} \DeclareOptionX{oldstyle}{\edef\fbb@figurestyle{OsF}} \DeclareOptionX{osf}{\edef\fbb@figurestyle{OsF}} \DeclareOptionX{tabular}{\edef\fbb@figurealign{T}} +\DeclareOptionX{p}{\edef\fbb@figurealign{}} \DeclareOptionX{proportional}{\edef\fbb@figurealign{}} \DeclareOptionX{bold}{\edef\bfseries@rm{b}} \DeclareOptionX{regular}{\edef\mdseries@rm{m}} \DeclareOptionX{sups}{\@fbb@supstrue} +\DeclareOptionX{scosf}{\@fbb@scosftrue} \ExecuteOptionsX{lining,tabular,bold,regular} \ProcessOptionsX\relax @@ -77,7 +80,10 @@ \DeclareRobustCommand{\texttosf}[1]{% {\fontfamily{fbb-TOsF}\selectfont #1}% }% to get tosf - +\if@fbb@scosf % +\DeclareRobustCommand{\textsc}[1]{% +{\fontfamily{fbb-\fbb@figurealign OsF}\fontshape{sc}\selectfont #1}% +}\fi \AtEndPreamble{\renewcommand*{\rmdefault}{fbb-\fbb@figurealign\fbb@figurestyle}} \renewcommand*{\familydefault}{\rmdefault} \if@fbb@sups % -- cgit v1.2.3