noto (6sep21)

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

1 files changed, 223 insertions, 247 deletions

diff --git a/Master/texmf-dist/tex/latex/noto/T2CNotoSerif-OsF.fd b/Master/texmf-dist/tex/latex/noto/T2CNotoSerif-OsF.fd
index 2c5bbf41022..9cfcee74184 100644
--- a/Master/texmf-dist/tex/latex/noto/T2CNotoSerif-OsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/T2CNotoSerif-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/12/09
+%% Generated by autoinst on 2021/09/05
 %%
 \ProvidesFile{T2CNotoSerif-OsF.fd}
-    [2019/12/09 (autoinst)  Font definitions for T2C/NotoSerif-OsF.]
+    [2021/09/05 (autoinst)  Font definitions for T2C/NotoSerif-OsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,192 +20,156 @@
 \DeclareFontFamily{T2C}{NotoSerif-OsF}{}
 
 
-%   ----  regular  ----
+%   ----  eb = extrabold  ----
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{regular}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-osf-sc-t2c
-}{}
-
-\DeclareFontShape{T2C}{NotoSerif-OsF}{regular}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-osf-t2c
-}{}
-
-\DeclareFontShape{T2C}{NotoSerif-OsF}{regular}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-osf-t2c
-}{}
-
-\DeclareFontShape{T2C}{NotoSerif-OsF}{regular}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-osf-sc-t2c
-}{}
-
-\DeclareFontShape{T2C}{NotoSerif-OsF}{regular}{scsl}{
-      <-> ssub * NotoSerif-OsF/regular/scit
-}{}
-
-\DeclareFontShape{T2C}{NotoSerif-OsF}{regular}{sl}{
-      <-> ssub * NotoSerif-OsF/regular/it
-}{}
-
-
-%   ----  thin  ----
-
-\DeclareFontShape{T2C}{NotoSerif-OsF}{thin}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-osf-sc-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{eb}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{thin}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-osf-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{extrabold}{n}{
+      <-> alias * NotoSerif-OsF/eb/n
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{thin}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{eb}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-sc-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{thin}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-sc-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{extrabold}{sc}{
+      <-> alias * NotoSerif-OsF/eb/sc
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{thin}{scsl}{
-      <-> ssub * NotoSerif-OsF/thin/scit
+\DeclareFontShape{T2C}{NotoSerif-OsF}{eb}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{thin}{sl}{
-      <-> ssub * NotoSerif-OsF/thin/it
+\DeclareFontShape{T2C}{NotoSerif-OsF}{extrabold}{it}{
+      <-> alias * NotoSerif-OsF/eb/it
 }{}
 
-
-%   ----  semibold  ----
-
-\DeclareFontShape{T2C}{NotoSerif-OsF}{semibold}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-sc-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{eb}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-sc-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{semibold}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{extrabold}{scit}{
+      <-> alias * NotoSerif-OsF/eb/scit
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{semibold}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{eb}{sl}{
+    <-> ssub * NotoSerif-OsF/eb/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{semibold}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-sc-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{extrabold}{sl}{
+    <-> ssub * NotoSerif-OsF/extrabold/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{semibold}{scsl}{
-      <-> ssub * NotoSerif-OsF/semibold/scit
+\DeclareFontShape{T2C}{NotoSerif-OsF}{eb}{scsl}{
+    <-> ssub * NotoSerif-OsF/eb/scit
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{semibold}{sl}{
-      <-> ssub * NotoSerif-OsF/semibold/it
+\DeclareFontShape{T2C}{NotoSerif-OsF}{extrabold}{scsl}{
+    <-> ssub * NotoSerif-OsF/extrabold/scit
 }{}
 
 
-%   ----  bold  ----
+%   ----  el = extralight  ----
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{bold}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-osf-sc-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{el}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraLight-osf-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{bold}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-osf-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{extralight}{n}{
+      <-> alias * NotoSerif-OsF/el/n
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{bold}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{el}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraLight-osf-sc-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{bold}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-sc-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{extralight}{sc}{
+      <-> alias * NotoSerif-OsF/el/sc
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{bold}{scsl}{
-      <-> ssub * NotoSerif-OsF/bold/scit
+\DeclareFontShape{T2C}{NotoSerif-OsF}{el}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-osf-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{bold}{sl}{
-      <-> ssub * NotoSerif-OsF/bold/it
+\DeclareFontShape{T2C}{NotoSerif-OsF}{extralight}{it}{
+      <-> alias * NotoSerif-OsF/el/it
 }{}
 
-
-%   ----  light  ----
-
-\DeclareFontShape{T2C}{NotoSerif-OsF}{light}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Light-osf-sc-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{el}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-osf-sc-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{light}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Light-osf-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{extralight}{scit}{
+      <-> alias * NotoSerif-OsF/el/scit
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{light}{it}{
-      <-> \NotoSerif@@scale NotoSerif-LightItalic-osf-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{el}{sl}{
+    <-> ssub * NotoSerif-OsF/el/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{light}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-LightItalic-osf-sc-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{extralight}{sl}{
+    <-> ssub * NotoSerif-OsF/extralight/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{light}{scsl}{
-      <-> ssub * NotoSerif-OsF/light/scit
+\DeclareFontShape{T2C}{NotoSerif-OsF}{el}{scsl}{
+    <-> ssub * NotoSerif-OsF/el/scit
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{light}{sl}{
-      <-> ssub * NotoSerif-OsF/light/it
+\DeclareFontShape{T2C}{NotoSerif-OsF}{extralight}{scsl}{
+    <-> ssub * NotoSerif-OsF/extralight/scit
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  b = bold  ----
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{extrabold}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-sc-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{b}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-osf-sc-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{extrabold}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{bold}{sc}{
+      <-> alias * NotoSerif-OsF/b/sc
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{extrabold}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{b}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-sc-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{extrabold}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-sc-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{bold}{scit}{
+      <-> alias * NotoSerif-OsF/b/scit
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{extrabold}{scsl}{
-      <-> ssub * NotoSerif-OsF/extrabold/scit
+\DeclareFontShape{T2C}{NotoSerif-OsF}{b}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-osf-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{extrabold}{sl}{
-      <-> ssub * NotoSerif-OsF/extrabold/it
+\DeclareFontShape{T2C}{NotoSerif-OsF}{bold}{n}{
+      <-> alias * NotoSerif-OsF/b/n
 }{}
 
-
-%   ----  black  ----
-
-\DeclareFontShape{T2C}{NotoSerif-OsF}{black}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Black-osf-sc-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{b}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{black}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Black-osf-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{bold}{it}{
+      <-> alias * NotoSerif-OsF/b/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{black}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BlackItalic-osf-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{b}{sl}{
+    <-> ssub * NotoSerif-OsF/b/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{black}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-BlackItalic-osf-sc-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{bold}{sl}{
+    <-> ssub * NotoSerif-OsF/bold/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{black}{scsl}{
-      <-> ssub * NotoSerif-OsF/black/scit
+\DeclareFontShape{T2C}{NotoSerif-OsF}{b}{scsl}{
+    <-> ssub * NotoSerif-OsF/b/scit
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{black}{sl}{
-      <-> ssub * NotoSerif-OsF/black/it
+\DeclareFontShape{T2C}{NotoSerif-OsF}{bold}{scsl}{
+    <-> ssub * NotoSerif-OsF/bold/scit
 }{}
 
 
@@ -227,268 +191,272 @@
       <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-sc-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{medium}{scsl}{
-      <-> ssub * NotoSerif-OsF/medium/scit
+\DeclareFontShape{T2C}{NotoSerif-OsF}{medium}{sl}{
+    <-> ssub * NotoSerif-OsF/medium/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{medium}{sl}{
-      <-> ssub * NotoSerif-OsF/medium/it
+\DeclareFontShape{T2C}{NotoSerif-OsF}{medium}{scsl}{
+    <-> ssub * NotoSerif-OsF/medium/scit
 }{}
 
 
-%   ----  extralight  ----
+%   ----  l = light  ----
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{extralight}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraLight-osf-sc-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{l}{it}{
+      <-> \NotoSerif@@scale NotoSerif-LightItalic-osf-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{extralight}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraLight-osf-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{light}{it}{
+      <-> alias * NotoSerif-OsF/l/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{extralight}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-osf-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{l}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Light-osf-sc-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{extralight}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-osf-sc-t2c
+\DeclareFontShape{T2C}{NotoSerif-OsF}{light}{sc}{
+      <-> alias * NotoSerif-OsF/l/sc
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{extralight}{scsl}{
-      <-> ssub * NotoSerif-OsF/extralight/scit
+\DeclareFontShape{T2C}{NotoSerif-OsF}{l}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Light-osf-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{extralight}{sl}{
-      <-> ssub * NotoSerif-OsF/extralight/it
+\DeclareFontShape{T2C}{NotoSerif-OsF}{light}{n}{
+      <-> alias * NotoSerif-OsF/l/n
 }{}
 
-%
-%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-
-%   ul --> thin
-
-\DeclareFontShape{T2C}{NotoSerif-OsF}{ul}{sl}{
-      <-> alias * NotoSerif-OsF/thin/sl
+\DeclareFontShape{T2C}{NotoSerif-OsF}{l}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-LightItalic-osf-sc-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{ul}{scsl}{
-      <-> alias * NotoSerif-OsF/thin/scsl
+\DeclareFontShape{T2C}{NotoSerif-OsF}{light}{scit}{
+      <-> alias * NotoSerif-OsF/l/scit
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{ul}{sc}{
-      <-> alias * NotoSerif-OsF/thin/sc
+\DeclareFontShape{T2C}{NotoSerif-OsF}{l}{sl}{
+    <-> ssub * NotoSerif-OsF/l/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{ul}{n}{
-      <-> alias * NotoSerif-OsF/thin/n
+\DeclareFontShape{T2C}{NotoSerif-OsF}{light}{sl}{
+    <-> ssub * NotoSerif-OsF/light/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{ul}{it}{
-      <-> alias * NotoSerif-OsF/thin/it
+\DeclareFontShape{T2C}{NotoSerif-OsF}{l}{scsl}{
+    <-> ssub * NotoSerif-OsF/l/scit
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{ul}{scit}{
-      <-> alias * NotoSerif-OsF/thin/scit
+\DeclareFontShape{T2C}{NotoSerif-OsF}{light}{scsl}{
+    <-> ssub * NotoSerif-OsF/light/scit
 }{}
 
 
-%   el --> extralight
+%   ----  ub = black  ----
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{el}{sl}{
-      <-> alias * NotoSerif-OsF/extralight/sl
+\DeclareFontShape{T2C}{NotoSerif-OsF}{ub}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Black-osf-sc-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{el}{scsl}{
-      <-> alias * NotoSerif-OsF/extralight/scsl
+\DeclareFontShape{T2C}{NotoSerif-OsF}{black}{sc}{
+      <-> alias * NotoSerif-OsF/ub/sc
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{el}{sc}{
-      <-> alias * NotoSerif-OsF/extralight/sc
+\DeclareFontShape{T2C}{NotoSerif-OsF}{ub}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BlackItalic-osf-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{el}{n}{
-      <-> alias * NotoSerif-OsF/extralight/n
+\DeclareFontShape{T2C}{NotoSerif-OsF}{black}{it}{
+      <-> alias * NotoSerif-OsF/ub/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{el}{it}{
-      <-> alias * NotoSerif-OsF/extralight/it
+\DeclareFontShape{T2C}{NotoSerif-OsF}{ub}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Black-osf-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{el}{scit}{
-      <-> alias * NotoSerif-OsF/extralight/scit
+\DeclareFontShape{T2C}{NotoSerif-OsF}{black}{n}{
+      <-> alias * NotoSerif-OsF/ub/n
 }{}
 
-
-%   l --> light
-
-\DeclareFontShape{T2C}{NotoSerif-OsF}{l}{sl}{
-      <-> alias * NotoSerif-OsF/light/sl
+\DeclareFontShape{T2C}{NotoSerif-OsF}{ub}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-BlackItalic-osf-sc-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{l}{scsl}{
-      <-> alias * NotoSerif-OsF/light/scsl
+\DeclareFontShape{T2C}{NotoSerif-OsF}{black}{scit}{
+      <-> alias * NotoSerif-OsF/ub/scit
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{l}{sc}{
-      <-> alias * NotoSerif-OsF/light/sc
+\DeclareFontShape{T2C}{NotoSerif-OsF}{ub}{sl}{
+    <-> ssub * NotoSerif-OsF/ub/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{l}{n}{
-      <-> alias * NotoSerif-OsF/light/n
+\DeclareFontShape{T2C}{NotoSerif-OsF}{black}{sl}{
+    <-> ssub * NotoSerif-OsF/black/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{l}{it}{
-      <-> alias * NotoSerif-OsF/light/it
+\DeclareFontShape{T2C}{NotoSerif-OsF}{ub}{scsl}{
+    <-> ssub * NotoSerif-OsF/ub/scit
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{l}{scit}{
-      <-> alias * NotoSerif-OsF/light/scit
+\DeclareFontShape{T2C}{NotoSerif-OsF}{black}{scsl}{
+    <-> ssub * NotoSerif-OsF/black/scit
 }{}
 
 
-%   m --> regular
+%   ----  sb = semibold  ----
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{m}{sl}{
-      <-> alias * NotoSerif-OsF/regular/sl
+\DeclareFontShape{T2C}{NotoSerif-OsF}{sb}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{m}{scsl}{
-      <-> alias * NotoSerif-OsF/regular/scsl
+\DeclareFontShape{T2C}{NotoSerif-OsF}{semibold}{it}{
+      <-> alias * NotoSerif-OsF/sb/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{m}{sc}{
-      <-> alias * NotoSerif-OsF/regular/sc
+\DeclareFontShape{T2C}{NotoSerif-OsF}{sb}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-sc-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{m}{n}{
-      <-> alias * NotoSerif-OsF/regular/n
+\DeclareFontShape{T2C}{NotoSerif-OsF}{semibold}{sc}{
+      <-> alias * NotoSerif-OsF/sb/sc
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{m}{it}{
-      <-> alias * NotoSerif-OsF/regular/it
+\DeclareFontShape{T2C}{NotoSerif-OsF}{sb}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{m}{scit}{
-      <-> alias * NotoSerif-OsF/regular/scit
+\DeclareFontShape{T2C}{NotoSerif-OsF}{semibold}{n}{
+      <-> alias * NotoSerif-OsF/sb/n
 }{}
 
-
-%   sb --> semibold
-
-\DeclareFontShape{T2C}{NotoSerif-OsF}{sb}{sl}{
-      <-> alias * NotoSerif-OsF/semibold/sl
+\DeclareFontShape{T2C}{NotoSerif-OsF}{sb}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-sc-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{sb}{scsl}{
-      <-> alias * NotoSerif-OsF/semibold/scsl
+\DeclareFontShape{T2C}{NotoSerif-OsF}{semibold}{scit}{
+      <-> alias * NotoSerif-OsF/sb/scit
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{sb}{sc}{
-      <-> alias * NotoSerif-OsF/semibold/sc
+\DeclareFontShape{T2C}{NotoSerif-OsF}{sb}{sl}{
+    <-> ssub * NotoSerif-OsF/sb/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{sb}{n}{
-      <-> alias * NotoSerif-OsF/semibold/n
+\DeclareFontShape{T2C}{NotoSerif-OsF}{semibold}{sl}{
+    <-> ssub * NotoSerif-OsF/semibold/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{sb}{it}{
-      <-> alias * NotoSerif-OsF/semibold/it
+\DeclareFontShape{T2C}{NotoSerif-OsF}{sb}{scsl}{
+    <-> ssub * NotoSerif-OsF/sb/scit
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{sb}{scit}{
-      <-> alias * NotoSerif-OsF/semibold/scit
+\DeclareFontShape{T2C}{NotoSerif-OsF}{semibold}{scsl}{
+    <-> ssub * NotoSerif-OsF/semibold/scit
 }{}
 
 
-%   b --> bold
+%   ----  ul = thin  ----
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{b}{sl}{
-      <-> alias * NotoSerif-OsF/bold/sl
+\DeclareFontShape{T2C}{NotoSerif-OsF}{ul}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{b}{scsl}{
-      <-> alias * NotoSerif-OsF/bold/scsl
+\DeclareFontShape{T2C}{NotoSerif-OsF}{thin}{it}{
+      <-> alias * NotoSerif-OsF/ul/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{b}{sc}{
-      <-> alias * NotoSerif-OsF/bold/sc
+\DeclareFontShape{T2C}{NotoSerif-OsF}{ul}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-osf-sc-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{b}{n}{
-      <-> alias * NotoSerif-OsF/bold/n
+\DeclareFontShape{T2C}{NotoSerif-OsF}{thin}{sc}{
+      <-> alias * NotoSerif-OsF/ul/sc
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{b}{it}{
-      <-> alias * NotoSerif-OsF/bold/it
+\DeclareFontShape{T2C}{NotoSerif-OsF}{ul}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-osf-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{b}{scit}{
-      <-> alias * NotoSerif-OsF/bold/scit
+\DeclareFontShape{T2C}{NotoSerif-OsF}{thin}{n}{
+      <-> alias * NotoSerif-OsF/ul/n
 }{}
 
+\DeclareFontShape{T2C}{NotoSerif-OsF}{ul}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-sc-t2c
+}{}
 
-%   eb --> extrabold
+\DeclareFontShape{T2C}{NotoSerif-OsF}{thin}{scit}{
+      <-> alias * NotoSerif-OsF/ul/scit
+}{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{eb}{sl}{
-      <-> alias * NotoSerif-OsF/extrabold/sl
+\DeclareFontShape{T2C}{NotoSerif-OsF}{ul}{sl}{
+    <-> ssub * NotoSerif-OsF/ul/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{eb}{scsl}{
-      <-> alias * NotoSerif-OsF/extrabold/scsl
+\DeclareFontShape{T2C}{NotoSerif-OsF}{thin}{sl}{
+    <-> ssub * NotoSerif-OsF/thin/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{eb}{sc}{
-      <-> alias * NotoSerif-OsF/extrabold/sc
+\DeclareFontShape{T2C}{NotoSerif-OsF}{ul}{scsl}{
+    <-> ssub * NotoSerif-OsF/ul/scit
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{eb}{n}{
-      <-> alias * NotoSerif-OsF/extrabold/n
+\DeclareFontShape{T2C}{NotoSerif-OsF}{thin}{scsl}{
+    <-> ssub * NotoSerif-OsF/thin/scit
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{eb}{it}{
-      <-> alias * NotoSerif-OsF/extrabold/it
+
+%   ----  m = regular  ----
+
+\DeclareFontShape{T2C}{NotoSerif-OsF}{m}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-osf-sc-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{eb}{scit}{
-      <-> alias * NotoSerif-OsF/extrabold/scit
+\DeclareFontShape{T2C}{NotoSerif-OsF}{regular}{sc}{
+      <-> alias * NotoSerif-OsF/m/sc
 }{}
 
+\DeclareFontShape{T2C}{NotoSerif-OsF}{m}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-osf-sc-t2c
+}{}
 
-%   ub --> black
+\DeclareFontShape{T2C}{NotoSerif-OsF}{regular}{scit}{
+      <-> alias * NotoSerif-OsF/m/scit
+}{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{ub}{sl}{
-      <-> alias * NotoSerif-OsF/black/sl
+\DeclareFontShape{T2C}{NotoSerif-OsF}{m}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-osf-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{ub}{scsl}{
-      <-> alias * NotoSerif-OsF/black/scsl
+\DeclareFontShape{T2C}{NotoSerif-OsF}{regular}{n}{
+      <-> alias * NotoSerif-OsF/m/n
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{ub}{sc}{
-      <-> alias * NotoSerif-OsF/black/sc
+\DeclareFontShape{T2C}{NotoSerif-OsF}{m}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-osf-t2c
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{ub}{n}{
-      <-> alias * NotoSerif-OsF/black/n
+\DeclareFontShape{T2C}{NotoSerif-OsF}{regular}{it}{
+      <-> alias * NotoSerif-OsF/m/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{ub}{it}{
-      <-> alias * NotoSerif-OsF/black/it
+\DeclareFontShape{T2C}{NotoSerif-OsF}{m}{sl}{
+    <-> ssub * NotoSerif-OsF/m/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{ub}{scit}{
-      <-> alias * NotoSerif-OsF/black/scit
+\DeclareFontShape{T2C}{NotoSerif-OsF}{regular}{sl}{
+    <-> ssub * NotoSerif-OsF/regular/it
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{bx}{n}{
-      <-> ssub * NotoSerif-OsF/b/n
+\DeclareFontShape{T2C}{NotoSerif-OsF}{m}{scsl}{
+    <-> ssub * NotoSerif-OsF/m/scit
 }{}
 
-\DeclareFontShape{T2C}{NotoSerif-OsF}{bx}{sc}{
-      <-> ssub * NotoSerif-OsF/b/sc
+\DeclareFontShape{T2C}{NotoSerif-OsF}{regular}{scsl}{
+    <-> ssub * NotoSerif-OsF/regular/scit
 }{}
 
+
+%   ----  Extra 'ssub' rules to map 'bx' to 'b'  ----
+
 \DeclareFontShape{T2C}{NotoSerif-OsF}{bx}{scsl}{
       <-> ssub * NotoSerif-OsF/b/scsl
 }{}
@@ -501,6 +469,14 @@
       <-> ssub * NotoSerif-OsF/b/it
 }{}
 
+\DeclareFontShape{T2C}{NotoSerif-OsF}{bx}{n}{
+      <-> ssub * NotoSerif-OsF/b/n
+}{}
+
+\DeclareFontShape{T2C}{NotoSerif-OsF}{bx}{sc}{
+      <-> ssub * NotoSerif-OsF/b/sc
+}{}
+
 \DeclareFontShape{T2C}{NotoSerif-OsF}{bx}{scit}{
       <-> ssub * NotoSerif-OsF/b/scit
 }{}