droid 2.0 (23aug11)

git-svn-id: svn://tug.org/texlive/trunk@23706 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2011-08-26 22:20:49 +0000
committer: Karl Berry <karl@freefriends.org> 2011-08-26 22:20:49 +0000
commit: 13c0a602069e9bf1dc330dd271d95d11ec60e621 (patch)
tree: cd797af95b63c7d2176ee3f7b3f23037c464e35c /Master/texmf-dist/source
parent: 48dd773c890f2b8a9b6cc6508f88eaef6e7bcb27 (diff)
30 files changed, 3855 insertions, 2261 deletions
diff --git a/Master/texmf-dist/source/droid/CHANGES b/Master/texmf-dist/source/droid/CHANGES
deleted file mode 100644
index b585d73a7fc..00000000000
--- a/Master/texmf-dist/source/droid/CHANGES
+++ /dev/null
@@ -1,10 +0,0 @@
-Changelog for version 1.1:
-	- clean comfortaa-fixlatin.etx
-
-Changelog for version 1.2:
-	- clean comfortaa-fixlatin.etx (again...)
-
-Changelog for version 1.3:
-	- fix metrics bugs in TS1 encoding
-	- fix documentation
-	- add samples PDFs
diff --git a/Master/texmf-dist/source/droid/README b/Master/texmf-dist/source/droid/README
deleted file mode 100644
index aea1e529c03..00000000000
--- a/Master/texmf-dist/source/droid/README
+++ /dev/null
@@ -1,29 +0,0 @@
---------------------
- Droid, version 1.3
---------------------
-
-The Droid typeface family was designed in the fall of 2006 by Ascender's Steve
-Matteson, as a commission from Google to create a set of system fonts for its
-Android platform. The goal was to provide optimal quality and comfort on a
-mobile handset when rendered in application menus, web browsers and for other
-screen text. The Droid family of fonts consists of Droid Serif, Droid Sans and
-Droid Sans Mono, licensed under the Apache License version 2.0, and available in
-the Android Git at
-http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts
-as TrueType files.
-
-This package provides support for this font family in LaTeX. It includes the
-original TrueType fonts, as well as Type 1 versions, converted for this package
-using FontForge for full support with Dvips.
-
-Notice that this package does not support the Droid Pro family sold by Ascender.
-
-Installation and usage instructions are described in
-doc/latex/droid/droid.pdf.
-
-This package is released under the LaTeX Project Public License, either version
-1.3c or above, with the exception of the .ttf and .pfb files, released under the
-Apache License version 2.0.
-
-If you have comments about the package, please contact Mohamed El Morabity
-(melmorabity AT fedoraproject DOT org).
diff --git a/Master/texmf-dist/source/droid/droid-drv.tex b/Master/texmf-dist/source/droid/droid-drv.tex
deleted file mode 100644
index 5f16a8c70c2..00000000000
--- a/Master/texmf-dist/source/droid/droid-drv.tex
+++ /dev/null
@@ -1,521 +0,0 @@
-%% droid-drv.tex
-%% Copyright 2010, 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)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\input fontinst.sty
-
-
-\setint{slant}{213}
-\setint{smallcapsscale}{800}
-
-\substitutesilent{scit}{scsl}
-
-
-\recordtransforms{droid-rec.tex}
-
-\foreach(encoding){ot1,t1,ts1,t2a,t2b,t2c,x2,lgr}
-  % Serif
-  \transformfont{raw-\str{encoding}-DroidSerif-Regular}{\reencodefont{\str{encoding}}{\fromafm{DroidSerif-Regular}}}
-  \transformfont{raw-\str{encoding}-DroidSerif-Regular-Slanted}{\slantfont{\int{slant}}\reencodefont{\str{encoding}}{\fromafm{DroidSerif-Regular}}}
-  \transformfont{raw-\str{encoding}-DroidSerif-Italic}{\reencodefont{\str{encoding}}{\fromafm{DroidSerif-Italic}}}
-  \transformfont{raw-\str{encoding}-DroidSerif-Italic-Upright}{\slantfont{-\int{slant}}\reencodefont{\str{encoding}}{\fromafm{DroidSerif-Italic}}}
-  \transformfont{raw-\str{encoding}-DroidSerif-Bold}{\reencodefont{\str{encoding}}{\fromafm{DroidSerif-Bold}}}
-  \transformfont{raw-\str{encoding}-DroidSerif-Bold-Slanted}{\slantfont{\int{slant}}\reencodefont{\str{encoding}}{\fromafm{DroidSerif-Bold}}}
-  \transformfont{raw-\str{encoding}-DroidSerif-BoldItalic}{\reencodefont{\str{encoding}}{\fromafm{DroidSerif-BoldItalic}}}
-  \transformfont{raw-\str{encoding}-DroidSerif-BoldItalic-Upright}{\slantfont{-\int{slant}}\reencodefont{\str{encoding}}{\fromafm{DroidSerif-BoldItalic}}}
-  % Sans
-  \transformfont{raw-\str{encoding}-DroidSans}{\reencodefont{\str{encoding}}{\fromafm{DroidSans}}}
-  \transformfont{raw-\str{encoding}-DroidSans-Slanted}{\slantfont{\int{slant}}\reencodefont{\str{encoding}}{\fromafm{DroidSans}}}
-  \transformfont{raw-\str{encoding}-DroidSans-Bold}{\reencodefont{\str{encoding}}{\fromafm{DroidSans-Bold}}}
-  \transformfont{raw-\str{encoding}-DroidSans-Bold-Slanted}{\slantfont{\int{slant}}\reencodefont{\str{encoding}}{\fromafm{DroidSans-Bold}}}
-  % Mono
-  \transformfont{raw-\str{encoding}-DroidSansMono}{\reencodefont{\str{encoding}}{\fromafm{DroidSansMono}}}
-  \transformfont{raw-\str{encoding}-DroidSansMono-Slanted}{\slantfont{\int{slant}}\reencodefont{\str{encoding}}{\fromafm{DroidSansMono}}}
-\endfor(encoding)
-
-\foreach(encoding){fixlatin,fixtextcomp,fixcyrillic,fixgreek}
-  % Serif
-  \transformfont{raw-\str{encoding}-DroidSerif-Regular}{\reencodefont{droid-\str{encoding}}{\fromafm{DroidSerif-Regular}}}
-  \transformfont{raw-\str{encoding}-DroidSerif-Regular-Slanted}{\slantfont{\int{slant}}\reencodefont{droid-\str{encoding}}{\fromafm{DroidSerif-Regular}}}
-  \transformfont{raw-\str{encoding}-DroidSerif-Italic}{\reencodefont{droid-\str{encoding}}{\fromafm{DroidSerif-Italic}}}
-  \transformfont{raw-\str{encoding}-DroidSerif-Italic-Upright}{\slantfont{-\int{slant}}\reencodefont{droid-\str{encoding}}{\fromafm{DroidSerif-Italic}}}
-  \transformfont{raw-\str{encoding}-DroidSerif-Bold}{\reencodefont{droid-\str{encoding}}{\fromafm{DroidSerif-Bold}}}
-  \transformfont{raw-\str{encoding}-DroidSerif-Bold-Slanted}{\slantfont{\int{slant}}\reencodefont{droid-\str{encoding}}{\fromafm{DroidSerif-Bold}}}
-  \transformfont{raw-\str{encoding}-DroidSerif-BoldItalic}{\reencodefont{droid-\str{encoding}}{\fromafm{DroidSerif-BoldItalic}}}
-  \transformfont{raw-\str{encoding}-DroidSerif-BoldItalic-Upright}{\slantfont{-\int{slant}}\reencodefont{droid-\str{encoding}}{\fromafm{DroidSerif-BoldItalic}}}
-  % Sans
-  \transformfont{raw-\str{encoding}-DroidSans}{\reencodefont{droid-\str{encoding}}{\fromafm{DroidSans}}}
-  \transformfont{raw-\str{encoding}-DroidSans-Slanted}{\slantfont{\int{slant}}\reencodefont{droid-\str{encoding}}{\fromafm{DroidSans}}}
-  \transformfont{raw-\str{encoding}-DroidSans-Bold}{\reencodefont{droid-\str{encoding}}{\fromafm{DroidSans-Bold}}}
-  \transformfont{raw-\str{encoding}-DroidSans-Bold-Slanted}{\slantfont{\int{slant}}\reencodefont{droid-\str{encoding}}{\fromafm{DroidSans-Bold}}}
-  % Mono
-  \transformfont{raw-\str{encoding}-DroidSansMono}{\reencodefont{droid-\str{encoding}}{\fromafm{DroidSansMono}}}
-  \transformfont{raw-\str{encoding}-DroidSansMono-Slanted}{\slantfont{\int{slant}}\reencodefont{droid-\str{encoding}}{\fromafm{DroidSansMono}}}
-\endfor(encoding)
-
-
-\input droid-reglyph
-
-
-\fontinstcc
-\def\fd_family#1#2#3{
-   \a_toks{#3}
-   \edef\lowercase_file{\lowercase{
-     \edef\noexpand\lowercase_file{#1#2.fd}}}
-   \lowercase_file
-   \open_out{\lowercase_file}
-   \out_line{\percent_char~Filename:~\lowercase_file}
-   \out_line{\percent_char~Created~by:~tex~\jobname}
-   \out_line{\percent_char~Created~using~fontinst~v\fontinstversion}
-   \out_line{}
-   \out_line{\percent_char~THIS~FILE~SHOULD~BE~PUT~IN~A~TEX~INPUTS~
-      DIRECTORY}
-   \out_line{}
-   \out_line{\string\ProvidesFile{\lowercase_file}}
-   \out_lline{[
-      \the\year/
-      \ifnum10>\month0\fi\the\month/
-      \ifnum10>\day0\fi\the\day\space
-      Fontinst~v\fontinstversion\space
-      font~definitions~for~#1/#2.
-   ]}
-   \out_line{}
-   %%%
-   \out_line{\string\expandafter\string\ifx\string\csname\space droid@#2@scale\string\endcsname\string\relax}
-   \out_line{\space\space\string\let\string\droid@#2@scale\string\@empty}
-   \out_line{\string\fi}
-   \out_line{}
-   %%%
-   \out_line{\string\DeclareFontFamily{#1}{#2}{\the\a_toks}}
-   {
-      \csname #1-#2\endcsname
-      \out_line{}
-      \let\do_shape=\substitute_shape
-      \csname #1-#2\endcsname
-      \let\do_shape=\remove_shape
-      \csname #1-#2\endcsname
-   }
-   \x_cs\g_let{#1-#2}\x_relax
-   \out_line{}
-   \out_line{\string\endinput}
-   \close_out{Font~definitions}
-}
-\normalcc
-
-
-% Serif
-\installfonts
-\installfamily{OT1}{fdr}{}
-
-\installfont{ot1-DroidSerif-Regular}{ot1-DroidSerif-Regular,fixlatin-DroidSerif-Regular,newlatin}{ot1}{OT1}{fdr}{m}{n}{<->\string\droid@fdr@scale}
-\installfont{ot1-DroidSerif-Regular-Slanted}{ot1-DroidSerif-Regular-Slanted,fixlatin-DroidSerif-Regular-Slanted,newlatin}{ot1}{OT1}{fdr}{m}{sl}{<->\string\droid@fdr@scale}
-\installfont{ot1-DroidSerif-Regular-SmallCaps}{ot1-DroidSerif-Regular,fixlatin-DroidSerif-Regular,newlatin}{ot1c}{OT1}{fdr}{m}{sc}{<->\string\droid@fdr@scale}
-\installfont{ot1-DroidSerif-Regular-Slanted-SmallCaps}{ot1-DroidSerif-Regular-Slanted,fixlatin-DroidSerif-Regular-Slanted,newlatin}{ot1c}{OT1}{fdr}{m}{scsl}{<->\string\droid@fdr@scale}
-
-\installfont{ot1-DroidSerif-Italic}{ot1-DroidSerif-Italic,fixlatin-DroidSerif-Italic,newlatin}{ot1}{OT1}{fdr}{m}{it}{<->\string\droid@fdr@scale}
-\installfont{ot1-DroidSerif-Italic-Upright}{ot1-DroidSerif-Italic-Upright,fixlatin-DroidSerif-Italic-Upright,newlatin}{ot1}{OT1}{fdr}{m}{up}{<->\string\droid@fdr@scale}
-\installfont{ot1-DroidSerif-Italic-SmallCaps}{ot1-DroidSerif-Italic,fixlatin-DroidSerif-Italic,newlatin}{ot1c}{OT1}{fdr}{m}{scit}{<->\string\droid@fdr@scale}
-\installfont{ot1-DroidSerif-Italic-Upright-SmallCaps}{ot1-DroidSerif-Italic-Upright,fixlatin-DroidSerif-Italic-Upright,newlatin}{ot1c}{OT1}{fdr}{m}{scup}{<->\string\droid@fdr@scale}
-
-\installfont{ot1-DroidSerif-Bold}{ot1-DroidSerif-Bold,fixlatin-DroidSerif-Bold,newlatin}{ot1}{OT1}{fdr}{b}{n}{<->\string\droid@fdr@scale}
-\installfont{ot1-DroidSerif-Bold-Slanted}{ot1-DroidSerif-Bold-Slanted,fixlatin-DroidSerif-Bold-Slanted,newlatin}{ot1}{OT1}{fdr}{b}{sl}{<->\string\droid@fdr@scale}
-\installfont{ot1-DroidSerif-Bold-SmallCaps}{ot1-DroidSerif-Bold,fixlatin-DroidSerif-Bold,newlatin}{ot1c}{OT1}{fdr}{b}{sc}{<->\string\droid@fdr@scale}
-\installfont{ot1-DroidSerif-Bold-Slanted-SmallCaps}{ot1-DroidSerif-Bold-Slanted,fixlatin-DroidSerif-Bold-Slanted,newlatin}{ot1c}{OT1}{fdr}{b}{scsl}{<->\string\droid@fdr@scale}
-
-\installfont{ot1-DroidSerif-BoldItalic}{ot1-DroidSerif-BoldItalic,fixlatin-DroidSerif-BoldItalic,newlatin}{ot1}{OT1}{fdr}{b}{it}{<->\string\droid@fdr@scale}
-\installfont{ot1-DroidSerif-BoldItalic-Upright}{ot1-DroidSerif-BoldItalic-Upright,fixlatin-DroidSerif-BoldItalic-Upright,newlatin}{ot1}{OT1}{fdr}{b}{up}{<->\string\droid@fdr@scale}
-\installfont{ot1-DroidSerif-BoldItalic-SmallCaps}{ot1-DroidSerif-BoldItalic,fixlatin-DroidSerif-BoldItalic,newlatin}{ot1c}{OT1}{fdr}{b}{scit}{<->\string\droid@fdr@scale}
-\installfont{ot1-DroidSerif-BoldItalic-Upright-SmallCaps}{ot1-DroidSerif-BoldItalic-Upright,fixlatin-DroidSerif-BoldItalic-Upright,newlatin}{ot1c}{OT1}{fdr}{b}{scup}{<->\string\droid@fdr@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{T1}{fdr}{}
-
-\installfont{t1-DroidSerif-Regular}{t1-DroidSerif-Regular,fixlatin-DroidSerif-Regular,newlatin}{t1}{T1}{fdr}{m}{n}{<->\string\droid@fdr@scale}
-\installfont{t1-DroidSerif-Regular-Slanted}{t1-DroidSerif-Regular-Slanted,fixlatin-DroidSerif-Regular-Slanted,newlatin}{t1}{T1}{fdr}{m}{sl}{<->\string\droid@fdr@scale}
-\installfont{t1-DroidSerif-Regular-SmallCaps}{t1-DroidSerif-Regular,fixlatin-DroidSerif-Regular,newlatin}{t1c}{T1}{fdr}{m}{sc}{<->\string\droid@fdr@scale}
-\installfont{t1-DroidSerif-Regular-Slanted-SmallCaps}{t1-DroidSerif-Regular-Slanted,fixlatin-DroidSerif-Regular-Slanted,newlatin}{t1c}{T1}{fdr}{m}{scsl}{<->\string\droid@fdr@scale}
-
-\installfont{t1-DroidSerif-Italic}{t1-DroidSerif-Italic,fixlatin-DroidSerif-Italic,newlatin}{t1}{T1}{fdr}{m}{it}{<->\string\droid@fdr@scale}
-\installfont{t1-DroidSerif-Italic-Upright}{t1-DroidSerif-Italic-Upright,fixlatin-DroidSerif-Italic-Upright,newlatin}{t1}{T1}{fdr}{m}{up}{<->\string\droid@fdr@scale}
-\installfont{t1-DroidSerif-Italic-SmallCaps}{t1-DroidSerif-Italic,fixlatin-DroidSerif-Italic,newlatin}{t1c}{T1}{fdr}{m}{scit}{<->\string\droid@fdr@scale}
-\installfont{t1-DroidSerif-Italic-Upright-SmallCaps}{t1-DroidSerif-Italic-Upright,fixlatin-DroidSerif-Italic-Upright,newlatin}{t1c}{T1}{fdr}{m}{scup}{<->\string\droid@fdr@scale}
-
-\installfont{t1-DroidSerif-Bold}{t1-DroidSerif-Bold,fixlatin-DroidSerif-Bold,newlatin}{t1}{T1}{fdr}{b}{n}{<->\string\droid@fdr@scale}
-\installfont{t1-DroidSerif-Bold-Slanted}{t1-DroidSerif-Bold-Slanted,fixlatin-DroidSerif-Bold-Slanted,newlatin}{t1}{T1}{fdr}{b}{sl}{<->\string\droid@fdr@scale}
-\installfont{t1-DroidSerif-Bold-SmallCaps}{t1-DroidSerif-Bold,fixlatin-DroidSerif-Bold,newlatin}{t1c}{T1}{fdr}{b}{sc}{<->\string\droid@fdr@scale}
-\installfont{t1-DroidSerif-Bold-Slanted-SmallCaps}{t1-DroidSerif-Bold-Slanted,fixlatin-DroidSerif-Bold-Slanted,newlatin}{t1c}{T1}{fdr}{b}{scsl}{<->\string\droid@fdr@scale}
-
-\installfont{t1-DroidSerif-BoldItalic}{t1-DroidSerif-BoldItalic,fixlatin-DroidSerif-BoldItalic,newlatin}{t1}{T1}{fdr}{b}{it}{<->\string\droid@fdr@scale}
-\installfont{t1-DroidSerif-BoldItalic-Upright}{t1-DroidSerif-BoldItalic-Upright,fixlatin-DroidSerif-BoldItalic-Upright,newlatin}{t1}{T1}{fdr}{b}{up}{<->\string\droid@fdr@scale}
-\installfont{t1-DroidSerif-BoldItalic-SmallCaps}{t1-DroidSerif-BoldItalic,fixlatin-DroidSerif-BoldItalic,newlatin}{t1c}{T1}{fdr}{b}{scit}{<->\string\droid@fdr@scale}
-\installfont{t1-DroidSerif-BoldItalic-Upright-SmallCaps}{t1-DroidSerif-BoldItalic-Upright,fixlatin-DroidSerif-BoldItalic-Upright,newlatin}{t1c}{T1}{fdr}{b}{scup}{<->\string\droid@fdr@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{TS1}{fdr}{}
-
-\installfont{ts1-DroidSerif-Regular}{ts1-DroidSerif-Regular,fixtextcomp-DroidSerif-Regular,textcomp}{ts1}{TS1}{fdr}{m}{n}{<->\string\droid@fdr@scale}
-\installfont{ts1-DroidSerif-Regular-Slanted}{ts1-DroidSerif-Regular-Slanted,fixtextcomp-DroidSerif-Regular-Slanted,textcomp}{ts1}{TS1}{fdr}{m}{sl}{<->\string\droid@fdr@scale}
-\installfontas{ts1-DroidSerif-Regular}{TS1}{fdr}{m}{sc}{<->\string\droid@fdr@scale}
-\installfontas{ts1-DroidSerif-Regular-Slanted}{TS1}{fdr}{m}{scsl}{<->\string\droid@fdr@scale}
-
-\installfont{ts1-DroidSerif-Italic}{ts1-DroidSerif-Italic,fixtextcomp-DroidSerif-Italic,textcomp}{ts1}{TS1}{fdr}{m}{n}{<->\string\droid@fdr@scale}
-\installfont{ts1-DroidSerif-Italic-Upright}{ts1-DroidSerif-Italic-Upright,fixtextcomp-DroidSerif-Italic-Upright,textcomp}{ts1}{TS1}{fdr}{m}{up}{<->\string\droid@fdr@scale}
-\installfontas{ts1-DroidSerif-Italic}{TS1}{fdr}{m}{scit}{<->\string\droid@fdr@scale}
-\installfontas{ts1-DroidSerif-Italic-Upright}{TS1}{fdr}{m}{scup}{<->\string\droid@fdr@scale}
-
-\installfont{ts1-DroidSerif-Bold}{ts1-DroidSerif-Bold,fixtextcomp-DroidSerif-Bold,textcomp}{ts1}{TS1}{fdr}{b}{n}{<->\string\droid@fdr@scale}
-\installfont{ts1-DroidSerif-Bold-Slanted}{ts1-DroidSerif-Bold-Slanted,fixtextcomp-DroidSerif-Bold-Slanted,textcomp}{ts1}{TS1}{fdr}{b}{sl}{<->\string\droid@fdr@scale}
-\installfontas{ts1-DroidSerif-Bold}{TS1}{fdr}{b}{sc}{<->\string\droid@fdr@scale}
-\installfontas{ts1-DroidSerif-Bold-Slanted}{TS1}{fdr}{b}{scsl}{<->\string\droid@fdr@scale}
-
-\installfont{ts1-DroidSerif-BoldItalic}{ts1-DroidSerif-BoldItalic,fixtextcomp-DroidSerif-BoldItalic,textcomp}{ts1}{TS1}{fdr}{b}{n}{<->\string\droid@fdr@scale}
-\installfont{ts1-DroidSerif-BoldItalic-Upright}{ts1-DroidSerif-BoldItalic-Upright,fixtextcomp-DroidSerif-BoldItalic-Upright,textcomp}{ts1}{TS1}{fdr}{b}{up}{<->\string\droid@fdr@scale}
-\installfontas{ts1-DroidSerif-BoldItalic}{TS1}{fdr}{b}{scit}{<->\string\droid@fdr@scale}
-\installfontas{ts1-DroidSerif-BoldItalic-Upright}{TS1}{fdr}{b}{scup}{<->\string\droid@fdr@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{T2A}{fdr}{}
-
-\installfont{t2a-DroidSerif-Regular}{t2a-DroidSerif-Regular,fixcyrillic-DroidSerif-Regular,newlatin,cyrillic}{t2a}{T2A}{fdr}{m}{n}{<->\string\droid@fdr@scale}
-\installfont{t2a-DroidSerif-Regular-Slanted}{t2a-DroidSerif-Regular-Slanted,fixcyrillic-DroidSerif-Regular-Slanted,newlatin,cyrillic}{t2a}{T2A}{fdr}{m}{sl}{<->\string\droid@fdr@scale}
-\installfont{t2a-DroidSerif-Regular-SmallCaps}{t2a-DroidSerif-Regular,fixcyrillic-DroidSerif-Regular,newlatin,cyrillic}{t2ac}{T2A}{fdr}{m}{sc}{<->\string\droid@fdr@scale}
-\installfont{t2a-DroidSerif-Regular-Slanted-SmallCaps}{t2a-DroidSerif-Regular-Slanted,fixcyrillic-DroidSerif-Regular-Slanted,newlatin,cyrillic}{t2ac}{T2A}{fdr}{m}{scsl}{<->\string\droid@fdr@scale}
-
-\installfont{t2a-DroidSerif-Italic}{t2a-DroidSerif-Italic,fixcyrillic-DroidSerif-Italic,newlatin,cyrillic}{t2a}{T2A}{fdr}{m}{it}{<->\string\droid@fdr@scale}
-\installfont{t2a-DroidSerif-Italic-Upright}{t2a-DroidSerif-Italic-Upright,fixcyrillic-DroidSerif-Italic-Upright,newlatin,cyrillic}{t2a}{T2A}{fdr}{m}{up}{<->\string\droid@fdr@scale}
-\installfont{t2a-DroidSerif-Italic-SmallCaps}{t2a-DroidSerif-Italic,fixcyrillic-DroidSerif-Italic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{m}{scit}{<->\string\droid@fdr@scale}
-\installfont{t2a-DroidSerif-Italic-Upright-SmallCaps}{t2a-DroidSerif-Italic-Upright,fixcyrillic-DroidSerif-Italic-Upright,newlatin,cyrillic}{t2ac}{T2A}{fdr}{m}{scup}{<->\string\droid@fdr@scale}
-
-\installfont{t2a-DroidSerif-Bold}{t2a-DroidSerif-Bold,fixcyrillic-DroidSerif-Bold,newlatin,cyrillic}{t2a}{T2A}{fdr}{b}{n}{<->\string\droid@fdr@scale}
-\installfont{t2a-DroidSerif-Bold-Slanted}{t2a-DroidSerif-Bold-Slanted,fixcyrillic-DroidSerif-Bold-Slanted,newlatin,cyrillic}{t2a}{T2A}{fdr}{b}{sl}{<->\string\droid@fdr@scale}
-\installfont{t2a-DroidSerif-Bold-SmallCaps}{t2a-DroidSerif-Bold,fixcyrillic-DroidSerif-Bold,newlatin,cyrillic}{t2ac}{T2A}{fdr}{b}{sc}{<->\string\droid@fdr@scale}
-\installfont{t2a-DroidSerif-Bold-Slanted-SmallCaps}{t2a-DroidSerif-Bold-Slanted,fixcyrillic-DroidSerif-Bold-Slanted,newlatin,cyrillic}{t2ac}{T2A}{fdr}{b}{scsl}{<->\string\droid@fdr@scale}
-
-\installfont{t2a-DroidSerif-BoldItalic}{t2a-DroidSerif-BoldItalic,fixcyrillic-DroidSerif-BoldItalic,newlatin,cyrillic}{t2a}{T2A}{fdr}{b}{it}{<->\string\droid@fdr@scale}
-\installfont{t2a-DroidSerif-BoldItalic-Upright}{t2a-DroidSerif-BoldItalic-Upright,fixcyrillic-DroidSerif-BoldItalic-Upright,newlatin,cyrillic}{t2a}{T2A}{fdr}{b}{up}{<->\string\droid@fdr@scale}
-\installfont{t2a-DroidSerif-BoldItalic-SmallCaps}{t2a-DroidSerif-BoldItalic,fixcyrillic-DroidSerif-BoldItalic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{b}{scit}{<->\string\droid@fdr@scale}
-\installfont{t2a-DroidSerif-BoldItalic-Upright-SmallCaps}{t2a-DroidSerif-BoldItalic-Upright,fixcyrillic-DroidSerif-BoldItalic-Upright,newlatin,cyrillic}{t2ac}{T2A}{fdr}{b}{scup}{<->\string\droid@fdr@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{T2B}{fdr}{}
-
-\installfont{t2b-DroidSerif-Regular}{t2b-DroidSerif-Regular,fixcyrillic-DroidSerif-Regular,newlatin,cyrillic}{t2b}{T2B}{fdr}{m}{n}{<->\string\droid@fdr@scale}
-\installfont{t2b-DroidSerif-Regular-Slanted}{t2b-DroidSerif-Regular-Slanted,fixcyrillic-DroidSerif-Regular-Slanted,newlatin,cyrillic}{t2b}{T2B}{fdr}{m}{sl}{<->\string\droid@fdr@scale}
-\installfont{t2b-DroidSerif-Regular-SmallCaps}{t2b-DroidSerif-Regular,fixcyrillic-DroidSerif-Regular,newlatin,cyrillic}{t2bc}{T2B}{fdr}{m}{sc}{<->\string\droid@fdr@scale}
-\installfont{t2b-DroidSerif-Regular-Slanted-SmallCaps}{t2b-DroidSerif-Regular-Slanted,fixcyrillic-DroidSerif-Regular-Slanted,newlatin,cyrillic}{t2bc}{T2B}{fdr}{m}{scsl}{<->\string\droid@fdr@scale}
-
-\installfont{t2b-DroidSerif-Italic}{t2b-DroidSerif-Italic,fixcyrillic-DroidSerif-Italic,newlatin,cyrillic}{t2b}{T2B}{fdr}{m}{it}{<->\string\droid@fdr@scale}
-\installfont{t2b-DroidSerif-Italic-Upright}{t2b-DroidSerif-Italic-Upright,fixcyrillic-DroidSerif-Italic-Upright,newlatin,cyrillic}{t2b}{T2B}{fdr}{m}{up}{<->\string\droid@fdr@scale}
-\installfont{t2b-DroidSerif-Italic-SmallCaps}{t2b-DroidSerif-Italic,fixcyrillic-DroidSerif-Italic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{m}{scit}{<->\string\droid@fdr@scale}
-\installfont{t2b-DroidSerif-Italic-Upright-SmallCaps}{t2b-DroidSerif-Italic-Upright,fixcyrillic-DroidSerif-Italic-Upright,newlatin,cyrillic}{t2bc}{T2B}{fdr}{m}{scup}{<->\string\droid@fdr@scale}
-
-\installfont{t2b-DroidSerif-Bold}{t2b-DroidSerif-Bold,fixcyrillic-DroidSerif-Bold,newlatin,cyrillic}{t2b}{T2B}{fdr}{b}{n}{<->\string\droid@fdr@scale}
-\installfont{t2b-DroidSerif-Bold-Slanted}{t2b-DroidSerif-Bold-Slanted,fixcyrillic-DroidSerif-Bold-Slanted,newlatin,cyrillic}{t2b}{T2B}{fdr}{b}{sl}{<->\string\droid@fdr@scale}
-\installfont{t2b-DroidSerif-Bold-SmallCaps}{t2b-DroidSerif-Bold,fixcyrillic-DroidSerif-Bold,newlatin,cyrillic}{t2bc}{T2B}{fdr}{b}{sc}{<->\string\droid@fdr@scale}
-\installfont{t2b-DroidSerif-Bold-Slanted-SmallCaps}{t2b-DroidSerif-Bold-Slanted,fixcyrillic-DroidSerif-Bold-Slanted,newlatin,cyrillic}{t2bc}{T2B}{fdr}{b}{scsl}{<->\string\droid@fdr@scale}
-
-\installfont{t2b-DroidSerif-BoldItalic}{t2b-DroidSerif-BoldItalic,fixcyrillic-DroidSerif-BoldItalic,newlatin,cyrillic}{t2b}{T2B}{fdr}{b}{it}{<->\string\droid@fdr@scale}
-\installfont{t2b-DroidSerif-BoldItalic-Upright}{t2b-DroidSerif-BoldItalic-Upright,fixcyrillic-DroidSerif-BoldItalic-Upright,newlatin,cyrillic}{t2b}{T2B}{fdr}{b}{up}{<->\string\droid@fdr@scale}
-\installfont{t2b-DroidSerif-BoldItalic-SmallCaps}{t2b-DroidSerif-BoldItalic,fixcyrillic-DroidSerif-BoldItalic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{b}{scit}{<->\string\droid@fdr@scale}
-\installfont{t2b-DroidSerif-BoldItalic-Upright-SmallCaps}{t2b-DroidSerif-BoldItalic-Upright,fixcyrillic-DroidSerif-BoldItalic-Upright,newlatin,cyrillic}{t2bc}{T2B}{fdr}{b}{scup}{<->\string\droid@fdr@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{T2C}{fdr}{}
-
-\installfont{t2c-DroidSerif-Regular}{t2c-DroidSerif-Regular,fixcyrillic-DroidSerif-Regular,newlatin,cyrillic}{t2c}{T2C}{fdr}{m}{n}{<->\string\droid@fdr@scale}
-\installfont{t2c-DroidSerif-Regular-Slanted}{t2c-DroidSerif-Regular-Slanted,fixcyrillic-DroidSerif-Regular-Slanted,newlatin,cyrillic}{t2c}{T2C}{fdr}{m}{sl}{<->\string\droid@fdr@scale}
-\installfont{t2c-DroidSerif-Regular-SmallCaps}{t2c-DroidSerif-Regular,fixcyrillic-DroidSerif-Regular,newlatin,cyrillic}{t2cc}{T2C}{fdr}{m}{sc}{<->\string\droid@fdr@scale}
-\installfont{t2c-DroidSerif-Regular-Slanted-SmallCaps}{t2c-DroidSerif-Regular-Slanted,fixcyrillic-DroidSerif-Regular-Slanted,newlatin,cyrillic}{t2cc}{T2C}{fdr}{m}{scsl}{<->\string\droid@fdr@scale}
-
-\installfont{t2c-DroidSerif-Italic}{t2c-DroidSerif-Italic,fixcyrillic-DroidSerif-Italic,newlatin,cyrillic}{t2c}{T2C}{fdr}{m}{it}{<->\string\droid@fdr@scale}
-\installfont{t2c-DroidSerif-Italic-Upright}{t2c-DroidSerif-Italic-Upright,fixcyrillic-DroidSerif-Italic-Upright,newlatin,cyrillic}{t2c}{T2C}{fdr}{m}{up}{<->\string\droid@fdr@scale}
-\installfont{t2c-DroidSerif-Italic-SmallCaps}{t2c-DroidSerif-Italic,fixcyrillic-DroidSerif-Italic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{m}{scit}{<->\string\droid@fdr@scale}
-\installfont{t2c-DroidSerif-Italic-Upright-SmallCaps}{t2c-DroidSerif-Italic-Upright,fixcyrillic-DroidSerif-Italic-Upright,newlatin,cyrillic}{t2cc}{T2C}{fdr}{m}{scup}{<->\string\droid@fdr@scale}
-
-\installfont{t2c-DroidSerif-Bold}{t2c-DroidSerif-Bold,fixcyrillic-DroidSerif-Bold,newlatin,cyrillic}{t2c}{T2C}{fdr}{b}{n}{<->\string\droid@fdr@scale}
-\installfont{t2c-DroidSerif-Bold-Slanted}{t2c-DroidSerif-Bold-Slanted,fixcyrillic-DroidSerif-Bold-Slanted,newlatin,cyrillic}{t2c}{T2C}{fdr}{b}{sl}{<->\string\droid@fdr@scale}
-\installfont{t2c-DroidSerif-Bold-SmallCaps}{t2c-DroidSerif-Bold,fixcyrillic-DroidSerif-Bold,newlatin,cyrillic}{t2cc}{T2C}{fdr}{b}{sc}{<->\string\droid@fdr@scale}
-\installfont{t2c-DroidSerif-Bold-Slanted-SmallCaps}{t2c-DroidSerif-Bold-Slanted,fixcyrillic-DroidSerif-Bold-Slanted,newlatin,cyrillic}{t2cc}{T2C}{fdr}{b}{scsl}{<->\string\droid@fdr@scale}
-
-\installfont{t2c-DroidSerif-BoldItalic}{t2c-DroidSerif-BoldItalic,fixcyrillic-DroidSerif-BoldItalic,newlatin,cyrillic}{t2c}{T2C}{fdr}{b}{it}{<->\string\droid@fdr@scale}
-\installfont{t2c-DroidSerif-BoldItalic-Upright}{t2c-DroidSerif-BoldItalic-Upright,fixcyrillic-DroidSerif-BoldItalic-Upright,newlatin,cyrillic}{t2c}{T2C}{fdr}{b}{up}{<->\string\droid@fdr@scale}
-\installfont{t2c-DroidSerif-BoldItalic-SmallCaps}{t2c-DroidSerif-BoldItalic,fixcyrillic-DroidSerif-BoldItalic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{b}{scit}{<->\string\droid@fdr@scale}
-\installfont{t2c-DroidSerif-BoldItalic-Upright-SmallCaps}{t2c-DroidSerif-BoldItalic-Upright,fixcyrillic-DroidSerif-BoldItalic-Upright,newlatin,cyrillic}{t2cc}{T2C}{fdr}{b}{scup}{<->\string\droid@fdr@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{X2}{fdr}{}
-
-\installfont{x2-DroidSerif-Regular}{x2-DroidSerif-Regular,fixcyrillic-DroidSerif-Regular,newlatin,cyrillic}{x2}{X2}{fdr}{m}{n}{<->\string\droid@fdr@scale}
-\installfont{x2-DroidSerif-Regular-Slanted}{x2-DroidSerif-Regular-Slanted,fixcyrillic-DroidSerif-Regular-Slanted,newlatin,cyrillic}{x2}{X2}{fdr}{m}{sl}{<->\string\droid@fdr@scale}
-\installfont{x2-DroidSerif-Regular-SmallCaps}{x2-DroidSerif-Regular,fixcyrillic-DroidSerif-Regular,newlatin,cyrillic}{x2c}{X2}{fdr}{m}{sc}{<->\string\droid@fdr@scale}
-\installfont{x2-DroidSerif-Regular-Slanted-SmallCaps}{x2-DroidSerif-Regular-Slanted,fixcyrillic-DroidSerif-Regular-Slanted,newlatin,cyrillic}{x2c}{X2}{fdr}{m}{scsl}{<->\string\droid@fdr@scale}
-
-\installfont{x2-DroidSerif-Italic}{x2-DroidSerif-Italic,fixcyrillic-DroidSerif-Italic,newlatin,cyrillic}{x2}{X2}{fdr}{m}{it}{<->\string\droid@fdr@scale}
-\installfont{x2-DroidSerif-Italic-Upright}{x2-DroidSerif-Italic-Upright,fixcyrillic-DroidSerif-Italic-Upright,newlatin,cyrillic}{x2}{X2}{fdr}{m}{up}{<->\string\droid@fdr@scale}
-\installfont{x2-DroidSerif-Italic-SmallCaps}{x2-DroidSerif-Italic,fixcyrillic-DroidSerif-Italic,newlatin,cyrillic}{x2c}{X2}{fdr}{m}{scit}{<->\string\droid@fdr@scale}
-\installfont{x2-DroidSerif-Italic-Upright-SmallCaps}{x2-DroidSerif-Italic-Upright,fixcyrillic-DroidSerif-Italic-Upright,newlatin,cyrillic}{x2c}{X2}{fdr}{m}{scup}{<->\string\droid@fdr@scale}
-
-\installfont{x2-DroidSerif-Bold}{x2-DroidSerif-Bold,fixcyrillic-DroidSerif-Bold,newlatin,cyrillic}{x2}{X2}{fdr}{b}{n}{<->\string\droid@fdr@scale}
-\installfont{x2-DroidSerif-Bold-Slanted}{x2-DroidSerif-Bold-Slanted,fixcyrillic-DroidSerif-Bold-Slanted,newlatin,cyrillic}{x2}{X2}{fdr}{b}{sl}{<->\string\droid@fdr@scale}
-\installfont{x2-DroidSerif-Bold-SmallCaps}{x2-DroidSerif-Bold,fixcyrillic-DroidSerif-Bold,newlatin,cyrillic}{x2c}{X2}{fdr}{b}{sc}{<->\string\droid@fdr@scale}
-\installfont{x2-DroidSerif-Bold-Slanted-SmallCaps}{x2-DroidSerif-Bold-Slanted,fixcyrillic-DroidSerif-Bold-Slanted,newlatin,cyrillic}{x2c}{X2}{fdr}{b}{scsl}{<->\string\droid@fdr@scale}
-
-\installfont{x2-DroidSerif-BoldItalic}{x2-DroidSerif-BoldItalic,fixcyrillic-DroidSerif-BoldItalic,newlatin,cyrillic}{x2}{X2}{fdr}{b}{it}{<->\string\droid@fdr@scale}
-\installfont{x2-DroidSerif-BoldItalic-Upright}{x2-DroidSerif-BoldItalic-Upright,fixcyrillic-DroidSerif-BoldItalic-Upright,newlatin,cyrillic}{x2}{X2}{fdr}{b}{up}{<->\string\droid@fdr@scale}
-\installfont{x2-DroidSerif-BoldItalic-SmallCaps}{x2-DroidSerif-BoldItalic,fixcyrillic-DroidSerif-BoldItalic,newlatin,cyrillic}{x2c}{X2}{fdr}{b}{scit}{<->\string\droid@fdr@scale}
-\installfont{x2-DroidSerif-BoldItalic-Upright-SmallCaps}{x2-DroidSerif-BoldItalic-Upright,fixcyrillic-DroidSerif-BoldItalic-Upright,newlatin,cyrillic}{x2c}{X2}{fdr}{b}{scup}{<->\string\droid@fdr@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{LGR}{fdr}{}
-
-\installfont{lgr-DroidSerif-Regular}{lgr-DroidSerif-Regular,fixgreek-DroidSerif-Regular,newlatin,greek}{lgr}{LGR}{fdr}{m}{n}{<->\string\droid@fdr@scale}
-\installfont{lgr-DroidSerif-Regular-Slanted}{lgr-DroidSerif-Regular-Slanted,fixgreek-DroidSerif-Regular-Slanted,newlatin,greek}{lgr}{LGR}{fdr}{m}{sl}{<->\string\droid@fdr@scale}
-\installfont{lgr-DroidSerif-Regular-SmallCaps}{lgr-DroidSerif-Regular,fixgreek-DroidSerif-Regular,newlatin,greek}{lgrc}{LGR}{fdr}{m}{sc}{<->\string\droid@fdr@scale}
-\installfont{lgr-DroidSerif-Regular-Slanted-SmallCaps}{lgr-DroidSerif-Regular-Slanted,fixgreek-DroidSerif-Regular-Slanted,newlatin,greek}{lgrc}{LGR}{fdr}{m}{scsl}{<->\string\droid@fdr@scale}
-
-\installfont{lgr-DroidSerif-Italic}{lgr-DroidSerif-Italic,fixgreek-DroidSerif-Italic,newlatin,greek}{lgr}{LGR}{fdr}{m}{it}{<->\string\droid@fdr@scale}
-\installfont{lgr-DroidSerif-Italic-Upright}{lgr-DroidSerif-Italic-Upright,fixgreek-DroidSerif-Italic-Upright,newlatin,greek}{lgr}{LGR}{fdr}{m}{up}{<->\string\droid@fdr@scale}
-\installfont{lgr-DroidSerif-Italic-SmallCaps}{lgr-DroidSerif-Italic,fixgreek-DroidSerif-Italic,newlatin,greek}{lgrc}{LGR}{fdr}{m}{scit}{<->\string\droid@fdr@scale}
-\installfont{lgr-DroidSerif-Italic-Upright-SmallCaps}{lgr-DroidSerif-Italic-Upright,fixgreek-DroidSerif-Italic-Upright,newlatin,greek}{lgrc}{LGR}{fdr}{m}{scup}{<->\string\droid@fdr@scale}
-
-\installfont{lgr-DroidSerif-Bold}{lgr-DroidSerif-Bold,fixgreek-DroidSerif-Bold,newlatin,greek}{lgr}{LGR}{fdr}{b}{n}{<->\string\droid@fdr@scale}
-\installfont{lgr-DroidSerif-Bold-Slanted}{lgr-DroidSerif-Bold-Slanted,fixgreek-DroidSerif-Bold-Slanted,newlatin,greek}{lgr}{LGR}{fdr}{b}{sl}{<->\string\droid@fdr@scale}
-\installfont{lgr-DroidSerif-Bold-SmallCaps}{lgr-DroidSerif-Bold,fixgreek-DroidSerif-Bold,newlatin,greek}{lgrc}{LGR}{fdr}{b}{sc}{<->\string\droid@fdr@scale}
-\installfont{lgr-DroidSerif-Bold-Slanted-SmallCaps}{lgr-DroidSerif-Bold-Slanted,fixgreek-DroidSerif-Bold-Slanted,newlatin,greek}{lgrc}{LGR}{fdr}{b}{scsl}{<->\string\droid@fdr@scale}
-
-\installfont{lgr-DroidSerif-BoldItalic}{lgr-DroidSerif-BoldItalic,fixgreek-DroidSerif-BoldItalic,newlatin,greek}{lgr}{LGR}{fdr}{b}{it}{<->\string\droid@fdr@scale}
-\installfont{lgr-DroidSerif-BoldItalic-Upright}{lgr-DroidSerif-BoldItalic-Upright,fixgreek-DroidSerif-BoldItalic-Upright,newlatin,greek}{lgr}{LGR}{fdr}{b}{up}{<->\string\droid@fdr@scale}
-\installfont{lgr-DroidSerif-BoldItalic-SmallCaps}{lgr-DroidSerif-BoldItalic,fixgreek-DroidSerif-BoldItalic,newlatin,greek}{lgrc}{LGR}{fdr}{b}{scit}{<->\string\droid@fdr@scale}
-\installfont{lgr-DroidSerif-BoldItalic-Upright-SmallCaps}{lgr-DroidSerif-BoldItalic-Upright,fixgreek-DroidSerif-BoldItalic-Upright,newlatin,greek}{lgrc}{LGR}{fdr}{b}{scup}{<->\string\droid@fdr@scale}
-\endinstallfonts
-
-
-% Sans
-\installfonts
-\installfamily{OT1}{fds}{}
-
-\installfont{ot1-DroidSans}{ot1-DroidSans,fixlatin-DroidSans,newlatin}{ot1}{OT1}{fds}{m}{n}{<->\string\droid@fds@scale}
-\installfont{ot1-DroidSans-Slanted}{ot1-DroidSans-Slanted,fixlatin-DroidSans-Slanted,newlatin}{ot1}{OT1}{fds}{m}{sl}{<->\string\droid@fds@scale}
-\installfont{ot1-DroidSans-SmallCaps}{ot1-DroidSans,fixlatin-DroidSans,newlatin}{ot1c}{OT1}{fds}{m}{sc}{<->\string\droid@fds@scale}
-\installfont{ot1-DroidSans-Slanted-SmallCaps}{ot1-DroidSans-Slanted,fixlatin-DroidSans-Slanted,newlatin}{ot1c}{OT1}{fds}{m}{scsl}{<->\string\droid@fds@scale}
-
-\installfont{ot1-DroidSans-Bold}{ot1-DroidSans-Bold,fixlatin-DroidSans-Bold,newlatin}{ot1}{OT1}{fds}{b}{n}{<->\string\droid@fds@scale}
-\installfont{ot1-DroidSans-Bold-Slanted}{ot1-DroidSans-Bold-Slanted,fixlatin-DroidSans-Bold-Slanted,newlatin}{ot1}{OT1}{fds}{b}{sl}{<->\string\droid@fds@scale}
-\installfont{ot1-DroidSans-Bold-SmallCaps}{ot1-DroidSans-Bold,fixlatin-DroidSans-Bold,newlatin}{ot1c}{OT1}{fds}{b}{sc}{<->\string\droid@fds@scale}
-\installfont{ot1-DroidSans-Bold-Slanted-SmallCaps}{ot1-DroidSans-Bold-Slanted,fixlatin-DroidSans-Bold-Slanted,newlatin}{ot1c}{OT1}{fds}{b}{scsl}{<->\string\droid@fds@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{T1}{fds}{}
-
-\installfont{t1-DroidSans}{t1-DroidSans,fixlatin-DroidSans,newlatin}{t1}{T1}{fds}{m}{n}{<->\string\droid@fds@scale}
-\installfont{t1-DroidSans-Slanted}{t1-DroidSans-Slanted,fixlatin-DroidSans-Slanted,newlatin}{t1}{T1}{fds}{m}{sl}{<->\string\droid@fds@scale}
-\installfont{t1-DroidSans-SmallCaps}{t1-DroidSans,fixlatin-DroidSans,newlatin}{t1c}{T1}{fds}{m}{sc}{<->\string\droid@fds@scale}
-\installfont{t1-DroidSans-Slanted-SmallCaps}{t1-DroidSans-Slanted,fixlatin-DroidSans-Slanted,newlatin}{t1c}{T1}{fds}{m}{scsl}{<->\string\droid@fds@scale}
-
-\installfont{t1-DroidSans-Bold}{t1-DroidSans-Bold,fixlatin-DroidSans-Bold,newlatin}{t1}{T1}{fds}{b}{n}{<->\string\droid@fds@scale}
-\installfont{t1-DroidSans-Bold-Slanted}{t1-DroidSans-Bold-Slanted,fixlatin-DroidSans-Bold-Slanted,newlatin}{t1}{T1}{fds}{b}{sl}{<->\string\droid@fds@scale}
-\installfont{t1-DroidSans-Bold-SmallCaps}{t1-DroidSans-Bold,fixlatin-DroidSans-Bold,newlatin}{t1c}{T1}{fds}{b}{sc}{<->\string\droid@fds@scale}
-\installfont{t1-DroidSans-Bold-Slanted-SmallCaps}{t1-DroidSans-Bold-Slanted,fixlatin-DroidSans-Bold-Slanted,newlatin}{t1c}{T1}{fds}{b}{scsl}{<->\string\droid@fds@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{TS1}{fds}{}
-
-\installfont{ts1-DroidSans}{ts1-DroidSans,fixtextcomp-DroidSans,textcomp}{ts1}{TS1}{fds}{m}{n}{<->\string\droid@fds@scale}
-\installfont{ts1-DroidSans-Slanted}{ts1-DroidSans-Slanted,fixtextcomp-DroidSans-Slanted,textcomp}{ts1}{TS1}{fds}{m}{sl}{<->\string\droid@fds@scale}
-\installfontas{ts1-DroidSans}{TS1}{fds}{m}{sc}{<->\string\droid@fds@scale}
-\installfontas{ts1-DroidSans-Slanted}{TS1}{fds}{m}{scsl}{<->\string\droid@fds@scale}
-
-\installfont{ts1-DroidSans-Bold}{ts1-DroidSans-Bold,fixtextcomp-DroidSans-Bold,textcomp}{ts1}{TS1}{fds}{b}{n}{<->\string\droid@fds@scale}
-\installfont{ts1-DroidSans-Bold-Slanted}{ts1-DroidSans-Bold-Slanted,fixtextcomp-DroidSans-Bold-Slanted,textcomp}{ts1}{TS1}{fds}{b}{sl}{<->\string\droid@fds@scale}
-\installfontas{ts1-DroidSans-Bold}{TS1}{fds}{b}{sc}{<->\string\droid@fds@scale}
-\installfontas{ts1-DroidSans-Bold-Slanted}{TS1}{fds}{b}{scsl}{<->\string\droid@fds@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{T2A}{fds}{}
-
-\installfont{t2a-DroidSans}{t2a-DroidSans,fixcyrillic-DroidSans,newlatin,cyrillic}{t2a}{T2A}{fds}{m}{n}{<->\string\droid@fds@scale}
-\installfont{t2a-DroidSans-Slanted}{t2a-DroidSans-Slanted,fixcyrillic-DroidSans-Slanted,newlatin,cyrillic}{t2a}{T2A}{fds}{m}{sl}{<->\string\droid@fds@scale}
-\installfont{t2a-DroidSans-SmallCaps}{t2a-DroidSans,fixcyrillic-DroidSans,newlatin,cyrillic}{t2ac}{T2A}{fds}{m}{sc}{<->\string\droid@fds@scale}
-\installfont{t2a-DroidSans-Slanted-SmallCaps}{t2a-DroidSans-Slanted,fixcyrillic-DroidSans-Slanted,newlatin,cyrillic}{t2ac}{T2A}{fds}{m}{scsl}{<->\string\droid@fds@scale}
-
-\installfont{t2a-DroidSans-Bold}{t2a-DroidSans-Bold,fixcyrillic-DroidSans-Bold,newlatin,cyrillic}{t2a}{T2A}{fds}{b}{n}{<->\string\droid@fds@scale}
-\installfont{t2a-DroidSans-Bold-Slanted}{t2a-DroidSans-Bold-Slanted,fixcyrillic-DroidSans-Bold-Slanted,newlatin,cyrillic}{t2a}{T2A}{fds}{b}{sl}{<->\string\droid@fds@scale}
-\installfont{t2a-DroidSans-Bold-SmallCaps}{t2a-DroidSans-Bold,fixcyrillic-DroidSans-Bold,newlatin,cyrillic}{t2ac}{T2A}{fds}{b}{sc}{<->\string\droid@fds@scale}
-\installfont{t2a-DroidSans-Bold-Slanted-SmallCaps}{t2a-DroidSans-Bold-Slanted,fixcyrillic-DroidSans-Bold-Slanted,newlatin,cyrillic}{t2ac}{T2A}{fds}{b}{scsl}{<->\string\droid@fds@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{T2B}{fds}{}
-
-\installfont{t2b-DroidSans}{t2b-DroidSans,fixcyrillic-DroidSans,newlatin,cyrillic}{t2b}{T2B}{fds}{m}{n}{<->\string\droid@fds@scale}
-\installfont{t2b-DroidSans-Slanted}{t2b-DroidSans-Slanted,fixcyrillic-DroidSans-Slanted,newlatin,cyrillic}{t2b}{T2B}{fds}{m}{sl}{<->\string\droid@fds@scale}
-\installfont{t2b-DroidSans-SmallCaps}{t2b-DroidSans,fixcyrillic-DroidSans,newlatin,cyrillic}{t2bc}{T2B}{fds}{m}{sc}{<->\string\droid@fds@scale}
-\installfont{t2b-DroidSans-Slanted-SmallCaps}{t2b-DroidSans-Slanted,fixcyrillic-DroidSans-Slanted,newlatin,cyrillic}{t2bc}{T2B}{fds}{m}{scsl}{<->\string\droid@fds@scale}
-
-\installfont{t2b-DroidSans-Bold}{t2b-DroidSans-Bold,fixcyrillic-DroidSans-Bold,newlatin,cyrillic}{t2b}{T2B}{fds}{b}{n}{<->\string\droid@fds@scale}
-\installfont{t2b-DroidSans-Bold-Slanted}{t2b-DroidSans-Bold-Slanted,fixcyrillic-DroidSans-Bold-Slanted,newlatin,cyrillic}{t2b}{T2B}{fds}{b}{sl}{<->\string\droid@fds@scale}
-\installfont{t2b-DroidSans-Bold-SmallCaps}{t2b-DroidSans-Bold,fixcyrillic-DroidSans-Bold,newlatin,cyrillic}{t2bc}{T2B}{fds}{b}{sc}{<->\string\droid@fds@scale}
-\installfont{t2b-DroidSans-Bold-Slanted-SmallCaps}{t2b-DroidSans-Bold-Slanted,fixcyrillic-DroidSans-Bold-Slanted,newlatin,cyrillic}{t2bc}{T2B}{fds}{b}{scsl}{<->\string\droid@fds@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{T2C}{fds}{}
-
-\installfont{t2c-DroidSans}{t2c-DroidSans,fixcyrillic-DroidSans,newlatin,cyrillic}{t2c}{T2C}{fds}{m}{n}{<->\string\droid@fds@scale}
-\installfont{t2c-DroidSans-Slanted}{t2c-DroidSans-Slanted,fixcyrillic-DroidSans-Slanted,newlatin,cyrillic}{t2c}{T2C}{fds}{m}{sl}{<->\string\droid@fds@scale}
-\installfont{t2c-DroidSans-SmallCaps}{t2c-DroidSans,fixcyrillic-DroidSans,newlatin,cyrillic}{t2cc}{T2C}{fds}{m}{sc}{<->\string\droid@fds@scale}
-\installfont{t2c-DroidSans-Slanted-SmallCaps}{t2c-DroidSans-Slanted,fixcyrillic-DroidSans-Slanted,newlatin,cyrillic}{t2cc}{T2C}{fds}{m}{scsl}{<->\string\droid@fds@scale}
-
-\installfont{t2c-DroidSans-Bold}{t2c-DroidSans-Bold,fixcyrillic-DroidSans-Bold,newlatin,cyrillic}{t2c}{T2C}{fds}{b}{n}{<->\string\droid@fds@scale}
-\installfont{t2c-DroidSans-Bold-Slanted}{t2c-DroidSans-Bold-Slanted,fixcyrillic-DroidSans-Bold-Slanted,newlatin,cyrillic}{t2c}{T2C}{fds}{b}{sl}{<->\string\droid@fds@scale}
-\installfont{t2c-DroidSans-Bold-SmallCaps}{t2c-DroidSans-Bold,fixcyrillic-DroidSans-Bold,newlatin,cyrillic}{t2cc}{T2C}{fds}{b}{sc}{<->\string\droid@fds@scale}
-\installfont{t2c-DroidSans-Bold-Slanted-SmallCaps}{t2c-DroidSans-Bold-Slanted,fixcyrillic-DroidSans-Bold-Slanted,newlatin,cyrillic}{t2cc}{T2C}{fds}{b}{scsl}{<->\string\droid@fds@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{X2}{fds}{}
-
-\installfont{x2-DroidSans}{x2-DroidSans,fixcyrillic-DroidSans,newlatin,cyrillic}{x2}{X2}{fds}{m}{n}{<->\string\droid@fds@scale}
-\installfont{x2-DroidSans-Slanted}{x2-DroidSans-Slanted,fixcyrillic-DroidSans-Slanted,newlatin,cyrillic}{x2}{X2}{fds}{m}{sl}{<->\string\droid@fds@scale}
-\installfont{x2-DroidSans-SmallCaps}{x2-DroidSans,fixcyrillic-DroidSans,newlatin,cyrillic}{x2c}{X2}{fds}{m}{sc}{<->\string\droid@fds@scale}
-\installfont{x2-DroidSans-Slanted-SmallCaps}{x2-DroidSans-Slanted,fixcyrillic-DroidSans-Slanted,newlatin,cyrillic}{x2c}{X2}{fds}{m}{scsl}{<->\string\droid@fds@scale}
-
-\installfont{x2-DroidSans-Bold}{x2-DroidSans-Bold,fixcyrillic-DroidSans-Bold,newlatin,cyrillic}{x2}{X2}{fds}{b}{n}{<->\string\droid@fds@scale}
-\installfont{x2-DroidSans-Bold-Slanted}{x2-DroidSans-Bold-Slanted,fixcyrillic-DroidSans-Bold-Slanted,newlatin,cyrillic}{x2}{X2}{fds}{b}{sl}{<->\string\droid@fds@scale}
-\installfont{x2-DroidSans-Bold-SmallCaps}{x2-DroidSans-Bold,fixcyrillic-DroidSans-Bold,newlatin,cyrillic}{x2c}{X2}{fds}{b}{sc}{<->\string\droid@fds@scale}
-\installfont{x2-DroidSans-Bold-Slanted-SmallCaps}{x2-DroidSans-Bold-Slanted,fixcyrillic-DroidSans-Bold-Slanted,newlatin,cyrillic}{x2c}{X2}{fds}{b}{scsl}{<->\string\droid@fds@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{LGR}{fds}{}
-
-\installfont{lgr-DroidSans}{lgr-DroidSans,fixgreek-DroidSans,newlatin,greek}{lgr}{LGR}{fds}{m}{n}{<->\string\droid@fds@scale}
-\installfont{lgr-DroidSans-Slanted}{lgr-DroidSans-Slanted,fixgreek-DroidSans-Slanted,newlatin,greek}{lgr}{LGR}{fds}{m}{sl}{<->\string\droid@fds@scale}
-\installfont{lgr-DroidSans-SmallCaps}{lgr-DroidSans,fixgreek-DroidSans,newlatin,greek}{lgrc}{LGR}{fds}{m}{sc}{<->\string\droid@fds@scale}
-\installfont{lgr-DroidSans-Slanted-SmallCaps}{lgr-DroidSans-Slanted,fixgreek-DroidSans-Slanted,newlatin,greek}{lgrc}{LGR}{fds}{m}{scsl}{<->\string\droid@fds@scale}
-
-\installfont{lgr-DroidSans-Bold}{lgr-DroidSans-Bold,fixgreek-DroidSans-Bold,newlatin,greek}{lgr}{LGR}{fds}{b}{n}{<->\string\droid@fds@scale}
-\installfont{lgr-DroidSans-Bold-Slanted}{lgr-DroidSans-Bold-Slanted,fixgreek-DroidSans-Bold-Slanted,newlatin,greek}{lgr}{LGR}{fds}{b}{sl}{<->\string\droid@fds@scale}
-\installfont{lgr-DroidSans-Bold-SmallCaps}{lgr-DroidSans-Bold,fixgreek-DroidSans-Bold,newlatin,greek}{lgrc}{LGR}{fds}{b}{sc}{<->\string\droid@fds@scale}
-\installfont{lgr-DroidSans-Bold-Slanted-SmallCaps}{lgr-DroidSans-Bold-Slanted,fixgreek-DroidSans-Bold-Slanted,newlatin,greek}{lgrc}{LGR}{fds}{b}{scsl}{<->\string\droid@fds@scale}
-\endinstallfonts
-
-
-% Mono
-\installfonts
-\installfamily{OT1}{fdm}{}
-
-\installfont{ot1-DroidSansMono}{ot1-DroidSansMono,fixlatin-DroidSansMono,newlatin}{ot1}{OT1}{fdm}{m}{n}{<->\string\droid@fdm@scale}
-\installfont{ot1-DroidSansMono-Slanted}{ot1-DroidSansMono-Slanted,fixlatin-DroidSansMono-Slanted,newlatin}{ot1}{OT1}{fdm}{m}{sl}{<->\string\droid@fdm@scale}
-\installfont{ot1-DroidSansMono-SmallCaps}{ot1-DroidSansMono,fixlatin-DroidSansMono,newlatin}{ot1c}{OT1}{fdm}{m}{sc}{<->\string\droid@fdm@scale}
-\installfont{ot1-DroidSansMono-Slanted-SmallCaps}{ot1-DroidSansMono-Slanted,fixlatin-DroidSansMono-Slanted,newlatin}{ot1c}{OT1}{fdm}{m}{scsl}{<->\string\droid@fdm@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{T1}{fdm}{}
-
-\installfont{t1-DroidSansMono}{t1-DroidSansMono,fixlatin-DroidSansMono,newlatin}{t1}{T1}{fdm}{m}{n}{<->\string\droid@fdm@scale}
-\installfont{t1-DroidSansMono-Slanted}{t1-DroidSansMono-Slanted,fixlatin-DroidSansMono-Slanted,newlatin}{t1}{T1}{fdm}{m}{sl}{<->\string\droid@fdm@scale}
-\installfont{t1-DroidSansMono-SmallCaps}{t1-DroidSansMono,fixlatin-DroidSansMono,newlatin}{t1c}{T1}{fdm}{m}{sc}{<->\string\droid@fdm@scale}
-\installfont{t1-DroidSansMono-Slanted-SmallCaps}{t1-DroidSansMono-Slanted,fixlatin-DroidSansMono-Slanted,newlatin}{t1c}{T1}{fdm}{m}{scsl}{<->\string\droid@fdm@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{TS1}{fdm}{}
-
-\installfont{ts1-DroidSansMono}{ts1-DroidSansMono,fixtextcomp-DroidSansMono,textcomp}{ts1}{TS1}{fdm}{m}{n}{<->\string\droid@fdm@scale}
-\installfont{ts1-DroidSansMono-Slanted}{ts1-DroidSansMono-Slanted,fixtextcomp-DroidSansMono-Slanted,textcomp}{ts1}{TS1}{fdm}{m}{sl}{<->\string\droid@fdm@scale}
-\installfontas{ts1-DroidSansMono}{TS1}{fdm}{m}{sc}{<->\string\droid@fdm@scale}
-\installfontas{ts1-DroidSansMono-Slanted}{TS1}{fdm}{m}{scsl}{<->\string\droid@fdm@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{T2A}{fdm}{}
-
-\installfont{t2a-DroidSansMono}{t2a-DroidSansMono,fixcyrillic-DroidSansMono,newlatin,cyrillic}{t2a}{T2A}{fdm}{m}{n}{<->\string\droid@fdm@scale}
-\installfont{t2a-DroidSansMono-Slanted}{t2a-DroidSansMono-Slanted,fixcyrillic-DroidSansMono-Slanted,newlatin,cyrillic}{t2a}{T2A}{fdm}{m}{sl}{<->\string\droid@fdm@scale}
-\installfont{t2a-DroidSansMono-SmallCaps}{t2a-DroidSansMono,fixcyrillic-DroidSansMono,newlatin,cyrillic}{t2ac}{T2A}{fdm}{m}{sc}{<->\string\droid@fdm@scale}
-\installfont{t2a-DroidSansMono-Slanted-SmallCaps}{t2a-DroidSansMono-Slanted,fixcyrillic-DroidSansMono-Slanted,newlatin,cyrillic}{t2ac}{T2A}{fdm}{m}{scsl}{<->\string\droid@fdm@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{T2B}{fdm}{}
-
-\installfont{t2b-DroidSansMono}{t2b-DroidSansMono,fixcyrillic-DroidSansMono,newlatin,cyrillic}{t2b}{T2B}{fdm}{m}{n}{<->\string\droid@fdm@scale}
-\installfont{t2b-DroidSansMono-Slanted}{t2b-DroidSansMono-Slanted,fixcyrillic-DroidSansMono-Slanted,newlatin,cyrillic}{t2b}{T2B}{fdm}{m}{sl}{<->\string\droid@fdm@scale}
-\installfont{t2b-DroidSansMono-SmallCaps}{t2b-DroidSansMono,fixcyrillic-DroidSansMono,newlatin,cyrillic}{t2bc}{T2B}{fdm}{m}{sc}{<->\string\droid@fdm@scale}
-\installfont{t2b-DroidSansMono-Slanted-SmallCaps}{t2b-DroidSansMono-Slanted,fixcyrillic-DroidSansMono-Slanted,newlatin,cyrillic}{t2bc}{T2B}{fdm}{m}{scsl}{<->\string\droid@fdm@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{T2C}{fdm}{}
-
-\installfont{t2c-DroidSansMono}{t2c-DroidSansMono,fixcyrillic-DroidSansMono,newlatin,cyrillic}{t2c}{T2C}{fdm}{m}{n}{<->\string\droid@fdm@scale}
-\installfont{t2c-DroidSansMono-Slanted}{t2c-DroidSansMono-Slanted,fixcyrillic-DroidSansMono-Slanted,newlatin,cyrillic}{t2c}{T2C}{fdm}{m}{sl}{<->\string\droid@fdm@scale}
-\installfont{t2c-DroidSansMono-SmallCaps}{t2c-DroidSansMono,fixcyrillic-DroidSansMono,newlatin,cyrillic}{t2cc}{T2C}{fdm}{m}{sc}{<->\string\droid@fdm@scale}
-\installfont{t2c-DroidSansMono-Slanted-SmallCaps}{t2c-DroidSansMono-Slanted,fixcyrillic-DroidSansMono-Slanted,newlatin,cyrillic}{t2cc}{T2C}{fdm}{m}{scsl}{<->\string\droid@fdm@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{X2}{fdm}{}
-
-\installfont{x2-DroidSansMono}{x2-DroidSansMono,fixcyrillic-DroidSansMono,newlatin,cyrillic}{x2}{X2}{fdm}{m}{n}{<->\string\droid@fdm@scale}
-\installfont{x2-DroidSansMono-Slanted}{x2-DroidSansMono-Slanted,fixcyrillic-DroidSansMono-Slanted,newlatin,cyrillic}{x2}{X2}{fdm}{m}{sl}{<->\string\droid@fdm@scale}
-\installfont{x2-DroidSansMono-SmallCaps}{x2-DroidSansMono,fixcyrillic-DroidSansMono,newlatin,cyrillic}{x2c}{X2}{fdm}{m}{sc}{<->\string\droid@fdm@scale}
-\installfont{x2-DroidSansMono-Slanted-SmallCaps}{x2-DroidSansMono-Slanted,fixcyrillic-DroidSansMono-Slanted,newlatin,cyrillic}{x2c}{X2}{fdm}{m}{scsl}{<->\string\droid@fdm@scale}
-\endinstallfonts
-
-
-\installfonts
-\installfamily{LGR}{fdm}{}
-
-\installfont{lgr-DroidSansMono}{lgr-DroidSansMono,fixgreek-DroidSansMono,newlatin,greek}{lgr}{LGR}{fdm}{m}{n}{<->\string\droid@fdm@scale}
-\installfont{lgr-DroidSansMono-Slanted}{lgr-DroidSansMono-Slanted,fixgreek-DroidSansMono-Slanted,newlatin,greek}{lgr}{LGR}{fdm}{m}{sl}{<->\string\droid@fdm@scale}
-\installfont{lgr-DroidSansMono-SmallCaps}{lgr-DroidSansMono,fixgreek-DroidSansMono,newlatin,greek}{lgrc}{LGR}{fdm}{m}{sc}{<->\string\droid@fdm@scale}
-\installfont{lgr-DroidSansMono-Slanted-SmallCaps}{lgr-DroidSansMono-Slanted,fixgreek-DroidSansMono-Slanted,newlatin,greek}{lgrc}{LGR}{fdm}{m}{scsl}{<->\string\droid@fdm@scale}
-\endinstallfonts
-
-
-\endrecordtransforms
-\bye
diff --git a/Master/texmf-dist/source/droid/droid-fixgreek.etx b/Master/texmf-dist/source/droid/droid-fixgreek.etx
deleted file mode 100644
index 523f39acb64..00000000000
--- a/Master/texmf-dist/source/droid/droid-fixgreek.etx
+++ /dev/null
@@ -1,75 +0,0 @@
-%% droid-fixgreek.etx
-%% Copyright 2010, 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)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\relax
-\encoding
-
-% questiongreek
-\setslot{semicolon}
-\endsetslot
-
-% digamma
-\setslot{f}
-\endsetslot
-
-% Digamma
-\setslot{F}
-\endsetslot
-
-% dieresisgreek
-\setslot{dieresis}
-\endsetslot
-
-% guillemotleft
-\setslot{guillemotleft}
-\endsetslot
-
-% guillemotright
-\setslot{guillemotright}
-\endsetslot
-
-% macrongreek
-\setslot{macron}
-\endsetslot
-
-% brevegreek
-\setslot{breve}
-\endsetslot
-
-% Delta
-\setslot{uni0394}
-\endsetslot
-
-% Omega
-\setslot{uni03A9}
-\endsetslot
-
-% mu
-\setslot{uni03BC}
-\endsetslot
-
-% rangedash
-\setslot{endash}
-\endsetslot
-
-% punctdash
-\setslot{emdash}
-\endsetslot
-
-% euro
-\setslot{Euro}
-\endsetslot
-
-\endencoding
diff --git a/Master/texmf-dist/source/droid/droid-fixlatin.etx b/Master/texmf-dist/source/droid/droid-fixlatin.etx
deleted file mode 100644
index a2ba2fec126..00000000000
--- a/Master/texmf-dist/source/droid/droid-fixlatin.etx
+++ /dev/null
@@ -1,103 +0,0 @@
-%% droid-fixlatin.etx
-%% Copyright 2010, 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)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\relax
-\encoding
-
-% quotedbl
-\setslot{quotedbl}
-\endsetslot
-
-% quotesingle
-\setslot{quotesingle}
-\endsetslot
-
-% less
-\setslot{less}
-\endsetslot
-
-% greater
-\setslot{greater}
-\endsetslot
-
-% backslash
-\setslot{backslash}
-\endsetslot
-
-% underscore
-\setslot{underscore}
-\endsetslot
-
-% braceleft
-\setslot{braceleft}
-\endsetslot
-
-% bar
-\setslot{bar}
-\endsetslot
-
-% braceright
-\setslot{braceright}
-\endsetslot
-
-% dbar
-\setslot{dcroat}
-\endsetslot
-
-% Ng
-\setslot{Eng}
-\endsetslot
-
-% ng
-\setslot{eng}
-\endsetslot
-
-% ringfitted
-\setslot{ring}
-\endsetslot
-
-% Delta
-\setslot{uni0394}
-\endsetslot
-
-% Omega
-\setslot{uni03A9}
-\endsetslot
-
-% rangedash
-\setslot{endash}
-\endsetslot
-
-% punctdash
-\setslot{emdash}
-\endsetslot
-
-% fi
-\setslot{uniFB01}
-\endsetslot
-
-% fl
-\setslot{uniFB02}
-\endsetslot
-
-% ffi
-\setslot{uniFB03}
-\endsetslot
-
-% ffl
-\setslot{uniFB04}
-\endsetslot
-
-\endencoding
diff --git a/Master/texmf-dist/source/droid/droid-fixtextcomp.etx b/Master/texmf-dist/source/droid/droid-fixtextcomp.etx
deleted file mode 100644
index 0b4adbe000d..00000000000
--- a/Master/texmf-dist/source/droid/droid-fixtextcomp.etx
+++ /dev/null
@@ -1,149 +0,0 @@
-%% droid-fixtextcomp.etx
-%% Copyright 2010, 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)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\relax
-\encoding
-
-% Needed to fake interrobang
-\setslot{exclam}
-\endsetslot
-
-% Needed to set vaxis variable
-\setslot{parenleft}
-\endsetslot
-
-% Needed to fake asteriskcentered
-\setslot{asterisk}
-\endsetslot
-
-% hyphen
-\setslot{hyphen}
-\endsetslot
-
-% Needed to fake interrobang
-\setslot{question}
-\endsetslot
-
-% Needed to fake centigrade
-\setslot{C}
-\endsetslot
-
-% Needed to fake openbracketleft
-\setslot{bracketleft}
-\endsetslot
-
-% Needed to fake openbracketright
-\setslot{bracketright}
-\endsetslot
-
-% capitalgreve, asciigrave
-% Needed to fake asciigravedbl
-\setslot{grave}
-\endsetslot
-
-% Needed to set descender variable
-\setslot{g}
-\endsetslot
-
-% Needed to fake bardbl
-\setslot{bar}
-\endsetslot
-
-% tildelow
-\setslot{asciitilde}
-\endsetslot
-
-% capitaldieresis, asciidieresis
-\setslot{dieresis}
-\endsetslot
-
-% capitalacute, asciiacute
-% Needed to fake asciiacutedbl
-\setslot{acute}
-\endsetslot
-
-% cedilla
-\setslot{cedilla}
-\endsetslot
-
-% capitalcircumflex
-\setslot{circumflex}
-\endsetslot
-
-% capitalcaron, asciicaron
-\setslot{caron}
-\endsetslot
-
-% capitalmacron, asciimacron
-\setslot{macron}
-\endsetslot
-
-% capitalbreve, asciibreve
-\setslot{breve}
-\endsetslot
-
-% capitaldotaccent
-\setslot{dotaccent}
-\endsetslot
-
-% capitalring
-\setslot{ring}
-\endsetslot
-
-% ogonek
-\setslot{ogonek}
-\endsetslot
-
-% capitaltilde
-\setslot{tilde}
-\endsetslot
-
-% capitalhungarumlaut
-\setslot{hungarumlaut}
-\endsetslot
-
-% asciigravedbl
-\setslot{uni030F}
-\endsetslot
-
-% quotesinglebase
-\setslot{quotesinglebase}
-\endsetslot
-
-% quotedblbase
-\setslot{quotedblbase}
-\endsetslot
-
-% Needed to fake twelveudash and threequartersemdash
-\setslot{endash}
-\endsetslot
-
-% lira
-\setslot{afii08941}
-\endsetslot
-
-% dong
-\setslot{uni20AB}
-\endsetslot
-
-% euro
-\setslot{Euro}
-\endsetslot
-
-% numero
-\setslot{afii61352}
-\endsetslot
-
-\endencoding
diff --git a/Master/texmf-dist/source/droid/droid-reglyph.tex b/Master/texmf-dist/source/droid/droid-reglyph.tex
deleted file mode 100644
index 4033be77195..00000000000
--- a/Master/texmf-dist/source/droid/droid-reglyph.tex
+++ /dev/null
@@ -1,458 +0,0 @@
-%% droid-reglyph.tex
-%% Copyright 2010, 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)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\relax
-
-
-\reglyphfonts
-  \killglyph{Delta}
-  \killglyph{Omega}
-  
-  \reglyphfont{ot1-DroidSerif-Regular}{raw-ot1-DroidSerif-Regular}
-  \reglyphfont{ot1-DroidSerif-Regular-Slanted}{raw-ot1-DroidSerif-Regular-Slanted}
-  \reglyphfont{ot1-DroidSerif-Italic}{raw-ot1-DroidSerif-Italic}
-  \reglyphfont{ot1-DroidSerif-Italic-Upright}{raw-ot1-DroidSerif-Italic-Upright}
-  \reglyphfont{ot1-DroidSerif-Bold}{raw-ot1-DroidSerif-Bold}
-  \reglyphfont{ot1-DroidSerif-Bold-Slanted}{raw-ot1-DroidSerif-Bold-Slanted}
-  \reglyphfont{ot1-DroidSerif-BoldItalic}{raw-ot1-DroidSerif-BoldItalic}
-  \reglyphfont{ot1-DroidSerif-BoldItalic-Upright}{raw-ot1-DroidSerif-BoldItalic-Upright}
-
-  \reglyphfont{ot1-DroidSans}{raw-ot1-DroidSans}
-  \reglyphfont{ot1-DroidSans-Slanted}{raw-ot1-DroidSans-Slanted}
-  \reglyphfont{ot1-DroidSans-Bold}{raw-ot1-DroidSans-Bold}
-  \reglyphfont{ot1-DroidSans-Bold-Slanted}{raw-ot1-DroidSans-Bold-Slanted}
-
-  \reglyphfont{ot1-DroidSansMono}{raw-ot1-DroidSansMono}
-  \reglyphfont{ot1-DroidSansMono-Slanted}{raw-ot1-DroidSansMono-Slanted}
-\endreglyphfonts
-
-
-\reglyphfonts
-  \reglyphfont{t1-DroidSerif-Regular}{raw-t1-DroidSerif-Regular}
-  \reglyphfont{t1-DroidSerif-Regular-Slanted}{raw-t1-DroidSerif-Regular-Slanted}
-  \reglyphfont{t1-DroidSerif-Italic}{raw-t1-DroidSerif-Italic}
-  \reglyphfont{t1-DroidSerif-Italic-Upright}{raw-t1-DroidSerif-Italic-Upright}
-  \reglyphfont{t1-DroidSerif-Bold}{raw-t1-DroidSerif-Bold}
-  \reglyphfont{t1-DroidSerif-Bold-Slanted}{raw-t1-DroidSerif-Bold-Slanted}
-  \reglyphfont{t1-DroidSerif-BoldItalic}{raw-t1-DroidSerif-BoldItalic}
-  \reglyphfont{t1-DroidSerif-BoldItalic-Upright}{raw-t1-DroidSerif-BoldItalic-Upright}
-
-  \reglyphfont{t1-DroidSans}{raw-t1-DroidSans}
-  \reglyphfont{t1-DroidSans-Slanted}{raw-t1-DroidSans-Slanted}
-  \reglyphfont{t1-DroidSans-Bold}{raw-t1-DroidSans-Bold}
-  \reglyphfont{t1-DroidSans-Bold-Slanted}{raw-t1-DroidSans-Bold-Slanted}
-
-  \reglyphfont{t1-DroidSansMono}{raw-t1-DroidSansMono}
-  \reglyphfont{t1-DroidSansMono-Slanted}{raw-t1-DroidSansMono-Slanted}
-\endreglyphfonts
-
-\reglyphfonts
-  \renameglyph{Ng}{Eng}
-  \renameglyph{dbar}{dcroat}
-  \renameglyph{ng}{eng}
-  \renameglyph{Delta}{uni0394}
-  \renameglyph{Omega}{uni03A9}
-  \renameglyph{fi}{uniFB01}
-  \renameglyph{fl}{uniFB02}
-  \renameglyph{ffi}{uniFB03}
-  \renameglyph{ffl}{uniFB04}
-
-  \reglyphfont{fixlatin-DroidSerif-Regular}{raw-fixlatin-DroidSerif-Regular}
-  \reglyphfont{fixlatin-DroidSerif-Regular-Slanted}{raw-fixlatin-DroidSerif-Regular-Slanted}
-  \reglyphfont{fixlatin-DroidSerif-Italic}{raw-fixlatin-DroidSerif-Italic}
-  \reglyphfont{fixlatin-DroidSerif-Italic-Upright}{raw-fixlatin-DroidSerif-Italic-Upright}
-  \reglyphfont{fixlatin-DroidSerif-Bold}{raw-fixlatin-DroidSerif-Bold}
-  \reglyphfont{fixlatin-DroidSerif-Bold-Slanted}{raw-fixlatin-DroidSerif-Bold-Slanted}
-  \reglyphfont{fixlatin-DroidSerif-BoldItalic}{raw-fixlatin-DroidSerif-BoldItalic}
-  \reglyphfont{fixlatin-DroidSerif-BoldItalic-Upright}{raw-fixlatin-DroidSerif-BoldItalic-Upright}
-
-  \reglyphfont{fixlatin-DroidSans}{raw-fixlatin-DroidSans}
-  \reglyphfont{fixlatin-DroidSans-Slanted}{raw-fixlatin-DroidSans-Slanted}
-  \reglyphfont{fixlatin-DroidSans-Bold}{raw-fixlatin-DroidSans-Bold}
-  \reglyphfont{fixlatin-DroidSans-Bold-Slanted}{raw-fixlatin-DroidSans-Bold-Slanted}
-
-  \reglyphfont{fixlatin-DroidSansMono}{raw-fixlatin-DroidSansMono}
-  \reglyphfont{fixlatin-DroidSansMono-Slanted}{raw-fixlatin-DroidSansMono-Slanted}
-\endreglyphfonts
-
-
-\reglyphfonts
-  \reglyphfont{ts1-DroidSerif-Regular}{raw-ts1-DroidSerif-Regular}
-  \reglyphfont{ts1-DroidSerif-Regular-Slanted}{raw-ts1-DroidSerif-Regular-Slanted}
-  \reglyphfont{ts1-DroidSerif-Italic}{raw-ts1-DroidSerif-Italic}
-  \reglyphfont{ts1-DroidSerif-Italic-Upright}{raw-ts1-DroidSerif-Italic-Upright}
-  \reglyphfont{ts1-DroidSerif-Bold}{raw-ts1-DroidSerif-Bold}
-  \reglyphfont{ts1-DroidSerif-Bold-Slanted}{raw-ts1-DroidSerif-Bold-Slanted}
-  \reglyphfont{ts1-DroidSerif-BoldItalic}{raw-ts1-DroidSerif-BoldItalic}
-  \reglyphfont{ts1-DroidSerif-BoldItalic-Upright}{raw-ts1-DroidSerif-BoldItalic-Upright}
-
-  \reglyphfont{ts1-DroidSans}{raw-ts1-DroidSans}
-  \reglyphfont{ts1-DroidSans-Slanted}{raw-ts1-DroidSans-Slanted}
-  \reglyphfont{ts1-DroidSans-Bold}{raw-ts1-DroidSans-Bold}
-  \reglyphfont{ts1-DroidSans-Bold-Slanted}{raw-ts1-DroidSans-Bold-Slanted}
-
-  \reglyphfont{ts1-DroidSansMono}{raw-ts1-DroidSansMono}
-  \reglyphfont{ts1-DroidSansMono-Slanted}{raw-ts1-DroidSansMono-Slanted}
-\endreglyphfonts
-
-\reglyphfonts
-  \renameglyph{asciigravedbl}{uni030F}
-  \renameglyph{lira}{afii08941}
-  \renameglyph{dong}{uni20AB}
-  \renameglyph{numero}{afii61352}
-
-  \reglyphfont{fixtextcomp-DroidSerif-Regular}{raw-fixtextcomp-DroidSerif-Regular}
-  \reglyphfont{fixtextcomp-DroidSerif-Regular-Slanted}{raw-fixtextcomp-DroidSerif-Regular-Slanted}
-  \reglyphfont{fixtextcomp-DroidSerif-Italic}{raw-fixtextcomp-DroidSerif-Italic}
-  \reglyphfont{fixtextcomp-DroidSerif-Italic-Upright}{raw-fixtextcomp-DroidSerif-Italic-Upright}
-  \reglyphfont{fixtextcomp-DroidSerif-Bold}{raw-fixtextcomp-DroidSerif-Bold}
-  \reglyphfont{fixtextcomp-DroidSerif-Bold-Slanted}{raw-fixtextcomp-DroidSerif-Bold-Slanted}
-  \reglyphfont{fixtextcomp-DroidSerif-BoldItalic}{raw-fixtextcomp-DroidSerif-BoldItalic}
-  \reglyphfont{fixtextcomp-DroidSerif-BoldItalic-Upright}{raw-fixtextcomp-DroidSerif-BoldItalic-Upright}
-
-  \reglyphfont{fixtextcomp-DroidSans}{raw-fixtextcomp-DroidSans}
-  \reglyphfont{fixtextcomp-DroidSans-Slanted}{raw-fixtextcomp-DroidSans-Slanted}
-  \reglyphfont{fixtextcomp-DroidSans-Bold}{raw-fixtextcomp-DroidSans-Bold}
-  \reglyphfont{fixtextcomp-DroidSans-Bold-Slanted}{raw-fixtextcomp-DroidSans-Bold-Slanted}
-
-  \reglyphfont{fixtextcomp-DroidSansMono}{raw-fixtextcomp-DroidSansMono}
-  \reglyphfont{fixtextcomp-DroidSansMono-Slanted}{raw-fixtextcomp-DroidSansMono-Slanted}
-\endreglyphfonts
-
-
-\reglyphfonts
-  \reglyphfont{t2a-DroidSerif-Regular}{raw-t2a-DroidSerif-Regular}
-  \reglyphfont{t2a-DroidSerif-Regular-Slanted}{raw-t2a-DroidSerif-Regular-Slanted}
-  \reglyphfont{t2a-DroidSerif-Italic}{raw-t2a-DroidSerif-Italic}
-  \reglyphfont{t2a-DroidSerif-Italic-Upright}{raw-t2a-DroidSerif-Italic-Upright}
-  \reglyphfont{t2a-DroidSerif-Bold}{raw-t2a-DroidSerif-Bold}
-  \reglyphfont{t2a-DroidSerif-Bold-Slanted}{raw-t2a-DroidSerif-Bold-Slanted}
-  \reglyphfont{t2a-DroidSerif-BoldItalic}{raw-t2a-DroidSerif-BoldItalic}
-  \reglyphfont{t2a-DroidSerif-BoldItalic-Upright}{raw-t2a-DroidSerif-BoldItalic-Upright}
-
-  \reglyphfont{t2a-DroidSans}{raw-t2a-DroidSans}
-  \reglyphfont{t2a-DroidSans-Slanted}{raw-t2a-DroidSans-Slanted}
-  \reglyphfont{t2a-DroidSans-Bold}{raw-t2a-DroidSans-Bold}
-  \reglyphfont{t2a-DroidSans-Bold-Slanted}{raw-t2a-DroidSans-Bold-Slanted}
-
-  \reglyphfont{t2a-DroidSansMono}{raw-t2a-DroidSansMono}
-  \reglyphfont{t2a-DroidSansMono-Slanted}{raw-t2a-DroidSansMono-Slanted}
-\endreglyphfonts
-
-
-\reglyphfonts
-  \reglyphfont{t2b-DroidSerif-Regular}{raw-t2b-DroidSerif-Regular}
-  \reglyphfont{t2b-DroidSerif-Regular-Slanted}{raw-t2b-DroidSerif-Regular-Slanted}
-  \reglyphfont{t2b-DroidSerif-Italic}{raw-t2b-DroidSerif-Italic}
-  \reglyphfont{t2b-DroidSerif-Italic-Upright}{raw-t2b-DroidSerif-Italic-Upright}
-  \reglyphfont{t2b-DroidSerif-Bold}{raw-t2b-DroidSerif-Bold}
-  \reglyphfont{t2b-DroidSerif-Bold-Slanted}{raw-t2b-DroidSerif-Bold-Slanted}
-  \reglyphfont{t2b-DroidSerif-BoldItalic}{raw-t2b-DroidSerif-BoldItalic}
-  \reglyphfont{t2b-DroidSerif-BoldItalic-Upright}{raw-t2b-DroidSerif-BoldItalic-Upright}
-
-  \reglyphfont{t2b-DroidSans}{raw-t2b-DroidSans}
-  \reglyphfont{t2b-DroidSans-Slanted}{raw-t2b-DroidSans-Slanted}
-  \reglyphfont{t2b-DroidSans-Bold}{raw-t2b-DroidSans-Bold}
-  \reglyphfont{t2b-DroidSans-Bold-Slanted}{raw-t2b-DroidSans-Bold-Slanted}
-
-  \reglyphfont{t2b-DroidSansMono}{raw-t2b-DroidSansMono}
-  \reglyphfont{t2b-DroidSansMono-Slanted}{raw-t2b-DroidSansMono-Slanted}
-\endreglyphfonts
-
-
-\reglyphfonts
-  \reglyphfont{t2c-DroidSerif-Regular}{raw-t2c-DroidSerif-Regular}
-  \reglyphfont{t2c-DroidSerif-Regular-Slanted}{raw-t2c-DroidSerif-Regular-Slanted}
-  \reglyphfont{t2c-DroidSerif-Italic}{raw-t2c-DroidSerif-Italic}
-  \reglyphfont{t2c-DroidSerif-Italic-Upright}{raw-t2c-DroidSerif-Italic-Upright}
-  \reglyphfont{t2c-DroidSerif-Bold}{raw-t2c-DroidSerif-Bold}
-  \reglyphfont{t2c-DroidSerif-Bold-Slanted}{raw-t2c-DroidSerif-Bold-Slanted}
-  \reglyphfont{t2c-DroidSerif-BoldItalic}{raw-t2c-DroidSerif-BoldItalic}
-  \reglyphfont{t2c-DroidSerif-BoldItalic-Upright}{raw-t2c-DroidSerif-BoldItalic-Upright}
-
-  \reglyphfont{t2c-DroidSans}{raw-t2c-DroidSans}
-  \reglyphfont{t2c-DroidSans-Slanted}{raw-t2c-DroidSans-Slanted}
-  \reglyphfont{t2c-DroidSans-Bold}{raw-t2c-DroidSans-Bold}
-  \reglyphfont{t2c-DroidSans-Bold-Slanted}{raw-t2c-DroidSans-Bold-Slanted}
-
-  \reglyphfont{t2c-DroidSansMono}{raw-t2c-DroidSansMono}
-  \reglyphfont{t2c-DroidSansMono-Slanted}{raw-t2c-DroidSansMono-Slanted}
-\endreglyphfonts
-
-
-\reglyphfonts
-  \reglyphfont{x2-DroidSerif-Regular}{raw-x2-DroidSerif-Regular}
-  \reglyphfont{x2-DroidSerif-Regular-Slanted}{raw-x2-DroidSerif-Regular-Slanted}
-  \reglyphfont{x2-DroidSerif-Italic}{raw-x2-DroidSerif-Italic}
-  \reglyphfont{x2-DroidSerif-Italic-Upright}{raw-x2-DroidSerif-Italic-Upright}
-  \reglyphfont{x2-DroidSerif-Bold}{raw-x2-DroidSerif-Bold}
-  \reglyphfont{x2-DroidSerif-Bold-Slanted}{raw-x2-DroidSerif-Bold-Slanted}
-  \reglyphfont{x2-DroidSerif-BoldItalic}{raw-x2-DroidSerif-BoldItalic}
-  \reglyphfont{x2-DroidSerif-BoldItalic-Upright}{raw-x2-DroidSerif-BoldItalic-Upright}
-
-  \reglyphfont{x2-DroidSans}{raw-x2-DroidSans}
-  \reglyphfont{x2-DroidSans-Slanted}{raw-x2-DroidSans-Slanted}
-  \reglyphfont{x2-DroidSans-Bold}{raw-x2-DroidSans-Bold}
-  \reglyphfont{x2-DroidSans-Bold-Slanted}{raw-x2-DroidSans-Bold-Slanted}
-
-  \reglyphfont{x2-DroidSansMono}{raw-x2-DroidSansMono}
-  \reglyphfont{x2-DroidSansMono-Slanted}{raw-x2-DroidSansMono}
-\endreglyphfonts
-
-
-\reglyphfonts
-  \renameglyph{dblgrave}{uni030F}
-  \renameglyph{CYRYO}{afii10023}
-  \renameglyph{CYRDJE}{afii10051}
-  \renameglyph{CYRIE}{afii10053}
-  \renameglyph{CYRDZE}{afii10054}
-  \renameglyph{CYRII}{afii10055}
-  \renameglyph{CYRYI}{afii10056}
-  \renameglyph{CYRJE}{afii10057}
-  \renameglyph{CYRLJE}{afii10058}
-  \renameglyph{CYRNJE}{afii10059}
-  \renameglyph{CYRTSHE}{afii10060}
-  \renameglyph{CYRUSHRT}{afii10062}
-  \renameglyph{CYRDZHE}{afii10145}
-  \renameglyph{CYRA}{afii10017}
-  \renameglyph{CYRB}{afii10018}
-  \renameglyph{CYRV}{afii10019}
-  \renameglyph{CYRG}{afii10020}
-  \renameglyph{CYRD}{afii10021}
-  \renameglyph{CYRE}{afii10022}
-  \renameglyph{CYRZH}{afii10024}
-  \renameglyph{CYRZ}{afii10025}
-  \renameglyph{CYRI}{afii10026}
-  \renameglyph{CYRISHRT}{afii10027}
-  \renameglyph{CYRK}{afii10028}
-  \renameglyph{CYRL}{afii10029}
-  \renameglyph{CYRM}{afii10030}
-  \renameglyph{CYRN}{afii10031}
-  \renameglyph{CYRO}{afii10032}
-  \renameglyph{CYRP}{afii10033}
-  \renameglyph{CYRR}{afii10034}
-  \renameglyph{CYRS}{afii10035}
-  \renameglyph{CYRT}{afii10036}
-  \renameglyph{CYRU}{afii10037}
-  \renameglyph{CYRF}{afii10038}
-  \renameglyph{CYRH}{afii10039}
-  \renameglyph{CYRC}{afii10040}
-  \renameglyph{CYRCH}{afii10041}
-  \renameglyph{CYRSH}{afii10042}
-  \renameglyph{CYRSHCH}{afii10043}
-  \renameglyph{CYRHRDSN}{afii10044}
-  \renameglyph{CYRERY}{afii10045}
-  \renameglyph{CYRSFTSN}{afii10046}
-  \renameglyph{CYREREV}{afii10047}
-  \renameglyph{CYRYU}{afii10048}
-  \renameglyph{CYRYA}{afii10049}
-  \renameglyph{cyra}{afii10065}
-  \renameglyph{cyrb}{afii10066}
-  \renameglyph{cyrv}{afii10067}
-  \renameglyph{cyrg}{afii10068}
-  \renameglyph{cyrd}{afii10069}
-  \renameglyph{cyre}{afii10070}
-  \renameglyph{cyrzh}{afii10072}
-  \renameglyph{cyrz}{afii10073}
-  \renameglyph{cyri}{afii10074}
-  \renameglyph{cyrishrt}{afii10075}
-  \renameglyph{cyrk}{afii10076}
-  \renameglyph{cyrl}{afii10077}
-  \renameglyph{cyrm}{afii10078}
-  \renameglyph{cyrn}{afii10079}
-  \renameglyph{cyro}{afii10080}
-  \renameglyph{cyrp}{afii10081}
-  \renameglyph{cyrr}{afii10082}
-  \renameglyph{cyrs}{afii10083}
-  \renameglyph{cyrt}{afii10084}
-  \renameglyph{cyru}{afii10085}
-  \renameglyph{cyrf}{afii10086}
-  \renameglyph{cyrh}{afii10087}
-  \renameglyph{cyrc}{afii10088}
-  \renameglyph{cyrch}{afii10089}
-  \renameglyph{cyrsh}{afii10090}
-  \renameglyph{cyrshch}{afii10091}
-  \renameglyph{cyrhrdsn}{afii10092}
-  \renameglyph{cyrery}{afii10093}
-  \renameglyph{cyrsftsn}{afii10094}
-  \renameglyph{cyrerev}{afii10095}
-  \renameglyph{cyryu}{afii10096}
-  \renameglyph{cyrya}{afii10097}
-  \renameglyph{cyryo}{afii10071}
-  \renameglyph{cyrdje}{afii10099}
-  \renameglyph{cyrie}{afii10101}
-  \renameglyph{cyrdze}{afii10102}
-  \renameglyph{cyrii}{afii10103}
-  \renameglyph{cyryi}{afii10104}
-  \renameglyph{cyrje}{afii10105}
-  \renameglyph{cyrlje}{afii10106}
-  \renameglyph{cyrnje}{afii10107}
-  \renameglyph{cyrtshe}{afii10108}
-  \renameglyph{cyrushrt}{afii10110}
-  \renameglyph{cyrdzhe}{afii10193}
-  \renameglyph{CYRYAT}{uni0462}
-  \renameglyph{cyryat}{uni0463}
-  \renameglyph{CYRBYUS}{uni046A}
-  \renameglyph{cyrbyus}{uni046B}
-  \renameglyph{CYRIZH}{uni0474}
-  \renameglyph{cyrizh}{uni0475}
-  \renameglyph{CYRSEMISFTSN}{uni048C}
-  \renameglyph{cyrsemisftsn}{uni048D}
-  \renameglyph{CYRRTICK}{uni048E}
-  \renameglyph{cyrrtick}{uni048F}
-  \renameglyph{CYRGUP}{afii10050}
-  \renameglyph{cyrgup}{afii10098}
-  \renameglyph{CYRGHCRS}{uni0492}
-  \renameglyph{cyrghcrs}{uni0493}
-  \renameglyph{CYRGHK}{uni0494}
-  \renameglyph{cyrghk}{uni0495}
-  \renameglyph{CYRZHDSC}{uni0496}
-  \renameglyph{cyrzhdsc}{uni0497}
-  \renameglyph{CYRZDSC}{uni0498}
-  \renameglyph{cyrzdsc}{uni0499}
-  \renameglyph{CYRKDSC}{uni049A}
-  \renameglyph{cyrkdsc}{uni049B}
-  \renameglyph{CYRKVCRS}{uni049C}
-  \renameglyph{cyrkvcrs}{uni049D}
-  \renameglyph{CYRKHCRS}{uni049E}
-  \renameglyph{cyrkhcrs}{uni049F}
-  \renameglyph{CYRKBEAK}{uni04A0}
-  \renameglyph{cyrkbeak}{uni04A1}
-  \renameglyph{CYRNDSC}{uni04A2}
-  \renameglyph{cyrndsc}{uni04A3}
-  \renameglyph{CYRNG}{uni04A4}
-  \renameglyph{cyrng}{uni04A5}
-  \renameglyph{CYRPHK}{uni04A6}
-  \renameglyph{cyrphk}{uni04A7}
-  \renameglyph{CYRABHHA}{uni04A8}
-  \renameglyph{cyrabhha}{uni04A9}
-  \renameglyph{CYRSDSC}{uni04AA}
-  \renameglyph{cyrsdsc}{uni04AB}
-  \renameglyph{CYRTDSC}{uni04AC}
-  \renameglyph{cyrtdsc}{uni04AD}
-  \renameglyph{CYRY}{uni04AE}
-  \renameglyph{cyry}{uni04AF}
-  \renameglyph{CYRYHCRS}{uni04B0}
-  \renameglyph{cyryhcrs}{uni04B1}
-  \renameglyph{CYRHDSC}{uni04B2}
-  \renameglyph{cyrhdsc}{uni04B3}
-  \renameglyph{CYRTETSE}{uni04B4}
-  \renameglyph{cyrtetse}{uni04B5}
-  \renameglyph{CYRCHRDSC}{uni04B6}
-  \renameglyph{cyrchrdsc}{uni04B7}
-  \renameglyph{CYRCHVCRS}{uni04B8}
-  \renameglyph{cyrchvcrs}{uni04B9}
-  \renameglyph{CYRSHHA}{uni04BA}
-  \renameglyph{cyrshha}{uni04BB}
-  \renameglyph{CYRABHCH}{uni04BC}
-  \renameglyph{cyrabhch}{uni04BD}
-  \renameglyph{CYRABHCHDSC}{uni04BE}
-  \renameglyph{cyrabhchdsc}{uni04BF}
-  \renameglyph{CYRpalochka}{uni04C0}
-  \renameglyph{CYRKHK}{uni04C3}
-  \renameglyph{cyrkhk}{uni04C4}
-  \renameglyph{CYRNHK}{uni04C7}
-  \renameglyph{cyrnhk}{uni04C8}
-  \renameglyph{CYRCHLDSC}{uni04CB}
-  \renameglyph{cyrchldsc}{uni04CC}
-  \renameglyph{CYRAE}{uni04D4}
-  \renameglyph{cyrae}{uni04D5}
-  \renameglyph{CYRSCHWA}{uni04D8}
-  \renameglyph{cyrschwa}{uni04D9}
-  \renameglyph{CYRABHDZE}{uni04E0}
-  \renameglyph{cyrabhdze}{uni04E1}
-  \renameglyph{CYROTLD}{uni04E8}
-  \renameglyph{cyrotld}{uni04E9}
-  \renameglyph{CYRGDSC}{uni04F6}
-  \renameglyph{cyrgdsc}{uni04F7}
-  \renameglyph{CYRHHK}{uni04FC}
-  \renameglyph{cyrhhk}{uni04FD}
-  \renameglyph{CYRHHCRS}{uni04FE}
-  \renameglyph{cyrhhcrs}{uni04FF}
-  \renameglyph{CYRLHK}{uni0512}
-  \renameglyph{cyrlhk}{uni0513}
-  \renameglyph{numero}{afii61352}
-  \renameglyph{fi}{uniFB01}
-  \renameglyph{fl}{uniFB02}
-  \renameglyph{ffi}{uniFB03}
-  \renameglyph{ffl}{uniFB04}
-  \renameglyph{cyrbreve}{cyrillicbreve}
-
-  \reglyphfont{fixcyrillic-DroidSerif-Regular}{raw-fixcyrillic-DroidSerif-Regular}
-  \reglyphfont{fixcyrillic-DroidSerif-Regular-Slanted}{raw-fixcyrillic-DroidSerif-Regular-Slanted}
-  \reglyphfont{fixcyrillic-DroidSerif-Italic}{raw-fixcyrillic-DroidSerif-Italic}
-  \reglyphfont{fixcyrillic-DroidSerif-Italic-Upright}{raw-fixcyrillic-DroidSerif-Italic-Upright}
-  \reglyphfont{fixcyrillic-DroidSerif-Bold}{raw-fixcyrillic-DroidSerif-Bold}
-  \reglyphfont{fixcyrillic-DroidSerif-Bold-Slanted}{raw-fixcyrillic-DroidSerif-Bold-Slanted}
-  \reglyphfont{fixcyrillic-DroidSerif-BoldItalic}{raw-fixcyrillic-DroidSerif-BoldItalic}
-  \reglyphfont{fixcyrillic-DroidSerif-BoldItalic-Upright}{raw-fixcyrillic-DroidSerif-BoldItalic-Upright}
-
-  \reglyphfont{fixcyrillic-DroidSans}{raw-fixcyrillic-DroidSans}
-  \reglyphfont{fixcyrillic-DroidSans-Slanted}{raw-fixcyrillic-DroidSans-Slanted}
-  \reglyphfont{fixcyrillic-DroidSans-Bold}{raw-fixcyrillic-DroidSans-Bold}
-  \reglyphfont{fixcyrillic-DroidSans-Bold-Slanted}{raw-fixcyrillic-DroidSans-Bold-Slanted}
-
-  \reglyphfont{fixcyrillic-DroidSansMono}{raw-fixcyrillic-DroidSansMono}
-  \reglyphfont{fixcyrillic-DroidSansMono-Slanted}{raw-fixcyrillic-DroidSansMono-Slanted}
-\endreglyphfonts
-
-
-\reglyphfonts
-  \killglyph{Delta}
-  \killglyph{Omega}
-  \killglyph{mu}
-
-  \reglyphfont{lgr-DroidSerif-Regular}{raw-lgr-DroidSerif-Regular}
-  \reglyphfont{lgr-DroidSerif-Regular-Slanted}{raw-lgr-DroidSerif-Regular-Slanted}
-  \reglyphfont{lgr-DroidSerif-Italic}{raw-lgr-DroidSerif-Italic}
-  \reglyphfont{lgr-DroidSerif-Italic-Upright}{raw-lgr-DroidSerif-Italic-Upright}
-  \reglyphfont{lgr-DroidSerif-Bold}{raw-lgr-DroidSerif-Bold}
-  \reglyphfont{lgr-DroidSerif-Bold-Slanted}{raw-lgr-DroidSerif-Bold-Slanted}
-  \reglyphfont{lgr-DroidSerif-BoldItalic}{raw-lgr-DroidSerif-BoldItalic}
-  \reglyphfont{lgr-DroidSerif-BoldItalic-Upright}{raw-lgr-DroidSerif-BoldItalic-Upright}
-
-  \reglyphfont{lgr-DroidSans}{raw-lgr-DroidSans}
-  \reglyphfont{lgr-DroidSans-Slanted}{raw-lgr-DroidSans-Slanted}
-  \reglyphfont{lgr-DroidSans-Bold}{raw-lgr-DroidSans-Bold}
-  \reglyphfont{lgr-DroidSans-Bold-Slanted}{raw-lgr-DroidSans-Bold-Slanted}
-
-  \reglyphfont{lgr-DroidSansMono}{raw-lgr-DroidSansMono}
-  \reglyphfont{lgr-DroidSansMono-Slanted}{raw-lgr-DroidSansMono-Slanted}
-\endreglyphfonts
-
-
-\reglyphfonts
-  \renameglyph{Delta}{uni0394}
-  \renameglyph{Omega}{uni03A9}
-  \renameglyph{mu}{uni03BC}
-  \renameglyph{euro}{Euro}
-
-  \reglyphfont{fixgreek-DroidSerif-Regular}{raw-fixgreek-DroidSerif-Regular}
-  \reglyphfont{fixgreek-DroidSerif-Regular-Slanted}{raw-fixgreek-DroidSerif-Regular-Slanted}
-  \reglyphfont{fixgreek-DroidSerif-Italic}{raw-fixgreek-DroidSerif-Italic}
-  \reglyphfont{fixgreek-DroidSerif-Italic-Upright}{raw-fixgreek-DroidSerif-Italic-Upright}
-  \reglyphfont{fixgreek-DroidSerif-Bold}{raw-fixgreek-DroidSerif-Bold}
-  \reglyphfont{fixgreek-DroidSerif-Bold-Slanted}{raw-fixgreek-DroidSerif-Bold-Slanted}
-  \reglyphfont{fixgreek-DroidSerif-BoldItalic}{raw-fixgreek-DroidSerif-BoldItalic}
-  \reglyphfont{fixgreek-DroidSerif-BoldItalic-Upright}{raw-fixgreek-DroidSerif-BoldItalic-Upright}
-
-  \reglyphfont{fixgreek-DroidSans}{raw-fixgreek-DroidSans}
-  \reglyphfont{fixgreek-DroidSans-Slanted}{raw-fixgreek-DroidSans-Slanted}
-  \reglyphfont{fixgreek-DroidSans-Bold}{raw-fixgreek-DroidSans-Bold}
-  \reglyphfont{fixgreek-DroidSans-Bold-Slanted}{raw-fixgreek-DroidSans-Bold-Slanted}
-
-  \reglyphfont{fixgreek-DroidSansMono}{raw-fixgreek-DroidSansMono}
-  \reglyphfont{fixgreek-DroidSansMono-Slanted}{raw-fixgreek-DroidSansMono-Slanted}
-\endreglyphfonts
diff --git a/Master/texmf-dist/source/droid/droid.pdf b/Master/texmf-dist/source/droid/droid.pdf
deleted file mode 100644
index f56e4f18bff..00000000000
--- a/Master/texmf-dist/source/droid/droid.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/source/droid/droid.tex b/Master/texmf-dist/source/droid/droid.tex
deleted file mode 100644
index 6bdfe019021..00000000000
--- a/Master/texmf-dist/source/droid/droid.tex
+++ /dev/null
@@ -1,251 +0,0 @@
-%% droid.tex
-%% Copyright 2010, 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)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-% 
-% This work has the LPPL maintenance status `maintained'.
-% 
-% The Current Maintainer of this work is Mohamed El Morabity
-% 
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[american]{babel}
-\usepackage{booktabs}
-\usepackage{droid}
-\usepackage[utf8x]{inputenc}
-\usepackage{microtype}
-\usepackage{multirow}
-\usepackage{path}
-\usepackage{relsize}
-\usepackage[colorlinks]{hyperref}
-
-\hypersetup{%
-  pdftitle={LaTeX support for Droid},%
-  pdfauthor={Mohamed El Morabity}%
-}%
-
-\newcommand{\acronym}[1]{\textsc{\lowercase{#1}}}
-\newcommand{\code}{\texttt}
-\newcommand{\command}{\texttt}
-\newcommand{\email}[1]{\href{mailto:#1}{\nolinkurl{#1}}}
-\newcommand{\name}{}
-\newcommand{\package}{\texttt}
-\newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
-\newcommand{\program}{}
-
-\title{\LaTeX{} support for Droid\\\relsize{-1}Version~1.3}
-
-\author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
-
-\begin{document}
-
-\maketitle
-
-\tableofcontents
-
-\section{Introduction}
-
-The Droid typeface family was designed in the fall of 2006 by Ascender's Steve
-\name{Matteson}, as a commission from Google to create a set of system fonts for
-its Android platform. The goal was to provide optimal quality and comfort on a
-mobile handset when rendered in application menus, web browsers and for other
-screen text. The Droid family of fonts consists of {\fdrfamily Droid Serif},
-{\fdsfamily Droid Sans} and {\fdmfamily Droid Sans Mono}, licensed under the
-Apache License version~2.0, and available in the Android \program{Git}
-tree~\cite{droid} as TrueType files.
-
-This package provides support for this font family in \LaTeX{}. It includes the
-original TrueType fonts, as well as Type~1 versions, converted for this package
-using \program{FontForge} for full support with \program{Dvips}.
-
-Notice that this package does not support the Droid Pro family sold by
-Ascender~\cite{droidpro}.
-
-\section{Installation}
-
-These directions assume that your \TeX{} distribution is
-\acronym{TDS}-compliant.
-
-Once the \path|droid.zip| archive extracted:
-\begin{enumerate}
-\item Copy \path|doc/|, \path|fonts/|, \path|source/|, and \path|tex/|
-  directories to your \path|texmf/| directory (either your local or global
-  \path|texmf/| directory).
-\item Run \command{mktexlsr} to refresh the file name database and make \TeX{}
-  aware of the new files.
-\item Run \command{updmap --enable Map droid.map} to make \program{Dvips},
-  \program{dvipdf} and \program{pdf\TeX} aware of the new fonts.
-\end{enumerate}
-
-Note that this package requires the \package{keyval}~\cite{keyval} and
-\package{slantsc}~\cite{slantsc} (to handle italic/slanted small caps) ones to
-work.
-
-\section{Usage}
-
-\subsection{Calling Droid}
-
-Several macro packages are provided to use these font
-families with \LaTeX:
-\begin{center}
-  \begin{tabular}{llll}
-    \toprule
-    font name&family&package&switch command\\
-    \midrule
-    Droid Serif&fdr&\package{droidserif}&\code{\char`\\fdrfamily}\\
-    Droid Sans&fds&\package{droidsans}&\code{\char`\\fdsfamily}\\
-    Droid Sans Mono&fdm&\package{droidmono}&\code{\char`\\fdmfamily}\\
-    \bottomrule
-  \end{tabular}
-\end{center}
-For each family package, the provided commands \code{\char`\\fdrfamily},
-\code{\char`\\fdsfamily} and \code{\char`\\fdmfamily} will switch the current
-font to Droid Serif, Droid Sans and Droid Sans Mono respectively. You need not
-necessarily use all three font families together (even though this is supported,
-see below).
-
-\subsubsection{Using the Droid font families together}
-
-To make the use of the three Droid fonts families together most easy, a further
-macro package \package{droid} is provided:
-\begin{verbatim}
-\usepackage{droid}
-\end{verbatim}
-This will set Droid Serif, Droid Sans and Droid Sans Mono as the three main text
-font families.
-
-\subsubsection{Using each font family separately}
-
-You can set \LaTeX{} to use Droid Serif only as standard font throughout the
-whole document by passing the \code{default} option to the \package{droidserif}
-package:
-\begin{verbatim}
-\usepackage[default]{droidserif}
-\end{verbatim}
-
-As well, you can set \LaTeX{} to use Droid Sans as standard font with the
-\code{default} option to the \package{droidsans} package:
-\begin{verbatim}
-\usepackage[default]{droidsans}
-\end{verbatim}
-To set Droid Sans as default sans-serif only:
-\begin{verbatim}
-\usepackage[defaultsans]{droidsans}
-\end{verbatim}
-
-Finally, to set Droid Sans Mono as the default typewriter font:
-\begin{verbatim}
-\usepackage[defaultmono]{droidmono}
-\end{verbatim}
-
-\paragraph{Font scaling}
-
-The font can be up- and downscaled by any factor. This can be used to make the
-Droid fonts more friendly when used in company with other type faces, e.g., to
-adapt the x-height. The package option \code{scale=\parameter{ratio}} will scale
-the font according to \parameter{ratio} (1.0 by default), for example:
-\begin{verbatim}
-\usepackage[scale=0.95]{droidserif}
-\usepackage[scale=0.95]{droidsans}
-\usepackage[scale=0.95]{droidmono}
-\end{verbatim}
-
-\subsection{Encodings}
-
-The following encodings are supported:
-\begin{center}
-  \begin{tabular}{ll}
-    \toprule
-    Latin&OT1, T1, TS1 (partial)\\
-    \midrule
-    Cyrillic&T2A, T2B, T2C, X2\\
-    \midrule
-    Greek&LGR\\
-    \bottomrule
-  \end{tabular}
-\end{center}
-To use one or another encoding, give the \LaTeX{} name to the \package{fontenc}
-package as usual, as in
-\begin{verbatim}
-\usepackage[T1]{fontenc}
-\usepackage{droid}
-\end{verbatim}
-
-Note that, as usual with OT1 encoded fonts, kerning with accented characters is
-treated poorly, if at all. Note difference in kerning between e.g.
-\begin{center}
-  \begin{tabular}{ll}
-    \toprule
-    OT1-encoded&{\fdsfamily To Ta Té}\\
-    \midrule
-    T1-encoded&{\fdsfamily\fontencoding{T1}\selectfont To Ta Té}\\
-    \bottomrule
-  \end{tabular}
-\end{center}
-It is therefore advised to always use the Droid fonts in any encoding than OT1
-when typing diacritics.
-
-\subsection{Available weights and variants}
-
-The following table lists the available font series and shapes with their
-\acronym{NFSS} classification. Parenthesized combinations are provided via
-substitutions.
-\begin{center}
-  \begin{tabular}{llll}
-    \toprule
-    family&encoding&series&shape\\
-    \midrule
-    \multirow{4}{*}{fdr}&OT1, T1,&\multirow{3}{*}{m, b (bx)}&\multirow{2}{*}{n, it, sl, up}\\
-    &T2A, T2B, T2C, X2,&&\multirow{2}{*}{sc, scit, scsl, scup}\\
-    &LGR&&\\
-    \cmidrule{2-4}
-    &TS1&m, b (bx)&n, it, sl, up\\
-    \midrule
-    \multirow{4}{*}{fds}&OT1, T1,&\multirow{3}{*}{m, b (bx)}&\multirow{2}{*}{n, sl (it)}\\
-    &T2A, T2B, T2C, X2,&&\multirow{2}{*}{sc, scsl (scit)}\\
-    &LGR&&\\
-    \cmidrule{2-4}
-    &TS1&m, b (bx)&n, sl (it)\\
-    \midrule
-    \multirow{4}{*}{fdm}&OT1, T1,&\multirow{3}{*}{m}&\multirow{2}{*}{n, sl (it)}\\
-    &T2A, T2B, T2C, X2,&&\multirow{2}{*}{sc, scsl (scit)}\\
-    &LGR&&\\
-    \cmidrule{2-4}
-    &TS1&m&n, sl (it)\\
-    \bottomrule
-  \end{tabular}
-\end{center}
-Notice that the slanted shapes are faked ones for Droid Sans and Droid Sans
-Mono, as well as the upright shape for Droid Serif and the small capitals for
-all the families (reduced to 80\%).
-
-\section{Known bugs and improvements}
-
-Please send bug reports and suggestions about the Droid \LaTeX{} support to
-\href{mailto:melmorabity@fedoraproject.org}{Mohamed \name{El~Morabity}}.
-
-\section{License}
-
-This package is released under the \LaTeX{} project public license, either
-version~1.3c or above~\cite{lppl}. Anyway both the TrueType and Type~1 files are
-delivered under the Apache License Version~2.0~\cite{asl}.
-
-\begin{thebibliography}{9}
-\bibitem{droid}
-  \url{http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts}
-\bibitem{droidpro} \url{http://www.DroidFonts.com/}
-\bibitem{keyval}
-  \url{http://www.ctan.org/tex-archive/macros/latex/required/graphics/}
-\bibitem{slantsc}
-  \url{http://www.ctan.org/tex-archive/macros/latex/contrib/slantsc/}
-\bibitem{lppl} \url{http://www.latex-project.org/lppl/lppl-1-3c.html}
-\bibitem{asl} \url{http://www.apache.org/licenses/LICENSE-2.0.html}
-\end{thebibliography}
-
-\end{document}
diff --git a/Master/texmf-dist/source/droid/droidsans-samples.pdf b/Master/texmf-dist/source/droid/droidsans-samples.pdf
deleted file mode 100644
index c72b1ab6702..00000000000
--- a/Master/texmf-dist/source/droid/droidsans-samples.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/source/droid/droidsans-samples.tex b/Master/texmf-dist/source/droid/droidsans-samples.tex
deleted file mode 100644
index 7e71f890ea0..00000000000
--- a/Master/texmf-dist/source/droid/droidsans-samples.tex
+++ /dev/null
@@ -1,79 +0,0 @@
-%% droidsans-samples.tex
-%% 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)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[greek,russian,francais,american]{babel}
-\usepackage{droidsans}
-\usepackage[LGR,T2A,T1,OT1]{fontenc}
-\usepackage[utf8x]{inputenc}
-\usepackage{microtype}
-\usepackage{textcomp}
-
-\newcommand{\latinSample}{%
-  \foreignlanguage{francais}{%
-    Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils sont doués de raison et de conscience et doivent agir les uns envers les autres dans un esprit de fraternité.%
-  }%
-}
-
-\newcommand{\cyrillicSample}{%
-  \foreignlanguage{russian}{%
-    Все люди рождаются свободными и равными в своем достоинстве и правах. Они наделены разумом и совестью и должны поступать в отношении друг друга в духе братства.%
-  }%
-}
-
-\newcommand{\greekSample}{%
-  \foreignlanguage{greek}{%
-    'Ολοι οι άνθρωποι γεννιούνται ελεύθεροι και ίσοι στην αξιοπρέπεια και τα δικαιώματα. Είναι προικισμένοι με λογική και συνείδηση, και οφείλουν να συμπεριφέρονται μεταξύ τους με πνεύμα αδελφοσύνης.%
-  }%
-}
-
-\newcommand{\miscSample}{%
-  0123456789 fi fl ffi ffl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
-}
-
-\newcommand{\fontSample}[2]{%
-  {\usefont{T1}{fds}{#1}{#2} \latinSample}
-
-  {\usefont{T2A}{fds}{#1}{#2} \cyrillicSample}
-
-  {\usefont{LGR}{fds}{#1}{#2} \greekSample}%
-
-  {\fontfamily{fds}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
-}
-
-\begin{document}
-
-\section*{Droid Sans Regular}
-
-\fontSample{m}{n}
-
-\fontSample{m}{sl}
-
-\fontSample{m}{sc}
-
-\fontSample{m}{scsl}
-
-\section*{Droid Sans Bold}
-
-\fontSample{b}{n}
-
-\fontSample{b}{sl}
-
-\fontSample{b}{sc}
-
-\fontSample{b}{scsl}
-
-\end{document}
diff --git a/Master/texmf-dist/source/droid/droidsansmono-samples.pdf b/Master/texmf-dist/source/droid/droidsansmono-samples.pdf
deleted file mode 100644
index 7378988fb26..00000000000
--- a/Master/texmf-dist/source/droid/droidsansmono-samples.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/source/droid/droidsansmono-samples.tex b/Master/texmf-dist/source/droid/droidsansmono-samples.tex
deleted file mode 100644
index 4818bc283a3..00000000000
--- a/Master/texmf-dist/source/droid/droidsansmono-samples.tex
+++ /dev/null
@@ -1,69 +0,0 @@
-%% droidsansmono-samples.tex
-%% 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)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[greek,russian,francais,american]{babel}
-\usepackage{droidmono}
-\usepackage[LGR,T2A,T1,OT1]{fontenc}
-\usepackage[utf8x]{inputenc}
-\usepackage{microtype}
-\usepackage{textcomp}
-
-\newcommand{\latinSample}{%
-  \foreignlanguage{francais}{%
-    Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils sont doués de raison et de conscience et doivent agir les uns envers les autres dans un esprit de fraternité.%
-  }%
-}
-
-\newcommand{\cyrillicSample}{%
-  \foreignlanguage{russian}{%
-    Все люди рождаются свободными и равными в своем достоинстве и правах. Они наделены разумом и совестью и должны поступать в отношении друг друга в духе братства.%
-  }%
-}
-
-\newcommand{\greekSample}{%
-  \foreignlanguage{greek}{%
-    'Ολοι οι άνθρωποι γεννιούνται ελεύθεροι και ίσοι στην αξιοπρέπεια και τα δικαιώματα. Είναι προικισμένοι με λογική και συνείδηση, και οφείλουν να συμπεριφέρονται μεταξύ τους με πνεύμα αδελφοσύνης.%
-  }%
-}
-
-\newcommand{\miscSample}{%
-  0123456789 fi fl ffi ffl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
-}
-
-\newcommand{\fontSample}[2]{%
-  {\usefont{T1}{fdm}{#1}{#2} \latinSample}
-
-  {\usefont{T2A}{fdm}{#1}{#2} \cyrillicSample}
-
-  {\usefont{LGR}{fdm}{#1}{#2} \greekSample}%
-
-  {\fontfamily{fdm}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
-}
-
-\begin{document}
-
-\section*{Droid Sans Mono}
-
-\fontSample{m}{n}
-
-\fontSample{m}{sl}
-
-\fontSample{m}{sc}
-
-\fontSample{m}{scsl}
-
-\end{document}
diff --git a/Master/texmf-dist/source/droid/droidserif-samples.pdf b/Master/texmf-dist/source/droid/droidserif-samples.pdf
deleted file mode 100644
index cef74da4b9d..00000000000
--- a/Master/texmf-dist/source/droid/droidserif-samples.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/source/droid/droidserif-samples.tex b/Master/texmf-dist/source/droid/droidserif-samples.tex
deleted file mode 100644
index 9de7b897972..00000000000
--- a/Master/texmf-dist/source/droid/droidserif-samples.tex
+++ /dev/null
@@ -1,91 +0,0 @@
-%% droidserif-samples.tex
-%% 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)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[greek,russian,francais,american]{babel}
-\usepackage{droidserif}
-\usepackage[LGR,T2A,T1,OT1]{fontenc}
-\usepackage[utf8x]{inputenc}
-\usepackage{microtype}
-\usepackage{textcomp}
-
-\newcommand{\latinSample}{%
-  \foreignlanguage{francais}{%
-    Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils sont doués de raison et de conscience et doivent agir les uns envers les autres dans un esprit de fraternité.%
-  }%
-}
-
-\newcommand{\cyrillicSample}{%
-  \foreignlanguage{russian}{%
-    Все люди рождаются свободными и равными в своем достоинстве и правах. Они наделены разумом и совестью и должны поступать в отношении друг друга в духе братства.%
-  }%
-}
-
-\newcommand{\greekSample}{%
-  \foreignlanguage{greek}{%
-    'Ολοι οι άνθρωποι γεννιούνται ελεύθεροι και ίσοι στην αξιοπρέπεια και τα δικαιώματα. Είναι προικισμένοι με λογική και συνείδηση, και οφείλουν να συμπεριφέρονται μεταξύ τους με πνεύμα αδελφοσύνης.%
-  }%
-}
-
-\newcommand{\miscSample}{%
-  0123456789 fi fl ffi ffl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
-}
-
-\newcommand{\fontSample}[2]{%
-  {\usefont{T1}{fdr}{#1}{#2} \latinSample}
-
-  {\usefont{T2A}{fdr}{#1}{#2} \cyrillicSample}
-
-  {\usefont{LGR}{fdr}{#1}{#2} \greekSample}%
-
-  {\fontfamily{fdr}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
-}
-
-\begin{document}
-
-\section*{Droid Serif Regular}
-
-\fontSample{m}{n}
-
-\fontSample{m}{it}
-
-\fontSample{m}{sl}
-
-\fontSample{m}{up}
-
-\fontSample{m}{sc}
-
-\fontSample{m}{scit}
-
-\fontSample{m}{scsl}
-
-\section*{Droid Serif Bold}
-
-\fontSample{b}{n}
-
-\fontSample{b}{it}
-
-\fontSample{b}{sl}
-
-\fontSample{b}{up}
-
-\fontSample{b}{sc}
-
-\fontSample{b}{scit}
-
-\fontSample{b}{scsl}
-
-\end{document}
diff --git a/Master/texmf-dist/source/droid/Makefile b/Master/texmf-dist/source/fonts/droid/Makefile
index a7128c2dedc..7924e85f3b1 100644
--- a/Master/texmf-dist/source/droid/Makefile
+++ b/Master/texmf-dist/source/fonts/droid/Makefile
@@ -1,5 +1,5 @@
 ## Makefile
-## 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)
@@ -26,7 +26,7 @@ SUPPORTED_ENCODINGS = ot1 t1 ts1 t2a t2b t2c x2 lgr
 # Supported LaTeX encodings containing small caps
 SUPPORTED_SC_ENCODINGS = $(filter-out ts1,$(SUPPORTED_ENCODINGS))
 # Custom encodings provided
-CUSTOM_ENCODINGS = $(FONT_NAME)-fixlatin $(FONT_NAME)-fixtextcomp $(FONT_NAME)-fixcyrillic $(FONT_NAME)-fixgreek
+INPUT_ENCODINGS = $(INPUT_ETX_FILES:$(FONT_NAME)-%.etx=%)
 
 
 #####################
@@ -52,21 +52,19 @@ TRUETYPE_FILES = $(wildcard *.ttf)
 
 # Fontinst files
 FONTINST_FILE = $(FONT_NAME)-drv.tex
-FONTINST_REGLYPH_FILE = $(FONT_NAME)-reglyph.tex
+FONTINST_AUX_FILES = $(FONT_NAME)serif-drv.tex $(FONT_NAME)sans-drv.tex $(FONT_NAME)sansmono-drv.tex 
 FONTINST_MAP_FILE = $(FONT_NAME)-map.tex
 
 # Custom Fontinst encoding files
-ETX_FILES = $(CUSTOM_ENCODINGS:=.etx)
+INPUT_ETX_FILES = $(FONT_NAME)-01.etx $(FONT_NAME)-02.etx $(FONT_NAME)-03.etx $(FONT_NAME)-04.etx
+MTX_FILES = $(FONT_NAME)-fixlatin.mtx $(FONT_NAME)-fixtextcomp.mtx $(FONT_NAME)-fixcyrillic.mtx $(FONT_NAME)-fixgreek.mtx
 
 STYLE_FILES = $(wildcard *.sty)
 
 DOCUMENTATION = $(FONT_NAME).tex $(FONT_NAME).pdf $(FONT_NAME)serif-samples.tex $(FONT_NAME)serif-samples.pdf $(FONT_NAME)sans-samples.tex $(FONT_NAME)sans-samples.pdf $(FONT_NAME)sansmono-samples.tex $(FONT_NAME)sansmono-samples.pdf CHANGES README
 
 # Files to be installed in texmf/source
-BUILD_FILES = $(FONTINST_FILE) $(FONTINST_REGLYPH_FILE) $(FONTINST_MAP_FILE) $(ETX_FILES) Makefile ttf2type1.pe $(DOCUMENTATION)
-
-# Source files to be installed
-SOURCES_FILES = $(TRUETYPE_FILES) $(STYLE_FILES) $(BUILD_FILES) $(DOCUMENTATION)
+SOURCE_FILES = $(FONTINST_FILE) $(FONTINST_AUX_FILES) $(FONTINST_MAP_FILE) $(INPUT_ETX_FILES) $(MTX_FILES) Makefile ttf2type1.pe
 
 
 
@@ -81,41 +79,33 @@ AFM_FILES = $(TYPE1_FILES:.pfb=.afm)
 FONTINST_REC_FILE = $(FONT_NAME)-rec.tex
 
 # Metrics files
-PL_FILES = $(foreach e,$(SUPPORTED_ENCODINGS) $(CUSTOM_ENCODINGS:$(FONT_NAME)-%=%), \
-             $(foreach f,$(TRUETYPE_FILES:.ttf=),                                   \
-               raw-$(e)-$(f).pl                                                     \
-             )                                                                      \
-             $(foreach f,$(filter-out %Italic,$(TRUETYPE_FILES:.ttf=)),             \
-               raw-$(e)-$(f)-Slanted.pl                                             \
-             )                                                                      \
-             $(foreach f,$(filter DroidSerif%Italic,$(TRUETYPE_FILES:.ttf=)),       \
-               raw-$(e)-$(f)-Upright.pl                                             \
-             )                                                                      \
+PL_FILES = $(foreach e,$(INPUT_ENCODINGS),                                     \
+             $(TRUETYPE_FILES:.ttf=-$(e).pl)                                   \
+             $(foreach f,$(filter-out %Italic,$(TRUETYPE_FILES:.ttf=)),        \
+               $(f)-Slanted-$(e).pl                                            \
+             )                                                                 \
+             $(foreach f,$(filter DroidSerif-%Italic,$(TRUETYPE_FILES:.ttf=)), \
+               $(f)-Upright-$(e).pl                                            \
+             )                                                                 \
            )
-TMP_MTX_FILES = $(PL_FILES:%.pl=%.mtx) $(PL_FILES:raw-%.pl=%.mtx)
-VPL_FILES = $(foreach f,$(TRUETYPE_FILES:.ttf=),                             \
-              $(foreach e,$(SUPPORTED_ENCODINGS),                            \
-                $(e)-$(f).vpl                                                \
-              )                                                              \
-              $(foreach e,$(SUPPORTED_SC_ENCODINGS),                         \
-                $(e)-$(f)-SmallCaps.vpl                                      \
-              )                                                              \
-            )                                                                \
-            $(foreach f,$(filter-out %Italic,$(TRUETYPE_FILES:.ttf=)),       \
-              $(foreach e,$(SUPPORTED_ENCODINGS),                            \
-                $(e)-$(f)-Slanted.vpl                                        \
-              )                                                              \
-              $(foreach e,$(SUPPORTED_SC_ENCODINGS),                         \
-                $(e)-$(f)-Slanted-SmallCaps.vpl                              \
-              )                                                              \
-            )                                                                \
-            $(foreach f,$(filter DroidSerif%Italic,$(TRUETYPE_FILES:.ttf=)), \
-              $(foreach e,$(SUPPORTED_ENCODINGS),                            \
-                $(e)-$(f)-Upright.vpl                                        \
-              )                                                              \
-              $(foreach e,$(SUPPORTED_SC_ENCODINGS),                         \
-                $(e)-$(f)-Upright-SmallCaps.vpl                              \
-              )                                                              \
+OUTPUT_MTX_FILES = $(PL_FILES:.pl=.mtx)
+VPL_FILES = $(foreach e,$(SUPPORTED_ENCODINGS),                                 \
+              $(TRUETYPE_FILES:.ttf=-$(e:$(FONT_NAME)-=).vpl)                   \
+              $(foreach f,$(filter-out %Italic,$(TRUETYPE_FILES:.ttf=)),        \
+                $(f)-Slanted-$(e).vpl                                           \
+              )                                                                 \
+              $(foreach f,$(filter DroidSerif-%Italic,$(TRUETYPE_FILES:.ttf=)), \
+                $(f)-Upright-$(e).vpl                                           \
+              )                                                                 \
+            )                                                                   \
+            $(foreach e,$(SUPPORTED_SC_ENCODINGS),                              \
+              $(TRUETYPE_FILES:.ttf=-SmallCaps-$(e).vpl)                        \
+              $(foreach f,$(filter-out %Italic,$(TRUETYPE_FILES:.ttf=)),        \
+                $(f)-Slanted-SmallCaps-$(e).vpl                                 \
+              )                                                                 \
+              $(foreach f,$(filter DroidSerif-%Italic,$(TRUETYPE_FILES:.ttf=)), \
+                $(f)-Upright-SmallCaps-$(e).vpl                                 \
+              )                                                                 \
             )
 TFM_FILES = $(PL_FILES:.pl=.tfm) $(VPL_FILES:.vpl=.tfm)
 VF_FILES = $(VPL_FILES:.vpl=.vf)
@@ -124,13 +114,11 @@ MAP = $(FONT_NAME).map
 
 # Font definition files
 FD_FILES = $(foreach e,$(SUPPORTED_ENCODINGS), \
-             $(foreach f,$(FONT_CODES),        \
-               $(e)$(f).fd                     \
-             )                                 \
+               $(FONT_CODES:%=$(e)%.fd)        \
            )
 
 # Generated encoding files
-ENC_FILES = $(SUPPORTED_ENCODINGS:%=$(FONT_NAME)-%.enc) $(CUSTOM_ENCODINGS:$(FONT_NAME)-%=$(FONT_NAME)-%.enc)
+ENC_FILES = $(INPUT_ETX_FILES:.etx=.enc)
 
 # Generated files to be installed
 GENERATED_FILES = $(TYPE1_FILES) $(AFM_FILES) $(TFM_FILES) $(VF_FILES) $(MAP) $(FD_FILES) $(ENC_FILES)
@@ -163,7 +151,7 @@ dist: $(ARCHIVE)
 	vptovf $^ $@
 
 
-$(FONTINST_REC_FILE): $(TYPE1_FILES) $(AFM_FILES) $(ETX_FILES) $(FONTINST_FILE) $(FONTINST_REGLYPH_FILE)
+$(FONTINST_REC_FILE): $(AFM_FILES) $(MTX_FILES) $(FONTINST_FILE) $(FONTINST_AUX_FILES)
 	latex $(FONTINST_FILE)
 
 
@@ -178,12 +166,12 @@ $(FD_FILES) $(ENC_FILES): $(MAP)
 
 
 texmf-tree: clean-texmf-tree $(GENERATED_FILES) $(SOURCES_FILES)
-	mkdir -p $(ARCHIVE_ROOT)/doc/latex/$(FONT_NAME)/
+	mkdir -p $(ARCHIVE_ROOT)/doc/fonts/$(FONT_NAME)/
 	mkdir -p $(ARCHIVE_ROOT)/tex/latex/$(FONT_NAME)/
 	mkdir -p $(ARCHIVE_ROOT)/fonts/{enc,map}/dvips/$(FONT_NAME)/
 	mkdir -p $(ARCHIVE_ROOT)/fonts/{afm,tfm,truetype,type1,vf}/$(FOUNDRY)/$(FONT_NAME)/
-	mkdir -p $(ARCHIVE_ROOT)/source/$(FONT_NAME)/
-	cp -p $(DOCUMENTATION) $(ARCHIVE_ROOT)/doc/latex/$(FONT_NAME)/
+	mkdir -p $(ARCHIVE_ROOT)/source/fonts/$(FONT_NAME)/
+	cp -p $(DOCUMENTATION) $(ARCHIVE_ROOT)/doc/fonts/$(FONT_NAME)/
 	cp -p $(FD_FILES) $(STYLE_FILES) $(ARCHIVE_ROOT)/tex/latex/$(FONT_NAME)/
 	cp -p $(ENC_FILES) $(ARCHIVE_ROOT)/fonts/enc/dvips/$(FONT_NAME)/
 	cp -p $(MAP) $(ARCHIVE_ROOT)/fonts/map/dvips/$(FONT_NAME)/
@@ -192,7 +180,7 @@ texmf-tree: clean-texmf-tree $(GENERATED_FILES) $(SOURCES_FILES)
 	cp -p $(TRUETYPE_FILES) $(ARCHIVE_ROOT)/fonts/truetype/$(FOUNDRY)/$(FONT_NAME)/
 	cp -p $(TYPE1_FILES) $(ARCHIVE_ROOT)/fonts/type1/$(FOUNDRY)/$(FONT_NAME)/
 	cp -p $(VF_FILES) $(ARCHIVE_ROOT)/fonts/vf/$(FOUNDRY)/$(FONT_NAME)/
-	cp -p $(BUILD_FILES) $(ARCHIVE_ROOT)/source/$(FONT_NAME)/
+	cp -p $(SOURCE_FILES) $(ARCHIVE_ROOT)/source/fonts/$(FONT_NAME)/
 	cp -p README $(ARCHIVE_ROOT)
 	cd $(ARCHIVE_ROOT) && find . -type f > manifest.txt
 
@@ -212,7 +200,7 @@ uninstall:
 	$(RM) -r $(TEXMFHOME)/doc/latex/$(FONT_NAME)/
 	$(RM) -r $(TEXMFHOME)/tex/latex/$(FONT_NAME)/
 	$(RM) -r $(TEXMFHOME)/fonts/{enc,map}/dvips/$(FONT_NAME)/
-	$(RM) -r $(TEXMFHOME)/fonts/{afm,tfm,truetype,type1,vf}/$(FOUNDRY)/$(FONT_NAME)/
+	$(RM) -r $(TEXMFHOME)/fonts/{afm,tfm,type1,vf}/$(FOUNDRY)/$(FONT_NAME)/
 	$(RM) -r $(TEXMFHOME)/source/$(FONT_NAME)/
 	updmap --disable $(MAP)
 	texhash
@@ -222,7 +210,7 @@ clean: clean-texmf-tree
 	$(RM) $(TYPE1_FILES) $(AFM_FILES)
 	$(RM) $(FONTINST_REC_FILE)
 	$(RM) $(PL_FILES) $(TYPE1_FILES:.pfb=.pl)
-	$(RM) $(TMP_MTX_FILES) $(TYPE1_FILES:.pfb=.mtx)
+	$(RM) $(OUTPUT_MTX_FILES) $(TYPE1_FILES:.pfb=.mtx)
 	$(RM) $(VPL_FILES)
 	$(RM) $(TFM_FILES)
 	$(RM) $(VF_FILES)
@@ -237,4 +225,7 @@ clean-texmf-tree:
 	$(RM) -r $(ARCHIVE_ROOT)
 
 
-.PHONY: clean clean-texmf-tree texmf-tree
+test:
+	@echo $(PL_FILES)
+
+.PHONY: clean clean-texmf-tree texmf-tree test
diff --git a/Master/texmf-dist/source/fonts/droid/droid-01.etx b/Master/texmf-dist/source/fonts/droid/droid-01.etx
new file mode 100644
index 00000000000..dac2a0d299c
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/droid/droid-01.etx
@@ -0,0 +1,788 @@
+%% droidserif-01.etx
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+% 
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\relax
+
+\encoding
+
+\setslot{space}
+\endsetslot
+
+\setslot{exclam}
+\endsetslot
+
+\setslot{quotedbl}
+\endsetslot
+
+\setslot{numbersign}
+\endsetslot
+
+\setslot{dollar}
+\endsetslot
+
+\setslot{percent}
+\endsetslot
+
+\setslot{ampersand}
+\endsetslot
+
+\setslot{quotesingle}
+\endsetslot
+
+\setslot{parenleft}
+\endsetslot
+
+\setslot{parenright}
+\endsetslot
+
+\setslot{asterisk}
+\endsetslot
+
+\setslot{plus}
+\endsetslot
+
+\setslot{comma}
+\endsetslot
+
+\setslot{hyphen}
+\endsetslot
+
+\setslot{period}
+\endsetslot
+
+\setslot{slash}
+\endsetslot
+
+\setslot{zero}
+\endsetslot
+
+\setslot{one}
+\endsetslot
+
+\setslot{two}
+\endsetslot
+
+\setslot{three}
+\endsetslot
+
+\setslot{four}
+\endsetslot
+
+\setslot{five}
+\endsetslot
+
+\setslot{six}
+\endsetslot
+
+\setslot{seven}
+\endsetslot
+
+\setslot{eight}
+\endsetslot
+
+\setslot{nine}
+\endsetslot
+
+\setslot{colon}
+\endsetslot
+
+\setslot{semicolon}
+\endsetslot
+
+\setslot{less}
+\endsetslot
+
+\setslot{equal}
+\endsetslot
+
+\setslot{greater}
+\endsetslot
+
+\setslot{question}
+\endsetslot
+
+\setslot{at}
+\endsetslot
+
+\setslot{A}
+\endsetslot
+
+\setslot{B}
+\endsetslot
+
+\setslot{C}
+\endsetslot
+
+\setslot{D}
+\endsetslot
+
+\setslot{E}
+\endsetslot
+
+\setslot{F}
+\endsetslot
+
+\setslot{G}
+\endsetslot
+
+\setslot{H}
+\endsetslot
+
+\setslot{I}
+\endsetslot
+
+\setslot{J}
+\endsetslot
+
+\setslot{K}
+\endsetslot
+
+\setslot{L}
+\endsetslot
+
+\setslot{M}
+\endsetslot
+
+\setslot{N}
+\endsetslot
+
+\setslot{O}
+\endsetslot
+
+\setslot{P}
+\endsetslot
+
+\setslot{Q}
+\endsetslot
+
+\setslot{R}
+\endsetslot
+
+\setslot{S}
+\endsetslot
+
+\setslot{T}
+\endsetslot
+
+\setslot{U}
+\endsetslot
+
+\setslot{V}
+\endsetslot
+
+\setslot{W}
+\endsetslot
+
+\setslot{X}
+\endsetslot
+
+\setslot{Y}
+\endsetslot
+
+\setslot{Z}
+\endsetslot
+
+\setslot{bracketleft}
+\endsetslot
+
+\setslot{backslash}
+\endsetslot
+
+\setslot{bracketright}
+\endsetslot
+
+\setslot{asciicircum}
+\endsetslot
+
+\setslot{underscore}
+\endsetslot
+
+\setslot{grave}
+\endsetslot
+
+\setslot{a}
+\endsetslot
+
+\setslot{b}
+\endsetslot
+
+\setslot{c}
+\endsetslot
+
+\setslot{d}
+\endsetslot
+
+\setslot{e}
+\endsetslot
+
+\setslot{f}
+\endsetslot
+
+\setslot{g}
+\endsetslot
+
+\setslot{h}
+\endsetslot
+
+\setslot{i}
+\endsetslot
+
+\setslot{j}
+\endsetslot
+
+\setslot{k}
+\endsetslot
+
+\setslot{l}
+\endsetslot
+
+\setslot{m}
+\endsetslot
+
+\setslot{n}
+\endsetslot
+
+\setslot{o}
+\endsetslot
+
+\setslot{p}
+\endsetslot
+
+\setslot{q}
+\endsetslot
+
+\setslot{r}
+\endsetslot
+
+\setslot{s}
+\endsetslot
+
+\setslot{t}
+\endsetslot
+
+\setslot{u}
+\endsetslot
+
+\setslot{v}
+\endsetslot
+
+\setslot{w}
+\endsetslot
+
+\setslot{x}
+\endsetslot
+
+\setslot{y}
+\endsetslot
+
+\setslot{z}
+\endsetslot
+
+\setslot{braceleft}
+\endsetslot
+
+\setslot{bar}
+\endsetslot
+
+\setslot{braceright}
+\endsetslot
+
+\setslot{asciitilde}
+\endsetslot
+
+\setslot{nonbreakingspace}
+\endsetslot
+
+\setslot{exclamdown}
+\endsetslot
+
+\setslot{cent}
+\endsetslot
+
+\setslot{sterling}
+\endsetslot
+
+\setslot{currency}
+\endsetslot
+
+\setslot{yen}
+\endsetslot
+
+\setslot{brokenbar}
+\endsetslot
+
+\setslot{section}
+\endsetslot
+
+\setslot{dieresis}
+\endsetslot
+
+\setslot{copyright}
+\endsetslot
+
+\setslot{ordfeminine}
+\endsetslot
+
+\setslot{guillemotleft}
+\endsetslot
+
+\setslot{logicalnot}
+\endsetslot
+
+\setslot{uni00AD}
+\endsetslot
+
+\setslot{registered}
+\endsetslot
+
+\setslot{overscore}
+\endsetslot
+
+\setslot{degree}
+\endsetslot
+
+\setslot{plusminus}
+\endsetslot
+
+\setslot{twosuperior}
+\endsetslot
+
+\setslot{threesuperior}
+\endsetslot
+
+\setslot{acute}
+\endsetslot
+
+\setslot{mu}
+\endsetslot
+
+\setslot{paragraph}
+\endsetslot
+
+\setslot{periodcentered}
+\endsetslot
+
+\setslot{cedilla}
+\endsetslot
+
+\setslot{onesuperior}
+\endsetslot
+
+\setslot{ordmasculine}
+\endsetslot
+
+\setslot{guillemotright}
+\endsetslot
+
+\setslot{onequarter}
+\endsetslot
+
+\setslot{onehalf}
+\endsetslot
+
+\setslot{threequarters}
+\endsetslot
+
+\setslot{questiondown}
+\endsetslot
+
+\setslot{Agrave}
+\endsetslot
+
+\setslot{Aacute}
+\endsetslot
+
+\setslot{Acircumflex}
+\endsetslot
+
+\setslot{Atilde}
+\endsetslot
+
+\setslot{Adieresis}
+\endsetslot
+
+\setslot{Aring}
+\endsetslot
+
+\setslot{AE}
+\endsetslot
+
+\setslot{Ccedilla}
+\endsetslot
+
+\setslot{Egrave}
+\endsetslot
+
+\setslot{Eacute}
+\endsetslot
+
+\setslot{Ecircumflex}
+\endsetslot
+
+\setslot{Edieresis}
+\endsetslot
+
+\setslot{Igrave}
+\endsetslot
+
+\setslot{Iacute}
+\endsetslot
+
+\setslot{Icircumflex}
+\endsetslot
+
+\setslot{Idieresis}
+\endsetslot
+
+\setslot{Eth}
+\endsetslot
+
+\setslot{Ntilde}
+\endsetslot
+
+\setslot{Ograve}
+\endsetslot
+
+\setslot{Oacute}
+\endsetslot
+
+\setslot{Ocircumflex}
+\endsetslot
+
+\setslot{Otilde}
+\endsetslot
+
+\setslot{Odieresis}
+\endsetslot
+
+\setslot{multiply}
+\endsetslot
+
+\setslot{Oslash}
+\endsetslot
+
+\setslot{Ugrave}
+\endsetslot
+
+\setslot{Uacute}
+\endsetslot
+
+\setslot{Ucircumflex}
+\endsetslot
+
+\setslot{Udieresis}
+\endsetslot
+
+\setslot{Yacute}
+\endsetslot
+
+\setslot{Thorn}
+\endsetslot
+
+\setslot{germandbls}
+\endsetslot
+
+\setslot{agrave}
+\endsetslot
+
+\setslot{aacute}
+\endsetslot
+
+\setslot{acircumflex}
+\endsetslot
+
+\setslot{atilde}
+\endsetslot
+
+\setslot{adieresis}
+\endsetslot
+
+\setslot{aring}
+\endsetslot
+
+\setslot{ae}
+\endsetslot
+
+\setslot{ccedilla}
+\endsetslot
+
+\setslot{egrave}
+\endsetslot
+
+\setslot{eacute}
+\endsetslot
+
+\setslot{ecircumflex}
+\endsetslot
+
+\setslot{edieresis}
+\endsetslot
+
+\setslot{igrave}
+\endsetslot
+
+\setslot{iacute}
+\endsetslot
+
+\setslot{icircumflex}
+\endsetslot
+
+\setslot{idieresis}
+\endsetslot
+
+\setslot{eth}
+\endsetslot
+
+\setslot{ntilde}
+\endsetslot
+
+\setslot{ograve}
+\endsetslot
+
+\setslot{oacute}
+\endsetslot
+
+\setslot{ocircumflex}
+\endsetslot
+
+\setslot{otilde}
+\endsetslot
+
+\setslot{odieresis}
+\endsetslot
+
+\setslot{divide}
+\endsetslot
+
+\setslot{oslash}
+\endsetslot
+
+\setslot{ugrave}
+\endsetslot
+
+\setslot{uacute}
+\endsetslot
+
+\setslot{ucircumflex}
+\endsetslot
+
+\setslot{udieresis}
+\endsetslot
+
+\setslot{yacute}
+\endsetslot
+
+\setslot{thorn}
+\endsetslot
+
+\setslot{ydieresis}
+\endsetslot
+
+\setslot{Amacron}
+\endsetslot
+
+\setslot{amacron}
+\endsetslot
+
+\setslot{Abreve}
+\endsetslot
+
+\setslot{abreve}
+\endsetslot
+
+\setslot{Aogonek}
+\endsetslot
+
+\setslot{aogonek}
+\endsetslot
+
+\setslot{Cacute}
+\endsetslot
+
+\setslot{cacute}
+\endsetslot
+
+\setslot{Ccircumflex}
+\endsetslot
+
+\setslot{ccircumflex}
+\endsetslot
+
+\setslot{Cdot}
+\endsetslot
+
+\setslot{cdot}
+\endsetslot
+
+\setslot{Ccaron}
+\endsetslot
+
+\setslot{ccaron}
+\endsetslot
+
+\setslot{Dcaron}
+\endsetslot
+
+\setslot{dcaron}
+\endsetslot
+
+\setslot{Dcroat}
+\endsetslot
+
+\setslot{dcroat}
+\endsetslot
+
+\setslot{Emacron}
+\endsetslot
+
+\setslot{emacron}
+\endsetslot
+
+\setslot{Ebreve}
+\endsetslot
+
+\setslot{ebreve}
+\endsetslot
+
+\setslot{Edotaccent}
+\endsetslot
+
+\setslot{edotaccent}
+\endsetslot
+
+\setslot{Eogonek}
+\endsetslot
+
+\setslot{eogonek}
+\endsetslot
+
+\setslot{Ecaron}
+\endsetslot
+
+\setslot{ecaron}
+\endsetslot
+
+\setslot{Gcircumflex}
+\endsetslot
+
+\setslot{gcircumflex}
+\endsetslot
+
+\setslot{Gbreve}
+\endsetslot
+
+\setslot{gbreve}
+\endsetslot
+
+\setslot{Gdot}
+\endsetslot
+
+\setslot{gdot}
+\endsetslot
+
+\setslot{Gcommaaccent}
+\endsetslot
+
+\setslot{gcommaaccent}
+\endsetslot
+
+\setslot{Hcircumflex}
+\endsetslot
+
+\setslot{hcircumflex}
+\endsetslot
+
+\setslot{Hbar}
+\endsetslot
+
+\setslot{hbar}
+\endsetslot
+
+\setslot{Itilde}
+\endsetslot
+
+\setslot{itilde}
+\endsetslot
+
+\setslot{Imacron}
+\endsetslot
+
+\setslot{imacron}
+\endsetslot
+
+\setslot{Ibreve}
+\endsetslot
+
+\setslot{ibreve}
+\endsetslot
+
+\setslot{Iogonek}
+\endsetslot
+
+\setslot{iogonek}
+\endsetslot
+
+\setslot{Idotaccent}
+\endsetslot
+
+\setslot{dotlessi}
+\endsetslot
+
+\setslot{IJ}
+\endsetslot
+
+\setslot{ij}
+\endsetslot
+
+\setslot{Jcircumflex}
+\endsetslot
+
+\setslot{jcircumflex}
+\endsetslot
+
+\setslot{Kcommaaccent}
+\endsetslot
+
+\setslot{kcommaaccent}
+\endsetslot
+
+\setslot{kgreenlandic}
+\endsetslot
+
+\setslot{Lacute}
+\endsetslot
+
+\setslot{lacute}
+\endsetslot
+
+\setslot{Lcommaaccent}
+\endsetslot
+
+\setslot{lcommaaccent}
+\endsetslot
+
+\setslot{Lcaron}
+\endsetslot
+
+\setslot{lcaron}
+\endsetslot
+
+\setslot{Ldot}
+\endsetslot
+
+\setslot{ldot}
+\endsetslot
+
+\endencoding
diff --git a/Master/texmf-dist/source/droid/droid-fixcyrillic.etx b/Master/texmf-dist/source/fonts/droid/droid-02.etx
index ff6e998c79e..fc41111939b 100644
--- a/Master/texmf-dist/source/droid/droid-fixcyrillic.etx
+++ b/Master/texmf-dist/source/fonts/droid/droid-02.etx
@@ -1,5 +1,5 @@
-%% droid-fixcyrillic.etx
-%% Copyright 2010, 2011 Mohamed El Morabity
+%% droidserif-02.etx
+%% 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)
@@ -8,740 +8,781 @@
 % distributions of LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status `maintained'.
-%
+% 
 % The Current Maintainer of this work is Mohamed El Morabity
 %
 % This work consists of all files listed in manifest.txt.
 
 \relax
+
 \encoding
 
-% CYRQ
-\setslot{Q}
+\setslot{Lslash}
 \endsetslot
 
-% CYRW
-\setslot{W}
+\setslot{lslash}
 \endsetslot
 
-% cyrw
-\setslot{w}
+\setslot{Nacute}
 \endsetslot
 
-% cyrq
-\setslot{q}
+\setslot{nacute}
 \endsetslot
 
-% dblgrave
-\setslot{uni030F}
+\setslot{Ncommaaccent}
 \endsetslot
 
-% CYRYO
-\setslot{afii10023}
+\setslot{ncommaaccent}
 \endsetslot
 
-% CYRDJE
-\setslot{afii10051}
+\setslot{Ncaron}
 \endsetslot
 
-% CYRIE
-\setslot{afii10053}
+\setslot{ncaron}
 \endsetslot
 
-% CYRDZE
-\setslot{afii10054}
+\setslot{napostrophe}
 \endsetslot
 
-% CYRII
-\setslot{afii10055}
+\setslot{Eng}
 \endsetslot
 
-% CYRYI
-\setslot{afii10056}
+\setslot{eng}
 \endsetslot
 
-% CYRJE
-\setslot{afii10057}
+\setslot{Omacron}
 \endsetslot
 
-% CYRLJE
-\setslot{afii10058}
+\setslot{omacron}
 \endsetslot
 
-% CYRNJE
-\setslot{afii10059}
+\setslot{Obreve}
 \endsetslot
 
-% CYRTSHE
-\setslot{afii10060}
+\setslot{obreve}
 \endsetslot
 
-% CYRUSHRT
-\setslot{afii10062}
+\setslot{Ohungarumlaut}
 \endsetslot
 
-% CYRDZHE
-\setslot{afii10145}
+\setslot{ohungarumlaut}
 \endsetslot
 
-% CYRA
-\setslot{afii10017}
+\setslot{OE}
 \endsetslot
 
-% CYRB
-\setslot{afii10018}
+\setslot{oe}
 \endsetslot
 
-% CYRV
-\setslot{afii10019}
+\setslot{Racute}
 \endsetslot
 
-% CYRG
-\setslot{afii10020}
+\setslot{racute}
 \endsetslot
 
-% CYRD
-\setslot{afii10021}
+\setslot{Rcommaaccent}
 \endsetslot
 
-% CYRE
-\setslot{afii10022}
+\setslot{rcommaaccent}
 \endsetslot
 
-% CYRZH
-\setslot{afii10024}
+\setslot{Rcaron}
 \endsetslot
 
-% CYRZ
-\setslot{afii10025}
+\setslot{rcaron}
 \endsetslot
 
-% CYRI
-\setslot{afii10026}
+\setslot{Sacute}
 \endsetslot
 
-% CYRISHRT
-\setslot{afii10027}
+\setslot{sacute}
 \endsetslot
 
-% CYRK
-\setslot{afii10028}
+\setslot{Scircumflex}
 \endsetslot
 
-% CYRL
-\setslot{afii10029}
+\setslot{scircumflex}
 \endsetslot
 
-% CYRM
-\setslot{afii10030}
+\setslot{Scedilla}
 \endsetslot
 
-% CYRN
-\setslot{afii10031}
+\setslot{scedilla}
 \endsetslot
 
-% CYRO
-\setslot{afii10032}
+\setslot{Scaron}
 \endsetslot
 
-% CYRP
-\setslot{afii10033}
+\setslot{scaron}
 \endsetslot
 
-% CYRR
-\setslot{afii10034}
+\setslot{Tcommaaccent}
 \endsetslot
 
-% CYRS
-\setslot{afii10035}
+\setslot{tcommaaccent}
 \endsetslot
 
-% CYRT
-\setslot{afii10036}
+\setslot{Tcaron}
 \endsetslot
 
-% CYRU
-\setslot{afii10037}
+\setslot{tcaron}
 \endsetslot
 
-% CYRF
-\setslot{afii10038}
+\setslot{Tbar}
 \endsetslot
 
-% CYRH
-\setslot{afii10039}
+\setslot{tbar}
 \endsetslot
 
-% CYRC
-\setslot{afii10040}
+\setslot{Utilde}
 \endsetslot
 
-% CYRCH
-\setslot{afii10041}
+\setslot{utilde}
 \endsetslot
 
-% CYRSH
-\setslot{afii10042}
+\setslot{Umacron}
 \endsetslot
 
-% CYRSHCH
-\setslot{afii10043}
+\setslot{umacron}
 \endsetslot
 
-% CYRHRDSN
-\setslot{afii10044}
+\setslot{Ubreve}
 \endsetslot
 
-% CYRERY
-\setslot{afii10045}
+\setslot{ubreve}
 \endsetslot
 
-% CYRSFTSN
-\setslot{afii10046}
+\setslot{Uring}
 \endsetslot
 
-% CYREREV
-\setslot{afii10047}
+\setslot{uring}
 \endsetslot
 
-% CYRYU
-\setslot{afii10048}
+\setslot{Uhungarumlaut}
 \endsetslot
 
-% CYRYA
-\setslot{afii10049}
+\setslot{uhungarumlaut}
 \endsetslot
 
-% cyra
-\setslot{afii10065}
+\setslot{Uogonek}
 \endsetslot
 
-% cyrb
-\setslot{afii10066}
+\setslot{uogonek}
 \endsetslot
 
-% cyrv
-\setslot{afii10067}
+\setslot{Wcircumflex}
 \endsetslot
 
-% cyrg
-\setslot{afii10068}
+\setslot{wcircumflex}
 \endsetslot
 
-% cyrd
-\setslot{afii10069}
+\setslot{Ycircumflex}
 \endsetslot
 
-% cyre
-\setslot{afii10070}
+\setslot{ycircumflex}
 \endsetslot
 
-% cyrzh
-\setslot{afii10072}
+\setslot{Ydieresis}
 \endsetslot
 
-% cyrz
-\setslot{afii10073}
+\setslot{Zacute}
 \endsetslot
 
-% cyri
-\setslot{afii10074}
+\setslot{zacute}
 \endsetslot
 
-% cyrishrt
-\setslot{afii10075}
+\setslot{Zdotaccent}
 \endsetslot
 
-% cyrk
-\setslot{afii10076}
+\setslot{zdotaccent}
 \endsetslot
 
-% cyrl
-\setslot{afii10077}
+\setslot{Zcaron}
 \endsetslot
 
-% cyrm
-\setslot{afii10078}
+\setslot{zcaron}
 \endsetslot
 
-% cyrn
-\setslot{afii10079}
+\setslot{longs}
 \endsetslot
 
-% cyro
-\setslot{afii10080}
+\setslot{florin}
 \endsetslot
 
-% cyrp
-\setslot{afii10081}
+\setslot{Aringacute}
 \endsetslot
 
-% cyrr
-\setslot{afii10082}
+\setslot{aringacute}
 \endsetslot
 
-% cyrs
-\setslot{afii10083}
+\setslot{AEacute}
 \endsetslot
 
-% cyrt
-\setslot{afii10084}
+\setslot{aeacute}
 \endsetslot
 
-% cyru
-\setslot{afii10085}
+\setslot{Oslashacute}
 \endsetslot
 
-% cyrf
-\setslot{afii10086}
+\setslot{oslashacute}
 \endsetslot
 
-% cyrh
-\setslot{afii10087}
+\setslot{Scommaaccent}
 \endsetslot
 
-% cyrc
-\setslot{afii10088}
+\setslot{scommaaccent}
 \endsetslot
 
-% cyrch
-\setslot{afii10089}
+\setslot{circumflex}
 \endsetslot
 
-% cyrsh
-\setslot{afii10090}
+\setslot{caron}
 \endsetslot
 
-% cyrshch
-\setslot{afii10091}
+\setslot{macron}
 \endsetslot
 
-% cyrhrdsn
-\setslot{afii10092}
+\setslot{breve}
 \endsetslot
 
-% cyrery
-\setslot{afii10093}
+\setslot{dotaccent}
 \endsetslot
 
-% cyrsftsn
-\setslot{afii10094}
+\setslot{ring}
 \endsetslot
 
-% cyrerev
-\setslot{afii10095}
+\setslot{ogonek}
 \endsetslot
 
-% cyryu
-\setslot{afii10096}
+\setslot{tilde}
 \endsetslot
 
-% cyrya
-\setslot{afii10097}
+\setslot{hungarumlaut}
 \endsetslot
 
-% cyryo
-\setslot{afii10071}
+\setslot{tonos}
 \endsetslot
 
-% cyrdje
-\setslot{afii10099}
+\setslot{dieresistonos}
 \endsetslot
 
-% cyrie
-\setslot{afii10101}
+\setslot{Alphatonos}
 \endsetslot
 
-% cyrdze
-\setslot{afii10102}
+\setslot{anoteleia}
 \endsetslot
 
-% cyrii
-\setslot{afii10103}
+\setslot{Epsilontonos}
 \endsetslot
 
-% cyryi
-\setslot{afii10104}
+\setslot{Etatonos}
 \endsetslot
 
-% cyrje
-\setslot{afii10105}
+\setslot{Iotatonos}
 \endsetslot
 
-% cyrlje
-\setslot{afii10106}
+\setslot{Omicrontonos}
 \endsetslot
 
-% cyrnje
-\setslot{afii10107}
+\setslot{Upsilontonos}
 \endsetslot
 
-% cyrtshe
-\setslot{afii10108}
+\setslot{Omegatonos}
 \endsetslot
 
-% cyrushrt
-\setslot{afii10110}
+\setslot{iotadieresistonos}
 \endsetslot
 
-% cyrdzhe
-\setslot{afii10193}
+\setslot{Alpha}
 \endsetslot
 
-% CYRYAT
-\setslot{uni0462}
+\setslot{Beta}
 \endsetslot
 
-% cyryat
-\setslot{uni0463}
+\setslot{Gamma}
 \endsetslot
 
-% CYRBYUS
-\setslot{uni046A}
+\setslot{uni0394}
 \endsetslot
 
-% cyrbyus
-\setslot{uni046B}
+\setslot{Epsilon}
 \endsetslot
 
-% CYRIZH
-\setslot{uni0474}
+\setslot{Zeta}
 \endsetslot
 
-% cyrizh
-\setslot{uni0475}
+\setslot{Eta}
 \endsetslot
 
-% CYRSEMISFTSN
-\setslot{uni048C}
+\setslot{Theta}
 \endsetslot
 
-% cyrsemisftsn
-\setslot{uni048D}
+\setslot{Iota}
 \endsetslot
 
-% CYRRTICK
-\setslot{uni048E}
+\setslot{Kappa}
 \endsetslot
 
-% cyrrtick
-\setslot{uni048F}
+\setslot{Lambda}
 \endsetslot
 
-% CYRGUP
-\setslot{afii10050}
+\setslot{Mu}
 \endsetslot
 
-% cyrgup
-\setslot{afii10098}
+\setslot{Nu}
 \endsetslot
 
-% CYRGHCRS
-\setslot{uni0492}
+\setslot{Xi}
 \endsetslot
 
-% cyrghcrs
-\setslot{uni0493}
+\setslot{Omicron}
 \endsetslot
 
-% CYRGHK
-\setslot{uni0494}
+\setslot{Pi}
 \endsetslot
 
-% cyrghk
-\setslot{uni0495}
+\setslot{Rho}
 \endsetslot
 
-% CYRZHDSC
-\setslot{uni0496}
+\setslot{Sigma}
 \endsetslot
 
-% cyrzhdsc
-\setslot{uni0497}
+\setslot{Tau}
 \endsetslot
 
-% CYRZDSC
-\setslot{uni0498}
+\setslot{Upsilon}
 \endsetslot
 
-% cyrzdsc
-\setslot{uni0499}
+\setslot{Phi}
 \endsetslot
 
-% CYRKDSC
-\setslot{uni049A}
+\setslot{Chi}
 \endsetslot
 
-% cyrkdsc
-\setslot{uni049B}
+\setslot{Psi}
 \endsetslot
 
-% CYRKVCRS
-\setslot{uni049C}
+\setslot{uni03A9}
 \endsetslot
 
-% cyrkvcrs
-\setslot{uni049D}
+\setslot{Iotadieresis}
 \endsetslot
 
-% CYRKHCRS
-\setslot{uni049E}
+\setslot{Upsilondieresis}
 \endsetslot
 
-% cyrkhcrs
-\setslot{uni049F}
+\setslot{alphatonos}
 \endsetslot
 
-% CYRKBEAK
-\setslot{uni04A0}
+\setslot{epsilontonos}
 \endsetslot
 
-% cyrkbeak
-\setslot{uni04A1}
+\setslot{etatonos}
 \endsetslot
 
-% CYRNDSC
-\setslot{uni04A2}
+\setslot{iotatonos}
 \endsetslot
 
-% cyrndsc
-\setslot{uni04A3}
+\setslot{upsilondieresistonos}
 \endsetslot
 
-% CYRNG
-\setslot{uni04A4}
+\setslot{alpha}
 \endsetslot
 
-% cyrng
-\setslot{uni04A5}
+\setslot{beta}
 \endsetslot
 
-% CYRPHK
-\setslot{uni04A6}
+\setslot{gamma}
 \endsetslot
 
-% cyrphk
-\setslot{uni04A7}
+\setslot{delta}
 \endsetslot
 
-% CYRABHHA
-\setslot{uni04A8}
+\setslot{epsilon}
 \endsetslot
 
-% cyrabhha
-\setslot{uni04A9}
+\setslot{zeta}
 \endsetslot
 
-% CYRSDSC
-\setslot{uni04AA}
+\setslot{eta}
 \endsetslot
 
-% cyrsdsc
-\setslot{uni04AB}
+\setslot{theta}
 \endsetslot
 
-% CYRTDSC
-\setslot{uni04AC}
+\setslot{iota}
 \endsetslot
 
-% cyrtdsc
-\setslot{uni04AD}
+\setslot{kappa}
 \endsetslot
 
-% CYRY
-\setslot{uni04AE}
+\setslot{lambda}
 \endsetslot
 
-% cyry
-\setslot{uni04AF}
+\setslot{uni03BC}
 \endsetslot
 
-% CYRYHCRS
-\setslot{uni04B0}
+\setslot{nu}
 \endsetslot
 
-% cyryhcrs
-\setslot{uni04B1}
+\setslot{xi}
 \endsetslot
 
-% CYRHDSC
-\setslot{uni04B2}
+\setslot{omicron}
 \endsetslot
 
-% cyrhdsc
-\setslot{uni04B3}
+\setslot{pi}
 \endsetslot
 
-% CYRTETSE
-\setslot{uni04B4}
+\setslot{rho}
 \endsetslot
 
-% cyrtetse
-\setslot{uni04B5}
+\setslot{sigma1}
 \endsetslot
 
-% CYRCHRDSC
-\setslot{uni04B6}
+\setslot{sigma}
 \endsetslot
 
-% cyrchrdsc
-\setslot{uni04B7}
+\setslot{tau}
 \endsetslot
 
-% CYRCHVCRS
-\setslot{uni04B8}
+\setslot{upsilon}
 \endsetslot
 
-% cyrchvcrs
-\setslot{uni04B9}
+\setslot{phi}
 \endsetslot
 
-% CYRSHHA
-\setslot{uni04BA}
+\setslot{chi}
 \endsetslot
 
-% cyrshha
-\setslot{uni04BB}
+\setslot{psi}
 \endsetslot
 
-% CYRABHCH
-\setslot{uni04BC}
+\setslot{omega}
 \endsetslot
 
-% cyrabhch
-\setslot{uni04BD}
+\setslot{iotadieresis}
 \endsetslot
 
-% CYRABHCHDSC
-\setslot{uni04BE}
+\setslot{upsilondieresis}
 \endsetslot
 
-% cyrabhchdsc
-\setslot{uni04BF}
+\setslot{omicrontonos}
 \endsetslot
 
-% CYRpalochka
-\setslot{uni04C0}
+\setslot{upsilontonos}
 \endsetslot
 
-% CYRKHK
-\setslot{uni04C3}
+\setslot{omegatonos}
 \endsetslot
 
-% cyrkhk
-\setslot{uni04C4}
+\setslot{afii10023}
+\endsetslot
+
+\setslot{afii10051}
+\endsetslot
+
+\setslot{afii10052}
+\endsetslot
+
+\setslot{afii10053}
+\endsetslot
+
+\setslot{afii10054}
 \endsetslot
 
-% CYRNHK
-\setslot{uni04C7}
+\setslot{afii10055}
 \endsetslot
 
-% cyrnhk
-\setslot{uni04C8}
+\setslot{afii10056}
 \endsetslot
 
-% CYRCHLDSC
-\setslot{uni04CB}
+\setslot{afii10057}
 \endsetslot
 
-% cyrchldsc
-\setslot{uni04CC}
+\setslot{afii10058}
 \endsetslot
 
-% CYRAE
-\setslot{uni04D4}
+\setslot{afii10059}
 \endsetslot
 
-% cyrae
-\setslot{uni04D5}
+\setslot{afii10060}
 \endsetslot
 
-% CYRSCHWA
-\setslot{uni04D8}
+\setslot{afii10061}
 \endsetslot
 
-% cyrschwa
-\setslot{uni04D9}
+\setslot{afii10062}
 \endsetslot
 
-% CYRABHDZE
-\setslot{uni04E0}
+\setslot{afii10145}
 \endsetslot
 
-% cyrabhdze
-\setslot{uni04E1}
+\setslot{afii10017}
 \endsetslot
 
-% CYROTLD
-\setslot{uni04E8}
+\setslot{afii10018}
 \endsetslot
 
-% cyrotld
-\setslot{uni04E9}
+\setslot{afii10019}
 \endsetslot
 
-% CYRGDSC
-\setslot{uni04F6}
+\setslot{afii10020}
 \endsetslot
 
-% cyrgdsc
-\setslot{uni04F7}
+\setslot{afii10021}
 \endsetslot
 
-% CYRHHK
-\setslot{uni04FC}
+\setslot{afii10022}
 \endsetslot
 
-% cyrhhk
-\setslot{uni04FD}
+\setslot{afii10024}
 \endsetslot
 
-% CYRHHCRS
-\setslot{uni04FE}
+\setslot{afii10025}
 \endsetslot
 
-% cyrhhcrs
-\setslot{uni04FF}
+\setslot{afii10026}
 \endsetslot
 
-% CYRLHK
-\setslot{uni0512}
+\setslot{afii10027}
 \endsetslot
 
-% cyrlhk
-\setslot{uni0513}
+\setslot{afii10028}
 \endsetslot
 
-% rangedash
-\setslot{endash}
+\setslot{afii10029}
+\endsetslot
+
+\setslot{afii10030}
+\endsetslot
+
+\setslot{afii10031}
+\endsetslot
+
+\setslot{afii10032}
+\endsetslot
+
+\setslot{afii10033}
+\endsetslot
+
+\setslot{afii10034}
+\endsetslot
+
+\setslot{afii10035}
+\endsetslot
+
+\setslot{afii10036}
+\endsetslot
+
+\setslot{afii10037}
+\endsetslot
+
+\setslot{afii10038}
+\endsetslot
+
+\setslot{afii10039}
+\endsetslot
+
+\setslot{afii10040}
+\endsetslot
+
+\setslot{afii10041}
+\endsetslot
+
+\setslot{afii10042}
+\endsetslot
+
+\setslot{afii10043}
+\endsetslot
+
+\setslot{afii10044}
+\endsetslot
+
+\setslot{afii10045}
+\endsetslot
+
+\setslot{afii10046}
+\endsetslot
+
+\setslot{afii10047}
+\endsetslot
+
+\setslot{afii10048}
+\endsetslot
+
+\setslot{afii10049}
+\endsetslot
+
+\setslot{afii10065}
+\endsetslot
+
+\setslot{afii10066}
+\endsetslot
+
+\setslot{afii10067}
+\endsetslot
+
+\setslot{afii10068}
+\endsetslot
+
+\setslot{afii10069}
+\endsetslot
+
+\setslot{afii10070}
+\endsetslot
+
+\setslot{afii10072}
+\endsetslot
+
+\setslot{afii10073}
+\endsetslot
+
+\setslot{afii10074}
+\endsetslot
+
+\setslot{afii10075}
+\endsetslot
+
+\setslot{afii10076}
+\endsetslot
+
+\setslot{afii10077}
+\endsetslot
+
+\setslot{afii10078}
+\endsetslot
+
+\setslot{afii10079}
+\endsetslot
+
+\setslot{afii10080}
+\endsetslot
+
+\setslot{afii10081}
+\endsetslot
+
+\setslot{afii10082}
+\endsetslot
+
+\setslot{afii10083}
+\endsetslot
+
+\setslot{afii10084}
+\endsetslot
+
+\setslot{afii10085}
+\endsetslot
+
+\setslot{afii10086}
+\endsetslot
+
+\setslot{afii10087}
+\endsetslot
+
+\setslot{afii10088}
+\endsetslot
+
+\setslot{afii10089}
+\endsetslot
+
+\setslot{afii10090}
+\endsetslot
+
+\setslot{afii10091}
+\endsetslot
+
+\setslot{afii10092}
+\endsetslot
+
+\setslot{afii10093}
+\endsetslot
+
+\setslot{afii10094}
 \endsetslot
 
-% cyrdash
-\setslot{emdash}
+\setslot{afii10095}
 \endsetslot
 
-% numero
-\setslot{afii61352}
+\setslot{afii10096}
 \endsetslot
 
-% fi
-\setslot{uniFB01}
+\setslot{afii10097}
 \endsetslot
 
-% fl
-\setslot{uniFB02}
+\setslot{afii10071}
 \endsetslot
 
-% ffi
-\setslot{uniFB03}
+\setslot{afii10099}
 \endsetslot
 
-% ffl
-\setslot{uniFB04}
+\setslot{afii10100}
 \endsetslot
 
-% cyrbreve
-\setslot{cyrillicbreve}
+\setslot{afii10101}
+\endsetslot
+
+\setslot{afii10102}
+\endsetslot
+
+\setslot{afii10103}
+\endsetslot
+
+\setslot{afii10104}
+\endsetslot
+
+\setslot{afii10105}
+\endsetslot
+
+\setslot{afii10106}
+\endsetslot
+
+\setslot{afii10107}
+\endsetslot
+
+\setslot{afii10108}
+\endsetslot
+
+\setslot{afii10109}
+\endsetslot
+
+\setslot{afii10110}
+\endsetslot
+
+\setslot{afii10193}
+\endsetslot
+
+\setslot{afii10050}
+\endsetslot
+
+\setslot{afii10098}
+\endsetslot
+
+\setslot{Wgrave}
+\endsetslot
+
+\setslot{wgrave}
+\endsetslot
+
+\setslot{Wacute}
+\endsetslot
+
+\setslot{wacute}
+\endsetslot
+
+\setslot{Wdieresis}
+\endsetslot
+
+\setslot{wdieresis}
+\endsetslot
+
+\setslot{Ygrave}
+\endsetslot
+
+\setslot{ygrave}
+\endsetslot
+
+\setslot{endash}
 \endsetslot
 
 \endencoding
diff --git a/Master/texmf-dist/source/fonts/droid/droid-03.etx b/Master/texmf-dist/source/fonts/droid/droid-03.etx
new file mode 100644
index 00000000000..824de852829
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/droid/droid-03.etx
@@ -0,0 +1,788 @@
+%% droidserif-03.etx
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+% 
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\relax
+
+\encoding
+
+\setslot{emdash}
+\endsetslot
+
+\setslot{afii00208}
+\endsetslot
+
+\setslot{underscoredbl}
+\endsetslot
+
+\setslot{quoteleft}
+\endsetslot
+
+\setslot{quoteright}
+\endsetslot
+
+\setslot{quotesinglbase}
+\endsetslot
+
+\setslot{quotereversed}
+\endsetslot
+
+\setslot{quotedblleft}
+\endsetslot
+
+\setslot{quotedblright}
+\endsetslot
+
+\setslot{quotedblbase}
+\endsetslot
+
+\setslot{dagger}
+\endsetslot
+
+\setslot{daggerdbl}
+\endsetslot
+
+\setslot{bullet}
+\endsetslot
+
+\setslot{ellipsis}
+\endsetslot
+
+\setslot{perthousand}
+\endsetslot
+
+\setslot{minute}
+\endsetslot
+
+\setslot{second}
+\endsetslot
+
+\setslot{guilsinglleft}
+\endsetslot
+
+\setslot{guilsinglright}
+\endsetslot
+
+\setslot{exclamdbl}
+\endsetslot
+
+\setslot{fraction}
+\endsetslot
+
+\setslot{nsuperior}
+\endsetslot
+
+\setslot{franc}
+\endsetslot
+
+\setslot{afii08941}
+\endsetslot
+
+\setslot{peseta}
+\endsetslot
+
+\setslot{Euro}
+\endsetslot
+
+\setslot{afii61248}
+\endsetslot
+
+\setslot{afii61289}
+\endsetslot
+
+\setslot{afii61352}
+\endsetslot
+
+\setslot{trademark}
+\endsetslot
+
+\setslot{Omega}
+\endsetslot
+
+\setslot{estimated}
+\endsetslot
+
+\setslot{oneeighth}
+\endsetslot
+
+\setslot{threeeighths}
+\endsetslot
+
+\setslot{fiveeighths}
+\endsetslot
+
+\setslot{seveneighths}
+\endsetslot
+
+\setslot{partialdiff}
+\endsetslot
+
+\setslot{Delta}
+\endsetslot
+
+\setslot{product}
+\endsetslot
+
+\setslot{summation}
+\endsetslot
+
+\setslot{minus}
+\endsetslot
+
+\setslot{radical}
+\endsetslot
+
+\setslot{infinity}
+\endsetslot
+
+\setslot{integral}
+\endsetslot
+
+\setslot{approxequal}
+\endsetslot
+
+\setslot{notequal}
+\endsetslot
+
+\setslot{lessequal}
+\endsetslot
+
+\setslot{greaterequal}
+\endsetslot
+
+\setslot{lozenge}
+\endsetslot
+
+\setslot{uniFB01}
+\endsetslot
+
+\setslot{uniFB02}
+\endsetslot
+
+\setslot{cyrillicbreve}
+\endsetslot
+
+\setslot{dotlessj}
+\endsetslot
+
+\setslot{caroncommaaccent}
+\endsetslot
+
+\setslot{commaaccent}
+\endsetslot
+
+\setslot{commaaccentrotate}
+\endsetslot
+
+\setslot{foursuperior}
+\endsetslot
+
+\setslot{fivesuperior}
+\endsetslot
+
+\setslot{sevensuperior}
+\endsetslot
+
+\setslot{eightsuperior}
+\endsetslot
+
+\setslot{uni2000}
+\endsetslot
+
+\setslot{uni2001}
+\endsetslot
+
+\setslot{uni2002}
+\endsetslot
+
+\setslot{uni2003}
+\endsetslot
+
+\setslot{uni2004}
+\endsetslot
+
+\setslot{uni2005}
+\endsetslot
+
+\setslot{uni2006}
+\endsetslot
+
+\setslot{uni2007}
+\endsetslot
+
+\setslot{uni2008}
+\endsetslot
+
+\setslot{uni2009}
+\endsetslot
+
+\setslot{uni200A}
+\endsetslot
+
+\setslot{uni200B}
+\endsetslot
+
+\setslot{uniFEFF}
+\endsetslot
+
+\setslot{uniFFFC}
+\endsetslot
+
+\setslot{uniFFFD}
+\endsetslot
+
+\setslot{uni01F0}
+\endsetslot
+
+\setslot{uni02BC}
+\endsetslot
+
+\setslot{uni03D1}
+\endsetslot
+
+\setslot{uni03D2}
+\endsetslot
+
+\setslot{uni03D6}
+\endsetslot
+
+\setslot{uni1E3E}
+\endsetslot
+
+\setslot{uni1E3F}
+\endsetslot
+
+\setslot{uni1E00}
+\endsetslot
+
+\setslot{uni1E01}
+\endsetslot
+
+\setslot{uni1F4D}
+\endsetslot
+
+\setslot{uni02F3}
+\endsetslot
+
+\setslot{dasiaoxia}
+\endsetslot
+
+\setslot{uniFB03}
+\endsetslot
+
+\setslot{uniFB04}
+\endsetslot
+
+\setslot{Ohorn}
+\endsetslot
+
+\setslot{ohorn}
+\endsetslot
+
+\setslot{Uhorn}
+\endsetslot
+
+\setslot{uhorn}
+\endsetslot
+
+\setslot{uni0300}
+\endsetslot
+
+\setslot{uni0301}
+\endsetslot
+
+\setslot{uni0303}
+\endsetslot
+
+\setslot{hook}
+\endsetslot
+
+\setslot{dotbelow}
+\endsetslot
+
+\setslot{uni0400}
+\endsetslot
+
+\setslot{uni040D}
+\endsetslot
+
+\setslot{uni0450}
+\endsetslot
+
+\setslot{uni045D}
+\endsetslot
+
+\setslot{uni0460}
+\endsetslot
+
+\setslot{uni0461}
+\endsetslot
+
+\setslot{uni0462}
+\endsetslot
+
+\setslot{uni0463}
+\endsetslot
+
+\setslot{uni0464}
+\endsetslot
+
+\setslot{uni0465}
+\endsetslot
+
+\setslot{uni0466}
+\endsetslot
+
+\setslot{uni0467}
+\endsetslot
+
+\setslot{uni0468}
+\endsetslot
+
+\setslot{uni0469}
+\endsetslot
+
+\setslot{uni046A}
+\endsetslot
+
+\setslot{uni046B}
+\endsetslot
+
+\setslot{uni046C}
+\endsetslot
+
+\setslot{uni046D}
+\endsetslot
+
+\setslot{uni046E}
+\endsetslot
+
+\setslot{uni046F}
+\endsetslot
+
+\setslot{uni0470}
+\endsetslot
+
+\setslot{uni0471}
+\endsetslot
+
+\setslot{uni0472}
+\endsetslot
+
+\setslot{uni0473}
+\endsetslot
+
+\setslot{uni0474}
+\endsetslot
+
+\setslot{uni0475}
+\endsetslot
+
+\setslot{uni0476}
+\endsetslot
+
+\setslot{uni0477}
+\endsetslot
+
+\setslot{uni0478}
+\endsetslot
+
+\setslot{uni0479}
+\endsetslot
+
+\setslot{uni047A}
+\endsetslot
+
+\setslot{uni047B}
+\endsetslot
+
+\setslot{uni047C}
+\endsetslot
+
+\setslot{uni047D}
+\endsetslot
+
+\setslot{uni047E}
+\endsetslot
+
+\setslot{uni047F}
+\endsetslot
+
+\setslot{uni0480}
+\endsetslot
+
+\setslot{uni0481}
+\endsetslot
+
+\setslot{uni0482}
+\endsetslot
+
+\setslot{uni0483}
+\endsetslot
+
+\setslot{uni0484}
+\endsetslot
+
+\setslot{uni0485}
+\endsetslot
+
+\setslot{uni0486}
+\endsetslot
+
+\setslot{uni0488}
+\endsetslot
+
+\setslot{uni0489}
+\endsetslot
+
+\setslot{uni048A}
+\endsetslot
+
+\setslot{uni048B}
+\endsetslot
+
+\setslot{uni048C}
+\endsetslot
+
+\setslot{uni048D}
+\endsetslot
+
+\setslot{uni048E}
+\endsetslot
+
+\setslot{uni048F}
+\endsetslot
+
+\setslot{uni0492}
+\endsetslot
+
+\setslot{uni0493}
+\endsetslot
+
+\setslot{uni0494}
+\endsetslot
+
+\setslot{uni0495}
+\endsetslot
+
+\setslot{uni0496}
+\endsetslot
+
+\setslot{uni0497}
+\endsetslot
+
+\setslot{uni0498}
+\endsetslot
+
+\setslot{uni0499}
+\endsetslot
+
+\setslot{uni049A}
+\endsetslot
+
+\setslot{uni049B}
+\endsetslot
+
+\setslot{uni049C}
+\endsetslot
+
+\setslot{uni049D}
+\endsetslot
+
+\setslot{uni049E}
+\endsetslot
+
+\setslot{uni049F}
+\endsetslot
+
+\setslot{uni04A0}
+\endsetslot
+
+\setslot{uni04A1}
+\endsetslot
+
+\setslot{uni04A2}
+\endsetslot
+
+\setslot{uni04A3}
+\endsetslot
+
+\setslot{uni04A4}
+\endsetslot
+
+\setslot{uni04A5}
+\endsetslot
+
+\setslot{uni04A6}
+\endsetslot
+
+\setslot{uni04A7}
+\endsetslot
+
+\setslot{uni04A8}
+\endsetslot
+
+\setslot{uni04A9}
+\endsetslot
+
+\setslot{uni04AA}
+\endsetslot
+
+\setslot{uni04AB}
+\endsetslot
+
+\setslot{uni04AC}
+\endsetslot
+
+\setslot{uni04AD}
+\endsetslot
+
+\setslot{uni04AE}
+\endsetslot
+
+\setslot{uni04AF}
+\endsetslot
+
+\setslot{uni04B0}
+\endsetslot
+
+\setslot{uni04B1}
+\endsetslot
+
+\setslot{uni04B2}
+\endsetslot
+
+\setslot{uni04B3}
+\endsetslot
+
+\setslot{uni04B4}
+\endsetslot
+
+\setslot{uni04B5}
+\endsetslot
+
+\setslot{uni04B6}
+\endsetslot
+
+\setslot{uni04B7}
+\endsetslot
+
+\setslot{uni04B8}
+\endsetslot
+
+\setslot{uni04B9}
+\endsetslot
+
+\setslot{uni04BA}
+\endsetslot
+
+\setslot{uni04BB}
+\endsetslot
+
+\setslot{uni04BC}
+\endsetslot
+
+\setslot{uni04BD}
+\endsetslot
+
+\setslot{uni04BE}
+\endsetslot
+
+\setslot{uni04BF}
+\endsetslot
+
+\setslot{uni04C0}
+\endsetslot
+
+\setslot{uni04C1}
+\endsetslot
+
+\setslot{uni04C2}
+\endsetslot
+
+\setslot{uni04C3}
+\endsetslot
+
+\setslot{uni04C4}
+\endsetslot
+
+\setslot{uni04C5}
+\endsetslot
+
+\setslot{uni04C6}
+\endsetslot
+
+\setslot{uni04C7}
+\endsetslot
+
+\setslot{uni04C8}
+\endsetslot
+
+\setslot{uni04C9}
+\endsetslot
+
+\setslot{uni04CA}
+\endsetslot
+
+\setslot{uni04CB}
+\endsetslot
+
+\setslot{uni04CC}
+\endsetslot
+
+\setslot{uni04CD}
+\endsetslot
+
+\setslot{uni04CE}
+\endsetslot
+
+\setslot{uni04CF}
+\endsetslot
+
+\setslot{uni04D0}
+\endsetslot
+
+\setslot{uni04D1}
+\endsetslot
+
+\setslot{uni04D2}
+\endsetslot
+
+\setslot{uni04D3}
+\endsetslot
+
+\setslot{uni04D4}
+\endsetslot
+
+\setslot{uni04D5}
+\endsetslot
+
+\setslot{uni04D6}
+\endsetslot
+
+\setslot{uni04D7}
+\endsetslot
+
+\setslot{uni04D8}
+\endsetslot
+
+\setslot{uni04D9}
+\endsetslot
+
+\setslot{uni04DA}
+\endsetslot
+
+\setslot{uni04DB}
+\endsetslot
+
+\setslot{uni04DC}
+\endsetslot
+
+\setslot{uni04DD}
+\endsetslot
+
+\setslot{uni04DE}
+\endsetslot
+
+\setslot{uni04DF}
+\endsetslot
+
+\setslot{uni04E0}
+\endsetslot
+
+\setslot{uni04E1}
+\endsetslot
+
+\setslot{uni04E2}
+\endsetslot
+
+\setslot{uni04E3}
+\endsetslot
+
+\setslot{uni04E4}
+\endsetslot
+
+\setslot{uni04E5}
+\endsetslot
+
+\setslot{uni04E6}
+\endsetslot
+
+\setslot{uni04E7}
+\endsetslot
+
+\setslot{uni04E8}
+\endsetslot
+
+\setslot{uni04E9}
+\endsetslot
+
+\setslot{uni04EA}
+\endsetslot
+
+\setslot{uni04EB}
+\endsetslot
+
+\setslot{uni04EC}
+\endsetslot
+
+\setslot{uni04ED}
+\endsetslot
+
+\setslot{uni04EE}
+\endsetslot
+
+\setslot{uni04EF}
+\endsetslot
+
+\setslot{uni04F0}
+\endsetslot
+
+\setslot{uni04F1}
+\endsetslot
+
+\setslot{uni04F2}
+\endsetslot
+
+\setslot{uni04F3}
+\endsetslot
+
+\setslot{uni04F4}
+\endsetslot
+
+\setslot{uni04F5}
+\endsetslot
+
+\setslot{uni04F6}
+\endsetslot
+
+\setslot{uni04F7}
+\endsetslot
+
+\setslot{uni04F8}
+\endsetslot
+
+\setslot{uni04F9}
+\endsetslot
+
+\setslot{uni04FA}
+\endsetslot
+
+\setslot{uni04FB}
+\endsetslot
+
+\setslot{uni04FC}
+\endsetslot
+
+\endencoding
diff --git a/Master/texmf-dist/source/fonts/droid/droid-04.etx b/Master/texmf-dist/source/fonts/droid/droid-04.etx
new file mode 100644
index 00000000000..060358317c5
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/droid/droid-04.etx
@@ -0,0 +1,395 @@
+%% droidserif-04.etx
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+% 
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\relax
+
+\encoding
+
+\setslot{uni04FD}
+\endsetslot
+
+\setslot{uni04FE}
+\endsetslot
+
+\setslot{uni04FF}
+\endsetslot
+
+\setslot{uni0500}
+\endsetslot
+
+\setslot{uni0501}
+\endsetslot
+
+\setslot{uni0502}
+\endsetslot
+
+\setslot{uni0503}
+\endsetslot
+
+\setslot{uni0504}
+\endsetslot
+
+\setslot{uni0505}
+\endsetslot
+
+\setslot{uni0506}
+\endsetslot
+
+\setslot{uni0507}
+\endsetslot
+
+\setslot{uni0508}
+\endsetslot
+
+\setslot{uni0509}
+\endsetslot
+
+\setslot{uni050A}
+\endsetslot
+
+\setslot{uni050B}
+\endsetslot
+
+\setslot{uni050C}
+\endsetslot
+
+\setslot{uni050D}
+\endsetslot
+
+\setslot{uni050E}
+\endsetslot
+
+\setslot{uni050F}
+\endsetslot
+
+\setslot{uni0510}
+\endsetslot
+
+\setslot{uni0511}
+\endsetslot
+
+\setslot{uni0512}
+\endsetslot
+
+\setslot{uni0513}
+\endsetslot
+
+\setslot{uni1EA0}
+\endsetslot
+
+\setslot{uni1EA1}
+\endsetslot
+
+\setslot{uni1EA2}
+\endsetslot
+
+\setslot{uni1EA3}
+\endsetslot
+
+\setslot{uni1EA4}
+\endsetslot
+
+\setslot{uni1EA5}
+\endsetslot
+
+\setslot{uni1EA6}
+\endsetslot
+
+\setslot{uni1EA7}
+\endsetslot
+
+\setslot{uni1EA8}
+\endsetslot
+
+\setslot{uni1EA9}
+\endsetslot
+
+\setslot{uni1EAA}
+\endsetslot
+
+\setslot{uni1EAB}
+\endsetslot
+
+\setslot{uni1EAC}
+\endsetslot
+
+\setslot{uni1EAD}
+\endsetslot
+
+\setslot{uni1EAE}
+\endsetslot
+
+\setslot{uni1EAF}
+\endsetslot
+
+\setslot{uni1EB0}
+\endsetslot
+
+\setslot{uni1EB1}
+\endsetslot
+
+\setslot{uni1EB2}
+\endsetslot
+
+\setslot{uni1EB3}
+\endsetslot
+
+\setslot{uni1EB4}
+\endsetslot
+
+\setslot{uni1EB5}
+\endsetslot
+
+\setslot{uni1EB6}
+\endsetslot
+
+\setslot{uni1EB7}
+\endsetslot
+
+\setslot{uni1EB8}
+\endsetslot
+
+\setslot{uni1EB9}
+\endsetslot
+
+\setslot{uni1EBA}
+\endsetslot
+
+\setslot{uni1EBB}
+\endsetslot
+
+\setslot{uni1EBC}
+\endsetslot
+
+\setslot{uni1EBD}
+\endsetslot
+
+\setslot{uni1EBE}
+\endsetslot
+
+\setslot{uni1EBF}
+\endsetslot
+
+\setslot{uni1EC0}
+\endsetslot
+
+\setslot{uni1EC1}
+\endsetslot
+
+\setslot{uni1EC2}
+\endsetslot
+
+\setslot{uni1EC3}
+\endsetslot
+
+\setslot{uni1EC4}
+\endsetslot
+
+\setslot{uni1EC5}
+\endsetslot
+
+\setslot{uni1EC6}
+\endsetslot
+
+\setslot{uni1EC7}
+\endsetslot
+
+\setslot{uni1EC8}
+\endsetslot
+
+\setslot{uni1EC9}
+\endsetslot
+
+\setslot{uni1ECA}
+\endsetslot
+
+\setslot{uni1ECB}
+\endsetslot
+
+\setslot{uni1ECC}
+\endsetslot
+
+\setslot{uni1ECD}
+\endsetslot
+
+\setslot{uni1ECE}
+\endsetslot
+
+\setslot{uni1ECF}
+\endsetslot
+
+\setslot{uni1ED0}
+\endsetslot
+
+\setslot{uni1ED1}
+\endsetslot
+
+\setslot{uni1ED2}
+\endsetslot
+
+\setslot{uni1ED3}
+\endsetslot
+
+\setslot{uni1ED4}
+\endsetslot
+
+\setslot{uni1ED5}
+\endsetslot
+
+\setslot{uni1ED6}
+\endsetslot
+
+\setslot{uni1ED7}
+\endsetslot
+
+\setslot{uni1ED8}
+\endsetslot
+
+\setslot{uni1ED9}
+\endsetslot
+
+\setslot{uni1EDA}
+\endsetslot
+
+\setslot{uni1EDB}
+\endsetslot
+
+\setslot{uni1EDC}
+\endsetslot
+
+\setslot{uni1EDD}
+\endsetslot
+
+\setslot{uni1EDE}
+\endsetslot
+
+\setslot{uni1EDF}
+\endsetslot
+
+\setslot{uni1EE0}
+\endsetslot
+
+\setslot{uni1EE1}
+\endsetslot
+
+\setslot{uni1EE2}
+\endsetslot
+
+\setslot{uni1EE3}
+\endsetslot
+
+\setslot{uni1EE4}
+\endsetslot
+
+\setslot{uni1EE5}
+\endsetslot
+
+\setslot{uni1EE6}
+\endsetslot
+
+\setslot{uni1EE7}
+\endsetslot
+
+\setslot{uni1EE8}
+\endsetslot
+
+\setslot{uni1EE9}
+\endsetslot
+
+\setslot{uni1EEA}
+\endsetslot
+
+\setslot{uni1EEB}
+\endsetslot
+
+\setslot{uni1EEC}
+\endsetslot
+
+\setslot{uni1EED}
+\endsetslot
+
+\setslot{uni1EEE}
+\endsetslot
+
+\setslot{uni1EEF}
+\endsetslot
+
+\setslot{uni1EF0}
+\endsetslot
+
+\setslot{uni1EF1}
+\endsetslot
+
+\setslot{uni1EF4}
+\endsetslot
+
+\setslot{uni1EF5}
+\endsetslot
+
+\setslot{uni1EF6}
+\endsetslot
+
+\setslot{uni1EF7}
+\endsetslot
+
+\setslot{uni1EF8}
+\endsetslot
+
+\setslot{uni1EF9}
+\endsetslot
+
+\setslot{uni20AB}
+\endsetslot
+
+\setslot{uni030F}
+\endsetslot
+
+\setslot{circumflexacutecomb}
+\endsetslot
+
+\setslot{circumflexgravecomb}
+\endsetslot
+
+\setslot{circumflexhookcomb}
+\endsetslot
+
+\setslot{circumflextildecomb}
+\endsetslot
+
+\setslot{breveacutecomb}
+\endsetslot
+
+\setslot{brevegravecomb}
+\endsetslot
+
+\setslot{brevehookcomb}
+\endsetslot
+
+\setslot{brevetildecomb}
+\endsetslot
+
+\setslot{cyrillichookleft}
+\endsetslot
+
+\setslot{cyrillicbighookUC}
+\endsetslot
+
+\setslot{Tcedilla}
+\endsetslot
+
+\setslot{tcedilla}
+\endsetslot
+
+\endencoding
diff --git a/Master/texmf-dist/source/fonts/droid/droid-drv.tex b/Master/texmf-dist/source/fonts/droid/droid-drv.tex
new file mode 100644
index 00000000000..0b088454264
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/droid/droid-drv.tex
@@ -0,0 +1,98 @@
+%% droid-drv.tex
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\input fontinst.sty
+
+
+\setint{slant}{213}
+\setint{smallcapsscale}{800}
+
+\substitutesilent{scit}{scsl}
+
+
+\recordtransforms{droid-rec.tex}
+
+
+\foreach(e){01,02,03,04}
+  \transformfont{DroidSerif-Regular-\str{e}}{\reencodefont{droid-\str{e}}{\fromafm{DroidSerif-Regular}}}
+  \transformfont{DroidSerif-Italic-\str{e}}{\reencodefont{droid-\str{e}}{\fromafm{DroidSerif-Italic}}}
+  \transformfont{DroidSerif-Regular-Slanted-\str{e}}{\slantfont{\int{slant}}\reencodefont{droid-\str{e}}{\fromafm{DroidSerif-Regular}}}
+  \transformfont{DroidSerif-Italic-Upright-\str{e}}{\slantfont{-\int{slant}}\reencodefont{droid-\str{e}}{\fromafm{DroidSerif-Italic}}}
+  \transformfont{DroidSerif-Bold-\str{e}}{\reencodefont{droid-\str{e}}{\fromafm{DroidSerif-Bold}}}
+  \transformfont{DroidSerif-BoldItalic-\str{e}}{\reencodefont{droid-\str{e}}{\fromafm{DroidSerif-BoldItalic}}}
+  \transformfont{DroidSerif-Bold-Slanted-\str{e}}{\slantfont{\int{slant}}\reencodefont{droid-\str{e}}{\fromafm{DroidSerif-Bold}}}
+  \transformfont{DroidSerif-BoldItalic-Upright-\str{e}}{\slantfont{-\int{slant}}\reencodefont{droid-\str{e}}{\fromafm{DroidSerif-BoldItalic}}}
+  \transformfont{DroidSans-\str{e}}{\reencodefont{droid-\str{e}}{\fromafm{DroidSans}}}
+  \transformfont{DroidSans-Slanted-\str{e}}{\slantfont{\int{slant}}\reencodefont{droid-\str{e}}{\fromafm{DroidSans}}}
+  \transformfont{DroidSans-Bold-\str{e}}{\reencodefont{droid-\str{e}}{\fromafm{DroidSans-Bold}}}
+  \transformfont{DroidSans-Bold-Slanted-\str{e}}{\slantfont{\int{slant}}\reencodefont{droid-\str{e}}{\fromafm{DroidSans-Bold}}}
+  \transformfont{DroidSansMono-\str{e}}{\reencodefont{droid-\str{e}}{\fromafm{DroidSansMono}}}
+  \transformfont{DroidSansMono-Slanted-\str{e}}{\slantfont{\int{slant}}\reencodefont{droid-\str{e}}{\fromafm{DroidSansMono}}}
+\endfor(e)
+
+
+\fontinstcc
+\def\fd_family#1#2#3{
+   \a_toks{#3}
+   \edef\lowercase_file{\lowercase{
+     \edef\noexpand\lowercase_file{#1#2.fd}}}
+   \lowercase_file
+   \open_out{\lowercase_file}
+   \out_line{\percent_char~Filename:~\lowercase_file}
+   \out_line{\percent_char~Created~by:~tex~\jobname}
+   \out_line{\percent_char~Created~using~fontinst~v\fontinstversion}
+   \out_line{}
+   \out_line{\percent_char~THIS~FILE~SHOULD~BE~PUT~IN~A~TEX~INPUTS~
+      DIRECTORY}
+   \out_line{}
+   \out_line{\string\ProvidesFile{\lowercase_file}}
+   \out_lline{[
+      \the\year/
+      \ifnum10>\month0\fi\the\month/
+      \ifnum10>\day0\fi\the\day\space
+      Fontinst~v\fontinstversion\space
+      font~definitions~for~#1/#2.
+   ]}
+   \out_line{}
+   %%%
+   \out_line{\string\expandafter\string\ifx\string\csname\space droid@scale\string\endcsname\string\relax}
+   \out_line{\space\space\string\let\string\droid@scale\string\@empty}
+   \out_line{\string\fi}
+   \out_line{}
+   %%%
+   \out_line{\string\DeclareFontFamily{#1}{#2}{\the\a_toks}}
+   {
+      \csname #1-#2\endcsname
+      \out_line{}
+      \let\do_shape=\substitute_shape
+      \csname #1-#2\endcsname
+      \let\do_shape=\remove_shape
+      \csname #1-#2\endcsname
+   }
+   \x_cs\g_let{#1-#2}\x_relax
+   \out_line{}
+   \out_line{\string\endinput}
+   \close_out{Font~definitions}
+}
+\normalcc
+
+
+\input droidserif-drv.tex
+\input droidsans-drv.tex
+\input droidsansmono-drv.tex
+
+
+\endrecordtransforms
+\bye
diff --git a/Master/texmf-dist/source/fonts/droid/droid-fixcyrillic.mtx b/Master/texmf-dist/source/fonts/droid/droid-fixcyrillic.mtx
new file mode 100644
index 00000000000..aa144afb13f
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/droid/droid-fixcyrillic.mtx
@@ -0,0 +1,756 @@
+%% droid-fixcyrillic.tex
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\relax
+
+\metrics
+
+\resetglyph{CYRpalochka}
+  \glyph{uni04C0}{1000}
+\endresetglyph
+
+\resetglyph{dblgrave}
+  \glyph{uni030F}{1000}
+\endresetglyph
+
+\resetglyph{cyrbreve}
+  \glyph{cyrillicbreve}{1000}
+\endresetglyph
+
+\resetglyph{fi}
+  \glyph{uniFB01}{1000}
+\endresetglyph
+
+\resetglyph{fl}
+  \glyph{uniFB02}{1000}
+\endresetglyph
+
+\resetglyph{ffi}
+  \glyph{uniFB03}{1000}
+\endresetglyph
+
+\resetglyph{ffl}
+  \glyph{uniFB04}{1000}
+\endresetglyph
+
+\resetglyph{CYRGUP}
+  \glyph{afii10050}{1000}
+\endresetglyph
+
+\resetglyph{CYRGHCRS}
+  \glyph{uni0492}{1000}
+\endresetglyph
+
+\resetglyph{CYRDJE}
+  \glyph{afii10051}{1000}
+\endresetglyph
+
+\resetglyph{CYRTSHE}
+  \glyph{afii10060}{1000}
+\endresetglyph
+
+\resetglyph{CYRSHHA}
+  \glyph{uni04BA}{1000}
+\endresetglyph
+
+\resetglyph{CYRZHDSC}
+  \glyph{uni0496}{1000}
+\endresetglyph
+
+\resetglyph{CYRZDSC}
+  \glyph{uni0498}{1000}
+\endresetglyph
+
+\resetglyph{CYRLJE}
+  \glyph{afii10058}{1000}
+\endresetglyph
+
+\resetglyph{CYRYI}
+  \glyph{afii10056}{1000}
+\endresetglyph
+
+\resetglyph{CYRKDSC}
+  \glyph{uni049A}{1000}
+\endresetglyph
+
+\resetglyph{CYRLDSC}
+  \glyph{uni04C5}{1000}
+\endresetglyph
+
+\resetglyph{CYRKBEAK}
+  \glyph{uni04A0}{1000}
+\endresetglyph
+
+\resetglyph{CYRKVCRS}
+  \glyph{uni049C}{1000}
+\endresetglyph
+
+\resetglyph{CYRAE}
+  \glyph{uni04D4}{1000}
+\endresetglyph
+
+\resetglyph{CYRNDSC}
+  \glyph{uni04A2}{1000}
+\endresetglyph
+
+\resetglyph{CYRNG}
+  \glyph{uni04A4}{1000}
+\endresetglyph
+
+\resetglyph{CYRDZE}
+  \glyph{afii10054}{1000}
+\endresetglyph
+
+\resetglyph{CYROTLD}
+  \glyph{uni04E8}{1000}
+\endresetglyph
+
+\resetglyph{CYRSDSC}
+  \glyph{uni04AA}{1000}
+\endresetglyph
+
+\resetglyph{CYRUSHRT}
+  \glyph{afii10062}{1000}
+\endresetglyph
+
+\resetglyph{CYRY}
+  \glyph{uni04AE}{1000}
+\endresetglyph
+
+\resetglyph{CYRYHCRS}
+  \glyph{uni04B0}{1000}
+\endresetglyph
+
+\resetglyph{CYRHDSC}
+  \glyph{uni04B2}{1000}
+\endresetglyph
+
+\resetglyph{CYRDZHE}
+  \glyph{afii10145}{1000}
+\endresetglyph
+
+\resetglyph{CYRCHVCRS}
+  \glyph{uni04B8}{1000}
+\endresetglyph
+
+\resetglyph{CYRCHRDSC}
+  \glyph{uni04B6}{1000}
+\endresetglyph
+
+\resetglyph{CYRIE}
+  \glyph{afii10053}{1000}
+\endresetglyph
+
+\resetglyph{CYRSCHWA}
+  \glyph{uni04D8}{1000}
+\endresetglyph
+
+\resetglyph{CYRNJE}
+  \glyph{afii10059}{1000}
+\endresetglyph
+
+\resetglyph{CYRYO}
+  \glyph{afii10023}{1000}
+\endresetglyph
+
+\resetglyph{numero}
+  \glyph{afii61352}{1000}
+\endresetglyph
+
+\resetglyph{cyrgup}
+  \glyph{afii10098}{1000}
+\endresetglyph
+
+\resetglyph{cyrghcrs}
+  \glyph{uni0493}{1000}
+\endresetglyph
+
+\resetglyph{cyrdje}
+  \glyph{afii10099}{1000}
+\endresetglyph
+
+\resetglyph{cyrtshe}
+  \glyph{afii10108}{1000}
+\endresetglyph
+
+\resetglyph{cyrshha}
+  \glyph{uni04BB}{1000}
+\endresetglyph
+
+\resetglyph{cyrzhdsc}
+  \glyph{uni0497}{1000}
+\endresetglyph
+
+\resetglyph{cyrzdsc}
+  \glyph{uni0499}{1000}
+\endresetglyph
+
+\resetglyph{cyrlje}
+  \glyph{afii10106}{1000}
+\endresetglyph
+
+\resetglyph{cyryi}
+  \glyph{afii10104}{1000}
+\endresetglyph
+
+\resetglyph{cyrkdsc}
+  \glyph{uni049B}{1000}
+\endresetglyph
+
+\resetglyph{cyrldsc}
+  \glyph{uni04C6}{1000}
+\endresetglyph
+
+\resetglyph{cyrkbeak}
+  \glyph{uni04A1}{1000}
+\endresetglyph
+
+\resetglyph{cyrkvcrs}
+  \glyph{uni049D}{1000}
+\endresetglyph
+
+\resetglyph{cyrae}
+  \glyph{uni04D5}{1000}
+\endresetglyph
+
+\resetglyph{cyrndsc}
+  \glyph{uni04A3}{1000}
+\endresetglyph
+
+\resetglyph{cyrng}
+  \glyph{uni04A5}{1000}
+\endresetglyph
+
+\resetglyph{cyrdze}
+  \glyph{afii10102}{1000}
+\endresetglyph
+
+\resetglyph{cyrotld}
+  \glyph{uni04E9}{1000}
+\endresetglyph
+
+\resetglyph{cyrsdsc}
+  \glyph{uni04AB}{1000}
+\endresetglyph
+
+\resetglyph{cyrushrt}
+  \glyph{afii10110}{1000}
+\endresetglyph
+
+\resetglyph{cyry}
+  \glyph{uni04AF}{1000}
+\endresetglyph
+
+\resetglyph{cyryhcrs}
+  \glyph{uni04B1}{1000}
+\endresetglyph
+
+\resetglyph{cyrhdsc}
+  \glyph{uni04B3}{1000}
+\endresetglyph
+
+\resetglyph{cyrdzhe}
+  \glyph{afii10193}{1000}
+\endresetglyph
+
+\resetglyph{cyrchvcrs}
+  \glyph{uni04B9}{1000}
+\endresetglyph
+
+\resetglyph{cyrchrdsc}
+  \glyph{uni04B7}{1000}
+\endresetglyph
+
+\resetglyph{cyrie}
+  \glyph{afii10101}{1000}
+\endresetglyph
+
+\resetglyph{cyrschwa}
+  \glyph{uni04D9}{1000}
+\endresetglyph
+
+\resetglyph{cyrnje}
+  \glyph{afii10107}{1000}
+\endresetglyph
+
+\resetglyph{cyryo}
+  \glyph{afii10071}{1000}
+\endresetglyph
+
+\resetglyph{CYRA}
+  \glyph{afii10017}{1000}
+\endresetglyph
+
+\resetglyph{CYRB}
+  \glyph{afii10018}{1000}
+\endresetglyph
+
+\resetglyph{CYRV}
+  \glyph{afii10019}{1000}
+\endresetglyph
+
+\resetglyph{CYRG}
+  \glyph{afii10020}{1000}
+\endresetglyph
+
+\resetglyph{CYRD}
+  \glyph{afii10021}{1000}
+\endresetglyph
+
+\resetglyph{CYRE}
+  \glyph{afii10022}{1000}
+\endresetglyph
+
+\resetglyph{CYRZH}
+  \glyph{afii10024}{1000}
+\endresetglyph
+
+\resetglyph{CYRZ}
+  \glyph{afii10025}{1000}
+\endresetglyph
+
+\resetglyph{CYRI}
+  \glyph{afii10026}{1000}
+\endresetglyph
+
+\resetglyph{CYRISHRT}
+  \glyph{afii10027}{1000}
+\endresetglyph
+
+\resetglyph{CYRK}
+  \glyph{afii10028}{1000}
+\endresetglyph
+
+\resetglyph{CYRL}
+  \glyph{afii10029}{1000}
+\endresetglyph
+
+\resetglyph{CYRM}
+  \glyph{afii10030}{1000}
+\endresetglyph
+
+\resetglyph{CYRN}
+  \glyph{afii10031}{1000}
+\endresetglyph
+
+\resetglyph{CYRO}
+  \glyph{afii10032}{1000}
+\endresetglyph
+
+\resetglyph{CYRP}
+  \glyph{afii10033}{1000}
+\endresetglyph
+
+\resetglyph{CYRR}
+  \glyph{afii10034}{1000}
+\endresetglyph
+
+\resetglyph{CYRS}
+  \glyph{afii10035}{1000}
+\endresetglyph
+
+\resetglyph{CYRT}
+  \glyph{afii10036}{1000}
+\endresetglyph
+
+\resetglyph{CYRU}
+  \glyph{afii10037}{1000}
+\endresetglyph
+
+\resetglyph{CYRF}
+  \glyph{afii10038}{1000}
+\endresetglyph
+
+\resetglyph{CYRH}
+  \glyph{afii10039}{1000}
+\endresetglyph
+
+\resetglyph{CYRC}
+  \glyph{afii10040}{1000}
+\endresetglyph
+
+\resetglyph{CYRCH}
+  \glyph{afii10041}{1000}
+\endresetglyph
+
+\resetglyph{CYRSH}
+  \glyph{afii10042}{1000}
+\endresetglyph
+
+\resetglyph{CYRSHCH}
+  \glyph{afii10043}{1000}
+\endresetglyph
+
+\resetglyph{CYRHRDSN}
+  \glyph{afii10044}{1000}
+\endresetglyph
+
+\resetglyph{CYRERY}
+  \glyph{afii10045}{1000}
+\endresetglyph
+
+\resetglyph{CYRSFTSN}
+  \glyph{afii10046}{1000}
+\endresetglyph
+
+\resetglyph{CYREREV}
+  \glyph{afii10047}{1000}
+\endresetglyph
+
+\resetglyph{CYRYU}
+  \glyph{afii10048}{1000}
+\endresetglyph
+
+\resetglyph{CYRYA}
+  \glyph{afii10049}{1000}
+\endresetglyph
+
+\resetglyph{cyra}
+  \glyph{afii10065}{1000}
+\endresetglyph
+
+\resetglyph{cyrb}
+  \glyph{afii10066}{1000}
+\endresetglyph
+
+\resetglyph{cyrv}
+  \glyph{afii10067}{1000}
+\endresetglyph
+
+\resetglyph{cyrg}
+  \glyph{afii10068}{1000}
+\endresetglyph
+
+\resetglyph{cyrd}
+  \glyph{afii10069}{1000}
+\endresetglyph
+
+\resetglyph{cyre}
+  \glyph{afii10070}{1000}
+\endresetglyph
+
+\resetglyph{cyrzh}
+  \glyph{afii10072}{1000}
+\endresetglyph
+
+\resetglyph{cyrz}
+  \glyph{afii10073}{1000}
+\endresetglyph
+
+\resetglyph{cyri}
+  \glyph{afii10074}{1000}
+\endresetglyph
+
+\resetglyph{cyrishrt}
+  \glyph{afii10075}{1000}
+\endresetglyph
+
+\resetglyph{cyrk}
+  \glyph{afii10076}{1000}
+\endresetglyph
+
+\resetglyph{cyrl}
+  \glyph{afii10077}{1000}
+\endresetglyph
+
+\resetglyph{cyrm}
+  \glyph{afii10078}{1000}
+\endresetglyph
+
+\resetglyph{cyrn}
+  \glyph{afii10079}{1000}
+\endresetglyph
+
+\resetglyph{cyro}
+  \glyph{afii10080}{1000}
+\endresetglyph
+
+\resetglyph{cyrp}
+  \glyph{afii10081}{1000}
+\endresetglyph
+
+\resetglyph{cyrr}
+  \glyph{afii10082}{1000}
+\endresetglyph
+
+\resetglyph{cyrs}
+  \glyph{afii10083}{1000}
+\endresetglyph
+
+\resetglyph{cyrt}
+  \glyph{afii10084}{1000}
+\endresetglyph
+
+\resetglyph{cyru}
+  \glyph{afii10085}{1000}
+\endresetglyph
+
+\resetglyph{cyrf}
+  \glyph{afii10086}{1000}
+\endresetglyph
+
+\resetglyph{cyrh}
+  \glyph{afii10087}{1000}
+\endresetglyph
+
+\resetglyph{cyrc}
+  \glyph{afii10088}{1000}
+\endresetglyph
+
+\resetglyph{cyrch}
+  \glyph{afii10089}{1000}
+\endresetglyph
+
+\resetglyph{cyrsh}
+  \glyph{afii10090}{1000}
+\endresetglyph
+
+\resetglyph{cyrshch}
+  \glyph{afii10091}{1000}
+\endresetglyph
+
+\resetglyph{cyrhrdsn}
+  \glyph{afii10092}{1000}
+\endresetglyph
+
+\resetglyph{cyrery}
+  \glyph{afii10093}{1000}
+\endresetglyph
+
+\resetglyph{cyrsftsn}
+  \glyph{afii10094}{1000}
+\endresetglyph
+
+\resetglyph{cyrerev}
+  \glyph{afii10095}{1000}
+\endresetglyph
+
+\resetglyph{cyryu}
+  \glyph{afii10096}{1000}
+\endresetglyph
+
+\resetglyph{cyrya}
+  \glyph{afii10097}{1000}
+\endresetglyph
+
+\resetglyph{CYRGDSC}
+  \glyph{uni04F6}{1000}
+\endresetglyph
+
+\resetglyph{CYRGHK}
+  \glyph{uni0494}{1000}
+\endresetglyph
+
+\resetglyph{CYRABHDZE}
+  \glyph{uni04E0}{1000}
+\endresetglyph
+
+\resetglyph{CYRKHK}
+  \glyph{uni04C3}{1000}
+\endresetglyph
+
+\resetglyph{CYRLHK}
+  \glyph{uni0512}{1000}
+\endresetglyph
+
+\resetglyph{CYRNHK}
+  \glyph{uni04C7}{1000}
+\endresetglyph
+
+\resetglyph{CYRHHCRS}
+  \glyph{uni04FE}{1000}
+\endresetglyph
+
+\resetglyph{CYRHHK}
+  \glyph{uni04FC}{1000}
+\endresetglyph
+
+\resetglyph{CYRCHLDSC}
+  \glyph{uni04CB}{1000}
+\endresetglyph
+
+\resetglyph{CYREPS}
+  \glyph{uni0510}{1000}
+\endresetglyph
+
+\resetglyph{cyrgdsc}
+  \glyph{uni04F7}{1000}
+\endresetglyph
+
+\resetglyph{cyrghk}
+  \glyph{uni0495}{1000}
+\endresetglyph
+
+\resetglyph{cyrabhdze}
+  \glyph{uni04E1}{1000}
+\endresetglyph
+
+\resetglyph{cyrkhk}
+  \glyph{uni04C4}{1000}
+\endresetglyph
+
+\resetglyph{cyrlhk}
+  \glyph{uni0513}{1000}
+\endresetglyph
+
+\resetglyph{cyrnhk}
+  \glyph{uni04C8}{1000}
+\endresetglyph
+
+\resetglyph{cyrhhcrs}
+  \glyph{uni04FF}{1000}
+\endresetglyph
+
+\resetglyph{cyrhhk}
+  \glyph{uni04FD}{1000}
+\endresetglyph
+
+\resetglyph{cyrchldsc}
+  \glyph{uni04CC}{1000}
+\endresetglyph
+
+\resetglyph{cyreps}
+  \glyph{uni0511}{1000}
+\endresetglyph
+
+\resetglyph{CYRPHK}
+  \glyph{uni04A6}{1000}
+\endresetglyph
+
+\resetglyph{CYRTETSE}
+  \glyph{uni04B4}{1000}
+\endresetglyph
+
+\resetglyph{CYRTDSC}
+  \glyph{uni04AC}{1000}
+\endresetglyph
+
+\resetglyph{CYRRTICK}
+  \glyph{uni048E}{1000}
+\endresetglyph
+
+\resetglyph{CYRMDSC}
+  \glyph{uni04CD}{1000}
+\endresetglyph
+
+\resetglyph{CYRKHCRS}
+  \glyph{uni049E}{1000}
+\endresetglyph
+
+\resetglyph{CYRABHCH}
+  \glyph{uni04BC}{1000}
+\endresetglyph
+
+\resetglyph{CYRABHCHDSC}
+  \glyph{uni04BE}{1000}
+\endresetglyph
+
+\resetglyph{CYRSEMISFTSN}
+  \glyph{uni048C}{1000}
+\endresetglyph
+
+\resetglyph{CYRISHRTDSC}
+  \glyph{uni048A}{1000}
+\endresetglyph
+
+\resetglyph{CYRABHHA}
+  \glyph{uni04A8}{1000}
+\endresetglyph
+
+\resetglyph{cyrphk}
+  \glyph{uni04A7}{1000}
+\endresetglyph
+
+\resetglyph{cyrtetse}
+  \glyph{uni04B5}{1000}
+\endresetglyph
+
+\resetglyph{cyrtdsc}
+  \glyph{uni04AD}{1000}
+\endresetglyph
+
+\resetglyph{cyrrtick}
+  \glyph{uni048F}{1000}
+\endresetglyph
+
+\resetglyph{cyrmdsc}
+  \glyph{uni04CE}{1000}
+\endresetglyph
+
+\resetglyph{cyrkhcrs}
+  \glyph{uni049F}{1000}
+\endresetglyph
+
+\resetglyph{cyrabhch}
+  \glyph{uni04BD}{1000}
+\endresetglyph
+
+\resetglyph{cyrabhchdsc}
+  \glyph{uni04BF}{1000}
+\endresetglyph
+
+\resetglyph{cyrsemisftsn}
+  \glyph{uni048D}{1000}
+\endresetglyph
+
+\resetglyph{cyrishrtdsc}
+  \glyph{uni048B}{1000}
+\endresetglyph
+
+\resetglyph{cyrabhha}
+  \glyph{uni04A9}{1000}
+\endresetglyph
+
+\resetglyph{CYRII}
+  \glyph{afii10055}{1000}
+\endresetglyph
+
+\resetglyph{CYRJE}
+  \glyph{afii10057}{1000}
+\endresetglyph
+
+\resetglyph{CYRYAT}
+  \glyph{uni0462}{1000}
+\endresetglyph
+
+\resetglyph{CYRBYUS}
+  \glyph{uni046A}{1000}
+\endresetglyph
+
+\resetglyph{CYRIZH}
+  \glyph{uni0474}{1000}
+\endresetglyph
+
+\resetglyph{cyrii}
+  \glyph{afii10103}{1000}
+\endresetglyph
+
+\resetglyph{cyrje}
+  \glyph{afii10105}{1000}
+\endresetglyph
+
+\resetglyph{cyryat}
+  \glyph{uni0463}{1000}
+\endresetglyph
+
+\resetglyph{cyrbyus}
+  \glyph{uni046B}{1000}
+\endresetglyph
+
+\resetglyph{cyrizh}
+  \glyph{uni0475}{1000}
+\endresetglyph
+
+\endmetrics
diff --git a/Master/texmf-dist/source/fonts/droid/droid-fixgreek.mtx b/Master/texmf-dist/source/fonts/droid/droid-fixgreek.mtx
new file mode 100644
index 00000000000..f0977446a01
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/droid/droid-fixgreek.mtx
@@ -0,0 +1,40 @@
+%% droid-fixgreek.tex
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\relax
+
+\metrics
+
+\resetglyph{euro}
+  \glyph{Euro}{1000}
+\endresetglyph
+
+\resetglyph{Delta}
+  \glyph{uni0394}{1000}
+\endresetglyph
+
+\resetglyph{Omega}
+  \glyph{uni03A9}{1000}
+\endresetglyph
+
+\resetglyph{mu}
+  \glyph{uni03BC}{1000}
+\endresetglyph
+
+\resetglyph{theta1}
+  \glyph{uni03D1}{1000}
+\endresetglyph
+
+\endmetrics
diff --git a/Master/texmf-dist/source/fonts/droid/droid-fixlatin.mtx b/Master/texmf-dist/source/fonts/droid/droid-fixlatin.mtx
new file mode 100644
index 00000000000..56726985c91
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/droid/droid-fixlatin.mtx
@@ -0,0 +1,44 @@
+%% droid-fixlatin.tex
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\relax
+
+\metrics
+
+\resetglyph{Delta}
+  \glyph{uni0394}{1000}
+\endresetglyph
+
+\resetglyph{Omega}
+  \glyph{uni03A9}{1000}
+\endresetglyph
+
+\resetglyph{fi}
+  \glyph{uniFB01}{1000}
+\endresetglyph
+
+\resetglyph{fl}
+  \glyph{uniFB02}{1000}
+\endresetglyph
+
+\resetglyph{ffi}
+  \glyph{uniFB03}{1000}
+\endresetglyph
+
+\resetglyph{ffl}
+  \glyph{uniFB04}{1000}
+\endresetglyph
+
+\endmetrics
diff --git a/Master/texmf-dist/source/fonts/droid/droid-fixtextcomp.mtx b/Master/texmf-dist/source/fonts/droid/droid-fixtextcomp.mtx
new file mode 100644
index 00000000000..4c8c07b0752
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/droid/droid-fixtextcomp.mtx
@@ -0,0 +1,36 @@
+%% droid-fixtextcomp.tex
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\relax
+
+\metrics
+
+\resetglyph{asciigravedbl}
+  \glyph{uni030F}{1000}
+\endresetglyph
+
+\resetglyph{lira}
+  \glyph{afii08941}{1000}
+\endresetglyph
+
+\resetglyph{dong}
+  \glyph{uni20AB}{1000}
+\endresetglyph
+
+\resetglyph{numero}
+  \glyph{afii61352}{1000}
+\endresetglyph
+
+\endmetrics
diff --git a/Master/texmf-dist/source/droid/droid-map.tex b/Master/texmf-dist/source/fonts/droid/droid-map.tex
index 7c0909500fc..e1e1ba3f963 100644
--- a/Master/texmf-dist/source/droid/droid-map.tex
+++ b/Master/texmf-dist/source/fonts/droid/droid-map.tex
@@ -1,5 +1,5 @@
 %% droid-map.etx
-%% 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)
@@ -17,10 +17,6 @@
 
 \resetstr{PSfontsuffix}{.pfb}
 
-\foreach(encoding){ot1,t1,ts1,t2a,t2b,t2c,x2,lgr}
-  \etxtoenc{\str{encoding}}{droid-\str{encoding}}
-\endfor(encoding)
-
 \adddriver{dvips}{droid.map}
 \input droid-rec.tex
 \donedrivers
diff --git a/Master/texmf-dist/source/fonts/droid/droidsans-drv.tex b/Master/texmf-dist/source/fonts/droid/droidsans-drv.tex
new file mode 100644
index 00000000000..e0f992295b2
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/droid/droidsans-drv.tex
@@ -0,0 +1,144 @@
+%% droidsans-drv.tex
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\relax
+
+
+\installfonts
+\installfamily{OT1}{fds}{}
+
+\installfont{DroidSans-ot1}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixlatin,newlatin}{ot1}{OT1}{fds}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSans-Slanted-ot1}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixlatin,newlatin}{ot1}{OT1}{fds}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSans-SmallCaps-ot1}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fds}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSans-Slanted-SmallCaps-ot1}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fds}{m}{scsl}{<->\string\droid@scale}
+
+\installfont{DroidSans-Bold-ot1}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixlatin,newlatin}{ot1}{OT1}{fds}{b}{n}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-Slanted-ot1}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixlatin,newlatin}{ot1}{OT1}{fds}{b}{sl}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-SmallCaps-ot1}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fds}{b}{sc}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-Slanted-SmallCaps-ot1}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fds}{b}{scsl}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{T1}{fds}{}
+
+\installfont{DroidSans-t1}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixlatin,newlatin}{t1}{T1}{fds}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSans-Slanted-t1}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixlatin,newlatin}{t1}{T1}{fds}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSans-SmallCaps-t1}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixlatin,newlatin}{t1c}{T1}{fds}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSans-Slanted-SmallCaps-t1}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixlatin,newlatin}{t1c}{T1}{fds}{m}{scsl}{<->\string\droid@scale}
+
+\installfont{DroidSans-Bold-t1}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixlatin,newlatin}{t1}{T1}{fds}{b}{n}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-Slanted-t1}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixlatin,newlatin}{t1}{T1}{fds}{b}{sl}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-SmallCaps-t1}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixlatin,newlatin}{t1c}{T1}{fds}{b}{sc}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-Slanted-SmallCaps-t1}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixlatin,newlatin}{t1c}{T1}{fds}{b}{scsl}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{TS1}{fds}{}
+
+\installfont{DroidSans-ts1}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fds}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSans-Slanted-ts1}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fds}{m}{sl}{<->\string\droid@scale}
+\installfontas{DroidSans-ts1}{TS1}{fds}{m}{sc}{<->\string\droid@scale}
+\installfontas{DroidSans-Slanted-ts1}{TS1}{fds}{m}{scsl}{<->\string\droid@scale}
+
+\installfont{DroidSans-Bold-ts1}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fds}{b}{n}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-Slanted-ts1}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fds}{b}{sl}{<->\string\droid@scale}
+\installfontas{DroidSans-Bold-ts1}{TS1}{fds}{b}{sc}{<->\string\droid@scale}
+\installfontas{DroidSans-Bold-Slanted-ts1}{TS1}{fds}{b}{scsl}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{T2A}{fds}{}
+
+\installfont{DroidSans-t2a}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fds}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSans-Slanted-t2a}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fds}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSans-SmallCaps-t2a}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fds}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSans-Slanted-SmallCaps-t2a}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fds}{m}{scsl}{<->\string\droid@scale}
+
+\installfont{DroidSans-Bold-t2a}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fds}{b}{n}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-Slanted-t2a}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fds}{b}{sl}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-SmallCaps-t2a}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fds}{b}{sc}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-Slanted-SmallCaps-t2a}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fds}{b}{scsl}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{T2B}{fds}{}
+
+\installfont{DroidSans-t2b}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fds}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSans-Slanted-t2b}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fds}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSans-SmallCaps-t2b}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fds}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSans-Slanted-SmallCaps-t2b}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fds}{m}{scsl}{<->\string\droid@scale}
+
+\installfont{DroidSans-Bold-t2b}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fds}{b}{n}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-Slanted-t2b}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fds}{b}{sl}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-SmallCaps-t2b}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fds}{b}{sc}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-Slanted-SmallCaps-t2b}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fds}{b}{scsl}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{T2C}{fds}{}
+
+\installfont{DroidSans-t2c}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fds}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSans-Slanted-t2c}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fds}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSans-SmallCaps-t2c}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fds}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSans-Slanted-SmallCaps-t2c}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fds}{m}{scsl}{<->\string\droid@scale}
+
+\installfont{DroidSans-Bold-t2c}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fds}{b}{n}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-Slanted-t2c}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fds}{b}{sl}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-SmallCaps-t2c}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fds}{b}{sc}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-Slanted-SmallCaps-t2c}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fds}{b}{scsl}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{X2}{fds}{}
+
+\installfont{DroidSans-x2}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fds}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSans-Slanted-x2}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fds}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSans-SmallCaps-x2}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fds}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSans-Slanted-SmallCaps-x2}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fds}{m}{scsl}{<->\string\droid@scale}
+
+\installfont{DroidSans-Bold-x2}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fds}{b}{n}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-Slanted-x2}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fds}{b}{sl}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-SmallCaps-x2}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fds}{b}{sc}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-Slanted-SmallCaps-x2}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fds}{b}{scsl}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{LGR}{fds}{}
+
+\installfont{DroidSans-lgr}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fds}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSans-Slanted-lgr}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fds}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSans-SmallCaps-lgr}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fds}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSans-Slanted-SmallCaps-lgr}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fds}{m}{scsl}{<->\string\droid@scale}
+
+\installfont{DroidSans-Bold-lgr}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fds}{b}{n}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-Slanted-lgr}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fds}{b}{sl}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-SmallCaps-lgr}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fds}{b}{sc}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-Slanted-SmallCaps-lgr}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fds}{b}{scsl}{<->\string\droid@scale}
+
+\endinstallfonts
diff --git a/Master/texmf-dist/source/fonts/droid/droidsansmono-drv.tex b/Master/texmf-dist/source/fonts/droid/droidsansmono-drv.tex
new file mode 100644
index 00000000000..7a8b16f5df3
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/droid/droidsansmono-drv.tex
@@ -0,0 +1,104 @@
+%% droidsansmono-drv.tex
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\relax
+
+
+\installfonts
+\installfamily{OT1}{fdm}{}
+
+\installfont{DroidSansMono-ot1}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdm}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSansMono-Slanted-ot1}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdm}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSansMono-SmallCaps-ot1}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdm}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSansMono-Slanted-SmallCaps-ot1}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdm}{m}{scsl}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{T1}{fdm}{}
+
+\installfont{DroidSansMono-t1}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixlatin,newlatin}{t1}{T1}{fdm}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSansMono-Slanted-t1}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixlatin,newlatin}{t1}{T1}{fdm}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSansMono-SmallCaps-t1}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixlatin,newlatin}{t1c}{T1}{fdm}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSansMono-Slanted-SmallCaps-t1}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixlatin,newlatin}{t1c}{T1}{fdm}{m}{scsl}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{TS1}{fdm}{}
+
+\installfont{DroidSansMono-ts1}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdm}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSansMono-Slanted-ts1}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdm}{m}{sl}{<->\string\droid@scale}
+\installfontas{DroidSansMono-ts1}{TS1}{fdm}{m}{sc}{<->\string\droid@scale}
+\installfontas{DroidSansMono-Slanted-ts1}{TS1}{fdm}{m}{scsl}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{T2A}{fdm}{}
+
+\installfont{DroidSansMono-t2a}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdm}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSansMono-Slanted-t2a}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdm}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSansMono-SmallCaps-t2a}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdm}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSansMono-Slanted-SmallCaps-t2a}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdm}{m}{scsl}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{T2B}{fdm}{}
+
+\installfont{DroidSansMono-t2b}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdm}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSansMono-Slanted-t2b}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdm}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSansMono-SmallCaps-t2b}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdm}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSansMono-Slanted-SmallCaps-t2b}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdm}{m}{scsl}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{T2C}{fdm}{}
+
+\installfont{DroidSansMono-t2c}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdm}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSansMono-Slanted-t2c}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdm}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSansMono-SmallCaps-t2c}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdm}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSansMono-Slanted-SmallCaps-t2c}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdm}{m}{scsl}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{X2}{fdm}{}
+
+\installfont{DroidSansMono-x2}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdm}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSansMono-Slanted-x2}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdm}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSansMono-SmallCaps-x2}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdm}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSansMono-Slanted-SmallCaps-x2}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdm}{m}{scsl}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{LGR}{fdm}{}
+
+\installfont{DroidSansMono-lgr}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdm}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSansMono-Slanted-lgr}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdm}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSansMono-SmallCaps-lgr}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdm}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSansMono-Slanted-SmallCaps-lgr}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdm}{m}{scsl}{<->\string\droid@scale}
+
+\endinstallfonts
diff --git a/Master/texmf-dist/source/fonts/droid/droidserif-drv.tex b/Master/texmf-dist/source/fonts/droid/droidserif-drv.tex
new file mode 100644
index 00000000000..dee3676496e
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/droid/droidserif-drv.tex
@@ -0,0 +1,208 @@
+%% droidserif-drv.tex
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\relax
+
+
+\installfonts
+\installfamily{OT1}{fdr}{}
+
+\installfont{DroidSerif-Regular-ot1}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-ot1}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{m}{it}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-Slanted-ot1}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-Upright-ot1}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{m}{ui}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-SmallCaps-ot1}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-SmallCaps-ot1}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{m}{scit}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-Slanted-SmallCaps-ot1}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-Upright-SmallCaps-ot1}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{m}{scui}{<->\string\droid@scale}
+
+\installfont{DroidSerif-Bold-ot1}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{b}{n}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-ot1}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{b}{it}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-Slanted-ot1}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{b}{sl}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-Upright-ot1}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{b}{ui}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-SmallCaps-ot1}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{b}{sc}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-SmallCaps-ot1}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{b}{scit}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-Slanted-SmallCaps-ot1}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{b}{scsl}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-ot1}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{b}{scui}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{T1}{fdr}{}
+
+\installfont{DroidSerif-Regular-t1}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-t1}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{m}{it}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-Slanted-t1}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-Upright-t1}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{m}{ui}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-SmallCaps-t1}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-SmallCaps-t1}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{m}{scit}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-Slanted-SmallCaps-t1}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-Upright-SmallCaps-t1}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{m}{scui}{<->\string\droid@scale}
+
+\installfont{DroidSerif-Bold-t1}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{b}{n}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-t1}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{b}{it}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-Slanted-t1}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{b}{sl}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-Upright-t1}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{b}{ui}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-SmallCaps-t1}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{b}{sc}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-SmallCaps-t1}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{b}{scit}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-Slanted-SmallCaps-t1}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{b}{scsl}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-t1}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{b}{scui}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{TS1}{fdr}{}
+
+\installfont{DroidSerif-Regular-ts1}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-ts1}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{m}{it}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-Slanted-ts1}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-Upright-ts1}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{m}{ui}{<->\string\droid@scale}
+\installfontas{DroidSerif-Regular-ts1}{TS1}{fdr}{m}{sc}{<->\string\droid@scale}
+\installfontas{DroidSerif-Italic-ts1}{TS1}{fdr}{m}{scit}{<->\string\droid@scale}
+\installfontas{DroidSerif-Regular-Slanted-ts1}{TS1}{fdr}{m}{scsl}{<->\string\droid@scale}
+\installfontas{DroidSerif-Italic-Upright-ts1}{TS1}{fdr}{m}{scui}{<->\string\droid@scale}
+
+\installfont{DroidSerif-Bold-ts1}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{b}{n}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-ts1}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{b}{it}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-Slanted-ts1}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{b}{sl}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-Upright-ts1}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{b}{ui}{<->\string\droid@scale}
+\installfontas{DroidSerif-Bold-ts1}{TS1}{fdr}{b}{sc}{<->\string\droid@scale}
+\installfontas{DroidSerif-BoldItalic-ts1}{TS1}{fdr}{b}{scit}{<->\string\droid@scale}
+\installfontas{DroidSerif-Bold-Slanted-ts1}{TS1}{fdr}{b}{scsl}{<->\string\droid@scale}
+\installfontas{DroidSerif-BoldItalic-Upright-ts1}{TS1}{fdr}{b}{scui}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{T2A}{fdr}{}
+
+\installfont{DroidSerif-Regular-t2a}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-t2a}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{m}{it}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-Slanted-t2a}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-Upright-t2a}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{m}{ui}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-SmallCaps-t2a}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-SmallCaps-t2a}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{m}{scit}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-Slanted-SmallCaps-t2a}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-Upright-SmallCaps-t2a}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{m}{scui}{<->\string\droid@scale}
+
+\installfont{DroidSerif-Bold-t2a}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{b}{n}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-t2a}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{b}{it}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-Slanted-t2a}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{b}{sl}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-Upright-t2a}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{b}{ui}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-SmallCaps-t2a}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{b}{sc}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-SmallCaps-t2a}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{b}{scit}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-Slanted-SmallCaps-t2a}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{b}{scsl}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-t2a}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{b}{scui}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{T2B}{fdr}{}
+
+\installfont{DroidSerif-Regular-t2b}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-t2b}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{m}{it}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-Slanted-t2b}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-Upright-t2b}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{m}{ui}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-SmallCaps-t2b}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-SmallCaps-t2b}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{m}{scit}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-Slanted-SmallCaps-t2b}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-Upright-SmallCaps-t2b}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{m}{scui}{<->\string\droid@scale}
+
+\installfont{DroidSerif-Bold-t2b}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{b}{n}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-t2b}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{b}{it}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-Slanted-t2b}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{b}{sl}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-Upright-t2b}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{b}{ui}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-SmallCaps-t2b}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{b}{sc}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-SmallCaps-t2b}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{b}{scit}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-Slanted-SmallCaps-t2b}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{b}{scsl}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-t2b}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{b}{scui}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{T2C}{fdr}{}
+
+\installfont{DroidSerif-Regular-t2c}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-t2c}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{m}{it}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-Slanted-t2c}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-Upright-t2c}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{m}{ui}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-SmallCaps-t2c}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-SmallCaps-t2c}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{m}{scit}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-Slanted-SmallCaps-t2c}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-Upright-SmallCaps-t2c}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{m}{scui}{<->\string\droid@scale}
+
+\installfont{DroidSerif-Bold-t2c}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{b}{n}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-t2c}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{b}{it}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-Slanted-t2c}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{b}{sl}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-Upright-t2c}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{b}{ui}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-SmallCaps-t2c}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{b}{sc}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-SmallCaps-t2c}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{b}{scit}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-Slanted-SmallCaps-t2c}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{b}{scsl}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-t2c}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{b}{scui}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{X2}{fdr}{}
+
+\installfont{DroidSerif-Regular-x2}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-x2}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{m}{it}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-Slanted-x2}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-Upright-x2}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{m}{ui}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-SmallCaps-x2}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-SmallCaps-x2}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{m}{scit}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-Slanted-SmallCaps-x2}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-Upright-SmallCaps-x2}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{m}{scui}{<->\string\droid@scale}
+
+\installfont{DroidSerif-Bold-x2}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{b}{n}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-x2}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{b}{it}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-Slanted-x2}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{b}{sl}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-Upright-x2}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{b}{ui}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-SmallCaps-x2}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{b}{sc}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-SmallCaps-x2}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{b}{scit}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-Slanted-SmallCaps-x2}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{b}{scsl}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-x2}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{b}{scui}{<->\string\droid@scale}
+
+\endinstallfonts
+
+
+\installfonts
+\installfamily{LGR}{fdr}{}
+
+\installfont{DroidSerif-Regular-lgr}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{m}{n}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-lgr}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{m}{it}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-Slanted-lgr}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{m}{sl}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-Upright-lgr}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{m}{ui}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-SmallCaps-lgr}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{m}{sc}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-SmallCaps-lgr}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{m}{scit}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-Slanted-SmallCaps-lgr}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSerif-Italic-Upright-SmallCaps-lgr}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{m}{scui}{<->\string\droid@scale}
+
+\installfont{DroidSerif-Bold-lgr}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{b}{n}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-lgr}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{b}{it}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-Slanted-lgr}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{b}{sl}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-Upright-lgr}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{b}{ui}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-SmallCaps-lgr}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{b}{sc}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-SmallCaps-lgr}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{b}{scit}{<->\string\droid@scale}
+\installfont{DroidSerif-Bold-Slanted-SmallCaps-lgr}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{b}{scsl}{<->\string\droid@scale}
+\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-lgr}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{b}{scui}{<->\string\droid@scale}
+
+\endinstallfonts
diff --git a/Master/texmf-dist/source/droid/ttf2type1.pe b/Master/texmf-dist/source/fonts/droid/ttf2type1.pe
index 0719858b891..0719858b891 100644
--- a/Master/texmf-dist/source/droid/ttf2type1.pe
+++ b/Master/texmf-dist/source/fonts/droid/ttf2type1.pe
author	Karl Berry <karl@freefriends.org>	2011-08-26 22:20:49 +0000
committer	Karl Berry <karl@freefriends.org>	2011-08-26 22:20:49 +0000
commit	13c0a602069e9bf1dc330dd271d95d11ec60e621 (patch)
tree	cd797af95b63c7d2176ee3f7b3f23037c464e35c /Master/texmf-dist/source
parent	48dd773c890f2b8a9b6cc6508f88eaef6e7bcb27 (diff)