summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fbb
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
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')
-rw-r--r--Master/texmf-dist/tex/latex/fbb/LY1fbb-LF.fd32
-rw-r--r--Master/texmf-dist/tex/latex/fbb/LY1fbb-OsF.fd31
-rw-r--r--Master/texmf-dist/tex/latex/fbb/LY1fbb-TLF.fd31
-rw-r--r--Master/texmf-dist/tex/latex/fbb/LY1fbb-TOsF.fd27
-rw-r--r--Master/texmf-dist/tex/latex/fbb/OT1fbb-LF.fd32
-rw-r--r--Master/texmf-dist/tex/latex/fbb/OT1fbb-OsF.fd31
-rw-r--r--Master/texmf-dist/tex/latex/fbb/OT1fbb-TLF.fd31
-rw-r--r--Master/texmf-dist/tex/latex/fbb/OT1fbb-TOsF.fd31
-rw-r--r--Master/texmf-dist/tex/latex/fbb/T1fbb-LF.fd31
-rw-r--r--Master/texmf-dist/tex/latex/fbb/T1fbb-OsF.fd31
-rw-r--r--Master/texmf-dist/tex/latex/fbb/T1fbb-TLF.fd31
-rw-r--r--Master/texmf-dist/tex/latex/fbb/T1fbb-TOsF.fd31
-rw-r--r--Master/texmf-dist/tex/latex/fbb/fbb.sty46
13 files changed, 324 insertions, 92 deletions
diff --git a/Master/texmf-dist/tex/latex/fbb/LY1fbb-LF.fd b/Master/texmf-dist/tex/latex/fbb/LY1fbb-LF.fd
index 8ac02d5997c..f4ea7071a94 100644
--- a/Master/texmf-dist/tex/latex/fbb/LY1fbb-LF.fd
+++ b/Master/texmf-dist/tex/latex/fbb/LY1fbb-LF.fd
@@ -1,13 +1,17 @@
-%% Generated by autoinst on 2015/08/23
%%
\ProvidesFile{LY1fbb-LF.fd}
- [2015/08/23 (autoinst) Font definitions for LY1/fbb-LF.]
+ [2020/07/01 (msharpe) Font definitions for LY1/fbb-LF.]
+
+\expandafter\ifx\csname fbb@@swashQ\endcsname\relax%
+ \global\let\fbb@@swashQ\@empty
+\fi
\expandafter\ifx\csname fbb@scale\endcsname\relax
\let\fbb@@scale\@empty
\else
\edef\fbb@@scale{s*[\csname fbb@scale\endcsname]}%
\fi
+
\expandafter\ifx\csname fbb@altP\endcsname\relax
\let\fbb@@altP\@empty
\else
@@ -16,6 +20,22 @@
\DeclareFontFamily{LY1}{fbb-LF}{}
+\DeclareFontShape{LY1}{fbb-LF}{b}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-lf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{fbb-LF}{b}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-lf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{fbb-LF}{m}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-lf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{fbb-LF}{m}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-lf-swash-ly1
+}{}
+
\DeclareFontShape{LY1}{fbb-LF}{m}{scit}{
<-> \fbb@@scale fbb-Italic-lf-sc-ly1
}{}
@@ -25,11 +45,11 @@
}{}
\DeclareFontShape{LY1}{fbb-LF}{m}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Regular-lf-ly1
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-lf\fbb@@swashQ-ly1
}{}
\DeclareFontShape{LY1}{fbb-LF}{m}{it}{
- <-> \fbb@@scale fbb-Italic-lf-ly1
+ <-> \fbb@@scale fbb-Italic-lf\fbb@@swashQ-ly1
}{}
\DeclareFontShape{LY1}{fbb-LF}{m}{sl}{
@@ -41,11 +61,11 @@
}{}
\DeclareFontShape{LY1}{fbb-LF}{b}{it}{
- <-> \fbb@@scale fbb-BoldItalic-lf-ly1
+ <-> \fbb@@scale fbb-BoldItalic-lf\fbb@@swashQ-ly1
}{}
\DeclareFontShape{LY1}{fbb-LF}{b}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Bold-lf-ly1
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-lf\fbb@@swashQ-ly1
}{}
\DeclareFontShape{LY1}{fbb-LF}{b}{scit}{
diff --git a/Master/texmf-dist/tex/latex/fbb/LY1fbb-OsF.fd b/Master/texmf-dist/tex/latex/fbb/LY1fbb-OsF.fd
index c7299f395d5..8c463d875b1 100644
--- a/Master/texmf-dist/tex/latex/fbb/LY1fbb-OsF.fd
+++ b/Master/texmf-dist/tex/latex/fbb/LY1fbb-OsF.fd
@@ -1,7 +1,10 @@
-%% Generated by autoinst on 2015/08/23
%%
\ProvidesFile{LY1fbb-OsF.fd}
- [2015/08/23 (autoinst) Font definitions for LY1/fbb-OsF.]
+ [2020/07/01 (msharpe) Font definitions for LY1/fbb-OsF.]
+
+\expandafter\ifx\csname fbb@@swashQ\endcsname\relax%
+ \global\let\fbb@@swashQ\@empty
+\fi
\expandafter\ifx\csname fbb@scale\endcsname\relax
\let\fbb@@scale\@empty
@@ -16,12 +19,28 @@
\DeclareFontFamily{LY1}{fbb-OsF}{}
+\DeclareFontShape{LY1}{fbb-OsF}{b}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-osf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{fbb-OsF}{b}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-osf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{fbb-OsF}{m}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-osf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{fbb-OsF}{m}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-osf-swash-ly1
+}{}
+
\DeclareFontShape{LY1}{fbb-OsF}{m}{it}{
- <-> \fbb@@scale fbb-Italic-osf-ly1
+ <-> \fbb@@scale fbb-Italic-osf\fbb@@swashQ-ly1
}{}
\DeclareFontShape{LY1}{fbb-OsF}{m}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Regular-osf-ly1
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-osf\fbb@@swashQ-ly1
}{}
\DeclareFontShape{LY1}{fbb-OsF}{m}{scit}{
@@ -49,11 +68,11 @@
}{}
\DeclareFontShape{LY1}{fbb-OsF}{b}{it}{
- <-> \fbb@@scale fbb-BoldItalic-osf-ly1
+ <-> \fbb@@scale fbb-BoldItalic-osf\fbb@@swashQ-ly1
}{}
\DeclareFontShape{LY1}{fbb-OsF}{b}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Bold-osf-ly1
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-osf\fbb@@swashQ-ly1
}{}
\DeclareFontShape{LY1}{fbb-OsF}{b}{sl}{
diff --git a/Master/texmf-dist/tex/latex/fbb/LY1fbb-TLF.fd b/Master/texmf-dist/tex/latex/fbb/LY1fbb-TLF.fd
index af818121dbc..69b396dcad6 100644
--- a/Master/texmf-dist/tex/latex/fbb/LY1fbb-TLF.fd
+++ b/Master/texmf-dist/tex/latex/fbb/LY1fbb-TLF.fd
@@ -1,7 +1,10 @@
-%% Generated by autoinst on 2015/08/23
%%
\ProvidesFile{LY1fbb-TLF.fd}
- [2015/08/23 (autoinst) Font definitions for LY1/fbb-TLF.]
+ [2020/07/01 (msharpe) Font definitions for LY1/fbb-TLF.]
+
+\expandafter\ifx\csname fbb@@swashQ\endcsname\relax%
+ \global\let\fbb@@swashQ\@empty
+\fi
\expandafter\ifx\csname fbb@scale\endcsname\relax
\let\fbb@@scale\@empty
@@ -16,12 +19,28 @@
\DeclareFontFamily{LY1}{fbb-TLF}{}
+\DeclareFontShape{LY1}{fbb-TLF}{b}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{fbb-TLF}{b}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{fbb-TLF}{m}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{fbb-TLF}{m}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-tlf-swash-ly1
+}{}
+
\DeclareFontShape{LY1}{fbb-TLF}{b}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Bold-tlf-ly1
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-tlf\fbb@@swashQ-ly1
}{}
\DeclareFontShape{LY1}{fbb-TLF}{b}{it}{
- <-> \fbb@@scale fbb-BoldItalic-tlf-ly1
+ <-> \fbb@@scale fbb-BoldItalic-tlf\fbb@@swashQ-ly1
}{}
\DeclareFontShape{LY1}{fbb-TLF}{b}{scit}{
@@ -49,11 +68,11 @@
}{}
\DeclareFontShape{LY1}{fbb-TLF}{m}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Regular-tlf-ly1
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-tlf\fbb@@swashQ-ly1
}{}
\DeclareFontShape{LY1}{fbb-TLF}{m}{it}{
- <-> \fbb@@scale fbb-Italic-tlf-ly1
+ <-> \fbb@@scale fbb-Italic-tlf\fbb@@swashQ-ly1
}{}
\DeclareFontShape{LY1}{fbb-TLF}{m}{sl}{
diff --git a/Master/texmf-dist/tex/latex/fbb/LY1fbb-TOsF.fd b/Master/texmf-dist/tex/latex/fbb/LY1fbb-TOsF.fd
index d02f043b648..4e9d0474c9c 100644
--- a/Master/texmf-dist/tex/latex/fbb/LY1fbb-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/fbb/LY1fbb-TOsF.fd
@@ -1,7 +1,6 @@
-%% Generated by autoinst on 2015/08/23
%%
\ProvidesFile{LY1fbb-TOsF.fd}
- [2015/08/23 (autoinst) Font definitions for LY1/fbb-TOsF.]
+ [2020/07/01 (msharpe) Font definitions for LY1/fbb-TOsF.]
\expandafter\ifx\csname fbb@scale\endcsname\relax
\let\fbb@@scale\@empty
@@ -16,12 +15,28 @@
\DeclareFontFamily{LY1}{fbb-TOsF}{}
+\DeclareFontShape{LY1}{fbb-TOsF}{b}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-tosf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{fbb-TOsF}{b}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-tosf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{fbb-TOsF}{m}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-tosf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{fbb-TOsF}{m}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-tosf-swash-ly1
+}{}
+
\DeclareFontShape{LY1}{fbb-TOsF}{b}{it}{
- <-> \fbb@@scale fbb-BoldItalic-tosf-ly1
+ <-> \fbb@@scale fbb-BoldItalic-tosf\fbb@@swashQ-ly1
}{}
\DeclareFontShape{LY1}{fbb-TOsF}{b}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Bold-tosf-ly1
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-tosf\fbb@@swashQ-ly1
}{}
\DeclareFontShape{LY1}{fbb-TOsF}{b}{sc}{
@@ -41,11 +56,11 @@
}{}
\DeclareFontShape{LY1}{fbb-TOsF}{m}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Regular-tosf-ly1
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-tosf\fbb@@swashQ-ly1
}{}
\DeclareFontShape{LY1}{fbb-TOsF}{m}{it}{
- <-> \fbb@@scale fbb-Italic-tosf-ly1
+ <-> \fbb@@scale fbb-Italic-tosf\fbb@@swashQ-ly1
}{}
\DeclareFontShape{LY1}{fbb-TOsF}{m}{sc}{
diff --git a/Master/texmf-dist/tex/latex/fbb/OT1fbb-LF.fd b/Master/texmf-dist/tex/latex/fbb/OT1fbb-LF.fd
index e1744a874fa..04f180c2f44 100644
--- a/Master/texmf-dist/tex/latex/fbb/OT1fbb-LF.fd
+++ b/Master/texmf-dist/tex/latex/fbb/OT1fbb-LF.fd
@@ -1,13 +1,17 @@
-%% Generated by autoinst on 2015/08/23
%%
\ProvidesFile{OT1fbb-LF.fd}
- [2015/08/23 (autoinst) Font definitions for OT1/fbb-LF.]
+ [2020/07/01 (msharpe) Font definitions for OT1/fbb-LF.]
+
+\expandafter\ifx\csname fbb@@swashQ\endcsname\relax%
+ \global\let\fbb@@swashQ\@empty
+\fi
\expandafter\ifx\csname fbb@scale\endcsname\relax
\let\fbb@@scale\@empty
\else
\edef\fbb@@scale{s*[\csname fbb@scale\endcsname]}%
\fi
+
\expandafter\ifx\csname fbb@altP\endcsname\relax
\let\fbb@@altP\@empty
\else
@@ -16,6 +20,22 @@
\DeclareFontFamily{OT1}{fbb-LF}{}
+\DeclareFontShape{OT1}{fbb-LF}{b}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-lf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{fbb-LF}{b}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-lf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{fbb-LF}{m}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-lf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{fbb-LF}{m}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-lf-swash-ot1
+}{}
+
\DeclareFontShape{OT1}{fbb-LF}{m}{scit}{
<-> \fbb@@scale fbb-Italic-lf-sc-ot1
}{}
@@ -25,11 +45,11 @@
}{}
\DeclareFontShape{OT1}{fbb-LF}{m}{n}{
- <-> \fbb@@scale fbb\fbb@@alt-Regular-lf-ot1
+ <-> \fbb@@scale fbb\fbb@@alt-Regular-lf\fbb@@swashQ-ot1
}{}
\DeclareFontShape{OT1}{fbb-LF}{m}{it}{
- <-> \fbb@@scale fbb-Italic-lf-ot1
+ <-> \fbb@@scale fbb-Italic-lf\fbb@@swashQ-ot1
}{}
\DeclareFontShape{OT1}{fbb-LF}{m}{sl}{
@@ -49,11 +69,11 @@
}{}
\DeclareFontShape{OT1}{fbb-LF}{b}{it}{
- <-> \fbb@@scale fbb-BoldItalic-lf-ot1
+ <-> \fbb@@scale fbb-BoldItalic-lf\fbb@@swashQ-ot1
}{}
\DeclareFontShape{OT1}{fbb-LF}{b}{n}{
- <-> \fbb@@scale fbb\fbb@@alt-Bold-lf-ot1
+ <-> \fbb@@scale fbb\fbb@@alt-Bold-lf\fbb@@swashQ-ot1
}{}
\DeclareFontShape{OT1}{fbb-LF}{b}{sl}{
diff --git a/Master/texmf-dist/tex/latex/fbb/OT1fbb-OsF.fd b/Master/texmf-dist/tex/latex/fbb/OT1fbb-OsF.fd
index 6a31d57fb5d..45ce7f3e944 100644
--- a/Master/texmf-dist/tex/latex/fbb/OT1fbb-OsF.fd
+++ b/Master/texmf-dist/tex/latex/fbb/OT1fbb-OsF.fd
@@ -1,7 +1,10 @@
-%% Generated by autoinst on 2015/08/23
%%
\ProvidesFile{OT1fbb-OsF.fd}
- [2015/08/23 (autoinst) Font definitions for OT1/fbb-OsF.]
+ [2020/07/01 (msharpe) Font definitions for OT1/fbb-OsF.]
+
+\expandafter\ifx\csname fbb@@swashQ\endcsname\relax%
+ \global\let\fbb@@swashQ\@empty
+\fi
\expandafter\ifx\csname fbb@scale\endcsname\relax
\let\fbb@@scale\@empty
@@ -16,6 +19,22 @@
\DeclareFontFamily{OT1}{fbb-OsF}{}
+\DeclareFontShape{OT1}{fbb-OsF}{b}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-osf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{fbb-OsF}{b}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-osf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{fbb-OsF}{m}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-osf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{fbb-OsF}{m}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-osf-swash-ot1
+}{}
+
\DeclareFontShape{OT1}{fbb-OsF}{b}{sc}{
<-> \fbb@@scale fbb\fbb@@altP-Bold-osf-sc-ot1
}{}
@@ -25,11 +44,11 @@
}{}
\DeclareFontShape{OT1}{fbb-OsF}{b}{it}{
- <-> \fbb@@scale fbb-BoldItalic-osf-ot1
+ <-> \fbb@@scale fbb-BoldItalic-osf\fbb@@swashQ-ot1
}{}
\DeclareFontShape{OT1}{fbb-OsF}{b}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Bold-osf-ot1
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-osf\fbb@@swashQ-ot1
}{}
\DeclareFontShape{OT1}{fbb-OsF}{b}{sl}{
@@ -41,11 +60,11 @@
}{}
\DeclareFontShape{OT1}{fbb-OsF}{m}{it}{
- <-> \fbb@@scale fbb-Italic-osf-ot1
+ <-> \fbb@@scale fbb-Italic-osf\fbb@@swashQ-ot1
}{}
\DeclareFontShape{OT1}{fbb-OsF}{m}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Regular-osf-ot1
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-osf\fbb@@swashQ-ot1
}{}
\DeclareFontShape{OT1}{fbb-OsF}{m}{sc}{
diff --git a/Master/texmf-dist/tex/latex/fbb/OT1fbb-TLF.fd b/Master/texmf-dist/tex/latex/fbb/OT1fbb-TLF.fd
index fa077d419db..31867ffa8ec 100644
--- a/Master/texmf-dist/tex/latex/fbb/OT1fbb-TLF.fd
+++ b/Master/texmf-dist/tex/latex/fbb/OT1fbb-TLF.fd
@@ -1,7 +1,10 @@
-%% Generated by autoinst on 2015/08/23
%%
\ProvidesFile{OT1fbb-TLF.fd}
- [2015/08/23 (autoinst) Font definitions for OT1/fbb-TLF.]
+ [2020/07/01 (msharpe) Font definitions for OT1/fbb-TLF.]
+
+\expandafter\ifx\csname fbb@@swashQ\endcsname\relax%
+ \global\let\fbb@@swashQ\@empty
+\fi
\expandafter\ifx\csname fbb@scale\endcsname\relax
\let\fbb@@scale\@empty
@@ -16,12 +19,28 @@
\DeclareFontFamily{OT1}{fbb-TLF}{}
+\DeclareFontShape{OT1}{fbb-TLF}{b}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{fbb-TLF}{b}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{fbb-TLF}{m}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{fbb-TLF}{m}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-tlf-swash-ot1
+}{}
+
\DeclareFontShape{OT1}{fbb-TLF}{b}{it}{
- <-> \fbb@@scale fbb-BoldItalic-tlf-ot1
+ <-> \fbb@@scale fbb-BoldItalic-tlf\fbb@@swashQ-ot1
}{}
\DeclareFontShape{OT1}{fbb-TLF}{b}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Bold-tlf-ot1
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-tlf\fbb@@swashQ-ot1
}{}
\DeclareFontShape{OT1}{fbb-TLF}{b}{scit}{
@@ -41,11 +60,11 @@
}{}
\DeclareFontShape{OT1}{fbb-TLF}{m}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Regular-tlf-ot1
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-tlf\fbb@@swashQ-ot1
}{}
\DeclareFontShape{OT1}{fbb-TLF}{m}{it}{
- <-> \fbb@@scale fbb-Italic-tlf-ot1
+ <-> \fbb@@scale fbb-Italic-tlf\fbb@@swashQ-ot1
}{}
\DeclareFontShape{OT1}{fbb-TLF}{m}{scit}{
diff --git a/Master/texmf-dist/tex/latex/fbb/OT1fbb-TOsF.fd b/Master/texmf-dist/tex/latex/fbb/OT1fbb-TOsF.fd
index fea405a87e7..2402a2d88b9 100644
--- a/Master/texmf-dist/tex/latex/fbb/OT1fbb-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/fbb/OT1fbb-TOsF.fd
@@ -1,7 +1,10 @@
-%% Generated by autoinst on 2015/08/23
%%
\ProvidesFile{OT1fbb-TOsF.fd}
- [2015/08/23 (autoinst) Font definitions for OT1/fbb-TOsF.]
+ [2020/07/01 (msharpe) Font definitions for OT1/fbb-TOsF.]
+
+\expandafter\ifx\csname fbb@@swashQ\endcsname\relax%
+ \global\let\fbb@@swashQ\@empty
+\fi
\expandafter\ifx\csname fbb@scale\endcsname\relax
\let\fbb@@scale\@empty
@@ -16,6 +19,22 @@
\DeclareFontFamily{OT1}{fbb-TOsF}{}
+\DeclareFontShape{OT1}{fbb-TOsF}{b}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-tosf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{fbb-TOsF}{b}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-tosf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{fbb-TOsF}{m}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-tosf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{fbb-TOsF}{m}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-tosf-swash-ot1
+}{}
+
\DeclareFontShape{OT1}{fbb-TOsF}{b}{sc}{
<-> \fbb@@scale fbb-Bold\fbb@@altP-tosf-sc-ot1
}{}
@@ -25,11 +44,11 @@
}{}
\DeclareFontShape{OT1}{fbb-TOsF}{b}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Bold-tosf-ot1
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-tosf\fbb@@swashQ-ot1
}{}
\DeclareFontShape{OT1}{fbb-TOsF}{b}{it}{
- <-> \fbb@@scale fbb-BoldItalic-tosf-ot1
+ <-> \fbb@@scale fbb-BoldItalic-tosf\fbb@@swashQ-ot1
}{}
\DeclareFontShape{OT1}{fbb-TOsF}{b}{sl}{
@@ -41,11 +60,11 @@
}{}
\DeclareFontShape{OT1}{fbb-TOsF}{m}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Regular-tosf-ot1
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-tosf\fbb@@swashQ-ot1
}{}
\DeclareFontShape{OT1}{fbb-TOsF}{m}{it}{
- <-> \fbb@@scale fbb-Italic-tosf-ot1
+ <-> \fbb@@scale fbb-Italic-tosf\fbb@@swashQ-ot1
}{}
\DeclareFontShape{OT1}{fbb-TOsF}{m}{sc}{
diff --git a/Master/texmf-dist/tex/latex/fbb/T1fbb-LF.fd b/Master/texmf-dist/tex/latex/fbb/T1fbb-LF.fd
index c95ff77e141..cb466e17a95 100644
--- a/Master/texmf-dist/tex/latex/fbb/T1fbb-LF.fd
+++ b/Master/texmf-dist/tex/latex/fbb/T1fbb-LF.fd
@@ -1,7 +1,10 @@
-%% Generated by autoinst on 2015/08/23
%%
\ProvidesFile{T1fbb-LF.fd}
- [2015/08/23 (autoinst) Font definitions for T1/fbb-LF.]
+ [2020/07/01 (msharpe) Font definitions for T1/fbb-LF.]
+
+\expandafter\ifx\csname fbb@@swashQ\endcsname\relax%
+ \global\let\fbb@@swashQ\@empty
+\fi
\expandafter\ifx\csname fbb@scale\endcsname\relax
\let\fbb@@scale\@empty
@@ -16,6 +19,22 @@
\DeclareFontFamily{T1}{fbb-LF}{}
+\DeclareFontShape{T1}{fbb-LF}{b}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-lf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{fbb-LF}{b}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-lf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{fbb-LF}{m}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-lf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{fbb-LF}{m}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-lf-swash-t1
+}{}
+
\DeclareFontShape{T1}{fbb-LF}{b}{sc}{
<-> \fbb@@scale fbb\fbb@@altP-Bold-lf-sc-t1
}{}
@@ -25,11 +44,11 @@
}{}
\DeclareFontShape{T1}{fbb-LF}{b}{it}{
- <-> \fbb@@scale fbb-BoldItalic-lf-t1
+ <-> \fbb@@scale fbb-BoldItalic-lf\fbb@@swashQ-t1
}{}
\DeclareFontShape{T1}{fbb-LF}{b}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Bold-lf-t1
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-lf\fbb@@swashQ-t1
}{}
\DeclareFontShape{T1}{fbb-LF}{b}{sl}{
@@ -41,11 +60,11 @@
}{}
\DeclareFontShape{T1}{fbb-LF}{m}{it}{
- <-> \fbb@@scale fbb-Italic-lf-t1
+ <-> \fbb@@scale fbb-Italic-lf\fbb@@swashQ-t1
}{}
\DeclareFontShape{T1}{fbb-LF}{m}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Regular-lf-t1
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-lf\fbb@@swashQ-t1
}{}
\DeclareFontShape{T1}{fbb-LF}{m}{scit}{
diff --git a/Master/texmf-dist/tex/latex/fbb/T1fbb-OsF.fd b/Master/texmf-dist/tex/latex/fbb/T1fbb-OsF.fd
index 4349d83d0cb..5ab8d4f03c9 100644
--- a/Master/texmf-dist/tex/latex/fbb/T1fbb-OsF.fd
+++ b/Master/texmf-dist/tex/latex/fbb/T1fbb-OsF.fd
@@ -1,7 +1,10 @@
-%% Generated by autoinst on 2015/08/23
%%
\ProvidesFile{T1fbb-OsF.fd}
- [2015/08/23 (autoinst) Font definitions for T1/fbb-OsF.]
+ [2020/07/01 (msharpe) Font definitions for T1/fbb-OsF.]
+
+\expandafter\ifx\csname fbb@@swashQ\endcsname\relax%
+ \global\let\fbb@@swashQ\@empty
+\fi
\expandafter\ifx\csname fbb@scale\endcsname\relax
\let\fbb@@scale\@empty
@@ -16,12 +19,28 @@
\DeclareFontFamily{T1}{fbb-OsF}{}
+\DeclareFontShape{T1}{fbb-OsF}{b}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-osf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{fbb-OsF}{b}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-osf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{fbb-OsF}{m}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-osf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{fbb-OsF}{m}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-osf-swash-t1
+}{}
+
\DeclareFontShape{T1}{fbb-OsF}{b}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Bold-osf-t1
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-osf\fbb@@swashQ-t1
}{}
\DeclareFontShape{T1}{fbb-OsF}{b}{it}{
- <-> \fbb@@scale fbb-BoldItalic-osf-t1
+ <-> \fbb@@scale fbb-BoldItalic-osf\fbb@@swashQ-t1
}{}
\DeclareFontShape{T1}{fbb-OsF}{b}{sc}{
@@ -41,11 +60,11 @@
}{}
\DeclareFontShape{T1}{fbb-OsF}{m}{it}{
- <-> \fbb@@scale fbb-Italic-osf-t1
+ <-> \fbb@@scale fbb-Italic-osf\fbb@@swashQ-t1
}{}
\DeclareFontShape{T1}{fbb-OsF}{m}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Regular-osf-t1
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-osf\fbb@@swashQ-t1
}{}
\DeclareFontShape{T1}{fbb-OsF}{m}{sc}{
diff --git a/Master/texmf-dist/tex/latex/fbb/T1fbb-TLF.fd b/Master/texmf-dist/tex/latex/fbb/T1fbb-TLF.fd
index 583f8b412be..991edf02f55 100644
--- a/Master/texmf-dist/tex/latex/fbb/T1fbb-TLF.fd
+++ b/Master/texmf-dist/tex/latex/fbb/T1fbb-TLF.fd
@@ -1,7 +1,10 @@
-%% Generated by autoinst on 2015/08/23
%%
\ProvidesFile{T1fbb-TLF.fd}
- [2015/08/23 (autoinst) Font definitions for T1/fbb-TLF.]
+ [2020/07/01 (msharpe) Font definitions for T1/fbb-TLF.]
+
+\expandafter\ifx\csname fbb@@swashQ\endcsname\relax%
+ \global\let\fbb@@swashQ\@empty
+\fi
\expandafter\ifx\csname fbb@scale\endcsname\relax
\let\fbb@@scale\@empty
@@ -16,12 +19,28 @@
\DeclareFontFamily{T1}{fbb-TLF}{}
+\DeclareFontShape{T1}{fbb-TLF}{b}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{fbb-TLF}{b}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{fbb-TLF}{m}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{fbb-TLF}{m}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-tlf-swash-t1
+}{}
+
\DeclareFontShape{T1}{fbb-TLF}{m}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Regular-tlf-t1
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-tlf\fbb@@swashQ-t1
}{}
\DeclareFontShape{T1}{fbb-TLF}{m}{it}{
- <-> \fbb@@scale fbb-Italic-tlf-t1
+ <-> \fbb@@scale fbb-Italic-tlf\fbb@@swashQ-t1
}{}
\DeclareFontShape{T1}{fbb-TLF}{m}{sc}{
@@ -41,11 +60,11 @@
}{}
\DeclareFontShape{T1}{fbb-TLF}{b}{it}{
- <-> \fbb@@scale fbb-BoldItalic-tlf-t1
+ <-> \fbb@@scale fbb-BoldItalic-tlf\fbb@@swashQ-t1
}{}
\DeclareFontShape{T1}{fbb-TLF}{b}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Bold-tlf-t1
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-tlf\fbb@@swashQ-t1
}{}
\DeclareFontShape{T1}{fbb-TLF}{b}{scit}{
diff --git a/Master/texmf-dist/tex/latex/fbb/T1fbb-TOsF.fd b/Master/texmf-dist/tex/latex/fbb/T1fbb-TOsF.fd
index b09419d4272..45f9c68456f 100644
--- a/Master/texmf-dist/tex/latex/fbb/T1fbb-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/fbb/T1fbb-TOsF.fd
@@ -1,7 +1,10 @@
-%% Generated by autoinst on 2015/08/23
%%
\ProvidesFile{T1fbb-TOsF.fd}
- [2015/08/23 (autoinst) Font definitions for T1/fbb-TOsF.]
+ [2020/07/01 (msharpe) Font definitions for T1/fbb-TOsF.]
+
+\expandafter\ifx\csname fbb@@swashQ\endcsname\relax%
+ \global\let\fbb@@swashQ\@empty
+\fi
\expandafter\ifx\csname fbb@scale\endcsname\relax
\let\fbb@@scale\@empty
@@ -16,6 +19,22 @@
\DeclareFontFamily{T1}{fbb-TOsF}{}
+\DeclareFontShape{T1}{fbb-TOsF}{b}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-tosf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{fbb-TOsF}{b}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-tosf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{fbb-TOsF}{m}{nw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-tosf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{fbb-TOsF}{m}{sw}{
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-tosf-swash-t1
+}{}
+
\DeclareFontShape{T1}{fbb-TOsF}{b}{scit}{
<-> \fbb@@scale fbb-BoldItalic-tosf-sc-t1
}{}
@@ -25,11 +44,11 @@
}{}
\DeclareFontShape{T1}{fbb-TOsF}{b}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Bold-tosf-t1
+ <-> \fbb@@scale fbb\fbb@@altP-Bold-tosf\fbb@@swashQ-t1
}{}
\DeclareFontShape{T1}{fbb-TOsF}{b}{it}{
- <-> \fbb@@scale fbb-BoldItalic-tosf-t1
+ <-> \fbb@@scale fbb-BoldItalic-tosf\fbb@@swashQ-t1
}{}
\DeclareFontShape{T1}{fbb-TOsF}{b}{sl}{
@@ -49,11 +68,11 @@
}{}
\DeclareFontShape{T1}{fbb-TOsF}{m}{n}{
- <-> \fbb@@scale fbb\fbb@@altP-Regular-tosf-t1
+ <-> \fbb@@scale fbb\fbb@@altP-Regular-tosf\fbb@@swashQ-t1
}{}
\DeclareFontShape{T1}{fbb-TOsF}{m}{it}{
- <-> \fbb@@scale fbb-Italic-tosf-t1
+ <-> \fbb@@scale fbb-Italic-tosf\fbb@@swashQ-t1
}{}
\DeclareFontShape{T1}{fbb-TOsF}{m}{sl}{
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