summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/noto/noto-serif.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-05-19 21:08:29 +0000
committerKarl Berry <karl@freefriends.org>2019-05-19 21:08:29 +0000
commitfde837e1c6b239ad573936340f59c8efb0fdc193 (patch)
treef1e85b6450bf2a57f9eb445448addbe5398f33c8 /Master/texmf-dist/tex/latex/noto/noto-serif.sty
parent5aecfcf893f8d1d3d65d27fc45656384d723e867 (diff)
noto (19may19)
git-svn-id: svn://tug.org/texlive/trunk@51162 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/noto/noto-serif.sty')
-rw-r--r--Master/texmf-dist/tex/latex/noto/noto-serif.sty70
1 files changed, 36 insertions, 34 deletions
diff --git a/Master/texmf-dist/tex/latex/noto/noto-serif.sty b/Master/texmf-dist/tex/latex/noto/noto-serif.sty
index b0bc533d990..b1f4db3e736 100644
--- a/Master/texmf-dist/tex/latex/noto/noto-serif.sty
+++ b/Master/texmf-dist/tex/latex/noto/noto-serif.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{noto-serif}
- [2019/04/22 (Bob Tennent) Supports NotoSerif fonts for all LaTeX engines.]
+ [2019/05/18 (Bob Tennent) Supports NotoSerif fonts for all LaTeX engines.]
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
@@ -14,14 +14,12 @@
\fi\fi
\newcommand*{\NotoSerif@scale}{1}
+\newcommand*{\NotoSerifMono@scale}{1}
\DeclareOptionX{scaled}{\renewcommand*{\NotoSerif@scale}{#1}}
\DeclareOptionX{scale}{\renewcommand*{\NotoSerif@scale}{#1}}
-
-\DeclareOptionX{sfdefault}{}
\DeclareOptionX{type1}{\notoserif@otffalse}
-
\newif\ifnotoserif@oldstyle \notoserif@oldstylefalse
\newif\ifnotoserif@proportional \notoserif@proportionalfalse
@@ -52,7 +50,6 @@
\DeclareOptionX{black}{\notoserif@blacktrue}
\DeclareOptionX{bold}{\notoserif@blackfalse\notoserif@semiboldfalse\notoserif@extraboldfalse}
-
\ProcessOptionsX\relax
\ifnotoserif@otf
@@ -67,7 +64,9 @@
\ifnotoserif@medium\def\notoserif@regstyle{Medium}\fi
\else % type1
- \def\bfseries@rm{bold}
+ \def\seriesdefault{\mdseries@rm}
+
+ \def\bfseries@rm{bold}\def\mdseries@rm{regular}
\ifnotoserif@semibold\def\bfseries@rm{semibold}\fi
\ifnotoserif@extrabold\def\bfseries@rm{extrabold}\fi
\ifnotoserif@black\def\bfseries@rm{black}\fi
@@ -75,9 +74,8 @@
\ifnotoserif@thin\def\mdseries@rm{thin}\fi
\ifnotoserif@extralight\def\mdseries@rm{extralight}\fi
\ifnotoserif@light\def\mdseries@rm{light}\fi
- \ifnotoserif@medium\def\mdseries@rm{medium}\fi
- \def\seriesdefault{\mdseries@rm}
-
+ \ifnotoserif@medium\ifnotoserif@rm\def\mdseries@rm{medium}\fi
+
\fi
\ifnotoserif@otf
@@ -87,14 +85,13 @@
\def\notoserif@figurealign{Monospaced}
\ifnotoserif@proportional\def\notoserif@figurealign{Proportional}\fi
-\else % type1
-
- \def\notoserif@figurestyle{LF}
- \ifnotoserif@oldstyle\def\notoserif@figurestyle{OsF}\fi
- \def\notoserif@figurealign{T}
- \ifnotoserif@proportional\def\notoserif@figurealign{}\fi
-
\fi
+% type1
+
+ \def\notoserif@tonefigurestyle{LF}
+ \ifnotoserif@oldstyle\def\notoserif@tonefigurestyle{OsF}\fi
+ \def\notoserif@tonefigurealign{T}
+ \ifnotoserif@proportional\def\notoserif@tonefigurealign{}\fi
\ifnotoserif@otf
\RequirePackage{fontspec}
@@ -104,8 +101,6 @@
\fa@naming@exception{figures}{{superior}{tabular}}{Sup}
\def\sufigures{\@nomath\sufigures
\fontfigurestyle{superior}\selectfont}
- \DeclareTextFontCommand{\textsu}{\sufigures}
- \let\textsuperior\textsu
\fi
\ifnotoserif@otf
@@ -113,31 +108,38 @@
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
- Scale = \NotoSerif@scale ,
- Extension = .otf }
+ Extension = .ttf }
\setmainfont
- [ UprightFont = *-\notoserif@regstyle ,
- ItalicFont = *-\ifx\notoserif@regstyle\notoserif@regular
- Italic
- \else\notoserif@regstyle Italic\fi ,
+ [ Numbers = {\notoserif@figurealign, \notoserif@figurestyle} ,
+ SmallCapsFeatures={Letters=SmallCaps} ,
+ UprightFont = *-\notoserif@regstyle ,
+ ItalicFont = *-\ifx\notoserif@regstyle\notoserif@regular Italic\else\notoserif@regstyle Italic\fi ,
BoldFont = *-\notoserif@boldstyle ,
- BoldItalicFont = *-\notoserif@boldstyle Italic ]
+ BoldItalicFont = *-\notoserif@boldstyle Italic ,
+ ]
{NotoSerif}
+ \def\notoserif@Lining{Lining}
\newfontfamily\notoserif
- [ UprightFont = *-\notoserif@regstyle ,
- ItalicFont = *-\ifx\notoserif@regstyle\notoserif@regular
- Italic
- \else\notoserif@regstyle Italic\fi ,
- BoldFont = *-\notoserif@boldstyle ,
- BoldItalicFont = *-\notoserif@boldstyle Italic ]
- {NotoSerif}
+ [ Scale = \NotoSerif@scale ,
+ Numbers = {\notoserif@figurealign, \notoserif@figurestyle} ,
+ SmallCapsFeatures={Letters=SmallCaps} ,
+ UprightFont = *-\notoserif@regstyle ,
+ ItalicFont = *-\ifx\notoserif@regstyle\notoserif@regular Italic\else\notoserif@regstyle Italic\fi ,
+ BoldFont = *-\notoserif@boldstyle ,
+ BoldItalicFont = *-\notoserif@boldstyle Italic ,
+ ]
+ {NotoSerif}
+ \providecommand\sufigures{\addfontfeatures{VerticalPosition=Superior}}
+
\else % type1
- \def\notoseriffamily{NotoSerif-\notoserif@figurealign\notoserif@figurestyle}
+ \def\notoseriffamily{NotoSerif-\notoserif@tonefigurealign\notoserif@tonefigurestyle}
\newcommand*\notoserif{\fontfamily{\notoseriffamily}\selectfont}
\def\rmdefault{\notoseriffamily}
\fi
-\newcommand*\notoseriflgr{\fontencoding{LGR}\fontfamily{NotoSerif-TLF}\selectfont}
+\DeclareTextFontCommand{\textsu}{\sufigures}
+\newcommand*\notoseriflgr{\fontencoding{LGR}\fontfamily{NotoSerif-\notoserif@tonefigurealign\notoserif@tonefigurestyle}\selectfont}
+
\ifnotoserif@otf
% turn off defaults in case other fonts are selected: