sourcesanspro (22oct13)

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

6 files changed, 29 insertions, 24 deletions

diff --git a/Master/texmf-dist/doc/latex/sourcesanspro/README b/Master/texmf-dist/doc/latex/sourcesanspro/README
index 53b438b58a2..917f2c7e4a2 100644
--- a/Master/texmf-dist/doc/latex/sourcesanspro/README
+++ b/Master/texmf-dist/doc/latex/sourcesanspro/README
@@ -1,4 +1,4 @@
-Source Sans Pro v2.2
+Source Sans Pro v2.3
 ====================
 This package provides the Source Sans Pro typeface as a LaTeX package.
 Full documentation and revision history in `sourcesanspro.pdf`.
diff --git a/Master/texmf-dist/doc/latex/sourcesanspro/sourcesanspro-otf-specimen.pdf b/Master/texmf-dist/doc/latex/sourcesanspro/sourcesanspro-otf-specimen.pdf
index c552f2031c2..9c52f37a6c8 100644
--- a/Master/texmf-dist/doc/latex/sourcesanspro/sourcesanspro-otf-specimen.pdf
+++ b/Master/texmf-dist/doc/latex/sourcesanspro/sourcesanspro-otf-specimen.pdf
diff --git a/Master/texmf-dist/doc/latex/sourcesanspro/sourcesanspro-type1-specimen.pdf b/Master/texmf-dist/doc/latex/sourcesanspro/sourcesanspro-type1-specimen.pdf
index b365c8130ac..326f19e4726 100644
--- a/Master/texmf-dist/doc/latex/sourcesanspro/sourcesanspro-type1-specimen.pdf
+++ b/Master/texmf-dist/doc/latex/sourcesanspro/sourcesanspro-type1-specimen.pdf
diff --git a/Master/texmf-dist/doc/latex/sourcesanspro/sourcesanspro.pdf b/Master/texmf-dist/doc/latex/sourcesanspro/sourcesanspro.pdf
index 083f7e90a84..9ec61da6402 100644
--- a/Master/texmf-dist/doc/latex/sourcesanspro/sourcesanspro.pdf
+++ b/Master/texmf-dist/doc/latex/sourcesanspro/sourcesanspro.pdf
diff --git a/Master/texmf-dist/doc/latex/sourcesanspro/sourcesanspro.tex b/Master/texmf-dist/doc/latex/sourcesanspro/sourcesanspro.tex
index 125bd74153f..45c124850fb 100644
--- a/Master/texmf-dist/doc/latex/sourcesanspro/sourcesanspro.tex
+++ b/Master/texmf-dist/doc/latex/sourcesanspro/sourcesanspro.tex
@@ -18,7 +18,7 @@
 }
 
 \author{Silke Hofstra, \href{mailto:tex@slxh.nl}{tex@slxh.nl}}
-\date{Documentation for sourcesanspro v2.2.\\ \today}
+\date{Documentation for sourcesanspro v2.3.\\ \today}
 
 \begin{document}
 \maketitle
@@ -97,6 +97,11 @@ The following Type1 font families are included:
 With series ‘el’, ‘l’, ‘m’, ‘sb’, ‘b’, ‘k’ and shapes ‘n’, ‘i’ and ‘sc’.
 
 \section{Version history}
+\subsection*{2.3}
+\begin{itemize*}
+	\item Weights are now handled with the \href{http://www.ctan.org/pkg/mweights}{mweights} package.
+\end{itemize*}
+
 \subsection*{2.2}
 \begin{itemize*}
 	\item Updated fonts to 1.050
@@ -126,7 +131,6 @@ With series ‘el’, ‘l’, ‘m’, ‘sb’, ‘b’, ‘k’ and shapes â€
 \section{Known issues}
 \begin{itemize*}
 	\item Using \texttt{\textbackslash liningnums} when the default numbers are oldstyle results in an ‘font feature does not exist’ error and no lining numbers due to lack of the ‘lnum’ font feature.
-	\item For Type1 users the weight options are set globally.
 \end{itemize*}
 
 \newpage
diff --git a/Master/texmf-dist/tex/latex/sourcesanspro/sourcesanspro.sty b/Master/texmf-dist/tex/latex/sourcesanspro/sourcesanspro.sty
index 150788ee76a..790c5cf09dc 100644
--- a/Master/texmf-dist/tex/latex/sourcesanspro/sourcesanspro.sty
+++ b/Master/texmf-dist/tex/latex/sourcesanspro/sourcesanspro.sty
@@ -8,7 +8,7 @@
 % Licenced under the LPPL v1.3 or higher.
 %
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{sourcesanspro}[2013/04/26 v2.2 Adobe's Source Sans Pro typeface]
+\ProvidesPackage{sourcesanspro}[2013/09/23 v2.3 Adobe's Source Sans Pro typeface]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval}
 
@@ -68,37 +68,37 @@
 	
 	% Oldstyle/Lining
 	\ifsourcesanspro@oldstyle
-		\edef\sourcesanspro@figurestyle{OldStyle}
+		\def\sourcesanspro@figurestyle{OldStyle}
 	\else
-		\edef\sourcesanspro@figurestyle{}
+		\def\sourcesanspro@figurestyle{}
 	\fi
 	
 	% Tabular/Proportional
 	\ifsourcesanspro@tabular
-		\edef\sourcesanspro@figurealign{Monospaced}
+		\def\sourcesanspro@figurealign{Monospaced}
 	\else
-		\edef\sourcesanspro@figurealign{Proportional}
+		\def\sourcesanspro@figurealign{Proportional}
 	\fi
 	
 	% Black/Semibold/Bold
 	\ifsourcesanspro@black
-		\edef\sourcesanspro@boldstyle{Black}
+		\def\sourcesanspro@boldstyle{Black}
 	\else
 		\ifsourcesanspro@semibold
-			\edef\sourcesanspro@boldstyle{Semibold}
+			\def\sourcesanspro@boldstyle{Semibold}
 		\else
-			\edef\sourcesanspro@boldstyle{Bold}
+			\def\sourcesanspro@boldstyle{Bold}
 		\fi
 	\fi
 	
 	% Light/ExtraLight/Regular
 	\ifsourcesanspro@light
-		\edef\sourcesanspro@regstyle{Light}
+		\def\sourcesanspro@regstyle{Light}
 	\else
 		\ifsourcesanspro@extralight
-			\edef\sourcesanspro@regstyle{ExtraLight}
+			\def\sourcesanspro@regstyle{ExtraLight}
 		\else
-			\edef\sourcesanspro@regstyle{Regular}
+			\def\sourcesanspro@regstyle{Regular}
 		\fi
 	\fi
 	
@@ -159,40 +159,41 @@
 % Load type1 font.
 \else
 	\RequirePackage[OT1,LY1,T1]{fontenc}
+	\RequirePackage{mweights}
 
 	% Oldstyle/Lining
 	\ifsourcesanspro@oldstyle
-		\edef\sourcesanspro@figurestyle{OsF}
+		\def\sourcesanspro@figurestyle{OsF}
 	\else
-		\edef\sourcesanspro@figurestyle{LF}
+		\def\sourcesanspro@figurestyle{LF}
 	\fi
 	
 	% Tabular/Proportional
 	\ifsourcesanspro@tabular
-		\edef\sourcesanspro@figurealign{T}
+		\def\sourcesanspro@figurealign{T}
 	\else
-		\edef\sourcesanspro@figurealign{}
+		\def\sourcesanspro@figurealign{}
 	\fi
 	
 	% Black/Semibold/Bold
 	\ifsourcesanspro@black
-		\renewcommand*{\bfdefault}{k}
+		\def\bfseries@sf{k}
 	\else
 		\ifsourcesanspro@semibold
-			\renewcommand*{\bfdefault}{sb}
+			\def\bfseries@sf{sb}
 		\else
-			\renewcommand*{\bfdefault}{b}
+			\def\bfseries@sf{b}
 		\fi
 	\fi
 	
 	% Light/ExtraLight/Regular
 	\ifsourcesanspro@light
-		\renewcommand*{\mddefault}{l}
+		\def\mdseries@sf{l}
 	\else
 		\ifsourcesanspro@extralight
-			\renewcommand*{\mddefault}{el}
+			\def\mdseries@sf{el}
 		\else
-			\renewcommand*{\mddefault}{m}
+			\def\mdseries@sf{m}
 		\fi
 	\fi