droid 2.0 (23aug11)

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

28 files changed, 474 insertions, 470 deletions

diff --git a/Master/texmf-dist/tex/latex/droid/droid.sty b/Master/texmf-dist/tex/latex/droid/droid.sty
index 32ae080a3ab..5dbe492fbce 100644
--- a/Master/texmf-dist/tex/latex/droid/droid.sty
+++ b/Master/texmf-dist/tex/latex/droid/droid.sty
@@ -1,5 +1,5 @@
 %% droid.sty
-%% Copyright 2010, 2011 Mohamed El Morabity
+%% Copyright 2011 Mohamed El Morabity
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License, either version 1.3 of this license or (at your option)
@@ -14,7 +14,7 @@
 % This work consists of all files listed in manifest.txt.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{droid}[2011/03/24 Droid]
+\ProvidesPackage{droid}[2011/08/21 Droid]
 
 \RequirePackage[default]{droidserif}
 \RequirePackage[defaultsans]{droidsans}
diff --git a/Master/texmf-dist/tex/latex/droid/droidmono.sty b/Master/texmf-dist/tex/latex/droid/droidmono.sty
index 4626ade37e5..2438ad3d29a 100644
--- a/Master/texmf-dist/tex/latex/droid/droidmono.sty
+++ b/Master/texmf-dist/tex/latex/droid/droidmono.sty
@@ -1,5 +1,5 @@
 %% droidmono.sty
-%% Copyright 2010, 2011 Mohamed El Morabity
+%% Copyright 2011 Mohamed El Morabity
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License, either version 1.3 of this license or (at your option)
@@ -14,7 +14,7 @@
 % This work consists of all files listed in manifest.txt.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{droidmono}[2011/03/24 Droid Sans Mono]
+\ProvidesPackage{droidmono}[2011/08/21 Droid Sans Mono]
 
 \RequirePackage{keyval}
 \RequirePackage{slantsc}
diff --git a/Master/texmf-dist/tex/latex/droid/droidsans.sty b/Master/texmf-dist/tex/latex/droid/droidsans.sty
index 0ae873a2e74..93c4301185b 100644
--- a/Master/texmf-dist/tex/latex/droid/droidsans.sty
+++ b/Master/texmf-dist/tex/latex/droid/droidsans.sty
@@ -1,5 +1,5 @@
 %% droidsans.sty
-%% Copyright 2010, 2011 Mohamed El Morabity
+%% Copyright 2011 Mohamed El Morabity
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License, either version 1.3 of this license or (at your option)
@@ -14,7 +14,7 @@
 % This work consists of all files listed in manifest.txt.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{droidsans}[2011/03/24 Droid Sans]
+\ProvidesPackage{droidsans}[2011/08/21 Droid Sans]
 
 \RequirePackage{keyval}
 \RequirePackage{slantsc}
diff --git a/Master/texmf-dist/tex/latex/droid/droidserif.sty b/Master/texmf-dist/tex/latex/droid/droidserif.sty
index 2a910b5deb4..ec21d9baec2 100644
--- a/Master/texmf-dist/tex/latex/droid/droidserif.sty
+++ b/Master/texmf-dist/tex/latex/droid/droidserif.sty
@@ -1,5 +1,5 @@
 %% droidserif.sty
-%% Copyright 2010, 2011 Mohamed El Morabity
+%% Copyright 2011 Mohamed El Morabity
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License, either version 1.3 of this license or (at your option)
@@ -14,7 +14,7 @@
 % This work consists of all files listed in manifest.txt.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{droidserif}[2011/03/24 Droid Serif]
+\ProvidesPackage{droidserif}[2011/08/21 Droid Serif]
 
 \RequirePackage{keyval}
 \RequirePackage{slantsc}
diff --git a/Master/texmf-dist/tex/latex/droid/lgrfdm.fd b/Master/texmf-dist/tex/latex/droid/lgrfdm.fd
index 9d20804a4c3..4a780bdf167 100644
--- a/Master/texmf-dist/tex/latex/droid/lgrfdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/lgrfdm.fd
@@ -1,32 +1,32 @@
 %Filename: lgrfdm.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{lgrfdm.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for LGR/fdm.]
+   [2011/08/21 Fontinst v1.933 font definitions for LGR/fdm.]
 
-\expandafter\ifx\csname droid@fdm@scale\endcsname\relax
-  \let\droid@fdm@scale\@empty
+\expandafter\ifx\csname droid@scale\endcsname\relax
+  \let\droid@scale\@empty
 \fi
 
 \DeclareFontFamily{LGR}{fdm}{}
 
 \DeclareFontShape{LGR}{fdm}{m}{n}{
-   <->\droid@fdm@scale lgr-DroidSansMono
+   <->\droid@scale DroidSansMono-lgr
 }{}
 
 \DeclareFontShape{LGR}{fdm}{m}{sl}{
-   <->\droid@fdm@scale lgr-DroidSansMono-Slanted
+   <->\droid@scale DroidSansMono-Slanted-lgr
 }{}
 
 \DeclareFontShape{LGR}{fdm}{m}{sc}{
-   <->\droid@fdm@scale lgr-DroidSansMono-SmallCaps
+   <->\droid@scale DroidSansMono-SmallCaps-lgr
 }{}
 
 \DeclareFontShape{LGR}{fdm}{m}{scsl}{
-   <->\droid@fdm@scale lgr-DroidSansMono-Slanted-SmallCaps
+   <->\droid@scale DroidSansMono-Slanted-SmallCaps-lgr
 }{}
 
 \DeclareFontShape{LGR}{fdm}{m}{it}{<->ssub * fdm/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/lgrfdr.fd b/Master/texmf-dist/tex/latex/droid/lgrfdr.fd
index 5d33c4cc841..1b4d1cea7fe 100644
--- a/Master/texmf-dist/tex/latex/droid/lgrfdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/lgrfdr.fd
@@ -1,89 +1,89 @@
 %Filename: lgrfdr.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{lgrfdr.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for LGR/fdr.]
+   [2011/08/21 Fontinst v1.933 font definitions for LGR/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{LGR}{fdr}{}
 
 \DeclareFontShape{LGR}{fdr}{m}{n}{
-   <->\droid@fdr@scale lgr-DroidSerif-Regular
+   <->\droid@scale DroidSerif-Regular-lgr
 }{}
 
-\DeclareFontShape{LGR}{fdr}{m}{sl}{
-   <->\droid@fdr@scale lgr-DroidSerif-Regular-Slanted
+\DeclareFontShape{LGR}{fdr}{m}{it}{
+   <->\droid@scale DroidSerif-Italic-lgr
 }{}
 
-\DeclareFontShape{LGR}{fdr}{m}{sc}{
-   <->\droid@fdr@scale lgr-DroidSerif-Regular-SmallCaps
+\DeclareFontShape{LGR}{fdr}{m}{sl}{
+   <->\droid@scale DroidSerif-Regular-Slanted-lgr
 }{}
 
-\DeclareFontShape{LGR}{fdr}{m}{scsl}{
-   <->\droid@fdr@scale lgr-DroidSerif-Regular-Slanted-SmallCaps
+\DeclareFontShape{LGR}{fdr}{m}{ui}{
+   <->\droid@scale DroidSerif-Italic-Upright-lgr
 }{}
 
-\DeclareFontShape{LGR}{fdr}{m}{it}{
-   <->\droid@fdr@scale lgr-DroidSerif-Italic
+\DeclareFontShape{LGR}{fdr}{m}{sc}{
+   <->\droid@scale DroidSerif-Regular-SmallCaps-lgr
 }{}
 
-\DeclareFontShape{LGR}{fdr}{m}{up}{
-   <->\droid@fdr@scale lgr-DroidSerif-Italic-Upright
+\DeclareFontShape{LGR}{fdr}{m}{scit}{
+   <->\droid@scale DroidSerif-Italic-SmallCaps-lgr
 }{}
 
-\DeclareFontShape{LGR}{fdr}{m}{scit}{
-   <->\droid@fdr@scale lgr-DroidSerif-Italic-SmallCaps
+\DeclareFontShape{LGR}{fdr}{m}{scsl}{
+   <->\droid@scale DroidSerif-Regular-Slanted-SmallCaps-lgr
 }{}
 
-\DeclareFontShape{LGR}{fdr}{m}{scup}{
-   <->\droid@fdr@scale lgr-DroidSerif-Italic-Upright-SmallCaps
+\DeclareFontShape{LGR}{fdr}{m}{scui}{
+   <->\droid@scale DroidSerif-Italic-Upright-SmallCaps-lgr
 }{}
 
 \DeclareFontShape{LGR}{fdr}{b}{n}{
-   <->\droid@fdr@scale lgr-DroidSerif-Bold
+   <->\droid@scale DroidSerif-Bold-lgr
 }{}
 
-\DeclareFontShape{LGR}{fdr}{b}{sl}{
-   <->\droid@fdr@scale lgr-DroidSerif-Bold-Slanted
+\DeclareFontShape{LGR}{fdr}{b}{it}{
+   <->\droid@scale DroidSerif-BoldItalic-lgr
 }{}
 
-\DeclareFontShape{LGR}{fdr}{b}{sc}{
-   <->\droid@fdr@scale lgr-DroidSerif-Bold-SmallCaps
+\DeclareFontShape{LGR}{fdr}{b}{sl}{
+   <->\droid@scale DroidSerif-Bold-Slanted-lgr
 }{}
 
-\DeclareFontShape{LGR}{fdr}{b}{scsl}{
-   <->\droid@fdr@scale lgr-DroidSerif-Bold-Slanted-SmallCaps
+\DeclareFontShape{LGR}{fdr}{b}{ui}{
+   <->\droid@scale DroidSerif-BoldItalic-Upright-lgr
 }{}
 
-\DeclareFontShape{LGR}{fdr}{b}{it}{
-   <->\droid@fdr@scale lgr-DroidSerif-BoldItalic
+\DeclareFontShape{LGR}{fdr}{b}{sc}{
+   <->\droid@scale DroidSerif-Bold-SmallCaps-lgr
 }{}
 
-\DeclareFontShape{LGR}{fdr}{b}{up}{
-   <->\droid@fdr@scale lgr-DroidSerif-BoldItalic-Upright
+\DeclareFontShape{LGR}{fdr}{b}{scit}{
+   <->\droid@scale DroidSerif-BoldItalic-SmallCaps-lgr
 }{}
 
-\DeclareFontShape{LGR}{fdr}{b}{scit}{
-   <->\droid@fdr@scale lgr-DroidSerif-BoldItalic-SmallCaps
+\DeclareFontShape{LGR}{fdr}{b}{scsl}{
+   <->\droid@scale DroidSerif-Bold-Slanted-SmallCaps-lgr
 }{}
 
-\DeclareFontShape{LGR}{fdr}{b}{scup}{
-   <->\droid@fdr@scale lgr-DroidSerif-BoldItalic-Upright-SmallCaps
+\DeclareFontShape{LGR}{fdr}{b}{scui}{
+   <->\droid@scale DroidSerif-BoldItalic-Upright-SmallCaps-lgr
 }{}
 
 \DeclareFontShape{LGR}{fdr}{bx}{n}{<->ssub * fdr/b/n}{}
+\DeclareFontShape{LGR}{fdr}{bx}{it}{<->ssub * fdr/b/it}{}
 \DeclareFontShape{LGR}{fdr}{bx}{sl}{<->ssub * fdr/b/sl}{}
+\DeclareFontShape{LGR}{fdr}{bx}{ui}{<->ssub * fdr/b/ui}{}
 \DeclareFontShape{LGR}{fdr}{bx}{sc}{<->ssub * fdr/b/sc}{}
-\DeclareFontShape{LGR}{fdr}{bx}{scsl}{<->ssub * fdr/b/scsl}{}
-\DeclareFontShape{LGR}{fdr}{bx}{it}{<->ssub * fdr/b/it}{}
-\DeclareFontShape{LGR}{fdr}{bx}{up}{<->ssub * fdr/b/up}{}
 \DeclareFontShape{LGR}{fdr}{bx}{scit}{<->ssub * fdr/b/scit}{}
-\DeclareFontShape{LGR}{fdr}{bx}{scup}{<->ssub * fdr/b/scup}{}
+\DeclareFontShape{LGR}{fdr}{bx}{scsl}{<->ssub * fdr/b/scsl}{}
+\DeclareFontShape{LGR}{fdr}{bx}{scui}{<->ssub * fdr/b/scui}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/droid/lgrfds.fd b/Master/texmf-dist/tex/latex/droid/lgrfds.fd
index c5f1eb1d406..a34de05e0bb 100644
--- a/Master/texmf-dist/tex/latex/droid/lgrfds.fd
+++ b/Master/texmf-dist/tex/latex/droid/lgrfds.fd
@@ -1,48 +1,48 @@
 %Filename: lgrfds.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{lgrfds.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for LGR/fds.]
+   [2011/08/21 Fontinst v1.933 font definitions for LGR/fds.]
 
-\expandafter\ifx\csname droid@fds@scale\endcsname\relax
-  \let\droid@fds@scale\@empty
+\expandafter\ifx\csname droid@scale\endcsname\relax
+  \let\droid@scale\@empty
 \fi
 
 \DeclareFontFamily{LGR}{fds}{}
 
 \DeclareFontShape{LGR}{fds}{m}{n}{
-   <->\droid@fds@scale lgr-DroidSans
+   <->\droid@scale DroidSans-lgr
 }{}
 
 \DeclareFontShape{LGR}{fds}{m}{sl}{
-   <->\droid@fds@scale lgr-DroidSans-Slanted
+   <->\droid@scale DroidSans-Slanted-lgr
 }{}
 
 \DeclareFontShape{LGR}{fds}{m}{sc}{
-   <->\droid@fds@scale lgr-DroidSans-SmallCaps
+   <->\droid@scale DroidSans-SmallCaps-lgr
 }{}
 
 \DeclareFontShape{LGR}{fds}{m}{scsl}{
-   <->\droid@fds@scale lgr-DroidSans-Slanted-SmallCaps
+   <->\droid@scale DroidSans-Slanted-SmallCaps-lgr
 }{}
 
 \DeclareFontShape{LGR}{fds}{b}{n}{
-   <->\droid@fds@scale lgr-DroidSans-Bold
+   <->\droid@scale DroidSans-Bold-lgr
 }{}
 
 \DeclareFontShape{LGR}{fds}{b}{sl}{
-   <->\droid@fds@scale lgr-DroidSans-Bold-Slanted
+   <->\droid@scale DroidSans-Bold-Slanted-lgr
 }{}
 
 \DeclareFontShape{LGR}{fds}{b}{sc}{
-   <->\droid@fds@scale lgr-DroidSans-Bold-SmallCaps
+   <->\droid@scale DroidSans-Bold-SmallCaps-lgr
 }{}
 
 \DeclareFontShape{LGR}{fds}{b}{scsl}{
-   <->\droid@fds@scale lgr-DroidSans-Bold-Slanted-SmallCaps
+   <->\droid@scale DroidSans-Bold-Slanted-SmallCaps-lgr
 }{}
 
 \DeclareFontShape{LGR}{fds}{m}{it}{<->ssub * fds/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/ot1fdm.fd b/Master/texmf-dist/tex/latex/droid/ot1fdm.fd
index 2e04581646f..8a4afcde57c 100644
--- a/Master/texmf-dist/tex/latex/droid/ot1fdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/ot1fdm.fd
@@ -1,32 +1,32 @@
 %Filename: ot1fdm.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{ot1fdm.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for OT1/fdm.]
+   [2011/08/21 Fontinst v1.933 font definitions for OT1/fdm.]
 
-\expandafter\ifx\csname droid@fdm@scale\endcsname\relax
-  \let\droid@fdm@scale\@empty
+\expandafter\ifx\csname droid@scale\endcsname\relax
+  \let\droid@scale\@empty
 \fi
 
 \DeclareFontFamily{OT1}{fdm}{}
 
 \DeclareFontShape{OT1}{fdm}{m}{n}{
-   <->\droid@fdm@scale ot1-DroidSansMono
+   <->\droid@scale DroidSansMono-ot1
 }{}
 
 \DeclareFontShape{OT1}{fdm}{m}{sl}{
-   <->\droid@fdm@scale ot1-DroidSansMono-Slanted
+   <->\droid@scale DroidSansMono-Slanted-ot1
 }{}
 
 \DeclareFontShape{OT1}{fdm}{m}{sc}{
-   <->\droid@fdm@scale ot1-DroidSansMono-SmallCaps
+   <->\droid@scale DroidSansMono-SmallCaps-ot1
 }{}
 
 \DeclareFontShape{OT1}{fdm}{m}{scsl}{
-   <->\droid@fdm@scale ot1-DroidSansMono-Slanted-SmallCaps
+   <->\droid@scale DroidSansMono-Slanted-SmallCaps-ot1
 }{}
 
 \DeclareFontShape{OT1}{fdm}{m}{it}{<->ssub * fdm/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/ot1fdr.fd b/Master/texmf-dist/tex/latex/droid/ot1fdr.fd
index 468646676cc..578ff67f11f 100644
--- a/Master/texmf-dist/tex/latex/droid/ot1fdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/ot1fdr.fd
@@ -1,89 +1,89 @@
 %Filename: ot1fdr.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{ot1fdr.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for OT1/fdr.]
+   [2011/08/21 Fontinst v1.933 font definitions for OT1/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{OT1}{fdr}{}
 
 \DeclareFontShape{OT1}{fdr}{m}{n}{
-   <->\droid@fdr@scale ot1-DroidSerif-Regular
+   <->\droid@scale DroidSerif-Regular-ot1
 }{}
 
-\DeclareFontShape{OT1}{fdr}{m}{sl}{
-   <->\droid@fdr@scale ot1-DroidSerif-Regular-Slanted
+\DeclareFontShape{OT1}{fdr}{m}{it}{
+   <->\droid@scale DroidSerif-Italic-ot1
 }{}
 
-\DeclareFontShape{OT1}{fdr}{m}{sc}{
-   <->\droid@fdr@scale ot1-DroidSerif-Regular-SmallCaps
+\DeclareFontShape{OT1}{fdr}{m}{sl}{
+   <->\droid@scale DroidSerif-Regular-Slanted-ot1
 }{}
 
-\DeclareFontShape{OT1}{fdr}{m}{scsl}{
-   <->\droid@fdr@scale ot1-DroidSerif-Regular-Slanted-SmallCaps
+\DeclareFontShape{OT1}{fdr}{m}{ui}{
+   <->\droid@scale DroidSerif-Italic-Upright-ot1
 }{}
 
-\DeclareFontShape{OT1}{fdr}{m}{it}{
-   <->\droid@fdr@scale ot1-DroidSerif-Italic
+\DeclareFontShape{OT1}{fdr}{m}{sc}{
+   <->\droid@scale DroidSerif-Regular-SmallCaps-ot1
 }{}
 
-\DeclareFontShape{OT1}{fdr}{m}{up}{
-   <->\droid@fdr@scale ot1-DroidSerif-Italic-Upright
+\DeclareFontShape{OT1}{fdr}{m}{scit}{
+   <->\droid@scale DroidSerif-Italic-SmallCaps-ot1
 }{}
 
-\DeclareFontShape{OT1}{fdr}{m}{scit}{
-   <->\droid@fdr@scale ot1-DroidSerif-Italic-SmallCaps
+\DeclareFontShape{OT1}{fdr}{m}{scsl}{
+   <->\droid@scale DroidSerif-Regular-Slanted-SmallCaps-ot1
 }{}
 
-\DeclareFontShape{OT1}{fdr}{m}{scup}{
-   <->\droid@fdr@scale ot1-DroidSerif-Italic-Upright-SmallCaps
+\DeclareFontShape{OT1}{fdr}{m}{scui}{
+   <->\droid@scale DroidSerif-Italic-Upright-SmallCaps-ot1
 }{}
 
 \DeclareFontShape{OT1}{fdr}{b}{n}{
-   <->\droid@fdr@scale ot1-DroidSerif-Bold
+   <->\droid@scale DroidSerif-Bold-ot1
 }{}
 
-\DeclareFontShape{OT1}{fdr}{b}{sl}{
-   <->\droid@fdr@scale ot1-DroidSerif-Bold-Slanted
+\DeclareFontShape{OT1}{fdr}{b}{it}{
+   <->\droid@scale DroidSerif-BoldItalic-ot1
 }{}
 
-\DeclareFontShape{OT1}{fdr}{b}{sc}{
-   <->\droid@fdr@scale ot1-DroidSerif-Bold-SmallCaps
+\DeclareFontShape{OT1}{fdr}{b}{sl}{
+   <->\droid@scale DroidSerif-Bold-Slanted-ot1
 }{}
 
-\DeclareFontShape{OT1}{fdr}{b}{scsl}{
-   <->\droid@fdr@scale ot1-DroidSerif-Bold-Slanted-SmallCaps
+\DeclareFontShape{OT1}{fdr}{b}{ui}{
+   <->\droid@scale DroidSerif-BoldItalic-Upright-ot1
 }{}
 
-\DeclareFontShape{OT1}{fdr}{b}{it}{
-   <->\droid@fdr@scale ot1-DroidSerif-BoldItalic
+\DeclareFontShape{OT1}{fdr}{b}{sc}{
+   <->\droid@scale DroidSerif-Bold-SmallCaps-ot1
 }{}
 
-\DeclareFontShape{OT1}{fdr}{b}{up}{
-   <->\droid@fdr@scale ot1-DroidSerif-BoldItalic-Upright
+\DeclareFontShape{OT1}{fdr}{b}{scit}{
+   <->\droid@scale DroidSerif-BoldItalic-SmallCaps-ot1
 }{}
 
-\DeclareFontShape{OT1}{fdr}{b}{scit}{
-   <->\droid@fdr@scale ot1-DroidSerif-BoldItalic-SmallCaps
+\DeclareFontShape{OT1}{fdr}{b}{scsl}{
+   <->\droid@scale DroidSerif-Bold-Slanted-SmallCaps-ot1
 }{}
 
-\DeclareFontShape{OT1}{fdr}{b}{scup}{
-   <->\droid@fdr@scale ot1-DroidSerif-BoldItalic-Upright-SmallCaps
+\DeclareFontShape{OT1}{fdr}{b}{scui}{
+   <->\droid@scale DroidSerif-BoldItalic-Upright-SmallCaps-ot1
 }{}
 
 \DeclareFontShape{OT1}{fdr}{bx}{n}{<->ssub * fdr/b/n}{}
+\DeclareFontShape{OT1}{fdr}{bx}{it}{<->ssub * fdr/b/it}{}
 \DeclareFontShape{OT1}{fdr}{bx}{sl}{<->ssub * fdr/b/sl}{}
+\DeclareFontShape{OT1}{fdr}{bx}{ui}{<->ssub * fdr/b/ui}{}
 \DeclareFontShape{OT1}{fdr}{bx}{sc}{<->ssub * fdr/b/sc}{}
-\DeclareFontShape{OT1}{fdr}{bx}{scsl}{<->ssub * fdr/b/scsl}{}
-\DeclareFontShape{OT1}{fdr}{bx}{it}{<->ssub * fdr/b/it}{}
-\DeclareFontShape{OT1}{fdr}{bx}{up}{<->ssub * fdr/b/up}{}
 \DeclareFontShape{OT1}{fdr}{bx}{scit}{<->ssub * fdr/b/scit}{}
-\DeclareFontShape{OT1}{fdr}{bx}{scup}{<->ssub * fdr/b/scup}{}
+\DeclareFontShape{OT1}{fdr}{bx}{scsl}{<->ssub * fdr/b/scsl}{}
+\DeclareFontShape{OT1}{fdr}{bx}{scui}{<->ssub * fdr/b/scui}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/droid/ot1fds.fd b/Master/texmf-dist/tex/latex/droid/ot1fds.fd
index ef342bdfc8f..01c2cdc179a 100644
--- a/Master/texmf-dist/tex/latex/droid/ot1fds.fd
+++ b/Master/texmf-dist/tex/latex/droid/ot1fds.fd
@@ -1,48 +1,48 @@
 %Filename: ot1fds.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{ot1fds.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for OT1/fds.]
+   [2011/08/21 Fontinst v1.933 font definitions for OT1/fds.]
 
-\expandafter\ifx\csname droid@fds@scale\endcsname\relax
-  \let\droid@fds@scale\@empty
+\expandafter\ifx\csname droid@scale\endcsname\relax
+  \let\droid@scale\@empty
 \fi
 
 \DeclareFontFamily{OT1}{fds}{}
 
 \DeclareFontShape{OT1}{fds}{m}{n}{
-   <->\droid@fds@scale ot1-DroidSans
+   <->\droid@scale DroidSans-ot1
 }{}
 
 \DeclareFontShape{OT1}{fds}{m}{sl}{
-   <->\droid@fds@scale ot1-DroidSans-Slanted
+   <->\droid@scale DroidSans-Slanted-ot1
 }{}
 
 \DeclareFontShape{OT1}{fds}{m}{sc}{
-   <->\droid@fds@scale ot1-DroidSans-SmallCaps
+   <->\droid@scale DroidSans-SmallCaps-ot1
 }{}
 
 \DeclareFontShape{OT1}{fds}{m}{scsl}{
-   <->\droid@fds@scale ot1-DroidSans-Slanted-SmallCaps
+   <->\droid@scale DroidSans-Slanted-SmallCaps-ot1
 }{}
 
 \DeclareFontShape{OT1}{fds}{b}{n}{
-   <->\droid@fds@scale ot1-DroidSans-Bold
+   <->\droid@scale DroidSans-Bold-ot1
 }{}
 
 \DeclareFontShape{OT1}{fds}{b}{sl}{
-   <->\droid@fds@scale ot1-DroidSans-Bold-Slanted
+   <->\droid@scale DroidSans-Bold-Slanted-ot1
 }{}
 
 \DeclareFontShape{OT1}{fds}{b}{sc}{
-   <->\droid@fds@scale ot1-DroidSans-Bold-SmallCaps
+   <->\droid@scale DroidSans-Bold-SmallCaps-ot1
 }{}
 
 \DeclareFontShape{OT1}{fds}{b}{scsl}{
-   <->\droid@fds@scale ot1-DroidSans-Bold-Slanted-SmallCaps
+   <->\droid@scale DroidSans-Bold-Slanted-SmallCaps-ot1
 }{}
 
 \DeclareFontShape{OT1}{fds}{m}{it}{<->ssub * fds/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t1fdm.fd b/Master/texmf-dist/tex/latex/droid/t1fdm.fd
index 9240ec5ef4f..73fcb01f41f 100644
--- a/Master/texmf-dist/tex/latex/droid/t1fdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/t1fdm.fd
@@ -1,32 +1,32 @@
 %Filename: t1fdm.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{t1fdm.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for T1/fdm.]
+   [2011/08/21 Fontinst v1.933 font definitions for T1/fdm.]
 
-\expandafter\ifx\csname droid@fdm@scale\endcsname\relax
-  \let\droid@fdm@scale\@empty
+\expandafter\ifx\csname droid@scale\endcsname\relax
+  \let\droid@scale\@empty
 \fi
 
 \DeclareFontFamily{T1}{fdm}{}
 
 \DeclareFontShape{T1}{fdm}{m}{n}{
-   <->\droid@fdm@scale t1-DroidSansMono
+   <->\droid@scale DroidSansMono-t1
 }{}
 
 \DeclareFontShape{T1}{fdm}{m}{sl}{
-   <->\droid@fdm@scale t1-DroidSansMono-Slanted
+   <->\droid@scale DroidSansMono-Slanted-t1
 }{}
 
 \DeclareFontShape{T1}{fdm}{m}{sc}{
-   <->\droid@fdm@scale t1-DroidSansMono-SmallCaps
+   <->\droid@scale DroidSansMono-SmallCaps-t1
 }{}
 
 \DeclareFontShape{T1}{fdm}{m}{scsl}{
-   <->\droid@fdm@scale t1-DroidSansMono-Slanted-SmallCaps
+   <->\droid@scale DroidSansMono-Slanted-SmallCaps-t1
 }{}
 
 \DeclareFontShape{T1}{fdm}{m}{it}{<->ssub * fdm/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t1fdr.fd b/Master/texmf-dist/tex/latex/droid/t1fdr.fd
index 4ccb8287854..69687e540c7 100644
--- a/Master/texmf-dist/tex/latex/droid/t1fdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/t1fdr.fd
@@ -1,89 +1,89 @@
 %Filename: t1fdr.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{t1fdr.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for T1/fdr.]
+   [2011/08/21 Fontinst v1.933 font definitions for T1/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{T1}{fdr}{}
 
 \DeclareFontShape{T1}{fdr}{m}{n}{
-   <->\droid@fdr@scale t1-DroidSerif-Regular
+   <->\droid@scale DroidSerif-Regular-t1
 }{}
 
-\DeclareFontShape{T1}{fdr}{m}{sl}{
-   <->\droid@fdr@scale t1-DroidSerif-Regular-Slanted
+\DeclareFontShape{T1}{fdr}{m}{it}{
+   <->\droid@scale DroidSerif-Italic-t1
 }{}
 
-\DeclareFontShape{T1}{fdr}{m}{sc}{
-   <->\droid@fdr@scale t1-DroidSerif-Regular-SmallCaps
+\DeclareFontShape{T1}{fdr}{m}{sl}{
+   <->\droid@scale DroidSerif-Regular-Slanted-t1
 }{}
 
-\DeclareFontShape{T1}{fdr}{m}{scsl}{
-   <->\droid@fdr@scale t1-DroidSerif-Regular-Slanted-SmallCaps
+\DeclareFontShape{T1}{fdr}{m}{ui}{
+   <->\droid@scale DroidSerif-Italic-Upright-t1
 }{}
 
-\DeclareFontShape{T1}{fdr}{m}{it}{
-   <->\droid@fdr@scale t1-DroidSerif-Italic
+\DeclareFontShape{T1}{fdr}{m}{sc}{
+   <->\droid@scale DroidSerif-Regular-SmallCaps-t1
 }{}
 
-\DeclareFontShape{T1}{fdr}{m}{up}{
-   <->\droid@fdr@scale t1-DroidSerif-Italic-Upright
+\DeclareFontShape{T1}{fdr}{m}{scit}{
+   <->\droid@scale DroidSerif-Italic-SmallCaps-t1
 }{}
 
-\DeclareFontShape{T1}{fdr}{m}{scit}{
-   <->\droid@fdr@scale t1-DroidSerif-Italic-SmallCaps
+\DeclareFontShape{T1}{fdr}{m}{scsl}{
+   <->\droid@scale DroidSerif-Regular-Slanted-SmallCaps-t1
 }{}
 
-\DeclareFontShape{T1}{fdr}{m}{scup}{
-   <->\droid@fdr@scale t1-DroidSerif-Italic-Upright-SmallCaps
+\DeclareFontShape{T1}{fdr}{m}{scui}{
+   <->\droid@scale DroidSerif-Italic-Upright-SmallCaps-t1
 }{}
 
 \DeclareFontShape{T1}{fdr}{b}{n}{
-   <->\droid@fdr@scale t1-DroidSerif-Bold
+   <->\droid@scale DroidSerif-Bold-t1
 }{}
 
-\DeclareFontShape{T1}{fdr}{b}{sl}{
-   <->\droid@fdr@scale t1-DroidSerif-Bold-Slanted
+\DeclareFontShape{T1}{fdr}{b}{it}{
+   <->\droid@scale DroidSerif-BoldItalic-t1
 }{}
 
-\DeclareFontShape{T1}{fdr}{b}{sc}{
-   <->\droid@fdr@scale t1-DroidSerif-Bold-SmallCaps
+\DeclareFontShape{T1}{fdr}{b}{sl}{
+   <->\droid@scale DroidSerif-Bold-Slanted-t1
 }{}
 
-\DeclareFontShape{T1}{fdr}{b}{scsl}{
-   <->\droid@fdr@scale t1-DroidSerif-Bold-Slanted-SmallCaps
+\DeclareFontShape{T1}{fdr}{b}{ui}{
+   <->\droid@scale DroidSerif-BoldItalic-Upright-t1
 }{}
 
-\DeclareFontShape{T1}{fdr}{b}{it}{
-   <->\droid@fdr@scale t1-DroidSerif-BoldItalic
+\DeclareFontShape{T1}{fdr}{b}{sc}{
+   <->\droid@scale DroidSerif-Bold-SmallCaps-t1
 }{}
 
-\DeclareFontShape{T1}{fdr}{b}{up}{
-   <->\droid@fdr@scale t1-DroidSerif-BoldItalic-Upright
+\DeclareFontShape{T1}{fdr}{b}{scit}{
+   <->\droid@scale DroidSerif-BoldItalic-SmallCaps-t1
 }{}
 
-\DeclareFontShape{T1}{fdr}{b}{scit}{
-   <->\droid@fdr@scale t1-DroidSerif-BoldItalic-SmallCaps
+\DeclareFontShape{T1}{fdr}{b}{scsl}{
+   <->\droid@scale DroidSerif-Bold-Slanted-SmallCaps-t1
 }{}
 
-\DeclareFontShape{T1}{fdr}{b}{scup}{
-   <->\droid@fdr@scale t1-DroidSerif-BoldItalic-Upright-SmallCaps
+\DeclareFontShape{T1}{fdr}{b}{scui}{
+   <->\droid@scale DroidSerif-BoldItalic-Upright-SmallCaps-t1
 }{}
 
 \DeclareFontShape{T1}{fdr}{bx}{n}{<->ssub * fdr/b/n}{}
+\DeclareFontShape{T1}{fdr}{bx}{it}{<->ssub * fdr/b/it}{}
 \DeclareFontShape{T1}{fdr}{bx}{sl}{<->ssub * fdr/b/sl}{}
+\DeclareFontShape{T1}{fdr}{bx}{ui}{<->ssub * fdr/b/ui}{}
 \DeclareFontShape{T1}{fdr}{bx}{sc}{<->ssub * fdr/b/sc}{}
-\DeclareFontShape{T1}{fdr}{bx}{scsl}{<->ssub * fdr/b/scsl}{}
-\DeclareFontShape{T1}{fdr}{bx}{it}{<->ssub * fdr/b/it}{}
-\DeclareFontShape{T1}{fdr}{bx}{up}{<->ssub * fdr/b/up}{}
 \DeclareFontShape{T1}{fdr}{bx}{scit}{<->ssub * fdr/b/scit}{}
-\DeclareFontShape{T1}{fdr}{bx}{scup}{<->ssub * fdr/b/scup}{}
+\DeclareFontShape{T1}{fdr}{bx}{scsl}{<->ssub * fdr/b/scsl}{}
+\DeclareFontShape{T1}{fdr}{bx}{scui}{<->ssub * fdr/b/scui}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/droid/t1fds.fd b/Master/texmf-dist/tex/latex/droid/t1fds.fd
index 40d8f6e0a6a..c01e0f7903e 100644
--- a/Master/texmf-dist/tex/latex/droid/t1fds.fd
+++ b/Master/texmf-dist/tex/latex/droid/t1fds.fd
@@ -1,48 +1,48 @@
 %Filename: t1fds.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{t1fds.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for T1/fds.]
+   [2011/08/21 Fontinst v1.933 font definitions for T1/fds.]
 
-\expandafter\ifx\csname droid@fds@scale\endcsname\relax
-  \let\droid@fds@scale\@empty
+\expandafter\ifx\csname droid@scale\endcsname\relax
+  \let\droid@scale\@empty
 \fi
 
 \DeclareFontFamily{T1}{fds}{}
 
 \DeclareFontShape{T1}{fds}{m}{n}{
-   <->\droid@fds@scale t1-DroidSans
+   <->\droid@scale DroidSans-t1
 }{}
 
 \DeclareFontShape{T1}{fds}{m}{sl}{
-   <->\droid@fds@scale t1-DroidSans-Slanted
+   <->\droid@scale DroidSans-Slanted-t1
 }{}
 
 \DeclareFontShape{T1}{fds}{m}{sc}{
-   <->\droid@fds@scale t1-DroidSans-SmallCaps
+   <->\droid@scale DroidSans-SmallCaps-t1
 }{}
 
 \DeclareFontShape{T1}{fds}{m}{scsl}{
-   <->\droid@fds@scale t1-DroidSans-Slanted-SmallCaps
+   <->\droid@scale DroidSans-Slanted-SmallCaps-t1
 }{}
 
 \DeclareFontShape{T1}{fds}{b}{n}{
-   <->\droid@fds@scale t1-DroidSans-Bold
+   <->\droid@scale DroidSans-Bold-t1
 }{}
 
 \DeclareFontShape{T1}{fds}{b}{sl}{
-   <->\droid@fds@scale t1-DroidSans-Bold-Slanted
+   <->\droid@scale DroidSans-Bold-Slanted-t1
 }{}
 
 \DeclareFontShape{T1}{fds}{b}{sc}{
-   <->\droid@fds@scale t1-DroidSans-Bold-SmallCaps
+   <->\droid@scale DroidSans-Bold-SmallCaps-t1
 }{}
 
 \DeclareFontShape{T1}{fds}{b}{scsl}{
-   <->\droid@fds@scale t1-DroidSans-Bold-Slanted-SmallCaps
+   <->\droid@scale DroidSans-Bold-Slanted-SmallCaps-t1
 }{}
 
 \DeclareFontShape{T1}{fds}{m}{it}{<->ssub * fds/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t2afdm.fd b/Master/texmf-dist/tex/latex/droid/t2afdm.fd
index 7b598ade66e..b83c7148d14 100644
--- a/Master/texmf-dist/tex/latex/droid/t2afdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2afdm.fd
@@ -1,32 +1,32 @@
 %Filename: t2afdm.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{t2afdm.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for T2A/fdm.]
+   [2011/08/21 Fontinst v1.933 font definitions for T2A/fdm.]
 
-\expandafter\ifx\csname droid@fdm@scale\endcsname\relax
-  \let\droid@fdm@scale\@empty
+\expandafter\ifx\csname droid@scale\endcsname\relax
+  \let\droid@scale\@empty
 \fi
 
 \DeclareFontFamily{T2A}{fdm}{}
 
 \DeclareFontShape{T2A}{fdm}{m}{n}{
-   <->\droid@fdm@scale t2a-DroidSansMono
+   <->\droid@scale DroidSansMono-t2a
 }{}
 
 \DeclareFontShape{T2A}{fdm}{m}{sl}{
-   <->\droid@fdm@scale t2a-DroidSansMono-Slanted
+   <->\droid@scale DroidSansMono-Slanted-t2a
 }{}
 
 \DeclareFontShape{T2A}{fdm}{m}{sc}{
-   <->\droid@fdm@scale t2a-DroidSansMono-SmallCaps
+   <->\droid@scale DroidSansMono-SmallCaps-t2a
 }{}
 
 \DeclareFontShape{T2A}{fdm}{m}{scsl}{
-   <->\droid@fdm@scale t2a-DroidSansMono-Slanted-SmallCaps
+   <->\droid@scale DroidSansMono-Slanted-SmallCaps-t2a
 }{}
 
 \DeclareFontShape{T2A}{fdm}{m}{it}{<->ssub * fdm/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t2afdr.fd b/Master/texmf-dist/tex/latex/droid/t2afdr.fd
index 40cfc78ded2..cda0ed17285 100644
--- a/Master/texmf-dist/tex/latex/droid/t2afdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2afdr.fd
@@ -1,89 +1,89 @@
 %Filename: t2afdr.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{t2afdr.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for T2A/fdr.]
+   [2011/08/21 Fontinst v1.933 font definitions for T2A/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{T2A}{fdr}{}
 
 \DeclareFontShape{T2A}{fdr}{m}{n}{
-   <->\droid@fdr@scale t2a-DroidSerif-Regular
+   <->\droid@scale DroidSerif-Regular-t2a
 }{}
 
-\DeclareFontShape{T2A}{fdr}{m}{sl}{
-   <->\droid@fdr@scale t2a-DroidSerif-Regular-Slanted
+\DeclareFontShape{T2A}{fdr}{m}{it}{
+   <->\droid@scale DroidSerif-Italic-t2a
 }{}
 
-\DeclareFontShape{T2A}{fdr}{m}{sc}{
-   <->\droid@fdr@scale t2a-DroidSerif-Regular-SmallCaps
+\DeclareFontShape{T2A}{fdr}{m}{sl}{
+   <->\droid@scale DroidSerif-Regular-Slanted-t2a
 }{}
 
-\DeclareFontShape{T2A}{fdr}{m}{scsl}{
-   <->\droid@fdr@scale t2a-DroidSerif-Regular-Slanted-SmallCaps
+\DeclareFontShape{T2A}{fdr}{m}{ui}{
+   <->\droid@scale DroidSerif-Italic-Upright-t2a
 }{}
 
-\DeclareFontShape{T2A}{fdr}{m}{it}{
-   <->\droid@fdr@scale t2a-DroidSerif-Italic
+\DeclareFontShape{T2A}{fdr}{m}{sc}{
+   <->\droid@scale DroidSerif-Regular-SmallCaps-t2a
 }{}
 
-\DeclareFontShape{T2A}{fdr}{m}{up}{
-   <->\droid@fdr@scale t2a-DroidSerif-Italic-Upright
+\DeclareFontShape{T2A}{fdr}{m}{scit}{
+   <->\droid@scale DroidSerif-Italic-SmallCaps-t2a
 }{}
 
-\DeclareFontShape{T2A}{fdr}{m}{scit}{
-   <->\droid@fdr@scale t2a-DroidSerif-Italic-SmallCaps
+\DeclareFontShape{T2A}{fdr}{m}{scsl}{
+   <->\droid@scale DroidSerif-Regular-Slanted-SmallCaps-t2a
 }{}
 
-\DeclareFontShape{T2A}{fdr}{m}{scup}{
-   <->\droid@fdr@scale t2a-DroidSerif-Italic-Upright-SmallCaps
+\DeclareFontShape{T2A}{fdr}{m}{scui}{
+   <->\droid@scale DroidSerif-Italic-Upright-SmallCaps-t2a
 }{}
 
 \DeclareFontShape{T2A}{fdr}{b}{n}{
-   <->\droid@fdr@scale t2a-DroidSerif-Bold
+   <->\droid@scale DroidSerif-Bold-t2a
 }{}
 
-\DeclareFontShape{T2A}{fdr}{b}{sl}{
-   <->\droid@fdr@scale t2a-DroidSerif-Bold-Slanted
+\DeclareFontShape{T2A}{fdr}{b}{it}{
+   <->\droid@scale DroidSerif-BoldItalic-t2a
 }{}
 
-\DeclareFontShape{T2A}{fdr}{b}{sc}{
-   <->\droid@fdr@scale t2a-DroidSerif-Bold-SmallCaps
+\DeclareFontShape{T2A}{fdr}{b}{sl}{
+   <->\droid@scale DroidSerif-Bold-Slanted-t2a
 }{}
 
-\DeclareFontShape{T2A}{fdr}{b}{scsl}{
-   <->\droid@fdr@scale t2a-DroidSerif-Bold-Slanted-SmallCaps
+\DeclareFontShape{T2A}{fdr}{b}{ui}{
+   <->\droid@scale DroidSerif-BoldItalic-Upright-t2a
 }{}
 
-\DeclareFontShape{T2A}{fdr}{b}{it}{
-   <->\droid@fdr@scale t2a-DroidSerif-BoldItalic
+\DeclareFontShape{T2A}{fdr}{b}{sc}{
+   <->\droid@scale DroidSerif-Bold-SmallCaps-t2a
 }{}
 
-\DeclareFontShape{T2A}{fdr}{b}{up}{
-   <->\droid@fdr@scale t2a-DroidSerif-BoldItalic-Upright
+\DeclareFontShape{T2A}{fdr}{b}{scit}{
+   <->\droid@scale DroidSerif-BoldItalic-SmallCaps-t2a
 }{}
 
-\DeclareFontShape{T2A}{fdr}{b}{scit}{
-   <->\droid@fdr@scale t2a-DroidSerif-BoldItalic-SmallCaps
+\DeclareFontShape{T2A}{fdr}{b}{scsl}{
+   <->\droid@scale DroidSerif-Bold-Slanted-SmallCaps-t2a
 }{}
 
-\DeclareFontShape{T2A}{fdr}{b}{scup}{
-   <->\droid@fdr@scale t2a-DroidSerif-BoldItalic-Upright-SmallCaps
+\DeclareFontShape{T2A}{fdr}{b}{scui}{
+   <->\droid@scale DroidSerif-BoldItalic-Upright-SmallCaps-t2a
 }{}
 
 \DeclareFontShape{T2A}{fdr}{bx}{n}{<->ssub * fdr/b/n}{}
+\DeclareFontShape{T2A}{fdr}{bx}{it}{<->ssub * fdr/b/it}{}
 \DeclareFontShape{T2A}{fdr}{bx}{sl}{<->ssub * fdr/b/sl}{}
+\DeclareFontShape{T2A}{fdr}{bx}{ui}{<->ssub * fdr/b/ui}{}
 \DeclareFontShape{T2A}{fdr}{bx}{sc}{<->ssub * fdr/b/sc}{}
-\DeclareFontShape{T2A}{fdr}{bx}{scsl}{<->ssub * fdr/b/scsl}{}
-\DeclareFontShape{T2A}{fdr}{bx}{it}{<->ssub * fdr/b/it}{}
-\DeclareFontShape{T2A}{fdr}{bx}{up}{<->ssub * fdr/b/up}{}
 \DeclareFontShape{T2A}{fdr}{bx}{scit}{<->ssub * fdr/b/scit}{}
-\DeclareFontShape{T2A}{fdr}{bx}{scup}{<->ssub * fdr/b/scup}{}
+\DeclareFontShape{T2A}{fdr}{bx}{scsl}{<->ssub * fdr/b/scsl}{}
+\DeclareFontShape{T2A}{fdr}{bx}{scui}{<->ssub * fdr/b/scui}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/droid/t2afds.fd b/Master/texmf-dist/tex/latex/droid/t2afds.fd
index 9db7d1d474b..d89ed7624be 100644
--- a/Master/texmf-dist/tex/latex/droid/t2afds.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2afds.fd
@@ -1,48 +1,48 @@
 %Filename: t2afds.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{t2afds.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for T2A/fds.]
+   [2011/08/21 Fontinst v1.933 font definitions for T2A/fds.]
 
-\expandafter\ifx\csname droid@fds@scale\endcsname\relax
-  \let\droid@fds@scale\@empty
+\expandafter\ifx\csname droid@scale\endcsname\relax
+  \let\droid@scale\@empty
 \fi
 
 \DeclareFontFamily{T2A}{fds}{}
 
 \DeclareFontShape{T2A}{fds}{m}{n}{
-   <->\droid@fds@scale t2a-DroidSans
+   <->\droid@scale DroidSans-t2a
 }{}
 
 \DeclareFontShape{T2A}{fds}{m}{sl}{
-   <->\droid@fds@scale t2a-DroidSans-Slanted
+   <->\droid@scale DroidSans-Slanted-t2a
 }{}
 
 \DeclareFontShape{T2A}{fds}{m}{sc}{
-   <->\droid@fds@scale t2a-DroidSans-SmallCaps
+   <->\droid@scale DroidSans-SmallCaps-t2a
 }{}
 
 \DeclareFontShape{T2A}{fds}{m}{scsl}{
-   <->\droid@fds@scale t2a-DroidSans-Slanted-SmallCaps
+   <->\droid@scale DroidSans-Slanted-SmallCaps-t2a
 }{}
 
 \DeclareFontShape{T2A}{fds}{b}{n}{
-   <->\droid@fds@scale t2a-DroidSans-Bold
+   <->\droid@scale DroidSans-Bold-t2a
 }{}
 
 \DeclareFontShape{T2A}{fds}{b}{sl}{
-   <->\droid@fds@scale t2a-DroidSans-Bold-Slanted
+   <->\droid@scale DroidSans-Bold-Slanted-t2a
 }{}
 
 \DeclareFontShape{T2A}{fds}{b}{sc}{
-   <->\droid@fds@scale t2a-DroidSans-Bold-SmallCaps
+   <->\droid@scale DroidSans-Bold-SmallCaps-t2a
 }{}
 
 \DeclareFontShape{T2A}{fds}{b}{scsl}{
-   <->\droid@fds@scale t2a-DroidSans-Bold-Slanted-SmallCaps
+   <->\droid@scale DroidSans-Bold-Slanted-SmallCaps-t2a
 }{}
 
 \DeclareFontShape{T2A}{fds}{m}{it}{<->ssub * fds/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t2bfdm.fd b/Master/texmf-dist/tex/latex/droid/t2bfdm.fd
index 337af6b8715..94ba346c3ea 100644
--- a/Master/texmf-dist/tex/latex/droid/t2bfdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2bfdm.fd
@@ -1,32 +1,32 @@
 %Filename: t2bfdm.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{t2bfdm.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for T2B/fdm.]
+   [2011/08/21 Fontinst v1.933 font definitions for T2B/fdm.]
 
-\expandafter\ifx\csname droid@fdm@scale\endcsname\relax
-  \let\droid@fdm@scale\@empty
+\expandafter\ifx\csname droid@scale\endcsname\relax
+  \let\droid@scale\@empty
 \fi
 
 \DeclareFontFamily{T2B}{fdm}{}
 
 \DeclareFontShape{T2B}{fdm}{m}{n}{
-   <->\droid@fdm@scale t2b-DroidSansMono
+   <->\droid@scale DroidSansMono-t2b
 }{}
 
 \DeclareFontShape{T2B}{fdm}{m}{sl}{
-   <->\droid@fdm@scale t2b-DroidSansMono-Slanted
+   <->\droid@scale DroidSansMono-Slanted-t2b
 }{}
 
 \DeclareFontShape{T2B}{fdm}{m}{sc}{
-   <->\droid@fdm@scale t2b-DroidSansMono-SmallCaps
+   <->\droid@scale DroidSansMono-SmallCaps-t2b
 }{}
 
 \DeclareFontShape{T2B}{fdm}{m}{scsl}{
-   <->\droid@fdm@scale t2b-DroidSansMono-Slanted-SmallCaps
+   <->\droid@scale DroidSansMono-Slanted-SmallCaps-t2b
 }{}
 
 \DeclareFontShape{T2B}{fdm}{m}{it}{<->ssub * fdm/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t2bfdr.fd b/Master/texmf-dist/tex/latex/droid/t2bfdr.fd
index 7075acbf4fc..1134f2773a4 100644
--- a/Master/texmf-dist/tex/latex/droid/t2bfdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2bfdr.fd
@@ -1,89 +1,89 @@
 %Filename: t2bfdr.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{t2bfdr.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for T2B/fdr.]
+   [2011/08/21 Fontinst v1.933 font definitions for T2B/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{T2B}{fdr}{}
 
 \DeclareFontShape{T2B}{fdr}{m}{n}{
-   <->\droid@fdr@scale t2b-DroidSerif-Regular
+   <->\droid@scale DroidSerif-Regular-t2b
 }{}
 
-\DeclareFontShape{T2B}{fdr}{m}{sl}{
-   <->\droid@fdr@scale t2b-DroidSerif-Regular-Slanted
+\DeclareFontShape{T2B}{fdr}{m}{it}{
+   <->\droid@scale DroidSerif-Italic-t2b
 }{}
 
-\DeclareFontShape{T2B}{fdr}{m}{sc}{
-   <->\droid@fdr@scale t2b-DroidSerif-Regular-SmallCaps
+\DeclareFontShape{T2B}{fdr}{m}{sl}{
+   <->\droid@scale DroidSerif-Regular-Slanted-t2b
 }{}
 
-\DeclareFontShape{T2B}{fdr}{m}{scsl}{
-   <->\droid@fdr@scale t2b-DroidSerif-Regular-Slanted-SmallCaps
+\DeclareFontShape{T2B}{fdr}{m}{ui}{
+   <->\droid@scale DroidSerif-Italic-Upright-t2b
 }{}
 
-\DeclareFontShape{T2B}{fdr}{m}{it}{
-   <->\droid@fdr@scale t2b-DroidSerif-Italic
+\DeclareFontShape{T2B}{fdr}{m}{sc}{
+   <->\droid@scale DroidSerif-Regular-SmallCaps-t2b
 }{}
 
-\DeclareFontShape{T2B}{fdr}{m}{up}{
-   <->\droid@fdr@scale t2b-DroidSerif-Italic-Upright
+\DeclareFontShape{T2B}{fdr}{m}{scit}{
+   <->\droid@scale DroidSerif-Italic-SmallCaps-t2b
 }{}
 
-\DeclareFontShape{T2B}{fdr}{m}{scit}{
-   <->\droid@fdr@scale t2b-DroidSerif-Italic-SmallCaps
+\DeclareFontShape{T2B}{fdr}{m}{scsl}{
+   <->\droid@scale DroidSerif-Regular-Slanted-SmallCaps-t2b
 }{}
 
-\DeclareFontShape{T2B}{fdr}{m}{scup}{
-   <->\droid@fdr@scale t2b-DroidSerif-Italic-Upright-SmallCaps
+\DeclareFontShape{T2B}{fdr}{m}{scui}{
+   <->\droid@scale DroidSerif-Italic-Upright-SmallCaps-t2b
 }{}
 
 \DeclareFontShape{T2B}{fdr}{b}{n}{
-   <->\droid@fdr@scale t2b-DroidSerif-Bold
+   <->\droid@scale DroidSerif-Bold-t2b
 }{}
 
-\DeclareFontShape{T2B}{fdr}{b}{sl}{
-   <->\droid@fdr@scale t2b-DroidSerif-Bold-Slanted
+\DeclareFontShape{T2B}{fdr}{b}{it}{
+   <->\droid@scale DroidSerif-BoldItalic-t2b
 }{}
 
-\DeclareFontShape{T2B}{fdr}{b}{sc}{
-   <->\droid@fdr@scale t2b-DroidSerif-Bold-SmallCaps
+\DeclareFontShape{T2B}{fdr}{b}{sl}{
+   <->\droid@scale DroidSerif-Bold-Slanted-t2b
 }{}
 
-\DeclareFontShape{T2B}{fdr}{b}{scsl}{
-   <->\droid@fdr@scale t2b-DroidSerif-Bold-Slanted-SmallCaps
+\DeclareFontShape{T2B}{fdr}{b}{ui}{
+   <->\droid@scale DroidSerif-BoldItalic-Upright-t2b
 }{}
 
-\DeclareFontShape{T2B}{fdr}{b}{it}{
-   <->\droid@fdr@scale t2b-DroidSerif-BoldItalic
+\DeclareFontShape{T2B}{fdr}{b}{sc}{
+   <->\droid@scale DroidSerif-Bold-SmallCaps-t2b
 }{}
 
-\DeclareFontShape{T2B}{fdr}{b}{up}{
-   <->\droid@fdr@scale t2b-DroidSerif-BoldItalic-Upright
+\DeclareFontShape{T2B}{fdr}{b}{scit}{
+   <->\droid@scale DroidSerif-BoldItalic-SmallCaps-t2b
 }{}
 
-\DeclareFontShape{T2B}{fdr}{b}{scit}{
-   <->\droid@fdr@scale t2b-DroidSerif-BoldItalic-SmallCaps
+\DeclareFontShape{T2B}{fdr}{b}{scsl}{
+   <->\droid@scale DroidSerif-Bold-Slanted-SmallCaps-t2b
 }{}
 
-\DeclareFontShape{T2B}{fdr}{b}{scup}{
-   <->\droid@fdr@scale t2b-DroidSerif-BoldItalic-Upright-SmallCaps
+\DeclareFontShape{T2B}{fdr}{b}{scui}{
+   <->\droid@scale DroidSerif-BoldItalic-Upright-SmallCaps-t2b
 }{}
 
 \DeclareFontShape{T2B}{fdr}{bx}{n}{<->ssub * fdr/b/n}{}
+\DeclareFontShape{T2B}{fdr}{bx}{it}{<->ssub * fdr/b/it}{}
 \DeclareFontShape{T2B}{fdr}{bx}{sl}{<->ssub * fdr/b/sl}{}
+\DeclareFontShape{T2B}{fdr}{bx}{ui}{<->ssub * fdr/b/ui}{}
 \DeclareFontShape{T2B}{fdr}{bx}{sc}{<->ssub * fdr/b/sc}{}
-\DeclareFontShape{T2B}{fdr}{bx}{scsl}{<->ssub * fdr/b/scsl}{}
-\DeclareFontShape{T2B}{fdr}{bx}{it}{<->ssub * fdr/b/it}{}
-\DeclareFontShape{T2B}{fdr}{bx}{up}{<->ssub * fdr/b/up}{}
 \DeclareFontShape{T2B}{fdr}{bx}{scit}{<->ssub * fdr/b/scit}{}
-\DeclareFontShape{T2B}{fdr}{bx}{scup}{<->ssub * fdr/b/scup}{}
+\DeclareFontShape{T2B}{fdr}{bx}{scsl}{<->ssub * fdr/b/scsl}{}
+\DeclareFontShape{T2B}{fdr}{bx}{scui}{<->ssub * fdr/b/scui}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/droid/t2bfds.fd b/Master/texmf-dist/tex/latex/droid/t2bfds.fd
index 6fee1e03eda..3f7451709de 100644
--- a/Master/texmf-dist/tex/latex/droid/t2bfds.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2bfds.fd
@@ -1,48 +1,48 @@
 %Filename: t2bfds.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{t2bfds.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for T2B/fds.]
+   [2011/08/21 Fontinst v1.933 font definitions for T2B/fds.]
 
-\expandafter\ifx\csname droid@fds@scale\endcsname\relax
-  \let\droid@fds@scale\@empty
+\expandafter\ifx\csname droid@scale\endcsname\relax
+  \let\droid@scale\@empty
 \fi
 
 \DeclareFontFamily{T2B}{fds}{}
 
 \DeclareFontShape{T2B}{fds}{m}{n}{
-   <->\droid@fds@scale t2b-DroidSans
+   <->\droid@scale DroidSans-t2b
 }{}
 
 \DeclareFontShape{T2B}{fds}{m}{sl}{
-   <->\droid@fds@scale t2b-DroidSans-Slanted
+   <->\droid@scale DroidSans-Slanted-t2b
 }{}
 
 \DeclareFontShape{T2B}{fds}{m}{sc}{
-   <->\droid@fds@scale t2b-DroidSans-SmallCaps
+   <->\droid@scale DroidSans-SmallCaps-t2b
 }{}
 
 \DeclareFontShape{T2B}{fds}{m}{scsl}{
-   <->\droid@fds@scale t2b-DroidSans-Slanted-SmallCaps
+   <->\droid@scale DroidSans-Slanted-SmallCaps-t2b
 }{}
 
 \DeclareFontShape{T2B}{fds}{b}{n}{
-   <->\droid@fds@scale t2b-DroidSans-Bold
+   <->\droid@scale DroidSans-Bold-t2b
 }{}
 
 \DeclareFontShape{T2B}{fds}{b}{sl}{
-   <->\droid@fds@scale t2b-DroidSans-Bold-Slanted
+   <->\droid@scale DroidSans-Bold-Slanted-t2b
 }{}
 
 \DeclareFontShape{T2B}{fds}{b}{sc}{
-   <->\droid@fds@scale t2b-DroidSans-Bold-SmallCaps
+   <->\droid@scale DroidSans-Bold-SmallCaps-t2b
 }{}
 
 \DeclareFontShape{T2B}{fds}{b}{scsl}{
-   <->\droid@fds@scale t2b-DroidSans-Bold-Slanted-SmallCaps
+   <->\droid@scale DroidSans-Bold-Slanted-SmallCaps-t2b
 }{}
 
 \DeclareFontShape{T2B}{fds}{m}{it}{<->ssub * fds/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t2cfdm.fd b/Master/texmf-dist/tex/latex/droid/t2cfdm.fd
index 0c638accd2c..2062286a414 100644
--- a/Master/texmf-dist/tex/latex/droid/t2cfdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2cfdm.fd
@@ -1,32 +1,32 @@
 %Filename: t2cfdm.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{t2cfdm.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for T2C/fdm.]
+   [2011/08/21 Fontinst v1.933 font definitions for T2C/fdm.]
 
-\expandafter\ifx\csname droid@fdm@scale\endcsname\relax
-  \let\droid@fdm@scale\@empty
+\expandafter\ifx\csname droid@scale\endcsname\relax
+  \let\droid@scale\@empty
 \fi
 
 \DeclareFontFamily{T2C}{fdm}{}
 
 \DeclareFontShape{T2C}{fdm}{m}{n}{
-   <->\droid@fdm@scale t2c-DroidSansMono
+   <->\droid@scale DroidSansMono-t2c
 }{}
 
 \DeclareFontShape{T2C}{fdm}{m}{sl}{
-   <->\droid@fdm@scale t2c-DroidSansMono-Slanted
+   <->\droid@scale DroidSansMono-Slanted-t2c
 }{}
 
 \DeclareFontShape{T2C}{fdm}{m}{sc}{
-   <->\droid@fdm@scale t2c-DroidSansMono-SmallCaps
+   <->\droid@scale DroidSansMono-SmallCaps-t2c
 }{}
 
 \DeclareFontShape{T2C}{fdm}{m}{scsl}{
-   <->\droid@fdm@scale t2c-DroidSansMono-Slanted-SmallCaps
+   <->\droid@scale DroidSansMono-Slanted-SmallCaps-t2c
 }{}
 
 \DeclareFontShape{T2C}{fdm}{m}{it}{<->ssub * fdm/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t2cfdr.fd b/Master/texmf-dist/tex/latex/droid/t2cfdr.fd
index 62646659e3b..3f657801243 100644
--- a/Master/texmf-dist/tex/latex/droid/t2cfdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2cfdr.fd
@@ -1,89 +1,89 @@
 %Filename: t2cfdr.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{t2cfdr.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for T2C/fdr.]
+   [2011/08/21 Fontinst v1.933 font definitions for T2C/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{T2C}{fdr}{}
 
 \DeclareFontShape{T2C}{fdr}{m}{n}{
-   <->\droid@fdr@scale t2c-DroidSerif-Regular
+   <->\droid@scale DroidSerif-Regular-t2c
 }{}
 
-\DeclareFontShape{T2C}{fdr}{m}{sl}{
-   <->\droid@fdr@scale t2c-DroidSerif-Regular-Slanted
+\DeclareFontShape{T2C}{fdr}{m}{it}{
+   <->\droid@scale DroidSerif-Italic-t2c
 }{}
 
-\DeclareFontShape{T2C}{fdr}{m}{sc}{
-   <->\droid@fdr@scale t2c-DroidSerif-Regular-SmallCaps
+\DeclareFontShape{T2C}{fdr}{m}{sl}{
+   <->\droid@scale DroidSerif-Regular-Slanted-t2c
 }{}
 
-\DeclareFontShape{T2C}{fdr}{m}{scsl}{
-   <->\droid@fdr@scale t2c-DroidSerif-Regular-Slanted-SmallCaps
+\DeclareFontShape{T2C}{fdr}{m}{ui}{
+   <->\droid@scale DroidSerif-Italic-Upright-t2c
 }{}
 
-\DeclareFontShape{T2C}{fdr}{m}{it}{
-   <->\droid@fdr@scale t2c-DroidSerif-Italic
+\DeclareFontShape{T2C}{fdr}{m}{sc}{
+   <->\droid@scale DroidSerif-Regular-SmallCaps-t2c
 }{}
 
-\DeclareFontShape{T2C}{fdr}{m}{up}{
-   <->\droid@fdr@scale t2c-DroidSerif-Italic-Upright
+\DeclareFontShape{T2C}{fdr}{m}{scit}{
+   <->\droid@scale DroidSerif-Italic-SmallCaps-t2c
 }{}
 
-\DeclareFontShape{T2C}{fdr}{m}{scit}{
-   <->\droid@fdr@scale t2c-DroidSerif-Italic-SmallCaps
+\DeclareFontShape{T2C}{fdr}{m}{scsl}{
+   <->\droid@scale DroidSerif-Regular-Slanted-SmallCaps-t2c
 }{}
 
-\DeclareFontShape{T2C}{fdr}{m}{scup}{
-   <->\droid@fdr@scale t2c-DroidSerif-Italic-Upright-SmallCaps
+\DeclareFontShape{T2C}{fdr}{m}{scui}{
+   <->\droid@scale DroidSerif-Italic-Upright-SmallCaps-t2c
 }{}
 
 \DeclareFontShape{T2C}{fdr}{b}{n}{
-   <->\droid@fdr@scale t2c-DroidSerif-Bold
+   <->\droid@scale DroidSerif-Bold-t2c
 }{}
 
-\DeclareFontShape{T2C}{fdr}{b}{sl}{
-   <->\droid@fdr@scale t2c-DroidSerif-Bold-Slanted
+\DeclareFontShape{T2C}{fdr}{b}{it}{
+   <->\droid@scale DroidSerif-BoldItalic-t2c
 }{}
 
-\DeclareFontShape{T2C}{fdr}{b}{sc}{
-   <->\droid@fdr@scale t2c-DroidSerif-Bold-SmallCaps
+\DeclareFontShape{T2C}{fdr}{b}{sl}{
+   <->\droid@scale DroidSerif-Bold-Slanted-t2c
 }{}
 
-\DeclareFontShape{T2C}{fdr}{b}{scsl}{
-   <->\droid@fdr@scale t2c-DroidSerif-Bold-Slanted-SmallCaps
+\DeclareFontShape{T2C}{fdr}{b}{ui}{
+   <->\droid@scale DroidSerif-BoldItalic-Upright-t2c
 }{}
 
-\DeclareFontShape{T2C}{fdr}{b}{it}{
-   <->\droid@fdr@scale t2c-DroidSerif-BoldItalic
+\DeclareFontShape{T2C}{fdr}{b}{sc}{
+   <->\droid@scale DroidSerif-Bold-SmallCaps-t2c
 }{}
 
-\DeclareFontShape{T2C}{fdr}{b}{up}{
-   <->\droid@fdr@scale t2c-DroidSerif-BoldItalic-Upright
+\DeclareFontShape{T2C}{fdr}{b}{scit}{
+   <->\droid@scale DroidSerif-BoldItalic-SmallCaps-t2c
 }{}
 
-\DeclareFontShape{T2C}{fdr}{b}{scit}{
-   <->\droid@fdr@scale t2c-DroidSerif-BoldItalic-SmallCaps
+\DeclareFontShape{T2C}{fdr}{b}{scsl}{
+   <->\droid@scale DroidSerif-Bold-Slanted-SmallCaps-t2c
 }{}
 
-\DeclareFontShape{T2C}{fdr}{b}{scup}{
-   <->\droid@fdr@scale t2c-DroidSerif-BoldItalic-Upright-SmallCaps
+\DeclareFontShape{T2C}{fdr}{b}{scui}{
+   <->\droid@scale DroidSerif-BoldItalic-Upright-SmallCaps-t2c
 }{}
 
 \DeclareFontShape{T2C}{fdr}{bx}{n}{<->ssub * fdr/b/n}{}
+\DeclareFontShape{T2C}{fdr}{bx}{it}{<->ssub * fdr/b/it}{}
 \DeclareFontShape{T2C}{fdr}{bx}{sl}{<->ssub * fdr/b/sl}{}
+\DeclareFontShape{T2C}{fdr}{bx}{ui}{<->ssub * fdr/b/ui}{}
 \DeclareFontShape{T2C}{fdr}{bx}{sc}{<->ssub * fdr/b/sc}{}
-\DeclareFontShape{T2C}{fdr}{bx}{scsl}{<->ssub * fdr/b/scsl}{}
-\DeclareFontShape{T2C}{fdr}{bx}{it}{<->ssub * fdr/b/it}{}
-\DeclareFontShape{T2C}{fdr}{bx}{up}{<->ssub * fdr/b/up}{}
 \DeclareFontShape{T2C}{fdr}{bx}{scit}{<->ssub * fdr/b/scit}{}
-\DeclareFontShape{T2C}{fdr}{bx}{scup}{<->ssub * fdr/b/scup}{}
+\DeclareFontShape{T2C}{fdr}{bx}{scsl}{<->ssub * fdr/b/scsl}{}
+\DeclareFontShape{T2C}{fdr}{bx}{scui}{<->ssub * fdr/b/scui}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/droid/t2cfds.fd b/Master/texmf-dist/tex/latex/droid/t2cfds.fd
index db0fd21cf29..da113f9dbb4 100644
--- a/Master/texmf-dist/tex/latex/droid/t2cfds.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2cfds.fd
@@ -1,48 +1,48 @@
 %Filename: t2cfds.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{t2cfds.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for T2C/fds.]
+   [2011/08/21 Fontinst v1.933 font definitions for T2C/fds.]
 
-\expandafter\ifx\csname droid@fds@scale\endcsname\relax
-  \let\droid@fds@scale\@empty
+\expandafter\ifx\csname droid@scale\endcsname\relax
+  \let\droid@scale\@empty
 \fi
 
 \DeclareFontFamily{T2C}{fds}{}
 
 \DeclareFontShape{T2C}{fds}{m}{n}{
-   <->\droid@fds@scale t2c-DroidSans
+   <->\droid@scale DroidSans-t2c
 }{}
 
 \DeclareFontShape{T2C}{fds}{m}{sl}{
-   <->\droid@fds@scale t2c-DroidSans-Slanted
+   <->\droid@scale DroidSans-Slanted-t2c
 }{}
 
 \DeclareFontShape{T2C}{fds}{m}{sc}{
-   <->\droid@fds@scale t2c-DroidSans-SmallCaps
+   <->\droid@scale DroidSans-SmallCaps-t2c
 }{}
 
 \DeclareFontShape{T2C}{fds}{m}{scsl}{
-   <->\droid@fds@scale t2c-DroidSans-Slanted-SmallCaps
+   <->\droid@scale DroidSans-Slanted-SmallCaps-t2c
 }{}
 
 \DeclareFontShape{T2C}{fds}{b}{n}{
-   <->\droid@fds@scale t2c-DroidSans-Bold
+   <->\droid@scale DroidSans-Bold-t2c
 }{}
 
 \DeclareFontShape{T2C}{fds}{b}{sl}{
-   <->\droid@fds@scale t2c-DroidSans-Bold-Slanted
+   <->\droid@scale DroidSans-Bold-Slanted-t2c
 }{}
 
 \DeclareFontShape{T2C}{fds}{b}{sc}{
-   <->\droid@fds@scale t2c-DroidSans-Bold-SmallCaps
+   <->\droid@scale DroidSans-Bold-SmallCaps-t2c
 }{}
 
 \DeclareFontShape{T2C}{fds}{b}{scsl}{
-   <->\droid@fds@scale t2c-DroidSans-Bold-Slanted-SmallCaps
+   <->\droid@scale DroidSans-Bold-Slanted-SmallCaps-t2c
 }{}
 
 \DeclareFontShape{T2C}{fds}{m}{it}{<->ssub * fds/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/ts1fdm.fd b/Master/texmf-dist/tex/latex/droid/ts1fdm.fd
index 2ad133b25db..ad01bb76b5a 100644
--- a/Master/texmf-dist/tex/latex/droid/ts1fdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/ts1fdm.fd
@@ -1,32 +1,32 @@
 %Filename: ts1fdm.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{ts1fdm.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for TS1/fdm.]
+   [2011/08/21 Fontinst v1.933 font definitions for TS1/fdm.]
 
-\expandafter\ifx\csname droid@fdm@scale\endcsname\relax
-  \let\droid@fdm@scale\@empty
+\expandafter\ifx\csname droid@scale\endcsname\relax
+  \let\droid@scale\@empty
 \fi
 
 \DeclareFontFamily{TS1}{fdm}{}
 
 \DeclareFontShape{TS1}{fdm}{m}{n}{
-   <->\droid@fdm@scale ts1-DroidSansMono
+   <->\droid@scale DroidSansMono-ts1
 }{}
 
 \DeclareFontShape{TS1}{fdm}{m}{sl}{
-   <->\droid@fdm@scale ts1-DroidSansMono-Slanted
+   <->\droid@scale DroidSansMono-Slanted-ts1
 }{}
 
 \DeclareFontShape{TS1}{fdm}{m}{sc}{
-   <->\droid@fdm@scale ts1-DroidSansMono
+   <->\droid@scale DroidSansMono-ts1
 }{}
 
 \DeclareFontShape{TS1}{fdm}{m}{scsl}{
-   <->\droid@fdm@scale ts1-DroidSansMono-Slanted
+   <->\droid@scale DroidSansMono-Slanted-ts1
 }{}
 
 \DeclareFontShape{TS1}{fdm}{m}{it}{<->ssub * fdm/m/sl}{}
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
diff --git a/Master/texmf-dist/tex/latex/droid/ts1fds.fd b/Master/texmf-dist/tex/latex/droid/ts1fds.fd
index 1304042cf4d..d496959d06a 100644
--- a/Master/texmf-dist/tex/latex/droid/ts1fds.fd
+++ b/Master/texmf-dist/tex/latex/droid/ts1fds.fd
@@ -1,48 +1,48 @@
 %Filename: ts1fds.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{ts1fds.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for TS1/fds.]
+   [2011/08/21 Fontinst v1.933 font definitions for TS1/fds.]
 
-\expandafter\ifx\csname droid@fds@scale\endcsname\relax
-  \let\droid@fds@scale\@empty
+\expandafter\ifx\csname droid@scale\endcsname\relax
+  \let\droid@scale\@empty
 \fi
 
 \DeclareFontFamily{TS1}{fds}{}
 
 \DeclareFontShape{TS1}{fds}{m}{n}{
-   <->\droid@fds@scale ts1-DroidSans
+   <->\droid@scale DroidSans-ts1
 }{}
 
 \DeclareFontShape{TS1}{fds}{m}{sl}{
-   <->\droid@fds@scale ts1-DroidSans-Slanted
+   <->\droid@scale DroidSans-Slanted-ts1
 }{}
 
 \DeclareFontShape{TS1}{fds}{m}{sc}{
-   <->\droid@fds@scale ts1-DroidSans
+   <->\droid@scale DroidSans-ts1
 }{}
 
 \DeclareFontShape{TS1}{fds}{m}{scsl}{
-   <->\droid@fds@scale ts1-DroidSans-Slanted
+   <->\droid@scale DroidSans-Slanted-ts1
 }{}
 
 \DeclareFontShape{TS1}{fds}{b}{n}{
-   <->\droid@fds@scale ts1-DroidSans-Bold
+   <->\droid@scale DroidSans-Bold-ts1
 }{}
 
 \DeclareFontShape{TS1}{fds}{b}{sl}{
-   <->\droid@fds@scale ts1-DroidSans-Bold-Slanted
+   <->\droid@scale DroidSans-Bold-Slanted-ts1
 }{}
 
 \DeclareFontShape{TS1}{fds}{b}{sc}{
-   <->\droid@fds@scale ts1-DroidSans-Bold
+   <->\droid@scale DroidSans-Bold-ts1
 }{}
 
 \DeclareFontShape{TS1}{fds}{b}{scsl}{
-   <->\droid@fds@scale ts1-DroidSans-Bold-Slanted
+   <->\droid@scale DroidSans-Bold-Slanted-ts1
 }{}
 
 \DeclareFontShape{TS1}{fds}{m}{it}{<->ssub * fds/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/x2fdm.fd b/Master/texmf-dist/tex/latex/droid/x2fdm.fd
index 30b3b14620a..b3c90d76bb0 100644
--- a/Master/texmf-dist/tex/latex/droid/x2fdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/x2fdm.fd
@@ -1,32 +1,32 @@
 %Filename: x2fdm.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{x2fdm.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for X2/fdm.]
+   [2011/08/21 Fontinst v1.933 font definitions for X2/fdm.]
 
-\expandafter\ifx\csname droid@fdm@scale\endcsname\relax
-  \let\droid@fdm@scale\@empty
+\expandafter\ifx\csname droid@scale\endcsname\relax
+  \let\droid@scale\@empty
 \fi
 
 \DeclareFontFamily{X2}{fdm}{}
 
 \DeclareFontShape{X2}{fdm}{m}{n}{
-   <->\droid@fdm@scale x2-DroidSansMono
+   <->\droid@scale DroidSansMono-x2
 }{}
 
 \DeclareFontShape{X2}{fdm}{m}{sl}{
-   <->\droid@fdm@scale x2-DroidSansMono-Slanted
+   <->\droid@scale DroidSansMono-Slanted-x2
 }{}
 
 \DeclareFontShape{X2}{fdm}{m}{sc}{
-   <->\droid@fdm@scale x2-DroidSansMono-SmallCaps
+   <->\droid@scale DroidSansMono-SmallCaps-x2
 }{}
 
 \DeclareFontShape{X2}{fdm}{m}{scsl}{
-   <->\droid@fdm@scale x2-DroidSansMono-Slanted-SmallCaps
+   <->\droid@scale DroidSansMono-Slanted-SmallCaps-x2
 }{}
 
 \DeclareFontShape{X2}{fdm}{m}{it}{<->ssub * fdm/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/x2fdr.fd b/Master/texmf-dist/tex/latex/droid/x2fdr.fd
index 7103072c33a..51435d608d8 100644
--- a/Master/texmf-dist/tex/latex/droid/x2fdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/x2fdr.fd
@@ -1,89 +1,89 @@
 %Filename: x2fdr.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{x2fdr.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for X2/fdr.]
+   [2011/08/21 Fontinst v1.933 font definitions for X2/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{X2}{fdr}{}
 
 \DeclareFontShape{X2}{fdr}{m}{n}{
-   <->\droid@fdr@scale x2-DroidSerif-Regular
+   <->\droid@scale DroidSerif-Regular-x2
 }{}
 
-\DeclareFontShape{X2}{fdr}{m}{sl}{
-   <->\droid@fdr@scale x2-DroidSerif-Regular-Slanted
+\DeclareFontShape{X2}{fdr}{m}{it}{
+   <->\droid@scale DroidSerif-Italic-x2
 }{}
 
-\DeclareFontShape{X2}{fdr}{m}{sc}{
-   <->\droid@fdr@scale x2-DroidSerif-Regular-SmallCaps
+\DeclareFontShape{X2}{fdr}{m}{sl}{
+   <->\droid@scale DroidSerif-Regular-Slanted-x2
 }{}
 
-\DeclareFontShape{X2}{fdr}{m}{scsl}{
-   <->\droid@fdr@scale x2-DroidSerif-Regular-Slanted-SmallCaps
+\DeclareFontShape{X2}{fdr}{m}{ui}{
+   <->\droid@scale DroidSerif-Italic-Upright-x2
 }{}
 
-\DeclareFontShape{X2}{fdr}{m}{it}{
-   <->\droid@fdr@scale x2-DroidSerif-Italic
+\DeclareFontShape{X2}{fdr}{m}{sc}{
+   <->\droid@scale DroidSerif-Regular-SmallCaps-x2
 }{}
 
-\DeclareFontShape{X2}{fdr}{m}{up}{
-   <->\droid@fdr@scale x2-DroidSerif-Italic-Upright
+\DeclareFontShape{X2}{fdr}{m}{scit}{
+   <->\droid@scale DroidSerif-Italic-SmallCaps-x2
 }{}
 
-\DeclareFontShape{X2}{fdr}{m}{scit}{
-   <->\droid@fdr@scale x2-DroidSerif-Italic-SmallCaps
+\DeclareFontShape{X2}{fdr}{m}{scsl}{
+   <->\droid@scale DroidSerif-Regular-Slanted-SmallCaps-x2
 }{}
 
-\DeclareFontShape{X2}{fdr}{m}{scup}{
-   <->\droid@fdr@scale x2-DroidSerif-Italic-Upright-SmallCaps
+\DeclareFontShape{X2}{fdr}{m}{scui}{
+   <->\droid@scale DroidSerif-Italic-Upright-SmallCaps-x2
 }{}
 
 \DeclareFontShape{X2}{fdr}{b}{n}{
-   <->\droid@fdr@scale x2-DroidSerif-Bold
+   <->\droid@scale DroidSerif-Bold-x2
 }{}
 
-\DeclareFontShape{X2}{fdr}{b}{sl}{
-   <->\droid@fdr@scale x2-DroidSerif-Bold-Slanted
+\DeclareFontShape{X2}{fdr}{b}{it}{
+   <->\droid@scale DroidSerif-BoldItalic-x2
 }{}
 
-\DeclareFontShape{X2}{fdr}{b}{sc}{
-   <->\droid@fdr@scale x2-DroidSerif-Bold-SmallCaps
+\DeclareFontShape{X2}{fdr}{b}{sl}{
+   <->\droid@scale DroidSerif-Bold-Slanted-x2
 }{}
 
-\DeclareFontShape{X2}{fdr}{b}{scsl}{
-   <->\droid@fdr@scale x2-DroidSerif-Bold-Slanted-SmallCaps
+\DeclareFontShape{X2}{fdr}{b}{ui}{
+   <->\droid@scale DroidSerif-BoldItalic-Upright-x2
 }{}
 
-\DeclareFontShape{X2}{fdr}{b}{it}{
-   <->\droid@fdr@scale x2-DroidSerif-BoldItalic
+\DeclareFontShape{X2}{fdr}{b}{sc}{
+   <->\droid@scale DroidSerif-Bold-SmallCaps-x2
 }{}
 
-\DeclareFontShape{X2}{fdr}{b}{up}{
-   <->\droid@fdr@scale x2-DroidSerif-BoldItalic-Upright
+\DeclareFontShape{X2}{fdr}{b}{scit}{
+   <->\droid@scale DroidSerif-BoldItalic-SmallCaps-x2
 }{}
 
-\DeclareFontShape{X2}{fdr}{b}{scit}{
-   <->\droid@fdr@scale x2-DroidSerif-BoldItalic-SmallCaps
+\DeclareFontShape{X2}{fdr}{b}{scsl}{
+   <->\droid@scale DroidSerif-Bold-Slanted-SmallCaps-x2
 }{}
 
-\DeclareFontShape{X2}{fdr}{b}{scup}{
-   <->\droid@fdr@scale x2-DroidSerif-BoldItalic-Upright-SmallCaps
+\DeclareFontShape{X2}{fdr}{b}{scui}{
+   <->\droid@scale DroidSerif-BoldItalic-Upright-SmallCaps-x2
 }{}
 
 \DeclareFontShape{X2}{fdr}{bx}{n}{<->ssub * fdr/b/n}{}
+\DeclareFontShape{X2}{fdr}{bx}{it}{<->ssub * fdr/b/it}{}
 \DeclareFontShape{X2}{fdr}{bx}{sl}{<->ssub * fdr/b/sl}{}
+\DeclareFontShape{X2}{fdr}{bx}{ui}{<->ssub * fdr/b/ui}{}
 \DeclareFontShape{X2}{fdr}{bx}{sc}{<->ssub * fdr/b/sc}{}
-\DeclareFontShape{X2}{fdr}{bx}{scsl}{<->ssub * fdr/b/scsl}{}
-\DeclareFontShape{X2}{fdr}{bx}{it}{<->ssub * fdr/b/it}{}
-\DeclareFontShape{X2}{fdr}{bx}{up}{<->ssub * fdr/b/up}{}
 \DeclareFontShape{X2}{fdr}{bx}{scit}{<->ssub * fdr/b/scit}{}
-\DeclareFontShape{X2}{fdr}{bx}{scup}{<->ssub * fdr/b/scup}{}
+\DeclareFontShape{X2}{fdr}{bx}{scsl}{<->ssub * fdr/b/scsl}{}
+\DeclareFontShape{X2}{fdr}{bx}{scui}{<->ssub * fdr/b/scui}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/droid/x2fds.fd b/Master/texmf-dist/tex/latex/droid/x2fds.fd
index d2e55456730..028e5eb7a38 100644
--- a/Master/texmf-dist/tex/latex/droid/x2fds.fd
+++ b/Master/texmf-dist/tex/latex/droid/x2fds.fd
@@ -1,48 +1,48 @@
 %Filename: x2fds.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{x2fds.fd}
-   [2011/03/24 Fontinst v1.927 font definitions for X2/fds.]
+   [2011/08/21 Fontinst v1.933 font definitions for X2/fds.]
 
-\expandafter\ifx\csname droid@fds@scale\endcsname\relax
-  \let\droid@fds@scale\@empty
+\expandafter\ifx\csname droid@scale\endcsname\relax
+  \let\droid@scale\@empty
 \fi
 
 \DeclareFontFamily{X2}{fds}{}
 
 \DeclareFontShape{X2}{fds}{m}{n}{
-   <->\droid@fds@scale x2-DroidSans
+   <->\droid@scale DroidSans-x2
 }{}
 
 \DeclareFontShape{X2}{fds}{m}{sl}{
-   <->\droid@fds@scale x2-DroidSans-Slanted
+   <->\droid@scale DroidSans-Slanted-x2
 }{}
 
 \DeclareFontShape{X2}{fds}{m}{sc}{
-   <->\droid@fds@scale x2-DroidSans-SmallCaps
+   <->\droid@scale DroidSans-SmallCaps-x2
 }{}
 
 \DeclareFontShape{X2}{fds}{m}{scsl}{
-   <->\droid@fds@scale x2-DroidSans-Slanted-SmallCaps
+   <->\droid@scale DroidSans-Slanted-SmallCaps-x2
 }{}
 
 \DeclareFontShape{X2}{fds}{b}{n}{
-   <->\droid@fds@scale x2-DroidSans-Bold
+   <->\droid@scale DroidSans-Bold-x2
 }{}
 
 \DeclareFontShape{X2}{fds}{b}{sl}{
-   <->\droid@fds@scale x2-DroidSans-Bold-Slanted
+   <->\droid@scale DroidSans-Bold-Slanted-x2
 }{}
 
 \DeclareFontShape{X2}{fds}{b}{sc}{
-   <->\droid@fds@scale x2-DroidSans-Bold-SmallCaps
+   <->\droid@scale DroidSans-Bold-SmallCaps-x2
 }{}
 
 \DeclareFontShape{X2}{fds}{b}{scsl}{
-   <->\droid@fds@scale x2-DroidSans-Bold-Slanted-SmallCaps
+   <->\droid@scale DroidSans-Bold-Slanted-SmallCaps-x2
 }{}
 
 \DeclareFontShape{X2}{fds}{m}{it}{<->ssub * fds/m/sl}{}