montserrat (27feb17)

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

5 files changed, 35 insertions, 75 deletions

diff --git a/Master/texmf-dist/doc/fonts/montserrat/README b/Master/texmf-dist/doc/fonts/montserrat/README
index 11a8aa55bc8..5a8971bb48c 100644
--- a/Master/texmf-dist/doc/fonts/montserrat/README
+++ b/Master/texmf-dist/doc/fonts/montserrat/README
@@ -19,8 +19,10 @@ Files provided "as is", with no warranties.
 
 The support files are provided in encodings OT1, T1, TS1 and LY1 for users of Western scripts.
 
-Current version: 1.0 2017-01-26
+Current version: 1.01 2017-02-26
 
+Changes in version 1.01
+Corrected a number of issues with montserat.sty.
 
 Please send comments and bug reports or suggestions for improvement to
 
diff --git a/Master/texmf-dist/doc/fonts/montserrat/montserrat-doc.pdf b/Master/texmf-dist/doc/fonts/montserrat/montserrat-doc.pdf
index 4a88c284fdf..548435554ae 100644
--- a/Master/texmf-dist/doc/fonts/montserrat/montserrat-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/montserrat/montserrat-doc.pdf
diff --git a/Master/texmf-dist/doc/fonts/montserrat/montserrat-doc.tex b/Master/texmf-dist/doc/fonts/montserrat/montserrat-doc.tex
index 80928b9714a..87d14bd023e 100644
--- a/Master/texmf-dist/doc/fonts/montserrat/montserrat-doc.tex
+++ b/Master/texmf-dist/doc/fonts/montserrat/montserrat-doc.tex
@@ -5,7 +5,7 @@
 \usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent
 \usepackage{graphicx}
 %\usepackage{amssymb}% don't use with newtxmath
-\pdfmapfile{+montserrat.map}
+%\pdfmapfile{+montserrat.map}
 %SetFonts
 % libertine+newtxmath
 \usepackage{newtxtext} % use sb in place of bold
@@ -19,7 +19,6 @@
 \useosf % use oldstyle figures except in math
 \usepackage[cal=boondoxo]{mathalfa}% less slanted than STIX cal
 %SetFonts
-%\let\rmdefault\sfdefault
 \usepackage{booktabs}
 \title{The Montserrat Font Package}
 \author{Michael Sharpe}
diff --git a/Master/texmf-dist/tex/latex/montserrat/MontserratAlternates.sty b/Master/texmf-dist/tex/latex/montserrat/MontserratAlternates.sty
deleted file mode 100644
index 85db90e53ee..00000000000
--- a/Master/texmf-dist/tex/latex/montserrat/MontserratAlternates.sty
+++ /dev/null
@@ -1,64 +0,0 @@
-%% Generated by autoinst on 2017/01/25
-%%
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{MontserratAlternates}
-    [2017/01/25 (autoinst)  Style file for MontserratAlternates.]
-
-\RequirePackage[LY1,T1]{fontenc}
-\RequirePackage{textcomp}
-\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
-\IfFileExists{fontaxes.sty}{
-    \RequirePackage{fontaxes}
-    \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
-    \fa@naming@exception{figures}{{superior}{tabular}}{Sup}
-    \def\sufigures{\@nomath\sufigures
-        \fontfigurestyle{superior}\selectfont}
-    \DeclareTextFontCommand{\textsu}{\sufigures}
-    \let\textsuperior\textsu
-
-    \fa@naming@exception{figures}{{inferior}{proportional}}{Inf}
-    \fa@naming@exception{figures}{{inferior}{tabular}}{Inf}
-    \def\infigures{\@nomath\infigures
-        \fontfigurestyle{inferior}\selectfont}
-    \DeclareTextFontCommand{\textin}{\infigures}
-    \let\textinferior\textin
-
-    \fa@naming@exception{figures}{{numerators}{proportional}}{Numr}
-    \fa@naming@exception{figures}{{numerators}{tabular}}{Numr}
-
-    \fa@naming@exception{figures}{{denominators}{proportional}}{Dnom}
-    \fa@naming@exception{figures}{{denominators}{tabular}}{Dnom}
-
-}{}
-
-\IfFileExists{xkeyval.sty}{
-    \newcommand*{\MontserratAlternates@scale}{1}
-    \RequirePackage{xkeyval}
-    \DeclareOptionX{scale}{\renewcommand*{\MontserratAlternates@scale}{##1}}
-    \DeclareOptionX{scaled}{\renewcommand*{\MontserratAlternates@scale}{##1}}
-}{
-    \let\DeclareOptionX\DeclareOption
-    \let\ExecuteOptionsX\ExecuteOptions
-    \let\ProcessOptionsX\ProcessOptions
-}
-
-\DeclareOptionX{lining}{\edef\MontserratAlternates@figurestyle{LF}}
-\DeclareOptionX{oldstyle}{\edef\MontserratAlternates@figurestyle{OsF}}
-\DeclareOptionX{tabular}{\edef\MontserratAlternates@figurealign{T}}
-\DeclareOptionX{proportional}{\edef\MontserratAlternates@figurealign{}}
-\DeclareOptionX{black}{\edef\bfseries@sf{k}}
-\DeclareOptionX{extrabold}{\edef\bfseries@sf{eb}}
-\DeclareOptionX{semibold}{\edef\bfseries@sf{sb}}
-\DeclareOptionX{bold}{\edef\bfseries@sf{b}}
-\DeclareOptionX{light}{\edef\mdseries@sf{l}}
-\DeclareOptionX{medium}{\edef\mdseries@sf{mb}}
-\DeclareOptionX{regular}{\edef\mdseries@sf{m}}
-\ExecuteOptionsX{oldstyle,proportional,bold,regular}
-\ProcessOptionsX\relax
-
-\renewcommand*
-    {\sfdefault}
-    {MontserratAlternates-\MontserratAlternates@figurealign\MontserratAlternates@figurestyle}
-\renewcommand*{\familydefault}{\sfdefault}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/montserrat/montserrat.sty b/Master/texmf-dist/tex/latex/montserrat/montserrat.sty
index 6cb0228e406..c95ba88812f 100644
--- a/Master/texmf-dist/tex/latex/montserrat/montserrat.sty
+++ b/Master/texmf-dist/tex/latex/montserrat/montserrat.sty
@@ -1,7 +1,10 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{montserrat}
-    [2017/01/25 (msharpe)  Style file for Montserrat and Alternates.]
+\def\fileversion{1.01}
+\def\filedate{2017/02/26}
+\ProvidesPackage{montserrat}[\filedate\space v\fileversion]
+
+\message{`montserrat' v\fileversion, \filedate\space Style file for Montserrat and Alternates (msharpe)}
 
 \RequirePackage[LY1,T1]{fontenc}
 \RequirePackage{textcomp}
@@ -27,34 +30,54 @@
 
     \fa@naming@exception{figures}{{denominators}{proportional}}{Dnom}
     \fa@naming@exception{figures}{{denominators}{tabular}}{Dnom}
+    \def\defigures{\@nomath\defigures
+        \fontfigurestyle{denominators}\selectfont}
+    \DeclareTextFontCommand{\textde}{\defigures}
+    \let\textdenominators\textde
+    \def\nufigures{\@nomath\nufigures
+        \fontfigurestyle{numerators}\selectfont}
+    \DeclareTextFontCommand{\textnu}{\nufigures}
+    \let\textnumerators\textnu
 
 }{}
 
-\usepackage{trace}
 \RequirePackage{xkeyval}
 \newcommand*{\Montserrat@scale}{1}
 \DeclareOptionX{scale}{\renewcommand*{\Montserrat@scale}{#1}}
 \DeclareOptionX{scaled}{\renewcommand*{\Montserrat@scale}{#1}}
 \newif\ifMontserrat@famdef
-\def\Montserrat@alt{}
+\def\Montserrat@alt{}\newif\ifMontserrat@alt
 \DeclareOptionX{lining}{\edef\Montserrat@figurestyle{LF}}
 \DeclareOptionX{oldstyle}{\edef\Montserrat@figurestyle{OsF}}
 \DeclareOptionX{tabular}{\edef\Montserrat@figurealign{T}}
 \DeclareOptionX{proportional}{\edef\Montserrat@figurealign{}}
+\DeclareOptionX{thin}{\edef\mdseries@sf{t}}
 \DeclareOptionX{black}{\edef\bfseries@sf{k}}
 \DeclareOptionX{extrabold}{\edef\bfseries@sf{eb}}
 \DeclareOptionX{semibold}{\edef\bfseries@sf{sb}}
 \DeclareOptionX{bold}{\edef\bfseries@sf{b}}
+\DeclareOptionX{extralight}{\edef\mdseries@sf{el}}
 \DeclareOptionX{light}{\edef\mdseries@sf{l}}
 \DeclareOptionX{medium}{\edef\mdseries@sf{mb}}
 \DeclareOptionX{regular}{\edef\mdseries@sf{m}}
-\DeclareOptionX{alternates}{\edef\Montserrat@alt{Alternates}}
+\DeclareOptionX{alternates}{\edef\Montserrat@alt{Alternates}\Montserrat@alttrue}
 \DeclareOptionX{defaultfam}{\Montserrat@famdeftrue}
-\ExecuteOptionsX{oldstyle,proportional,bold,regular}
+\ExecuteOptionsX{lining,proportional,bold,regular}
 \ProcessOptionsX\relax
 
-
+\ifMontserrat@alt
+  \edef\Montserrat@other{Montserrat-\Montserrat@figurealign\Montserrat@figurestyle}
+\else
+  \edef\Montserrat@other{MontserratAlternates-\Montserrat@figurealign\Montserrat@figurestyle}
+\fi
+\def\montserratalt{\fontfamily{\Montserrat@other}\selectfont }
 \renewcommand*{\sfdefault}%
 {Montserrat\Montserrat@alt-\Montserrat@figurealign\Montserrat@figurestyle}
-\ifMontserrat@famdef\renewcommand*{\familydefault}{\sfdefault}\fi
+\ifMontserrat@famdef%
+  \renewcommand*{\familydefault}{\sfdefault}
+  \edef\mdseries@rm{\mdseries@sf}
+  \edef\bfseries@rm{\bfseries@sf}
+  \let\mddefault\mdseries@rm
+  \rmfamily
+\fi
 \endinput