raleway (22oct13)

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

1 files changed, 37 insertions, 25 deletions

diff --git a/Master/texmf-dist/tex/latex/raleway/raleway.sty b/Master/texmf-dist/tex/latex/raleway/raleway.sty
index f236d5fa294..7a146131ffa 100644
--- a/Master/texmf-dist/tex/latex/raleway/raleway.sty
+++ b/Master/texmf-dist/tex/latex/raleway/raleway.sty
@@ -8,7 +8,7 @@
 % Licenced under the LPPL v1.3 or higher.
 %
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{raleway}[2013/04/14 v1.0 Matt McInerney’s Raleway family]
+\ProvidesPackage{raleway}[2013/10/05 v1.1 Matt McInerney’s Raleway family]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval}
 
@@ -123,60 +123,73 @@
 		\setsansfont
 			[ UprightFont    = *-\raleway@regstyle ,
 			  BoldFont       = *-\raleway@boldstyle ]
-			{raleway}
+			{Raleway}
 	\fi
 	
 	% Font families
 	% Regular/Bold
 	\newfontfamily\raleway
 		[ UprightFont    = *-Regular ,
-		  BoldFont       = *-Bold ]
+		  ItalicFont     = *-Regular-Italic ,
+		  BoldFont       = *-Bold ,
+		  BoldItalicFont     = *-Bold-Italic ]
 		{Raleway}
 		
 	\newfontfamily\ralewaymedium
 		[ UprightFont    = *-Medium ,
-		  BoldFont       = *-Bold ]
+		  ItalicFont     = *-Medium-Italic ,
+		  BoldFont       = *-Bold ,
+		  BoldItalicFont = *-Bold-Italic ]
 		{Raleway}
 
 	% Light/Semibold
 	\newfontfamily\ralewaylight
 		[ UprightFont    = *-Light ,
-		  BoldFont       = *-Semibold ]
+		  ItalicFont     = *-Light-Italic ,
+		  BoldFont       = *-SemiBold ,
+		  BoldItalicFont = *-SemiBold-Italic ]
 		{Raleway}
 	
 	% Light/Semibold
 	\newfontfamily\ralewaythin
 		[ UprightFont    = *-Thin ,
-		  BoldFont       = *-Black ]
+		  ItalicFont     = *-Thin-Italic ,
+		  BoldFont       = *-Black ,
+		  BoldItalicFont = *-Black-Italic ]
 		{Raleway}
 	
 	% ExtraLight/Black
 	\newfontfamily\ralewayextra
 		[ UprightFont    = *-ExtraLight ,
-		  BoldFont       = *-ExtraBold ]
+		  ItalicFont     = *-ExtraLight-Italic ,
+		  BoldFont       = *-ExtraBold ,
+		  BoldItalicFont = *-ExtraBold-Italic ]
 		{Raleway}
 	
 	% Dont keep all default font features
 	\defaultfontfeatures{}
 	
 	\newfontfamily\ralewayLF
-		[ Ligatures = TeX ,
-		  Numbers   = Lining ,
-		  Scale     = \raleway@scale ,
-		  Extension = .otf ,
+		[ Ligatures      = TeX ,
+		  Numbers        = Lining ,
+		  Scale          = \raleway@scale ,
+		  Extension      = .otf ,
 		  UprightFont    = *-\raleway@regstyle ,
-		  BoldFont       = *-\raleway@boldstyle ]
-		{raleway}
+		  ItalicFont     = *-\raleway@regstyle-Italic ,
+		  BoldFont       = *-\raleway@boldstyle ,
+		  BoldItalicFont = *-\raleway@boldstyle-Italic ]
+		{Raleway}
 
 % Load type1 font.
 \else
 	\RequirePackage[OT1,LY1,T1]{fontenc}
+	\RequirePackage{mweights}
 	
 	% Tabular/Proportional
 	\ifraleway@tabular
 		\def\raleway@figurealign{T}
 	\else
-		\def\raleway@figurealign{}
+		\def\raleway@figurealign{T}
 	\fi
 	
 	% Oldstyle/Lining
@@ -184,38 +197,37 @@
 		\def\raleway@figurestyle{OsF}
 	\else
 		\def\raleway@figurestyle{LF}
-		\def\raleway@figurealign{T}
 	\fi
 	
 	% Black/Semibold/Bold
 	\ifraleway@extrabold
-		\renewcommand*{\bfdefault}{eb}
+		\def\bfseries@sf{eb}
 	\else
 		\ifraleway@semibold
-			\renewcommand*{\bfdefault}{sb}
+			\def\bfseries@sf{sb}
 		\else
 			\ifraleway@black
-				\renewcommand*{\bfdefault}{k}
+				\def\bfseries@sf{k}
 			\else
-				\renewcommand*{\bfdefault}{b}
+				\def\bfseries@sf{b}
 			\fi
 		\fi
 	\fi
 	
 	% Light/ExtraLight/Regular/Medium/Thin
 	\ifraleway@light
-		\renewcommand*{\mddefault}{l}
+		\def\mdseries@sf{l}
 	\else
 		\ifraleway@extralight
-			\renewcommand*{\mddefault}{el}
+			\def\mdseries@sf{el}
 		\else
 			\ifraleway@thin
-				\renewcommand*{\mddefault}{t}
+				\def\mdseries@sf{t}
 			\else
 				\ifraleway@medium
-					\renewcommand*{\mddefault}{mb}
+					\def\mdseries@sf{mb}
 				\else
-					\renewcommand*{\mddefault}{m}
+					\def\mdseries@sf{m}
 				\fi
 			\fi
 		\fi
@@ -247,4 +259,4 @@
 	\let\familydefault\sfdefault
 \fi
 
-\endinput
\ No newline at end of file
+\endinput