From bcc14926db4eaff495f6ba1336bdf674c54bbdb1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 29 Jul 2020 21:33:21 +0000 Subject: lobster2 (29jul20) git-svn-id: svn://tug.org/texlive/trunk@55984 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/lobster2/LY1Lbstr-LF.fd | 97 ++++++++++++++++++++++ .../texmf-dist/tex/latex/lobster2/LobsterTwo.sty | 78 ++++++++++------- .../texmf-dist/tex/latex/lobster2/OT1Lbstr-LF.fd | 97 ++++++++++++++++++++++ Master/texmf-dist/tex/latex/lobster2/T1Lbstr-LF.fd | 97 ++++++++++++++++++++++ .../texmf-dist/tex/latex/lobster2/TS1Lbstr-LF.fd | 97 ++++++++++++++++++++++ 5 files changed, 436 insertions(+), 30 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/lobster2/LY1Lbstr-LF.fd create mode 100644 Master/texmf-dist/tex/latex/lobster2/OT1Lbstr-LF.fd create mode 100644 Master/texmf-dist/tex/latex/lobster2/T1Lbstr-LF.fd create mode 100644 Master/texmf-dist/tex/latex/lobster2/TS1Lbstr-LF.fd (limited to 'Master/texmf-dist/tex/latex/lobster2') diff --git a/Master/texmf-dist/tex/latex/lobster2/LY1Lbstr-LF.fd b/Master/texmf-dist/tex/latex/lobster2/LY1Lbstr-LF.fd new file mode 100644 index 00000000000..3c17ae21813 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lobster2/LY1Lbstr-LF.fd @@ -0,0 +1,97 @@ +%% Generated by autoinst on 2020/07/28 +%% +\ProvidesFile{LY1Lbstr-LF.fd} + [2020/07/28 (autoinst) Font definitions for LY1/Lbstr-LF.] + +\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 Lbstr@scale\endcsname\relax + \let\Lbstr@@scale\@empty +\else + \edef\Lbstr@@scale{s*[\csname Lbstr@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{Lbstr-LF}{} + + +% ---- regular ---- + +\DeclareFontShape{LY1}{Lbstr-LF}{regular}{n}{ + <-> \Lbstr@@scale Lbstr-Regular-lf-ly1 +}{} + +\DeclareFontShape{LY1}{Lbstr-LF}{regular}{it}{ + <-> \Lbstr@@scale Lbstr-Italic-lf-ly1 +}{} + +\DeclareFontShape{LY1}{Lbstr-LF}{regular}{sl}{ + <-> ssub * Lbstr-LF/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{LY1}{Lbstr-LF}{bold}{n}{ + <-> \Lbstr@@scale Lbstr-Bold-lf-ly1 +}{} + +\DeclareFontShape{LY1}{Lbstr-LF}{bold}{it}{ + <-> \Lbstr@@scale Lbstr-BoldItalic-lf-ly1 +}{} + +\DeclareFontShape{LY1}{Lbstr-LF}{bold}{sl}{ + <-> ssub * Lbstr-LF/bold/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{LY1}{Lbstr-LF}{m}{sl}{ + <-> alias * Lbstr-LF/regular/sl +}{} + +\DeclareFontShape{LY1}{Lbstr-LF}{m}{n}{ + <-> alias * Lbstr-LF/regular/n +}{} + +\DeclareFontShape{LY1}{Lbstr-LF}{m}{it}{ + <-> alias * Lbstr-LF/regular/it +}{} + + +% b --> bold + +\DeclareFontShape{LY1}{Lbstr-LF}{b}{sl}{ + <-> alias * Lbstr-LF/bold/sl +}{} + +\DeclareFontShape{LY1}{Lbstr-LF}{b}{n}{ + <-> alias * Lbstr-LF/bold/n +}{} + +\DeclareFontShape{LY1}{Lbstr-LF}{b}{it}{ + <-> alias * Lbstr-LF/bold/it +}{} + +\DeclareFontShape{LY1}{Lbstr-LF}{bx}{n}{ + <-> ssub * Lbstr-LF/b/n +}{} + +\DeclareFontShape{LY1}{Lbstr-LF}{bx}{sl}{ + <-> ssub * Lbstr-LF/b/sl +}{} + +\DeclareFontShape{LY1}{Lbstr-LF}{bx}{it}{ + <-> ssub * Lbstr-LF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/lobster2/LobsterTwo.sty b/Master/texmf-dist/tex/latex/lobster2/LobsterTwo.sty index 324c209567e..c8bca9b8fb8 100644 --- a/Master/texmf-dist/tex/latex/lobster2/LobsterTwo.sty +++ b/Master/texmf-dist/tex/latex/lobster2/LobsterTwo.sty @@ -1,46 +1,64 @@ \ProvidesPackage{LobsterTwo}[% - 2020/07/22 (Bob Tennent) Supports Lobster Two fonts for modern LaTeX engines. ] + 2020/07/29 (Bob Tennent) Supports Lobster Two fonts for all LaTeX engines. ] -\RequirePackage{iftex} - -\ifpdftex -\PackageError{lobster2}{% - *****************************************\MessageBreak - Please Process using xelatex or lualatex\MessageBreak - *****************************************} -\fi +\RequirePackage{ifxetex,ifluatex,textcomp} +\newif\ifLobsterTwo@otf +\ifxetex + \LobsterTwo@otftrue +\else\ifluatex + \LobsterTwo@otftrue +\else % [pdf]LaTeX + \LobsterTwo@otffalse +\fi\fi \newcommand*{\LobsterTwo@scale}{1} \RequirePackage{xkeyval} \DeclareOptionX{scaled}{\renewcommand*{\LobsterTwo@scale}{#1}} \DeclareOptionX{scale}{\renewcommand*{\LobsterTwo@scale}{#1}} +\DeclareOptionX{type1}{\LobsterTwo@otffalse} + \ProcessOptionsX\relax -\RequirePackage{fontspec} - -\ifxetex\XeTeXtracingfonts=1\fi -\defaultfontfeatures{ - Ligatures = TeX , - Extension = .ttf , - Scale = \LobsterTwo@scale , -} -\setmainfont - [ UprightFont = *-Regular , - ItalicFont = *-Italic , - BoldFont = *-Bold , - BoldItalicFont = *-BoldItalic ] - {LobsterTwo} -\newfontfamily\LobsterTwo - [ UprightFont = *-Regular , - ItalicFont = *-Italic , - BoldFont = *-Bold , - BoldItalicFont = *-BoldItalic ] - {LobsterTwo} +\ifLobsterTwo@otf + \RequirePackage{fontspec} +\else + \RequirePackage{fontenc,fontaxes} +\fi + +\ifLobsterTwo@otf + \ifxetex\XeTeXtracingfonts=1\fi + \defaultfontfeatures{ + Ligatures = TeX , + Extension = .otf , + Scale = \LobsterTwo@scale , + } + \setmainfont + [ UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] + {LobsterTwo} + \newfontfamily\LobsterTwo + [ UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] + {LobsterTwo} + +\else % type1 + + \def\LobsterTwofamily{Lbstr-LF} + \renewcommand*\rmdefault{\LobsterTwofamily} + \newcommand*\LobsterTwo{\fontfamily{\LobsterTwofamily}\selectfont} + +\fi % turn off defaults in case other fonts are selected: -\defaultfontfeatures{} +\ifLobsterTwo@otf + \defaultfontfeatures{} +\fi \endinput diff --git a/Master/texmf-dist/tex/latex/lobster2/OT1Lbstr-LF.fd b/Master/texmf-dist/tex/latex/lobster2/OT1Lbstr-LF.fd new file mode 100644 index 00000000000..a241c40607a --- /dev/null +++ b/Master/texmf-dist/tex/latex/lobster2/OT1Lbstr-LF.fd @@ -0,0 +1,97 @@ +%% Generated by autoinst on 2020/07/28 +%% +\ProvidesFile{OT1Lbstr-LF.fd} + [2020/07/28 (autoinst) Font definitions for OT1/Lbstr-LF.] + +\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 Lbstr@scale\endcsname\relax + \let\Lbstr@@scale\@empty +\else + \edef\Lbstr@@scale{s*[\csname Lbstr@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{Lbstr-LF}{} + + +% ---- regular ---- + +\DeclareFontShape{OT1}{Lbstr-LF}{regular}{n}{ + <-> \Lbstr@@scale Lbstr-Regular-lf-ot1 +}{} + +\DeclareFontShape{OT1}{Lbstr-LF}{regular}{it}{ + <-> \Lbstr@@scale Lbstr-Italic-lf-ot1 +}{} + +\DeclareFontShape{OT1}{Lbstr-LF}{regular}{sl}{ + <-> ssub * Lbstr-LF/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{OT1}{Lbstr-LF}{bold}{n}{ + <-> \Lbstr@@scale Lbstr-Bold-lf-ot1 +}{} + +\DeclareFontShape{OT1}{Lbstr-LF}{bold}{it}{ + <-> \Lbstr@@scale Lbstr-BoldItalic-lf-ot1 +}{} + +\DeclareFontShape{OT1}{Lbstr-LF}{bold}{sl}{ + <-> ssub * Lbstr-LF/bold/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{OT1}{Lbstr-LF}{m}{sl}{ + <-> alias * Lbstr-LF/regular/sl +}{} + +\DeclareFontShape{OT1}{Lbstr-LF}{m}{n}{ + <-> alias * Lbstr-LF/regular/n +}{} + +\DeclareFontShape{OT1}{Lbstr-LF}{m}{it}{ + <-> alias * Lbstr-LF/regular/it +}{} + + +% b --> bold + +\DeclareFontShape{OT1}{Lbstr-LF}{b}{sl}{ + <-> alias * Lbstr-LF/bold/sl +}{} + +\DeclareFontShape{OT1}{Lbstr-LF}{b}{n}{ + <-> alias * Lbstr-LF/bold/n +}{} + +\DeclareFontShape{OT1}{Lbstr-LF}{b}{it}{ + <-> alias * Lbstr-LF/bold/it +}{} + +\DeclareFontShape{OT1}{Lbstr-LF}{bx}{n}{ + <-> ssub * Lbstr-LF/b/n +}{} + +\DeclareFontShape{OT1}{Lbstr-LF}{bx}{sl}{ + <-> ssub * Lbstr-LF/b/sl +}{} + +\DeclareFontShape{OT1}{Lbstr-LF}{bx}{it}{ + <-> ssub * Lbstr-LF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/lobster2/T1Lbstr-LF.fd b/Master/texmf-dist/tex/latex/lobster2/T1Lbstr-LF.fd new file mode 100644 index 00000000000..d38a17c3aa4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lobster2/T1Lbstr-LF.fd @@ -0,0 +1,97 @@ +%% Generated by autoinst on 2020/07/28 +%% +\ProvidesFile{T1Lbstr-LF.fd} + [2020/07/28 (autoinst) Font definitions for T1/Lbstr-LF.] + +\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 Lbstr@scale\endcsname\relax + \let\Lbstr@@scale\@empty +\else + \edef\Lbstr@@scale{s*[\csname Lbstr@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{Lbstr-LF}{} + + +% ---- regular ---- + +\DeclareFontShape{T1}{Lbstr-LF}{regular}{n}{ + <-> \Lbstr@@scale Lbstr-Regular-lf-t1 +}{} + +\DeclareFontShape{T1}{Lbstr-LF}{regular}{it}{ + <-> \Lbstr@@scale Lbstr-Italic-lf-t1 +}{} + +\DeclareFontShape{T1}{Lbstr-LF}{regular}{sl}{ + <-> ssub * Lbstr-LF/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{T1}{Lbstr-LF}{bold}{n}{ + <-> \Lbstr@@scale Lbstr-Bold-lf-t1 +}{} + +\DeclareFontShape{T1}{Lbstr-LF}{bold}{it}{ + <-> \Lbstr@@scale Lbstr-BoldItalic-lf-t1 +}{} + +\DeclareFontShape{T1}{Lbstr-LF}{bold}{sl}{ + <-> ssub * Lbstr-LF/bold/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{T1}{Lbstr-LF}{m}{sl}{ + <-> alias * Lbstr-LF/regular/sl +}{} + +\DeclareFontShape{T1}{Lbstr-LF}{m}{n}{ + <-> alias * Lbstr-LF/regular/n +}{} + +\DeclareFontShape{T1}{Lbstr-LF}{m}{it}{ + <-> alias * Lbstr-LF/regular/it +}{} + + +% b --> bold + +\DeclareFontShape{T1}{Lbstr-LF}{b}{sl}{ + <-> alias * Lbstr-LF/bold/sl +}{} + +\DeclareFontShape{T1}{Lbstr-LF}{b}{n}{ + <-> alias * Lbstr-LF/bold/n +}{} + +\DeclareFontShape{T1}{Lbstr-LF}{b}{it}{ + <-> alias * Lbstr-LF/bold/it +}{} + +\DeclareFontShape{T1}{Lbstr-LF}{bx}{n}{ + <-> ssub * Lbstr-LF/b/n +}{} + +\DeclareFontShape{T1}{Lbstr-LF}{bx}{sl}{ + <-> ssub * Lbstr-LF/b/sl +}{} + +\DeclareFontShape{T1}{Lbstr-LF}{bx}{it}{ + <-> ssub * Lbstr-LF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/lobster2/TS1Lbstr-LF.fd b/Master/texmf-dist/tex/latex/lobster2/TS1Lbstr-LF.fd new file mode 100644 index 00000000000..69bd29ad1ce --- /dev/null +++ b/Master/texmf-dist/tex/latex/lobster2/TS1Lbstr-LF.fd @@ -0,0 +1,97 @@ +%% Generated by autoinst on 2020/07/28 +%% +\ProvidesFile{TS1Lbstr-LF.fd} + [2020/07/28 (autoinst) Font definitions for TS1/Lbstr-LF.] + +\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 Lbstr@scale\endcsname\relax + \let\Lbstr@@scale\@empty +\else + \edef\Lbstr@@scale{s*[\csname Lbstr@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS1}{Lbstr-LF}{} + + +% ---- regular ---- + +\DeclareFontShape{TS1}{Lbstr-LF}{regular}{n}{ + <-> \Lbstr@@scale Lbstr-Regular-lf-ts1 +}{} + +\DeclareFontShape{TS1}{Lbstr-LF}{regular}{it}{ + <-> \Lbstr@@scale Lbstr-Italic-lf-ts1 +}{} + +\DeclareFontShape{TS1}{Lbstr-LF}{regular}{sl}{ + <-> ssub * Lbstr-LF/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{TS1}{Lbstr-LF}{bold}{n}{ + <-> \Lbstr@@scale Lbstr-Bold-lf-ts1 +}{} + +\DeclareFontShape{TS1}{Lbstr-LF}{bold}{it}{ + <-> \Lbstr@@scale Lbstr-BoldItalic-lf-ts1 +}{} + +\DeclareFontShape{TS1}{Lbstr-LF}{bold}{sl}{ + <-> ssub * Lbstr-LF/bold/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{TS1}{Lbstr-LF}{m}{sl}{ + <-> alias * Lbstr-LF/regular/sl +}{} + +\DeclareFontShape{TS1}{Lbstr-LF}{m}{n}{ + <-> alias * Lbstr-LF/regular/n +}{} + +\DeclareFontShape{TS1}{Lbstr-LF}{m}{it}{ + <-> alias * Lbstr-LF/regular/it +}{} + + +% b --> bold + +\DeclareFontShape{TS1}{Lbstr-LF}{b}{sl}{ + <-> alias * Lbstr-LF/bold/sl +}{} + +\DeclareFontShape{TS1}{Lbstr-LF}{b}{n}{ + <-> alias * Lbstr-LF/bold/n +}{} + +\DeclareFontShape{TS1}{Lbstr-LF}{b}{it}{ + <-> alias * Lbstr-LF/bold/it +}{} + +\DeclareFontShape{TS1}{Lbstr-LF}{bx}{n}{ + <-> ssub * Lbstr-LF/b/n +}{} + +\DeclareFontShape{TS1}{Lbstr-LF}{bx}{sl}{ + <-> ssub * Lbstr-LF/b/sl +}{} + +\DeclareFontShape{TS1}{Lbstr-LF}{bx}{it}{ + <-> ssub * Lbstr-LF/b/it +}{} + +\endinput -- cgit v1.2.3