droid (8may11)

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

90 files changed, 1203 insertions, 704 deletions

diff --git a/Master/texmf-dist/doc/fonts/droid/CHANGES b/Master/texmf-dist/doc/fonts/droid/CHANGES
index 2580c6050db..b585d73a7fc 100644
--- a/Master/texmf-dist/doc/fonts/droid/CHANGES
+++ b/Master/texmf-dist/doc/fonts/droid/CHANGES
@@ -3,3 +3,8 @@ Changelog for version 1.1:
 
 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/doc/fonts/droid/README b/Master/texmf-dist/doc/fonts/droid/README
index cdc6a2c9df8..aea1e529c03 100644
--- a/Master/texmf-dist/doc/fonts/droid/README
+++ b/Master/texmf-dist/doc/fonts/droid/README
@@ -1,5 +1,5 @@
 --------------------
- Droid, version 1.2
+ Droid, version 1.3
 --------------------
 
 The Droid typeface family was designed in the fall of 2006 by Ascender's Steve
diff --git a/Master/texmf-dist/doc/fonts/droid/droid.pdf b/Master/texmf-dist/doc/fonts/droid/droid.pdf
index 54ba268fd16..f56e4f18bff 100644
--- a/Master/texmf-dist/doc/fonts/droid/droid.pdf
+++ b/Master/texmf-dist/doc/fonts/droid/droid.pdf
diff --git a/Master/texmf-dist/doc/fonts/droid/droid.tex b/Master/texmf-dist/doc/fonts/droid/droid.tex
index 4c178595eaa..6bdfe019021 100644
--- a/Master/texmf-dist/doc/fonts/droid/droid.tex
+++ b/Master/texmf-dist/doc/fonts/droid/droid.tex
@@ -39,7 +39,7 @@
 \newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
 \newcommand{\program}{}
 
-\title{\LaTeX{} support for Droid\\\relsize{-1}Version~1.2}
+\title{\LaTeX{} support for Droid\\\relsize{-1}Version~1.3}
 
 \author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
 
@@ -148,12 +148,12 @@ Finally, to set Droid Sans Mono as the default typewriter font:
 
 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{scaled=\parameter{ratio}} will
-scale the font according to \parameter{ratio} (1.0 by default), for example:
+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[scaled=0.95]{droidserif}
-\usepackage[scaled=0.95]{droidsans}
-\usepackage[scaled=0.95]{droidmono}
+\usepackage[scale=0.95]{droidserif}
+\usepackage[scale=0.95]{droidsans}
+\usepackage[scale=0.95]{droidmono}
 \end{verbatim}
 
 \subsection{Encodings}
@@ -184,7 +184,7 @@ treated poorly, if at all. Note difference in kerning between e.g.
     \toprule
     OT1-encoded&{\fdsfamily To Ta Té}\\
     \midrule
-    T1-encoded&{\fontencoding{T1}\selectfont\fdsfamily To Ta Té}\\
+    T1-encoded&{\fdsfamily\fontencoding{T1}\selectfont To Ta Té}\\
     \bottomrule
   \end{tabular}
 \end{center}
@@ -201,7 +201,7 @@ substitutions.
     \toprule
     family&encoding&series&shape\\
     \midrule
-    \fdrfamily\multirow{4}{*}{fdr}&OT1, T1,&\multirow{3}{*}{m, b (bx)}&\multirow{2}{*}{n, it, sl, up}\\
+    \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}
diff --git a/Master/texmf-dist/doc/fonts/droid/droidsans-samples.pdf b/Master/texmf-dist/doc/fonts/droid/droidsans-samples.pdf
new file mode 100644
index 00000000000..c72b1ab6702
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/droid/droidsans-samples.pdf
diff --git a/Master/texmf-dist/doc/fonts/droid/droidsans-samples.tex b/Master/texmf-dist/doc/fonts/droid/droidsans-samples.tex
new file mode 100644
index 00000000000..7e71f890ea0
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/droid/droidsans-samples.tex
@@ -0,0 +1,79 @@
+%% 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/doc/fonts/droid/droidsansmono-samples.pdf b/Master/texmf-dist/doc/fonts/droid/droidsansmono-samples.pdf
new file mode 100644
index 00000000000..7378988fb26
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/droid/droidsansmono-samples.pdf
diff --git a/Master/texmf-dist/doc/fonts/droid/droidsansmono-samples.tex b/Master/texmf-dist/doc/fonts/droid/droidsansmono-samples.tex
new file mode 100644
index 00000000000..4818bc283a3
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/droid/droidsansmono-samples.tex
@@ -0,0 +1,69 @@
+%% 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/doc/fonts/droid/droidserif-samples.pdf b/Master/texmf-dist/doc/fonts/droid/droidserif-samples.pdf
new file mode 100644
index 00000000000..cef74da4b9d
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/droid/droidserif-samples.pdf
diff --git a/Master/texmf-dist/doc/fonts/droid/droidserif-samples.tex b/Master/texmf-dist/doc/fonts/droid/droidserif-samples.tex
new file mode 100644
index 00000000000..9de7b897972
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/droid/droidserif-samples.tex
@@ -0,0 +1,91 @@
+%% 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/doc/fonts/droid/manifest.txt b/Master/texmf-dist/doc/fonts/droid/manifest.txt
index 03c013a6b4e..3afb3632e7b 100644
--- a/Master/texmf-dist/doc/fonts/droid/manifest.txt
+++ b/Master/texmf-dist/doc/fonts/droid/manifest.txt
@@ -1,669 +1,681 @@
-./manifest.txt
-./source/droid/droid-drv.tex
-./source/droid/ttf2type1.pe
-./source/droid/droid-fixlatin.etx
-./source/droid/droid-reglyph.tex
-./source/droid/droid-fixtextcomp.etx
-./source/droid/droid-fixgreek.etx
-./source/droid/droid-map.tex
-./source/droid/droid-fixcyrillic.etx
-./source/droid/droid.pdf
-./source/droid/droid.tex
-./source/droid/Makefile
-./source/droid/CHANGES
-./source/droid/README
-./fonts/type1/public/droid/DroidSerif-Italic.pfb
+./fonts/truetype/public/droid/DroidSans-Bold.ttf
+./fonts/truetype/public/droid/DroidSerif-Italic.ttf
+./fonts/truetype/public/droid/DroidSerif-Regular.ttf
+./fonts/truetype/public/droid/DroidSans.ttf
+./fonts/truetype/public/droid/DroidSansMono.ttf
+./fonts/truetype/public/droid/DroidSerif-BoldItalic.ttf
+./fonts/truetype/public/droid/DroidSerif-Bold.ttf
+./fonts/type1/public/droid/DroidSans-Bold.pfb
+./fonts/type1/public/droid/DroidSerif-BoldItalic.pfb
 ./fonts/type1/public/droid/DroidSans.pfb
+./fonts/type1/public/droid/DroidSerif-Italic.pfb
 ./fonts/type1/public/droid/DroidSerif-Bold.pfb
-./fonts/type1/public/droid/DroidSansMono.pfb
-./fonts/type1/public/droid/DroidSans-Bold.pfb
 ./fonts/type1/public/droid/DroidSerif-Regular.pfb
-./fonts/type1/public/droid/DroidSerif-BoldItalic.pfb
-./fonts/tfm/public/droid/t2a-DroidSerif-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-t2c-DroidSerif-Regular-Slanted.tfm
-./fonts/tfm/public/droid/t2c-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/t2b-DroidSerif-Italic-SmallCaps.tfm
-./fonts/tfm/public/droid/lgr-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/raw-lgr-DroidSans-Slanted.tfm
+./fonts/type1/public/droid/DroidSansMono.pfb
+./fonts/vf/public/droid/t2b-DroidSerif-Bold-SmallCaps.vf
+./fonts/vf/public/droid/t2a-DroidSans-Bold.vf
+./fonts/vf/public/droid/lgr-DroidSans-Bold.vf
+./fonts/vf/public/droid/ot1-DroidSans-SmallCaps.vf
+./fonts/vf/public/droid/t2c-DroidSansMono.vf
+./fonts/vf/public/droid/t2b-DroidSerif-Italic-SmallCaps.vf
+./fonts/vf/public/droid/t1-DroidSans-Slanted.vf
+./fonts/vf/public/droid/t2b-DroidSerif-BoldItalic.vf
+./fonts/vf/public/droid/t2a-DroidSerif-Italic.vf
+./fonts/vf/public/droid/x2-DroidSerif-BoldItalic-SmallCaps.vf
+./fonts/vf/public/droid/t2a-DroidSerif-BoldItalic-Upright.vf
+./fonts/vf/public/droid/ot1-DroidSans-Bold-Slanted.vf
+./fonts/vf/public/droid/ot1-DroidSerif-Bold-Slanted.vf
+./fonts/vf/public/droid/t2a-DroidSans-Bold-Slanted.vf
+./fonts/vf/public/droid/ts1-DroidSerif-Bold-Slanted.vf
+./fonts/vf/public/droid/t2a-DroidSerif-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/lgr-DroidSerif-Italic-SmallCaps.vf
+./fonts/vf/public/droid/t2a-DroidSans.vf
+./fonts/vf/public/droid/t1-DroidSerif-Bold-Slanted.vf
+./fonts/vf/public/droid/ts1-DroidSerif-BoldItalic.vf
+./fonts/vf/public/droid/lgr-DroidSans-Slanted.vf
+./fonts/vf/public/droid/t2b-DroidSerif-Regular-Slanted.vf
+./fonts/vf/public/droid/lgr-DroidSerif-Bold-SmallCaps.vf
+./fonts/vf/public/droid/t1-DroidSerif-Regular-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/t2b-DroidSerif-Italic.vf
+./fonts/vf/public/droid/t1-DroidSerif-BoldItalic-Upright.vf
+./fonts/vf/public/droid/t1-DroidSerif-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/t1-DroidSans-SmallCaps.vf
+./fonts/vf/public/droid/x2-DroidSansMono-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/t1-DroidSans-Bold-SmallCaps.vf
+./fonts/vf/public/droid/t2b-DroidSans-Slanted.vf
+./fonts/vf/public/droid/lgr-DroidSansMono-Slanted.vf
+./fonts/vf/public/droid/t2c-DroidSerif-Italic.vf
+./fonts/vf/public/droid/t2b-DroidSansMono-SmallCaps.vf
+./fonts/vf/public/droid/t2a-DroidSansMono-SmallCaps.vf
+./fonts/vf/public/droid/ot1-DroidSansMono.vf
+./fonts/vf/public/droid/x2-DroidSansMono-Slanted.vf
+./fonts/vf/public/droid/ot1-DroidSerif-Italic-SmallCaps.vf
+./fonts/vf/public/droid/t1-DroidSerif-Regular.vf
+./fonts/vf/public/droid/ot1-DroidSerif-BoldItalic-SmallCaps.vf
+./fonts/vf/public/droid/t1-DroidSansMono-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/ot1-DroidSerif-Regular-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/ot1-DroidSansMono-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/t2c-DroidSans-Bold.vf
+./fonts/vf/public/droid/lgr-DroidSerif-Regular-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/x2-DroidSerif-Regular.vf
+./fonts/vf/public/droid/t2c-DroidSerif-Bold-SmallCaps.vf
+./fonts/vf/public/droid/t1-DroidSerif-Regular-SmallCaps.vf
+./fonts/vf/public/droid/t2b-DroidSerif-Italic-Upright.vf
+./fonts/vf/public/droid/x2-DroidSansMono-SmallCaps.vf
+./fonts/vf/public/droid/lgr-DroidSans-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/t2b-DroidSans-SmallCaps.vf
+./fonts/vf/public/droid/t2b-DroidSerif-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/t2b-DroidSerif-Regular-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/t2a-DroidSans-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/x2-DroidSans-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/x2-DroidSerif-BoldItalic.vf
+./fonts/vf/public/droid/t2c-DroidSerif-Bold.vf
+./fonts/vf/public/droid/t2a-DroidSans-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/ot1-DroidSerif-BoldItalic-Upright-SmallCaps.vf
+./fonts/vf/public/droid/lgr-DroidSerif-BoldItalic-Upright.vf
+./fonts/vf/public/droid/t2c-DroidSans-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/t2c-DroidSerif-Regular-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/ot1-DroidSerif-Regular-Slanted.vf
+./fonts/vf/public/droid/t2a-DroidSerif-BoldItalic.vf
+./fonts/vf/public/droid/t1-DroidSansMono-SmallCaps.vf
+./fonts/vf/public/droid/lgr-DroidSans-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/ot1-DroidSerif-Italic-Upright.vf
+./fonts/vf/public/droid/ts1-DroidSans-Bold-Slanted.vf
+./fonts/vf/public/droid/ts1-DroidSerif-Italic.vf
+./fonts/vf/public/droid/t2a-DroidSansMono-Slanted.vf
+./fonts/vf/public/droid/lgr-DroidSerif-Bold.vf
+./fonts/vf/public/droid/ts1-DroidSerif-Regular-Slanted.vf
+./fonts/vf/public/droid/ot1-DroidSans-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/ot1-DroidSansMono-Slanted.vf
+./fonts/vf/public/droid/t2b-DroidSans-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/t2a-DroidSerif-BoldItalic-Upright-SmallCaps.vf
+./fonts/vf/public/droid/ot1-DroidSans.vf
+./fonts/vf/public/droid/t1-DroidSerif-BoldItalic-SmallCaps.vf
+./fonts/vf/public/droid/t2b-DroidSerif-Bold.vf
+./fonts/vf/public/droid/x2-DroidSerif-Bold-Slanted.vf
+./fonts/vf/public/droid/lgr-DroidSerif-BoldItalic-SmallCaps.vf
+./fonts/vf/public/droid/t2b-DroidSerif-Italic-Upright-SmallCaps.vf
+./fonts/vf/public/droid/ts1-DroidSerif-Regular.vf
+./fonts/vf/public/droid/t1-DroidSerif-BoldItalic.vf
+./fonts/vf/public/droid/x2-DroidSans-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/ot1-DroidSerif-BoldItalic-Upright.vf
+./fonts/vf/public/droid/x2-DroidSerif-BoldItalic-Upright-SmallCaps.vf
+./fonts/vf/public/droid/ts1-DroidSansMono.vf
+./fonts/vf/public/droid/t2a-DroidSerif-Regular-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/lgr-DroidSans-Bold-Slanted.vf
+./fonts/vf/public/droid/x2-DroidSerif-Regular-Slanted.vf
+./fonts/vf/public/droid/x2-DroidSerif-Bold.vf
+./fonts/vf/public/droid/lgr-DroidSans-Bold-SmallCaps.vf
+./fonts/vf/public/droid/x2-DroidSansMono.vf
+./fonts/vf/public/droid/t2c-DroidSerif-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/x2-DroidSerif-Italic.vf
+./fonts/vf/public/droid/ot1-DroidSerif-Bold.vf
+./fonts/vf/public/droid/t2c-DroidSans-Bold-Slanted.vf
+./fonts/vf/public/droid/t1-DroidSans-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/x2-DroidSans-Slanted.vf
+./fonts/vf/public/droid/t2a-DroidSerif-Bold-SmallCaps.vf
+./fonts/vf/public/droid/lgr-DroidSerif-Regular-Slanted.vf
+./fonts/vf/public/droid/t2a-DroidSerif-Italic-SmallCaps.vf
+./fonts/vf/public/droid/lgr-DroidSerif-Bold-Slanted.vf
+./fonts/vf/public/droid/x2-DroidSerif-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/lgr-DroidSerif-Regular.vf
+./fonts/vf/public/droid/t2c-DroidSansMono-SmallCaps.vf
+./fonts/vf/public/droid/ot1-DroidSans-Bold-SmallCaps.vf
+./fonts/vf/public/droid/x2-DroidSerif-Italic-SmallCaps.vf
+./fonts/vf/public/droid/x2-DroidSans-Bold.vf
+./fonts/vf/public/droid/t2b-DroidSansMono-Slanted.vf
+./fonts/vf/public/droid/t2b-DroidSerif-Bold-Slanted.vf
+./fonts/vf/public/droid/t2b-DroidSerif-BoldItalic-SmallCaps.vf
+./fonts/vf/public/droid/t1-DroidSerif-Italic.vf
+./fonts/vf/public/droid/t2b-DroidSerif-Regular-SmallCaps.vf
+./fonts/vf/public/droid/x2-DroidSans-Bold-SmallCaps.vf
+./fonts/vf/public/droid/ot1-DroidSerif-Regular.vf
+./fonts/vf/public/droid/x2-DroidSerif-Regular-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/t2a-DroidSerif-Regular-Slanted.vf
+./fonts/vf/public/droid/t1-DroidSans-Bold-Slanted.vf
+./fonts/vf/public/droid/t1-DroidSerif-Bold-SmallCaps.vf
+./fonts/vf/public/droid/t2a-DroidSerif-Italic-Upright-SmallCaps.vf
+./fonts/vf/public/droid/t1-DroidSerif-Bold.vf
+./fonts/vf/public/droid/t2b-DroidSansMono-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/t1-DroidSerif-Regular-Slanted.vf
+./fonts/vf/public/droid/t1-DroidSerif-Italic-SmallCaps.vf
+./fonts/vf/public/droid/t2a-DroidSerif-Regular-SmallCaps.vf
+./fonts/vf/public/droid/t1-DroidSerif-Italic-Upright.vf
+./fonts/vf/public/droid/t2a-DroidSans-SmallCaps.vf
+./fonts/vf/public/droid/t2b-DroidSans-Bold.vf
+./fonts/vf/public/droid/t2c-DroidSansMono-Slanted.vf
+./fonts/vf/public/droid/lgr-DroidSans.vf
+./fonts/vf/public/droid/t2a-DroidSans-Bold-SmallCaps.vf
+./fonts/vf/public/droid/lgr-DroidSerif-Italic-Upright-SmallCaps.vf
+./fonts/vf/public/droid/lgr-DroidSansMono-SmallCaps.vf
+./fonts/vf/public/droid/x2-DroidSerif-Italic-Upright-SmallCaps.vf
+./fonts/vf/public/droid/lgr-DroidSerif-Italic.vf
+./fonts/vf/public/droid/t2c-DroidSerif-BoldItalic-SmallCaps.vf
+./fonts/vf/public/droid/ot1-DroidSerif-BoldItalic.vf
+./fonts/vf/public/droid/t1-DroidSerif-Italic-Upright-SmallCaps.vf
+./fonts/vf/public/droid/ts1-DroidSansMono-Slanted.vf
+./fonts/vf/public/droid/x2-DroidSans.vf
+./fonts/vf/public/droid/t2c-DroidSans.vf
+./fonts/vf/public/droid/t2b-DroidSansMono.vf
+./fonts/vf/public/droid/t2a-DroidSerif-BoldItalic-SmallCaps.vf
+./fonts/vf/public/droid/lgr-DroidSans-SmallCaps.vf
+./fonts/vf/public/droid/lgr-DroidSerif-BoldItalic.vf
+./fonts/vf/public/droid/t1-DroidSans-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/t2c-DroidSerif-Regular-SmallCaps.vf
+./fonts/vf/public/droid/ts1-DroidSans-Slanted.vf
+./fonts/vf/public/droid/t2c-DroidSans-Slanted.vf
+./fonts/vf/public/droid/ts1-DroidSerif-BoldItalic-Upright.vf
+./fonts/vf/public/droid/t2c-DroidSerif-BoldItalic-Upright.vf
+./fonts/vf/public/droid/t2a-DroidSerif-Bold.vf
+./fonts/vf/public/droid/ot1-DroidSansMono-SmallCaps.vf
+./fonts/vf/public/droid/lgr-DroidSerif-Regular-SmallCaps.vf
+./fonts/vf/public/droid/lgr-DroidSansMono.vf
+./fonts/vf/public/droid/t2c-DroidSans-SmallCaps.vf
+./fonts/vf/public/droid/x2-DroidSans-SmallCaps.vf
+./fonts/vf/public/droid/t1-DroidSans.vf
+./fonts/vf/public/droid/x2-DroidSerif-BoldItalic-Upright.vf
+./fonts/vf/public/droid/ts1-DroidSans.vf
+./fonts/vf/public/droid/t2c-DroidSerif-Regular-Slanted.vf
+./fonts/vf/public/droid/t2c-DroidSerif-Bold-Slanted.vf
+./fonts/vf/public/droid/lgr-DroidSansMono-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/ot1-DroidSerif-Italic-Upright-SmallCaps.vf
+./fonts/vf/public/droid/t2b-DroidSerif-BoldItalic-Upright.vf
+./fonts/vf/public/droid/t2a-DroidSansMono.vf
+./fonts/vf/public/droid/ot1-DroidSerif-Italic.vf
+./fonts/vf/public/droid/ot1-DroidSans-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/ot1-DroidSerif-Regular-SmallCaps.vf
+./fonts/vf/public/droid/t1-DroidSansMono.vf
+./fonts/vf/public/droid/ot1-DroidSerif-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/t2c-DroidSansMono-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/x2-DroidSerif-Regular-SmallCaps.vf
+./fonts/vf/public/droid/t2c-DroidSerif-Italic-SmallCaps.vf
+./fonts/vf/public/droid/t2b-DroidSans-Bold-Slanted.vf
+./fonts/vf/public/droid/ot1-DroidSans-Slanted.vf
+./fonts/vf/public/droid/lgr-DroidSerif-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/t2a-DroidSansMono-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/t2a-DroidSerif-Italic-Upright.vf
+./fonts/vf/public/droid/lgr-DroidSerif-BoldItalic-Upright-SmallCaps.vf
+./fonts/vf/public/droid/t1-DroidSerif-BoldItalic-Upright-SmallCaps.vf
+./fonts/vf/public/droid/ot1-DroidSerif-Bold-SmallCaps.vf
+./fonts/vf/public/droid/ts1-DroidSans-Bold.vf
+./fonts/vf/public/droid/ts1-DroidSerif-Bold.vf
+./fonts/vf/public/droid/t2a-DroidSerif-Regular.vf
+./fonts/vf/public/droid/lgr-DroidSerif-Italic-Upright.vf
+./fonts/vf/public/droid/t1-DroidSansMono-Slanted.vf
+./fonts/vf/public/droid/t2b-DroidSans.vf
+./fonts/vf/public/droid/t2c-DroidSans-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/t2b-DroidSans-Slanted-SmallCaps.vf
+./fonts/vf/public/droid/t2c-DroidSerif-Italic-Upright.vf
+./fonts/vf/public/droid/x2-DroidSerif-Italic-Upright.vf
+./fonts/vf/public/droid/ot1-DroidSans-Bold.vf
+./fonts/vf/public/droid/t2a-DroidSans-Slanted.vf
+./fonts/vf/public/droid/t2b-DroidSans-Bold-SmallCaps.vf
+./fonts/vf/public/droid/t2c-DroidSerif-Italic-Upright-SmallCaps.vf
+./fonts/vf/public/droid/t2b-DroidSerif-Regular.vf
+./fonts/vf/public/droid/t2c-DroidSans-Bold-SmallCaps.vf
+./fonts/vf/public/droid/t2c-DroidSerif-BoldItalic-Upright-SmallCaps.vf
+./fonts/vf/public/droid/t1-DroidSans-Bold.vf
+./fonts/vf/public/droid/t2c-DroidSerif-BoldItalic.vf
+./fonts/vf/public/droid/x2-DroidSerif-Bold-SmallCaps.vf
+./fonts/vf/public/droid/ts1-DroidSerif-Italic-Upright.vf
+./fonts/vf/public/droid/t2a-DroidSerif-Bold-Slanted.vf
+./fonts/vf/public/droid/t2c-DroidSerif-Regular.vf
+./fonts/vf/public/droid/x2-DroidSans-Bold-Slanted.vf
+./fonts/vf/public/droid/t2b-DroidSerif-BoldItalic-Upright-SmallCaps.vf
+./fonts/map/dvips/droid/droid.map
+./fonts/enc/dvips/droid/droid-t2c.enc
+./fonts/enc/dvips/droid/droid-lgr.enc
+./fonts/enc/dvips/droid/droid-fixgreek.enc
+./fonts/enc/dvips/droid/droid-t2a.enc
+./fonts/enc/dvips/droid/droid-x2.enc
+./fonts/enc/dvips/droid/droid-fixlatin.enc
+./fonts/enc/dvips/droid/droid-ts1.enc
+./fonts/enc/dvips/droid/droid-t2b.enc
+./fonts/enc/dvips/droid/droid-t1.enc
+./fonts/enc/dvips/droid/droid-fixtextcomp.enc
+./fonts/enc/dvips/droid/droid-fixcyrillic.enc
+./fonts/enc/dvips/droid/droid-ot1.enc
+./fonts/tfm/public/droid/raw-ot1-DroidSans.tfm
+./fonts/tfm/public/droid/raw-x2-DroidSerif-Italic.tfm
+./fonts/tfm/public/droid/raw-t2a-DroidSans-Bold-Slanted.tfm
+./fonts/tfm/public/droid/t2a-DroidSerif-Regular-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/t2a-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/lgr-DroidSerif-Italic-Upright-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-t2c-DroidSerif-Italic-Upright.tfm
+./fonts/tfm/public/droid/t2a-DroidSans-Bold-Slanted.tfm
+./fonts/tfm/public/droid/raw-t2b-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/raw-fixcyrillic-DroidSerif-Bold.tfm
+./fonts/tfm/public/droid/t2c-DroidSerif-Italic-Upright.tfm
+./fonts/tfm/public/droid/raw-x2-DroidSerif-Regular-Slanted.tfm
 ./fonts/tfm/public/droid/t2b-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/raw-ot1-DroidSerif-BoldItalic-Upright.tfm
-./fonts/tfm/public/droid/raw-fixtextcomp-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/x2-DroidSans-Slanted.tfm
-./fonts/tfm/public/droid/raw-fixgreek-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/x2-DroidSansMono-SmallCaps.tfm
-./fonts/tfm/public/droid/lgr-DroidSans-Bold-Slanted.tfm
-./fonts/tfm/public/droid/raw-fixlatin-DroidSans-Bold-Slanted.tfm
-./fonts/tfm/public/droid/raw-t1-DroidSerif-Italic-Upright.tfm
-./fonts/tfm/public/droid/t2a-DroidSansMono-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/t2a-DroidSerif-Bold.tfm
-./fonts/tfm/public/droid/lgr-DroidSansMono.tfm
-./fonts/tfm/public/droid/t2b-DroidSerif-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/t2b-DroidSansMono-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-t2a-DroidSerif-BoldItalic-Upright.tfm
-./fonts/tfm/public/droid/x2-DroidSans.tfm
-./fonts/tfm/public/droid/raw-fixtextcomp-DroidSans-Slanted.tfm
-./fonts/tfm/public/droid/t2c-DroidSerif-Italic-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-t2c-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/x2-DroidSerif-Italic-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-fixtextcomp-DroidSerif-Bold.tfm
-./fonts/tfm/public/droid/t1-DroidSans-Bold-Slanted.tfm
-./fonts/tfm/public/droid/raw-t2c-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/raw-fixlatin-DroidSans-Slanted.tfm
+./fonts/tfm/public/droid/raw-fixcyrillic-DroidSans-Bold.tfm
+./fonts/tfm/public/droid/raw-fixtextcomp-DroidSans-Bold-Slanted.tfm
+./fonts/tfm/public/droid/raw-t2a-DroidSerif-Bold.tfm
+./fonts/tfm/public/droid/raw-fixlatin-DroidSans-Bold.tfm
+./fonts/tfm/public/droid/t2b-DroidSerif-Regular-SmallCaps.tfm
+./fonts/tfm/public/droid/ot1-DroidSerif-Italic-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-fixcyrillic-DroidSerif-Regular-Slanted.tfm
+./fonts/tfm/public/droid/t2c-DroidSans-Bold-SmallCaps.tfm
 ./fonts/tfm/public/droid/raw-fixlatin-DroidSerif-Bold.tfm
-./fonts/tfm/public/droid/raw-t2b-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/raw-ot1-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/raw-fixlatin-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/t2b-DroidSerif-Bold-SmallCaps.tfm
-./fonts/tfm/public/droid/x2-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/ot1-DroidSerif-BoldItalic-Upright-SmallCaps.tfm
-./fonts/tfm/public/droid/t2c-DroidSans-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-t1-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/t2a-DroidSerif-Bold-SmallCaps.tfm
-./fonts/tfm/public/droid/t1-DroidSerif-BoldItalic-Upright-SmallCaps.tfm
-./fonts/tfm/public/droid/t2a-DroidSansMono-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-t2a-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/lgr-DroidSans-SmallCaps.tfm
-./fonts/tfm/public/droid/ot1-DroidSans-Bold-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-t2b-DroidSans-Bold-Slanted.tfm
-./fonts/tfm/public/droid/ts1-DroidSansMono-Slanted.tfm
-./fonts/tfm/public/droid/raw-fixlatin-DroidSerif-BoldItalic.tfm
-./fonts/tfm/public/droid/x2-DroidSans-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/ot1-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/raw-t2b-DroidSans.tfm
-./fonts/tfm/public/droid/t2c-DroidSans.tfm
-./fonts/tfm/public/droid/ot1-DroidSansMono-Slanted.tfm
-./fonts/tfm/public/droid/x2-DroidSansMono-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/t1-DroidSans-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/ot1-DroidSerif-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/t2b-DroidSans-Bold-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-ts1-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/t2c-DroidSerif-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-fixtextcomp-DroidSerif-BoldItalic.tfm
-./fonts/tfm/public/droid/t2b-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/lgr-DroidSerif-Italic-Upright.tfm
-./fonts/tfm/public/droid/t2c-DroidSerif-BoldItalic-Upright-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-fixtextcomp-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/x2-DroidSans-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/ts1-DroidSerif-BoldItalic.tfm
-./fonts/tfm/public/droid/raw-lgr-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/t1-DroidSansMono-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/lgr-DroidSerif-Italic-Upright-SmallCaps.tfm
-./fonts/tfm/public/droid/ot1-DroidSerif-Regular-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-t2b-DroidSerif-Regular-Slanted.tfm
-./fonts/tfm/public/droid/raw-fixgreek-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/raw-ot1-DroidSerif-Italic-Upright.tfm
 ./fonts/tfm/public/droid/raw-lgr-DroidSans.tfm
-./fonts/tfm/public/droid/ts1-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/t2c-DroidSerif-Bold-SmallCaps.tfm
-./fonts/tfm/public/droid/t2b-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/t2a-DroidSans-Bold-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-x2-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/raw-t2c-DroidSansMono.tfm
-./fonts/tfm/public/droid/t2b-DroidSerif-Bold.tfm
-./fonts/tfm/public/droid/t1-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/t2a-DroidSerif-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/x2-DroidSerif-Regular-SmallCaps.tfm
-./fonts/tfm/public/droid/t2b-DroidSerif-BoldItalic-Upright-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-fixcyrillic-DroidSerif-BoldItalic-Upright.tfm
-./fonts/tfm/public/droid/raw-x2-DroidSerif-Italic-Upright.tfm
-./fonts/tfm/public/droid/raw-fixgreek-DroidSansMono-Slanted.tfm
-./fonts/tfm/public/droid/ot1-DroidSerif-Italic-Upright-SmallCaps.tfm
-./fonts/tfm/public/droid/lgr-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/raw-ot1-DroidSans-Slanted.tfm
-./fonts/tfm/public/droid/raw-x2-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/x2-DroidSerif-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/x2-DroidSerif-BoldItalic.tfm
-./fonts/tfm/public/droid/x2-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/raw-ot1-DroidSans-Bold-Slanted.tfm
-./fonts/tfm/public/droid/lgr-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/x2-DroidSerif-BoldItalic-Upright.tfm
-./fonts/tfm/public/droid/t2b-DroidSans-Bold-Slanted.tfm
-./fonts/tfm/public/droid/t2a-DroidSerif-BoldItalic-Upright-SmallCaps.tfm
+./fonts/tfm/public/droid/t2a-DroidSans-Bold-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/ot1-DroidSansMono-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/ot1-DroidSerif-Regular-SmallCaps.tfm
+./fonts/tfm/public/droid/ot1-DroidSansMono-SmallCaps.tfm
 ./fonts/tfm/public/droid/lgr-DroidSerif-Bold-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/t2b-DroidSans.tfm
 ./fonts/tfm/public/droid/ts1-DroidSerif-Regular-Slanted.tfm
-./fonts/tfm/public/droid/raw-x2-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/t2a-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/raw-x2-DroidSerif-Bold.tfm
+./fonts/tfm/public/droid/raw-ot1-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/raw-fixcyrillic-DroidSans-Bold-Slanted.tfm
+./fonts/tfm/public/droid/ot1-DroidSans-Slanted.tfm
+./fonts/tfm/public/droid/t2a-DroidSans-Bold-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-t2c-DroidSerif-Regular-Slanted.tfm
+./fonts/tfm/public/droid/raw-ts1-DroidSans-Slanted.tfm
+./fonts/tfm/public/droid/raw-t2a-DroidSerif-Italic.tfm
+./fonts/tfm/public/droid/raw-ts1-DroidSans.tfm
+./fonts/tfm/public/droid/raw-t1-DroidSans-Bold-Slanted.tfm
+./fonts/tfm/public/droid/t2b-DroidSerif-Italic-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-t2c-DroidSans.tfm
+./fonts/tfm/public/droid/x2-DroidSans.tfm
+./fonts/tfm/public/droid/t1-DroidSansMono-SmallCaps.tfm
+./fonts/tfm/public/droid/t1-DroidSans-SmallCaps.tfm
 ./fonts/tfm/public/droid/raw-ot1-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/t2b-DroidSans-Bold-SmallCaps.tfm
+./fonts/tfm/public/droid/t2a-DroidSansMono-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/x2-DroidSerif-Italic-Upright.tfm
+./fonts/tfm/public/droid/raw-t1-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/lgr-DroidSans-Bold-Slanted.tfm
+./fonts/tfm/public/droid/ot1-DroidSerif-BoldItalic-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-fixlatin-DroidSerif-Italic.tfm
+./fonts/tfm/public/droid/t2b-DroidSerif-BoldItalic-Upright-SmallCaps.tfm
+./fonts/tfm/public/droid/t1-DroidSerif-BoldItalic-SmallCaps.tfm
+./fonts/tfm/public/droid/x2-DroidSans-Bold-SmallCaps.tfm
 ./fonts/tfm/public/droid/raw-ot1-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/raw-lgr-DroidSerif-Regular-Slanted.tfm
-./fonts/tfm/public/droid/raw-x2-DroidSerif-BoldItalic-Upright.tfm
-./fonts/tfm/public/droid/raw-t2a-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/raw-ts1-DroidSerif-Regular-Slanted.tfm
-./fonts/tfm/public/droid/raw-ot1-DroidSansMono.tfm
-./fonts/tfm/public/droid/x2-DroidSerif-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-lgr-DroidSerif-Italic-Upright.tfm
-./fonts/tfm/public/droid/raw-fixlatin-DroidSansMono.tfm
-./fonts/tfm/public/droid/t1-DroidSerif-Regular-Slanted.tfm
-./fonts/tfm/public/droid/raw-fixcyrillic-DroidSansMono-Slanted.tfm
-./fonts/tfm/public/droid/t1-DroidSerif-Bold.tfm
-./fonts/tfm/public/droid/t2b-DroidSerif-Italic-Upright.tfm
-./fonts/tfm/public/droid/t2c-DroidSansMono.tfm
-./fonts/tfm/public/droid/raw-fixgreek-DroidSerif-Regular-Slanted.tfm
-./fonts/tfm/public/droid/t1-DroidSansMono-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-t2c-DroidSansMono-Slanted.tfm
-./fonts/tfm/public/droid/raw-fixgreek-DroidSerif-Italic-Upright.tfm
-./fonts/tfm/public/droid/t2c-DroidSans-Slanted.tfm
-./fonts/tfm/public/droid/raw-ts1-DroidSerif-BoldItalic.tfm
-./fonts/tfm/public/droid/ts1-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/ot1-DroidSerif-Regular-Slanted.tfm
 ./fonts/tfm/public/droid/t2a-DroidSerif-Italic-SmallCaps.tfm
-./fonts/tfm/public/droid/t2a-DroidSansMono.tfm
-./fonts/tfm/public/droid/ot1-DroidSerif-Bold-SmallCaps.tfm
-./fonts/tfm/public/droid/ot1-DroidSerif-Italic-Upright.tfm
-./fonts/tfm/public/droid/raw-t2b-DroidSerif-BoldItalic.tfm
-./fonts/tfm/public/droid/lgr-DroidSerif-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/t1-DroidSerif-Italic-Upright.tfm
-./fonts/tfm/public/droid/t1-DroidSerif-Italic-SmallCaps.tfm
-./fonts/tfm/public/droid/x2-DroidSerif-Italic-Upright-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-lgr-DroidSerif-Bold.tfm
+./fonts/tfm/public/droid/raw-t2b-DroidSans-Bold-Slanted.tfm
+./fonts/tfm/public/droid/t2a-DroidSerif-Italic-Upright-SmallCaps.tfm
+./fonts/tfm/public/droid/ot1-DroidSans-Bold.tfm
+./fonts/tfm/public/droid/ot1-DroidSerif-Regular-Slanted.tfm
+./fonts/tfm/public/droid/t1-DroidSerif-Regular.tfm
+./fonts/tfm/public/droid/raw-lgr-DroidSans-Bold-Slanted.tfm
 ./fonts/tfm/public/droid/t2a-DroidSerif-BoldItalic-SmallCaps.tfm
-./fonts/tfm/public/droid/t1-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/raw-t2a-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/t2a-DroidSans-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/t2b-DroidSans-SmallCaps.tfm
-./fonts/tfm/public/droid/x2-DroidSans-SmallCaps.tfm
-./fonts/tfm/public/droid/t1-DroidSerif-BoldItalic-SmallCaps.tfm
-./fonts/tfm/public/droid/t2b-DroidSerif-Italic-Upright-SmallCaps.tfm
-./fonts/tfm/public/droid/t2b-DroidSansMono.tfm
-./fonts/tfm/public/droid/t2c-DroidSansMono-Slanted.tfm
-./fonts/tfm/public/droid/raw-x2-DroidSerif-Regular-Slanted.tfm
+./fonts/tfm/public/droid/t1-DroidSans.tfm
+./fonts/tfm/public/droid/ot1-DroidSans-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-x2-DroidSansMono.tfm
+./fonts/tfm/public/droid/raw-t2b-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/t1-DroidSans-Bold-Slanted.tfm
+./fonts/tfm/public/droid/t2c-DroidSerif-Bold-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-lgr-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/t1-DroidSerif-Italic-Upright-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-t1-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/raw-fixlatin-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/lgr-DroidSans-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-t2b-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/t1-DroidSansMono-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/x2-DroidSans-Bold.tfm
+./fonts/tfm/public/droid/raw-fixtextcomp-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/raw-fixgreek-DroidSerif-Regular.tfm
+./fonts/tfm/public/droid/raw-lgr-DroidSerif-Italic.tfm
+./fonts/tfm/public/droid/raw-x2-DroidSerif-Italic-Upright.tfm
+./fonts/tfm/public/droid/lgr-DroidSans-Bold.tfm
+./fonts/tfm/public/droid/lgr-DroidSansMono-Slanted-SmallCaps.tfm
 ./fonts/tfm/public/droid/raw-fixtextcomp-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/raw-ts1-DroidSansMono.tfm
-./fonts/tfm/public/droid/t2a-DroidSerif-Regular-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-t2a-DroidSans-Bold-Slanted.tfm
-./fonts/tfm/public/droid/raw-fixtextcomp-DroidSerif-Italic-Upright.tfm
-./fonts/tfm/public/droid/raw-ts1-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/raw-fixtextcomp-DroidSans.tfm
-./fonts/tfm/public/droid/t2c-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/raw-t1-DroidSans.tfm
-./fonts/tfm/public/droid/lgr-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/raw-fixtextcomp-DroidSans-Bold-Slanted.tfm
-./fonts/tfm/public/droid/x2-DroidSerif-BoldItalic-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-t1-DroidSerif-Bold.tfm
-./fonts/tfm/public/droid/raw-fixcyrillic-DroidSansMono.tfm
-./fonts/tfm/public/droid/raw-fixcyrillic-DroidSerif-Bold.tfm
-./fonts/tfm/public/droid/raw-t2c-DroidSans.tfm
-./fonts/tfm/public/droid/lgr-DroidSerif-Regular-Slanted.tfm
-./fonts/tfm/public/droid/ts1-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/raw-t2b-DroidSansMono-Slanted.tfm
-./fonts/tfm/public/droid/raw-t2c-DroidSerif-BoldItalic.tfm
-./fonts/tfm/public/droid/raw-fixcyrillic-DroidSans.tfm
-./fonts/tfm/public/droid/t2a-DroidSansMono-Slanted.tfm
-./fonts/tfm/public/droid/t1-DroidSans-Bold-SmallCaps.tfm
+./fonts/tfm/public/droid/t2c-DroidSansMono-SmallCaps.tfm
+./fonts/tfm/public/droid/ot1-DroidSans-Bold-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-t1-DroidSans-Bold.tfm
 ./fonts/tfm/public/droid/raw-x2-DroidSans.tfm
-./fonts/tfm/public/droid/raw-t2a-DroidSerif-Regular-Slanted.tfm
-./fonts/tfm/public/droid/t1-DroidSerif-Regular-SmallCaps.tfm
-./fonts/tfm/public/droid/x2-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/t2a-DroidSans-SmallCaps.tfm
+./fonts/tfm/public/droid/t2a-DroidSans-Slanted.tfm
+./fonts/tfm/public/droid/raw-t2b-DroidSerif-Regular-Slanted.tfm
+./fonts/tfm/public/droid/ot1-DroidSerif-Regular.tfm
+./fonts/tfm/public/droid/raw-t2b-DroidSerif-Italic.tfm
+./fonts/tfm/public/droid/raw-ts1-DroidSans-Bold.tfm
+./fonts/tfm/public/droid/x2-DroidSerif-BoldItalic.tfm
 ./fonts/tfm/public/droid/raw-fixlatin-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/lgr-DroidSerif-BoldItalic.tfm
-./fonts/tfm/public/droid/ot1-DroidSerif-BoldItalic-Upright.tfm
-./fonts/tfm/public/droid/raw-t1-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/x2-DroidSans-Bold-SmallCaps.tfm
+./fonts/tfm/public/droid/t1-DroidSerif-Regular-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-fixcyrillic-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/raw-fixtextcomp-DroidSerif-BoldItalic.tfm
 ./fonts/tfm/public/droid/raw-ts1-DroidSans-Bold-Slanted.tfm
-./fonts/tfm/public/droid/lgr-DroidSerif-Bold-SmallCaps.tfm
-./fonts/tfm/public/droid/ot1-DroidSerif-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-t2a-DroidSerif-BoldItalic.tfm
-./fonts/tfm/public/droid/raw-fixgreek-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/t2b-DroidSerif-BoldItalic.tfm
-./fonts/tfm/public/droid/ts1-DroidSerif-Italic-Upright.tfm
-./fonts/tfm/public/droid/ot1-DroidSerif-Italic-SmallCaps.tfm
-./fonts/tfm/public/droid/t1-DroidSans-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-ot1-DroidSans.tfm
-./fonts/tfm/public/droid/lgr-DroidSansMono-Slanted.tfm
-./fonts/tfm/public/droid/x2-DroidSerif-Bold-SmallCaps.tfm
-./fonts/tfm/public/droid/t2c-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/raw-fixgreek-DroidSans.tfm
-./fonts/tfm/public/droid/raw-fixtextcomp-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/t2c-DroidSans-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-fixlatin-DroidSerif-Regular-Slanted.tfm
-./fonts/tfm/public/droid/ot1-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/raw-x2-DroidSans-Slanted.tfm
-./fonts/tfm/public/droid/t2c-DroidSerif-Italic-Upright.tfm
-./fonts/tfm/public/droid/ot1-DroidSerif-Bold.tfm
-./fonts/tfm/public/droid/lgr-DroidSansMono-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-ot1-DroidSerif-Italic-Upright.tfm
-./fonts/tfm/public/droid/x2-DroidSerif-BoldItalic-Upright-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-t2a-DroidSans.tfm
-./fonts/tfm/public/droid/raw-lgr-DroidSerif-BoldItalic.tfm
-./fonts/tfm/public/droid/t2a-DroidSerif-BoldItalic.tfm
-./fonts/tfm/public/droid/raw-t1-DroidSansMono-Slanted.tfm
-./fonts/tfm/public/droid/raw-ot1-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/t2b-DroidSansMono-Slanted.tfm
-./fonts/tfm/public/droid/raw-fixgreek-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/lgr-DroidSansMono-SmallCaps.tfm
-./fonts/tfm/public/droid/x2-DroidSansMono.tfm
-./fonts/tfm/public/droid/raw-t2c-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/lgr-DroidSans-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/t2a-DroidSerif-Italic-Upright.tfm
+./fonts/tfm/public/droid/t2a-DroidSerif-Bold-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-fixtextcomp-DroidSans.tfm
+./fonts/tfm/public/droid/t2b-DroidSans-Bold.tfm
+./fonts/tfm/public/droid/raw-fixlatin-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/x2-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/x2-DroidSerif-Italic-SmallCaps.tfm
+./fonts/tfm/public/droid/t2c-DroidSerif-Italic-Upright-SmallCaps.tfm
+./fonts/tfm/public/droid/t2c-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/x2-DroidSerif-Regular-SmallCaps.tfm
 ./fonts/tfm/public/droid/raw-fixlatin-DroidSerif-BoldItalic-Upright.tfm
-./fonts/tfm/public/droid/ot1-DroidSans.tfm
-./fonts/tfm/public/droid/ot1-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/raw-ts1-DroidSerif-Italic-Upright.tfm
-./fonts/tfm/public/droid/raw-t2c-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/x2-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/raw-fixtextcomp-DroidSansMono.tfm
-./fonts/tfm/public/droid/lgr-DroidSerif-Regular-SmallCaps.tfm
-./fonts/tfm/public/droid/t2b-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/ot1-DroidSerif-BoldItalic.tfm
-./fonts/tfm/public/droid/lgr-DroidSans.tfm
-./fonts/tfm/public/droid/ot1-DroidSansMono-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-fixgreek-DroidSans-Slanted.tfm
-./fonts/tfm/public/droid/t2c-DroidSerif-BoldItalic-Upright.tfm
-./fonts/tfm/public/droid/ot1-DroidSerif-BoldItalic-SmallCaps.tfm
-./fonts/tfm/public/droid/ts1-DroidSans.tfm
-./fonts/tfm/public/droid/ot1-DroidSansMono.tfm
+./fonts/tfm/public/droid/t2b-DroidSerif-BoldItalic-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-fixlatin-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/t1-DroidSerif-Regular-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/ot1-DroidSans-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-ot1-DroidSerif-BoldItalic-Upright.tfm
 ./fonts/tfm/public/droid/t2a-DroidSerif-Regular-Slanted.tfm
 ./fonts/tfm/public/droid/raw-t2b-DroidSerif-Italic-Upright.tfm
-./fonts/tfm/public/droid/t2a-DroidSans-SmallCaps.tfm
+./fonts/tfm/public/droid/x2-DroidSerif-Regular-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-t1-DroidSerif-Italic-Upright.tfm
+./fonts/tfm/public/droid/raw-ts1-DroidSansMono.tfm
+./fonts/tfm/public/droid/t2c-DroidSerif-Regular-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-fixcyrillic-DroidSerif-Italic-Upright.tfm
+./fonts/tfm/public/droid/raw-fixcyrillic-DroidSerif-Italic.tfm
+./fonts/tfm/public/droid/t1-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/t2a-DroidSerif-Bold.tfm
+./fonts/tfm/public/droid/raw-t2a-DroidSerif-Regular.tfm
+./fonts/tfm/public/droid/lgr-DroidSans-SmallCaps.tfm
+./fonts/tfm/public/droid/x2-DroidSerif-Bold-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/ot1-DroidSerif-Regular-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/ts1-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/raw-fixlatin-DroidSans-Bold-Slanted.tfm
+./fonts/tfm/public/droid/ts1-DroidSans-Slanted.tfm
+./fonts/tfm/public/droid/t2b-DroidSerif-Bold.tfm
+./fonts/tfm/public/droid/raw-x2-DroidSans-Bold.tfm
+./fonts/tfm/public/droid/raw-ts1-DroidSerif-BoldItalic-Upright.tfm
 ./fonts/tfm/public/droid/raw-ot1-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/lgr-DroidSerif-Regular-SmallCaps.tfm
+./fonts/tfm/public/droid/t2c-DroidSans-Bold-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/ot1-DroidSerif-Italic-Upright.tfm
+./fonts/tfm/public/droid/raw-x2-DroidSerif-Regular.tfm
+./fonts/tfm/public/droid/t2c-DroidSerif-Regular.tfm
+./fonts/tfm/public/droid/x2-DroidSerif-Bold.tfm
+./fonts/tfm/public/droid/raw-t2b-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/t1-DroidSans-Bold.tfm
+./fonts/tfm/public/droid/raw-fixcyrillic-DroidSerif-Regular.tfm
 ./fonts/tfm/public/droid/t2b-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/t2a-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/lgr-DroidSerif-Regular-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/t1-DroidSerif-Italic-Upright.tfm
+./fonts/tfm/public/droid/raw-fixtextcomp-DroidSansMono.tfm
+./fonts/tfm/public/droid/t1-DroidSans-Slanted.tfm
+./fonts/tfm/public/droid/raw-fixgreek-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/raw-t2b-DroidSansMono.tfm
+./fonts/tfm/public/droid/t2c-DroidSerif-BoldItalic-SmallCaps.tfm
+./fonts/tfm/public/droid/ot1-DroidSerif-BoldItalic-Upright-SmallCaps.tfm
+./fonts/tfm/public/droid/t2b-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/x2-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/lgr-DroidSansMono-SmallCaps.tfm
+./fonts/tfm/public/droid/t2b-DroidSerif-Bold-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/ot1-DroidSans.tfm
+./fonts/tfm/public/droid/t1-DroidSans-Bold-SmallCaps.tfm
+./fonts/tfm/public/droid/t1-DroidSerif-Bold-SmallCaps.tfm
+./fonts/tfm/public/droid/ts1-DroidSans.tfm
+./fonts/tfm/public/droid/raw-ts1-DroidSerif-Italic.tfm
+./fonts/tfm/public/droid/raw-fixgreek-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/t2c-DroidSerif-Bold.tfm
+./fonts/tfm/public/droid/raw-t2a-DroidSansMono.tfm
+./fonts/tfm/public/droid/ot1-DroidSerif-Bold-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/ts1-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/t2b-DroidSerif-Italic-Upright-SmallCaps.tfm
 ./fonts/tfm/public/droid/ot1-DroidSans-Bold-Slanted.tfm
-./fonts/tfm/public/droid/t1-DroidSansMono-Slanted.tfm
-./fonts/tfm/public/droid/raw-fixgreek-DroidSerif-Bold.tfm
-./fonts/tfm/public/droid/raw-ts1-DroidSerif-BoldItalic-Upright.tfm
-./fonts/tfm/public/droid/raw-fixtextcomp-DroidSerif-BoldItalic-Upright.tfm
-./fonts/tfm/public/droid/t2b-DroidSerif-BoldItalic-SmallCaps.tfm
-./fonts/tfm/public/droid/t2a-DroidSans.tfm
-./fonts/tfm/public/droid/raw-t2a-DroidSans-Slanted.tfm
-./fonts/tfm/public/droid/t1-DroidSans-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-fixcyrillic-DroidSans-Bold-Slanted.tfm
+./fonts/tfm/public/droid/t2a-DroidSerif-Italic-Upright.tfm
+./fonts/tfm/public/droid/ot1-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/lgr-DroidSerif-Bold-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-fixlatin-DroidSans.tfm
+./fonts/tfm/public/droid/raw-x2-DroidSans-Bold-Slanted.tfm
+./fonts/tfm/public/droid/raw-fixlatin-DroidSerif-Italic-Upright.tfm
+./fonts/tfm/public/droid/ot1-DroidSerif-Italic.tfm
+./fonts/tfm/public/droid/raw-fixtextcomp-DroidSerif-Regular-Slanted.tfm
+./fonts/tfm/public/droid/raw-fixcyrillic-DroidSans-Slanted.tfm
+./fonts/tfm/public/droid/t2a-DroidSans-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-t2a-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/t2c-DroidSerif-Regular-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/x2-DroidSerif-Regular-Slanted.tfm
+./fonts/tfm/public/droid/raw-fixtextcomp-DroidSerif-Bold.tfm
+./fonts/tfm/public/droid/t2c-DroidSans-Bold.tfm
+./fonts/tfm/public/droid/t2b-DroidSans-SmallCaps.tfm
+./fonts/tfm/public/droid/ts1-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/t1-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/raw-t2a-DroidSerif-Italic-Upright.tfm
+./fonts/tfm/public/droid/raw-fixgreek-DroidSerif-Italic-Upright.tfm
+./fonts/tfm/public/droid/raw-t2c-DroidSerif-Italic.tfm
+./fonts/tfm/public/droid/raw-ot1-DroidSans-Bold-Slanted.tfm
+./fonts/tfm/public/droid/lgr-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/raw-fixcyrillic-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/raw-ts1-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/ts1-DroidSerif-Italic.tfm
+./fonts/tfm/public/droid/t2b-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/x2-DroidSans-Bold-Slanted.tfm
+./fonts/tfm/public/droid/x2-DroidSerif-Bold-SmallCaps.tfm
 ./fonts/tfm/public/droid/raw-t1-DroidSansMono.tfm
-./fonts/tfm/public/droid/raw-ot1-DroidSerif-Bold.tfm
-./fonts/tfm/public/droid/lgr-DroidSerif-BoldItalic-Upright-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-lgr-DroidSerif-Bold.tfm
-./fonts/tfm/public/droid/t2b-DroidSans.tfm
-./fonts/tfm/public/droid/ts1-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/raw-t2b-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/t2a-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/raw-t2c-DroidSans-Bold-Slanted.tfm
-./fonts/tfm/public/droid/raw-lgr-DroidSansMono.tfm
-./fonts/tfm/public/droid/raw-fixlatin-DroidSansMono-Slanted.tfm
-./fonts/tfm/public/droid/raw-ts1-DroidSans.tfm
-./fonts/tfm/public/droid/raw-lgr-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/t2c-DroidSerif-Regular-Slanted.tfm
-./fonts/tfm/public/droid/raw-fixcyrillic-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/raw-fixcyrillic-DroidSerif-BoldItalic.tfm
-./fonts/tfm/public/droid/raw-t2b-DroidSerif-Bold.tfm
-./fonts/tfm/public/droid/raw-fixgreek-DroidSansMono.tfm
-./fonts/tfm/public/droid/raw-ts1-DroidSans-Slanted.tfm
-./fonts/tfm/public/droid/t2b-DroidSans-Slanted.tfm
-./fonts/tfm/public/droid/t2a-DroidSans-Bold-Slanted.tfm
-./fonts/tfm/public/droid/t2c-DroidSans-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/ts1-DroidSans-Slanted.tfm
-./fonts/tfm/public/droid/t1-DroidSans-Slanted.tfm
-./fonts/tfm/public/droid/t1-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/raw-t2b-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/ot1-DroidSans-SmallCaps.tfm
+./fonts/tfm/public/droid/t2b-DroidSerif-Regular.tfm
+./fonts/tfm/public/droid/t2b-DroidSans-Bold-Slanted.tfm
 ./fonts/tfm/public/droid/raw-t2c-DroidSerif-Bold.tfm
-./fonts/tfm/public/droid/raw-t1-DroidSans-Slanted.tfm
-./fonts/tfm/public/droid/raw-lgr-DroidSerif-BoldItalic-Upright.tfm
-./fonts/tfm/public/droid/raw-fixlatin-DroidSans.tfm
-./fonts/tfm/public/droid/x2-DroidSerif-Bold.tfm
-./fonts/tfm/public/droid/raw-t2b-DroidSans-Bold.tfm
+./fonts/tfm/public/droid/raw-lgr-DroidSans-Bold.tfm
+./fonts/tfm/public/droid/raw-ts1-DroidSerif-Regular-Slanted.tfm
 ./fonts/tfm/public/droid/raw-lgr-DroidSerif-Regular.tfm
+./fonts/tfm/public/droid/t2c-DroidSerif-Italic-SmallCaps.tfm
+./fonts/tfm/public/droid/ts1-DroidSerif-Regular.tfm
+./fonts/tfm/public/droid/raw-t2a-DroidSerif-Regular-Slanted.tfm
+./fonts/tfm/public/droid/raw-fixgreek-DroidSerif-Regular-Slanted.tfm
+./fonts/tfm/public/droid/lgr-DroidSerif-BoldItalic-Upright-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-t2c-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/raw-fixtextcomp-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/lgr-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/lgr-DroidSans-Slanted.tfm
 ./fonts/tfm/public/droid/lgr-DroidSerif-Bold.tfm
-./fonts/tfm/public/droid/raw-x2-DroidSansMono.tfm
-./fonts/tfm/public/droid/t2b-DroidSerif-Regular-SmallCaps.tfm
-./fonts/tfm/public/droid/t1-DroidSans.tfm
-./fonts/tfm/public/droid/raw-ot1-DroidSerif-Regular-Slanted.tfm
-./fonts/tfm/public/droid/raw-t2a-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/t1-DroidSerif-Italic-Upright-SmallCaps.tfm
+./fonts/tfm/public/droid/t2c-DroidSansMono-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-lgr-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/raw-t2a-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/t2c-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/t2c-DroidSans-Bold-Slanted.tfm
+./fonts/tfm/public/droid/lgr-DroidSerif-BoldItalic-SmallCaps.tfm
+./fonts/tfm/public/droid/t2a-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/raw-x2-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/raw-t2c-DroidSerif-Regular.tfm
+./fonts/tfm/public/droid/raw-t2a-DroidSans-Slanted.tfm
+./fonts/tfm/public/droid/x2-DroidSansMono.tfm
+./fonts/tfm/public/droid/ot1-DroidSans-Bold-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-ts1-DroidSerif-Italic-Upright.tfm
+./fonts/tfm/public/droid/ts1-DroidSans-Bold.tfm
+./fonts/tfm/public/droid/raw-ot1-DroidSerif-Bold.tfm
+./fonts/tfm/public/droid/raw-fixcyrillic-DroidSansMono.tfm
+./fonts/tfm/public/droid/lgr-DroidSerif-Italic-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-t2b-DroidSans-Bold.tfm
+./fonts/tfm/public/droid/raw-fixgreek-DroidSans-Slanted.tfm
+./fonts/tfm/public/droid/raw-fixgreek-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/raw-t2a-DroidSans-Bold.tfm
+./fonts/tfm/public/droid/x2-DroidSerif-BoldItalic-SmallCaps.tfm
+./fonts/tfm/public/droid/t2b-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/ot1-DroidSerif-Italic-Upright-SmallCaps.tfm
 ./fonts/tfm/public/droid/lgr-DroidSans-Bold-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-x2-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/raw-t1-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/t2b-DroidSansMono-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-fixcyrillic-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/raw-fixcyrillic-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/raw-t1-DroidSerif-BoldItalic-Upright.tfm
-./fonts/tfm/public/droid/raw-ts1-DroidSansMono-Slanted.tfm
-./fonts/tfm/public/droid/raw-fixlatin-DroidSans-Slanted.tfm
-./fonts/tfm/public/droid/t2c-DroidSerif-Italic-Upright-SmallCaps.tfm
-./fonts/tfm/public/droid/ot1-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/raw-t2b-DroidSerif-BoldItalic-Upright.tfm
-./fonts/tfm/public/droid/t2c-DroidSerif-Bold.tfm
-./fonts/tfm/public/droid/raw-fixcyrillic-DroidSerif-Regular-Slanted.tfm
-./fonts/tfm/public/droid/t2b-DroidSans-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-fixlatin-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/t2a-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/ot1-DroidSans-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/ts1-DroidSans-Bold-Slanted.tfm
-./fonts/tfm/public/droid/raw-x2-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/raw-t2b-DroidSansMono.tfm
-./fonts/tfm/public/droid/raw-lgr-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/raw-t2a-DroidSerif-Bold.tfm
-./fonts/tfm/public/droid/t2c-DroidSerif-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-ts1-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/t1-DroidSerif-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-fixcyrillic-DroidSans-Slanted.tfm
-./fonts/tfm/public/droid/t2c-DroidSerif-BoldItalic.tfm
-./fonts/tfm/public/droid/raw-x2-DroidSerif-Bold.tfm
+./fonts/tfm/public/droid/raw-fixlatin-DroidSerif-Regular-Slanted.tfm
+./fonts/tfm/public/droid/raw-fixgreek-DroidSansMono.tfm
 ./fonts/tfm/public/droid/t2a-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/raw-fixgreek-DroidSerif-BoldItalic-Upright.tfm
-./fonts/tfm/public/droid/t2a-DroidSans-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-fixtextcomp-DroidSerif-Regular-Slanted.tfm
+./fonts/tfm/public/droid/t2a-DroidSerif-Regular-SmallCaps.tfm
+./fonts/tfm/public/droid/ot1-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/t2a-DroidSerif-Italic.tfm
 ./fonts/tfm/public/droid/ts1-DroidSerif-Bold.tfm
-./fonts/tfm/public/droid/t2c-DroidSansMono-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-x2-DroidSans-Bold-Slanted.tfm
-./fonts/tfm/public/droid/t1-DroidSansMono.tfm
-./fonts/tfm/public/droid/t1-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/raw-ts1-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/raw-t1-DroidSans-Bold-Slanted.tfm
+./fonts/tfm/public/droid/t1-DroidSerif-Italic.tfm
+./fonts/tfm/public/droid/raw-lgr-DroidSerif-Italic-Upright.tfm
+./fonts/tfm/public/droid/t2b-DroidSans-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-t2c-DroidSans-Bold-Slanted.tfm
+./fonts/tfm/public/droid/lgr-DroidSerif-Regular-Slanted.tfm
+./fonts/tfm/public/droid/ot1-DroidSerif-Bold.tfm
+./fonts/tfm/public/droid/raw-ot1-DroidSerif-Regular-Slanted.tfm
 ./fonts/tfm/public/droid/raw-t2a-DroidSansMono-Slanted.tfm
-./fonts/tfm/public/droid/ot1-DroidSansMono-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-t2a-DroidSerif-Italic-Upright.tfm
-./fonts/tfm/public/droid/raw-ot1-DroidSerif-Italic.tfm
-./fonts/tfm/public/droid/t2c-DroidSans-Bold-Slanted.tfm
-./fonts/tfm/public/droid/raw-x2-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/raw-x2-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/raw-t2b-DroidSans.tfm
+./fonts/tfm/public/droid/x2-DroidSerif-BoldItalic-Upright-SmallCaps.tfm
+./fonts/tfm/public/droid/ot1-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/ts1-DroidSansMono.tfm
+./fonts/tfm/public/droid/t2b-DroidSans-Slanted.tfm
+./fonts/tfm/public/droid/raw-fixtextcomp-DroidSans-Slanted.tfm
+./fonts/tfm/public/droid/t1-DroidSansMono.tfm
+./fonts/tfm/public/droid/raw-t2c-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/t2c-DroidSerif-Bold-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/t2c-DroidSansMono.tfm
+./fonts/tfm/public/droid/t2c-DroidSans-Slanted.tfm
+./fonts/tfm/public/droid/raw-lgr-DroidSansMono.tfm
+./fonts/tfm/public/droid/raw-fixcyrillic-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/raw-fixcyrillic-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/t1-DroidSans-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-t1-DroidSerif-Bold.tfm
+./fonts/tfm/public/droid/t2b-DroidSerif-Italic-Upright.tfm
+./fonts/tfm/public/droid/x2-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/raw-fixcyrillic-DroidSans.tfm
+./fonts/tfm/public/droid/ts1-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/x2-DroidSans-Slanted.tfm
+./fonts/tfm/public/droid/x2-DroidSans-Bold-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/t1-DroidSerif-Bold-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/t1-DroidSans-Bold-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/ot1-DroidSansMono.tfm
+./fonts/tfm/public/droid/t2a-DroidSerif-Regular.tfm
+./fonts/tfm/public/droid/t2a-DroidSansMono-SmallCaps.tfm
+./fonts/tfm/public/droid/ot1-DroidSerif-Bold-SmallCaps.tfm
+./fonts/tfm/public/droid/t2b-DroidSansMono-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-ot1-DroidSansMono.tfm
+./fonts/tfm/public/droid/t1-DroidSerif-Bold.tfm
+./fonts/tfm/public/droid/t2a-DroidSerif-BoldItalic-Upright-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-fixgreek-DroidSans.tfm
+./fonts/tfm/public/droid/raw-t1-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/raw-t1-DroidSerif-Regular-Slanted.tfm
+./fonts/tfm/public/droid/raw-t2b-DroidSerif-Regular.tfm
+./fonts/tfm/public/droid/lgr-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/raw-fixtextcomp-DroidSans-Bold.tfm
 ./fonts/tfm/public/droid/raw-ts1-DroidSerif-Bold.tfm
+./fonts/tfm/public/droid/raw-x2-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/raw-x2-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/raw-ot1-DroidSerif-Italic.tfm
+./fonts/tfm/public/droid/raw-fixtextcomp-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/t2c-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/raw-fixgreek-DroidSerif-Bold.tfm
+./fonts/tfm/public/droid/raw-fixgreek-DroidSans-Bold.tfm
+./fonts/tfm/public/droid/t2c-DroidSerif-BoldItalic-Upright-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-t2b-DroidSerif-Bold.tfm
+./fonts/tfm/public/droid/t2a-DroidSansMono.tfm
+./fonts/tfm/public/droid/t1-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/raw-fixtextcomp-DroidSerif-Italic.tfm
+./fonts/tfm/public/droid/raw-t2a-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/x2-DroidSans-SmallCaps.tfm
+./fonts/tfm/public/droid/x2-DroidSansMono-SmallCaps.tfm
 ./fonts/tfm/public/droid/t2b-DroidSerif-Regular-Slanted.tfm
-./fonts/tfm/public/droid/t2c-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/x2-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/lgr-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/x2-DroidSerif-Italic-Upright-SmallCaps.tfm
+./fonts/tfm/public/droid/x2-DroidSerif-Italic.tfm
+./fonts/tfm/public/droid/raw-ts1-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/t2c-DroidSans-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/t1-DroidSerif-BoldItalic-Upright-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-ot1-DroidSans-Bold.tfm
+./fonts/tfm/public/droid/lgr-DroidSans.tfm
+./fonts/tfm/public/droid/raw-t1-DroidSans.tfm
+./fonts/tfm/public/droid/lgr-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/x2-DroidSansMono-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/t1-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/raw-t1-DroidSerif-Regular.tfm
+./fonts/tfm/public/droid/raw-lgr-DroidSans-Slanted.tfm
+./fonts/tfm/public/droid/raw-lgr-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/raw-ot1-DroidSans-Slanted.tfm
+./fonts/tfm/public/droid/ot1-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/raw-t2a-DroidSans.tfm
+./fonts/tfm/public/droid/raw-t1-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/raw-ts1-DroidSerif-Regular.tfm
+./fonts/tfm/public/droid/t2c-DroidSans-SmallCaps.tfm
+./fonts/tfm/public/droid/lgr-DroidSerif-Italic.tfm
+./fonts/tfm/public/droid/raw-fixgreek-DroidSerif-Italic.tfm
+./fonts/tfm/public/droid/raw-t1-DroidSerif-Italic.tfm
+./fonts/tfm/public/droid/raw-t1-DroidSans-Slanted.tfm
 ./fonts/tfm/public/droid/t2b-DroidSans-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-t2c-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/ot1-DroidSans-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/t2c-DroidSansMono-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-lgr-DroidSansMono-Slanted.tfm
-./fonts/tfm/public/droid/raw-t2b-DroidSans-Slanted.tfm
+./fonts/tfm/public/droid/t2c-DroidSerif-BoldItalic-Upright.tfm
+./fonts/tfm/public/droid/t2b-DroidSansMono.tfm
+./fonts/tfm/public/droid/raw-lgr-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/raw-t2c-DroidSansMono-Slanted.tfm
+./fonts/tfm/public/droid/t2a-DroidSerif-Bold-SmallCaps.tfm
+./fonts/tfm/public/droid/raw-t2c-DroidSansMono.tfm
+./fonts/tfm/public/droid/t2b-DroidSerif-Bold-SmallCaps.tfm
 ./fonts/tfm/public/droid/raw-t2c-DroidSans-Slanted.tfm
-./fonts/tfm/public/droid/t2a-DroidSans-Slanted.tfm
+./fonts/tfm/public/droid/lgr-DroidSans-Bold-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/x2-DroidSans-Slanted-SmallCaps.tfm
+./fonts/tfm/public/droid/t2b-DroidSansMono-SmallCaps.tfm
+./fonts/tfm/public/droid/t2c-DroidSerif-Italic.tfm
+./fonts/tfm/public/droid/ts1-DroidSerif-Italic-Upright.tfm
+./fonts/tfm/public/droid/raw-ts1-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/raw-t2c-DroidSans-Bold.tfm
+./fonts/tfm/public/droid/raw-t2c-DroidSerif-BoldItalic.tfm
+./fonts/tfm/public/droid/x2-DroidSerif-Regular.tfm
+./fonts/tfm/public/droid/raw-t2b-DroidSans-Slanted.tfm
+./fonts/tfm/public/droid/lgr-DroidSerif-Italic-Upright.tfm
+./fonts/tfm/public/droid/t2c-DroidSerif-Regular-Slanted.tfm
+./fonts/tfm/public/droid/t1-DroidSerif-Italic-SmallCaps.tfm
+./fonts/tfm/public/droid/t1-DroidSerif-Regular-Slanted.tfm
+./fonts/tfm/public/droid/lgr-DroidSerif-Regular.tfm
+./fonts/tfm/public/droid/lgr-DroidSansMono.tfm
+./fonts/tfm/public/droid/raw-lgr-DroidSerif-Regular-Slanted.tfm
+./fonts/tfm/public/droid/raw-fixgreek-DroidSerif-Bold-Slanted.tfm
+./fonts/tfm/public/droid/raw-fixtextcomp-DroidSerif-Italic-Upright.tfm
 ./fonts/tfm/public/droid/raw-fixgreek-DroidSans-Bold-Slanted.tfm
-./fonts/tfm/public/droid/raw-t1-DroidSerif-Regular.tfm
-./fonts/tfm/public/droid/t1-DroidSerif-BoldItalic-Upright.tfm
-./fonts/tfm/public/droid/ts1-DroidSerif-BoldItalic-Upright.tfm
-./fonts/tfm/public/droid/t2c-DroidSerif-Regular-SmallCaps.tfm
-./fonts/tfm/public/droid/lgr-DroidSans-Slanted.tfm
-./fonts/tfm/public/droid/raw-fixgreek-DroidSans-Bold.tfm
-./fonts/tfm/public/droid/t1-DroidSerif-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-lgr-DroidSans-Bold-Slanted.tfm
-./fonts/tfm/public/droid/ot1-DroidSans-Slanted.tfm
-./fonts/tfm/public/droid/raw-fixcyrillic-DroidSerif-Italic-Upright.tfm
-./fonts/tfm/public/droid/t1-DroidSerif-BoldItalic.tfm
-./fonts/tfm/public/droid/t2c-DroidSerif-BoldItalic-SmallCaps.tfm
-./fonts/tfm/public/droid/ts1-DroidSansMono.tfm
-./fonts/tfm/public/droid/raw-fixtextcomp-DroidSansMono-Slanted.tfm
-./fonts/tfm/public/droid/lgr-DroidSerif-BoldItalic-SmallCaps.tfm
-./fonts/tfm/public/droid/lgr-DroidSerif-Italic-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-t1-DroidSerif-BoldItalic.tfm
-./fonts/tfm/public/droid/t2a-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/t2a-DroidSerif-Italic-Upright-SmallCaps.tfm
+./fonts/tfm/public/droid/t2a-DroidSans.tfm
+./fonts/tfm/public/droid/raw-fixlatin-DroidSansMono.tfm
+./fonts/tfm/public/droid/ts1-DroidSans-Bold-Slanted.tfm
+./fonts/tfm/public/droid/raw-x2-DroidSans-Slanted.tfm
 ./fonts/tfm/public/droid/t2b-DroidSerif-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/raw-fixcyrillic-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/raw-t2a-DroidSansMono.tfm
-./fonts/tfm/public/droid/x2-DroidSans-Bold-Slanted.tfm
-./fonts/tfm/public/droid/raw-t1-DroidSerif-Regular-Slanted.tfm
-./fonts/tfm/public/droid/t1-DroidSerif-Bold-SmallCaps.tfm
-./fonts/tfm/public/droid/lgr-DroidSans-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/droid/t2c-DroidSans-Bold-SmallCaps.tfm
-./fonts/tfm/public/droid/x2-DroidSerif-Regular-Slanted.tfm
-./fonts/tfm/public/droid/x2-DroidSerif-Italic-Upright.tfm
-./fonts/tfm/public/droid/t2a-DroidSerif-BoldItalic-Upright.tfm
-./fonts/tfm/public/droid/raw-fixlatin-DroidSerif-Italic-Upright.tfm
-./fonts/tfm/public/droid/raw-fixlatin-DroidSerif-Bold-Slanted.tfm
-./fonts/tfm/public/droid/raw-t2c-DroidSerif-Italic-Upright.tfm
-./fonts/map/dvips/droid/droid.map
-./fonts/vf/public/droid/t2b-DroidSans-Bold-SmallCaps.vf
-./fonts/vf/public/droid/t2b-DroidSerif-BoldItalic-SmallCaps.vf
-./fonts/vf/public/droid/t1-DroidSerif-Bold-SmallCaps.vf
-./fonts/vf/public/droid/ts1-DroidSerif-BoldItalic.vf
-./fonts/vf/public/droid/ot1-DroidSerif-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t2b-DroidSerif-Italic.vf
-./fonts/vf/public/droid/t1-DroidSerif-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/x2-DroidSans-SmallCaps.vf
-./fonts/vf/public/droid/lgr-DroidSerif-Regular-SmallCaps.vf
-./fonts/vf/public/droid/ot1-DroidSansMono-Slanted.vf
-./fonts/vf/public/droid/lgr-DroidSerif-BoldItalic.vf
-./fonts/vf/public/droid/t1-DroidSerif-Italic-Upright.vf
-./fonts/vf/public/droid/t2a-DroidSansMono-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t1-DroidSans-SmallCaps.vf
-./fonts/vf/public/droid/x2-DroidSans-Bold.vf
-./fonts/vf/public/droid/lgr-DroidSans-Bold-SmallCaps.vf
-./fonts/vf/public/droid/ot1-DroidSerif-Italic-Upright.vf
-./fonts/vf/public/droid/ot1-DroidSerif-BoldItalic-Upright.vf
-./fonts/vf/public/droid/t2b-DroidSerif-BoldItalic-Upright-SmallCaps.vf
-./fonts/vf/public/droid/ot1-DroidSerif-Bold-SmallCaps.vf
-./fonts/vf/public/droid/lgr-DroidSerif-BoldItalic-Upright.vf
-./fonts/vf/public/droid/t2a-DroidSerif-Bold-Slanted.vf
-./fonts/vf/public/droid/lgr-DroidSerif-BoldItalic-SmallCaps.vf
-./fonts/vf/public/droid/x2-DroidSerif-Italic-SmallCaps.vf
-./fonts/vf/public/droid/lgr-DroidSans-Slanted.vf
-./fonts/vf/public/droid/ot1-DroidSansMono-SmallCaps.vf
-./fonts/vf/public/droid/ot1-DroidSans-Bold.vf
-./fonts/vf/public/droid/ts1-DroidSerif-Regular.vf
-./fonts/vf/public/droid/t2b-DroidSansMono-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t2a-DroidSerif-Regular-Slanted.vf
-./fonts/vf/public/droid/lgr-DroidSerif-Italic-SmallCaps.vf
-./fonts/vf/public/droid/t2c-DroidSans-SmallCaps.vf
-./fonts/vf/public/droid/ot1-DroidSerif-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/ot1-DroidSans-Slanted.vf
-./fonts/vf/public/droid/ts1-DroidSansMono.vf
-./fonts/vf/public/droid/t1-DroidSansMono.vf
-./fonts/vf/public/droid/x2-DroidSerif-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t2c-DroidSans-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t1-DroidSerif-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t2c-DroidSerif-Italic-Upright.vf
-./fonts/vf/public/droid/t2c-DroidSerif-BoldItalic-SmallCaps.vf
-./fonts/vf/public/droid/ot1-DroidSansMono.vf
-./fonts/vf/public/droid/t2c-DroidSerif-BoldItalic-Upright.vf
-./fonts/vf/public/droid/ot1-DroidSans-Bold-Slanted.vf
-./fonts/vf/public/droid/x2-DroidSans-Bold-SmallCaps.vf
-./fonts/vf/public/droid/x2-DroidSerif-Bold.vf
-./fonts/vf/public/droid/t2c-DroidSerif-Italic-SmallCaps.vf
-./fonts/vf/public/droid/t2c-DroidSans-Bold-SmallCaps.vf
-./fonts/vf/public/droid/t2b-DroidSans-SmallCaps.vf
-./fonts/vf/public/droid/x2-DroidSerif-BoldItalic-Upright.vf
-./fonts/vf/public/droid/t2c-DroidSerif-Italic.vf
-./fonts/vf/public/droid/ot1-DroidSerif-Italic.vf
-./fonts/vf/public/droid/lgr-DroidSans-Bold-Slanted.vf
-./fonts/vf/public/droid/t2b-DroidSerif-Regular-Slanted.vf
-./fonts/vf/public/droid/t2c-DroidSerif-BoldItalic-Upright-SmallCaps.vf
-./fonts/vf/public/droid/t2c-DroidSerif-Bold.vf
-./fonts/vf/public/droid/x2-DroidSerif-Regular.vf
-./fonts/vf/public/droid/lgr-DroidSans-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t1-DroidSans-Bold-SmallCaps.vf
-./fonts/vf/public/droid/t1-DroidSerif-Italic-Upright-SmallCaps.vf
-./fonts/vf/public/droid/t2c-DroidSansMono-Slanted.vf
-./fonts/vf/public/droid/t2b-DroidSerif-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/ts1-DroidSans-Bold.vf
-./fonts/vf/public/droid/t2c-DroidSerif-BoldItalic.vf
-./fonts/vf/public/droid/x2-DroidSerif-Bold-SmallCaps.vf
-./fonts/vf/public/droid/lgr-DroidSerif-Bold-SmallCaps.vf
-./fonts/vf/public/droid/t2b-DroidSerif-Bold-SmallCaps.vf
-./fonts/vf/public/droid/lgr-DroidSerif-BoldItalic-Upright-SmallCaps.vf
-./fonts/vf/public/droid/lgr-DroidSans-SmallCaps.vf
-./fonts/vf/public/droid/t2b-DroidSerif-Bold-Slanted.vf
-./fonts/vf/public/droid/t2a-DroidSerif-BoldItalic-SmallCaps.vf
-./fonts/vf/public/droid/t2b-DroidSerif-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t2a-DroidSerif-BoldItalic.vf
-./fonts/vf/public/droid/x2-DroidSans-Bold-Slanted.vf
-./fonts/vf/public/droid/ot1-DroidSerif-Bold-Slanted.vf
-./fonts/vf/public/droid/lgr-DroidSerif-Bold-Slanted.vf
-./fonts/vf/public/droid/t1-DroidSerif-Bold.vf
-./fonts/vf/public/droid/lgr-DroidSans-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/ot1-DroidSans.vf
-./fonts/vf/public/droid/x2-DroidSerif-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t2b-DroidSerif-Bold.vf
-./fonts/vf/public/droid/t2a-DroidSans-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t1-DroidSansMono-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t2a-DroidSerif-Regular.vf
-./fonts/vf/public/droid/x2-DroidSerif-Italic-Upright-SmallCaps.vf
-./fonts/vf/public/droid/t2b-DroidSansMono-SmallCaps.vf
-./fonts/vf/public/droid/t2a-DroidSans.vf
-./fonts/vf/public/droid/t1-DroidSans-Bold.vf
-./fonts/vf/public/droid/ts1-DroidSerif-Bold-Slanted.vf
-./fonts/vf/public/droid/lgr-DroidSerif-Italic.vf
-./fonts/vf/public/droid/t1-DroidSans-Bold-Slanted.vf
-./fonts/vf/public/droid/ts1-DroidSerif-BoldItalic-Upright.vf
-./fonts/vf/public/droid/t2a-DroidSerif-BoldItalic-Upright-SmallCaps.vf
-./fonts/vf/public/droid/t2c-DroidSansMono-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t2c-DroidSerif-Bold-SmallCaps.vf
-./fonts/vf/public/droid/ot1-DroidSans-SmallCaps.vf
-./fonts/vf/public/droid/t1-DroidSans-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t2b-DroidSansMono-Slanted.vf
-./fonts/vf/public/droid/lgr-DroidSerif-Bold.vf
-./fonts/vf/public/droid/ot1-DroidSerif-BoldItalic-Upright-SmallCaps.vf
-./fonts/vf/public/droid/x2-DroidSans.vf
-./fonts/vf/public/droid/t1-DroidSans-Slanted.vf
-./fonts/vf/public/droid/lgr-DroidSansMono-Slanted.vf
-./fonts/vf/public/droid/ot1-DroidSerif-Italic-SmallCaps.vf
-./fonts/vf/public/droid/t1-DroidSerif-BoldItalic-SmallCaps.vf
-./fonts/vf/public/droid/ts1-DroidSerif-Bold.vf
-./fonts/vf/public/droid/t2a-DroidSerif-Bold-SmallCaps.vf
-./fonts/vf/public/droid/t2a-DroidSerif-Regular-SmallCaps.vf
-./fonts/vf/public/droid/t2b-DroidSans-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t2c-DroidSerif-Regular-SmallCaps.vf
-./fonts/vf/public/droid/t2a-DroidSerif-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/ot1-DroidSerif-Italic-Upright-SmallCaps.vf
-./fonts/vf/public/droid/t1-DroidSans.vf
-./fonts/vf/public/droid/lgr-DroidSansMono-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t2c-DroidSans-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/x2-DroidSerif-BoldItalic-SmallCaps.vf
-./fonts/vf/public/droid/ts1-DroidSans-Slanted.vf
-./fonts/vf/public/droid/t1-DroidSerif-Italic.vf
-./fonts/vf/public/droid/t2c-DroidSansMono.vf
-./fonts/vf/public/droid/t2c-DroidSans-Slanted.vf
-./fonts/vf/public/droid/t1-DroidSerif-Regular.vf
-./fonts/vf/public/droid/t2b-DroidSerif-Italic-Upright-SmallCaps.vf
-./fonts/vf/public/droid/t1-DroidSerif-Regular-Slanted.vf
-./fonts/vf/public/droid/ot1-DroidSerif-BoldItalic-SmallCaps.vf
-./fonts/vf/public/droid/x2-DroidSansMono-Slanted.vf
-./fonts/vf/public/droid/x2-DroidSerif-Bold-Slanted.vf
-./fonts/vf/public/droid/t2c-DroidSans-Bold-Slanted.vf
-./fonts/vf/public/droid/ts1-DroidSerif-Italic.vf
-./fonts/vf/public/droid/t2a-DroidSansMono-Slanted.vf
-./fonts/vf/public/droid/t2c-DroidSerif-Regular-Slanted.vf
-./fonts/vf/public/droid/t2b-DroidSansMono.vf
-./fonts/vf/public/droid/x2-DroidSansMono-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t1-DroidSerif-BoldItalic.vf
-./fonts/vf/public/droid/x2-DroidSansMono.vf
-./fonts/vf/public/droid/ts1-DroidSerif-Regular-Slanted.vf
-./fonts/vf/public/droid/t2c-DroidSansMono-SmallCaps.vf
-./fonts/vf/public/droid/x2-DroidSans-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t2a-DroidSansMono-SmallCaps.vf
-./fonts/vf/public/droid/lgr-DroidSerif-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t2b-DroidSans-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t2b-DroidSans.vf
-./fonts/vf/public/droid/t2a-DroidSansMono.vf
-./fonts/vf/public/droid/lgr-DroidSerif-Italic-Upright-SmallCaps.vf
-./fonts/vf/public/droid/t1-DroidSerif-Bold-Slanted.vf
-./fonts/vf/public/droid/t2c-DroidSerif-Regular.vf
-./fonts/vf/public/droid/x2-DroidSans-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t2a-DroidSans-Bold.vf
-./fonts/vf/public/droid/ot1-DroidSansMono-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/lgr-DroidSans-Bold.vf
-./fonts/vf/public/droid/t2a-DroidSerif-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t2a-DroidSans-Bold-Slanted.vf
-./fonts/vf/public/droid/ts1-DroidSansMono-Slanted.vf
-./fonts/vf/public/droid/t2a-DroidSerif-BoldItalic-Upright.vf
-./fonts/vf/public/droid/x2-DroidSerif-BoldItalic.vf
-./fonts/vf/public/droid/ot1-DroidSans-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t2b-DroidSerif-BoldItalic.vf
-./fonts/vf/public/droid/lgr-DroidSans.vf
-./fonts/vf/public/droid/t2b-DroidSerif-BoldItalic-Upright.vf
-./fonts/vf/public/droid/t2b-DroidSans-Bold-Slanted.vf
-./fonts/vf/public/droid/x2-DroidSerif-Regular-Slanted.vf
-./fonts/vf/public/droid/ot1-DroidSerif-Regular-Slanted.vf
-./fonts/vf/public/droid/t1-DroidSerif-Regular-SmallCaps.vf
-./fonts/vf/public/droid/t2c-DroidSerif-Bold-Slanted.vf
-./fonts/vf/public/droid/t2a-DroidSans-Bold-SmallCaps.vf
-./fonts/vf/public/droid/ot1-DroidSerif-BoldItalic.vf
-./fonts/vf/public/droid/ot1-DroidSans-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/lgr-DroidSansMono-SmallCaps.vf
-./fonts/vf/public/droid/t2b-DroidSerif-Italic-SmallCaps.vf
-./fonts/vf/public/droid/t2b-DroidSerif-Regular.vf
-./fonts/vf/public/droid/t2c-DroidSans.vf
-./fonts/vf/public/droid/ot1-DroidSerif-Regular.vf
-./fonts/vf/public/droid/ot1-DroidSerif-Regular-SmallCaps.vf
-./fonts/vf/public/droid/x2-DroidSerif-Italic-Upright.vf
-./fonts/vf/public/droid/t2a-DroidSerif-Italic-SmallCaps.vf
-./fonts/vf/public/droid/t2a-DroidSans-Slanted.vf
-./fonts/vf/public/droid/t2a-DroidSerif-Bold.vf
-./fonts/vf/public/droid/ot1-DroidSans-Bold-SmallCaps.vf
-./fonts/vf/public/droid/x2-DroidSans-Slanted.vf
-./fonts/vf/public/droid/t1-DroidSerif-BoldItalic-Upright-SmallCaps.vf
-./fonts/vf/public/droid/t1-DroidSans-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/x2-DroidSerif-Regular-SmallCaps.vf
-./fonts/vf/public/droid/t2a-DroidSerif-Italic-Upright-SmallCaps.vf
-./fonts/vf/public/droid/t2b-DroidSans-Slanted.vf
-./fonts/vf/public/droid/t2c-DroidSerif-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t2a-DroidSans-SmallCaps.vf
-./fonts/vf/public/droid/t2b-DroidSerif-Italic-Upright.vf
-./fonts/vf/public/droid/lgr-DroidSerif-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/t1-DroidSerif-Italic-SmallCaps.vf
-./fonts/vf/public/droid/ts1-DroidSans.vf
-./fonts/vf/public/droid/t2a-DroidSerif-Italic-Upright.vf
-./fonts/vf/public/droid/ts1-DroidSerif-Italic-Upright.vf
-./fonts/vf/public/droid/t1-DroidSerif-BoldItalic-Upright.vf
-./fonts/vf/public/droid/t1-DroidSansMono-SmallCaps.vf
-./fonts/vf/public/droid/t2c-DroidSans-Bold.vf
-./fonts/vf/public/droid/lgr-DroidSerif-Regular-Slanted.vf
-./fonts/vf/public/droid/x2-DroidSansMono-SmallCaps.vf
-./fonts/vf/public/droid/t2b-DroidSerif-Regular-SmallCaps.vf
-./fonts/vf/public/droid/lgr-DroidSansMono.vf
-./fonts/vf/public/droid/t2a-DroidSerif-Italic.vf
-./fonts/vf/public/droid/t2b-DroidSans-Bold.vf
-./fonts/vf/public/droid/t2a-DroidSans-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/lgr-DroidSerif-Italic-Upright.vf
-./fonts/vf/public/droid/ts1-DroidSans-Bold-Slanted.vf
-./fonts/vf/public/droid/lgr-DroidSerif-Regular.vf
-./fonts/vf/public/droid/t2c-DroidSerif-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/droid/ot1-DroidSerif-Bold.vf
-./fonts/vf/public/droid/t1-DroidSansMono-Slanted.vf
-./fonts/vf/public/droid/x2-DroidSerif-BoldItalic-Upright-SmallCaps.vf
-./fonts/vf/public/droid/t2c-DroidSerif-Italic-Upright-SmallCaps.vf
-./fonts/vf/public/droid/x2-DroidSerif-Italic.vf
+./fonts/tfm/public/droid/t2c-DroidSans.tfm
+./fonts/afm/public/droid/DroidSerif-BoldItalic.afm
+./fonts/afm/public/droid/DroidSerif-Regular.afm
 ./fonts/afm/public/droid/DroidSans-Bold.afm
+./fonts/afm/public/droid/DroidSerif-Italic.afm
 ./fonts/afm/public/droid/DroidSansMono.afm
-./fonts/afm/public/droid/DroidSans.afm
-./fonts/afm/public/droid/DroidSerif-Regular.afm
 ./fonts/afm/public/droid/DroidSerif-Bold.afm
-./fonts/afm/public/droid/DroidSerif-Italic.afm
-./fonts/afm/public/droid/DroidSerif-BoldItalic.afm
-./fonts/truetype/public/droid/DroidSerif-Regular.ttf
-./fonts/truetype/public/droid/DroidSansMono.ttf
-./fonts/truetype/public/droid/DroidSerif-Italic.ttf
-./fonts/truetype/public/droid/DroidSans.ttf
-./fonts/truetype/public/droid/DroidSerif-Bold.ttf
-./fonts/truetype/public/droid/DroidSans-Bold.ttf
-./fonts/truetype/public/droid/DroidSerif-BoldItalic.ttf
-./fonts/enc/dvips/droid/droid-lgr.enc
-./fonts/enc/dvips/droid/droid-x2.enc
-./fonts/enc/dvips/droid/droid-t2c.enc
-./fonts/enc/dvips/droid/droid-fixlatin.enc
-./fonts/enc/dvips/droid/droid-t2b.enc
-./fonts/enc/dvips/droid/droid-fixtextcomp.enc
-./fonts/enc/dvips/droid/droid-fixgreek.enc
-./fonts/enc/dvips/droid/droid-fixcyrillic.enc
-./fonts/enc/dvips/droid/droid-ts1.enc
-./fonts/enc/dvips/droid/droid-t2a.enc
-./fonts/enc/dvips/droid/droid-ot1.enc
-./fonts/enc/dvips/droid/droid-t1.enc
+./fonts/afm/public/droid/DroidSans.afm
+./source/droid/droid.pdf
+./source/droid/droidserif-samples.pdf
+./source/droid/droid-fixlatin.etx
+./source/droid/droid-map.tex
+./source/droid/droidsans-samples.tex
+./source/droid/droid-drv.tex
+./source/droid/droid.tex
+./source/droid/droid-reglyph.tex
+./source/droid/Makefile
+./source/droid/droid-fixcyrillic.etx
+./source/droid/droidsansmono-samples.tex
+./source/droid/ttf2type1.pe
+./source/droid/droidsans-samples.pdf
+./source/droid/CHANGES
+./source/droid/droid-fixgreek.etx
+./source/droid/droidserif-samples.tex
+./source/droid/README
+./source/droid/droid-fixtextcomp.etx
+./source/droid/droidsansmono-samples.pdf
 ./doc/latex/droid/droid.pdf
+./doc/latex/droid/droidserif-samples.pdf
+./doc/latex/droid/droidsans-samples.tex
 ./doc/latex/droid/droid.tex
+./doc/latex/droid/droidsansmono-samples.tex
+./doc/latex/droid/droidsans-samples.pdf
 ./doc/latex/droid/CHANGES
+./doc/latex/droid/droidserif-samples.tex
 ./doc/latex/droid/README
+./doc/latex/droid/droidsansmono-samples.pdf
 ./README
-./tex/latex/droid/lgrfds.fd
-./tex/latex/droid/droidserif.sty
-./tex/latex/droid/x2fdm.fd
-./tex/latex/droid/lgrfdr.fd
 ./tex/latex/droid/ts1fds.fd
-./tex/latex/droid/t2cfdm.fd
-./tex/latex/droid/ot1fdm.fd
-./tex/latex/droid/t2cfds.fd
-./tex/latex/droid/droidmono.sty
-./tex/latex/droid/t1fds.fd
-./tex/latex/droid/ts1fdr.fd
-./tex/latex/droid/t1fdm.fd
-./tex/latex/droid/t1fdr.fd
-./tex/latex/droid/ot1fds.fd
+./tex/latex/droid/ts1fdm.fd
 ./tex/latex/droid/t2afdr.fd
-./tex/latex/droid/t2cfdr.fd
 ./tex/latex/droid/t2bfdr.fd
-./tex/latex/droid/x2fds.fd
-./tex/latex/droid/ot1fdr.fd
-./tex/latex/droid/t2afdm.fd
-./tex/latex/droid/droid.sty
+./tex/latex/droid/droidserif.sty
+./tex/latex/droid/t2cfdm.fd
+./tex/latex/droid/t2bfds.fd
 ./tex/latex/droid/x2fdr.fd
+./tex/latex/droid/t2cfdr.fd
 ./tex/latex/droid/droidsans.sty
-./tex/latex/droid/t2afds.fd
-./tex/latex/droid/lgrfdm.fd
 ./tex/latex/droid/t2bfdm.fd
-./tex/latex/droid/t2bfds.fd
-./tex/latex/droid/ts1fdm.fd
+./tex/latex/droid/droid.sty
+./tex/latex/droid/lgrfdm.fd
+./tex/latex/droid/t1fdm.fd
+./tex/latex/droid/t2afds.fd
+./tex/latex/droid/t2afdm.fd
+./tex/latex/droid/ot1fdm.fd
+./tex/latex/droid/lgrfdr.fd
+./tex/latex/droid/droidmono.sty
+./tex/latex/droid/ot1fdr.fd
+./tex/latex/droid/t1fdr.fd
+./tex/latex/droid/ts1fdr.fd
+./tex/latex/droid/x2fds.fd
+./tex/latex/droid/t2cfds.fd
+./tex/latex/droid/x2fdm.fd
+./tex/latex/droid/lgrfds.fd
+./tex/latex/droid/t1fds.fd
+./tex/latex/droid/ot1fds.fd
+./manifest.txt
diff --git a/Master/texmf-dist/fonts/afm/public/droid/DroidSans-Bold.afm b/Master/texmf-dist/fonts/afm/public/droid/DroidSans-Bold.afm
index deca97d228a..3452296dbcf 100644
--- a/Master/texmf-dist/fonts/afm/public/droid/DroidSans-Bold.afm
+++ b/Master/texmf-dist/fonts/afm/public/droid/DroidSans-Bold.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20100429
-Comment Creation Date: Sat Jan  8 03:36:52 2011
+Comment Creation Date: Thu Mar 24 01:54:15 2011
 FontName DroidSans-Bold
 FullName Droid Sans Bold
 FamilyName Droid Sans
diff --git a/Master/texmf-dist/fonts/afm/public/droid/DroidSans.afm b/Master/texmf-dist/fonts/afm/public/droid/DroidSans.afm
index 13e7be5727a..bca87dde9d5 100644
--- a/Master/texmf-dist/fonts/afm/public/droid/DroidSans.afm
+++ b/Master/texmf-dist/fonts/afm/public/droid/DroidSans.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20100429
-Comment Creation Date: Sat Jan  8 03:36:52 2011
+Comment Creation Date: Thu Mar 24 01:54:14 2011
 FontName DroidSans
 FullName Droid Sans
 FamilyName Droid Sans
diff --git a/Master/texmf-dist/fonts/afm/public/droid/DroidSansMono.afm b/Master/texmf-dist/fonts/afm/public/droid/DroidSansMono.afm
index aa0e5411877..b58033a4d61 100644
--- a/Master/texmf-dist/fonts/afm/public/droid/DroidSansMono.afm
+++ b/Master/texmf-dist/fonts/afm/public/droid/DroidSansMono.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20100429
-Comment Creation Date: Sat Jan  8 03:36:52 2011
+Comment Creation Date: Thu Mar 24 01:54:15 2011
 FontName DroidSansMono
 FullName Droid Sans Mono
 FamilyName Droid Sans Mono
diff --git a/Master/texmf-dist/fonts/afm/public/droid/DroidSerif-Bold.afm b/Master/texmf-dist/fonts/afm/public/droid/DroidSerif-Bold.afm
index c1533d955bf..854ca85b4ee 100644
--- a/Master/texmf-dist/fonts/afm/public/droid/DroidSerif-Bold.afm
+++ b/Master/texmf-dist/fonts/afm/public/droid/DroidSerif-Bold.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20100429
-Comment Creation Date: Sat Jan  8 03:36:53 2011
+Comment Creation Date: Thu Mar 24 01:54:14 2011
 FontName DroidSerif-Bold
 FullName Droid Serif Bold
 FamilyName Droid Serif
diff --git a/Master/texmf-dist/fonts/afm/public/droid/DroidSerif-BoldItalic.afm b/Master/texmf-dist/fonts/afm/public/droid/DroidSerif-BoldItalic.afm
index 4eb048da028..db4f32e4f36 100644
--- a/Master/texmf-dist/fonts/afm/public/droid/DroidSerif-BoldItalic.afm
+++ b/Master/texmf-dist/fonts/afm/public/droid/DroidSerif-BoldItalic.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20100429
-Comment Creation Date: Sat Jan  8 03:36:52 2011
+Comment Creation Date: Thu Mar 24 01:54:14 2011
 FontName DroidSerif-BoldItalic
 FullName Droid Serif Bold Italic
 FamilyName Droid Serif
diff --git a/Master/texmf-dist/fonts/afm/public/droid/DroidSerif-Italic.afm b/Master/texmf-dist/fonts/afm/public/droid/DroidSerif-Italic.afm
index 4583a8f2ee1..dd579d3909a 100644
--- a/Master/texmf-dist/fonts/afm/public/droid/DroidSerif-Italic.afm
+++ b/Master/texmf-dist/fonts/afm/public/droid/DroidSerif-Italic.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20100429
-Comment Creation Date: Sat Jan  8 03:36:52 2011
+Comment Creation Date: Thu Mar 24 01:54:15 2011
 FontName DroidSerif-Italic
 FullName Droid Serif Italic
 FamilyName Droid Serif
diff --git a/Master/texmf-dist/fonts/afm/public/droid/DroidSerif-Regular.afm b/Master/texmf-dist/fonts/afm/public/droid/DroidSerif-Regular.afm
index dc940586892..bf286ba10de 100644
--- a/Master/texmf-dist/fonts/afm/public/droid/DroidSerif-Regular.afm
+++ b/Master/texmf-dist/fonts/afm/public/droid/DroidSerif-Regular.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20100429
-Comment Creation Date: Sat Jan  8 03:36:52 2011
+Comment Creation Date: Thu Mar 24 01:54:15 2011
 FontName DroidSerif
 FullName Droid Serif
 FamilyName Droid Serif
diff --git a/Master/texmf-dist/fonts/enc/dvips/droid/droid-fixcyrillic.enc b/Master/texmf-dist/fonts/enc/dvips/droid/droid-fixcyrillic.enc
index 3ca1f2f4e94..7ed3116faae 100644
--- a/Master/texmf-dist/fonts/enc/dvips/droid/droid-fixcyrillic.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/droid/droid-fixcyrillic.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file droid-fixcyrillic.etx",
 %    version = "See file droid-fixcyrillic.etx",
-%    date = "generated 2011/01/08",
+%    date = "generated 2011/03/24",
 %    filename = "droid-fixcyrillic.enc",
 %    email = "See file droid-fixcyrillic.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/droid/droid-fixgreek.enc b/Master/texmf-dist/fonts/enc/dvips/droid/droid-fixgreek.enc
index cb88b3a0ee4..79f70ce54fd 100644
--- a/Master/texmf-dist/fonts/enc/dvips/droid/droid-fixgreek.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/droid/droid-fixgreek.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file droid-fixgreek.etx",
 %    version = "See file droid-fixgreek.etx",
-%    date = "generated 2011/01/08",
+%    date = "generated 2011/03/24",
 %    filename = "droid-fixgreek.enc",
 %    email = "See file droid-fixgreek.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/droid/droid-fixlatin.enc b/Master/texmf-dist/fonts/enc/dvips/droid/droid-fixlatin.enc
index 9610de1e650..a1e5cc60022 100644
--- a/Master/texmf-dist/fonts/enc/dvips/droid/droid-fixlatin.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/droid/droid-fixlatin.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file droid-fixlatin.etx",
 %    version = "See file droid-fixlatin.etx",
-%    date = "generated 2011/01/08",
+%    date = "generated 2011/03/24",
 %    filename = "droid-fixlatin.enc",
 %    email = "See file droid-fixlatin.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/droid/droid-fixtextcomp.enc b/Master/texmf-dist/fonts/enc/dvips/droid/droid-fixtextcomp.enc
index 75e16f41586..61e4214f926 100644
--- a/Master/texmf-dist/fonts/enc/dvips/droid/droid-fixtextcomp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/droid/droid-fixtextcomp.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file droid-fixtextcomp.etx",
 %    version = "See file droid-fixtextcomp.etx",
-%    date = "generated 2011/01/08",
+%    date = "generated 2011/03/24",
 %    filename = "droid-fixtextcomp.enc",
 %    email = "See file droid-fixtextcomp.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/droid/droid-lgr.enc b/Master/texmf-dist/fonts/enc/dvips/droid/droid-lgr.enc
index 8cedddcc2d8..6a0efcc8a20 100644
--- a/Master/texmf-dist/fonts/enc/dvips/droid/droid-lgr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/droid/droid-lgr.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file lgr.etx",
 %    version = "See file lgr.etx",
-%    date = "generated 2011/01/08",
+%    date = "generated 2011/03/24",
 %    filename = "droid-lgr.enc",
 %    email = "See file lgr.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/droid/droid-ot1.enc b/Master/texmf-dist/fonts/enc/dvips/droid/droid-ot1.enc
index 0682ad1a519..318b3372f1f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/droid/droid-ot1.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/droid/droid-ot1.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file ot1.etx",
 %    version = "See file ot1.etx",
-%    date = "generated 2011/01/08",
+%    date = "generated 2011/03/24",
 %    filename = "droid-ot1.enc",
 %    email = "See file ot1.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/droid/droid-t1.enc b/Master/texmf-dist/fonts/enc/dvips/droid/droid-t1.enc
index 40e06fa93c7..a14d5f2275d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/droid/droid-t1.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/droid/droid-t1.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file t1.etx",
 %    version = "See file t1.etx",
-%    date = "generated 2011/01/08",
+%    date = "generated 2011/03/24",
 %    filename = "droid-t1.enc",
 %    email = "See file t1.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/droid/droid-t2a.enc b/Master/texmf-dist/fonts/enc/dvips/droid/droid-t2a.enc
index 0143aebe023..08dbcd922b1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/droid/droid-t2a.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/droid/droid-t2a.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file t2a.etx",
 %    version = "See file t2a.etx",
-%    date = "generated 2011/01/08",
+%    date = "generated 2011/03/24",
 %    filename = "droid-t2a.enc",
 %    email = "See file t2a.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/droid/droid-t2b.enc b/Master/texmf-dist/fonts/enc/dvips/droid/droid-t2b.enc
index 3dec065354b..eaa52d2b1e3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/droid/droid-t2b.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/droid/droid-t2b.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file t2b.etx",
 %    version = "See file t2b.etx",
-%    date = "generated 2011/01/08",
+%    date = "generated 2011/03/24",
 %    filename = "droid-t2b.enc",
 %    email = "See file t2b.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/droid/droid-t2c.enc b/Master/texmf-dist/fonts/enc/dvips/droid/droid-t2c.enc
index 3009010a428..1d47067faa6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/droid/droid-t2c.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/droid/droid-t2c.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file t2c.etx",
 %    version = "See file t2c.etx",
-%    date = "generated 2011/01/08",
+%    date = "generated 2011/03/24",
 %    filename = "droid-t2c.enc",
 %    email = "See file t2c.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/droid/droid-ts1.enc b/Master/texmf-dist/fonts/enc/dvips/droid/droid-ts1.enc
index 861e9be192e..6068c228c29 100644
--- a/Master/texmf-dist/fonts/enc/dvips/droid/droid-ts1.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/droid/droid-ts1.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file ts1.etx",
 %    version = "See file ts1.etx",
-%    date = "generated 2011/01/08",
+%    date = "generated 2011/03/24",
 %    filename = "droid-ts1.enc",
 %    email = "See file ts1.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/droid/droid-x2.enc b/Master/texmf-dist/fonts/enc/dvips/droid/droid-x2.enc
index 5f8305abd6b..dd4eab065f4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/droid/droid-x2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/droid/droid-x2.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file x2.etx",
 %    version = "See file x2.etx",
-%    date = "generated 2011/01/08",
+%    date = "generated 2011/03/24",
 %    filename = "droid-x2.enc",
 %    email = "See file x2.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/map/dvips/droid/droid.map b/Master/texmf-dist/fonts/map/dvips/droid/droid.map
index 5819f199bda..5530521357b 100644
--- a/Master/texmf-dist/fonts/map/dvips/droid/droid.map
+++ b/Master/texmf-dist/fonts/map/dvips/droid/droid.map
@@ -28,6 +28,7 @@ raw-fixtextcomp-DroidSerif-Regular-Slanted DroidSerif <droid-fixtextcomp.enc <Dr
 raw-ts1-DroidSerif-Regular-Slanted DroidSerif <droid-ts1.enc <DroidSerif-Regular.pfb " fontinst-autoenc-ts1 ReEncodeFont 0.213 SlantFont "
 raw-fixtextcomp-DroidSerif-Italic DroidSerif-Italic <droid-fixtextcomp.enc <DroidSerif-Italic.pfb " fontinst-autoenc-droid-fixtextcomp ReEncodeFont "
 raw-ts1-DroidSerif-Italic DroidSerif-Italic <droid-ts1.enc <DroidSerif-Italic.pfb " fontinst-autoenc-ts1 ReEncodeFont "
+raw-fixtextcomp-DroidSerif-Italic-Upright DroidSerif-Italic <droid-fixtextcomp.enc <DroidSerif-Italic.pfb " fontinst-autoenc-droid-fixtextcomp ReEncodeFont -0.213 SlantFont "
 raw-ts1-DroidSerif-Italic-Upright DroidSerif-Italic <droid-ts1.enc <DroidSerif-Italic.pfb " fontinst-autoenc-ts1 ReEncodeFont -0.213 SlantFont "
 raw-fixtextcomp-DroidSerif-Bold DroidSerif-Bold <droid-fixtextcomp.enc <DroidSerif-Bold.pfb " fontinst-autoenc-droid-fixtextcomp ReEncodeFont "
 raw-ts1-DroidSerif-Bold DroidSerif-Bold <droid-ts1.enc <DroidSerif-Bold.pfb " fontinst-autoenc-ts1 ReEncodeFont "
@@ -35,6 +36,7 @@ raw-fixtextcomp-DroidSerif-Bold-Slanted DroidSerif-Bold <droid-fixtextcomp.enc <
 raw-ts1-DroidSerif-Bold-Slanted DroidSerif-Bold <droid-ts1.enc <DroidSerif-Bold.pfb " fontinst-autoenc-ts1 ReEncodeFont 0.213 SlantFont "
 raw-fixtextcomp-DroidSerif-BoldItalic DroidSerif-BoldItalic <droid-fixtextcomp.enc <DroidSerif-BoldItalic.pfb " fontinst-autoenc-droid-fixtextcomp ReEncodeFont "
 raw-ts1-DroidSerif-BoldItalic DroidSerif-BoldItalic <droid-ts1.enc <DroidSerif-BoldItalic.pfb " fontinst-autoenc-ts1 ReEncodeFont "
+raw-fixtextcomp-DroidSerif-BoldItalic-Upright DroidSerif-BoldItalic <droid-fixtextcomp.enc <DroidSerif-BoldItalic.pfb " fontinst-autoenc-droid-fixtextcomp ReEncodeFont -0.213 SlantFont "
 raw-ts1-DroidSerif-BoldItalic-Upright DroidSerif-BoldItalic <droid-ts1.enc <DroidSerif-BoldItalic.pfb " fontinst-autoenc-ts1 ReEncodeFont -0.213 SlantFont "
 raw-t2a-DroidSerif-Regular DroidSerif <droid-t2a.enc <DroidSerif-Regular.pfb " fontinst-autoenc-t2a ReEncodeFont "
 raw-fixcyrillic-DroidSerif-Regular DroidSerif <droid-fixcyrillic.enc <DroidSerif-Regular.pfb " fontinst-autoenc-droid-fixcyrillic ReEncodeFont "
diff --git a/Master/texmf-dist/fonts/tfm/public/droid/ts1-DroidSerif-BoldItalic-Upright.tfm b/Master/texmf-dist/fonts/tfm/public/droid/ts1-DroidSerif-BoldItalic-Upright.tfm
index e9967a7e189..a6421ae9352 100644
--- a/Master/texmf-dist/fonts/tfm/public/droid/ts1-DroidSerif-BoldItalic-Upright.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/droid/ts1-DroidSerif-BoldItalic-Upright.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/droid/ts1-DroidSerif-Italic-Upright.tfm b/Master/texmf-dist/fonts/tfm/public/droid/ts1-DroidSerif-Italic-Upright.tfm
index 5a74d3c5fc8..47af440666d 100644
--- a/Master/texmf-dist/fonts/tfm/public/droid/ts1-DroidSerif-Italic-Upright.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/droid/ts1-DroidSerif-Italic-Upright.tfm
diff --git a/Master/texmf-dist/fonts/type1/public/droid/DroidSans-Bold.pfb b/Master/texmf-dist/fonts/type1/public/droid/DroidSans-Bold.pfb
index 7cdc777489d..edb79cffda4 100644
--- a/Master/texmf-dist/fonts/type1/public/droid/DroidSans-Bold.pfb
+++ b/Master/texmf-dist/fonts/type1/public/droid/DroidSans-Bold.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/droid/DroidSans.pfb b/Master/texmf-dist/fonts/type1/public/droid/DroidSans.pfb
index 1a54e0091b8..ae54aee64ca 100644
--- a/Master/texmf-dist/fonts/type1/public/droid/DroidSans.pfb
+++ b/Master/texmf-dist/fonts/type1/public/droid/DroidSans.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/droid/DroidSansMono.pfb b/Master/texmf-dist/fonts/type1/public/droid/DroidSansMono.pfb
index c4690d5bbba..96487abf3b3 100644
--- a/Master/texmf-dist/fonts/type1/public/droid/DroidSansMono.pfb
+++ b/Master/texmf-dist/fonts/type1/public/droid/DroidSansMono.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Bold.pfb b/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Bold.pfb
index 63e24a44329..ebade6ea115 100644
--- a/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Bold.pfb
+++ b/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Bold.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-BoldItalic.pfb b/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-BoldItalic.pfb
index 7968be0d4c8..ab14e8e4ed6 100644
--- a/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-BoldItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-BoldItalic.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Italic.pfb b/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Italic.pfb
index 297f8f21cb7..969d512e0b4 100644
--- a/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Italic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Italic.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Regular.pfb b/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Regular.pfb
index 63e7306f3fb..f08e47d83f1 100644
--- a/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Regular.pfb
+++ b/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Regular.pfb
diff --git a/Master/texmf-dist/fonts/vf/public/droid/ts1-DroidSerif-BoldItalic-Upright.vf b/Master/texmf-dist/fonts/vf/public/droid/ts1-DroidSerif-BoldItalic-Upright.vf
index d6db7b80507..41807867c07 100644
--- a/Master/texmf-dist/fonts/vf/public/droid/ts1-DroidSerif-BoldItalic-Upright.vf
+++ b/Master/texmf-dist/fonts/vf/public/droid/ts1-DroidSerif-BoldItalic-Upright.vf
diff --git a/Master/texmf-dist/fonts/vf/public/droid/ts1-DroidSerif-Italic-Upright.vf b/Master/texmf-dist/fonts/vf/public/droid/ts1-DroidSerif-Italic-Upright.vf
index 06a1bf7fa87..9a0f3d12f9e 100644
--- a/Master/texmf-dist/fonts/vf/public/droid/ts1-DroidSerif-Italic-Upright.vf
+++ b/Master/texmf-dist/fonts/vf/public/droid/ts1-DroidSerif-Italic-Upright.vf
diff --git a/Master/texmf-dist/source/droid/CHANGES b/Master/texmf-dist/source/droid/CHANGES
index 2580c6050db..b585d73a7fc 100644
--- a/Master/texmf-dist/source/droid/CHANGES
+++ b/Master/texmf-dist/source/droid/CHANGES
@@ -3,3 +3,8 @@ Changelog for version 1.1:
 
 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/Makefile b/Master/texmf-dist/source/droid/Makefile
index 5f375372f70..a7128c2dedc 100644
--- a/Master/texmf-dist/source/droid/Makefile
+++ b/Master/texmf-dist/source/droid/Makefile
@@ -1,5 +1,5 @@
 ## Makefile
-## Copyright 2010 Mohamed El Morabity
+## 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)
@@ -60,7 +60,7 @@ ETX_FILES = $(CUSTOM_ENCODINGS:=.etx)
 
 STYLE_FILES = $(wildcard *.sty)
 
-DOCUMENTATION = $(FONT_NAME).tex $(FONT_NAME).pdf CHANGES README
+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)
diff --git a/Master/texmf-dist/source/droid/README b/Master/texmf-dist/source/droid/README
index cdc6a2c9df8..aea1e529c03 100644
--- a/Master/texmf-dist/source/droid/README
+++ b/Master/texmf-dist/source/droid/README
@@ -1,5 +1,5 @@
 --------------------
- Droid, version 1.2
+ Droid, version 1.3
 --------------------
 
 The Droid typeface family was designed in the fall of 2006 by Ascender's Steve
diff --git a/Master/texmf-dist/source/droid/droid-drv.tex b/Master/texmf-dist/source/droid/droid-drv.tex
index 324763cc637..5f16a8c70c2 100644
--- a/Master/texmf-dist/source/droid/droid-drv.tex
+++ b/Master/texmf-dist/source/droid/droid-drv.tex
@@ -1,5 +1,5 @@
 %% droid-drv.tex
-%% Copyright 2010 Mohamed El Morabity
+%% 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)
@@ -174,7 +174,7 @@
 \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,fixlatin-DroidSerif-Italic-Upright,newlatin}{ts1}{TS1}{fdr}{m}{up}{<->\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}
 
@@ -184,7 +184,7 @@
 \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,fixlatin-DroidSerif-BoldItalic-Upright,newlatin}{ts1}{TS1}{fdr}{b}{up}{<->\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
diff --git a/Master/texmf-dist/source/droid/droid-fixcyrillic.etx b/Master/texmf-dist/source/droid/droid-fixcyrillic.etx
index cbcab0c03b4..ff6e998c79e 100644
--- a/Master/texmf-dist/source/droid/droid-fixcyrillic.etx
+++ b/Master/texmf-dist/source/droid/droid-fixcyrillic.etx
@@ -1,5 +1,5 @@
 %% droid-fixcyrillic.etx
-%% Copyright 2010 Mohamed El Morabity
+%% 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)
diff --git a/Master/texmf-dist/source/droid/droid-fixgreek.etx b/Master/texmf-dist/source/droid/droid-fixgreek.etx
index 8874cb4b048..523f39acb64 100644
--- a/Master/texmf-dist/source/droid/droid-fixgreek.etx
+++ b/Master/texmf-dist/source/droid/droid-fixgreek.etx
@@ -1,5 +1,5 @@
 %% droid-fixgreek.etx
-%% Copyright 2010 Mohamed El Morabity
+%% 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)
diff --git a/Master/texmf-dist/source/droid/droid-fixtextcomp.etx b/Master/texmf-dist/source/droid/droid-fixtextcomp.etx
index 9ff69c7428d..0b4adbe000d 100644
--- a/Master/texmf-dist/source/droid/droid-fixtextcomp.etx
+++ b/Master/texmf-dist/source/droid/droid-fixtextcomp.etx
@@ -1,5 +1,5 @@
 %% droid-fixtextcomp.etx
-%% Copyright 2010 Mohamed El Morabity
+%% 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)
diff --git a/Master/texmf-dist/source/droid/droid-map.tex b/Master/texmf-dist/source/droid/droid-map.tex
index 1e39235ca7f..7c0909500fc 100644
--- a/Master/texmf-dist/source/droid/droid-map.tex
+++ b/Master/texmf-dist/source/droid/droid-map.tex
@@ -1,5 +1,5 @@
 %% droid-map.etx
-%% Copyright 2010 Mohamed El Morabity
+%% 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)
diff --git a/Master/texmf-dist/source/droid/droid-reglyph.tex b/Master/texmf-dist/source/droid/droid-reglyph.tex
index 493ab414191..4033be77195 100644
--- a/Master/texmf-dist/source/droid/droid-reglyph.tex
+++ b/Master/texmf-dist/source/droid/droid-reglyph.tex
@@ -1,5 +1,5 @@
 %% droid-reglyph.tex
-%% Copyright 2010 Mohamed El Morabity
+%% 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)
diff --git a/Master/texmf-dist/source/droid/droid.pdf b/Master/texmf-dist/source/droid/droid.pdf
index 54ba268fd16..f56e4f18bff 100644
--- a/Master/texmf-dist/source/droid/droid.pdf
+++ b/Master/texmf-dist/source/droid/droid.pdf
diff --git a/Master/texmf-dist/source/droid/droid.tex b/Master/texmf-dist/source/droid/droid.tex
index 4c178595eaa..6bdfe019021 100644
--- a/Master/texmf-dist/source/droid/droid.tex
+++ b/Master/texmf-dist/source/droid/droid.tex
@@ -39,7 +39,7 @@
 \newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
 \newcommand{\program}{}
 
-\title{\LaTeX{} support for Droid\\\relsize{-1}Version~1.2}
+\title{\LaTeX{} support for Droid\\\relsize{-1}Version~1.3}
 
 \author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
 
@@ -148,12 +148,12 @@ Finally, to set Droid Sans Mono as the default typewriter font:
 
 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{scaled=\parameter{ratio}} will
-scale the font according to \parameter{ratio} (1.0 by default), for example:
+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[scaled=0.95]{droidserif}
-\usepackage[scaled=0.95]{droidsans}
-\usepackage[scaled=0.95]{droidmono}
+\usepackage[scale=0.95]{droidserif}
+\usepackage[scale=0.95]{droidsans}
+\usepackage[scale=0.95]{droidmono}
 \end{verbatim}
 
 \subsection{Encodings}
@@ -184,7 +184,7 @@ treated poorly, if at all. Note difference in kerning between e.g.
     \toprule
     OT1-encoded&{\fdsfamily To Ta Té}\\
     \midrule
-    T1-encoded&{\fontencoding{T1}\selectfont\fdsfamily To Ta Té}\\
+    T1-encoded&{\fdsfamily\fontencoding{T1}\selectfont To Ta Té}\\
     \bottomrule
   \end{tabular}
 \end{center}
@@ -201,7 +201,7 @@ substitutions.
     \toprule
     family&encoding&series&shape\\
     \midrule
-    \fdrfamily\multirow{4}{*}{fdr}&OT1, T1,&\multirow{3}{*}{m, b (bx)}&\multirow{2}{*}{n, it, sl, up}\\
+    \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}
diff --git a/Master/texmf-dist/source/droid/droidsans-samples.pdf b/Master/texmf-dist/source/droid/droidsans-samples.pdf
new file mode 100644
index 00000000000..c72b1ab6702
--- /dev/null
+++ b/Master/texmf-dist/source/droid/droidsans-samples.pdf
diff --git a/Master/texmf-dist/source/droid/droidsans-samples.tex b/Master/texmf-dist/source/droid/droidsans-samples.tex
new file mode 100644
index 00000000000..7e71f890ea0
--- /dev/null
+++ b/Master/texmf-dist/source/droid/droidsans-samples.tex
@@ -0,0 +1,79 @@
+%% 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
new file mode 100644
index 00000000000..7378988fb26
--- /dev/null
+++ b/Master/texmf-dist/source/droid/droidsansmono-samples.pdf
diff --git a/Master/texmf-dist/source/droid/droidsansmono-samples.tex b/Master/texmf-dist/source/droid/droidsansmono-samples.tex
new file mode 100644
index 00000000000..4818bc283a3
--- /dev/null
+++ b/Master/texmf-dist/source/droid/droidsansmono-samples.tex
@@ -0,0 +1,69 @@
+%% 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
new file mode 100644
index 00000000000..cef74da4b9d
--- /dev/null
+++ b/Master/texmf-dist/source/droid/droidserif-samples.pdf
diff --git a/Master/texmf-dist/source/droid/droidserif-samples.tex b/Master/texmf-dist/source/droid/droidserif-samples.tex
new file mode 100644
index 00000000000..9de7b897972
--- /dev/null
+++ b/Master/texmf-dist/source/droid/droidserif-samples.tex
@@ -0,0 +1,91 @@
+%% 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/ttf2type1.pe b/Master/texmf-dist/source/droid/ttf2type1.pe
index 4c71df2b326..0719858b891 100644
--- a/Master/texmf-dist/source/droid/ttf2type1.pe
+++ b/Master/texmf-dist/source/droid/ttf2type1.pe
@@ -1,6 +1,6 @@
 #!/usr/bin/env fontforge
 ## ttf2ype1.pe
-## Copyright 2010 Mohamed El Morabity
+## 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)
diff --git a/Master/texmf-dist/tex/latex/droid/droid.sty b/Master/texmf-dist/tex/latex/droid/droid.sty
index 9138bd29941..32ae080a3ab 100644
--- a/Master/texmf-dist/tex/latex/droid/droid.sty
+++ b/Master/texmf-dist/tex/latex/droid/droid.sty
@@ -1,5 +1,5 @@
 %% droid.sty
-%% Copyright 2010 Mohamed El Morabity
+%% 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)
@@ -14,9 +14,8 @@
 % This work consists of all files listed in manifest.txt.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{droid}[2010/12/04 Droid]
+\ProvidesPackage{droid}[2011/03/24 Droid]
 
-\RequirePackage{slantsc}
 \RequirePackage[default]{droidserif}
 \RequirePackage[defaultsans]{droidsans}
 \RequirePackage[defaultmono]{droidmono}
diff --git a/Master/texmf-dist/tex/latex/droid/droidmono.sty b/Master/texmf-dist/tex/latex/droid/droidmono.sty
index db21cd7b634..4626ade37e5 100644
--- a/Master/texmf-dist/tex/latex/droid/droidmono.sty
+++ b/Master/texmf-dist/tex/latex/droid/droidmono.sty
@@ -1,5 +1,5 @@
 %% droidmono.sty
-%% Copyright 2010 Mohamed El Morabity
+%% 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)
@@ -14,7 +14,7 @@
 % This work consists of all files listed in manifest.txt.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{droidmono}[2010/12/04 Droid Sans Mono]
+\ProvidesPackage{droidmono}[2011/03/24 Droid Sans Mono]
 
 \RequirePackage{keyval}
 \RequirePackage{slantsc}
@@ -33,7 +33,6 @@
 }
 
 \ProcessOptions*
-\relax
 
 \newcommand{\fdmfamily}{%
   \fontfamily{fdm}%
diff --git a/Master/texmf-dist/tex/latex/droid/droidsans.sty b/Master/texmf-dist/tex/latex/droid/droidsans.sty
index e3c61014b6b..0ae873a2e74 100644
--- a/Master/texmf-dist/tex/latex/droid/droidsans.sty
+++ b/Master/texmf-dist/tex/latex/droid/droidsans.sty
@@ -1,5 +1,5 @@
 %% droidsans.sty
-%% Copyright 2010 Mohamed El Morabity
+%% 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)
@@ -14,7 +14,7 @@
 % This work consists of all files listed in manifest.txt.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{droidsans}[2010/12/04 Droid Sans]
+\ProvidesPackage{droidsans}[2011/03/24 Droid Sans]
 
 \RequirePackage{keyval}
 \RequirePackage{slantsc}
@@ -38,7 +38,6 @@
 }
 
 \ProcessOptions*
-\relax
 
 \newcommand{\fdsfamily}{%
   \fontfamily{fds}%
diff --git a/Master/texmf-dist/tex/latex/droid/droidserif.sty b/Master/texmf-dist/tex/latex/droid/droidserif.sty
index 56ed45df4e6..2a910b5deb4 100644
--- a/Master/texmf-dist/tex/latex/droid/droidserif.sty
+++ b/Master/texmf-dist/tex/latex/droid/droidserif.sty
@@ -1,5 +1,5 @@
 %% droidserif.sty
-%% Copyright 2010 Mohamed El Morabity
+%% 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)
@@ -14,7 +14,7 @@
 % This work consists of all files listed in manifest.txt.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{droidserif}[2010/12/04 Droid Serif]
+\ProvidesPackage{droidserif}[2011/03/24 Droid Serif]
 
 \RequirePackage{keyval}
 \RequirePackage{slantsc}
@@ -33,7 +33,6 @@
 }
 
 \ProcessOptions*
-\relax
 
 \newcommand{\fdrfamily}{%
   \fontfamily{fdr}%
diff --git a/Master/texmf-dist/tex/latex/droid/lgrfdm.fd b/Master/texmf-dist/tex/latex/droid/lgrfdm.fd
index 085b70a9935..9d20804a4c3 100644
--- a/Master/texmf-dist/tex/latex/droid/lgrfdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/lgrfdm.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{lgrfdm.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for LGR/fdm.]
+   [2011/03/24 Fontinst v1.927 font definitions for LGR/fdm.]
 
 \expandafter\ifx\csname droid@fdm@scale\endcsname\relax
   \let\droid@fdm@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/lgrfdr.fd b/Master/texmf-dist/tex/latex/droid/lgrfdr.fd
index 0bb8639fb91..5d33c4cc841 100644
--- a/Master/texmf-dist/tex/latex/droid/lgrfdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/lgrfdr.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{lgrfdr.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for LGR/fdr.]
+   [2011/03/24 Fontinst v1.927 font definitions for LGR/fdr.]
 
 \expandafter\ifx\csname droid@fdr@scale\endcsname\relax
   \let\droid@fdr@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/lgrfds.fd b/Master/texmf-dist/tex/latex/droid/lgrfds.fd
index 0a71040539c..c5f1eb1d406 100644
--- a/Master/texmf-dist/tex/latex/droid/lgrfds.fd
+++ b/Master/texmf-dist/tex/latex/droid/lgrfds.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{lgrfds.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for LGR/fds.]
+   [2011/03/24 Fontinst v1.927 font definitions for LGR/fds.]
 
 \expandafter\ifx\csname droid@fds@scale\endcsname\relax
   \let\droid@fds@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/ot1fdm.fd b/Master/texmf-dist/tex/latex/droid/ot1fdm.fd
index 8a170a15227..2e04581646f 100644
--- a/Master/texmf-dist/tex/latex/droid/ot1fdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/ot1fdm.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{ot1fdm.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for OT1/fdm.]
+   [2011/03/24 Fontinst v1.927 font definitions for OT1/fdm.]
 
 \expandafter\ifx\csname droid@fdm@scale\endcsname\relax
   \let\droid@fdm@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/ot1fdr.fd b/Master/texmf-dist/tex/latex/droid/ot1fdr.fd
index b7bd084357a..468646676cc 100644
--- a/Master/texmf-dist/tex/latex/droid/ot1fdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/ot1fdr.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{ot1fdr.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for OT1/fdr.]
+   [2011/03/24 Fontinst v1.927 font definitions for OT1/fdr.]
 
 \expandafter\ifx\csname droid@fdr@scale\endcsname\relax
   \let\droid@fdr@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/ot1fds.fd b/Master/texmf-dist/tex/latex/droid/ot1fds.fd
index 0bee87bbb37..ef342bdfc8f 100644
--- a/Master/texmf-dist/tex/latex/droid/ot1fds.fd
+++ b/Master/texmf-dist/tex/latex/droid/ot1fds.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{ot1fds.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for OT1/fds.]
+   [2011/03/24 Fontinst v1.927 font definitions for OT1/fds.]
 
 \expandafter\ifx\csname droid@fds@scale\endcsname\relax
   \let\droid@fds@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/t1fdm.fd b/Master/texmf-dist/tex/latex/droid/t1fdm.fd
index 32c0454ecbc..9240ec5ef4f 100644
--- a/Master/texmf-dist/tex/latex/droid/t1fdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/t1fdm.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t1fdm.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for T1/fdm.]
+   [2011/03/24 Fontinst v1.927 font definitions for T1/fdm.]
 
 \expandafter\ifx\csname droid@fdm@scale\endcsname\relax
   \let\droid@fdm@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/t1fdr.fd b/Master/texmf-dist/tex/latex/droid/t1fdr.fd
index 0047f787db1..4ccb8287854 100644
--- a/Master/texmf-dist/tex/latex/droid/t1fdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/t1fdr.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t1fdr.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for T1/fdr.]
+   [2011/03/24 Fontinst v1.927 font definitions for T1/fdr.]
 
 \expandafter\ifx\csname droid@fdr@scale\endcsname\relax
   \let\droid@fdr@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/t1fds.fd b/Master/texmf-dist/tex/latex/droid/t1fds.fd
index 02521e9e007..40d8f6e0a6a 100644
--- a/Master/texmf-dist/tex/latex/droid/t1fds.fd
+++ b/Master/texmf-dist/tex/latex/droid/t1fds.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t1fds.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for T1/fds.]
+   [2011/03/24 Fontinst v1.927 font definitions for T1/fds.]
 
 \expandafter\ifx\csname droid@fds@scale\endcsname\relax
   \let\droid@fds@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/t2afdm.fd b/Master/texmf-dist/tex/latex/droid/t2afdm.fd
index d600c860f30..7b598ade66e 100644
--- a/Master/texmf-dist/tex/latex/droid/t2afdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2afdm.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t2afdm.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for T2A/fdm.]
+   [2011/03/24 Fontinst v1.927 font definitions for T2A/fdm.]
 
 \expandafter\ifx\csname droid@fdm@scale\endcsname\relax
   \let\droid@fdm@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/t2afdr.fd b/Master/texmf-dist/tex/latex/droid/t2afdr.fd
index 79bf2a74ccd..40cfc78ded2 100644
--- a/Master/texmf-dist/tex/latex/droid/t2afdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2afdr.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t2afdr.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for T2A/fdr.]
+   [2011/03/24 Fontinst v1.927 font definitions for T2A/fdr.]
 
 \expandafter\ifx\csname droid@fdr@scale\endcsname\relax
   \let\droid@fdr@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/t2afds.fd b/Master/texmf-dist/tex/latex/droid/t2afds.fd
index 000773b1896..9db7d1d474b 100644
--- a/Master/texmf-dist/tex/latex/droid/t2afds.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2afds.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t2afds.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for T2A/fds.]
+   [2011/03/24 Fontinst v1.927 font definitions for T2A/fds.]
 
 \expandafter\ifx\csname droid@fds@scale\endcsname\relax
   \let\droid@fds@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/t2bfdm.fd b/Master/texmf-dist/tex/latex/droid/t2bfdm.fd
index 97c83cc0eb6..337af6b8715 100644
--- a/Master/texmf-dist/tex/latex/droid/t2bfdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2bfdm.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t2bfdm.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for T2B/fdm.]
+   [2011/03/24 Fontinst v1.927 font definitions for T2B/fdm.]
 
 \expandafter\ifx\csname droid@fdm@scale\endcsname\relax
   \let\droid@fdm@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/t2bfdr.fd b/Master/texmf-dist/tex/latex/droid/t2bfdr.fd
index 368b287f473..7075acbf4fc 100644
--- a/Master/texmf-dist/tex/latex/droid/t2bfdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2bfdr.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t2bfdr.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for T2B/fdr.]
+   [2011/03/24 Fontinst v1.927 font definitions for T2B/fdr.]
 
 \expandafter\ifx\csname droid@fdr@scale\endcsname\relax
   \let\droid@fdr@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/t2bfds.fd b/Master/texmf-dist/tex/latex/droid/t2bfds.fd
index 6016bad42f4..6fee1e03eda 100644
--- a/Master/texmf-dist/tex/latex/droid/t2bfds.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2bfds.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t2bfds.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for T2B/fds.]
+   [2011/03/24 Fontinst v1.927 font definitions for T2B/fds.]
 
 \expandafter\ifx\csname droid@fds@scale\endcsname\relax
   \let\droid@fds@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/t2cfdm.fd b/Master/texmf-dist/tex/latex/droid/t2cfdm.fd
index d9c6d5dc0ae..0c638accd2c 100644
--- a/Master/texmf-dist/tex/latex/droid/t2cfdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2cfdm.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t2cfdm.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for T2C/fdm.]
+   [2011/03/24 Fontinst v1.927 font definitions for T2C/fdm.]
 
 \expandafter\ifx\csname droid@fdm@scale\endcsname\relax
   \let\droid@fdm@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/t2cfdr.fd b/Master/texmf-dist/tex/latex/droid/t2cfdr.fd
index 0aa70c44f25..62646659e3b 100644
--- a/Master/texmf-dist/tex/latex/droid/t2cfdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2cfdr.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t2cfdr.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for T2C/fdr.]
+   [2011/03/24 Fontinst v1.927 font definitions for T2C/fdr.]
 
 \expandafter\ifx\csname droid@fdr@scale\endcsname\relax
   \let\droid@fdr@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/t2cfds.fd b/Master/texmf-dist/tex/latex/droid/t2cfds.fd
index 43aee981f33..db0fd21cf29 100644
--- a/Master/texmf-dist/tex/latex/droid/t2cfds.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2cfds.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t2cfds.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for T2C/fds.]
+   [2011/03/24 Fontinst v1.927 font definitions for T2C/fds.]
 
 \expandafter\ifx\csname droid@fds@scale\endcsname\relax
   \let\droid@fds@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/ts1fdm.fd b/Master/texmf-dist/tex/latex/droid/ts1fdm.fd
index a3e04522415..2ad133b25db 100644
--- a/Master/texmf-dist/tex/latex/droid/ts1fdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/ts1fdm.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{ts1fdm.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for TS1/fdm.]
+   [2011/03/24 Fontinst v1.927 font definitions for TS1/fdm.]
 
 \expandafter\ifx\csname droid@fdm@scale\endcsname\relax
   \let\droid@fdm@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/ts1fdr.fd b/Master/texmf-dist/tex/latex/droid/ts1fdr.fd
index 5c11b513c23..625e9cd9998 100644
--- a/Master/texmf-dist/tex/latex/droid/ts1fdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/ts1fdr.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{ts1fdr.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for TS1/fdr.]
+   [2011/03/24 Fontinst v1.927 font definitions for TS1/fdr.]
 
 \expandafter\ifx\csname droid@fdr@scale\endcsname\relax
   \let\droid@fdr@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/ts1fds.fd b/Master/texmf-dist/tex/latex/droid/ts1fds.fd
index 2a53980fb6e..1304042cf4d 100644
--- a/Master/texmf-dist/tex/latex/droid/ts1fds.fd
+++ b/Master/texmf-dist/tex/latex/droid/ts1fds.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{ts1fds.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for TS1/fds.]
+   [2011/03/24 Fontinst v1.927 font definitions for TS1/fds.]
 
 \expandafter\ifx\csname droid@fds@scale\endcsname\relax
   \let\droid@fds@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/x2fdm.fd b/Master/texmf-dist/tex/latex/droid/x2fdm.fd
index 9ab45733f7b..30b3b14620a 100644
--- a/Master/texmf-dist/tex/latex/droid/x2fdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/x2fdm.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{x2fdm.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for X2/fdm.]
+   [2011/03/24 Fontinst v1.927 font definitions for X2/fdm.]
 
 \expandafter\ifx\csname droid@fdm@scale\endcsname\relax
   \let\droid@fdm@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/x2fdr.fd b/Master/texmf-dist/tex/latex/droid/x2fdr.fd
index 9b45c068c69..7103072c33a 100644
--- a/Master/texmf-dist/tex/latex/droid/x2fdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/x2fdr.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{x2fdr.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for X2/fdr.]
+   [2011/03/24 Fontinst v1.927 font definitions for X2/fdr.]
 
 \expandafter\ifx\csname droid@fdr@scale\endcsname\relax
   \let\droid@fdr@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/droid/x2fds.fd b/Master/texmf-dist/tex/latex/droid/x2fds.fd
index 8fb3f72df83..d2e55456730 100644
--- a/Master/texmf-dist/tex/latex/droid/x2fds.fd
+++ b/Master/texmf-dist/tex/latex/droid/x2fds.fd
@@ -5,7 +5,7 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{x2fds.fd}
-   [2011/01/08 Fontinst v1.927 font definitions for X2/fds.]
+   [2011/03/24 Fontinst v1.927 font definitions for X2/fds.]
 
 \expandafter\ifx\csname droid@fds@scale\endcsname\relax
   \let\droid@fds@scale\@empty
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 8a42423e638..50a4b4d5482 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -147,7 +147,7 @@ my @TLP_working = qw(
   facsimile faktor
     fancybox fancyhdr fancyhdr-it fancynum fancypar
     fancyref fancytabs fancytooltips fancyvrb
-    FAQ-en fbithesis fbs featpost fenixpar
+    FAQ-en fbithesis fbs fdsymbol featpost fenixpar
     feyn feynmf fge fig4latex figbas figbib figflow figsize
     filecontents filehook fileinfo filemod
     findhyph fink finstrut first-latex-doc
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index f2463828e53..f7ef3f8848f 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -322,6 +322,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'fc',		"&MAKEflatten",
  'fc_arith',	"die 'skipping, per author request'",
  'fc-arith',	"die 'skipping, per author request'",
+# 'fdsymbol',	"&MAKEflatten",
  'featpost',	"&MAKEfeatpost",
  'feynmf',	"&MAKEfeynmf",
  'findhyph',	"&MAKEflatten",