From 05b77f5f5173540aa52f68ee3679d1aa64109001 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 27 May 2013 01:06:15 +0000 Subject: sourcecodepro 5/25 git-svn-id: svn://tug.org/texlive/trunk@30691 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/sourcecodepro/README | 9 +++-- .../sourcecodepro/sourcecodepro-otf-specimen.pdf | Bin 20065 -> 19031 bytes .../sourcecodepro/sourcecodepro-otf-specimen.tex | 2 +- .../sourcecodepro/sourcecodepro-type1-specimen.pdf | Bin 20884 -> 20883 bytes .../doc/latex/sourcecodepro/sourcecodepro.pdf | Bin 67475 -> 66590 bytes .../doc/latex/sourcecodepro/sourcecodepro.tex | 15 +++++--- .../fonts/enc/dvips/sourcecodepro/a_aoc6c2.enc | 9 ++--- .../fonts/enc/dvips/sourcecodepro/a_djdyjq.enc | 9 ++--- .../fonts/enc/dvips/sourcecodepro/a_jvslvy.enc | 9 ++--- .../fonts/enc/dvips/sourcecodepro/a_ktd5xr.enc | 9 ++--- .../fonts/enc/dvips/sourcecodepro/a_mqb3sg.enc | 9 ++--- .../fonts/enc/dvips/sourcecodepro/a_retzg2.enc | 9 ++--- .../fonts/enc/dvips/sourcecodepro/a_xftsmg.enc | 9 ++--- .../latex/sourcecodepro/LY1SourceCodePro-OsF.fd | 4 +- .../latex/sourcecodepro/LY1SourceCodePro-TLF.fd | 4 +- .../latex/sourcecodepro/LY1SourceCodePro-TOsF.fd | 4 +- .../latex/sourcecodepro/OT1SourceCodePro-OsF.fd | 4 +- .../latex/sourcecodepro/OT1SourceCodePro-TLF.fd | 4 +- .../latex/sourcecodepro/OT1SourceCodePro-TOsF.fd | 4 +- .../tex/latex/sourcecodepro/T1SourceCodePro-OsF.fd | 4 +- .../tex/latex/sourcecodepro/T1SourceCodePro-TLF.fd | 4 +- .../latex/sourcecodepro/T1SourceCodePro-TOsF.fd | 4 +- .../latex/sourcecodepro/TS1SourceCodePro-OsF.fd | 4 +- .../latex/sourcecodepro/TS1SourceCodePro-TLF.fd | 4 +- .../latex/sourcecodepro/TS1SourceCodePro-TOsF.fd | 4 +- .../sourcecodepro/sourcecodepro-type1-autoinst.sty | 8 ++-- .../tex/latex/sourcecodepro/sourcecodepro.sty | 41 ++++++++++++--------- 27 files changed, 89 insertions(+), 97 deletions(-) diff --git a/Master/texmf-dist/doc/latex/sourcecodepro/README b/Master/texmf-dist/doc/latex/sourcecodepro/README index 923ae099177..8b9ce17248c 100644 --- a/Master/texmf-dist/doc/latex/sourcecodepro/README +++ b/Master/texmf-dist/doc/latex/sourcecodepro/README @@ -1,7 +1,7 @@ -Source Code Pro v2.0 +Source Code Pro v2.1 ==================== -This package provides the Source Sans Pro typeface as a LaTeX package. -Full documentation and revision history in `sourcesanspro.pdf`. +This package provides the Source Code Pro typeface as a LaTeX package. +Full documentation and revision history in `sourcecodepro.pdf`. Options ------- @@ -16,7 +16,8 @@ The following options can be used: * `extralight`: `\mdseries` is extra light. * `regular`: `\mdseries` is regular. * `scale, scaled`: set scaling for the font, eg: scale=.5 -* `default`: Source Sans Pro is set as default font family. +* `default`: Source Code Pro is set as default font family. +* `nottdefault`: Source Code Pro is not set as monospaced family. * `type1, t1`: override detection and load the Type1 font family. * `opentype, otf`: override detection and load the OpenType font family. diff --git a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.pdf b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.pdf index a153658cb51..61e2a8d0c15 100644 Binary files a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.pdf and b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.pdf differ diff --git a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.tex b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.tex index acd149f74ec..9850febc1ff 100644 --- a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.tex +++ b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.tex @@ -1,6 +1,6 @@ \documentclass[11pt,a4paper]{article} \usepackage{array} -\usepackage[default,otf]{sourcecodepro} +\usepackage[default,opentype]{sourcecodepro} \usepackage[margin=0mm,paperheight=25mm,paperwidth=170mm]{geometry} \newcommand*\spA{abcde} diff --git a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.pdf b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.pdf index 264fe7eb1ef..b639c49a54d 100644 Binary files a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.pdf and b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.pdf differ diff --git a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro.pdf b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro.pdf index a849628ffb9..2d43baaee0b 100644 Binary files a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro.pdf and b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro.pdf differ diff --git a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro.tex b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro.tex index 39e22e653a1..b151bec21de 100644 --- a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro.tex +++ b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro.tex @@ -2,8 +2,6 @@ \usepackage{geometry,hologo,hyperref,babel,mdwlist,array,multicol} \usepackage[default,osf]{sourcesanspro} \usepackage[scaled=.95]{sourcecodepro} -%\show\oldstylenums -%\RenewDocumentCommand\oldstylenums{m}{{\addfontfeature{Numbers=OldStyle} #1}} \hypersetup{ colorlinks, citecolor=blue, @@ -17,8 +15,8 @@ \Huge sourcecodepro\\ \Large Adobe's Source Code Pro typeface for \LaTeX } -\author{Silke Hofstra, \href{mailto:silke@slxh.nl}{silke@slxh.nl}} -\date{Documentation for sourcecodepro v2.0.\\ \today} +\author{Silke Hofstra, \href{mailto:tex@slxh.nl}{tex@slxh.nl}} +\date{Documentation for sourcecodepro v2.1.\\ \today} \begin{document} \maketitle @@ -37,7 +35,8 @@ The package has the following options: \item \textbf{extralight}: \texttt{\textbackslash mdseries} is extra light. \item \textbf{regular}: \texttt{\textbackslash mdseries} is regular. \item \textbf{scale, scaled}: Change the scaling with a factor. For example: \texttt{scale=.5} - \item \textbf{default}: Source Code Pro is set as the default font family and as the sans serif family. + \item \textbf{default}: Source Code Pro is set as the default font family and as the monotype family. + \item \textbf{nottdefault}: Source Code Pro is not set as monospaced family. \item \textbf{type1, t1}: Override automatic detection and use the Type 1 fonts. \item \textbf{opentype, otf}: Override automatic detection and use OpenType fonts. \end{itemize*} @@ -94,6 +93,12 @@ 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.1} +\begin{itemize*} + \item Added \texttt{nottdefault} option. + \item Fixed issue in which font was set as default sans-serif family instead of the default monospaced family. +\end{itemize*} + \subsection*{2.0} \begin{itemize*} \item Merged all \texttt{.sty} files into \texttt{sourcecodepro.sty}. diff --git a/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_aoc6c2.enc b/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_aoc6c2.enc index 149bd9078a3..47cd35480bc 100644 --- a/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_aoc6c2.enc +++ b/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_aoc6c2.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_aoc6c2yfiywrypxazkbjbuobhb -% Encoding created by otftotfm on Thu Jan 17 11:51:09 2013 +% Encoding created by otftotfm on Sun May 26 14:51:16 2013 % Command line follows encoding /AutoEnc_aoc6c2yfiywrypxazkbjbuobhb [ %00 @@ -56,13 +56,10 @@ % Command line: 'otftotfm --automatic --encoding=fontools_ot1 % --tfm-directory=fonts/tfm/adobe/sourcecodepro % --vf-directory=fonts/vf/adobe/sourcecodepro -% --pl-directory=fonts/pl/adobe/sourcecodepro -% --vpl-directory=fonts/vpl/adobe/sourcecodepro % --type1-directory=fonts/type1/adobe/sourcecodepro % --truetype-directory=fonts/truetype/adobe/sourcecodepro -% --type42-directory=fonts/type42/adobe/sourcecodepro -% --encoding-directory=fonts/enc/dvips/adobe -% --map-file=fonts/map/dvips/adobe/SourceCodePro.map --no-updmap +% --encoding-directory=fonts/enc/dvips/sourcecodepro +% --map-file=fonts/map/dvips/sourcecodepro/SourceCodePro.map --no-updmap % --coding-scheme=TEX TEXT --ligkern=f i =: fi --ligkern=f l =: fl % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl % fonts/opentype/adobe/sourcecodepro/SourceCodePro-Black.otf diff --git a/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_djdyjq.enc b/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_djdyjq.enc index 8bb196d9701..a5c1a261799 100644 --- a/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_djdyjq.enc +++ b/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_djdyjq.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_djdyjqcylsdnrqxziltltabatd -% Encoding created by otftotfm on Thu Jan 17 11:51:11 2013 +% Encoding created by otftotfm on Sun May 26 14:51:27 2013 % Command line follows encoding /AutoEnc_djdyjqcylsdnrqxziltltabatd [ %00 @@ -56,13 +56,10 @@ % Command line: 'otftotfm --automatic --encoding=fontools_ot1 % --tfm-directory=fonts/tfm/adobe/sourcecodepro % --vf-directory=fonts/vf/adobe/sourcecodepro -% --pl-directory=fonts/pl/adobe/sourcecodepro -% --vpl-directory=fonts/vpl/adobe/sourcecodepro % --type1-directory=fonts/type1/adobe/sourcecodepro % --truetype-directory=fonts/truetype/adobe/sourcecodepro -% --type42-directory=fonts/type42/adobe/sourcecodepro -% --encoding-directory=fonts/enc/dvips/adobe -% --map-file=fonts/map/dvips/adobe/SourceCodePro.map --no-updmap +% --encoding-directory=fonts/enc/dvips/sourcecodepro +% --map-file=fonts/map/dvips/sourcecodepro/SourceCodePro.map --no-updmap % --coding-scheme=TEX TEXT --feature=onum --ligkern=f i =: fi --ligkern=f l % =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl % fonts/opentype/adobe/sourcecodepro/SourceCodePro-Black.otf diff --git a/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_jvslvy.enc b/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_jvslvy.enc index 4862d2ea2b0..61be56e8a90 100644 --- a/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_jvslvy.enc +++ b/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_jvslvy.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_jvslvyb4t4nmlsg27a55bw6bee -% Encoding created by otftotfm on Thu Jan 17 11:51:10 2013 +% Encoding created by otftotfm on Sun May 26 14:51:26 2013 % Command line follows encoding /AutoEnc_jvslvyb4t4nmlsg27a55bw6bee [ %00 @@ -56,13 +56,10 @@ % Command line: 'otftotfm --automatic --encoding=fontools_ly1 % --tfm-directory=fonts/tfm/adobe/sourcecodepro % --vf-directory=fonts/vf/adobe/sourcecodepro -% --pl-directory=fonts/pl/adobe/sourcecodepro -% --vpl-directory=fonts/vpl/adobe/sourcecodepro % --type1-directory=fonts/type1/adobe/sourcecodepro % --truetype-directory=fonts/truetype/adobe/sourcecodepro -% --type42-directory=fonts/type42/adobe/sourcecodepro -% --encoding-directory=fonts/enc/dvips/adobe -% --map-file=fonts/map/dvips/adobe/SourceCodePro.map --no-updmap +% --encoding-directory=fonts/enc/dvips/sourcecodepro +% --map-file=fonts/map/dvips/sourcecodepro/SourceCodePro.map --no-updmap % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --ligkern=f i =: fi % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff % l =: ffl fonts/opentype/adobe/sourcecodepro/SourceCodePro-Black.otf diff --git a/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_ktd5xr.enc b/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_ktd5xr.enc index 4c217134c08..5c0eed52951 100644 --- a/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_ktd5xr.enc +++ b/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_ktd5xr.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_ktd5xroqdghu3kyuvxydiwrgqe -% Encoding created by otftotfm on Thu Jan 17 11:51:11 2013 +% Encoding created by otftotfm on Sun May 26 14:51:26 2013 % Command line follows encoding /AutoEnc_ktd5xroqdghu3kyuvxydiwrgqe [ %00 @@ -56,13 +56,10 @@ % Command line: 'otftotfm --automatic --encoding=fontools_ts1 % --tfm-directory=fonts/tfm/adobe/sourcecodepro % --vf-directory=fonts/vf/adobe/sourcecodepro -% --pl-directory=fonts/pl/adobe/sourcecodepro -% --vpl-directory=fonts/vpl/adobe/sourcecodepro % --type1-directory=fonts/type1/adobe/sourcecodepro % --truetype-directory=fonts/truetype/adobe/sourcecodepro -% --type42-directory=fonts/type42/adobe/sourcecodepro -% --encoding-directory=fonts/enc/dvips/adobe -% --map-file=fonts/map/dvips/adobe/SourceCodePro.map --no-updmap +% --encoding-directory=fonts/enc/dvips/sourcecodepro +% --map-file=fonts/map/dvips/sourcecodepro/SourceCodePro.map --no-updmap % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i % =: ffi --ligkern=ff l =: ffl diff --git a/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_mqb3sg.enc b/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_mqb3sg.enc index da41fef8b91..e77915f6d55 100644 --- a/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_mqb3sg.enc +++ b/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_mqb3sg.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_mqb3sgpydkp3qa23byr2yunmsg -% Encoding created by otftotfm on Thu Jan 17 11:51:10 2013 +% Encoding created by otftotfm on Sun May 26 14:51:23 2013 % Command line follows encoding /AutoEnc_mqb3sgpydkp3qa23byr2yunmsg [ %00 @@ -56,13 +56,10 @@ % Command line: 'otftotfm --automatic --encoding=fontools_t1 % --tfm-directory=fonts/tfm/adobe/sourcecodepro % --vf-directory=fonts/vf/adobe/sourcecodepro -% --pl-directory=fonts/pl/adobe/sourcecodepro -% --vpl-directory=fonts/vpl/adobe/sourcecodepro % --type1-directory=fonts/type1/adobe/sourcecodepro % --truetype-directory=fonts/truetype/adobe/sourcecodepro -% --type42-directory=fonts/type42/adobe/sourcecodepro -% --encoding-directory=fonts/enc/dvips/adobe -% --map-file=fonts/map/dvips/adobe/SourceCodePro.map --no-updmap +% --encoding-directory=fonts/enc/dvips/sourcecodepro +% --map-file=fonts/map/dvips/sourcecodepro/SourceCodePro.map --no-updmap % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --ligkern=f i =: fi % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff % l =: ffl fonts/opentype/adobe/sourcecodepro/SourceCodePro-Black.otf diff --git a/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_retzg2.enc b/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_retzg2.enc index 91e1605fd82..3ca3bdefa7a 100644 --- a/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_retzg2.enc +++ b/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_retzg2.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_retzg2pzf6wxgbppyetfqltdvb -% Encoding created by otftotfm on Thu Jan 17 11:51:12 2013 +% Encoding created by otftotfm on Sun May 26 14:51:28 2013 % Command line follows encoding /AutoEnc_retzg2pzf6wxgbppyetfqltdvb [ %00 @@ -56,13 +56,10 @@ % Command line: 'otftotfm --automatic --encoding=fontools_ly1 % --tfm-directory=fonts/tfm/adobe/sourcecodepro % --vf-directory=fonts/vf/adobe/sourcecodepro -% --pl-directory=fonts/pl/adobe/sourcecodepro -% --vpl-directory=fonts/vpl/adobe/sourcecodepro % --type1-directory=fonts/type1/adobe/sourcecodepro % --truetype-directory=fonts/truetype/adobe/sourcecodepro -% --type42-directory=fonts/type42/adobe/sourcecodepro -% --encoding-directory=fonts/enc/dvips/adobe -% --map-file=fonts/map/dvips/adobe/SourceCodePro.map --no-updmap +% --encoding-directory=fonts/enc/dvips/sourcecodepro +% --map-file=fonts/map/dvips/sourcecodepro/SourceCodePro.map --no-updmap % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=onum --ligkern=f % i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi % --ligkern=ff l =: ffl diff --git a/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_xftsmg.enc b/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_xftsmg.enc index 2765b177d7f..41b49b8624c 100644 --- a/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_xftsmg.enc +++ b/Master/texmf-dist/fonts/enc/dvips/sourcecodepro/a_xftsmg.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_xftsmgpyad7jkqv5pqlqn73ggh -% Encoding created by otftotfm on Thu Jan 17 11:51:12 2013 +% Encoding created by otftotfm on Sun May 26 14:51:28 2013 % Command line follows encoding /AutoEnc_xftsmgpyad7jkqv5pqlqn73ggh [ %00 @@ -56,13 +56,10 @@ % Command line: 'otftotfm --automatic --encoding=fontools_t1 % --tfm-directory=fonts/tfm/adobe/sourcecodepro % --vf-directory=fonts/vf/adobe/sourcecodepro -% --pl-directory=fonts/pl/adobe/sourcecodepro -% --vpl-directory=fonts/vpl/adobe/sourcecodepro % --type1-directory=fonts/type1/adobe/sourcecodepro % --truetype-directory=fonts/truetype/adobe/sourcecodepro -% --type42-directory=fonts/type42/adobe/sourcecodepro -% --encoding-directory=fonts/enc/dvips/adobe -% --map-file=fonts/map/dvips/adobe/SourceCodePro.map --no-updmap +% --encoding-directory=fonts/enc/dvips/sourcecodepro +% --map-file=fonts/map/dvips/sourcecodepro/SourceCodePro.map --no-updmap % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=onum % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i % =: ffi --ligkern=ff l =: ffl 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 -- cgit v1.2.3