CTAN sync 202109070303

1 files changed, 12 insertions, 111 deletions

diff --git a/fonts/noto/latex/noto-serif.sty b/fonts/noto/latex/noto-serif.sty
index cc4116be8f..c8c04b4c4c 100644
--- a/fonts/noto/latex/noto-serif.sty
+++ b/fonts/noto/latex/noto-serif.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{noto-serif}
-    [2021/09/04 (Bob Tennent)  Supports NotoSerif fonts for all LaTeX engines.]
+    [2021/09/06 (Bob Tennent)  Supports NotoSerif fonts for all LaTeX engines.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -40,10 +40,6 @@
 \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}
@@ -53,9 +49,6 @@
 \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
 
@@ -84,35 +77,6 @@
   \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@ttf
@@ -147,95 +111,32 @@
   \defaultfontfeatures{
         Ligatures = TeX ,
         Extension = .ttf }
-    \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    = *\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}
-    \else\ifnotoserif@extracondensed
-      \setmainfont
+    \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 ,
+          UprightFont    = *-\notoserif@regstyle ,
+          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
+        {NotoSerif}
 
   \def\notoserif@Lining{Lining}
   \newfontfamily\notoserif
-          [ 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}
-  \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  ,
+          UprightFont    = *-\notoserif@regstyle ,
+          ItalicFont     = *-\ifx\notoserif@regstyle\notoserif@regular Italic\else\notoserif@regstyle Italic\fi ,
+          BoldFont       = *-\notoserif@boldstyle , 
+          BoldItalicFont = *-\notoserif@boldstyle Italic ,
         ]
-        {NotoSerif-ExtraCondensed}
+        {NotoSerif}
 
   \providecommand\sufigures{\addfontfeatures{VerticalPosition=Superior}}
 
 \else % type1
   \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