sourcecodepro 5/25

git-svn-id: svn://tug.org/texlive/trunk@30691 c570f23f-e606-0410-a88d-b1316a301751

14 files changed, 52 insertions, 45 deletions

diff --git a/Master/texmf-dist/tex/latex/sourcecodepro/LY1SourceCodePro-OsF.fd b/Master/texmf-dist/tex/latex/sourcecodepro/LY1SourceCodePro-OsF.fd
index 647857157c4..6e6b1338a1f 100644
--- a/Master/texmf-dist/tex/latex/sourcecodepro/LY1SourceCodePro-OsF.fd
+++ b/Master/texmf-dist/tex/latex/sourcecodepro/LY1SourceCodePro-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/01/17
+%% Generated by autoinst on 2013/05/26
 %%
 \ProvidesFile{LY1SourceCodePro-OsF.fd}
-    [2013/01/17 (autoinst)  Font definitions for LY1/SourceCodePro-OsF.]
+    [2013/05/26 (autoinst)  Font definitions for LY1/SourceCodePro-OsF.]
 
 \expandafter\ifx\csname SourceCodePro@scale\endcsname\relax
     \let\SourceCodePro@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/sourcecodepro/LY1SourceCodePro-TLF.fd b/Master/texmf-dist/tex/latex/sourcecodepro/LY1SourceCodePro-TLF.fd
index 9237ec10868..c4a6a5b98d2 100644
--- a/Master/texmf-dist/tex/latex/sourcecodepro/LY1SourceCodePro-TLF.fd
+++ b/Master/texmf-dist/tex/latex/sourcecodepro/LY1SourceCodePro-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/01/17
+%% Generated by autoinst on 2013/05/26
 %%
 \ProvidesFile{LY1SourceCodePro-TLF.fd}
-    [2013/01/17 (autoinst)  Font definitions for LY1/SourceCodePro-TLF.]
+    [2013/05/26 (autoinst)  Font definitions for LY1/SourceCodePro-TLF.]
 
 \expandafter\ifx\csname SourceCodePro@scale\endcsname\relax
     \let\SourceCodePro@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/sourcecodepro/LY1SourceCodePro-TOsF.fd b/Master/texmf-dist/tex/latex/sourcecodepro/LY1SourceCodePro-TOsF.fd
index f43de51ab27..9b34df05dfc 100644
--- a/Master/texmf-dist/tex/latex/sourcecodepro/LY1SourceCodePro-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/sourcecodepro/LY1SourceCodePro-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/01/17
+%% Generated by autoinst on 2013/05/26
 %%
 \ProvidesFile{LY1SourceCodePro-TOsF.fd}
-    [2013/01/17 (autoinst)  Font definitions for LY1/SourceCodePro-TOsF.]
+    [2013/05/26 (autoinst)  Font definitions for LY1/SourceCodePro-TOsF.]
 
 \expandafter\ifx\csname SourceCodePro@scale\endcsname\relax
     \let\SourceCodePro@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/sourcecodepro/OT1SourceCodePro-OsF.fd b/Master/texmf-dist/tex/latex/sourcecodepro/OT1SourceCodePro-OsF.fd
index 4750f9d437b..a06c5328d77 100644
--- a/Master/texmf-dist/tex/latex/sourcecodepro/OT1SourceCodePro-OsF.fd
+++ b/Master/texmf-dist/tex/latex/sourcecodepro/OT1SourceCodePro-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/01/17
+%% Generated by autoinst on 2013/05/26
 %%
 \ProvidesFile{OT1SourceCodePro-OsF.fd}
-    [2013/01/17 (autoinst)  Font definitions for OT1/SourceCodePro-OsF.]
+    [2013/05/26 (autoinst)  Font definitions for OT1/SourceCodePro-OsF.]
 
 \expandafter\ifx\csname SourceCodePro@scale\endcsname\relax
     \let\SourceCodePro@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/sourcecodepro/OT1SourceCodePro-TLF.fd b/Master/texmf-dist/tex/latex/sourcecodepro/OT1SourceCodePro-TLF.fd
index 6f3d8c223fe..78df5241401 100644
--- a/Master/texmf-dist/tex/latex/sourcecodepro/OT1SourceCodePro-TLF.fd
+++ b/Master/texmf-dist/tex/latex/sourcecodepro/OT1SourceCodePro-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/01/17
+%% Generated by autoinst on 2013/05/26
 %%
 \ProvidesFile{OT1SourceCodePro-TLF.fd}
-    [2013/01/17 (autoinst)  Font definitions for OT1/SourceCodePro-TLF.]
+    [2013/05/26 (autoinst)  Font definitions for OT1/SourceCodePro-TLF.]
 
 \expandafter\ifx\csname SourceCodePro@scale\endcsname\relax
     \let\SourceCodePro@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/sourcecodepro/OT1SourceCodePro-TOsF.fd b/Master/texmf-dist/tex/latex/sourcecodepro/OT1SourceCodePro-TOsF.fd
index 249282b6cc1..b498cf375c7 100644
--- a/Master/texmf-dist/tex/latex/sourcecodepro/OT1SourceCodePro-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/sourcecodepro/OT1SourceCodePro-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/01/17
+%% Generated by autoinst on 2013/05/26
 %%
 \ProvidesFile{OT1SourceCodePro-TOsF.fd}
-    [2013/01/17 (autoinst)  Font definitions for OT1/SourceCodePro-TOsF.]
+    [2013/05/26 (autoinst)  Font definitions for OT1/SourceCodePro-TOsF.]
 
 \expandafter\ifx\csname SourceCodePro@scale\endcsname\relax
     \let\SourceCodePro@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/sourcecodepro/T1SourceCodePro-OsF.fd b/Master/texmf-dist/tex/latex/sourcecodepro/T1SourceCodePro-OsF.fd
index 6f74df4f12a..568bafecba8 100644
--- a/Master/texmf-dist/tex/latex/sourcecodepro/T1SourceCodePro-OsF.fd
+++ b/Master/texmf-dist/tex/latex/sourcecodepro/T1SourceCodePro-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/01/17
+%% Generated by autoinst on 2013/05/26
 %%
 \ProvidesFile{T1SourceCodePro-OsF.fd}
-    [2013/01/17 (autoinst)  Font definitions for T1/SourceCodePro-OsF.]
+    [2013/05/26 (autoinst)  Font definitions for T1/SourceCodePro-OsF.]
 
 \expandafter\ifx\csname SourceCodePro@scale\endcsname\relax
     \let\SourceCodePro@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/sourcecodepro/T1SourceCodePro-TLF.fd b/Master/texmf-dist/tex/latex/sourcecodepro/T1SourceCodePro-TLF.fd
index c17c688d66e..4956d62cbb9 100644
--- a/Master/texmf-dist/tex/latex/sourcecodepro/T1SourceCodePro-TLF.fd
+++ b/Master/texmf-dist/tex/latex/sourcecodepro/T1SourceCodePro-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/01/17
+%% Generated by autoinst on 2013/05/26
 %%
 \ProvidesFile{T1SourceCodePro-TLF.fd}
-    [2013/01/17 (autoinst)  Font definitions for T1/SourceCodePro-TLF.]
+    [2013/05/26 (autoinst)  Font definitions for T1/SourceCodePro-TLF.]
 
 \expandafter\ifx\csname SourceCodePro@scale\endcsname\relax
     \let\SourceCodePro@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/sourcecodepro/T1SourceCodePro-TOsF.fd b/Master/texmf-dist/tex/latex/sourcecodepro/T1SourceCodePro-TOsF.fd
index 05c2728ea88..3ec04d0af23 100644
--- a/Master/texmf-dist/tex/latex/sourcecodepro/T1SourceCodePro-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/sourcecodepro/T1SourceCodePro-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/01/17
+%% Generated by autoinst on 2013/05/26
 %%
 \ProvidesFile{T1SourceCodePro-TOsF.fd}
-    [2013/01/17 (autoinst)  Font definitions for T1/SourceCodePro-TOsF.]
+    [2013/05/26 (autoinst)  Font definitions for T1/SourceCodePro-TOsF.]
 
 \expandafter\ifx\csname SourceCodePro@scale\endcsname\relax
     \let\SourceCodePro@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/sourcecodepro/TS1SourceCodePro-OsF.fd b/Master/texmf-dist/tex/latex/sourcecodepro/TS1SourceCodePro-OsF.fd
index d8b20e85bbd..a5d0a7d6452 100644
--- a/Master/texmf-dist/tex/latex/sourcecodepro/TS1SourceCodePro-OsF.fd
+++ b/Master/texmf-dist/tex/latex/sourcecodepro/TS1SourceCodePro-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/01/17
+%% Generated by autoinst on 2013/05/26
 %%
 \ProvidesFile{TS1SourceCodePro-OsF.fd}
-    [2013/01/17 (autoinst)  Font definitions for TS1/SourceCodePro-OsF.]
+    [2013/05/26 (autoinst)  Font definitions for TS1/SourceCodePro-OsF.]
 
 \expandafter\ifx\csname SourceCodePro@scale\endcsname\relax
     \let\SourceCodePro@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/sourcecodepro/TS1SourceCodePro-TLF.fd b/Master/texmf-dist/tex/latex/sourcecodepro/TS1SourceCodePro-TLF.fd
index 10368f8d5dd..8ad3ac3f335 100644
--- a/Master/texmf-dist/tex/latex/sourcecodepro/TS1SourceCodePro-TLF.fd
+++ b/Master/texmf-dist/tex/latex/sourcecodepro/TS1SourceCodePro-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/01/17
+%% Generated by autoinst on 2013/05/26
 %%
 \ProvidesFile{TS1SourceCodePro-TLF.fd}
-    [2013/01/17 (autoinst)  Font definitions for TS1/SourceCodePro-TLF.]
+    [2013/05/26 (autoinst)  Font definitions for TS1/SourceCodePro-TLF.]
 
 \expandafter\ifx\csname SourceCodePro@scale\endcsname\relax
     \let\SourceCodePro@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/sourcecodepro/TS1SourceCodePro-TOsF.fd b/Master/texmf-dist/tex/latex/sourcecodepro/TS1SourceCodePro-TOsF.fd
index db71b317356..34354a2e8ed 100644
--- a/Master/texmf-dist/tex/latex/sourcecodepro/TS1SourceCodePro-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/sourcecodepro/TS1SourceCodePro-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2013/01/17
+%% Generated by autoinst on 2013/05/26
 %%
 \ProvidesFile{TS1SourceCodePro-TOsF.fd}
-    [2013/01/17 (autoinst)  Font definitions for TS1/SourceCodePro-TOsF.]
+    [2013/05/26 (autoinst)  Font definitions for TS1/SourceCodePro-TOsF.]
 
 \expandafter\ifx\csname SourceCodePro@scale\endcsname\relax
     \let\SourceCodePro@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/sourcecodepro/sourcecodepro-type1-autoinst.sty b/Master/texmf-dist/tex/latex/sourcecodepro/sourcecodepro-type1-autoinst.sty
index a00ade01cb3..16d1d39f3d8 100644
--- a/Master/texmf-dist/tex/latex/sourcecodepro/sourcecodepro-type1-autoinst.sty
+++ b/Master/texmf-dist/tex/latex/sourcecodepro/sourcecodepro-type1-autoinst.sty
@@ -1,8 +1,8 @@
-%% Generated by autoinst on 2013/01/17
+%% Generated by autoinst on 2013/05/26
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{SourceCodePro}
-    [2013/01/17 (autoinst)  Style file for SourceCodePro.]
+    [2013/05/26 (autoinst)  Style file for SourceCodePro.]
 
 \RequirePackage[T1,LY1]{fontenc}
 \RequirePackage{textcomp}
@@ -34,8 +34,8 @@
 \ProcessOptionsX\relax
 
 \renewcommand*
-    {\sfdefault}
+    {\ttdefault}
     {SourceCodePro-\SourceCodePro@figurealign\SourceCodePro@figurestyle}
-\renewcommand*{\familydefault}{\sfdefault}
+\renewcommand*{\familydefault}{\ttdefault}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/sourcecodepro/sourcecodepro.sty b/Master/texmf-dist/tex/latex/sourcecodepro/sourcecodepro.sty
index 69e28811aa9..3e7a40b914d 100644
--- a/Master/texmf-dist/tex/latex/sourcecodepro/sourcecodepro.sty
+++ b/Master/texmf-dist/tex/latex/sourcecodepro/sourcecodepro.sty
@@ -1,6 +1,6 @@
-% Source Sans Pro for LaTeX
+% Source Code 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.
@@ -10,11 +10,12 @@
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
 \ProvidesPackage{sourcecodepro}[2012/12/24 v2.0 Adobe's Source Code Pro typeface]
 
-\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
+\RequirePackage{ifxetex,ifluatex,xkeyval}
 
 % Switches
 \newif\ifsourcecodepro@otf
 \newif\ifsourcecodepro@default
+\newif\ifsourcecodepro@ttdefault
 \newif\ifsourcecodepro@oldstyle
 \newif\ifsourcecodepro@black
 \newif\ifsourcecodepro@semibold
@@ -47,13 +48,15 @@
 \DeclareOptionX{scale}       {\renewcommand*{\sourcecodepro@scale}{#1}}
 \DeclareOptionX{scaled}      {\renewcommand*{\sourcecodepro@scale}{#1}}
 \DeclareOptionX{default}     {\sourcecodepro@defaulttrue}
+\DeclareOptionX{ttdefault}   {\sourcecodepro@ttdefaulttrue}
+\DeclareOptionX{nottdefault} {\sourcecodepro@ttdefaultfalse}
 \DeclareOptionX{type1}       {\sourcecodepro@otffalse}
 \DeclareOptionX{t1}          {\sourcecodepro@otffalse}
 \DeclareOptionX{opentype}    {\sourcecodepro@otftrue}
 \DeclareOptionX{otf}         {\sourcecodepro@otftrue}
 
 % Default options
-\ExecuteOptionsX{lining,bold,regular}
+\ExecuteOptionsX{ttdefault,lining,bold,regular}
 \ProcessOptionsX\relax
 
 % Load OpenType files
@@ -96,13 +99,15 @@
 		Scale     = \sourcecodepro@scale ,
 		Extension = .otf }
 	
-	% Sans serif font
-	\setmonofont
-		[ UprightFont    = *-\sourcecodepro@regstyle ,
-		  ItalicFont     = *-\sourcecodepro@regstyle ,
-		  BoldFont       = *-\sourcecodepro@boldstyle , 
-		  BoldItalicFont = *-\sourcecodepro@boldstyle ]
-		{SourceCodePro}
+	% Monospace font
+	\ifsourcecodepro@ttdefault
+		\setmonofont
+			[ UprightFont    = *-\sourcecodepro@regstyle ,
+			  ItalicFont     = *-\sourcecodepro@regstyle ,
+			  BoldFont       = *-\sourcecodepro@boldstyle , 
+			  BoldItalicFont = *-\sourcecodepro@boldstyle ]
+			{SourceCodePro}
+	\fi
 	
 	% Font families
 	% Regular/Bold
@@ -174,12 +179,14 @@
 		\fi
 	\fi
 
-	% Sans serif font
-	\renewcommand*
-		{\sfdefault}
-		{SourceCodePro-T\sourcecodepro@figurestyle}
+	% Monospace font
+	\ifsourcecodepro@ttdefault
+		\renewcommand*
+			{\ttdefault}
+			{SourceCodePro-T\sourcecodepro@figurestyle}
+	\fi
 	
-	% If source sans pro is the default font \oldstylenums needs a new definition.
+	% If source code pro is the default font \oldstylenums needs a new definition.
 	\ifsourcecodepro@default
 		\renewcommand*\oldstylenums[1]{%
 			\begingroup
@@ -195,7 +202,7 @@
 
 % Set default font family
 \ifsourcecodepro@default
-	\let\familydefault\sfdefault
+	\let\familydefault\ttdefault
 \fi
 
 \endinput
\ No newline at end of file