From a65d1c9717d009514362c9239b295c1fbfe193a7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 23 Jul 2020 21:22:41 +0000 Subject: lobster2 (23jul20) git-svn-id: svn://tug.org/texlive/trunk@55913 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/lobster2/LY1LobsterTwo-LF.fd | 50 -------------- .../texmf-dist/tex/latex/lobster2/LobsterTwo.sty | 77 +++++++++------------- .../tex/latex/lobster2/OT1LobsterTwo-LF.fd | 50 -------------- .../tex/latex/lobster2/T1LobsterTwo-LF.fd | 50 -------------- .../tex/latex/lobster2/TS1LobsterTwo-LF.fd | 50 -------------- 5 files changed, 30 insertions(+), 247 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/lobster2/LY1LobsterTwo-LF.fd delete mode 100644 Master/texmf-dist/tex/latex/lobster2/OT1LobsterTwo-LF.fd delete mode 100644 Master/texmf-dist/tex/latex/lobster2/T1LobsterTwo-LF.fd delete mode 100644 Master/texmf-dist/tex/latex/lobster2/TS1LobsterTwo-LF.fd (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/lobster2/LY1LobsterTwo-LF.fd b/Master/texmf-dist/tex/latex/lobster2/LY1LobsterTwo-LF.fd deleted file mode 100644 index a506ce5f78d..00000000000 --- a/Master/texmf-dist/tex/latex/lobster2/LY1LobsterTwo-LF.fd +++ /dev/null @@ -1,50 +0,0 @@ -%% Generated by autoinst on 2014/01/08 -%% -\ProvidesFile{LY1LobsterTwo-LF.fd} - [2014/01/08 (autoinst) Font definitions for LY1/LobsterTwo-LF.] - -\expandafter\ifx\csname LobsterTwo@scale\endcsname\relax - \let\LobsterTwo@@scale\@empty -\else - \edef\LobsterTwo@@scale{s*[\csname LobsterTwo@scale\endcsname]}% -\fi - -\DeclareFontFamily{LY1}{LobsterTwo-LF}{} - -\DeclareFontShape{LY1}{LobsterTwo-LF}{b}{n}{ - <-> \LobsterTwo@@scale LobsterTwo-Bold-lf-ly1 -}{} - -\DeclareFontShape{LY1}{LobsterTwo-LF}{b}{it}{ - <-> \LobsterTwo@@scale LobsterTwo-BoldItalic-lf-ly1 -}{} - -\DeclareFontShape{LY1}{LobsterTwo-LF}{b}{sl}{ - <-> ssub * LobsterTwo-LF/b/it -}{} - -\DeclareFontShape{LY1}{LobsterTwo-LF}{m}{n}{ - <-> \LobsterTwo@@scale LobsterTwo-lf-ly1 -}{} - -\DeclareFontShape{LY1}{LobsterTwo-LF}{m}{it}{ - <-> \LobsterTwo@@scale LobsterTwo-Italic-lf-ly1 -}{} - -\DeclareFontShape{LY1}{LobsterTwo-LF}{m}{sl}{ - <-> ssub * LobsterTwo-LF/m/it -}{} - -\DeclareFontShape{LY1}{LobsterTwo-LF}{bx}{sl}{ - <-> ssub * LobsterTwo-LF/b/sl -}{} - -\DeclareFontShape{LY1}{LobsterTwo-LF}{bx}{n}{ - <-> ssub * LobsterTwo-LF/b/n -}{} - -\DeclareFontShape{LY1}{LobsterTwo-LF}{bx}{it}{ - <-> ssub * LobsterTwo-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 82599deff21..324c209567e 100644 --- a/Master/texmf-dist/tex/latex/lobster2/LobsterTwo.sty +++ b/Master/texmf-dist/tex/latex/lobster2/LobsterTwo.sty @@ -1,63 +1,46 @@ \ProvidesPackage{LobsterTwo}[% - 2014/01/08 (Bob Tennent) Supports Lobster Two fonts for all LaTeX engines. ] + 2020/07/22 (Bob Tennent) Supports Lobster Two fonts for modern LaTeX engines. ] -\RequirePackage{ifxetex,ifluatex,textcomp} +\RequirePackage{iftex} + +\ifpdftex +\PackageError{lobster2}{% + *****************************************\MessageBreak + Please Process using xelatex or lualatex\MessageBreak + *****************************************} +\fi -\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 -\ifLobsterTwo@otf - \RequirePackage{fontspec} -\else - \RequirePackage{fontenc,fontaxes} -\fi - -\ifLobsterTwo@otf - \ifxetex\XeTeXtracingfonts=1\fi - \defaultfontfeatures{ - Ligatures = TeX , - Extension = .otf , - } - \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{LobsterTwo-LF} - \renewcommand*\rmdefault{\LobsterTwofamily} - \newcommand*\LobsterTwo{\fontfamily{\LobsterTwofamily}\selectfont} - -\fi +\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} % turn off defaults in case other fonts are selected: -\ifLobsterTwo@otf - \defaultfontfeatures{} -\fi +\defaultfontfeatures{} \endinput diff --git a/Master/texmf-dist/tex/latex/lobster2/OT1LobsterTwo-LF.fd b/Master/texmf-dist/tex/latex/lobster2/OT1LobsterTwo-LF.fd deleted file mode 100644 index 8e0e51b9bc1..00000000000 --- a/Master/texmf-dist/tex/latex/lobster2/OT1LobsterTwo-LF.fd +++ /dev/null @@ -1,50 +0,0 @@ -%% Generated by autoinst on 2014/01/08 -%% -\ProvidesFile{OT1LobsterTwo-LF.fd} - [2014/01/08 (autoinst) Font definitions for OT1/LobsterTwo-LF.] - -\expandafter\ifx\csname LobsterTwo@scale\endcsname\relax - \let\LobsterTwo@@scale\@empty -\else - \edef\LobsterTwo@@scale{s*[\csname LobsterTwo@scale\endcsname]}% -\fi - -\DeclareFontFamily{OT1}{LobsterTwo-LF}{} - -\DeclareFontShape{OT1}{LobsterTwo-LF}{b}{n}{ - <-> \LobsterTwo@@scale LobsterTwo-Bold-lf-ot1 -}{} - -\DeclareFontShape{OT1}{LobsterTwo-LF}{b}{it}{ - <-> \LobsterTwo@@scale LobsterTwo-BoldItalic-lf-ot1 -}{} - -\DeclareFontShape{OT1}{LobsterTwo-LF}{b}{sl}{ - <-> ssub * LobsterTwo-LF/b/it -}{} - -\DeclareFontShape{OT1}{LobsterTwo-LF}{m}{n}{ - <-> \LobsterTwo@@scale LobsterTwo-lf-ot1 -}{} - -\DeclareFontShape{OT1}{LobsterTwo-LF}{m}{it}{ - <-> \LobsterTwo@@scale LobsterTwo-Italic-lf-ot1 -}{} - -\DeclareFontShape{OT1}{LobsterTwo-LF}{m}{sl}{ - <-> ssub * LobsterTwo-LF/m/it -}{} - -\DeclareFontShape{OT1}{LobsterTwo-LF}{bx}{sl}{ - <-> ssub * LobsterTwo-LF/b/sl -}{} - -\DeclareFontShape{OT1}{LobsterTwo-LF}{bx}{n}{ - <-> ssub * LobsterTwo-LF/b/n -}{} - -\DeclareFontShape{OT1}{LobsterTwo-LF}{bx}{it}{ - <-> ssub * LobsterTwo-LF/b/it -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/lobster2/T1LobsterTwo-LF.fd b/Master/texmf-dist/tex/latex/lobster2/T1LobsterTwo-LF.fd deleted file mode 100644 index 6e37a5bd864..00000000000 --- a/Master/texmf-dist/tex/latex/lobster2/T1LobsterTwo-LF.fd +++ /dev/null @@ -1,50 +0,0 @@ -%% Generated by autoinst on 2014/01/08 -%% -\ProvidesFile{T1LobsterTwo-LF.fd} - [2014/01/08 (autoinst) Font definitions for T1/LobsterTwo-LF.] - -\expandafter\ifx\csname LobsterTwo@scale\endcsname\relax - \let\LobsterTwo@@scale\@empty -\else - \edef\LobsterTwo@@scale{s*[\csname LobsterTwo@scale\endcsname]}% -\fi - -\DeclareFontFamily{T1}{LobsterTwo-LF}{} - -\DeclareFontShape{T1}{LobsterTwo-LF}{b}{n}{ - <-> \LobsterTwo@@scale LobsterTwo-Bold-lf-t1 -}{} - -\DeclareFontShape{T1}{LobsterTwo-LF}{b}{it}{ - <-> \LobsterTwo@@scale LobsterTwo-BoldItalic-lf-t1 -}{} - -\DeclareFontShape{T1}{LobsterTwo-LF}{b}{sl}{ - <-> ssub * LobsterTwo-LF/b/it -}{} - -\DeclareFontShape{T1}{LobsterTwo-LF}{m}{n}{ - <-> \LobsterTwo@@scale LobsterTwo-lf-t1 -}{} - -\DeclareFontShape{T1}{LobsterTwo-LF}{m}{it}{ - <-> \LobsterTwo@@scale LobsterTwo-Italic-lf-t1 -}{} - -\DeclareFontShape{T1}{LobsterTwo-LF}{m}{sl}{ - <-> ssub * LobsterTwo-LF/m/it -}{} - -\DeclareFontShape{T1}{LobsterTwo-LF}{bx}{sl}{ - <-> ssub * LobsterTwo-LF/b/sl -}{} - -\DeclareFontShape{T1}{LobsterTwo-LF}{bx}{n}{ - <-> ssub * LobsterTwo-LF/b/n -}{} - -\DeclareFontShape{T1}{LobsterTwo-LF}{bx}{it}{ - <-> ssub * LobsterTwo-LF/b/it -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/lobster2/TS1LobsterTwo-LF.fd b/Master/texmf-dist/tex/latex/lobster2/TS1LobsterTwo-LF.fd deleted file mode 100644 index e016516a8bf..00000000000 --- a/Master/texmf-dist/tex/latex/lobster2/TS1LobsterTwo-LF.fd +++ /dev/null @@ -1,50 +0,0 @@ -%% Generated by autoinst on 2014/01/08 -%% -\ProvidesFile{TS1LobsterTwo-LF.fd} - [2014/01/08 (autoinst) Font definitions for TS1/LobsterTwo-LF.] - -\expandafter\ifx\csname LobsterTwo@scale\endcsname\relax - \let\LobsterTwo@@scale\@empty -\else - \edef\LobsterTwo@@scale{s*[\csname LobsterTwo@scale\endcsname]}% -\fi - -\DeclareFontFamily{TS1}{LobsterTwo-LF}{} - -\DeclareFontShape{TS1}{LobsterTwo-LF}{b}{n}{ - <-> \LobsterTwo@@scale LobsterTwo-Bold-lf-ts1 -}{} - -\DeclareFontShape{TS1}{LobsterTwo-LF}{b}{it}{ - <-> \LobsterTwo@@scale LobsterTwo-BoldItalic-lf-ts1 -}{} - -\DeclareFontShape{TS1}{LobsterTwo-LF}{b}{sl}{ - <-> ssub * LobsterTwo-LF/b/it -}{} - -\DeclareFontShape{TS1}{LobsterTwo-LF}{m}{n}{ - <-> \LobsterTwo@@scale LobsterTwo-lf-ts1 -}{} - -\DeclareFontShape{TS1}{LobsterTwo-LF}{m}{it}{ - <-> \LobsterTwo@@scale LobsterTwo-Italic-lf-ts1 -}{} - -\DeclareFontShape{TS1}{LobsterTwo-LF}{m}{sl}{ - <-> ssub * LobsterTwo-LF/m/it -}{} - -\DeclareFontShape{TS1}{LobsterTwo-LF}{bx}{sl}{ - <-> ssub * LobsterTwo-LF/b/sl -}{} - -\DeclareFontShape{TS1}{LobsterTwo-LF}{bx}{n}{ - <-> ssub * LobsterTwo-LF/b/n -}{} - -\DeclareFontShape{TS1}{LobsterTwo-LF}{bx}{it}{ - <-> ssub * LobsterTwo-LF/b/it -}{} - -\endinput -- cgit v1.2.3