diff --git a/.gitignore b/.gitignore index 2c86d9d..8f5cb17 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ *.synctex.gz *.toc *.tds.zip +*.xdv diff --git a/README.md b/README.md index a9cceff..01c41b1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Source Code Pro v2.6 +Source Code Pro v2.7 ==================== This package provides the Source Code Pro typeface as a LaTeX package. Full documentation and revision history in `sourcecodepro.pdf`. diff --git a/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.pdf b/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.pdf index 89d3c38..e172a2f 100644 Binary files a/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.pdf and b/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.pdf differ diff --git a/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.pdf b/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.pdf index 2633b0d..1bce28e 100644 Binary files a/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.pdf and b/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.pdf differ diff --git a/doc/latex/sourcecodepro/sourcecodepro.pdf b/doc/latex/sourcecodepro/sourcecodepro.pdf index ae647e6..6fd40d5 100644 Binary files a/doc/latex/sourcecodepro/sourcecodepro.pdf and b/doc/latex/sourcecodepro/sourcecodepro.pdf differ diff --git a/doc/latex/sourcecodepro/sourcecodepro.tex b/doc/latex/sourcecodepro/sourcecodepro.tex index 74907d5..b88b108 100644 --- a/doc/latex/sourcecodepro/sourcecodepro.tex +++ b/doc/latex/sourcecodepro/sourcecodepro.tex @@ -1,5 +1,5 @@ \documentclass[10pt,a4paper,english]{article} -\usepackage{geometry,hologo,hyperref,babel,mdwlist,array,multicol} +\usepackage{geometry,hologo,hyperref,babel,mdwlist,array,multicol,graphicx} \usepackage[default,osf]{sourcesanspro} \usepackage[scaled=.95]{sourcecodepro} \hypersetup{ @@ -16,7 +16,7 @@ \Large Adobe's Source Code Pro typeface for \LaTeX } \author{Silke Hofstra, \href{mailto:tex@slxh.nl}{tex@slxh.nl}} -\date{Documentation for sourcecodepro v2.6.\\ \today} +\date{Documentation for sourcecodepro v2.7.\\ \today} \begin{document} \maketitle @@ -65,30 +65,11 @@ \section{Specimen} \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-Medium.otf - \item SourceCodePro-MediumIt.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*} @@ -100,7 +81,9 @@ \section{Type1} \section{Version history} \subsection*{2.7} \begin{itemize*} - \item Make the ligatures configurable through the \texttt{ligatures} option. + \item Make the ligatures for the OpenType fonts configurable with the \texttt{ligatures} option. + \item Update the fonts to Roman v2.030 and Italic v1.050. + \item Generate fonts without f-ligatures. \end{itemize*} \subsection*{2.6} @@ -203,6 +186,7 @@ \section{Opentype features} cv14 & Character Variants 14 - typographic hyphen [-] \\ cv15 & Character Variants 15 - typographic asterisk [*] \\ cv16 & Character Variants 16 - slashed dollar sign [\$]\\ + cv17 & Character Variants 17 - alternate numeral one [1] \\ dnom & Denominators \\ frac & Fractions \\ mark & Mark Positioning \\ @@ -219,6 +203,7 @@ \section{Opentype features} ss04 & Stylistic Set 4 - serifed i \\ ss05 & Stylistic Set 5 - Sami \symbol{"014A}, cursive \symbol{"03C6} \\ ss06 & Stylistic Set 6 - slashed dollar sign [\$] \\ + ss07 & Stylistic Set 7 - alternate numeral one [1] \\ subs & Subscript \\ sups & Superscript \\ zero & Slashed Zero diff --git a/tex/latex/sourcecodepro/sourcecodepro.sty b/tex/latex/sourcecodepro/sourcecodepro.sty index 31e1cb2..cb8b1d0 100644 --- a/tex/latex/sourcecodepro/sourcecodepro.sty +++ b/tex/latex/sourcecodepro/sourcecodepro.sty @@ -8,7 +8,7 @@ % Licenced under the LPPL v1.3 or higher. % \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{sourcecodepro}[2015/10/09 v2.6 Adobe's Source Code Pro typeface] +\ProvidesPackage{sourcecodepro}[2018/01/13 v2.7 Adobe's Source Code Pro typeface] \RequirePackage{ifxetex,ifluatex,xkeyval} @@ -66,17 +66,17 @@ % Load OpenType files \ifsourcecodepro@otf \RequirePackage{fontspec} - + % Create a fixed liningnums command: \renewcommand*\liningnums[1]{{\addfontfeature{RawFeature=+lnum;-onum}#1}} - + % Oldstyle/Lining \ifsourcecodepro@oldstyle \def\sourcecodepro@figurestyle{OldStyle} \else \def\sourcecodepro@figurestyle{} \fi - + % Black/Semibold/Bold \ifsourcecodepro@black \def\sourcecodepro@boldstyle{Black} @@ -87,7 +87,7 @@ \def\sourcecodepro@boldstyle{Bold} \fi \fi - + % Light/ExtraLight/Regular/Medium \ifsourcecodepro@light \def\sourcecodepro@regstyle{Light} @@ -102,41 +102,41 @@ \fi \fi \fi - + % Shared features \defaultfontfeatures{ Ligatures = \sourcecodepro@ligatures , Numbers = \sourcecodepro@figurestyle , Scale = \SourceCodePro@scale , Extension = .otf } - + % Monospace font \ifsourcecodepro@ttdefault \setmonofont [ UprightFont = *-\sourcecodepro@regstyle , ItalicFont = *-\sourcecodepro@regstyle It , - BoldFont = *-\sourcecodepro@boldstyle , + BoldFont = *-\sourcecodepro@boldstyle , BoldItalicFont = *-\sourcecodepro@boldstyle It ] {SourceCodePro} \fi - + % Font families % Regular/Bold \newfontfamily\sourcecodepro [ UprightFont = *-Regular , ItalicFont = *-RegularIt , - BoldFont = *-Bold , + BoldFont = *-Bold , BoldItalicFont = *-BoldIt ] {SourceCodePro} - + % Medium/Bold \newfontfamily\sourcecodepromedium [ UprightFont = *-Medium , ItalicFont = *-MediumIt , - BoldFont = *-Bold , + BoldFont = *-Bold , BoldItalicFont = *-BoldIt ] {SourceCodePro} - + % Light/Semibold \newfontfamily\sourcecodeprolight [ UprightFont = *-Light , @@ -144,7 +144,7 @@ BoldFont = *-Semibold , BoldItalicFont = *-SemiboldIt ] {SourceCodePro} - + % ExtraLight/Black \newfontfamily\sourcecodeproextreme [ UprightFont = *-ExtraLight , @@ -152,16 +152,16 @@ BoldFont = *-Black , BoldItalicFont = *-BlackIt ] {SourceCodePro} - + % Lining figures \newfontfamily\sourcecodeprolf [ Numbers = , UprightFont = *-\sourcecodepro@regstyle , ItalicFont = *-\sourcecodepro@regstyle It , - BoldFont = *-\sourcecodepro@boldstyle , + BoldFont = *-\sourcecodepro@boldstyle , BoldItalicFont = *-\sourcecodepro@boldstyle It ] {SourceCodePro} - + % Dont keep all default font features \defaultfontfeatures{} @@ -176,7 +176,7 @@ \else \def\sourcecodepro@figurestyle{LF} \fi - + % Black/Semibold/Bold \ifsourcecodepro@black \def\bfseries@tt{k} @@ -187,7 +187,7 @@ \def\bfseries@tt{b} \fi \fi - + % Light/ExtraLight/Regular/Medium \ifsourcecodepro@light \def\mdseries@tt{l} @@ -207,8 +207,8 @@ \ifsourcecodepro@ttdefault \edef\ttdefault{SourceCodePro-T\sourcecodepro@figurestyle} \fi - - % If source code 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 \let\nativeoldstylenums\oldstylenums \renewcommand*\oldstylenums[1]{%