From 2e4e4492f8975d8549339a3c8a53a6108cd77eb7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 25 Jul 2020 21:45:34 +0000 Subject: bitter (25jul20) git-svn-id: svn://tug.org/texlive/trunk@55939 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/bitter/LY1Bitter-TLF.fd | 65 ---------------------- .../texmf-dist/tex/latex/bitter/OT1Bitter-TLF.fd | 65 ---------------------- Master/texmf-dist/tex/latex/bitter/T1Bitter-TLF.fd | 65 ---------------------- .../texmf-dist/tex/latex/bitter/TS1Bitter-TLF.fd | 65 ---------------------- Master/texmf-dist/tex/latex/bitter/bitter.sty | 40 +++---------- 5 files changed, 9 insertions(+), 291 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/bitter/LY1Bitter-TLF.fd delete mode 100644 Master/texmf-dist/tex/latex/bitter/OT1Bitter-TLF.fd delete mode 100644 Master/texmf-dist/tex/latex/bitter/T1Bitter-TLF.fd delete mode 100644 Master/texmf-dist/tex/latex/bitter/TS1Bitter-TLF.fd (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/bitter/LY1Bitter-TLF.fd b/Master/texmf-dist/tex/latex/bitter/LY1Bitter-TLF.fd deleted file mode 100644 index 1d1a22b1975..00000000000 --- a/Master/texmf-dist/tex/latex/bitter/LY1Bitter-TLF.fd +++ /dev/null @@ -1,65 +0,0 @@ -%% Generated by autoinst on 2019/05/10 -%% -\ProvidesFile{LY1Bitter-TLF.fd} - [2019/05/10 (autoinst) Font definitions for LY1/Bitter-TLF.] - -\expandafter\ifx\csname Bitter@scale\endcsname\relax - \let\Bitter@@scale\@empty -\else - \edef\Bitter@@scale{s*[\csname Bitter@scale\endcsname]}% -\fi - -\DeclareFontFamily{LY1}{Bitter-TLF}{} - - -% ---- regular ---- - -\DeclareFontShape{LY1}{Bitter-TLF}{regular}{n}{ - <-> \Bitter@@scale Bitter-Regular-tlf-ly1 -}{} - -\DeclareFontShape{LY1}{Bitter-TLF}{regular}{it}{ - <-> \Bitter@@scale Bitter-Italic-tlf-ly1 -}{} - -\DeclareFontShape{LY1}{Bitter-TLF}{regular}{sl}{ - <-> ssub * Bitter-TLF/regular/it -}{} - - -% ---- bold ---- - -\DeclareFontShape{LY1}{Bitter-TLF}{bold}{n}{ - <-> \Bitter@@scale Bitter-Bold-tlf-ly1 -}{} - -% -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names -% - -% m --> regular - -\DeclareFontShape{LY1}{Bitter-TLF}{m}{sl}{ - <-> ssub * Bitter-TLF/regular/sl -}{} - -\DeclareFontShape{LY1}{Bitter-TLF}{m}{n}{ - <-> ssub * Bitter-TLF/regular/n -}{} - -\DeclareFontShape{LY1}{Bitter-TLF}{m}{it}{ - <-> ssub * Bitter-TLF/regular/it -}{} - - -% b --> bold - -\DeclareFontShape{LY1}{Bitter-TLF}{b}{n}{ - <-> ssub * Bitter-TLF/bold/n -}{} - -\DeclareFontShape{LY1}{Bitter-TLF}{bx}{n}{ - <-> ssub * Bitter-TLF/b/n -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/bitter/OT1Bitter-TLF.fd b/Master/texmf-dist/tex/latex/bitter/OT1Bitter-TLF.fd deleted file mode 100644 index cf2ba306962..00000000000 --- a/Master/texmf-dist/tex/latex/bitter/OT1Bitter-TLF.fd +++ /dev/null @@ -1,65 +0,0 @@ -%% Generated by autoinst on 2019/05/10 -%% -\ProvidesFile{OT1Bitter-TLF.fd} - [2019/05/10 (autoinst) Font definitions for OT1/Bitter-TLF.] - -\expandafter\ifx\csname Bitter@scale\endcsname\relax - \let\Bitter@@scale\@empty -\else - \edef\Bitter@@scale{s*[\csname Bitter@scale\endcsname]}% -\fi - -\DeclareFontFamily{OT1}{Bitter-TLF}{} - - -% ---- regular ---- - -\DeclareFontShape{OT1}{Bitter-TLF}{regular}{n}{ - <-> \Bitter@@scale Bitter-Regular-tlf-ot1 -}{} - -\DeclareFontShape{OT1}{Bitter-TLF}{regular}{it}{ - <-> \Bitter@@scale Bitter-Italic-tlf-ot1 -}{} - -\DeclareFontShape{OT1}{Bitter-TLF}{regular}{sl}{ - <-> ssub * Bitter-TLF/regular/it -}{} - - -% ---- bold ---- - -\DeclareFontShape{OT1}{Bitter-TLF}{bold}{n}{ - <-> \Bitter@@scale Bitter-Bold-tlf-ot1 -}{} - -% -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names -% - -% m --> regular - -\DeclareFontShape{OT1}{Bitter-TLF}{m}{sl}{ - <-> ssub * Bitter-TLF/regular/sl -}{} - -\DeclareFontShape{OT1}{Bitter-TLF}{m}{n}{ - <-> ssub * Bitter-TLF/regular/n -}{} - -\DeclareFontShape{OT1}{Bitter-TLF}{m}{it}{ - <-> ssub * Bitter-TLF/regular/it -}{} - - -% b --> bold - -\DeclareFontShape{OT1}{Bitter-TLF}{b}{n}{ - <-> ssub * Bitter-TLF/bold/n -}{} - -\DeclareFontShape{OT1}{Bitter-TLF}{bx}{n}{ - <-> ssub * Bitter-TLF/b/n -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/bitter/T1Bitter-TLF.fd b/Master/texmf-dist/tex/latex/bitter/T1Bitter-TLF.fd deleted file mode 100644 index 30ef1da2e80..00000000000 --- a/Master/texmf-dist/tex/latex/bitter/T1Bitter-TLF.fd +++ /dev/null @@ -1,65 +0,0 @@ -%% Generated by autoinst on 2019/05/10 -%% -\ProvidesFile{T1Bitter-TLF.fd} - [2019/05/10 (autoinst) Font definitions for T1/Bitter-TLF.] - -\expandafter\ifx\csname Bitter@scale\endcsname\relax - \let\Bitter@@scale\@empty -\else - \edef\Bitter@@scale{s*[\csname Bitter@scale\endcsname]}% -\fi - -\DeclareFontFamily{T1}{Bitter-TLF}{} - - -% ---- regular ---- - -\DeclareFontShape{T1}{Bitter-TLF}{regular}{n}{ - <-> \Bitter@@scale Bitter-Regular-tlf-t1 -}{} - -\DeclareFontShape{T1}{Bitter-TLF}{regular}{it}{ - <-> \Bitter@@scale Bitter-Italic-tlf-t1 -}{} - -\DeclareFontShape{T1}{Bitter-TLF}{regular}{sl}{ - <-> ssub * Bitter-TLF/regular/it -}{} - - -% ---- bold ---- - -\DeclareFontShape{T1}{Bitter-TLF}{bold}{n}{ - <-> \Bitter@@scale Bitter-Bold-tlf-t1 -}{} - -% -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names -% - -% m --> regular - -\DeclareFontShape{T1}{Bitter-TLF}{m}{sl}{ - <-> ssub * Bitter-TLF/regular/sl -}{} - -\DeclareFontShape{T1}{Bitter-TLF}{m}{n}{ - <-> ssub * Bitter-TLF/regular/n -}{} - -\DeclareFontShape{T1}{Bitter-TLF}{m}{it}{ - <-> ssub * Bitter-TLF/regular/it -}{} - - -% b --> bold - -\DeclareFontShape{T1}{Bitter-TLF}{b}{n}{ - <-> ssub * Bitter-TLF/bold/n -}{} - -\DeclareFontShape{T1}{Bitter-TLF}{bx}{n}{ - <-> ssub * Bitter-TLF/b/n -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/bitter/TS1Bitter-TLF.fd b/Master/texmf-dist/tex/latex/bitter/TS1Bitter-TLF.fd deleted file mode 100644 index 8504d093ef3..00000000000 --- a/Master/texmf-dist/tex/latex/bitter/TS1Bitter-TLF.fd +++ /dev/null @@ -1,65 +0,0 @@ -%% Generated by autoinst on 2019/05/10 -%% -\ProvidesFile{TS1Bitter-TLF.fd} - [2019/05/10 (autoinst) Font definitions for TS1/Bitter-TLF.] - -\expandafter\ifx\csname Bitter@scale\endcsname\relax - \let\Bitter@@scale\@empty -\else - \edef\Bitter@@scale{s*[\csname Bitter@scale\endcsname]}% -\fi - -\DeclareFontFamily{TS1}{Bitter-TLF}{} - - -% ---- regular ---- - -\DeclareFontShape{TS1}{Bitter-TLF}{regular}{n}{ - <-> \Bitter@@scale Bitter-Regular-tlf-ts1 -}{} - -\DeclareFontShape{TS1}{Bitter-TLF}{regular}{it}{ - <-> \Bitter@@scale Bitter-Italic-tlf-ts1 -}{} - -\DeclareFontShape{TS1}{Bitter-TLF}{regular}{sl}{ - <-> ssub * Bitter-TLF/regular/it -}{} - - -% ---- bold ---- - -\DeclareFontShape{TS1}{Bitter-TLF}{bold}{n}{ - <-> \Bitter@@scale Bitter-Bold-tlf-ts1 -}{} - -% -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names -% - -% m --> regular - -\DeclareFontShape{TS1}{Bitter-TLF}{m}{sl}{ - <-> ssub * Bitter-TLF/regular/sl -}{} - -\DeclareFontShape{TS1}{Bitter-TLF}{m}{n}{ - <-> ssub * Bitter-TLF/regular/n -}{} - -\DeclareFontShape{TS1}{Bitter-TLF}{m}{it}{ - <-> ssub * Bitter-TLF/regular/it -}{} - - -% b --> bold - -\DeclareFontShape{TS1}{Bitter-TLF}{b}{n}{ - <-> ssub * Bitter-TLF/bold/n -}{} - -\DeclareFontShape{TS1}{Bitter-TLF}{bx}{n}{ - <-> ssub * Bitter-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 1362c92640d..b792ae6d1e6 100644 --- a/Master/texmf-dist/tex/latex/bitter/bitter.sty +++ b/Master/texmf-dist/tex/latex/bitter/bitter.sty @@ -1,35 +1,26 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bitter} - [2019/05/10 (R.D. Tennent) Supports Bitter fonts for all LaTeX engines.] + [200/07/25 (R.D. Tennent) Supports Bitter fonts for xeLaTeX and luaLaTeX.] -\RequirePackage{ifxetex,ifluatex,textcomp} +\RequirePackage{iftex} + +\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} \RequirePackage{xkeyval} \DeclareOptionX{scaled}{\renewcommand*{\Bitter@scale}{#1}} \DeclareOptionX{scale}{\renewcommand*{\Bitter@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 , @@ -52,21 +43,8 @@ ] {Bitter} -\else % type1 - - \def\bfseries@rm{b} - \def\mdseries@rm{m} - \def\seriesdefault{\mdseries@rm} - \def\bitterfamily{Bitter-TLF} - \def\bitter{\fontfamily{\bitterfamily}\selectfont} - \def\rmdefault{\bitterfamily} - -\fi - % turn off defaults in case other fonts are selected: -\ifBitter@ttf \defaultfontfeatures{} -\fi \endinput -- cgit v1.2.3