From b63aa636b82853ca4885c1e90c619cdbcfa72730 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 6 Sep 2021 03:02:24 +0000 Subject: CTAN sync 202109060302 --- fonts/noto/latex/noto-serif.sty | 164 +++++++++++++++++++++++++++++++++------- 1 file changed, 137 insertions(+), 27 deletions(-) (limited to 'fonts/noto/latex/noto-serif.sty') diff --git a/fonts/noto/latex/noto-serif.sty b/fonts/noto/latex/noto-serif.sty index 343982d1c0..cc4116be8f 100644 --- a/fonts/noto/latex/noto-serif.sty +++ b/fonts/noto/latex/noto-serif.sty @@ -1,16 +1,16 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{noto-serif} - [2019/10/22 (Bob Tennent) Supports NotoSerif fonts for all LaTeX engines.] + [2021/09/04 (Bob Tennent) Supports NotoSerif fonts for all LaTeX engines.] \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp} -\newif\ifnotoserif@otf +\newif\ifnotoserif@ttf \ifxetex - \notoserif@otftrue + \notoserif@ttftrue \else\ifluatex - \notoserif@otftrue + \notoserif@ttftrue \else % [pdf]LaTeX - \notoserif@otffalse + \notoserif@ttffalse \fi\fi \newcommand*{\NotoSerif@scale}{1} @@ -18,7 +18,7 @@ \DeclareOptionX{scaled}{\renewcommand*{\NotoSerif@scale}{#1}} \DeclareOptionX{scale}{\renewcommand*{\NotoSerif@scale}{#1}} -\DeclareOptionX{type1}{\notoserif@otffalse} +\DeclareOptionX{type1}{\notoserif@ttffalse} \newif\ifnotoserif@oldstyle \notoserif@oldstylefalse \newif\ifnotoserif@proportional \notoserif@proportionalfalse @@ -40,6 +40,10 @@ \newif\ifnotoserif@extrabold \notoserif@extraboldfalse \newif\ifnotoserif@black \notoserif@blackfalse +\newif\ifnotoserif@condensed \notoserif@condensedfalse +\newif\ifnotoserif@semicondensed \notoserif@semicondensedfalse +\newif\ifnotoserif@extracondensed \notoserif@extracondensedfalse + \DeclareOptionX{thin}{\notoserif@thintrue} \DeclareOptionX{extralight}{\notoserif@extralighttrue} \DeclareOptionX{light}{\notoserif@lighttrue} @@ -49,10 +53,13 @@ \DeclareOptionX{extrabold}{\notoserif@extraboldtrue} \DeclareOptionX{black}{\notoserif@blacktrue} \DeclareOptionX{bold}{\notoserif@blackfalse\notoserif@semiboldfalse\notoserif@extraboldfalse} +\DeclareOptionX{condensed}{\notoserif@condensedtrue} +\DeclareOptionX{semicondensed}{\notoserif@semicondensedtrue} +\DeclareOptionX{extracondensed}{\notoserif@extracondensedtrue} \ProcessOptionsX\relax -\ifnotoserif@otf +\ifnotoserif@ttf \def\notoserif@boldstyle{Bold} \ifnotoserif@semibold\def\notoserif@boldstyle{SemiBold}\fi \ifnotoserif@extrabold\def\notoserif@boldstyle{ExtraBold}\fi @@ -64,6 +71,7 @@ \ifnotoserif@medium\def\notoserif@regstyle{Medium}\fi \else % type1 + \def\seriesdefault{\mdseries@rm} \def\bfseries@rm{b} @@ -76,24 +84,54 @@ \ifnotoserif@light\def\mdseries@rm{l}\fi \ifnotoserif@medium\def\mdseries@rm{medium}\fi + \ifnotoserif@condensed + \def\bfseries@rm{bc}\def\mdseries@rm{c} + \ifnotoserif@semibold\def\bfseries@rm{sbc}\fi + \ifnotoserif@extrabold\def\bfseries@rm{ebc}\fi + \ifnotoserif@black\def\bfseries@rm{ubc}\fi + \ifnotoserif@thin\def\mdseries@rm{ulc}\fi + \ifnotoserif@extralight\def\mdseries@rm{elc}\fi + \ifnotoserif@light\def\mdseries@rm{lc}\fi + \ifnotoserif@medium\def\mdseries@rm{mediumcondensed}\fi + \else\ifnotoserif@semicondensed + \def\bfseries@rm{bsc}\def\mdseries@rm{sc} + \ifnotoserif@semibold\def\bfseries@rm{sbsc}\fi + \ifnotoserif@extrabold\def\bfseries@rm{ebsc}\fi + \ifnotoserif@black\def\bfseries@rm{ubsc}\fi + \ifnotoserif@thin\def\mdseries@rm{ulsc}\fi + \ifnotoserif@extralight\def\mdseries@rm{elsc}\fi + \ifnotoserif@light\def\mdseries@rm{lsc}\fi + \ifnotoserif@medium\def\mdseries@rm{mediumsemicondensed}\fi + \else\ifnotoserif@extracondensed + \def\bfseries@rm{bec}\def\mdseries@rm{ec} + \ifnotoserif@semibold\def\bfseries@rm{sbec}\fi + \ifnotoserif@extrabold\def\bfseries@rm{ebec}\fi + \ifnotoserif@black\def\bfseries@rm{ubec}\fi + \ifnotoserif@thin\def\mdseries@rm{ulec}\fi + \ifnotoserif@extralight\def\mdseries@rm{elec}\fi + \ifnotoserif@light\def\mdseries@rm{lec}\fi + \ifnotoserif@medium\def\mdseries@rm{mediumsemicondensed}\fi + \fi\fi\fi + \fi -\ifnotoserif@otf +\ifnotoserif@ttf \def\notoserif@figurestyle{Lining} \ifnotoserif@oldstyle\def\notoserif@figurestyle{OldStyle}\fi \def\notoserif@figurealign{Monospaced} \ifnotoserif@proportional\def\notoserif@figurealign{Proportional}\fi -\fi -% type1 +\else % type1 - \def\notoserif@tonefigurestyle{LF} - \ifnotoserif@oldstyle\def\notoserif@tonefigurestyle{OsF}\fi - \def\notoserif@tonefigurealign{T} - \ifnotoserif@proportional\def\notoserif@tonefigurealign{}\fi + \def\notoserif@figurestyle{LF} + \ifnotoserif@oldstyle\def\notoserif@figurestyle{OsF}\fi + \def\notoserif@figurealign{T} + \ifnotoserif@proportional\def\notoserif@figurealign{}\fi -\ifnotoserif@otf +\fi + +\ifnotoserif@ttf \RequirePackage{fontspec} \else \RequirePackage{fontenc,fontaxes,mweights} @@ -103,25 +141,58 @@ \fontfigurestyle{superior}\selectfont} \fi -\ifnotoserif@otf +\ifnotoserif@ttf \def\notoserif@regular{Regular} \ifxetex\XeTeXtracingfonts=1\fi \defaultfontfeatures{ Ligatures = TeX , Extension = .ttf } - \setmainfont + \ifnotoserif@condensed + \setmainfont + [ Scale = \NotoSerif@scale , + Numbers = {\notoserif@figurealign, \notoserif@figurestyle} , + SmallCapsFeatures={Letters=SmallCaps} , + UprightFont = *\ifx\notoserif@regstyle\notoserif@regular\else\notoserif@regstyle\fi , + ItalicFont = *\ifx\notoserif@regstyle\notoserif@regular Italic\else\notoserif@regstyle Italic\fi , + BoldFont = *\notoserif@boldstyle , + BoldItalicFont = *\notoserif@boldstyle Italic , + ] + {NotoSerif-Condensed} + \else\ifnotoserif@semicondensed + \setmainfont [ 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 , + UprightFont = *\ifx\notoserif@regstyle\notoserif@regular\else\notoserif@regstyle\fi , + ItalicFont = *\ifx\notoserif@regstyle\notoserif@regular Italic\else\notoserif@regstyle Italic\fi , + BoldFont = *\notoserif@boldstyle , + BoldItalicFont = *\notoserif@boldstyle Italic , ] - {NotoSerif} + {NotoSerif-SemiCondensed} + \else\ifnotoserif@extracondensed + \setmainfont + [ Numbers = {\notoserif@figurealign, \notoserif@figurestyle} , + SmallCapsFeatures={Letters=SmallCaps} , + UprightFont = *\ifx\notoserif@regstyle\notoserif@regular\else\notoserif@regstyle\fi , + ItalicFont = *\ifx\notoserif@regstyle\notoserif@regular Italic\else\notoserif@regstyle Italic\fi , + BoldFont = *\notoserif@boldstyle , + BoldItalicFont = *\notoserif@boldstyle Italic , + ] + {NotoSerif-ExtraCondensed} + \else + \setmainfont + [ 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} + \fi\fi\fi + \def\notoserif@Lining{Lining} \newfontfamily\notoserif - [ Scale = \NotoSerif@scale , - Numbers = {\notoserif@figurealign, \notoserif@figurestyle} , + [ Numbers = {\notoserif@figurealign, \notoserif@figurestyle} , SmallCapsFeatures={Letters=SmallCaps} , UprightFont = *-\notoserif@regstyle , ItalicFont = *-\ifx\notoserif@regstyle\notoserif@regular Italic\else\notoserif@regstyle Italic\fi , @@ -129,19 +200,58 @@ BoldItalicFont = *-\notoserif@boldstyle Italic , ] {NotoSerif} + \newfontfamily\notoserifcondensed + [ Numbers = {\notoserif@figurealign, \notoserif@figurestyle} , + SmallCapsFeatures={Letters=SmallCaps} , + UprightFont = *\ifx\notoserif@regstyle\notoserif@regular\else\notoserif@regstyle\fi , + ItalicFont = *\ifx\notoserif@regstyle\notoserif@regular Italic\else\notoserif@regstyle Italic\fi , + BoldFont = *\notoserif@boldstyle , + BoldItalicFont = *\notoserif@boldstyle Italic , + ] + {NotoSerif-Condensed} + \newfontfamily\notoserifsemicondensed + [ Numbers = {\notoserif@figurealign, \notoserif@figurestyle} , + SmallCapsFeatures={Letters=SmallCaps} , + UprightFont = *\ifx\notoserif@regstyle\notoserif@regular\else\notoserif@regstyle\fi , + ItalicFont = *\ifx\notoserif@regstyle\notoserif@regular Italic\else\notoserif@regstyle Italic\fi , + BoldFont = *\notoserif@boldstyle , + BoldItalicFont = *\notoserif@boldstyle Italic , + ] + {NotoSerif-SemiCondensed} + \newfontfamily\notoserifextracondensed + [ Numbers = {\notoserif@figurealign, \notoserif@figurestyle} , + SmallCapsFeatures={Letters=SmallCaps} , + UprightFont = *\ifx\notoserif@regstyle\notoserif@regular\else\notoserif@regstyle\fi , + ItalicFont = *\ifx\notoserif@regstyle\notoserif@regular Italic\else\notoserif@regstyle Italic\fi , + BoldFont = *\notoserif@boldstyle , + BoldItalicFont = *\notoserif@boldstyle Italic , + ] + {NotoSerif-ExtraCondensed} + \providecommand\sufigures{\addfontfeatures{VerticalPosition=Superior}} \else % type1 - \def\notoseriffamily{NotoSerif-\notoserif@tonefigurealign\notoserif@tonefigurestyle} + \def\notoseriffamily{NotoSerif-\notoserif@figurealign\notoserif@figurestyle} \newcommand*\notoserif{\fontfamily{\notoseriffamily}\selectfont} + \newcommand*\notoserifcondensed{\fontfamily{\notoseriffamily}\fontseries{c}\selectfont} + \newcommand*\notoserifsemicondensed{\fontfamily{\notoseriffamily}\fontseries{sc}\selectfont} + \newcommand*\notoserifextracondensed{\fontfamily{\notoseriffamily}\fontseries{ec}\selectfont} + \def\rmdefault{\notoseriffamily} \fi \DeclareTextFontCommand{\textsu}{\sufigures} -\newcommand*\notoseriflgr{\fontencoding{LGR}\fontfamily{NotoSerif-\notoserif@tonefigurealign\notoserif@tonefigurestyle}\selectfont} + +% LGR + +\def\notoserif@figurestyle{LF} +\ifnotoserif@oldstyle\def\notoserif@figurestyle{OsF}\fi +\def\notoserif@figurealign{T} +\ifnotoserif@proportional\def\notoserif@figurealign{}\fi +\newcommand*\notoseriflgr{\fontencoding{LGR}\fontfamily{NotoSerif-\notoserif@figurealign\notoserif@figurestyle}\selectfont} -\ifnotoserif@otf +\ifnotoserif@ttf % turn off defaults in case other fonts are selected: \defaultfontfeatures{} \fi -- cgit v1.2.3