texlive[43347] Master/texmf-dist: montserrat (27feb17)
commits+karl at tug.org
commits+karl at tug.org
Mon Feb 27 23:34:31 CET 2017
Revision: 43347
http://tug.org/svn/texlive?view=revision&revision=43347
Author: karl
Date: 2017-02-27 23:34:30 +0100 (Mon, 27 Feb 2017)
Log Message:
-----------
montserrat (27feb17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/fonts/montserrat/README
trunk/Master/texmf-dist/doc/fonts/montserrat/montserrat-doc.pdf
trunk/Master/texmf-dist/doc/fonts/montserrat/montserrat-doc.tex
trunk/Master/texmf-dist/tex/latex/montserrat/montserrat.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/tex/latex/montserrat/MontserratAlternates.sty
Modified: trunk/Master/texmf-dist/doc/fonts/montserrat/README
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/montserrat/README 2017-02-27 08:52:35 UTC (rev 43346)
+++ trunk/Master/texmf-dist/doc/fonts/montserrat/README 2017-02-27 22:34:30 UTC (rev 43347)
@@ -19,8 +19,10 @@
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
Modified: trunk/Master/texmf-dist/doc/fonts/montserrat/montserrat-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/fonts/montserrat/montserrat-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/montserrat/montserrat-doc.tex 2017-02-27 08:52:35 UTC (rev 43346)
+++ trunk/Master/texmf-dist/doc/fonts/montserrat/montserrat-doc.tex 2017-02-27 22:34:30 UTC (rev 43347)
@@ -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}
Deleted: trunk/Master/texmf-dist/tex/latex/montserrat/MontserratAlternates.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/montserrat/MontserratAlternates.sty 2017-02-27 08:52:35 UTC (rev 43346)
+++ trunk/Master/texmf-dist/tex/latex/montserrat/MontserratAlternates.sty 2017-02-27 22:34:30 UTC (rev 43347)
@@ -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 at naming@exception{figures}{{superior}{proportional}}{Sup}
- \fa at naming@exception{figures}{{superior}{tabular}}{Sup}
- \def\sufigures{\@nomath\sufigures
- \fontfigurestyle{superior}\selectfont}
- \DeclareTextFontCommand{\textsu}{\sufigures}
- \let\textsuperior\textsu
-
- \fa at naming@exception{figures}{{inferior}{proportional}}{Inf}
- \fa at naming@exception{figures}{{inferior}{tabular}}{Inf}
- \def\infigures{\@nomath\infigures
- \fontfigurestyle{inferior}\selectfont}
- \DeclareTextFontCommand{\textin}{\infigures}
- \let\textinferior\textin
-
- \fa at naming@exception{figures}{{numerators}{proportional}}{Numr}
- \fa at naming@exception{figures}{{numerators}{tabular}}{Numr}
-
- \fa at naming@exception{figures}{{denominators}{proportional}}{Dnom}
- \fa at naming@exception{figures}{{denominators}{tabular}}{Dnom}
-
-}{}
-
-\IfFileExists{xkeyval.sty}{
- \newcommand*{\MontserratAlternates at scale}{1}
- \RequirePackage{xkeyval}
- \DeclareOptionX{scale}{\renewcommand*{\MontserratAlternates at scale}{##1}}
- \DeclareOptionX{scaled}{\renewcommand*{\MontserratAlternates at scale}{##1}}
-}{
- \let\DeclareOptionX\DeclareOption
- \let\ExecuteOptionsX\ExecuteOptions
- \let\ProcessOptionsX\ProcessOptions
-}
-
-\DeclareOptionX{lining}{\edef\MontserratAlternates at figurestyle{LF}}
-\DeclareOptionX{oldstyle}{\edef\MontserratAlternates at figurestyle{OsF}}
-\DeclareOptionX{tabular}{\edef\MontserratAlternates at figurealign{T}}
-\DeclareOptionX{proportional}{\edef\MontserratAlternates at figurealign{}}
-\DeclareOptionX{black}{\edef\bfseries at sf{k}}
-\DeclareOptionX{extrabold}{\edef\bfseries at sf{eb}}
-\DeclareOptionX{semibold}{\edef\bfseries at sf{sb}}
-\DeclareOptionX{bold}{\edef\bfseries at sf{b}}
-\DeclareOptionX{light}{\edef\mdseries at sf{l}}
-\DeclareOptionX{medium}{\edef\mdseries at sf{mb}}
-\DeclareOptionX{regular}{\edef\mdseries at sf{m}}
-\ExecuteOptionsX{oldstyle,proportional,bold,regular}
-\ProcessOptionsX\relax
-
-\renewcommand*
- {\sfdefault}
- {MontserratAlternates-\MontserratAlternates at figurealign\MontserratAlternates at figurestyle}
-\renewcommand*{\familydefault}{\sfdefault}
-
-\endinput
Modified: trunk/Master/texmf-dist/tex/latex/montserrat/montserrat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/montserrat/montserrat.sty 2017-02-27 08:52:35 UTC (rev 43346)
+++ trunk/Master/texmf-dist/tex/latex/montserrat/montserrat.sty 2017-02-27 22:34:30 UTC (rev 43347)
@@ -1,8 +1,11 @@
%%
\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}
\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
@@ -27,34 +30,54 @@
\fa at naming@exception{figures}{{denominators}{proportional}}{Dnom}
\fa at 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 at scale}{1}
\DeclareOptionX{scale}{\renewcommand*{\Montserrat at scale}{#1}}
\DeclareOptionX{scaled}{\renewcommand*{\Montserrat at scale}{#1}}
\newif\ifMontserrat at famdef
-\def\Montserrat at alt{}
+\def\Montserrat at alt{}\newif\ifMontserrat at alt
\DeclareOptionX{lining}{\edef\Montserrat at figurestyle{LF}}
\DeclareOptionX{oldstyle}{\edef\Montserrat at figurestyle{OsF}}
\DeclareOptionX{tabular}{\edef\Montserrat at figurealign{T}}
\DeclareOptionX{proportional}{\edef\Montserrat at figurealign{}}
+\DeclareOptionX{thin}{\edef\mdseries at sf{t}}
\DeclareOptionX{black}{\edef\bfseries at sf{k}}
\DeclareOptionX{extrabold}{\edef\bfseries at sf{eb}}
\DeclareOptionX{semibold}{\edef\bfseries at sf{sb}}
\DeclareOptionX{bold}{\edef\bfseries at sf{b}}
+\DeclareOptionX{extralight}{\edef\mdseries at sf{el}}
\DeclareOptionX{light}{\edef\mdseries at sf{l}}
\DeclareOptionX{medium}{\edef\mdseries at sf{mb}}
\DeclareOptionX{regular}{\edef\mdseries at sf{m}}
-\DeclareOptionX{alternates}{\edef\Montserrat at alt{Alternates}}
+\DeclareOptionX{alternates}{\edef\Montserrat at alt{Alternates}\Montserrat at alttrue}
\DeclareOptionX{defaultfam}{\Montserrat at famdeftrue}
-\ExecuteOptionsX{oldstyle,proportional,bold,regular}
+\ExecuteOptionsX{lining,proportional,bold,regular}
\ProcessOptionsX\relax
-
+\ifMontserrat at alt
+ \edef\Montserrat at other{Montserrat-\Montserrat at figurealign\Montserrat at figurestyle}
+\else
+ \edef\Montserrat at other{MontserratAlternates-\Montserrat at figurealign\Montserrat at figurestyle}
+\fi
+\def\montserratalt{\fontfamily{\Montserrat at other}\selectfont }
\renewcommand*{\sfdefault}%
{Montserrat\Montserrat at alt-\Montserrat at figurealign\Montserrat at figurestyle}
-\ifMontserrat at famdef\renewcommand*{\familydefault}{\sfdefault}\fi
+\ifMontserrat at famdef%
+ \renewcommand*{\familydefault}{\sfdefault}
+ \edef\mdseries at rm{\mdseries at sf}
+ \edef\bfseries at rm{\bfseries at sf}
+ \let\mddefault\mdseries at rm
+ \rmfamily
+\fi
\endinput
More information about the tex-live-commits
mailing list