1 files changed, 40 insertions, 36 deletions

diff --git a/Master/texmf-dist/tex/latex/droid/ts1fdr.fd b/Master/texmf-dist/tex/latex/droid/ts1fdr.fd
index 625e9cd9998..e86dccb1187 100644
--- a/Master/texmf-dist/tex/latex/droid/ts1fdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/ts1fdr.fd
@@ -1,85 +1,89 @@
 %Filename: ts1fdr.fd
 %Created by: tex droid-drv
-%Created using fontinst v1.927
+%Created using fontinst v1.933
 
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{ts1fdr.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for TS1/fdr.]
+   [2011/08/21 Fontinst v1.933 font definitions for TS1/fdr.]
 
-\expandafter\ifx\csname droid@fdr@scale\endcsname\relax
-  \let\droid@fdr@scale\@empty
+\expandafter\ifx\csname droid@scale\endcsname\relax
+  \let\droid@scale\@empty
 \fi
 
 \DeclareFontFamily{TS1}{fdr}{}
 
 \DeclareFontShape{TS1}{fdr}{m}{n}{
-   <->\droid@fdr@scale ts1-DroidSerif-Regular
-   <->\droid@fdr@scale ts1-DroidSerif-Italic
+   <->\droid@scale DroidSerif-Regular-ts1
 }{}
 
-\DeclareFontShape{TS1}{fdr}{m}{sl}{
-   <->\droid@fdr@scale ts1-DroidSerif-Regular-Slanted
+\DeclareFontShape{TS1}{fdr}{m}{it}{
+   <->\droid@scale DroidSerif-Italic-ts1
 }{}
 
-\DeclareFontShape{TS1}{fdr}{m}{sc}{
-   <->\droid@fdr@scale ts1-DroidSerif-Regular
+\DeclareFontShape{TS1}{fdr}{m}{sl}{
+   <->\droid@scale DroidSerif-Regular-Slanted-ts1
 }{}
 
-\DeclareFontShape{TS1}{fdr}{m}{scsl}{
-   <->\droid@fdr@scale ts1-DroidSerif-Regular-Slanted
+\DeclareFontShape{TS1}{fdr}{m}{ui}{
+   <->\droid@scale DroidSerif-Italic-Upright-ts1
 }{}
 
-\DeclareFontShape{TS1}{fdr}{m}{up}{
-   <->\droid@fdr@scale ts1-DroidSerif-Italic-Upright
+\DeclareFontShape{TS1}{fdr}{m}{sc}{
+   <->\droid@scale DroidSerif-Regular-ts1
 }{}
 
 \DeclareFontShape{TS1}{fdr}{m}{scit}{
-   <->\droid@fdr@scale ts1-DroidSerif-Italic
+   <->\droid@scale DroidSerif-Italic-ts1
 }{}
 
-\DeclareFontShape{TS1}{fdr}{m}{scup}{
-   <->\droid@fdr@scale ts1-DroidSerif-Italic-Upright
+\DeclareFontShape{TS1}{fdr}{m}{scsl}{
+   <->\droid@scale DroidSerif-Regular-Slanted-ts1
+}{}
+
+\DeclareFontShape{TS1}{fdr}{m}{scui}{
+   <->\droid@scale DroidSerif-Italic-Upright-ts1
 }{}
 
 \DeclareFontShape{TS1}{fdr}{b}{n}{
-   <->\droid@fdr@scale ts1-DroidSerif-Bold
-   <->\droid@fdr@scale ts1-DroidSerif-BoldItalic
+   <->\droid@scale DroidSerif-Bold-ts1
 }{}
 
-\DeclareFontShape{TS1}{fdr}{b}{sl}{
-   <->\droid@fdr@scale ts1-DroidSerif-Bold-Slanted
+\DeclareFontShape{TS1}{fdr}{b}{it}{
+   <->\droid@scale DroidSerif-BoldItalic-ts1
 }{}
 
-\DeclareFontShape{TS1}{fdr}{b}{sc}{
-   <->\droid@fdr@scale ts1-DroidSerif-Bold
+\DeclareFontShape{TS1}{fdr}{b}{sl}{
+   <->\droid@scale DroidSerif-Bold-Slanted-ts1
 }{}
 
-\DeclareFontShape{TS1}{fdr}{b}{scsl}{
-   <->\droid@fdr@scale ts1-DroidSerif-Bold-Slanted
+\DeclareFontShape{TS1}{fdr}{b}{ui}{
+   <->\droid@scale DroidSerif-BoldItalic-Upright-ts1
 }{}
 
-\DeclareFontShape{TS1}{fdr}{b}{up}{
-   <->\droid@fdr@scale ts1-DroidSerif-BoldItalic-Upright
+\DeclareFontShape{TS1}{fdr}{b}{sc}{
+   <->\droid@scale DroidSerif-Bold-ts1
 }{}
 
 \DeclareFontShape{TS1}{fdr}{b}{scit}{
-   <->\droid@fdr@scale ts1-DroidSerif-BoldItalic
+   <->\droid@scale DroidSerif-BoldItalic-ts1
+}{}
+
+\DeclareFontShape{TS1}{fdr}{b}{scsl}{
+   <->\droid@scale DroidSerif-Bold-Slanted-ts1
 }{}
 
-\DeclareFontShape{TS1}{fdr}{b}{scup}{
-   <->\droid@fdr@scale ts1-DroidSerif-BoldItalic-Upright
+\DeclareFontShape{TS1}{fdr}{b}{scui}{
+   <->\droid@scale DroidSerif-BoldItalic-Upright-ts1
 }{}
 
-\DeclareFontShape{TS1}{fdr}{m}{it}{<->ssub * fdr/m/sl}{}
 \DeclareFontShape{TS1}{fdr}{bx}{n}{<->ssub * fdr/b/n}{}
-\DeclareFontShape{TS1}{fdr}{bx}{sl}{<->ssub * fdr/b/sl}{}
-\DeclareFontShape{TS1}{fdr}{b}{it}{<->ssub * fdr/b/sl}{}
 \DeclareFontShape{TS1}{fdr}{bx}{it}{<->ssub * fdr/b/it}{}
+\DeclareFontShape{TS1}{fdr}{bx}{sl}{<->ssub * fdr/b/sl}{}
+\DeclareFontShape{TS1}{fdr}{bx}{ui}{<->ssub * fdr/b/ui}{}
 \DeclareFontShape{TS1}{fdr}{bx}{sc}{<->ssub * fdr/b/sc}{}
-\DeclareFontShape{TS1}{fdr}{bx}{scsl}{<->ssub * fdr/b/scsl}{}
-\DeclareFontShape{TS1}{fdr}{bx}{up}{<->ssub * fdr/b/up}{}
 \DeclareFontShape{TS1}{fdr}{bx}{scit}{<->ssub * fdr/b/scit}{}
-\DeclareFontShape{TS1}{fdr}{bx}{scup}{<->ssub * fdr/b/scup}{}
+\DeclareFontShape{TS1}{fdr}{bx}{scsl}{<->ssub * fdr/b/scsl}{}
+\DeclareFontShape{TS1}{fdr}{bx}{scui}{<->ssub * fdr/b/scui}{}
 
 \endinput