From 18c321e0a40e8ce41d8d71d0f82d336f1e4d0859 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 15 Oct 2019 21:49:22 +0000 Subject: cinzel (15oct19) git-svn-id: svn://tug.org/texlive/trunk@52392 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/cinzel/LY1Cinzel-LF.fd | 43 +++++++++++++++++++--- .../tex/latex/cinzel/LY1CinzelDecorative-LF.fd | 43 +++++++++++++++++++--- Master/texmf-dist/tex/latex/cinzel/OT1Cinzel-LF.fd | 43 +++++++++++++++++++--- .../tex/latex/cinzel/OT1CinzelDecorative-LF.fd | 43 +++++++++++++++++++--- Master/texmf-dist/tex/latex/cinzel/T1Cinzel-LF.fd | 43 +++++++++++++++++++--- .../tex/latex/cinzel/T1CinzelDecorative-LF.fd | 43 +++++++++++++++++++--- Master/texmf-dist/tex/latex/cinzel/TS1Cinzel-LF.fd | 43 +++++++++++++++++++--- .../tex/latex/cinzel/TS1CinzelDecorative-LF.fd | 43 +++++++++++++++++++--- Master/texmf-dist/tex/latex/cinzel/cinzel.sty | 8 ++-- 9 files changed, 308 insertions(+), 44 deletions(-) (limited to 'Master/texmf-dist/tex/latex/cinzel') diff --git a/Master/texmf-dist/tex/latex/cinzel/LY1Cinzel-LF.fd b/Master/texmf-dist/tex/latex/cinzel/LY1Cinzel-LF.fd index a72627d6255..b93187c0090 100644 --- a/Master/texmf-dist/tex/latex/cinzel/LY1Cinzel-LF.fd +++ b/Master/texmf-dist/tex/latex/cinzel/LY1Cinzel-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/05/24 +%% Generated by autoinst on 2019/10/15 %% \ProvidesFile{LY1Cinzel-LF.fd} - [2014/05/24 (autoinst) Font definitions for LY1/Cinzel-LF.] + [2019/10/15 (autoinst) Font definitions for LY1/Cinzel-LF.] \expandafter\ifx\csname Cinzel@scale\endcsname\relax \let\Cinzel@@scale\@empty @@ -11,16 +11,49 @@ \DeclareFontFamily{LY1}{Cinzel-LF}{} -\DeclareFontShape{LY1}{Cinzel-LF}{k}{n}{ + +% ---- regular ---- + +\DeclareFontShape{LY1}{Cinzel-LF}{regular}{n}{ + <-> \Cinzel@@scale Cinzel-Regular-lf-ly1 +}{} + + +% ---- black ---- + +\DeclareFontShape{LY1}{Cinzel-LF}{black}{n}{ <-> \Cinzel@@scale Cinzel-Black-lf-ly1 }{} -\DeclareFontShape{LY1}{Cinzel-LF}{b}{n}{ + +% ---- bold ---- + +\DeclareFontShape{LY1}{Cinzel-LF}{bold}{n}{ <-> \Cinzel@@scale Cinzel-Bold-lf-ly1 }{} +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + \DeclareFontShape{LY1}{Cinzel-LF}{m}{n}{ - <-> \Cinzel@@scale Cinzel-Regular-lf-ly1 + <-> ssub * Cinzel-LF/regular/n +}{} + + +% b --> bold + +\DeclareFontShape{LY1}{Cinzel-LF}{b}{n}{ + <-> ssub * Cinzel-LF/bold/n +}{} + + +% eb --> black + +\DeclareFontShape{LY1}{Cinzel-LF}{eb}{n}{ + <-> ssub * Cinzel-LF/black/n }{} \DeclareFontShape{LY1}{Cinzel-LF}{bx}{n}{ diff --git a/Master/texmf-dist/tex/latex/cinzel/LY1CinzelDecorative-LF.fd b/Master/texmf-dist/tex/latex/cinzel/LY1CinzelDecorative-LF.fd index 301223592f2..2c29be9555d 100644 --- a/Master/texmf-dist/tex/latex/cinzel/LY1CinzelDecorative-LF.fd +++ b/Master/texmf-dist/tex/latex/cinzel/LY1CinzelDecorative-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/05/24 +%% Generated by autoinst on 2019/10/15 %% \ProvidesFile{LY1CinzelDecorative-LF.fd} - [2014/05/24 (autoinst) Font definitions for LY1/CinzelDecorative-LF.] + [2019/10/15 (autoinst) Font definitions for LY1/CinzelDecorative-LF.] \expandafter\ifx\csname CinzelDecorative@scale\endcsname\relax \let\CinzelDecorative@@scale\@empty @@ -11,16 +11,49 @@ \DeclareFontFamily{LY1}{CinzelDecorative-LF}{} -\DeclareFontShape{LY1}{CinzelDecorative-LF}{k}{n}{ + +% ---- regular ---- + +\DeclareFontShape{LY1}{CinzelDecorative-LF}{regular}{n}{ + <-> \CinzelDecorative@@scale CinzelDecorative-Regular-lf-ly1 +}{} + + +% ---- black ---- + +\DeclareFontShape{LY1}{CinzelDecorative-LF}{black}{n}{ <-> \CinzelDecorative@@scale CinzelDecorative-Black-lf-ly1 }{} -\DeclareFontShape{LY1}{CinzelDecorative-LF}{b}{n}{ + +% ---- bold ---- + +\DeclareFontShape{LY1}{CinzelDecorative-LF}{bold}{n}{ <-> \CinzelDecorative@@scale CinzelDecorative-Bold-lf-ly1 }{} +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + \DeclareFontShape{LY1}{CinzelDecorative-LF}{m}{n}{ - <-> \CinzelDecorative@@scale CinzelDecorative-Regular-lf-ly1 + <-> ssub * CinzelDecorative-LF/regular/n +}{} + + +% b --> bold + +\DeclareFontShape{LY1}{CinzelDecorative-LF}{b}{n}{ + <-> ssub * CinzelDecorative-LF/bold/n +}{} + + +% eb --> black + +\DeclareFontShape{LY1}{CinzelDecorative-LF}{eb}{n}{ + <-> ssub * CinzelDecorative-LF/black/n }{} \DeclareFontShape{LY1}{CinzelDecorative-LF}{bx}{n}{ diff --git a/Master/texmf-dist/tex/latex/cinzel/OT1Cinzel-LF.fd b/Master/texmf-dist/tex/latex/cinzel/OT1Cinzel-LF.fd index 34acba5f39c..58c72b21bef 100644 --- a/Master/texmf-dist/tex/latex/cinzel/OT1Cinzel-LF.fd +++ b/Master/texmf-dist/tex/latex/cinzel/OT1Cinzel-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/05/24 +%% Generated by autoinst on 2019/10/15 %% \ProvidesFile{OT1Cinzel-LF.fd} - [2014/05/24 (autoinst) Font definitions for OT1/Cinzel-LF.] + [2019/10/15 (autoinst) Font definitions for OT1/Cinzel-LF.] \expandafter\ifx\csname Cinzel@scale\endcsname\relax \let\Cinzel@@scale\@empty @@ -11,16 +11,49 @@ \DeclareFontFamily{OT1}{Cinzel-LF}{} -\DeclareFontShape{OT1}{Cinzel-LF}{k}{n}{ + +% ---- regular ---- + +\DeclareFontShape{OT1}{Cinzel-LF}{regular}{n}{ + <-> \Cinzel@@scale Cinzel-Regular-lf-ot1 +}{} + + +% ---- black ---- + +\DeclareFontShape{OT1}{Cinzel-LF}{black}{n}{ <-> \Cinzel@@scale Cinzel-Black-lf-ot1 }{} -\DeclareFontShape{OT1}{Cinzel-LF}{b}{n}{ + +% ---- bold ---- + +\DeclareFontShape{OT1}{Cinzel-LF}{bold}{n}{ <-> \Cinzel@@scale Cinzel-Bold-lf-ot1 }{} +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + \DeclareFontShape{OT1}{Cinzel-LF}{m}{n}{ - <-> \Cinzel@@scale Cinzel-Regular-lf-ot1 + <-> ssub * Cinzel-LF/regular/n +}{} + + +% b --> bold + +\DeclareFontShape{OT1}{Cinzel-LF}{b}{n}{ + <-> ssub * Cinzel-LF/bold/n +}{} + + +% eb --> black + +\DeclareFontShape{OT1}{Cinzel-LF}{eb}{n}{ + <-> ssub * Cinzel-LF/black/n }{} \DeclareFontShape{OT1}{Cinzel-LF}{bx}{n}{ diff --git a/Master/texmf-dist/tex/latex/cinzel/OT1CinzelDecorative-LF.fd b/Master/texmf-dist/tex/latex/cinzel/OT1CinzelDecorative-LF.fd index c6d0665a3c7..9312efa227d 100644 --- a/Master/texmf-dist/tex/latex/cinzel/OT1CinzelDecorative-LF.fd +++ b/Master/texmf-dist/tex/latex/cinzel/OT1CinzelDecorative-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/05/24 +%% Generated by autoinst on 2019/10/15 %% \ProvidesFile{OT1CinzelDecorative-LF.fd} - [2014/05/24 (autoinst) Font definitions for OT1/CinzelDecorative-LF.] + [2019/10/15 (autoinst) Font definitions for OT1/CinzelDecorative-LF.] \expandafter\ifx\csname CinzelDecorative@scale\endcsname\relax \let\CinzelDecorative@@scale\@empty @@ -11,16 +11,49 @@ \DeclareFontFamily{OT1}{CinzelDecorative-LF}{} -\DeclareFontShape{OT1}{CinzelDecorative-LF}{k}{n}{ + +% ---- regular ---- + +\DeclareFontShape{OT1}{CinzelDecorative-LF}{regular}{n}{ + <-> \CinzelDecorative@@scale CinzelDecorative-Regular-lf-ot1 +}{} + + +% ---- black ---- + +\DeclareFontShape{OT1}{CinzelDecorative-LF}{black}{n}{ <-> \CinzelDecorative@@scale CinzelDecorative-Black-lf-ot1 }{} -\DeclareFontShape{OT1}{CinzelDecorative-LF}{b}{n}{ + +% ---- bold ---- + +\DeclareFontShape{OT1}{CinzelDecorative-LF}{bold}{n}{ <-> \CinzelDecorative@@scale CinzelDecorative-Bold-lf-ot1 }{} +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + \DeclareFontShape{OT1}{CinzelDecorative-LF}{m}{n}{ - <-> \CinzelDecorative@@scale CinzelDecorative-Regular-lf-ot1 + <-> ssub * CinzelDecorative-LF/regular/n +}{} + + +% b --> bold + +\DeclareFontShape{OT1}{CinzelDecorative-LF}{b}{n}{ + <-> ssub * CinzelDecorative-LF/bold/n +}{} + + +% eb --> black + +\DeclareFontShape{OT1}{CinzelDecorative-LF}{eb}{n}{ + <-> ssub * CinzelDecorative-LF/black/n }{} \DeclareFontShape{OT1}{CinzelDecorative-LF}{bx}{n}{ diff --git a/Master/texmf-dist/tex/latex/cinzel/T1Cinzel-LF.fd b/Master/texmf-dist/tex/latex/cinzel/T1Cinzel-LF.fd index 5c972e585ee..213d5edd41c 100644 --- a/Master/texmf-dist/tex/latex/cinzel/T1Cinzel-LF.fd +++ b/Master/texmf-dist/tex/latex/cinzel/T1Cinzel-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/05/24 +%% Generated by autoinst on 2019/10/15 %% \ProvidesFile{T1Cinzel-LF.fd} - [2014/05/24 (autoinst) Font definitions for T1/Cinzel-LF.] + [2019/10/15 (autoinst) Font definitions for T1/Cinzel-LF.] \expandafter\ifx\csname Cinzel@scale\endcsname\relax \let\Cinzel@@scale\@empty @@ -11,16 +11,49 @@ \DeclareFontFamily{T1}{Cinzel-LF}{} -\DeclareFontShape{T1}{Cinzel-LF}{k}{n}{ + +% ---- regular ---- + +\DeclareFontShape{T1}{Cinzel-LF}{regular}{n}{ + <-> \Cinzel@@scale Cinzel-Regular-lf-t1 +}{} + + +% ---- black ---- + +\DeclareFontShape{T1}{Cinzel-LF}{black}{n}{ <-> \Cinzel@@scale Cinzel-Black-lf-t1 }{} -\DeclareFontShape{T1}{Cinzel-LF}{b}{n}{ + +% ---- bold ---- + +\DeclareFontShape{T1}{Cinzel-LF}{bold}{n}{ <-> \Cinzel@@scale Cinzel-Bold-lf-t1 }{} +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + \DeclareFontShape{T1}{Cinzel-LF}{m}{n}{ - <-> \Cinzel@@scale Cinzel-Regular-lf-t1 + <-> ssub * Cinzel-LF/regular/n +}{} + + +% b --> bold + +\DeclareFontShape{T1}{Cinzel-LF}{b}{n}{ + <-> ssub * Cinzel-LF/bold/n +}{} + + +% eb --> black + +\DeclareFontShape{T1}{Cinzel-LF}{eb}{n}{ + <-> ssub * Cinzel-LF/black/n }{} \DeclareFontShape{T1}{Cinzel-LF}{bx}{n}{ diff --git a/Master/texmf-dist/tex/latex/cinzel/T1CinzelDecorative-LF.fd b/Master/texmf-dist/tex/latex/cinzel/T1CinzelDecorative-LF.fd index ce1e14cd828..e2dac3c621c 100644 --- a/Master/texmf-dist/tex/latex/cinzel/T1CinzelDecorative-LF.fd +++ b/Master/texmf-dist/tex/latex/cinzel/T1CinzelDecorative-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/05/24 +%% Generated by autoinst on 2019/10/15 %% \ProvidesFile{T1CinzelDecorative-LF.fd} - [2014/05/24 (autoinst) Font definitions for T1/CinzelDecorative-LF.] + [2019/10/15 (autoinst) Font definitions for T1/CinzelDecorative-LF.] \expandafter\ifx\csname CinzelDecorative@scale\endcsname\relax \let\CinzelDecorative@@scale\@empty @@ -11,16 +11,49 @@ \DeclareFontFamily{T1}{CinzelDecorative-LF}{} -\DeclareFontShape{T1}{CinzelDecorative-LF}{k}{n}{ + +% ---- regular ---- + +\DeclareFontShape{T1}{CinzelDecorative-LF}{regular}{n}{ + <-> \CinzelDecorative@@scale CinzelDecorative-Regular-lf-t1 +}{} + + +% ---- black ---- + +\DeclareFontShape{T1}{CinzelDecorative-LF}{black}{n}{ <-> \CinzelDecorative@@scale CinzelDecorative-Black-lf-t1 }{} -\DeclareFontShape{T1}{CinzelDecorative-LF}{b}{n}{ + +% ---- bold ---- + +\DeclareFontShape{T1}{CinzelDecorative-LF}{bold}{n}{ <-> \CinzelDecorative@@scale CinzelDecorative-Bold-lf-t1 }{} +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + \DeclareFontShape{T1}{CinzelDecorative-LF}{m}{n}{ - <-> \CinzelDecorative@@scale CinzelDecorative-Regular-lf-t1 + <-> ssub * CinzelDecorative-LF/regular/n +}{} + + +% b --> bold + +\DeclareFontShape{T1}{CinzelDecorative-LF}{b}{n}{ + <-> ssub * CinzelDecorative-LF/bold/n +}{} + + +% eb --> black + +\DeclareFontShape{T1}{CinzelDecorative-LF}{eb}{n}{ + <-> ssub * CinzelDecorative-LF/black/n }{} \DeclareFontShape{T1}{CinzelDecorative-LF}{bx}{n}{ diff --git a/Master/texmf-dist/tex/latex/cinzel/TS1Cinzel-LF.fd b/Master/texmf-dist/tex/latex/cinzel/TS1Cinzel-LF.fd index 2d769a54fad..0ea2629f26a 100644 --- a/Master/texmf-dist/tex/latex/cinzel/TS1Cinzel-LF.fd +++ b/Master/texmf-dist/tex/latex/cinzel/TS1Cinzel-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/05/24 +%% Generated by autoinst on 2019/10/15 %% \ProvidesFile{TS1Cinzel-LF.fd} - [2014/05/24 (autoinst) Font definitions for TS1/Cinzel-LF.] + [2019/10/15 (autoinst) Font definitions for TS1/Cinzel-LF.] \expandafter\ifx\csname Cinzel@scale\endcsname\relax \let\Cinzel@@scale\@empty @@ -11,16 +11,49 @@ \DeclareFontFamily{TS1}{Cinzel-LF}{} -\DeclareFontShape{TS1}{Cinzel-LF}{k}{n}{ + +% ---- regular ---- + +\DeclareFontShape{TS1}{Cinzel-LF}{regular}{n}{ + <-> \Cinzel@@scale Cinzel-Regular-lf-ts1 +}{} + + +% ---- black ---- + +\DeclareFontShape{TS1}{Cinzel-LF}{black}{n}{ <-> \Cinzel@@scale Cinzel-Black-lf-ts1 }{} -\DeclareFontShape{TS1}{Cinzel-LF}{b}{n}{ + +% ---- bold ---- + +\DeclareFontShape{TS1}{Cinzel-LF}{bold}{n}{ <-> \Cinzel@@scale Cinzel-Bold-lf-ts1 }{} +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + \DeclareFontShape{TS1}{Cinzel-LF}{m}{n}{ - <-> \Cinzel@@scale Cinzel-Regular-lf-ts1 + <-> ssub * Cinzel-LF/regular/n +}{} + + +% b --> bold + +\DeclareFontShape{TS1}{Cinzel-LF}{b}{n}{ + <-> ssub * Cinzel-LF/bold/n +}{} + + +% eb --> black + +\DeclareFontShape{TS1}{Cinzel-LF}{eb}{n}{ + <-> ssub * Cinzel-LF/black/n }{} \DeclareFontShape{TS1}{Cinzel-LF}{bx}{n}{ diff --git a/Master/texmf-dist/tex/latex/cinzel/TS1CinzelDecorative-LF.fd b/Master/texmf-dist/tex/latex/cinzel/TS1CinzelDecorative-LF.fd index a8379c6b69f..f9371d1d863 100644 --- a/Master/texmf-dist/tex/latex/cinzel/TS1CinzelDecorative-LF.fd +++ b/Master/texmf-dist/tex/latex/cinzel/TS1CinzelDecorative-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/05/24 +%% Generated by autoinst on 2019/10/15 %% \ProvidesFile{TS1CinzelDecorative-LF.fd} - [2014/05/24 (autoinst) Font definitions for TS1/CinzelDecorative-LF.] + [2019/10/15 (autoinst) Font definitions for TS1/CinzelDecorative-LF.] \expandafter\ifx\csname CinzelDecorative@scale\endcsname\relax \let\CinzelDecorative@@scale\@empty @@ -11,16 +11,49 @@ \DeclareFontFamily{TS1}{CinzelDecorative-LF}{} -\DeclareFontShape{TS1}{CinzelDecorative-LF}{k}{n}{ + +% ---- regular ---- + +\DeclareFontShape{TS1}{CinzelDecorative-LF}{regular}{n}{ + <-> \CinzelDecorative@@scale CinzelDecorative-Regular-lf-ts1 +}{} + + +% ---- black ---- + +\DeclareFontShape{TS1}{CinzelDecorative-LF}{black}{n}{ <-> \CinzelDecorative@@scale CinzelDecorative-Black-lf-ts1 }{} -\DeclareFontShape{TS1}{CinzelDecorative-LF}{b}{n}{ + +% ---- bold ---- + +\DeclareFontShape{TS1}{CinzelDecorative-LF}{bold}{n}{ <-> \CinzelDecorative@@scale CinzelDecorative-Bold-lf-ts1 }{} +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + \DeclareFontShape{TS1}{CinzelDecorative-LF}{m}{n}{ - <-> \CinzelDecorative@@scale CinzelDecorative-Regular-lf-ts1 + <-> ssub * CinzelDecorative-LF/regular/n +}{} + + +% b --> bold + +\DeclareFontShape{TS1}{CinzelDecorative-LF}{b}{n}{ + <-> ssub * CinzelDecorative-LF/bold/n +}{} + + +% eb --> black + +\DeclareFontShape{TS1}{CinzelDecorative-LF}{eb}{n}{ + <-> ssub * CinzelDecorative-LF/black/n }{} \DeclareFontShape{TS1}{CinzelDecorative-LF}{bx}{n}{ diff --git a/Master/texmf-dist/tex/latex/cinzel/cinzel.sty b/Master/texmf-dist/tex/latex/cinzel/cinzel.sty index 0509bdbe877..8de51544cad 100644 --- a/Master/texmf-dist/tex/latex/cinzel/cinzel.sty +++ b/Master/texmf-dist/tex/latex/cinzel/cinzel.sty @@ -1,6 +1,6 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{cinzel} - [2019/05/12 (Bob Tennent) Supports Cinzel and CinzelDecorative for all LaTeX engines.] + [2019/10/15 (Bob Tennent) Supports Cinzel and CinzelDecorative for all LaTeX engines.] \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp} @@ -27,7 +27,7 @@ \else % type1 \def\bfseries@rm{b} - \ifcinzel@black\def\bfseries@rm{k}\fi + \ifcinzel@black\def\bfseries@rm{eb}\fi \fi @@ -73,8 +73,8 @@ \def\itshape{\ifx\f@family\cinzelfamily\fontfamily{CinzelDecorative-LF}\fontshape{n}\else\fontshape{\itdefault}\fi\selectfont} \fi \newcommand*\cinzelblack{% - \fontfamily{\cinzelfamily}\fontseries{k}\selectfont - \def\itshape{\ifx\f@family\cinzelfamily\fontfamily{CinzelDecorative-LF}\fontseries{k}\else\fontshape{\itdefault}\fi\selectfont} + \fontfamily{\cinzelfamily}\fontseries{eb}\selectfont + \def\itshape{\ifx\f@family\cinzelfamily\fontfamily{CinzelDecorative-LF}\fontseries{eb}\else\fontshape{\itdefault}\fi\selectfont} } \fi -- cgit v1.2.3