1 files changed, 407 insertions, 407 deletions

diff --git a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TOsF.fd b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TOsF.fd
index 77547d3a2c7..d7caf690797 100644
--- a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
 %%
 \ProvidesFile{OT1Junicode-TOsF.fd}
-    [2024/06/03 (autoinst)  Font definitions for OT1/Junicode-TOsF.]
+    [2024/07/21 (autoinst)  Font definitions for OT1/Junicode-TOsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,394 +20,394 @@
 \DeclareFontFamily{OT1}{Junicode-TOsF}{}
 
 
-%   ----  bx = boldexpanded  ----
+%   ----  c = condensed  ----
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{scit}{
-      <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{c}{scit}{
+      <-> \Junicode@@scale Junicode-CondItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{scit}{
-      <-> alias * Junicode-TOsF/bx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{scit}{
+      <-> alias * Junicode-TOsF/c/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{it}{
-      <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{c}{n}{
+      <-> \Junicode@@scale Junicode-Cond-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{it}{
-      <-> alias * Junicode-TOsF/bx/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{n}{
+      <-> alias * Junicode-TOsF/c/n
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{sc}{
-      <-> \Junicode@@scale Junicode-ExpBold-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{c}{it}{
+      <-> \Junicode@@scale Junicode-CondItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{sc}{
-      <-> alias * Junicode-TOsF/bx/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{it}{
+      <-> alias * Junicode-TOsF/c/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{n}{
-      <-> \Junicode@@scale Junicode-ExpBold-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{c}{sc}{
+      <-> \Junicode@@scale Junicode-Cond-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{n}{
-      <-> alias * Junicode-TOsF/bx/n
+\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{sc}{
+      <-> alias * Junicode-TOsF/c/sc
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{scsl}{
-    <-> ssub * Junicode-TOsF/bx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{c}{sl}{
+    <-> ssub * Junicode-TOsF/c/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{scsl}{
-    <-> ssub * Junicode-TOsF/boldexpanded/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{sl}{
+    <-> ssub * Junicode-TOsF/condensed/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{sl}{
-    <-> ssub * Junicode-TOsF/bx/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{c}{scsl}{
+    <-> ssub * Junicode-TOsF/c/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{sl}{
-    <-> ssub * Junicode-TOsF/boldexpanded/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{scsl}{
+    <-> ssub * Junicode-TOsF/condensed/scit
 }{}
 
 
-%   ----  l = light  ----
+%   ----  sbx = semiboldexpanded  ----
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{l}{n}{
-      <-> \Junicode@@scale Junicode-Light-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{sc}{
+      <-> \Junicode@@scale Junicode-ExpSmBold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{light}{n}{
-      <-> alias * Junicode-TOsF/l/n
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{sc}{
+      <-> alias * Junicode-TOsF/sbx/sc
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{l}{sc}{
-      <-> \Junicode@@scale Junicode-Light-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{it}{
+      <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{light}{sc}{
-      <-> alias * Junicode-TOsF/l/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{it}{
+      <-> alias * Junicode-TOsF/sbx/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{l}{it}{
-      <-> \Junicode@@scale Junicode-LightItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{scit}{
+      <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{light}{it}{
-      <-> alias * Junicode-TOsF/l/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{scit}{
+      <-> alias * Junicode-TOsF/sbx/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{l}{scit}{
-      <-> \Junicode@@scale Junicode-LightItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{n}{
+      <-> \Junicode@@scale Junicode-ExpSmBold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{light}{scit}{
-      <-> alias * Junicode-TOsF/l/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{n}{
+      <-> alias * Junicode-TOsF/sbx/n
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{l}{scsl}{
-    <-> ssub * Junicode-TOsF/l/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{sl}{
+    <-> ssub * Junicode-TOsF/sbx/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{light}{scsl}{
-    <-> ssub * Junicode-TOsF/light/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{sl}{
+    <-> ssub * Junicode-TOsF/semiboldexpanded/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{l}{sl}{
-    <-> ssub * Junicode-TOsF/l/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{scsl}{
+    <-> ssub * Junicode-TOsF/sbx/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{light}{sl}{
-    <-> ssub * Junicode-TOsF/light/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{scsl}{
+    <-> ssub * Junicode-TOsF/semiboldexpanded/scit
 }{}
 
 
-%   ----  lsc = lightsemicondensed  ----
+%   ----  x = expanded  ----
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{n}{
-      <-> \Junicode@@scale Junicode-SmCondLight-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{x}{n}{
+      <-> \Junicode@@scale Junicode-Exp-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{n}{
-      <-> alias * Junicode-TOsF/lsc/n
+\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{n}{
+      <-> alias * Junicode-TOsF/x/n
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{sc}{
-      <-> \Junicode@@scale Junicode-SmCondLight-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{x}{scit}{
+      <-> \Junicode@@scale Junicode-ExpItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{sc}{
-      <-> alias * Junicode-TOsF/lsc/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{scit}{
+      <-> alias * Junicode-TOsF/x/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{it}{
-      <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{x}{it}{
+      <-> \Junicode@@scale Junicode-ExpItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{it}{
-      <-> alias * Junicode-TOsF/lsc/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{it}{
+      <-> alias * Junicode-TOsF/x/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{scit}{
-      <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{x}{sc}{
+      <-> \Junicode@@scale Junicode-Exp-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{scit}{
-      <-> alias * Junicode-TOsF/lsc/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{sc}{
+      <-> alias * Junicode-TOsF/x/sc
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{scsl}{
-    <-> ssub * Junicode-TOsF/lsc/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{x}{sl}{
+    <-> ssub * Junicode-TOsF/x/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{scsl}{
-    <-> ssub * Junicode-TOsF/lightsemicondensed/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{sl}{
+    <-> ssub * Junicode-TOsF/expanded/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{sl}{
-    <-> ssub * Junicode-TOsF/lsc/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{x}{scsl}{
+    <-> ssub * Junicode-TOsF/x/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{sl}{
-    <-> ssub * Junicode-TOsF/lightsemicondensed/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{scsl}{
+    <-> ssub * Junicode-TOsF/expanded/scit
 }{}
 
 
-%   ----  medium  ----
+%   ----  b = bold  ----
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{n}{
-      <-> \Junicode@@scale Junicode-Medium-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{b}{it}{
+      <-> \Junicode@@scale Junicode-BoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{sc}{
-      <-> \Junicode@@scale Junicode-Medium-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{it}{
+      <-> alias * Junicode-TOsF/b/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{it}{
-      <-> \Junicode@@scale Junicode-MediumItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{b}{n}{
+      <-> \Junicode@@scale Junicode-Bold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{scit}{
-      <-> \Junicode@@scale Junicode-MediumItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{n}{
+      <-> alias * Junicode-TOsF/b/n
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{scsl}{
-    <-> ssub * Junicode-TOsF/medium/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{b}{scit}{
+      <-> \Junicode@@scale Junicode-BoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{sl}{
-    <-> ssub * Junicode-TOsF/medium/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{scit}{
+      <-> alias * Junicode-TOsF/b/scit
 }{}
 
-
-%   ----  m = regular  ----
-
-\DeclareFontShape{OT1}{Junicode-TOsF}{m}{it}{
-      <-> \Junicode@@scale Junicode-Italic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{b}{sc}{
+      <-> \Junicode@@scale Junicode-Bold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{it}{
-      <-> alias * Junicode-TOsF/m/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{sc}{
+      <-> alias * Junicode-TOsF/b/sc
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{m}{scit}{
-      <-> \Junicode@@scale Junicode-Italic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{b}{sl}{
+    <-> ssub * Junicode-TOsF/b/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{scit}{
-      <-> alias * Junicode-TOsF/m/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{sl}{
+    <-> ssub * Junicode-TOsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{m}{n}{
-      <-> \Junicode@@scale Junicode-Regular-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{b}{scsl}{
+    <-> ssub * Junicode-TOsF/b/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{n}{
-      <-> alias * Junicode-TOsF/m/n
+\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{scsl}{
+    <-> ssub * Junicode-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{m}{sc}{
-      <-> \Junicode@@scale Junicode-Regular-tosf-sc-ot1
+
+%   ----  mediumexpanded  ----
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{n}{
+      <-> \Junicode@@scale Junicode-ExpMedium-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{sc}{
-      <-> alias * Junicode-TOsF/m/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{scit}{
+      <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{m}{scsl}{
-    <-> ssub * Junicode-TOsF/m/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{it}{
+      <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{scsl}{
-    <-> ssub * Junicode-TOsF/regular/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{sc}{
+      <-> \Junicode@@scale Junicode-ExpMedium-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{m}{sl}{
-    <-> ssub * Junicode-TOsF/m/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{sl}{
+    <-> ssub * Junicode-TOsF/mediumexpanded/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{sl}{
-    <-> ssub * Junicode-TOsF/regular/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{scsl}{
+    <-> ssub * Junicode-TOsF/mediumexpanded/scit
 }{}
 
 
-%   ----  sx = semiexpanded  ----
+%   ----  lsc = lightsemicondensed  ----
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{sc}{
-      <-> \Junicode@@scale Junicode-SmExp-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{sc}{
+      <-> \Junicode@@scale Junicode-SmCondLight-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{sc}{
-      <-> alias * Junicode-TOsF/sx/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{sc}{
+      <-> alias * Junicode-TOsF/lsc/sc
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{n}{
-      <-> \Junicode@@scale Junicode-SmExp-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{n}{
+      <-> \Junicode@@scale Junicode-SmCondLight-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{n}{
-      <-> alias * Junicode-TOsF/sx/n
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{n}{
+      <-> alias * Junicode-TOsF/lsc/n
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{scit}{
-      <-> \Junicode@@scale Junicode-SmExpItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{scit}{
+      <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{scit}{
-      <-> alias * Junicode-TOsF/sx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{scit}{
+      <-> alias * Junicode-TOsF/lsc/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{it}{
-      <-> \Junicode@@scale Junicode-SmExpItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{it}{
+      <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{it}{
-      <-> alias * Junicode-TOsF/sx/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{it}{
+      <-> alias * Junicode-TOsF/lsc/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{scsl}{
-    <-> ssub * Junicode-TOsF/sx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{sl}{
+    <-> ssub * Junicode-TOsF/lsc/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{scsl}{
-    <-> ssub * Junicode-TOsF/semiexpanded/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{sl}{
+    <-> ssub * Junicode-TOsF/lightsemicondensed/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{sl}{
-    <-> ssub * Junicode-TOsF/sx/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{scsl}{
+    <-> ssub * Junicode-TOsF/lsc/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{sl}{
-    <-> ssub * Junicode-TOsF/semiexpanded/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{scsl}{
+    <-> ssub * Junicode-TOsF/lightsemicondensed/scit
 }{}
 
 
-%   ----  c = condensed  ----
+%   ----  lc = lightcondensed  ----
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{c}{it}{
-      <-> \Junicode@@scale Junicode-CondItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{scit}{
+      <-> \Junicode@@scale Junicode-CondLightItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{it}{
-      <-> alias * Junicode-TOsF/c/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{scit}{
+      <-> alias * Junicode-TOsF/lc/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{c}{scit}{
-      <-> \Junicode@@scale Junicode-CondItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{n}{
+      <-> \Junicode@@scale Junicode-CondLight-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{scit}{
-      <-> alias * Junicode-TOsF/c/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{n}{
+      <-> alias * Junicode-TOsF/lc/n
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{c}{n}{
-      <-> \Junicode@@scale Junicode-Cond-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{it}{
+      <-> \Junicode@@scale Junicode-CondLightItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{n}{
-      <-> alias * Junicode-TOsF/c/n
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{it}{
+      <-> alias * Junicode-TOsF/lc/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{c}{sc}{
-      <-> \Junicode@@scale Junicode-Cond-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{sc}{
+      <-> \Junicode@@scale Junicode-CondLight-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{sc}{
-      <-> alias * Junicode-TOsF/c/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{sc}{
+      <-> alias * Junicode-TOsF/lc/sc
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{c}{scsl}{
-    <-> ssub * Junicode-TOsF/c/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{sl}{
+    <-> ssub * Junicode-TOsF/lc/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{scsl}{
-    <-> ssub * Junicode-TOsF/condensed/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{sl}{
+    <-> ssub * Junicode-TOsF/lightcondensed/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{c}{sl}{
-    <-> ssub * Junicode-TOsF/c/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{scsl}{
+    <-> ssub * Junicode-TOsF/lc/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{sl}{
-    <-> ssub * Junicode-TOsF/condensed/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{scsl}{
+    <-> ssub * Junicode-TOsF/lightcondensed/scit
 }{}
 
 
-%   ----  x = expanded  ----
+%   ----  m = regular  ----
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{x}{n}{
-      <-> \Junicode@@scale Junicode-Exp-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{m}{sc}{
+      <-> \Junicode@@scale Junicode-Regular-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{n}{
-      <-> alias * Junicode-TOsF/x/n
+\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{sc}{
+      <-> alias * Junicode-TOsF/m/sc
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{x}{sc}{
-      <-> \Junicode@@scale Junicode-Exp-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{m}{it}{
+      <-> \Junicode@@scale Junicode-Italic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{sc}{
-      <-> alias * Junicode-TOsF/x/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{it}{
+      <-> alias * Junicode-TOsF/m/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{x}{it}{
-      <-> \Junicode@@scale Junicode-ExpItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{m}{scit}{
+      <-> \Junicode@@scale Junicode-Italic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{it}{
-      <-> alias * Junicode-TOsF/x/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{scit}{
+      <-> alias * Junicode-TOsF/m/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{x}{scit}{
-      <-> \Junicode@@scale Junicode-ExpItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{m}{n}{
+      <-> \Junicode@@scale Junicode-Regular-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{scit}{
-      <-> alias * Junicode-TOsF/x/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{n}{
+      <-> alias * Junicode-TOsF/m/n
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{x}{scsl}{
-    <-> ssub * Junicode-TOsF/x/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{m}{sl}{
+    <-> ssub * Junicode-TOsF/m/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{scsl}{
-    <-> ssub * Junicode-TOsF/expanded/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{sl}{
+    <-> ssub * Junicode-TOsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{x}{sl}{
-    <-> ssub * Junicode-TOsF/x/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{m}{scsl}{
+    <-> ssub * Junicode-TOsF/m/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{sl}{
-    <-> ssub * Junicode-TOsF/expanded/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{scsl}{
+    <-> ssub * Junicode-TOsF/regular/scit
 }{}
 
 
 %   ----  mediumsemiexpanded  ----
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{sc}{
-      <-> \Junicode@@scale Junicode-SmExpMedium-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{it}{
+      <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-ot1
 }{}
 
 \DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{n}{
@@ -418,145 +418,196 @@
       <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{it}{
-      <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{sc}{
+      <-> \Junicode@@scale Junicode-SmExpMedium-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{sl}{
+    <-> ssub * Junicode-TOsF/mediumsemiexpanded/it
 }{}
 
 \DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{scsl}{
     <-> ssub * Junicode-TOsF/mediumsemiexpanded/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{sl}{
-    <-> ssub * Junicode-TOsF/mediumsemiexpanded/it
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{sc}{
+      <-> \Junicode@@scale Junicode-Medium-tosf-sc-ot1
 }{}
 
+\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{n}{
+      <-> \Junicode@@scale Junicode-Medium-tosf-ot1
+}{}
 
-%   ----  sbsx = semiboldsemiexpanded  ----
+\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{scit}{
+      <-> \Junicode@@scale Junicode-MediumItalic-tosf-sc-ot1
+}{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{sc}{
-      <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{it}{
+      <-> \Junicode@@scale Junicode-MediumItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{sc}{
-      <-> alias * Junicode-TOsF/sbsx/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{sl}{
+    <-> ssub * Junicode-TOsF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{n}{
-      <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{scsl}{
+    <-> ssub * Junicode-TOsF/medium/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{n}{
-      <-> alias * Junicode-TOsF/sbsx/n
+
+%   ----  bx = boldexpanded  ----
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{sc}{
+      <-> \Junicode@@scale Junicode-ExpBold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{scit}{
-      <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{sc}{
+      <-> alias * Junicode-TOsF/bx/sc
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{scit}{
-      <-> alias * Junicode-TOsF/sbsx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{scit}{
+      <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{it}{
-      <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{scit}{
+      <-> alias * Junicode-TOsF/bx/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{it}{
-      <-> alias * Junicode-TOsF/sbsx/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{n}{
+      <-> \Junicode@@scale Junicode-ExpBold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{scsl}{
-    <-> ssub * Junicode-TOsF/sbsx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{n}{
+      <-> alias * Junicode-TOsF/bx/n
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{scsl}{
-    <-> ssub * Junicode-TOsF/semiboldsemiexpanded/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{it}{
+      <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{sl}{
-    <-> ssub * Junicode-TOsF/sbsx/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{it}{
+      <-> alias * Junicode-TOsF/bx/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{sl}{
-    <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{sl}{
+    <-> ssub * Junicode-TOsF/bx/it
 }{}
 
+\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{sl}{
+    <-> ssub * Junicode-TOsF/boldexpanded/it
+}{}
 
-%   ----  mediumexpanded  ----
+\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{scsl}{
+    <-> ssub * Junicode-TOsF/bx/scit
+}{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{sc}{
-      <-> \Junicode@@scale Junicode-ExpMedium-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{scsl}{
+    <-> ssub * Junicode-TOsF/boldexpanded/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{n}{
-      <-> \Junicode@@scale Junicode-ExpMedium-tosf-ot1
+
+%   ----  sx = semiexpanded  ----
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{it}{
+      <-> \Junicode@@scale Junicode-SmExpItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{scit}{
-      <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{it}{
+      <-> alias * Junicode-TOsF/sx/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{it}{
-      <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{n}{
+      <-> \Junicode@@scale Junicode-SmExp-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{scsl}{
-    <-> ssub * Junicode-TOsF/mediumexpanded/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{n}{
+      <-> alias * Junicode-TOsF/sx/n
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{sl}{
-    <-> ssub * Junicode-TOsF/mediumexpanded/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{scit}{
+      <-> \Junicode@@scale Junicode-SmExpItalic-tosf-sc-ot1
 }{}
 
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{scit}{
+      <-> alias * Junicode-TOsF/sx/scit
+}{}
 
-%   ----  sbx = semiboldexpanded  ----
+\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{sc}{
+      <-> \Junicode@@scale Junicode-SmExp-tosf-sc-ot1
+}{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{it}{
-      <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{sc}{
+      <-> alias * Junicode-TOsF/sx/sc
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{it}{
-      <-> alias * Junicode-TOsF/sbx/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{sl}{
+    <-> ssub * Junicode-TOsF/sx/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{scit}{
-      <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{sl}{
+    <-> ssub * Junicode-TOsF/semiexpanded/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{scit}{
-      <-> alias * Junicode-TOsF/sbx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{scsl}{
+    <-> ssub * Junicode-TOsF/sx/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{n}{
-      <-> \Junicode@@scale Junicode-ExpSmBold-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{scsl}{
+    <-> ssub * Junicode-TOsF/semiexpanded/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{n}{
-      <-> alias * Junicode-TOsF/sbx/n
+
+%   ----  l = light  ----
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{l}{sc}{
+      <-> \Junicode@@scale Junicode-Light-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{sc}{
-      <-> \Junicode@@scale Junicode-ExpSmBold-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{light}{sc}{
+      <-> alias * Junicode-TOsF/l/sc
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{sc}{
-      <-> alias * Junicode-TOsF/sbx/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{l}{it}{
+      <-> \Junicode@@scale Junicode-LightItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{scsl}{
-    <-> ssub * Junicode-TOsF/sbx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{light}{it}{
+      <-> alias * Junicode-TOsF/l/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{scsl}{
-    <-> ssub * Junicode-TOsF/semiboldexpanded/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{l}{n}{
+      <-> \Junicode@@scale Junicode-Light-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{sl}{
-    <-> ssub * Junicode-TOsF/sbx/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{light}{n}{
+      <-> alias * Junicode-TOsF/l/n
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{sl}{
-    <-> ssub * Junicode-TOsF/semiboldexpanded/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{l}{scit}{
+      <-> \Junicode@@scale Junicode-LightItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{light}{scit}{
+      <-> alias * Junicode-TOsF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{l}{sl}{
+    <-> ssub * Junicode-TOsF/l/it
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{light}{sl}{
+    <-> ssub * Junicode-TOsF/light/it
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{l}{scsl}{
+    <-> ssub * Junicode-TOsF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{light}{scsl}{
+    <-> ssub * Junicode-TOsF/light/scit
 }{}
 
 
@@ -566,36 +617,28 @@
       <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{scit}{
-      <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-sc-ot1
-}{}
-
 \DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{n}{
       <-> \Junicode@@scale Junicode-SmCondMedium-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{sc}{
-      <-> \Junicode@@scale Junicode-SmCondMedium-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{scit}{
+      <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{scsl}{
-    <-> ssub * Junicode-TOsF/mediumsemicondensed/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{sc}{
+      <-> \Junicode@@scale Junicode-SmCondMedium-tosf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{sl}{
     <-> ssub * Junicode-TOsF/mediumsemicondensed/it
 }{}
 
-
-%   ----  sb = semibold  ----
-
-\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{n}{
-      <-> \Junicode@@scale Junicode-SmBold-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{scsl}{
+    <-> ssub * Junicode-TOsF/mediumsemicondensed/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semibold}{n}{
-      <-> alias * Junicode-TOsF/sb/n
-}{}
+
+%   ----  sb = semibold  ----
 
 \DeclareFontShape{OT1}{Junicode-TOsF}{sb}{sc}{
       <-> \Junicode@@scale Junicode-SmBold-tosf-sc-ot1
@@ -605,12 +648,12 @@
       <-> alias * Junicode-TOsF/sb/sc
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{it}{
-      <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{n}{
+      <-> \Junicode@@scale Junicode-SmBold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semibold}{it}{
-      <-> alias * Junicode-TOsF/sb/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{semibold}{n}{
+      <-> alias * Junicode-TOsF/sb/n
 }{}
 
 \DeclareFontShape{OT1}{Junicode-TOsF}{sb}{scit}{
@@ -621,12 +664,12 @@
       <-> alias * Junicode-TOsF/sb/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{scsl}{
-    <-> ssub * Junicode-TOsF/sb/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{it}{
+      <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semibold}{scsl}{
-    <-> ssub * Junicode-TOsF/semibold/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{semibold}{it}{
+      <-> alias * Junicode-TOsF/sb/it
 }{}
 
 \DeclareFontShape{OT1}{Junicode-TOsF}{sb}{sl}{
@@ -637,66 +680,50 @@
     <-> ssub * Junicode-TOsF/semibold/it
 }{}
 
-
-%   ----  sc = semicondensed  ----
-
-\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{it}{
-      <-> \Junicode@@scale Junicode-SmCondItalic-tosf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{it}{
-      <-> alias * Junicode-TOsF/sc/it
-}{}
-
-\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{scit}{
-      <-> \Junicode@@scale Junicode-SmCondItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{scsl}{
+    <-> ssub * Junicode-TOsF/sb/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{scit}{
-      <-> alias * Junicode-TOsF/sc/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{semibold}{scsl}{
+    <-> ssub * Junicode-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{n}{
-      <-> \Junicode@@scale Junicode-SmCond-tosf-ot1
-}{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{n}{
-      <-> alias * Junicode-TOsF/sc/n
-}{}
+%   ----  mediumcondensed  ----
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{sc}{
-      <-> \Junicode@@scale Junicode-SmCond-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{sc}{
+      <-> \Junicode@@scale Junicode-CondMedium-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{sc}{
-      <-> alias * Junicode-TOsF/sc/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{n}{
+      <-> \Junicode@@scale Junicode-CondMedium-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{scsl}{
-    <-> ssub * Junicode-TOsF/sc/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{scit}{
+      <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{scsl}{
-    <-> ssub * Junicode-TOsF/semicondensed/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{it}{
+      <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{sl}{
-    <-> ssub * Junicode-TOsF/sc/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{sl}{
+    <-> ssub * Junicode-TOsF/mediumcondensed/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{sl}{
-    <-> ssub * Junicode-TOsF/semicondensed/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{scsl}{
+    <-> ssub * Junicode-TOsF/mediumcondensed/scit
 }{}
 
 
 %   ----  bsx = boldsemiexpanded  ----
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{scit}{
-      <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{sc}{
+      <-> \Junicode@@scale Junicode-SmExpBold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{boldsemiexpanded}{scit}{
-      <-> alias * Junicode-TOsF/bsx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{boldsemiexpanded}{sc}{
+      <-> alias * Junicode-TOsF/bsx/sc
 }{}
 
 \DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{it}{
@@ -707,14 +734,6 @@
       <-> alias * Junicode-TOsF/bsx/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{sc}{
-      <-> \Junicode@@scale Junicode-SmExpBold-tosf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Junicode-TOsF}{boldsemiexpanded}{sc}{
-      <-> alias * Junicode-TOsF/bsx/sc
-}{}
-
 \DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{n}{
       <-> \Junicode@@scale Junicode-SmExpBold-tosf-ot1
 }{}
@@ -723,12 +742,12 @@
       <-> alias * Junicode-TOsF/bsx/n
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{scsl}{
-    <-> ssub * Junicode-TOsF/bsx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{scit}{
+      <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{boldsemiexpanded}{scsl}{
-    <-> ssub * Junicode-TOsF/boldsemiexpanded/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{boldsemiexpanded}{scit}{
+      <-> alias * Junicode-TOsF/bsx/scit
 }{}
 
 \DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{sl}{
@@ -739,133 +758,114 @@
     <-> ssub * Junicode-TOsF/boldsemiexpanded/it
 }{}
 
-
-%   ----  lc = lightcondensed  ----
-
-\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{sc}{
-      <-> \Junicode@@scale Junicode-CondLight-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{scsl}{
+    <-> ssub * Junicode-TOsF/bsx/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{sc}{
-      <-> alias * Junicode-TOsF/lc/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{boldsemiexpanded}{scsl}{
+    <-> ssub * Junicode-TOsF/boldsemiexpanded/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{n}{
-      <-> \Junicode@@scale Junicode-CondLight-tosf-ot1
-}{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{n}{
-      <-> alias * Junicode-TOsF/lc/n
-}{}
+%   ----  sbsx = semiboldsemiexpanded  ----
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{scit}{
-      <-> \Junicode@@scale Junicode-CondLightItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{n}{
+      <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{scit}{
-      <-> alias * Junicode-TOsF/lc/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{n}{
+      <-> alias * Junicode-TOsF/sbsx/n
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{it}{
-      <-> \Junicode@@scale Junicode-CondLightItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{scit}{
+      <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{it}{
-      <-> alias * Junicode-TOsF/lc/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{scit}{
+      <-> alias * Junicode-TOsF/sbsx/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{scsl}{
-    <-> ssub * Junicode-TOsF/lc/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{it}{
+      <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{scsl}{
-    <-> ssub * Junicode-TOsF/lightcondensed/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{it}{
+      <-> alias * Junicode-TOsF/sbsx/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{sl}{
-    <-> ssub * Junicode-TOsF/lc/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{sc}{
+      <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{sl}{
-    <-> ssub * Junicode-TOsF/lightcondensed/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{sc}{
+      <-> alias * Junicode-TOsF/sbsx/sc
 }{}
 
-
-%   ----  b = bold  ----
-
-\DeclareFontShape{OT1}{Junicode-TOsF}{b}{sc}{
-      <-> \Junicode@@scale Junicode-Bold-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{sl}{
+    <-> ssub * Junicode-TOsF/sbsx/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{sc}{
-      <-> alias * Junicode-TOsF/b/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{sl}{
+    <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{b}{n}{
-      <-> \Junicode@@scale Junicode-Bold-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{scsl}{
+    <-> ssub * Junicode-TOsF/sbsx/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{n}{
-      <-> alias * Junicode-TOsF/b/n
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{scsl}{
+    <-> ssub * Junicode-TOsF/semiboldsemiexpanded/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{b}{scit}{
-      <-> \Junicode@@scale Junicode-BoldItalic-tosf-sc-ot1
-}{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{scit}{
-      <-> alias * Junicode-TOsF/b/scit
-}{}
+%   ----  sc = semicondensed  ----
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{b}{it}{
-      <-> \Junicode@@scale Junicode-BoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{sc}{
+      <-> \Junicode@@scale Junicode-SmCond-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{it}{
-      <-> alias * Junicode-TOsF/b/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{sc}{
+      <-> alias * Junicode-TOsF/sc/sc
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{b}{scsl}{
-    <-> ssub * Junicode-TOsF/b/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{it}{
+      <-> \Junicode@@scale Junicode-SmCondItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{scsl}{
-    <-> ssub * Junicode-TOsF/bold/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{it}{
+      <-> alias * Junicode-TOsF/sc/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{b}{sl}{
-    <-> ssub * Junicode-TOsF/b/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{scit}{
+      <-> \Junicode@@scale Junicode-SmCondItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{sl}{
-    <-> ssub * Junicode-TOsF/bold/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{scit}{
+      <-> alias * Junicode-TOsF/sc/scit
 }{}
 
-
-%   ----  mediumcondensed  ----
-
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{scit}{
-      <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{n}{
+      <-> \Junicode@@scale Junicode-SmCond-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{it}{
-      <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{n}{
+      <-> alias * Junicode-TOsF/sc/n
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{sc}{
-      <-> \Junicode@@scale Junicode-CondMedium-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{sl}{
+    <-> ssub * Junicode-TOsF/sc/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{n}{
-      <-> \Junicode@@scale Junicode-CondMedium-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{sl}{
+    <-> ssub * Junicode-TOsF/semicondensed/it
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{scsl}{
-    <-> ssub * Junicode-TOsF/mediumcondensed/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{scsl}{
+    <-> ssub * Junicode-TOsF/sc/scit
 }{}
 
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{sl}{
-    <-> ssub * Junicode-TOsF/mediumcondensed/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{scsl}{
+    <-> ssub * Junicode-TOsF/semicondensed/scit
 }{}