From 38894824ac4e578bd39276dced905a30a0aece75 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 22 Aug 2014 00:09:37 +0000 Subject: carlito (21aug14) git-svn-id: svn://tug.org/texlive/trunk@35002 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/carlito/LY1Carlito-Inf.fd | 4 ++-- Master/texmf-dist/tex/latex/carlito/LY1Carlito-LF.fd | 12 ++++++------ Master/texmf-dist/tex/latex/carlito/LY1Carlito-OsF.fd | 4 ++-- Master/texmf-dist/tex/latex/carlito/LY1Carlito-Sup.fd | 4 ++-- Master/texmf-dist/tex/latex/carlito/LY1Carlito-TLF.fd | 16 ++++++---------- Master/texmf-dist/tex/latex/carlito/LY1Carlito-TOsF.fd | 4 ++-- Master/texmf-dist/tex/latex/carlito/OT1Carlito-Inf.fd | 4 ++-- Master/texmf-dist/tex/latex/carlito/OT1Carlito-LF.fd | 12 ++++++------ Master/texmf-dist/tex/latex/carlito/OT1Carlito-OsF.fd | 4 ++-- Master/texmf-dist/tex/latex/carlito/OT1Carlito-Sup.fd | 4 ++-- Master/texmf-dist/tex/latex/carlito/OT1Carlito-TLF.fd | 12 ++++++------ Master/texmf-dist/tex/latex/carlito/OT1Carlito-TOsF.fd | 4 ++-- Master/texmf-dist/tex/latex/carlito/T1Carlito-Inf.fd | 4 ++-- Master/texmf-dist/tex/latex/carlito/T1Carlito-LF.fd | 12 ++++++------ Master/texmf-dist/tex/latex/carlito/T1Carlito-OsF.fd | 4 ++-- Master/texmf-dist/tex/latex/carlito/T1Carlito-Sup.fd | 4 ++-- Master/texmf-dist/tex/latex/carlito/T1Carlito-TLF.fd | 12 ++++++------ Master/texmf-dist/tex/latex/carlito/T1Carlito-TOsF.fd | 4 ++-- Master/texmf-dist/tex/latex/carlito/TS1Carlito-LF.fd | 4 ++-- Master/texmf-dist/tex/latex/carlito/TS1Carlito-OsF.fd | 4 ++-- Master/texmf-dist/tex/latex/carlito/TS1Carlito-TLF.fd | 4 ++-- Master/texmf-dist/tex/latex/carlito/TS1Carlito-TOsF.fd | 4 ++-- Master/texmf-dist/tex/latex/carlito/carlito.sty | 13 ++++--------- 23 files changed, 72 insertions(+), 81 deletions(-) (limited to 'Master/texmf-dist/tex/latex/carlito') diff --git a/Master/texmf-dist/tex/latex/carlito/LY1Carlito-Inf.fd b/Master/texmf-dist/tex/latex/carlito/LY1Carlito-Inf.fd index 81186c0435d..33c8a70a8cb 100644 --- a/Master/texmf-dist/tex/latex/carlito/LY1Carlito-Inf.fd +++ b/Master/texmf-dist/tex/latex/carlito/LY1Carlito-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{LY1Carlito-Inf.fd} - [2014/08/16 (autoinst) Font definitions for LY1/Carlito-Inf.] + [2014/08/20 (autoinst) Font definitions for LY1/Carlito-Inf.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/carlito/LY1Carlito-LF.fd b/Master/texmf-dist/tex/latex/carlito/LY1Carlito-LF.fd index 5fbb3eaf077..a4bb0ad69fb 100644 --- a/Master/texmf-dist/tex/latex/carlito/LY1Carlito-LF.fd +++ b/Master/texmf-dist/tex/latex/carlito/LY1Carlito-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{LY1Carlito-LF.fd} - [2014/08/16 (autoinst) Font definitions for LY1/Carlito-LF.] + [2014/08/20 (autoinst) Font definitions for LY1/Carlito-LF.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty @@ -35,6 +35,10 @@ <-> ssub * Carlito-LF/m/it }{} +\DeclareFontShape{LY1}{Carlito-LF}{bx}{sl}{ + <-> ssub * Carlito-LF/b/sl +}{} + \DeclareFontShape{LY1}{Carlito-LF}{bx}{n}{ <-> ssub * Carlito-LF/b/n }{} @@ -43,8 +47,4 @@ <-> ssub * Carlito-LF/b/it }{} -\DeclareFontShape{LY1}{Carlito-LF}{bx}{sl}{ - <-> ssub * Carlito-LF/b/sl -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/carlito/LY1Carlito-OsF.fd b/Master/texmf-dist/tex/latex/carlito/LY1Carlito-OsF.fd index 4c0a21c38e2..82ab73fa21e 100644 --- a/Master/texmf-dist/tex/latex/carlito/LY1Carlito-OsF.fd +++ b/Master/texmf-dist/tex/latex/carlito/LY1Carlito-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{LY1Carlito-OsF.fd} - [2014/08/16 (autoinst) Font definitions for LY1/Carlito-OsF.] + [2014/08/20 (autoinst) Font definitions for LY1/Carlito-OsF.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/carlito/LY1Carlito-Sup.fd b/Master/texmf-dist/tex/latex/carlito/LY1Carlito-Sup.fd index 3d0c0991969..28a86731d67 100644 --- a/Master/texmf-dist/tex/latex/carlito/LY1Carlito-Sup.fd +++ b/Master/texmf-dist/tex/latex/carlito/LY1Carlito-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{LY1Carlito-Sup.fd} - [2014/08/16 (autoinst) Font definitions for LY1/Carlito-Sup.] + [2014/08/20 (autoinst) Font definitions for LY1/Carlito-Sup.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/carlito/LY1Carlito-TLF.fd b/Master/texmf-dist/tex/latex/carlito/LY1Carlito-TLF.fd index 2c659e624d8..6fdb48f17d3 100644 --- a/Master/texmf-dist/tex/latex/carlito/LY1Carlito-TLF.fd +++ b/Master/texmf-dist/tex/latex/carlito/LY1Carlito-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{LY1Carlito-TLF.fd} - [2014/08/16 (autoinst) Font definitions for LY1/Carlito-TLF.] + [2014/08/20 (autoinst) Font definitions for LY1/Carlito-TLF.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty @@ -11,10 +11,6 @@ \DeclareFontFamily{LY1}{Carlito-TLF}{} -\DeclareFontShape{LY1}{Carlito-TLF}{b}{tl}{ - <-> \Carlito@@scale Carlito-Bold-tlf-titling-ly1 -}{} - \DeclareFontShape{LY1}{Carlito-TLF}{b}{n}{ <-> \Carlito@@scale Carlito-Bold-tlf-ly1 }{} @@ -39,6 +35,10 @@ <-> ssub * Carlito-TLF/m/it }{} +\DeclareFontShape{LY1}{Carlito-TLF}{bx}{sl}{ + <-> ssub * Carlito-TLF/b/sl +}{} + \DeclareFontShape{LY1}{Carlito-TLF}{bx}{n}{ <-> ssub * Carlito-TLF/b/n }{} @@ -47,8 +47,4 @@ <-> ssub * Carlito-TLF/b/it }{} -\DeclareFontShape{LY1}{Carlito-TLF}{bx}{sl}{ - <-> ssub * Carlito-TLF/b/sl -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/carlito/LY1Carlito-TOsF.fd b/Master/texmf-dist/tex/latex/carlito/LY1Carlito-TOsF.fd index 77943037190..ad1f2622148 100644 --- a/Master/texmf-dist/tex/latex/carlito/LY1Carlito-TOsF.fd +++ b/Master/texmf-dist/tex/latex/carlito/LY1Carlito-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{LY1Carlito-TOsF.fd} - [2014/08/16 (autoinst) Font definitions for LY1/Carlito-TOsF.] + [2014/08/20 (autoinst) Font definitions for LY1/Carlito-TOsF.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/carlito/OT1Carlito-Inf.fd b/Master/texmf-dist/tex/latex/carlito/OT1Carlito-Inf.fd index 2d56bb41ca1..914f068f762 100644 --- a/Master/texmf-dist/tex/latex/carlito/OT1Carlito-Inf.fd +++ b/Master/texmf-dist/tex/latex/carlito/OT1Carlito-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{OT1Carlito-Inf.fd} - [2014/08/16 (autoinst) Font definitions for OT1/Carlito-Inf.] + [2014/08/20 (autoinst) Font definitions for OT1/Carlito-Inf.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/carlito/OT1Carlito-LF.fd b/Master/texmf-dist/tex/latex/carlito/OT1Carlito-LF.fd index ae7fed898c9..52196d9a0b0 100644 --- a/Master/texmf-dist/tex/latex/carlito/OT1Carlito-LF.fd +++ b/Master/texmf-dist/tex/latex/carlito/OT1Carlito-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{OT1Carlito-LF.fd} - [2014/08/16 (autoinst) Font definitions for OT1/Carlito-LF.] + [2014/08/20 (autoinst) Font definitions for OT1/Carlito-LF.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty @@ -35,6 +35,10 @@ <-> ssub * Carlito-LF/m/it }{} +\DeclareFontShape{OT1}{Carlito-LF}{bx}{sl}{ + <-> ssub * Carlito-LF/b/sl +}{} + \DeclareFontShape{OT1}{Carlito-LF}{bx}{n}{ <-> ssub * Carlito-LF/b/n }{} @@ -43,8 +47,4 @@ <-> ssub * Carlito-LF/b/it }{} -\DeclareFontShape{OT1}{Carlito-LF}{bx}{sl}{ - <-> ssub * Carlito-LF/b/sl -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/carlito/OT1Carlito-OsF.fd b/Master/texmf-dist/tex/latex/carlito/OT1Carlito-OsF.fd index c33c27b1866..354f8789ac5 100644 --- a/Master/texmf-dist/tex/latex/carlito/OT1Carlito-OsF.fd +++ b/Master/texmf-dist/tex/latex/carlito/OT1Carlito-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{OT1Carlito-OsF.fd} - [2014/08/16 (autoinst) Font definitions for OT1/Carlito-OsF.] + [2014/08/20 (autoinst) Font definitions for OT1/Carlito-OsF.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/carlito/OT1Carlito-Sup.fd b/Master/texmf-dist/tex/latex/carlito/OT1Carlito-Sup.fd index 0f4fdddc5f2..69020445a2a 100644 --- a/Master/texmf-dist/tex/latex/carlito/OT1Carlito-Sup.fd +++ b/Master/texmf-dist/tex/latex/carlito/OT1Carlito-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{OT1Carlito-Sup.fd} - [2014/08/16 (autoinst) Font definitions for OT1/Carlito-Sup.] + [2014/08/20 (autoinst) Font definitions for OT1/Carlito-Sup.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/carlito/OT1Carlito-TLF.fd b/Master/texmf-dist/tex/latex/carlito/OT1Carlito-TLF.fd index 9cee292f056..5e7a708e69f 100644 --- a/Master/texmf-dist/tex/latex/carlito/OT1Carlito-TLF.fd +++ b/Master/texmf-dist/tex/latex/carlito/OT1Carlito-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{OT1Carlito-TLF.fd} - [2014/08/16 (autoinst) Font definitions for OT1/Carlito-TLF.] + [2014/08/20 (autoinst) Font definitions for OT1/Carlito-TLF.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty @@ -35,6 +35,10 @@ <-> ssub * Carlito-TLF/m/it }{} +\DeclareFontShape{OT1}{Carlito-TLF}{bx}{sl}{ + <-> ssub * Carlito-TLF/b/sl +}{} + \DeclareFontShape{OT1}{Carlito-TLF}{bx}{n}{ <-> ssub * Carlito-TLF/b/n }{} @@ -43,8 +47,4 @@ <-> ssub * Carlito-TLF/b/it }{} -\DeclareFontShape{OT1}{Carlito-TLF}{bx}{sl}{ - <-> ssub * Carlito-TLF/b/sl -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/carlito/OT1Carlito-TOsF.fd b/Master/texmf-dist/tex/latex/carlito/OT1Carlito-TOsF.fd index 1531f9158b4..0b3b9ed19bf 100644 --- a/Master/texmf-dist/tex/latex/carlito/OT1Carlito-TOsF.fd +++ b/Master/texmf-dist/tex/latex/carlito/OT1Carlito-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{OT1Carlito-TOsF.fd} - [2014/08/16 (autoinst) Font definitions for OT1/Carlito-TOsF.] + [2014/08/20 (autoinst) Font definitions for OT1/Carlito-TOsF.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/carlito/T1Carlito-Inf.fd b/Master/texmf-dist/tex/latex/carlito/T1Carlito-Inf.fd index cf0f8269a4b..bc4e90e45f0 100644 --- a/Master/texmf-dist/tex/latex/carlito/T1Carlito-Inf.fd +++ b/Master/texmf-dist/tex/latex/carlito/T1Carlito-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{T1Carlito-Inf.fd} - [2014/08/16 (autoinst) Font definitions for T1/Carlito-Inf.] + [2014/08/20 (autoinst) Font definitions for T1/Carlito-Inf.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/carlito/T1Carlito-LF.fd b/Master/texmf-dist/tex/latex/carlito/T1Carlito-LF.fd index aa7298c4c0b..7e7597f5c24 100644 --- a/Master/texmf-dist/tex/latex/carlito/T1Carlito-LF.fd +++ b/Master/texmf-dist/tex/latex/carlito/T1Carlito-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{T1Carlito-LF.fd} - [2014/08/16 (autoinst) Font definitions for T1/Carlito-LF.] + [2014/08/20 (autoinst) Font definitions for T1/Carlito-LF.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty @@ -35,6 +35,10 @@ <-> ssub * Carlito-LF/m/it }{} +\DeclareFontShape{T1}{Carlito-LF}{bx}{sl}{ + <-> ssub * Carlito-LF/b/sl +}{} + \DeclareFontShape{T1}{Carlito-LF}{bx}{n}{ <-> ssub * Carlito-LF/b/n }{} @@ -43,8 +47,4 @@ <-> ssub * Carlito-LF/b/it }{} -\DeclareFontShape{T1}{Carlito-LF}{bx}{sl}{ - <-> ssub * Carlito-LF/b/sl -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/carlito/T1Carlito-OsF.fd b/Master/texmf-dist/tex/latex/carlito/T1Carlito-OsF.fd index 7c23402f5ee..685b4c56b5d 100644 --- a/Master/texmf-dist/tex/latex/carlito/T1Carlito-OsF.fd +++ b/Master/texmf-dist/tex/latex/carlito/T1Carlito-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{T1Carlito-OsF.fd} - [2014/08/16 (autoinst) Font definitions for T1/Carlito-OsF.] + [2014/08/20 (autoinst) Font definitions for T1/Carlito-OsF.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/carlito/T1Carlito-Sup.fd b/Master/texmf-dist/tex/latex/carlito/T1Carlito-Sup.fd index a242bb28935..f8349b9d20a 100644 --- a/Master/texmf-dist/tex/latex/carlito/T1Carlito-Sup.fd +++ b/Master/texmf-dist/tex/latex/carlito/T1Carlito-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{T1Carlito-Sup.fd} - [2014/08/16 (autoinst) Font definitions for T1/Carlito-Sup.] + [2014/08/20 (autoinst) Font definitions for T1/Carlito-Sup.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/carlito/T1Carlito-TLF.fd b/Master/texmf-dist/tex/latex/carlito/T1Carlito-TLF.fd index 573219cea52..a29fe423c4d 100644 --- a/Master/texmf-dist/tex/latex/carlito/T1Carlito-TLF.fd +++ b/Master/texmf-dist/tex/latex/carlito/T1Carlito-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{T1Carlito-TLF.fd} - [2014/08/16 (autoinst) Font definitions for T1/Carlito-TLF.] + [2014/08/20 (autoinst) Font definitions for T1/Carlito-TLF.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty @@ -35,6 +35,10 @@ <-> ssub * Carlito-TLF/m/it }{} +\DeclareFontShape{T1}{Carlito-TLF}{bx}{sl}{ + <-> ssub * Carlito-TLF/b/sl +}{} + \DeclareFontShape{T1}{Carlito-TLF}{bx}{n}{ <-> ssub * Carlito-TLF/b/n }{} @@ -43,8 +47,4 @@ <-> ssub * Carlito-TLF/b/it }{} -\DeclareFontShape{T1}{Carlito-TLF}{bx}{sl}{ - <-> ssub * Carlito-TLF/b/sl -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/carlito/T1Carlito-TOsF.fd b/Master/texmf-dist/tex/latex/carlito/T1Carlito-TOsF.fd index 23525691787..d371abc98d0 100644 --- a/Master/texmf-dist/tex/latex/carlito/T1Carlito-TOsF.fd +++ b/Master/texmf-dist/tex/latex/carlito/T1Carlito-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{T1Carlito-TOsF.fd} - [2014/08/16 (autoinst) Font definitions for T1/Carlito-TOsF.] + [2014/08/20 (autoinst) Font definitions for T1/Carlito-TOsF.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/carlito/TS1Carlito-LF.fd b/Master/texmf-dist/tex/latex/carlito/TS1Carlito-LF.fd index 978b9ce3d25..74354096257 100644 --- a/Master/texmf-dist/tex/latex/carlito/TS1Carlito-LF.fd +++ b/Master/texmf-dist/tex/latex/carlito/TS1Carlito-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{TS1Carlito-LF.fd} - [2014/08/16 (autoinst) Font definitions for TS1/Carlito-LF.] + [2014/08/20 (autoinst) Font definitions for TS1/Carlito-LF.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/carlito/TS1Carlito-OsF.fd b/Master/texmf-dist/tex/latex/carlito/TS1Carlito-OsF.fd index f3bfa81452c..3527a652a18 100644 --- a/Master/texmf-dist/tex/latex/carlito/TS1Carlito-OsF.fd +++ b/Master/texmf-dist/tex/latex/carlito/TS1Carlito-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{TS1Carlito-OsF.fd} - [2014/08/16 (autoinst) Font definitions for TS1/Carlito-OsF.] + [2014/08/20 (autoinst) Font definitions for TS1/Carlito-OsF.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/carlito/TS1Carlito-TLF.fd b/Master/texmf-dist/tex/latex/carlito/TS1Carlito-TLF.fd index f1493447a8a..a57e2162624 100644 --- a/Master/texmf-dist/tex/latex/carlito/TS1Carlito-TLF.fd +++ b/Master/texmf-dist/tex/latex/carlito/TS1Carlito-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{TS1Carlito-TLF.fd} - [2014/08/16 (autoinst) Font definitions for TS1/Carlito-TLF.] + [2014/08/20 (autoinst) Font definitions for TS1/Carlito-TLF.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/carlito/TS1Carlito-TOsF.fd b/Master/texmf-dist/tex/latex/carlito/TS1Carlito-TOsF.fd index 2bbaa98e453..f9086d7f90f 100644 --- a/Master/texmf-dist/tex/latex/carlito/TS1Carlito-TOsF.fd +++ b/Master/texmf-dist/tex/latex/carlito/TS1Carlito-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2014/08/16 +%% Generated by autoinst on 2014/08/20 %% \ProvidesFile{TS1Carlito-TOsF.fd} - [2014/08/16 (autoinst) Font definitions for TS1/Carlito-TOsF.] + [2014/08/20 (autoinst) Font definitions for TS1/Carlito-TOsF.] \expandafter\ifx\csname Carlito@scale\endcsname\relax \let\Carlito@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/carlito/carlito.sty b/Master/texmf-dist/tex/latex/carlito/carlito.sty index e250104896b..326843f6162 100644 --- a/Master/texmf-dist/tex/latex/carlito/carlito.sty +++ b/Master/texmf-dist/tex/latex/carlito/carlito.sty @@ -1,22 +1,17 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{carlito} - [2014/08/17 (Bob Tennent) Supports Carlito fonts for pdfLaTeX, luaLaTeX and xeLaTeX.] + [2014/08/20 (Bob Tennent) Supports Carlito fonts for LaTeX, pdfLaTeX, luaLaTeX and xeLaTeX.] -\RequirePackage{ifxetex,ifluatex,ifpdf,xkeyval,textcomp} +\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp} \newif\ifcarlito@fontspec \ifxetex \carlito@fontspectrue \else\ifluatex \carlito@fontspectrue -\else\ifpdf % pdfLaTeX - \carlito@fontspecfalse \else - \PackageError{carlito}{LaTeX is not supported}{% - ******************************************\MessageBreak - Please use pdfLaTeX, luaLaTeX or xeLaTeX\MessageBreak - ******************************************} -\fi\fi\fi + \carlito@fontspecfalse +\fi\fi \newif\ifcarlito@default \carlito@defaultfalse \newif\ifcarlito@lining \carlito@liningfalse -- cgit v1.2.3