summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/sourcecodepro/sourcecodepro.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-10-24 21:34:29 +0000
committerKarl Berry <karl@freefriends.org>2013-10-24 21:34:29 +0000
commit6376dc64eb3cbbb0931ee269e98a9a12c1ae2376 (patch)
treeaa1f3a914c1cc4720ff8726a975dd6180b9c6496 /Master/texmf-dist/tex/latex/sourcecodepro/sourcecodepro.sty
parent3abca69ae2714caba89314bd9d7c003b10801c6c (diff)
sourcodecodepro
git-svn-id: svn://tug.org/texlive/trunk@31987 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/sourcecodepro/sourcecodepro.sty')
-rw-r--r--Master/texmf-dist/tex/latex/sourcecodepro/sourcecodepro.sty43
1 files changed, 22 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/sourcecodepro/sourcecodepro.sty b/Master/texmf-dist/tex/latex/sourcecodepro/sourcecodepro.sty
index 3e7a40b914d..6e674d8924a 100644
--- a/Master/texmf-dist/tex/latex/sourcecodepro/sourcecodepro.sty
+++ b/Master/texmf-dist/tex/latex/sourcecodepro/sourcecodepro.sty
@@ -8,7 +8,7 @@
% Licenced under the LPPL v1.3 or higher.
%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{sourcecodepro}[2012/12/24 v2.0 Adobe's Source Code Pro typeface]
+\ProvidesPackage{sourcecodepro}[2013/09/23 v2.2 Adobe's Source Code Pro typeface]
\RequirePackage{ifxetex,ifluatex,xkeyval}
@@ -23,7 +23,7 @@
\newif\ifsourcecodepro@extralight
% Scaling command
-\newcommand*{\sourcecodepro@scale}{1}
+\newcommand*{\SourceCodePro@scale}{1}
% Use OpenType fonts for XeTeX and LuaTeX.
\ifxetex
@@ -45,8 +45,8 @@
\DeclareOptionX{light} {\sourcecodepro@lighttrue \sourcecodepro@extralightfalse}
\DeclareOptionX{extralight} {\sourcecodepro@lightfalse\sourcecodepro@extralighttrue}
\DeclareOptionX{regular} {\sourcecodepro@lightfalse\sourcecodepro@extralightfalse}
-\DeclareOptionX{scale} {\renewcommand*{\sourcecodepro@scale}{#1}}
-\DeclareOptionX{scaled} {\renewcommand*{\sourcecodepro@scale}{#1}}
+\DeclareOptionX{scale} {\renewcommand*{\SourceCodePro@scale}{#1}}
+\DeclareOptionX{scaled} {\renewcommand*{\SourceCodePro@scale}{#1}}
\DeclareOptionX{default} {\sourcecodepro@defaulttrue}
\DeclareOptionX{ttdefault} {\sourcecodepro@ttdefaulttrue}
\DeclareOptionX{nottdefault} {\sourcecodepro@ttdefaultfalse}
@@ -65,30 +65,30 @@
% Oldstyle/Lining
\ifsourcecodepro@oldstyle
- \edef\sourcecodepro@figurestyle{OldStyle}
+ \def\sourcecodepro@figurestyle{OldStyle}
\else
- \edef\sourcecodepro@figurestyle{}
+ \def\sourcecodepro@figurestyle{}
\fi
% Black/Semibold/Bold
\ifsourcecodepro@black
- \edef\sourcecodepro@boldstyle{Black}
+ \def\sourcecodepro@boldstyle{Black}
\else
\ifsourcecodepro@semibold
- \edef\sourcecodepro@boldstyle{Semibold}
+ \def\sourcecodepro@boldstyle{Semibold}
\else
- \edef\sourcecodepro@boldstyle{Bold}
+ \def\sourcecodepro@boldstyle{Bold}
\fi
\fi
% Light/ExtraLight/Regular
\ifsourcecodepro@light
- \edef\sourcecodepro@regstyle{Light}
+ \def\sourcecodepro@regstyle{Light}
\else
\ifsourcecodepro@extralight
- \edef\sourcecodepro@regstyle{ExtraLight}
+ \def\sourcecodepro@regstyle{ExtraLight}
\else
- \edef\sourcecodepro@regstyle{Regular}
+ \def\sourcecodepro@regstyle{Regular}
\fi
\fi
@@ -96,7 +96,7 @@
\defaultfontfeatures{
Ligatures = TeX ,
Numbers = \sourcecodepro@figurestyle ,
- Scale = \sourcecodepro@scale ,
+ Scale = \SourceCodePro@scale ,
Extension = .otf }
% Monospace font
@@ -149,33 +149,34 @@
% Load type1 font.
\else
\RequirePackage[OT1,LY1,T1]{fontenc}
+ \RequirePackage{mweights}
% Oldstyle/Lining
\ifsourcecodepro@oldstyle
- \edef\sourcecodepro@figurestyle{OsF}
+ \def\sourcecodepro@figurestyle{OsF}
\else
- \edef\sourcecodepro@figurestyle{LF}
+ \def\sourcecodepro@figurestyle{LF}
\fi
% Black/Semibold/Bold
\ifsourcecodepro@black
- \renewcommand*{\bfdefault}{k}
+ \def\bfseries@sf{k}
\else
\ifsourcecodepro@semibold
- \renewcommand*{\bfdefault}{sb}
+ \def\bfseries@sf{sb}
\else
- \renewcommand*{\bfdefault}{b}
+ \def\bfseries@sf{b}
\fi
\fi
% Light/ExtraLight/Regular
\ifsourcecodepro@light
- \renewcommand*{\mddefault}{l}
+ \def\bfseries@sf{l}
\else
\ifsourcecodepro@extralight
- \renewcommand*{\mddefault}{el}
+ \def\bfseries@sf{el}
\else
- \renewcommand*{\mddefault}{m}
+ \def\bfseries@sf{m}
\fi
\fi