summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-08-02 21:04:55 +0000
committerKarl Berry <karl@freefriends.org>2020-08-02 21:04:55 +0000
commitd9dd4b393252278351c67654e707014d12c5cd43 (patch)
tree64915c294228ada485ef991d29cdc5b2145dbb80 /Master/texmf-dist/tex
parentb11502a474f4a0977fe5e13a95c6a3f440ed9cf1 (diff)
bitter (2aug20)
git-svn-id: svn://tug.org/texlive/trunk@56026 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/bitter/LY1Bttr-TLF.fd67
-rw-r--r--Master/texmf-dist/tex/latex/bitter/OT1Bttr-TLF.fd67
-rw-r--r--Master/texmf-dist/tex/latex/bitter/T1Bttr-TLF.fd67
-rw-r--r--Master/texmf-dist/tex/latex/bitter/TS1Bttr-TLF.fd67
-rw-r--r--Master/texmf-dist/tex/latex/bitter/bitter.sty48
5 files changed, 303 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/bitter/LY1Bttr-TLF.fd b/Master/texmf-dist/tex/latex/bitter/LY1Bttr-TLF.fd
new file mode 100644
index 00000000000..06a6fde47c0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bitter/LY1Bttr-TLF.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2020/08/02
+%%
+\ProvidesFile{LY1Bttr-TLF.fd}
+ [2020/08/02 (autoinst) Font definitions for LY1/Bttr-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Bttr@scale\endcsname\relax
+ \let\Bttr@@scale\@empty
+\else
+ \edef\Bttr@@scale{s*[\csname Bttr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{Bttr-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{Bttr-TLF}{m}{n}{
+ <-> \Bttr@@scale Bttr-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Bttr-TLF}{regular}{n}{
+ <-> alias * Bttr-TLF/m/n
+}{}
+
+\DeclareFontShape{LY1}{Bttr-TLF}{m}{it}{
+ <-> \Bttr@@scale Bttr-Italic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Bttr-TLF}{regular}{it}{
+ <-> alias * Bttr-TLF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Bttr-TLF}{m}{sl}{
+ <-> ssub * Bttr-TLF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Bttr-TLF}{regular}{sl}{
+ <-> ssub * Bttr-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{Bttr-TLF}{b}{n}{
+ <-> \Bttr@@scale Bttr-Bold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Bttr-TLF}{bold}{n}{
+ <-> alias * Bttr-TLF/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{Bttr-TLF}{bx}{n}{
+ <-> ssub * Bttr-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/bitter/OT1Bttr-TLF.fd b/Master/texmf-dist/tex/latex/bitter/OT1Bttr-TLF.fd
new file mode 100644
index 00000000000..b2a13ab5d76
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bitter/OT1Bttr-TLF.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2020/08/02
+%%
+\ProvidesFile{OT1Bttr-TLF.fd}
+ [2020/08/02 (autoinst) Font definitions for OT1/Bttr-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Bttr@scale\endcsname\relax
+ \let\Bttr@@scale\@empty
+\else
+ \edef\Bttr@@scale{s*[\csname Bttr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{Bttr-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{Bttr-TLF}{m}{n}{
+ <-> \Bttr@@scale Bttr-Regular-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Bttr-TLF}{regular}{n}{
+ <-> alias * Bttr-TLF/m/n
+}{}
+
+\DeclareFontShape{OT1}{Bttr-TLF}{m}{it}{
+ <-> \Bttr@@scale Bttr-Italic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Bttr-TLF}{regular}{it}{
+ <-> alias * Bttr-TLF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Bttr-TLF}{m}{sl}{
+ <-> ssub * Bttr-TLF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Bttr-TLF}{regular}{sl}{
+ <-> ssub * Bttr-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{Bttr-TLF}{b}{n}{
+ <-> \Bttr@@scale Bttr-Bold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Bttr-TLF}{bold}{n}{
+ <-> alias * Bttr-TLF/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{Bttr-TLF}{bx}{n}{
+ <-> ssub * Bttr-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/bitter/T1Bttr-TLF.fd b/Master/texmf-dist/tex/latex/bitter/T1Bttr-TLF.fd
new file mode 100644
index 00000000000..6f501bf729c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bitter/T1Bttr-TLF.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2020/08/02
+%%
+\ProvidesFile{T1Bttr-TLF.fd}
+ [2020/08/02 (autoinst) Font definitions for T1/Bttr-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Bttr@scale\endcsname\relax
+ \let\Bttr@@scale\@empty
+\else
+ \edef\Bttr@@scale{s*[\csname Bttr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{Bttr-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{Bttr-TLF}{m}{n}{
+ <-> \Bttr@@scale Bttr-Regular-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Bttr-TLF}{regular}{n}{
+ <-> alias * Bttr-TLF/m/n
+}{}
+
+\DeclareFontShape{T1}{Bttr-TLF}{m}{it}{
+ <-> \Bttr@@scale Bttr-Italic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Bttr-TLF}{regular}{it}{
+ <-> alias * Bttr-TLF/m/it
+}{}
+
+\DeclareFontShape{T1}{Bttr-TLF}{m}{sl}{
+ <-> ssub * Bttr-TLF/m/it
+}{}
+
+\DeclareFontShape{T1}{Bttr-TLF}{regular}{sl}{
+ <-> ssub * Bttr-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{Bttr-TLF}{b}{n}{
+ <-> \Bttr@@scale Bttr-Bold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Bttr-TLF}{bold}{n}{
+ <-> alias * Bttr-TLF/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{Bttr-TLF}{bx}{n}{
+ <-> ssub * Bttr-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/bitter/TS1Bttr-TLF.fd b/Master/texmf-dist/tex/latex/bitter/TS1Bttr-TLF.fd
new file mode 100644
index 00000000000..f3c83f56124
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bitter/TS1Bttr-TLF.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2020/08/02
+%%
+\ProvidesFile{TS1Bttr-TLF.fd}
+ [2020/08/02 (autoinst) Font definitions for TS1/Bttr-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Bttr@scale\endcsname\relax
+ \let\Bttr@@scale\@empty
+\else
+ \edef\Bttr@@scale{s*[\csname Bttr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{Bttr-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{Bttr-TLF}{m}{n}{
+ <-> \Bttr@@scale Bttr-Regular-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Bttr-TLF}{regular}{n}{
+ <-> alias * Bttr-TLF/m/n
+}{}
+
+\DeclareFontShape{TS1}{Bttr-TLF}{m}{it}{
+ <-> \Bttr@@scale Bttr-Italic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Bttr-TLF}{regular}{it}{
+ <-> alias * Bttr-TLF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Bttr-TLF}{m}{sl}{
+ <-> ssub * Bttr-TLF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Bttr-TLF}{regular}{sl}{
+ <-> ssub * Bttr-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{Bttr-TLF}{b}{n}{
+ <-> \Bttr@@scale Bttr-Bold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Bttr-TLF}{bold}{n}{
+ <-> alias * Bttr-TLF/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{Bttr-TLF}{bx}{n}{
+ <-> ssub * Bttr-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/bitter/bitter.sty b/Master/texmf-dist/tex/latex/bitter/bitter.sty
index b792ae6d1e6..a215441ee70 100644
--- a/Master/texmf-dist/tex/latex/bitter/bitter.sty
+++ b/Master/texmf-dist/tex/latex/bitter/bitter.sty
@@ -1,31 +1,40 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bitter}
- [200/07/25 (R.D. Tennent) Supports Bitter fonts for xeLaTeX and luaLaTeX.]
+ [2020/08/02 (R.D. Tennent) Supports Bitter fonts for all LaTeX engines.]
-\RequirePackage{iftex}
+\RequirePackage{ifxetex,ifluatex,textcomp}
-\ifpdftex
-\PackageError{bitter}{%
- *****************************************\MessageBreak
- Please process using XeLaTeX or luaLaTeX\MessageBreak
- *****************************************}
-\fi
+\newif\ifBitter@ttf
+\ifxetex
+ \Bitter@ttftrue
+\else\ifluatex
+ \Bitter@ttftrue
+\else % [pdf]LaTeX
+ \Bitter@ttffalse
+\fi\fi
-
-\newcommand*{\Bitter@scale}{1}
+\newcommand*{\Bttr@scale}{1}
\RequirePackage{xkeyval}
-\DeclareOptionX{scaled}{\renewcommand*{\Bitter@scale}{#1}}
-\DeclareOptionX{scale}{\renewcommand*{\Bitter@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\Bttr@scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\Bttr@scale}{#1}}
+
+\DeclareOptionX{type1}{\Bitter@ttffalse}
\ProcessOptionsX\relax
+\ifBitter@ttf
\RequirePackage{fontspec}
+\else
+ \RequirePackage{fontenc,fontaxes,mweights}
+\fi
+\ifBitter@ttf
+ \def\Bitter@regular{Regular}
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
Extension = .ttf ,
- Scale = \Bitter@scale ,
+ Scale = \Bttr@scale ,
}
\setmainfont
[ UprightFont = *-Regular ,
@@ -43,8 +52,21 @@
]
{Bitter}
+\else % type1
+
+ \def\bfseries@rm{b}
+ \def\mdseries@rm{m}
+ \def\seriesdefault{\mdseries@rm}
+ \def\bitterfamily{Bttr-TLF}
+ \def\bitter{\fontfamily{\bitterfamily}\selectfont}
+ \def\rmdefault{\bitterfamily}
+
+\fi
+
% turn off defaults in case other fonts are selected:
+\ifBitter@ttf
\defaultfontfeatures{}
+\fi
\endinput