From af17255de8ba608f03d26eeb4ef5a774990da738 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 2 May 2013 21:48:59 +0000 Subject: sourcesanspro (2may13) git-svn-id: svn://tug.org/texlive/trunk@30210 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/sourcesanspro/LY1SourceSansPro-LF.fd | 4 +-- .../latex/sourcesanspro/LY1SourceSansPro-OsF.fd | 4 +-- .../latex/sourcesanspro/LY1SourceSansPro-TLF.fd | 4 +-- .../latex/sourcesanspro/LY1SourceSansPro-TOsF.fd | 4 +-- .../tex/latex/sourcesanspro/OT1SourceSansPro-LF.fd | 4 +-- .../latex/sourcesanspro/OT1SourceSansPro-OsF.fd | 4 +-- .../latex/sourcesanspro/OT1SourceSansPro-TLF.fd | 4 +-- .../latex/sourcesanspro/OT1SourceSansPro-TOsF.fd | 4 +-- .../tex/latex/sourcesanspro/T1SourceSansPro-LF.fd | 4 +-- .../tex/latex/sourcesanspro/T1SourceSansPro-OsF.fd | 4 +-- .../tex/latex/sourcesanspro/T1SourceSansPro-TLF.fd | 4 +-- .../latex/sourcesanspro/T1SourceSansPro-TOsF.fd | 4 +-- .../tex/latex/sourcesanspro/TS1SourceSansPro-LF.fd | 4 +-- .../latex/sourcesanspro/TS1SourceSansPro-OsF.fd | 4 +-- .../latex/sourcesanspro/TS1SourceSansPro-TLF.fd | 4 +-- .../latex/sourcesanspro/TS1SourceSansPro-TOsF.fd | 4 +-- .../sourcesanspro/sourcesanspro-type1-autoinst.sty | 4 +-- .../tex/latex/sourcesanspro/sourcesanspro.sty | 35 +++++++++++++--------- 18 files changed, 55 insertions(+), 48 deletions(-) (limited to 'Master/texmf-dist/tex/latex/sourcesanspro') diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/LY1SourceSansPro-LF.fd b/Master/texmf-dist/tex/latex/sourcesanspro/LY1SourceSansPro-LF.fd index 1643298d09c..f0bf349dc50 100644 --- a/Master/texmf-dist/tex/latex/sourcesanspro/LY1SourceSansPro-LF.fd +++ b/Master/texmf-dist/tex/latex/sourcesanspro/LY1SourceSansPro-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/04/10 +%% Generated by autoinst on 2013/04/21 %% \ProvidesFile{LY1SourceSansPro-LF.fd} - [2013/04/10 (autoinst) Font definitions for LY1/SourceSansPro-LF.] + [2013/04/21 (autoinst) Font definitions for LY1/SourceSansPro-LF.] \expandafter\ifx\csname SourceSansPro@scale\endcsname\relax \let\SourceSansPro@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/LY1SourceSansPro-OsF.fd b/Master/texmf-dist/tex/latex/sourcesanspro/LY1SourceSansPro-OsF.fd index 5799f7e7bf4..b0839bc0932 100644 --- a/Master/texmf-dist/tex/latex/sourcesanspro/LY1SourceSansPro-OsF.fd +++ b/Master/texmf-dist/tex/latex/sourcesanspro/LY1SourceSansPro-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/04/10 +%% Generated by autoinst on 2013/04/21 %% \ProvidesFile{LY1SourceSansPro-OsF.fd} - [2013/04/10 (autoinst) Font definitions for LY1/SourceSansPro-OsF.] + [2013/04/21 (autoinst) Font definitions for LY1/SourceSansPro-OsF.] \expandafter\ifx\csname SourceSansPro@scale\endcsname\relax \let\SourceSansPro@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/LY1SourceSansPro-TLF.fd b/Master/texmf-dist/tex/latex/sourcesanspro/LY1SourceSansPro-TLF.fd index f11c18f5f8a..1b4c9d4cbc4 100644 --- a/Master/texmf-dist/tex/latex/sourcesanspro/LY1SourceSansPro-TLF.fd +++ b/Master/texmf-dist/tex/latex/sourcesanspro/LY1SourceSansPro-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/04/10 +%% Generated by autoinst on 2013/04/21 %% \ProvidesFile{LY1SourceSansPro-TLF.fd} - [2013/04/10 (autoinst) Font definitions for LY1/SourceSansPro-TLF.] + [2013/04/21 (autoinst) Font definitions for LY1/SourceSansPro-TLF.] \expandafter\ifx\csname SourceSansPro@scale\endcsname\relax \let\SourceSansPro@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/LY1SourceSansPro-TOsF.fd b/Master/texmf-dist/tex/latex/sourcesanspro/LY1SourceSansPro-TOsF.fd index 9c86078a49b..12d380b579c 100644 --- a/Master/texmf-dist/tex/latex/sourcesanspro/LY1SourceSansPro-TOsF.fd +++ b/Master/texmf-dist/tex/latex/sourcesanspro/LY1SourceSansPro-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/04/10 +%% Generated by autoinst on 2013/04/21 %% \ProvidesFile{LY1SourceSansPro-TOsF.fd} - [2013/04/10 (autoinst) Font definitions for LY1/SourceSansPro-TOsF.] + [2013/04/21 (autoinst) Font definitions for LY1/SourceSansPro-TOsF.] \expandafter\ifx\csname SourceSansPro@scale\endcsname\relax \let\SourceSansPro@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/OT1SourceSansPro-LF.fd b/Master/texmf-dist/tex/latex/sourcesanspro/OT1SourceSansPro-LF.fd index fbc73440ac4..907e6c0d6fa 100644 --- a/Master/texmf-dist/tex/latex/sourcesanspro/OT1SourceSansPro-LF.fd +++ b/Master/texmf-dist/tex/latex/sourcesanspro/OT1SourceSansPro-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/04/10 +%% Generated by autoinst on 2013/04/21 %% \ProvidesFile{OT1SourceSansPro-LF.fd} - [2013/04/10 (autoinst) Font definitions for OT1/SourceSansPro-LF.] + [2013/04/21 (autoinst) Font definitions for OT1/SourceSansPro-LF.] \expandafter\ifx\csname SourceSansPro@scale\endcsname\relax \let\SourceSansPro@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/OT1SourceSansPro-OsF.fd b/Master/texmf-dist/tex/latex/sourcesanspro/OT1SourceSansPro-OsF.fd index b205c69c643..16e22325cde 100644 --- a/Master/texmf-dist/tex/latex/sourcesanspro/OT1SourceSansPro-OsF.fd +++ b/Master/texmf-dist/tex/latex/sourcesanspro/OT1SourceSansPro-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/04/10 +%% Generated by autoinst on 2013/04/21 %% \ProvidesFile{OT1SourceSansPro-OsF.fd} - [2013/04/10 (autoinst) Font definitions for OT1/SourceSansPro-OsF.] + [2013/04/21 (autoinst) Font definitions for OT1/SourceSansPro-OsF.] \expandafter\ifx\csname SourceSansPro@scale\endcsname\relax \let\SourceSansPro@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/OT1SourceSansPro-TLF.fd b/Master/texmf-dist/tex/latex/sourcesanspro/OT1SourceSansPro-TLF.fd index 5797025aedc..744da6a059a 100644 --- a/Master/texmf-dist/tex/latex/sourcesanspro/OT1SourceSansPro-TLF.fd +++ b/Master/texmf-dist/tex/latex/sourcesanspro/OT1SourceSansPro-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/04/10 +%% Generated by autoinst on 2013/04/21 %% \ProvidesFile{OT1SourceSansPro-TLF.fd} - [2013/04/10 (autoinst) Font definitions for OT1/SourceSansPro-TLF.] + [2013/04/21 (autoinst) Font definitions for OT1/SourceSansPro-TLF.] \expandafter\ifx\csname SourceSansPro@scale\endcsname\relax \let\SourceSansPro@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/OT1SourceSansPro-TOsF.fd b/Master/texmf-dist/tex/latex/sourcesanspro/OT1SourceSansPro-TOsF.fd index fc39e53f469..7f4d42def7e 100644 --- a/Master/texmf-dist/tex/latex/sourcesanspro/OT1SourceSansPro-TOsF.fd +++ b/Master/texmf-dist/tex/latex/sourcesanspro/OT1SourceSansPro-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/04/10 +%% Generated by autoinst on 2013/04/21 %% \ProvidesFile{OT1SourceSansPro-TOsF.fd} - [2013/04/10 (autoinst) Font definitions for OT1/SourceSansPro-TOsF.] + [2013/04/21 (autoinst) Font definitions for OT1/SourceSansPro-TOsF.] \expandafter\ifx\csname SourceSansPro@scale\endcsname\relax \let\SourceSansPro@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/T1SourceSansPro-LF.fd b/Master/texmf-dist/tex/latex/sourcesanspro/T1SourceSansPro-LF.fd index 026812b028b..67ace392b07 100644 --- a/Master/texmf-dist/tex/latex/sourcesanspro/T1SourceSansPro-LF.fd +++ b/Master/texmf-dist/tex/latex/sourcesanspro/T1SourceSansPro-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/04/10 +%% Generated by autoinst on 2013/04/21 %% \ProvidesFile{T1SourceSansPro-LF.fd} - [2013/04/10 (autoinst) Font definitions for T1/SourceSansPro-LF.] + [2013/04/21 (autoinst) Font definitions for T1/SourceSansPro-LF.] \expandafter\ifx\csname SourceSansPro@scale\endcsname\relax \let\SourceSansPro@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/T1SourceSansPro-OsF.fd b/Master/texmf-dist/tex/latex/sourcesanspro/T1SourceSansPro-OsF.fd index fc258462530..b7b5d8b60d0 100644 --- a/Master/texmf-dist/tex/latex/sourcesanspro/T1SourceSansPro-OsF.fd +++ b/Master/texmf-dist/tex/latex/sourcesanspro/T1SourceSansPro-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/04/10 +%% Generated by autoinst on 2013/04/21 %% \ProvidesFile{T1SourceSansPro-OsF.fd} - [2013/04/10 (autoinst) Font definitions for T1/SourceSansPro-OsF.] + [2013/04/21 (autoinst) Font definitions for T1/SourceSansPro-OsF.] \expandafter\ifx\csname SourceSansPro@scale\endcsname\relax \let\SourceSansPro@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/T1SourceSansPro-TLF.fd b/Master/texmf-dist/tex/latex/sourcesanspro/T1SourceSansPro-TLF.fd index a814ed84238..4f44e62d770 100644 --- a/Master/texmf-dist/tex/latex/sourcesanspro/T1SourceSansPro-TLF.fd +++ b/Master/texmf-dist/tex/latex/sourcesanspro/T1SourceSansPro-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/04/10 +%% Generated by autoinst on 2013/04/21 %% \ProvidesFile{T1SourceSansPro-TLF.fd} - [2013/04/10 (autoinst) Font definitions for T1/SourceSansPro-TLF.] + [2013/04/21 (autoinst) Font definitions for T1/SourceSansPro-TLF.] \expandafter\ifx\csname SourceSansPro@scale\endcsname\relax \let\SourceSansPro@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/T1SourceSansPro-TOsF.fd b/Master/texmf-dist/tex/latex/sourcesanspro/T1SourceSansPro-TOsF.fd index 825484672db..bf7e8f73179 100644 --- a/Master/texmf-dist/tex/latex/sourcesanspro/T1SourceSansPro-TOsF.fd +++ b/Master/texmf-dist/tex/latex/sourcesanspro/T1SourceSansPro-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/04/10 +%% Generated by autoinst on 2013/04/21 %% \ProvidesFile{T1SourceSansPro-TOsF.fd} - [2013/04/10 (autoinst) Font definitions for T1/SourceSansPro-TOsF.] + [2013/04/21 (autoinst) Font definitions for T1/SourceSansPro-TOsF.] \expandafter\ifx\csname SourceSansPro@scale\endcsname\relax \let\SourceSansPro@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/TS1SourceSansPro-LF.fd b/Master/texmf-dist/tex/latex/sourcesanspro/TS1SourceSansPro-LF.fd index 5c4ae1f19dc..361e941aab8 100644 --- a/Master/texmf-dist/tex/latex/sourcesanspro/TS1SourceSansPro-LF.fd +++ b/Master/texmf-dist/tex/latex/sourcesanspro/TS1SourceSansPro-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/04/10 +%% Generated by autoinst on 2013/04/21 %% \ProvidesFile{TS1SourceSansPro-LF.fd} - [2013/04/10 (autoinst) Font definitions for TS1/SourceSansPro-LF.] + [2013/04/21 (autoinst) Font definitions for TS1/SourceSansPro-LF.] \expandafter\ifx\csname SourceSansPro@scale\endcsname\relax \let\SourceSansPro@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/TS1SourceSansPro-OsF.fd b/Master/texmf-dist/tex/latex/sourcesanspro/TS1SourceSansPro-OsF.fd index 47654fe7e25..7f37393bd54 100644 --- a/Master/texmf-dist/tex/latex/sourcesanspro/TS1SourceSansPro-OsF.fd +++ b/Master/texmf-dist/tex/latex/sourcesanspro/TS1SourceSansPro-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/04/10 +%% Generated by autoinst on 2013/04/21 %% \ProvidesFile{TS1SourceSansPro-OsF.fd} - [2013/04/10 (autoinst) Font definitions for TS1/SourceSansPro-OsF.] + [2013/04/21 (autoinst) Font definitions for TS1/SourceSansPro-OsF.] \expandafter\ifx\csname SourceSansPro@scale\endcsname\relax \let\SourceSansPro@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/TS1SourceSansPro-TLF.fd b/Master/texmf-dist/tex/latex/sourcesanspro/TS1SourceSansPro-TLF.fd index d7f58060a8b..a3b6f42f860 100644 --- a/Master/texmf-dist/tex/latex/sourcesanspro/TS1SourceSansPro-TLF.fd +++ b/Master/texmf-dist/tex/latex/sourcesanspro/TS1SourceSansPro-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/04/10 +%% Generated by autoinst on 2013/04/21 %% \ProvidesFile{TS1SourceSansPro-TLF.fd} - [2013/04/10 (autoinst) Font definitions for TS1/SourceSansPro-TLF.] + [2013/04/21 (autoinst) Font definitions for TS1/SourceSansPro-TLF.] \expandafter\ifx\csname SourceSansPro@scale\endcsname\relax \let\SourceSansPro@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/TS1SourceSansPro-TOsF.fd b/Master/texmf-dist/tex/latex/sourcesanspro/TS1SourceSansPro-TOsF.fd index dc72fd01d0a..89e8d1c177c 100644 --- a/Master/texmf-dist/tex/latex/sourcesanspro/TS1SourceSansPro-TOsF.fd +++ b/Master/texmf-dist/tex/latex/sourcesanspro/TS1SourceSansPro-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/04/10 +%% Generated by autoinst on 2013/04/21 %% \ProvidesFile{TS1SourceSansPro-TOsF.fd} - [2013/04/10 (autoinst) Font definitions for TS1/SourceSansPro-TOsF.] + [2013/04/21 (autoinst) Font definitions for TS1/SourceSansPro-TOsF.] \expandafter\ifx\csname SourceSansPro@scale\endcsname\relax \let\SourceSansPro@@scale\@empty diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/sourcesanspro-type1-autoinst.sty b/Master/texmf-dist/tex/latex/sourcesanspro/sourcesanspro-type1-autoinst.sty index 020c856884d..60390c84d7e 100644 --- a/Master/texmf-dist/tex/latex/sourcesanspro/sourcesanspro-type1-autoinst.sty +++ b/Master/texmf-dist/tex/latex/sourcesanspro/sourcesanspro-type1-autoinst.sty @@ -1,8 +1,8 @@ -%% Generated by autoinst on 2013/04/10 +%% Generated by autoinst on 2013/04/21 %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{SourceSansPro} - [2013/04/10 (autoinst) Style file for SourceSansPro.] + [2013/04/21 (autoinst) Style file for SourceSansPro.] \RequirePackage[T1,LY1]{fontenc} \RequirePackage{textcomp} diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/sourcesanspro.sty b/Master/texmf-dist/tex/latex/sourcesanspro/sourcesanspro.sty index 85449755d80..150788ee76a 100644 --- a/Master/texmf-dist/tex/latex/sourcesanspro/sourcesanspro.sty +++ b/Master/texmf-dist/tex/latex/sourcesanspro/sourcesanspro.sty @@ -1,6 +1,6 @@ % Source Sans Pro for LaTeX % -% Silke Hofstra, silke@slxh.nl +% Silke Hofstra, tex@slxh.nl % % This file selects either the OTF or the TYPE1 fonts based on % the LaTeX engine used. @@ -8,13 +8,14 @@ % Licenced under the LPPL v1.3 or higher. % \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{sourcesanspro}[2013/04/09 v2.1 Adobe's Source Sans Pro typeface] +\ProvidesPackage{sourcesanspro}[2013/04/26 v2.2 Adobe's Source Sans Pro typeface] -\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp} +\RequirePackage{ifxetex,ifluatex,xkeyval} % Switches \newif\ifsourcesanspro@otf \newif\ifsourcesanspro@default +\newif\ifsourcesanspro@sfdefault \newif\ifsourcesanspro@oldstyle \newif\ifsourcesanspro@tabular \newif\ifsourcesanspro@black @@ -50,13 +51,15 @@ \DeclareOptionX{scale} {\renewcommand*{\SourceSansPro@scale}{#1}} \DeclareOptionX{scaled} {\renewcommand*{\SourceSansPro@scale}{#1}} \DeclareOptionX{default} {\sourcesanspro@defaulttrue} +\DeclareOptionX{sfdefault} {\sourcesanspro@sfdefaulttrue} +\DeclareOptionX{nosfdefault} {\sourcesanspro@sfdefaultfalse} \DeclareOptionX{type1} {\sourcesanspro@otffalse} \DeclareOptionX{t1} {\sourcesanspro@otffalse} \DeclareOptionX{opentype} {\sourcesanspro@otftrue} \DeclareOptionX{otf} {\sourcesanspro@otftrue} % Default options -\ExecuteOptionsX{lining,proportional,bold,regular} +\ExecuteOptionsX{sfdefault,lining,proportional,bold,regular} \ProcessOptionsX\relax % Load OpenType files @@ -105,14 +108,16 @@ Numbers = {\sourcesanspro@figurealign , \sourcesanspro@figurestyle } , Scale = \SourceSansPro@scale , Extension = .otf } - + % Sans serif font - \setsansfont - [ UprightFont = *-\sourcesanspro@regstyle , - ItalicFont = *-\sourcesanspro@regstyle It , - BoldFont = *-\sourcesanspro@boldstyle , - BoldItalicFont = *-\sourcesanspro@boldstyle It] - {SourceSansPro} + \ifsourcesanspro@sfdefault + \setsansfont + [ UprightFont = *-\sourcesanspro@regstyle , + ItalicFont = *-\sourcesanspro@regstyle It , + BoldFont = *-\sourcesanspro@boldstyle , + BoldItalicFont = *-\sourcesanspro@boldstyle It] + {SourceSansPro} + \fi % Font families % Regular/Bold @@ -192,9 +197,11 @@ \fi % Sans serif font - \renewcommand* - {\sfdefault} - {SourceSansPro-\sourcesanspro@figurealign\sourcesanspro@figurestyle} + \ifsourcesanspro@sfdefault + \renewcommand* + {\sfdefault} + {SourceSansPro-\sourcesanspro@figurealign\sourcesanspro@figurestyle} + \fi % If source sans pro is the default font \oldstylenums needs a new definition. \ifsourcesanspro@default -- cgit v1.2.3