sourcecodepro (18jan13)

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

7 files changed, 159 insertions, 87 deletions

diff --git a/Master/texmf-dist/doc/latex/sourcecodepro/README b/Master/texmf-dist/doc/latex/sourcecodepro/README
index bfbd99e0ccc..923ae099177 100644
--- a/Master/texmf-dist/doc/latex/sourcecodepro/README
+++ b/Master/texmf-dist/doc/latex/sourcecodepro/README
@@ -1,47 +1,28 @@
-Source Code Pro
-===============
-
-This package provides the Source Code Pro typeface as a LaTeX package.
-Full documentation in `SourceCodePro.pdf`.
-
-Packages
---------
-The following packages are provided:
-
-* sourcecodepro:  
-  Semi-package including one of the other packages based on the LaTeX engine.
-* sourcecodepro-otf:
-  Original fonts in OpenType format, only for XeLaTeX and LuaLaTeX users.
-* sourcecodepro-type1:
-  Converted `type1` version of the font.
+Source Code Pro v2.0
+====================
+This package provides the Source Sans Pro typeface as a LaTeX package.
+Full documentation and revision history in `sourcesanspro.pdf`.
 
 Options
 -------
-The following options are possible:
+The following options can be used:
 
 * `oldstyle, osf`: use old style numbers.
-* `lining, nf`:    use lining numbers (default).
+* `lining, nf`:    use lining numbers.
 * `black`:         `\bfseries` is black.
 * `semibold`:      `\bfseries` is semibold.
-* `bold`:          `\bfseries` is bold (default).
+* `bold`:          `\bfseries` is bold.
 * `light`:         `\mdseries` is light.
 * `extralight`:    `\mdseries` is extra light.
-* `regular`:       `\mdseries` is regular (default).
+* `regular`:       `\mdseries` is regular.
+* `scale, scaled`: set scaling for the font, eg: scale=.5
+* `default`:       Source Sans Pro is set as default font family.
+* `type1, t1`:     override detection and load the Type1 font family.
+* `opentype, otf`: override detection and load the OpenType font family.
 
 License
 -------
 Fonts are provided under the SIL Open Font License 1.1.
 LaTeX source is licensed under the LPPL.
 
-Enjoy!
-
-
-Revision History
-================
-
-1.02
-----
-* Removed `proportional` and `tabular` options.
-* Changed the order of `T1` and `LY1`.
-* Changed `lining`/`nf` behaviour.
-* Redefined `\oldstylenums`.
+Enjoy!
\ No newline at end of file
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 efab71adb98..a153658cb51 100644
--- a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.pdf
+++ b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.pdf
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 ed1c9d619ad..acd149f74ec 100644
--- a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.tex
+++ b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.tex
@@ -1,8 +1,7 @@
-\documentclass[11pt,a4paper,english]{article}
-\usepackage[margin=0mm,paperheight=25mm,paperwidth=145mm]{geometry}
-\usepackage{babel,array}
-\usepackage[default]{sourcecodepro-otf}
-
+\documentclass[11pt,a4paper]{article}
+\usepackage{array}
+\usepackage[default,otf]{sourcecodepro}
+\usepackage[margin=0mm,paperheight=25mm,paperwidth=170mm]{geometry}
 
 \newcommand*\spA{abcde}
 \newcommand*\spB{01469}
@@ -11,13 +10,13 @@
 \begin{document}
 \centering
 \begin{tabular}{
-	l
-	>{\sourcecodeproextreme}c
-	>{\sourcecodeprolight}c
-	>{\sourcecodepro}c
-	>{\sourcecodeprolight\bfseries}c
-	>{\sourcecodepro\bfseries}c
-	>{\sourcecodeproextreme\bfseries}c}
+		>{\sourcecodepro}l
+		>{\sourcecodeproextreme}c
+		>{\sourcecodeprolight}c
+		>{\sourcecodepro}c
+		>{\sourcecodeprolight\bfseries}c
+		>{\sourcecodepro\bfseries}c
+		>{\sourcecodeproextreme\bfseries}c }
 	& ExtraLight & Light & Regular & Semibold & Bold & Black \\
 	normal               \spr
 %	italic               \spr[\itshape\spA]
@@ -27,7 +26,7 @@
 %	lining italic        \spr[\itshape\spB]
 %	lining small-caps    \spr[\scshape\spB]
 	old-style            \spr[\oldstylenums{\spB}]
-%	old-style italic     \spr[\oldstylenums{\itshape \spB}]
+%	old-style italic     \spr[\oldstylenums{\itshape\spB}]
 %	old-style small-caps \spr[\oldstylenums{\scshape\spB}]
 \end{tabular}
 \end{document}
\ No newline at end of file
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 2b0b276c368..264fe7eb1ef 100644
--- a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.pdf
+++ b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.pdf
diff --git a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.tex b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.tex
index be328a2878e..0a1e6c047d7 100644
--- a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.tex
+++ b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.tex
@@ -1,7 +1,8 @@
-\documentclass[11pt,a4paper,english]{article}
-\usepackage{babel,array}
-\usepackage[margin=0mm,paperheight=25mm,paperwidth=150mm]{geometry}
-\usepackage[default]{sourcecodepro-type1}
+\documentclass[11pt,a4paper]{article}
+\usepackage{array}
+\usepackage[default,type1]{sourcecodepro}
+\usepackage[T1]{fontenc}
+\usepackage[margin=0mm,paperheight=25mm,paperwidth=170mm]{geometry}
 
 \newcommand*\spA{abcde}
 \newcommand*\spB{01469}
@@ -26,7 +27,7 @@
 %	lining italic        \spr[\itshape\spB]
 %	lining small-caps    \spr[\scshape\spB]
 	old-style            \spr[\oldstylenums{\spB}]
-%	old-style italic     \spr[\oldstylenums{\itshape \spB}]
+%	old-style italic     \spr[\oldstylenums{\itshape\spB}]
 %	old-style small-caps \spr[\oldstylenums{\scshape\spB}]
 \end{tabular}
 \end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro.pdf b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro.pdf
index 647f05cebea..a849628ffb9 100644
--- a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro.pdf
+++ b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro.pdf
diff --git a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro.tex b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro.tex
index 84710486f9a..39e22e653a1 100644
--- a/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro.tex
+++ b/Master/texmf-dist/doc/latex/sourcecodepro/sourcecodepro.tex
@@ -1,7 +1,9 @@
 \documentclass[11pt,a4paper,english]{article}
-\usepackage{sourcecodepro}
-\usepackage[default]{sourcesanspro-otf}
-\usepackage{geometry,dtklogos,hyperref,babel,mdwlist,multicol}
+\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,
@@ -11,59 +13,116 @@
 }
 \newcommand*\file[1]{\href{run:#1.pdf}{#1}}
 
-\title{\Huge \bfseries sourcecodepro\\ \Large Adobe's Source Code Pro typeface for \LaTeX}
+\title{\bfseries
+	\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}
 
 \begin{document}
 \maketitle
-
 \begin{multicols}{2}
-
-This package provides the Source Code Pro font in an easy to use way. For \XeLaTeX\ and \LuaLaTeX\ users the original OpenType fonts are used. The entire font family is included. It can also be downloaded from \href{https://github.com/adobe/source-code-pro}{Github}.
-
-\section{Packages}
-The packages that can be used are:
-\begin{itemize*}
-	\item \textbf{sourcecodepro}:\\
-		Loads either \texttt{sourcecodepro-otf} or \texttt{sourcecodepro-type1} depending on your engine.
-	\item \textbf{sourcecodepro-otf}:\\
-		Loads the original fonts (only for \XeLaTeX\ and \LuaLaTeX\ users).
-	\item \textbf{sourcecodepro-type1}:\\
-		Loads generated Type1 fonts.
-\end{itemize*}
+This package provides the Source Code Pro font in an easy to use way. For \hologo{XeLaTeX} and \hologo{LuaLaTeX} users the original OpenType fonts are used. The entire font family is included. It can also be downloaded from \href{https://github.com/adobe/source-code-pro}{Github}.
 
 \section{Options}
-The packages have the following options:
+The package has the following options:
 \begin{itemize*}
-	\item \textbf{oldstyle, osf}: use old style numbers.
-	\item \textbf{lining, nf}: use lining numbers.
-	\item \textbf{black}: \texttt{\textbackslash bfseries} is black.
-	\item \textbf{semibold}: \texttt{\textbackslash bfseries} is semibold.
-	\item \textbf{bold}: \texttt{\textbackslash bfseries} is bold.
-	\item \textbf{light}: \texttt{\textbackslash mdseries} is light.
-	\item \textbf{extralight}: \texttt{\textbackslash mdseries} is extra light.
-	\item \textbf{regular}: \texttt{\textbackslash mdseries} is regular.
-	\item \textbf{scaled}: Scaling factor, eg: \texttt{scaled=.5}
-	\item \textbf{default}: Font family is default.
+	\item \textbf{oldstyle, osf}:  use old style numbers.
+	\item \textbf{lining, nf, lf}: use lining numbers.
+	\item \textbf{black}:          \texttt{\textbackslash bfseries} is black.
+	\item \textbf{semibold}:       \texttt{\textbackslash bfseries} is semibold.
+	\item \textbf{bold}:           \texttt{\textbackslash bfseries} is bold.
+	\item \textbf{light}:          \texttt{\textbackslash mdseries} is light.
+	\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{type1, t1}:      Override automatic detection and use the Type 1 fonts.
+	\item \textbf{opentype, otf}:  Override automatic detection and use OpenType fonts.
 \end{itemize*}
-The following options are enabled by default: \texttt{lining, bold, regular}.
+The following options are enabled by default: lining, proportional, bold and regular.
 
 \section{Commands}
-Commands for all variants are also provided in the \texttt{sourcecodepro-otf} package:
+Commands for all weights are also provided for \hologo{XeTeX} and \hologo{LuaTeX} users.
 \begin{itemize*}
-	\item \texttt{\bfseries \textbackslash sourcecodepro} -- the regular and bold variants.
-	\item \texttt{\bfseries \textbackslash sourcecodeprolight} -- the light and semibold variants.
-	\item \texttt{\bfseries \textbackslash sourcecodeproextreme} -- the extra light and black variants.
+	\item \texttt{\bfseries \textbackslash sourcecodepro}
+		-- the regular and bold weights.
+	\item \texttt{\bfseries \textbackslash sourcecodeprolight}
+		-- the light and semibold weights.
+	\item \texttt{\bfseries \textbackslash sourcecodeproextreme}
+		-- the extra light and black weights.
 \end{itemize*}
 
 \section{Licence}
-Adobe's Source Code Pro typeface is available under the \href{http://scripts.sil.org/OFL}{SIL Open Font License 1.1}.
+Adobe's Source Code Pro typeface is available under the \href{http://scripts.sil.org/OFL}{SIL Open Font License 1.1}.\\
+All \LaTeX\ code is available under the \href{http://www.latex-project.org/lppl/}{\LaTeX\ project public license} v1.3 or later.
 
 \section{Specimen}
-Simple specimen follow. Full specimen can be \href{http://store1.adobe.com/type/browser/pdfs/1960.pdf}{acquired from Adobe}.
+Simple specimen can be found on page \pageref{sec:specimen}. Full specimen can be \href{http://store1.adobe.com/type/browser/pdfs/1960.pdf}{acquired from Adobe}. Please note that at the moment Source Code Pro doesn’t have italics or small-caps.
+
+\section{OpenType}
+The OpenType fonts have many features, including old style numerals (\texttt{\oldstylenums{1 6 9}})
+%, ligatures (\texttt{fi fl})
+and stylistic alternatives (\texttt{{\addfontfeature{Style=Alternate}a g}}).
+
+\subsection{Features}
+A complete list of available font features is available on page \pageref{sec:otfinfo}. More information on how to use font features can be found in the \href{http://mirror.ctan.org/macros/latex/contrib/fontspec/fontspec.pdf}{fontspec documentation}.
 
+\subsection{Files}
+\begin{itemize*}
+	\item SourceCodePro-ExtraLight.otf
+%	\item SourceCodePro-ExtraLightIt.otf
+	\item SourceCodePro-Light.otf
+%	\item SourceCodePro-LightIt.otf
+	\item SourceCodePro-Regular.otf
+%	\item SourceCodePro-RegularIt.otf
+	\item SourceCodePro-Semibold.otf
+%	\item SourceCodePro-SemiboldIt.otf
+	\item SourceCodePro-Bold.otf
+%	\item SourceCodePro-BoldIt.otf
+	\item SourceCodePro-Black.otf
+%	\item SourceCodePro-BlackIt.otf
+\end{itemize*}
+
+\section{Type1}
+The following Type1 font families are included:
+\begin{itemize*}
+	\item SourceCodePro-TLF
+	\item SourceCodePro-TOsF
+\end{itemize*}
+With series ‘el’, ‘l’, ‘m’, ‘sb’, ‘b’, ‘k’.% and shapes ‘n’, ‘i’ and ‘sc’.
+
+\section{Version history}
+\subsection*{2.0}
+\begin{itemize*}
+	\item Merged all \texttt{.sty} files into \texttt{sourcecodepro.sty}.
+	\item \texttt{default} option now sets the default font family to \texttt{Source Code Pro}, not \texttt{\textbackslash sfdefault}.
+	\item \texttt{type1}, \texttt{t1}, \texttt{opentype} and \texttt{otf} option added to override automatic detection.
+	\item Added \texttt{OT1} to \texttt{fontspec} options.
+	\item Updated fonts to 1.017.
+\end{itemize*}
+
+\subsection*{1.02}
+\begin{itemize*}
+	\item Removed \texttt{proportional} and \texttt{tabular} options.
+	\item Changed the order of \texttt{T1} and \texttt{LY1}.
+	\item Changed \texttt{lining}/\texttt{nf} behaviour.
+	\item Redefined \texttt{\textbackslash oldstylenums}.
+\end{itemize*}
+
+\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
 \end{multicols}
 
+\section{Specimen}
+At the moment Source Code Pro doesn’t have italics or small-caps.
+\label{sec:specimen}
 \subsection{OpenType}
 \begin{figure}[ht]
 	\centering
@@ -77,4 +136,36 @@ This table can also be found in \file{sourcecodepro-otf-specimen}.
 	\includegraphics{sourcecodepro-type1-specimen}
 \end{figure}
 This table can also be found in \file{sourcecodepro-type1-specimen}.
-\end{document}
\ No newline at end of file
+
+\newpage
+\section{Opentype features}
+\label{sec:otfinfo}
+
+\begin{figure}[ht]
+	\centering
+	\begin{tabular}{>{\ttfamily}l l}
+		aalt & Access All Alternates \\
+		case & Case-Sensitive Forms \\
+		ccmp & Glyph Composition/Decomposition \\
+		dnom & Denominators \\
+		frac & Fractions \\
+		mark & Mark Positioning \\
+		mkmk & Mark to Mark Positioning \\
+		numr & Numerators \\
+		onum & Oldstyle Figures \\
+		ordn & Ordinals \\
+		salt & Stylistic Alternates \\
+		sinf & Scientific Inferiors \\
+		size & Optical Size \\
+%		ss01 & Stylistic Set 1 - alternate l \\
+		ss02 & Stylistic Set 2 - alternate a \\
+		ss03 & Stylistic Set 3 - alternate g \\
+%		ss04 & Stylistic Set 4 - alternate I \\
+		subs & Subscript \\
+		sups & Superscript	
+	\end{tabular}
+\end{figure}
+\textit{(list generated with otfinfo)}
+
+\end{document}
+