summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-09-12 23:12:57 +0000
committerKarl Berry <karl@freefriends.org>2011-09-12 23:12:57 +0000
commitc0fc6f08ac435f1171b1349d429fce172e37a3f2 (patch)
tree605da0e5fd6e1f63a2f0c28b8de40f7021da3ae6 /Master
parente0c1dd1100b3d71edfbd747eaf324539d5ca5797 (diff)
droid 2.0 (12sep11)
git-svn-id: svn://tug.org/texlive/trunk@23912 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/fonts/droid/CHANGES3
-rw-r--r--Master/texmf-dist/doc/fonts/droid/README2
-rw-r--r--Master/texmf-dist/doc/fonts/droid/droid.pdfbin116754 -> 117503 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/droid/droid.tex7
-rw-r--r--Master/texmf-dist/doc/fonts/droid/droidsans-samples.pdfbin163596 -> 163597 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/droid/droidsansmono-samples.pdfbin73518 -> 73515 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/droid/droidserif-samples.pdfbin416419 -> 416425 bytes
-rw-r--r--Master/texmf-dist/fonts/afm/public/droid/DroidSans-Bold.afm2
-rw-r--r--Master/texmf-dist/fonts/afm/public/droid/DroidSans.afm2
-rw-r--r--Master/texmf-dist/fonts/afm/public/droid/DroidSansMono.afm2
-rw-r--r--Master/texmf-dist/fonts/afm/public/droid/DroidSerif-Bold.afm2
-rw-r--r--Master/texmf-dist/fonts/afm/public/droid/DroidSerif-BoldItalic.afm2
-rw-r--r--Master/texmf-dist/fonts/afm/public/droid/DroidSerif-Italic.afm2
-rw-r--r--Master/texmf-dist/fonts/afm/public/droid/DroidSerif-Regular.afm2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/droid/droid-01.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/droid/droid-02.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/droid/droid-03.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/droid/droid-04.enc2
-rw-r--r--Master/texmf-dist/fonts/type1/public/droid/DroidSans-Bold.pfbbin122158 -> 122158 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/droid/DroidSans.pfbbin125440 -> 125440 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/droid/DroidSansMono.pfbbin105828 -> 105828 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Bold.pfbbin146554 -> 146554 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/droid/DroidSerif-BoldItalic.pfbbin159554 -> 159554 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Italic.pfbbin121007 -> 121007 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Regular.pfbbin143920 -> 143920 bytes
-rw-r--r--Master/texmf-dist/source/fonts/droid/droid-drv.tex46
-rw-r--r--Master/texmf-dist/source/fonts/droid/droidsans-drv.tex174
-rw-r--r--Master/texmf-dist/source/fonts/droid/droidsansmono-drv.tex110
-rw-r--r--Master/texmf-dist/source/fonts/droid/droidserif-drv.tex318
-rw-r--r--Master/texmf-dist/tex/latex/droid/droidmono.sty2
-rw-r--r--Master/texmf-dist/tex/latex/droid/droidsans.sty2
-rw-r--r--Master/texmf-dist/tex/latex/droid/droidserif.sty2
-rw-r--r--Master/texmf-dist/tex/latex/droid/lgrfdm.fd14
-rw-r--r--Master/texmf-dist/tex/latex/droid/lgrfdr.fd38
-rw-r--r--Master/texmf-dist/tex/latex/droid/lgrfds.fd22
-rw-r--r--Master/texmf-dist/tex/latex/droid/ot1fdm.fd14
-rw-r--r--Master/texmf-dist/tex/latex/droid/ot1fdr.fd38
-rw-r--r--Master/texmf-dist/tex/latex/droid/ot1fds.fd22
-rw-r--r--Master/texmf-dist/tex/latex/droid/t1fdm.fd14
-rw-r--r--Master/texmf-dist/tex/latex/droid/t1fdr.fd38
-rw-r--r--Master/texmf-dist/tex/latex/droid/t1fds.fd22
-rw-r--r--Master/texmf-dist/tex/latex/droid/t2afdm.fd14
-rw-r--r--Master/texmf-dist/tex/latex/droid/t2afdr.fd38
-rw-r--r--Master/texmf-dist/tex/latex/droid/t2afds.fd22
-rw-r--r--Master/texmf-dist/tex/latex/droid/t2bfdm.fd14
-rw-r--r--Master/texmf-dist/tex/latex/droid/t2bfdr.fd38
-rw-r--r--Master/texmf-dist/tex/latex/droid/t2bfds.fd22
-rw-r--r--Master/texmf-dist/tex/latex/droid/t2cfdm.fd14
-rw-r--r--Master/texmf-dist/tex/latex/droid/t2cfdr.fd38
-rw-r--r--Master/texmf-dist/tex/latex/droid/t2cfds.fd22
-rw-r--r--Master/texmf-dist/tex/latex/droid/ts1fdm.fd14
-rw-r--r--Master/texmf-dist/tex/latex/droid/ts1fdr.fd38
-rw-r--r--Master/texmf-dist/tex/latex/droid/ts1fds.fd22
-rw-r--r--Master/texmf-dist/tex/latex/droid/x2fdm.fd14
-rw-r--r--Master/texmf-dist/tex/latex/droid/x2fdr.fd38
-rw-r--r--Master/texmf-dist/tex/latex/droid/x2fds.fd22
56 files changed, 690 insertions, 590 deletions
diff --git a/Master/texmf-dist/doc/fonts/droid/CHANGES b/Master/texmf-dist/doc/fonts/droid/CHANGES
index 7b4ba9a838a..a20ff968393 100644
--- a/Master/texmf-dist/doc/fonts/droid/CHANGES
+++ b/Master/texmf-dist/doc/fonts/droid/CHANGES
@@ -15,3 +15,6 @@ Changelog for version 2.0:
- fix NFSS shape for upright italic variant ("ui" instead of "up")
- modify paths of the archive: documentation is now in doc/fonts/droid/
and sources in source/fonts/droid/
+
+Changelog for version 2.0:
+ - fix bug in font scaling
diff --git a/Master/texmf-dist/doc/fonts/droid/README b/Master/texmf-dist/doc/fonts/droid/README
index 55051ae77df..88ad01bcce6 100644
--- a/Master/texmf-dist/doc/fonts/droid/README
+++ b/Master/texmf-dist/doc/fonts/droid/README
@@ -1,5 +1,5 @@
--------------------
- Droid, version 2.0
+ Droid, version 2.1
--------------------
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 7e6bdccd043..9a5a5f373af 100644
--- a/Master/texmf-dist/doc/fonts/droid/droid.pdf
+++ b/Master/texmf-dist/doc/fonts/droid/droid.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/droid/droid.tex b/Master/texmf-dist/doc/fonts/droid/droid.tex
index b1f7f42185d..9c23841cc0b 100644
--- a/Master/texmf-dist/doc/fonts/droid/droid.tex
+++ b/Master/texmf-dist/doc/fonts/droid/droid.tex
@@ -38,7 +38,7 @@
\newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
\newcommand{\program}{}
-\title{\LaTeX{} support for Droid\\Version~2.0}
+\title{\LaTeX{} support for Droid\\Version~2.1}
\author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
@@ -252,6 +252,11 @@ substitutions.
Notice that the slanted shapes are faked ones, as well as the small capitals
(reduced to 80\%).
+Samples of the font are available in the
+\href{run:droidserif-samples.pdf}{\path|droidserif-samples.pdf|},
+\href{run:droidsans-samples.pdf}{\path|droidsans-samples.pdf|}, and
+\href{run:droidsansmono-samples.pdf}{\path|droidsansmono-samples.pdf|} files.
+
\section{Known bugs and improvements}
Please send bug reports and suggestions about the Droid \LaTeX{} support to
diff --git a/Master/texmf-dist/doc/fonts/droid/droidsans-samples.pdf b/Master/texmf-dist/doc/fonts/droid/droidsans-samples.pdf
index d6bb3edceff..1c2da43ef28 100644
--- a/Master/texmf-dist/doc/fonts/droid/droidsans-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/droid/droidsans-samples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/droid/droidsansmono-samples.pdf b/Master/texmf-dist/doc/fonts/droid/droidsansmono-samples.pdf
index 51ddf2883e5..9026924c2f1 100644
--- a/Master/texmf-dist/doc/fonts/droid/droidsansmono-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/droid/droidsansmono-samples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/droid/droidserif-samples.pdf b/Master/texmf-dist/doc/fonts/droid/droidserif-samples.pdf
index 3a78b16c814..d97ec029aad 100644
--- a/Master/texmf-dist/doc/fonts/droid/droidserif-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/droid/droidserif-samples.pdf
Binary files differ
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 1b17dd387ed..0ef071796e8 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 20110222
-Comment Creation Date: Sun Aug 21 12:50:26 2011
+Comment Creation Date: Sun Sep 11 16:42:37 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 abd2f208eec..98f7faf23f0 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 20110222
-Comment Creation Date: Sun Aug 21 12:50:26 2011
+Comment Creation Date: Sun Sep 11 16:42:37 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 760c1aa6c0e..42406b4ff13 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 20110222
-Comment Creation Date: Sun Aug 21 12:50:26 2011
+Comment Creation Date: Sun Sep 11 16:42:37 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 598ee11c268..8bb40d63dd1 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 20110222
-Comment Creation Date: Sun Aug 21 12:50:25 2011
+Comment Creation Date: Sun Sep 11 16:42:37 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 6d3240f0e18..1d5ebe85866 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 20110222
-Comment Creation Date: Sun Aug 21 12:50:26 2011
+Comment Creation Date: Sun Sep 11 16:42:37 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 4eb95657676..9899f588a24 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 20110222
-Comment Creation Date: Sun Aug 21 12:50:26 2011
+Comment Creation Date: Sun Sep 11 16:42:37 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 30fb973691d..d7df00ed715 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 20110222
-Comment Creation Date: Sun Aug 21 12:50:26 2011
+Comment Creation Date: Sun Sep 11 16:42:38 2011
FontName DroidSerif
FullName Droid Serif
FamilyName Droid Serif
diff --git a/Master/texmf-dist/fonts/enc/dvips/droid/droid-01.enc b/Master/texmf-dist/fonts/enc/dvips/droid/droid-01.enc
index d96576a48c9..248a78155fd 100644
--- a/Master/texmf-dist/fonts/enc/dvips/droid/droid-01.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/droid/droid-01.enc
@@ -2,7 +2,7 @@
% @psencodingfile{
% author = "See file droid-01.etx",
% version = "See file droid-01.etx",
-% date = "generated 2011/08/21",
+% date = "generated 2011/09/11",
% filename = "droid-01.enc",
% email = "See file droid-01.etx",
% codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/droid/droid-02.enc b/Master/texmf-dist/fonts/enc/dvips/droid/droid-02.enc
index ca06e4b1964..bc8f5b0e8e6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/droid/droid-02.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/droid/droid-02.enc
@@ -2,7 +2,7 @@
% @psencodingfile{
% author = "See file droid-02.etx",
% version = "See file droid-02.etx",
-% date = "generated 2011/08/21",
+% date = "generated 2011/09/11",
% filename = "droid-02.enc",
% email = "See file droid-02.etx",
% codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/droid/droid-03.enc b/Master/texmf-dist/fonts/enc/dvips/droid/droid-03.enc
index 502ebb46286..1f2c728ee03 100644
--- a/Master/texmf-dist/fonts/enc/dvips/droid/droid-03.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/droid/droid-03.enc
@@ -2,7 +2,7 @@
% @psencodingfile{
% author = "See file droid-03.etx",
% version = "See file droid-03.etx",
-% date = "generated 2011/08/21",
+% date = "generated 2011/09/11",
% filename = "droid-03.enc",
% email = "See file droid-03.etx",
% codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/droid/droid-04.enc b/Master/texmf-dist/fonts/enc/dvips/droid/droid-04.enc
index 53c4bbde4c5..4b66c5d65ba 100644
--- a/Master/texmf-dist/fonts/enc/dvips/droid/droid-04.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/droid/droid-04.enc
@@ -2,7 +2,7 @@
% @psencodingfile{
% author = "See file droid-04.etx",
% version = "See file droid-04.etx",
-% date = "generated 2011/08/21",
+% date = "generated 2011/09/11",
% filename = "droid-04.enc",
% email = "See file droid-04.etx",
% codetable = "ISO/ASCII",
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 7541879b888..aed4a391f05 100644
--- a/Master/texmf-dist/fonts/type1/public/droid/DroidSans-Bold.pfb
+++ b/Master/texmf-dist/fonts/type1/public/droid/DroidSans-Bold.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/droid/DroidSans.pfb b/Master/texmf-dist/fonts/type1/public/droid/DroidSans.pfb
index e7f38e47e4c..a3ce3864150 100644
--- a/Master/texmf-dist/fonts/type1/public/droid/DroidSans.pfb
+++ b/Master/texmf-dist/fonts/type1/public/droid/DroidSans.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/droid/DroidSansMono.pfb b/Master/texmf-dist/fonts/type1/public/droid/DroidSansMono.pfb
index 44b0814219c..7b962c4616b 100644
--- a/Master/texmf-dist/fonts/type1/public/droid/DroidSansMono.pfb
+++ b/Master/texmf-dist/fonts/type1/public/droid/DroidSansMono.pfb
Binary files differ
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 5e01d535511..994c0b0ce78 100644
--- a/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Bold.pfb
+++ b/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Bold.pfb
Binary files differ
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 2cf855c50fe..664a1e78c9f 100644
--- a/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-BoldItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-BoldItalic.pfb
Binary files differ
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 933a460f671..8d7cb8c3bf5 100644
--- a/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Italic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Italic.pfb
Binary files differ
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 4daa7e78c3a..14a6f6ce495 100644
--- a/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Regular.pfb
+++ b/Master/texmf-dist/fonts/type1/public/droid/DroidSerif-Regular.pfb
Binary files differ
diff --git a/Master/texmf-dist/source/fonts/droid/droid-drv.tex b/Master/texmf-dist/source/fonts/droid/droid-drv.tex
index 0b088454264..2cc680b632d 100644
--- a/Master/texmf-dist/source/fonts/droid/droid-drv.tex
+++ b/Master/texmf-dist/source/fonts/droid/droid-drv.tex
@@ -43,52 +43,6 @@
\endfor(e)
-\fontinstcc
-\def\fd_family#1#2#3{
- \a_toks{#3}
- \edef\lowercase_file{\lowercase{
- \edef\noexpand\lowercase_file{#1#2.fd}}}
- \lowercase_file
- \open_out{\lowercase_file}
- \out_line{\percent_char~Filename:~\lowercase_file}
- \out_line{\percent_char~Created~by:~tex~\jobname}
- \out_line{\percent_char~Created~using~fontinst~v\fontinstversion}
- \out_line{}
- \out_line{\percent_char~THIS~FILE~SHOULD~BE~PUT~IN~A~TEX~INPUTS~
- DIRECTORY}
- \out_line{}
- \out_line{\string\ProvidesFile{\lowercase_file}}
- \out_lline{[
- \the\year/
- \ifnum10>\month0\fi\the\month/
- \ifnum10>\day0\fi\the\day\space
- Fontinst~v\fontinstversion\space
- font~definitions~for~#1/#2.
- ]}
- \out_line{}
- %%%
- \out_line{\string\expandafter\string\ifx\string\csname\space droid@scale\string\endcsname\string\relax}
- \out_line{\space\space\string\let\string\droid@scale\string\@empty}
- \out_line{\string\fi}
- \out_line{}
- %%%
- \out_line{\string\DeclareFontFamily{#1}{#2}{\the\a_toks}}
- {
- \csname #1-#2\endcsname
- \out_line{}
- \let\do_shape=\substitute_shape
- \csname #1-#2\endcsname
- \let\do_shape=\remove_shape
- \csname #1-#2\endcsname
- }
- \x_cs\g_let{#1-#2}\x_relax
- \out_line{}
- \out_line{\string\endinput}
- \close_out{Font~definitions}
-}
-\normalcc
-
-
\input droidserif-drv.tex
\input droidsans-drv.tex
\input droidsansmono-drv.tex
diff --git a/Master/texmf-dist/source/fonts/droid/droidsans-drv.tex b/Master/texmf-dist/source/fonts/droid/droidsans-drv.tex
index e0f992295b2..adb379923b7 100644
--- a/Master/texmf-dist/source/fonts/droid/droidsans-drv.tex
+++ b/Master/texmf-dist/source/fonts/droid/droidsans-drv.tex
@@ -16,18 +16,64 @@
\relax
+\fontinstcc
+\def\fd_family#1#2#3{
+ \a_toks{#3}
+ \edef\lowercase_file{\lowercase{
+ \edef\noexpand\lowercase_file{#1#2.fd}}}
+ \lowercase_file
+ \open_out{\lowercase_file}
+ \out_line{\percent_char~Filename:~\lowercase_file}
+ \out_line{\percent_char~Created~by:~tex~\jobname}
+ \out_line{\percent_char~Created~using~fontinst~v\fontinstversion}
+ \out_line{}
+ \out_line{\percent_char~THIS~FILE~SHOULD~BE~PUT~IN~A~TEX~INPUTS~
+ DIRECTORY}
+ \out_line{}
+ \out_line{\string\ProvidesFile{\lowercase_file}}
+ \out_lline{[
+ \the\year/
+ \ifnum10>\month0\fi\the\month/
+ \ifnum10>\day0\fi\the\day\space
+ Fontinst~v\fontinstversion\space
+ font~definitions~for~#1/#2.
+ ]}
+ \out_line{}
+ %%%
+ \out_line{\string\expandafter\string\ifx\string\csname\space droid@fds@scale\string\endcsname\string\relax}
+ \out_line{\space\space\string\let\string\droid@fds@scale\string\@empty}
+ \out_line{\string\fi}
+ \out_line{}
+ %%%
+ \out_line{\string\DeclareFontFamily{#1}{#2}{\the\a_toks}}
+ {
+ \csname #1-#2\endcsname
+ \out_line{}
+ \let\do_shape=\substitute_shape
+ \csname #1-#2\endcsname
+ \let\do_shape=\remove_shape
+ \csname #1-#2\endcsname
+ }
+ \x_cs\g_let{#1-#2}\x_relax
+ \out_line{}
+ \out_line{\string\endinput}
+ \close_out{Font~definitions}
+}
+\normalcc
+
+
\installfonts
\installfamily{OT1}{fds}{}
-\installfont{DroidSans-ot1}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixlatin,newlatin}{ot1}{OT1}{fds}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSans-Slanted-ot1}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixlatin,newlatin}{ot1}{OT1}{fds}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSans-SmallCaps-ot1}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fds}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSans-Slanted-SmallCaps-ot1}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fds}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSans-ot1}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixlatin,newlatin}{ot1}{OT1}{fds}{m}{n}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Slanted-ot1}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixlatin,newlatin}{ot1}{OT1}{fds}{m}{sl}{<->\string\droid@fds@scale}
+\installfont{DroidSans-SmallCaps-ot1}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fds}{m}{sc}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Slanted-SmallCaps-ot1}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fds}{m}{scsl}{<->\string\droid@fds@scale}
-\installfont{DroidSans-Bold-ot1}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixlatin,newlatin}{ot1}{OT1}{fds}{b}{n}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-Slanted-ot1}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixlatin,newlatin}{ot1}{OT1}{fds}{b}{sl}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-SmallCaps-ot1}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fds}{b}{sc}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-Slanted-SmallCaps-ot1}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fds}{b}{scsl}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-ot1}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixlatin,newlatin}{ot1}{OT1}{fds}{b}{n}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-Slanted-ot1}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixlatin,newlatin}{ot1}{OT1}{fds}{b}{sl}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-SmallCaps-ot1}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fds}{b}{sc}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-Slanted-SmallCaps-ot1}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fds}{b}{scsl}{<->\string\droid@fds@scale}
\endinstallfonts
@@ -35,15 +81,15 @@
\installfonts
\installfamily{T1}{fds}{}
-\installfont{DroidSans-t1}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixlatin,newlatin}{t1}{T1}{fds}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSans-Slanted-t1}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixlatin,newlatin}{t1}{T1}{fds}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSans-SmallCaps-t1}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixlatin,newlatin}{t1c}{T1}{fds}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSans-Slanted-SmallCaps-t1}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixlatin,newlatin}{t1c}{T1}{fds}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSans-t1}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixlatin,newlatin}{t1}{T1}{fds}{m}{n}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Slanted-t1}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixlatin,newlatin}{t1}{T1}{fds}{m}{sl}{<->\string\droid@fds@scale}
+\installfont{DroidSans-SmallCaps-t1}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixlatin,newlatin}{t1c}{T1}{fds}{m}{sc}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Slanted-SmallCaps-t1}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixlatin,newlatin}{t1c}{T1}{fds}{m}{scsl}{<->\string\droid@fds@scale}
-\installfont{DroidSans-Bold-t1}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixlatin,newlatin}{t1}{T1}{fds}{b}{n}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-Slanted-t1}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixlatin,newlatin}{t1}{T1}{fds}{b}{sl}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-SmallCaps-t1}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixlatin,newlatin}{t1c}{T1}{fds}{b}{sc}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-Slanted-SmallCaps-t1}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixlatin,newlatin}{t1c}{T1}{fds}{b}{scsl}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-t1}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixlatin,newlatin}{t1}{T1}{fds}{b}{n}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-Slanted-t1}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixlatin,newlatin}{t1}{T1}{fds}{b}{sl}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-SmallCaps-t1}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixlatin,newlatin}{t1c}{T1}{fds}{b}{sc}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-Slanted-SmallCaps-t1}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixlatin,newlatin}{t1c}{T1}{fds}{b}{scsl}{<->\string\droid@fds@scale}
\endinstallfonts
@@ -51,15 +97,15 @@
\installfonts
\installfamily{TS1}{fds}{}
-\installfont{DroidSans-ts1}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fds}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSans-Slanted-ts1}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fds}{m}{sl}{<->\string\droid@scale}
-\installfontas{DroidSans-ts1}{TS1}{fds}{m}{sc}{<->\string\droid@scale}
-\installfontas{DroidSans-Slanted-ts1}{TS1}{fds}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSans-ts1}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fds}{m}{n}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Slanted-ts1}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fds}{m}{sl}{<->\string\droid@fds@scale}
+\installfontas{DroidSans-ts1}{TS1}{fds}{m}{sc}{<->\string\droid@fds@scale}
+\installfontas{DroidSans-Slanted-ts1}{TS1}{fds}{m}{scsl}{<->\string\droid@fds@scale}
-\installfont{DroidSans-Bold-ts1}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fds}{b}{n}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-Slanted-ts1}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fds}{b}{sl}{<->\string\droid@scale}
-\installfontas{DroidSans-Bold-ts1}{TS1}{fds}{b}{sc}{<->\string\droid@scale}
-\installfontas{DroidSans-Bold-Slanted-ts1}{TS1}{fds}{b}{scsl}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-ts1}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fds}{b}{n}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-Slanted-ts1}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fds}{b}{sl}{<->\string\droid@fds@scale}
+\installfontas{DroidSans-Bold-ts1}{TS1}{fds}{b}{sc}{<->\string\droid@fds@scale}
+\installfontas{DroidSans-Bold-Slanted-ts1}{TS1}{fds}{b}{scsl}{<->\string\droid@fds@scale}
\endinstallfonts
@@ -67,15 +113,15 @@
\installfonts
\installfamily{T2A}{fds}{}
-\installfont{DroidSans-t2a}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fds}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSans-Slanted-t2a}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fds}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSans-SmallCaps-t2a}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fds}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSans-Slanted-SmallCaps-t2a}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fds}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSans-t2a}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fds}{m}{n}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Slanted-t2a}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fds}{m}{sl}{<->\string\droid@fds@scale}
+\installfont{DroidSans-SmallCaps-t2a}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fds}{m}{sc}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Slanted-SmallCaps-t2a}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fds}{m}{scsl}{<->\string\droid@fds@scale}
-\installfont{DroidSans-Bold-t2a}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fds}{b}{n}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-Slanted-t2a}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fds}{b}{sl}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-SmallCaps-t2a}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fds}{b}{sc}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-Slanted-SmallCaps-t2a}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fds}{b}{scsl}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-t2a}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fds}{b}{n}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-Slanted-t2a}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fds}{b}{sl}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-SmallCaps-t2a}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fds}{b}{sc}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-Slanted-SmallCaps-t2a}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fds}{b}{scsl}{<->\string\droid@fds@scale}
\endinstallfonts
@@ -83,15 +129,15 @@
\installfonts
\installfamily{T2B}{fds}{}
-\installfont{DroidSans-t2b}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fds}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSans-Slanted-t2b}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fds}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSans-SmallCaps-t2b}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fds}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSans-Slanted-SmallCaps-t2b}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fds}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSans-t2b}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fds}{m}{n}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Slanted-t2b}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fds}{m}{sl}{<->\string\droid@fds@scale}
+\installfont{DroidSans-SmallCaps-t2b}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fds}{m}{sc}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Slanted-SmallCaps-t2b}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fds}{m}{scsl}{<->\string\droid@fds@scale}
-\installfont{DroidSans-Bold-t2b}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fds}{b}{n}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-Slanted-t2b}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fds}{b}{sl}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-SmallCaps-t2b}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fds}{b}{sc}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-Slanted-SmallCaps-t2b}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fds}{b}{scsl}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-t2b}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fds}{b}{n}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-Slanted-t2b}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fds}{b}{sl}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-SmallCaps-t2b}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fds}{b}{sc}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-Slanted-SmallCaps-t2b}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fds}{b}{scsl}{<->\string\droid@fds@scale}
\endinstallfonts
@@ -99,15 +145,15 @@
\installfonts
\installfamily{T2C}{fds}{}
-\installfont{DroidSans-t2c}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fds}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSans-Slanted-t2c}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fds}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSans-SmallCaps-t2c}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fds}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSans-Slanted-SmallCaps-t2c}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fds}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSans-t2c}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fds}{m}{n}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Slanted-t2c}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fds}{m}{sl}{<->\string\droid@fds@scale}
+\installfont{DroidSans-SmallCaps-t2c}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fds}{m}{sc}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Slanted-SmallCaps-t2c}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fds}{m}{scsl}{<->\string\droid@fds@scale}
-\installfont{DroidSans-Bold-t2c}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fds}{b}{n}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-Slanted-t2c}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fds}{b}{sl}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-SmallCaps-t2c}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fds}{b}{sc}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-Slanted-SmallCaps-t2c}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fds}{b}{scsl}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-t2c}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fds}{b}{n}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-Slanted-t2c}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fds}{b}{sl}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-SmallCaps-t2c}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fds}{b}{sc}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-Slanted-SmallCaps-t2c}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fds}{b}{scsl}{<->\string\droid@fds@scale}
\endinstallfonts
@@ -115,15 +161,15 @@
\installfonts
\installfamily{X2}{fds}{}
-\installfont{DroidSans-x2}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fds}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSans-Slanted-x2}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fds}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSans-SmallCaps-x2}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fds}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSans-Slanted-SmallCaps-x2}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fds}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSans-x2}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fds}{m}{n}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Slanted-x2}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fds}{m}{sl}{<->\string\droid@fds@scale}
+\installfont{DroidSans-SmallCaps-x2}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fds}{m}{sc}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Slanted-SmallCaps-x2}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fds}{m}{scsl}{<->\string\droid@fds@scale}
-\installfont{DroidSans-Bold-x2}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fds}{b}{n}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-Slanted-x2}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fds}{b}{sl}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-SmallCaps-x2}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fds}{b}{sc}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-Slanted-SmallCaps-x2}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fds}{b}{scsl}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-x2}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fds}{b}{n}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-Slanted-x2}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fds}{b}{sl}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-SmallCaps-x2}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fds}{b}{sc}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-Slanted-SmallCaps-x2}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fds}{b}{scsl}{<->\string\droid@fds@scale}
\endinstallfonts
@@ -131,14 +177,14 @@
\installfonts
\installfamily{LGR}{fds}{}
-\installfont{DroidSans-lgr}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fds}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSans-Slanted-lgr}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fds}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSans-SmallCaps-lgr}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fds}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSans-Slanted-SmallCaps-lgr}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fds}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSans-lgr}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fds}{m}{n}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Slanted-lgr}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fds}{m}{sl}{<->\string\droid@fds@scale}
+\installfont{DroidSans-SmallCaps-lgr}{DroidSans-01,DroidSans-02,DroidSans-03,DroidSans-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fds}{m}{sc}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Slanted-SmallCaps-lgr}{DroidSans-Slanted-01,DroidSans-Slanted-02,DroidSans-Slanted-03,DroidSans-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fds}{m}{scsl}{<->\string\droid@fds@scale}
-\installfont{DroidSans-Bold-lgr}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fds}{b}{n}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-Slanted-lgr}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fds}{b}{sl}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-SmallCaps-lgr}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fds}{b}{sc}{<->\string\droid@scale}
-\installfont{DroidSans-Bold-Slanted-SmallCaps-lgr}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fds}{b}{scsl}{<->\string\droid@scale}
+\installfont{DroidSans-Bold-lgr}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fds}{b}{n}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-Slanted-lgr}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fds}{b}{sl}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-SmallCaps-lgr}{DroidSans-Bold-01,DroidSans-Bold-02,DroidSans-Bold-03,DroidSans-Bold-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fds}{b}{sc}{<->\string\droid@fds@scale}
+\installfont{DroidSans-Bold-Slanted-SmallCaps-lgr}{DroidSans-Bold-Slanted-01,DroidSans-Bold-Slanted-02,DroidSans-Bold-Slanted-03,DroidSans-Bold-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fds}{b}{scsl}{<->\string\droid@fds@scale}
\endinstallfonts
diff --git a/Master/texmf-dist/source/fonts/droid/droidsansmono-drv.tex b/Master/texmf-dist/source/fonts/droid/droidsansmono-drv.tex
index 7a8b16f5df3..82049ea94f4 100644
--- a/Master/texmf-dist/source/fonts/droid/droidsansmono-drv.tex
+++ b/Master/texmf-dist/source/fonts/droid/droidsansmono-drv.tex
@@ -16,13 +16,59 @@
\relax
+\fontinstcc
+\def\fd_family#1#2#3{
+ \a_toks{#3}
+ \edef\lowercase_file{\lowercase{
+ \edef\noexpand\lowercase_file{#1#2.fd}}}
+ \lowercase_file
+ \open_out{\lowercase_file}
+ \out_line{\percent_char~Filename:~\lowercase_file}
+ \out_line{\percent_char~Created~by:~tex~\jobname}
+ \out_line{\percent_char~Created~using~fontinst~v\fontinstversion}
+ \out_line{}
+ \out_line{\percent_char~THIS~FILE~SHOULD~BE~PUT~IN~A~TEX~INPUTS~
+ DIRECTORY}
+ \out_line{}
+ \out_line{\string\ProvidesFile{\lowercase_file}}
+ \out_lline{[
+ \the\year/
+ \ifnum10>\month0\fi\the\month/
+ \ifnum10>\day0\fi\the\day\space
+ Fontinst~v\fontinstversion\space
+ font~definitions~for~#1/#2.
+ ]}
+ \out_line{}
+ %%%
+ \out_line{\string\expandafter\string\ifx\string\csname\space droid@fdm@scale\string\endcsname\string\relax}
+ \out_line{\space\space\string\let\string\droid@fdm@scale\string\@empty}
+ \out_line{\string\fi}
+ \out_line{}
+ %%%
+ \out_line{\string\DeclareFontFamily{#1}{#2}{\the\a_toks}}
+ {
+ \csname #1-#2\endcsname
+ \out_line{}
+ \let\do_shape=\substitute_shape
+ \csname #1-#2\endcsname
+ \let\do_shape=\remove_shape
+ \csname #1-#2\endcsname
+ }
+ \x_cs\g_let{#1-#2}\x_relax
+ \out_line{}
+ \out_line{\string\endinput}
+ \close_out{Font~definitions}
+}
+\normalcc
+
+
\installfonts
\installfamily{OT1}{fdm}{}
-\installfont{DroidSansMono-ot1}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdm}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSansMono-Slanted-ot1}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdm}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSansMono-SmallCaps-ot1}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdm}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSansMono-Slanted-SmallCaps-ot1}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdm}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSansMono-ot1}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdm}{m}{n}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-Slanted-ot1}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdm}{m}{sl}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-SmallCaps-ot1}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdm}{m}{sc}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-Slanted-SmallCaps-ot1}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdm}{m}{scsl}{<->\string\droid@fdm@scale}
\endinstallfonts
@@ -30,10 +76,10 @@
\installfonts
\installfamily{T1}{fdm}{}
-\installfont{DroidSansMono-t1}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixlatin,newlatin}{t1}{T1}{fdm}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSansMono-Slanted-t1}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixlatin,newlatin}{t1}{T1}{fdm}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSansMono-SmallCaps-t1}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixlatin,newlatin}{t1c}{T1}{fdm}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSansMono-Slanted-SmallCaps-t1}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixlatin,newlatin}{t1c}{T1}{fdm}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSansMono-t1}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixlatin,newlatin}{t1}{T1}{fdm}{m}{n}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-Slanted-t1}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixlatin,newlatin}{t1}{T1}{fdm}{m}{sl}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-SmallCaps-t1}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixlatin,newlatin}{t1c}{T1}{fdm}{m}{sc}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-Slanted-SmallCaps-t1}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixlatin,newlatin}{t1c}{T1}{fdm}{m}{scsl}{<->\string\droid@fdm@scale}
\endinstallfonts
@@ -41,10 +87,10 @@
\installfonts
\installfamily{TS1}{fdm}{}
-\installfont{DroidSansMono-ts1}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdm}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSansMono-Slanted-ts1}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdm}{m}{sl}{<->\string\droid@scale}
-\installfontas{DroidSansMono-ts1}{TS1}{fdm}{m}{sc}{<->\string\droid@scale}
-\installfontas{DroidSansMono-Slanted-ts1}{TS1}{fdm}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSansMono-ts1}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdm}{m}{n}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-Slanted-ts1}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdm}{m}{sl}{<->\string\droid@fdm@scale}
+\installfontas{DroidSansMono-ts1}{TS1}{fdm}{m}{sc}{<->\string\droid@fdm@scale}
+\installfontas{DroidSansMono-Slanted-ts1}{TS1}{fdm}{m}{scsl}{<->\string\droid@fdm@scale}
\endinstallfonts
@@ -52,10 +98,10 @@
\installfonts
\installfamily{T2A}{fdm}{}
-\installfont{DroidSansMono-t2a}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdm}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSansMono-Slanted-t2a}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdm}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSansMono-SmallCaps-t2a}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdm}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSansMono-Slanted-SmallCaps-t2a}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdm}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSansMono-t2a}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdm}{m}{n}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-Slanted-t2a}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdm}{m}{sl}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-SmallCaps-t2a}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdm}{m}{sc}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-Slanted-SmallCaps-t2a}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdm}{m}{scsl}{<->\string\droid@fdm@scale}
\endinstallfonts
@@ -63,10 +109,10 @@
\installfonts
\installfamily{T2B}{fdm}{}
-\installfont{DroidSansMono-t2b}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdm}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSansMono-Slanted-t2b}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdm}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSansMono-SmallCaps-t2b}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdm}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSansMono-Slanted-SmallCaps-t2b}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdm}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSansMono-t2b}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdm}{m}{n}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-Slanted-t2b}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdm}{m}{sl}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-SmallCaps-t2b}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdm}{m}{sc}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-Slanted-SmallCaps-t2b}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdm}{m}{scsl}{<->\string\droid@fdm@scale}
\endinstallfonts
@@ -74,10 +120,10 @@
\installfonts
\installfamily{T2C}{fdm}{}
-\installfont{DroidSansMono-t2c}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdm}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSansMono-Slanted-t2c}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdm}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSansMono-SmallCaps-t2c}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdm}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSansMono-Slanted-SmallCaps-t2c}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdm}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSansMono-t2c}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdm}{m}{n}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-Slanted-t2c}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdm}{m}{sl}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-SmallCaps-t2c}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdm}{m}{sc}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-Slanted-SmallCaps-t2c}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdm}{m}{scsl}{<->\string\droid@fdm@scale}
\endinstallfonts
@@ -85,10 +131,10 @@
\installfonts
\installfamily{X2}{fdm}{}
-\installfont{DroidSansMono-x2}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdm}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSansMono-Slanted-x2}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdm}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSansMono-SmallCaps-x2}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdm}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSansMono-Slanted-SmallCaps-x2}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdm}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSansMono-x2}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdm}{m}{n}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-Slanted-x2}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdm}{m}{sl}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-SmallCaps-x2}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdm}{m}{sc}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-Slanted-SmallCaps-x2}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdm}{m}{scsl}{<->\string\droid@fdm@scale}
\endinstallfonts
@@ -96,9 +142,9 @@
\installfonts
\installfamily{LGR}{fdm}{}
-\installfont{DroidSansMono-lgr}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdm}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSansMono-Slanted-lgr}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdm}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSansMono-SmallCaps-lgr}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdm}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSansMono-Slanted-SmallCaps-lgr}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdm}{m}{scsl}{<->\string\droid@scale}
+\installfont{DroidSansMono-lgr}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdm}{m}{n}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-Slanted-lgr}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdm}{m}{sl}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-SmallCaps-lgr}{DroidSansMono-01,DroidSansMono-02,DroidSansMono-03,DroidSansMono-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdm}{m}{sc}{<->\string\droid@fdm@scale}
+\installfont{DroidSansMono-Slanted-SmallCaps-lgr}{DroidSansMono-Slanted-01,DroidSansMono-Slanted-02,DroidSansMono-Slanted-03,DroidSansMono-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdm}{m}{scsl}{<->\string\droid@fdm@scale}
\endinstallfonts
diff --git a/Master/texmf-dist/source/fonts/droid/droidserif-drv.tex b/Master/texmf-dist/source/fonts/droid/droidserif-drv.tex
index dee3676496e..07cda76778c 100644
--- a/Master/texmf-dist/source/fonts/droid/droidserif-drv.tex
+++ b/Master/texmf-dist/source/fonts/droid/droidserif-drv.tex
@@ -16,26 +16,72 @@
\relax
+\fontinstcc
+\def\fd_family#1#2#3{
+ \a_toks{#3}
+ \edef\lowercase_file{\lowercase{
+ \edef\noexpand\lowercase_file{#1#2.fd}}}
+ \lowercase_file
+ \open_out{\lowercase_file}
+ \out_line{\percent_char~Filename:~\lowercase_file}
+ \out_line{\percent_char~Created~by:~tex~\jobname}
+ \out_line{\percent_char~Created~using~fontinst~v\fontinstversion}
+ \out_line{}
+ \out_line{\percent_char~THIS~FILE~SHOULD~BE~PUT~IN~A~TEX~INPUTS~
+ DIRECTORY}
+ \out_line{}
+ \out_line{\string\ProvidesFile{\lowercase_file}}
+ \out_lline{[
+ \the\year/
+ \ifnum10>\month0\fi\the\month/
+ \ifnum10>\day0\fi\the\day\space
+ Fontinst~v\fontinstversion\space
+ font~definitions~for~#1/#2.
+ ]}
+ \out_line{}
+ %%%
+ \out_line{\string\expandafter\string\ifx\string\csname\space droid@fdr@scale\string\endcsname\string\relax}
+ \out_line{\space\space\string\let\string\droid@fdr@scale\string\@empty}
+ \out_line{\string\fi}
+ \out_line{}
+ %%%
+ \out_line{\string\DeclareFontFamily{#1}{#2}{\the\a_toks}}
+ {
+ \csname #1-#2\endcsname
+ \out_line{}
+ \let\do_shape=\substitute_shape
+ \csname #1-#2\endcsname
+ \let\do_shape=\remove_shape
+ \csname #1-#2\endcsname
+ }
+ \x_cs\g_let{#1-#2}\x_relax
+ \out_line{}
+ \out_line{\string\endinput}
+ \close_out{Font~definitions}
+}
+\normalcc
+
+
\installfonts
\installfamily{OT1}{fdr}{}
-\installfont{DroidSerif-Regular-ot1}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-ot1}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{m}{it}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-Slanted-ot1}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-Upright-ot1}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{m}{ui}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-SmallCaps-ot1}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-SmallCaps-ot1}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{m}{scit}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-Slanted-SmallCaps-ot1}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{m}{scsl}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-Upright-SmallCaps-ot1}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{m}{scui}{<->\string\droid@scale}
-
-\installfont{DroidSerif-Bold-ot1}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{b}{n}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-ot1}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{b}{it}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-Slanted-ot1}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{b}{sl}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-Upright-ot1}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{b}{ui}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-SmallCaps-ot1}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{b}{sc}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-SmallCaps-ot1}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{b}{scit}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-Slanted-SmallCaps-ot1}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{b}{scsl}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-ot1}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{b}{scui}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-ot1}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{m}{n}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-ot1}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{m}{it}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-Slanted-ot1}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{m}{sl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-Upright-ot1}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{m}{ui}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-SmallCaps-ot1}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{m}{sc}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-SmallCaps-ot1}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{m}{scit}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-Slanted-SmallCaps-ot1}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{m}{scsl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-Upright-SmallCaps-ot1}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{m}{scui}{<->\string\droid@fdr@scale}
+
+\installfont{DroidSerif-Bold-ot1}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{b}{n}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-ot1}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{b}{it}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-Slanted-ot1}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{b}{sl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-Upright-ot1}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixlatin,newlatin}{ot1}{OT1}{fdr}{b}{ui}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-SmallCaps-ot1}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{b}{sc}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-SmallCaps-ot1}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{b}{scit}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-Slanted-SmallCaps-ot1}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{b}{scsl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-ot1}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixlatin,newlatin}{ot1c}{OT1}{fdr}{b}{scui}{<->\string\droid@fdr@scale}
\endinstallfonts
@@ -43,23 +89,23 @@
\installfonts
\installfamily{T1}{fdr}{}
-\installfont{DroidSerif-Regular-t1}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-t1}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{m}{it}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-Slanted-t1}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-Upright-t1}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{m}{ui}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-SmallCaps-t1}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-SmallCaps-t1}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{m}{scit}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-Slanted-SmallCaps-t1}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{m}{scsl}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-Upright-SmallCaps-t1}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{m}{scui}{<->\string\droid@scale}
-
-\installfont{DroidSerif-Bold-t1}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{b}{n}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-t1}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{b}{it}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-Slanted-t1}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{b}{sl}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-Upright-t1}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{b}{ui}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-SmallCaps-t1}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{b}{sc}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-SmallCaps-t1}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{b}{scit}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-Slanted-SmallCaps-t1}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{b}{scsl}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-t1}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{b}{scui}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-t1}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{m}{n}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-t1}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{m}{it}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-Slanted-t1}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{m}{sl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-Upright-t1}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{m}{ui}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-SmallCaps-t1}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{m}{sc}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-SmallCaps-t1}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{m}{scit}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-Slanted-SmallCaps-t1}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{m}{scsl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-Upright-SmallCaps-t1}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{m}{scui}{<->\string\droid@fdr@scale}
+
+\installfont{DroidSerif-Bold-t1}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{b}{n}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-t1}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{b}{it}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-Slanted-t1}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{b}{sl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-Upright-t1}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixlatin,newlatin}{t1}{T1}{fdr}{b}{ui}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-SmallCaps-t1}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{b}{sc}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-SmallCaps-t1}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{b}{scit}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-Slanted-SmallCaps-t1}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{b}{scsl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-t1}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixlatin,newlatin}{t1c}{T1}{fdr}{b}{scui}{<->\string\droid@fdr@scale}
\endinstallfonts
@@ -67,23 +113,23 @@
\installfonts
\installfamily{TS1}{fdr}{}
-\installfont{DroidSerif-Regular-ts1}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-ts1}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{m}{it}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-Slanted-ts1}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-Upright-ts1}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{m}{ui}{<->\string\droid@scale}
-\installfontas{DroidSerif-Regular-ts1}{TS1}{fdr}{m}{sc}{<->\string\droid@scale}
-\installfontas{DroidSerif-Italic-ts1}{TS1}{fdr}{m}{scit}{<->\string\droid@scale}
-\installfontas{DroidSerif-Regular-Slanted-ts1}{TS1}{fdr}{m}{scsl}{<->\string\droid@scale}
-\installfontas{DroidSerif-Italic-Upright-ts1}{TS1}{fdr}{m}{scui}{<->\string\droid@scale}
-
-\installfont{DroidSerif-Bold-ts1}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{b}{n}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-ts1}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{b}{it}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-Slanted-ts1}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{b}{sl}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-Upright-ts1}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{b}{ui}{<->\string\droid@scale}
-\installfontas{DroidSerif-Bold-ts1}{TS1}{fdr}{b}{sc}{<->\string\droid@scale}
-\installfontas{DroidSerif-BoldItalic-ts1}{TS1}{fdr}{b}{scit}{<->\string\droid@scale}
-\installfontas{DroidSerif-Bold-Slanted-ts1}{TS1}{fdr}{b}{scsl}{<->\string\droid@scale}
-\installfontas{DroidSerif-BoldItalic-Upright-ts1}{TS1}{fdr}{b}{scui}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-ts1}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{m}{n}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-ts1}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{m}{it}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-Slanted-ts1}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{m}{sl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-Upright-ts1}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{m}{ui}{<->\string\droid@fdr@scale}
+\installfontas{DroidSerif-Regular-ts1}{TS1}{fdr}{m}{sc}{<->\string\droid@fdr@scale}
+\installfontas{DroidSerif-Italic-ts1}{TS1}{fdr}{m}{scit}{<->\string\droid@fdr@scale}
+\installfontas{DroidSerif-Regular-Slanted-ts1}{TS1}{fdr}{m}{scsl}{<->\string\droid@fdr@scale}
+\installfontas{DroidSerif-Italic-Upright-ts1}{TS1}{fdr}{m}{scui}{<->\string\droid@fdr@scale}
+
+\installfont{DroidSerif-Bold-ts1}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{b}{n}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-ts1}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{b}{it}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-Slanted-ts1}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{b}{sl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-Upright-ts1}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixtextcomp,textcomp}{ts1}{TS1}{fdr}{b}{ui}{<->\string\droid@fdr@scale}
+\installfontas{DroidSerif-Bold-ts1}{TS1}{fdr}{b}{sc}{<->\string\droid@fdr@scale}
+\installfontas{DroidSerif-BoldItalic-ts1}{TS1}{fdr}{b}{scit}{<->\string\droid@fdr@scale}
+\installfontas{DroidSerif-Bold-Slanted-ts1}{TS1}{fdr}{b}{scsl}{<->\string\droid@fdr@scale}
+\installfontas{DroidSerif-BoldItalic-Upright-ts1}{TS1}{fdr}{b}{scui}{<->\string\droid@fdr@scale}
\endinstallfonts
@@ -91,23 +137,23 @@
\installfonts
\installfamily{T2A}{fdr}{}
-\installfont{DroidSerif-Regular-t2a}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-t2a}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{m}{it}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-Slanted-t2a}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-Upright-t2a}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{m}{ui}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-SmallCaps-t2a}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-SmallCaps-t2a}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{m}{scit}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-Slanted-SmallCaps-t2a}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{m}{scsl}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-Upright-SmallCaps-t2a}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{m}{scui}{<->\string\droid@scale}
-
-\installfont{DroidSerif-Bold-t2a}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{b}{n}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-t2a}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{b}{it}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-Slanted-t2a}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{b}{sl}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-Upright-t2a}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{b}{ui}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-SmallCaps-t2a}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{b}{sc}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-SmallCaps-t2a}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{b}{scit}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-Slanted-SmallCaps-t2a}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{b}{scsl}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-t2a}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{b}{scui}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-t2a}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{m}{n}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-t2a}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{m}{it}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-Slanted-t2a}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{m}{sl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-Upright-t2a}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{m}{ui}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-SmallCaps-t2a}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{m}{sc}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-SmallCaps-t2a}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{m}{scit}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-Slanted-SmallCaps-t2a}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{m}{scsl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-Upright-SmallCaps-t2a}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{m}{scui}{<->\string\droid@fdr@scale}
+
+\installfont{DroidSerif-Bold-t2a}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{b}{n}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-t2a}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{b}{it}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-Slanted-t2a}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{b}{sl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-Upright-t2a}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2a}{T2A}{fdr}{b}{ui}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-SmallCaps-t2a}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{b}{sc}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-SmallCaps-t2a}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{b}{scit}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-Slanted-SmallCaps-t2a}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{b}{scsl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-t2a}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2ac}{T2A}{fdr}{b}{scui}{<->\string\droid@fdr@scale}
\endinstallfonts
@@ -115,23 +161,23 @@
\installfonts
\installfamily{T2B}{fdr}{}
-\installfont{DroidSerif-Regular-t2b}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-t2b}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{m}{it}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-Slanted-t2b}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-Upright-t2b}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{m}{ui}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-SmallCaps-t2b}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-SmallCaps-t2b}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{m}{scit}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-Slanted-SmallCaps-t2b}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{m}{scsl}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-Upright-SmallCaps-t2b}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{m}{scui}{<->\string\droid@scale}
-
-\installfont{DroidSerif-Bold-t2b}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{b}{n}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-t2b}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{b}{it}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-Slanted-t2b}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{b}{sl}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-Upright-t2b}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{b}{ui}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-SmallCaps-t2b}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{b}{sc}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-SmallCaps-t2b}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{b}{scit}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-Slanted-SmallCaps-t2b}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{b}{scsl}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-t2b}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{b}{scui}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-t2b}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{m}{n}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-t2b}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{m}{it}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-Slanted-t2b}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{m}{sl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-Upright-t2b}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{m}{ui}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-SmallCaps-t2b}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{m}{sc}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-SmallCaps-t2b}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{m}{scit}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-Slanted-SmallCaps-t2b}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{m}{scsl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-Upright-SmallCaps-t2b}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{m}{scui}{<->\string\droid@fdr@scale}
+
+\installfont{DroidSerif-Bold-t2b}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{b}{n}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-t2b}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{b}{it}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-Slanted-t2b}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{b}{sl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-Upright-t2b}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2b}{T2B}{fdr}{b}{ui}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-SmallCaps-t2b}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{b}{sc}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-SmallCaps-t2b}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{b}{scit}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-Slanted-SmallCaps-t2b}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{b}{scsl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-t2b}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2bc}{T2B}{fdr}{b}{scui}{<->\string\droid@fdr@scale}
\endinstallfonts
@@ -139,23 +185,23 @@
\installfonts
\installfamily{T2C}{fdr}{}
-\installfont{DroidSerif-Regular-t2c}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-t2c}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{m}{it}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-Slanted-t2c}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-Upright-t2c}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{m}{ui}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-SmallCaps-t2c}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-SmallCaps-t2c}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{m}{scit}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-Slanted-SmallCaps-t2c}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{m}{scsl}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-Upright-SmallCaps-t2c}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{m}{scui}{<->\string\droid@scale}
-
-\installfont{DroidSerif-Bold-t2c}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{b}{n}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-t2c}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{b}{it}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-Slanted-t2c}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{b}{sl}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-Upright-t2c}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{b}{ui}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-SmallCaps-t2c}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{b}{sc}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-SmallCaps-t2c}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{b}{scit}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-Slanted-SmallCaps-t2c}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{b}{scsl}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-t2c}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{b}{scui}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-t2c}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{m}{n}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-t2c}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{m}{it}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-Slanted-t2c}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{m}{sl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-Upright-t2c}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{m}{ui}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-SmallCaps-t2c}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{m}{sc}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-SmallCaps-t2c}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{m}{scit}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-Slanted-SmallCaps-t2c}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{m}{scsl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-Upright-SmallCaps-t2c}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{m}{scui}{<->\string\droid@fdr@scale}
+
+\installfont{DroidSerif-Bold-t2c}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{b}{n}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-t2c}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{b}{it}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-Slanted-t2c}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{b}{sl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-Upright-t2c}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2c}{T2C}{fdr}{b}{ui}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-SmallCaps-t2c}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{b}{sc}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-SmallCaps-t2c}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{b}{scit}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-Slanted-SmallCaps-t2c}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{b}{scsl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-t2c}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{t2cc}{T2C}{fdr}{b}{scui}{<->\string\droid@fdr@scale}
\endinstallfonts
@@ -163,23 +209,23 @@
\installfonts
\installfamily{X2}{fdr}{}
-\installfont{DroidSerif-Regular-x2}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-x2}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{m}{it}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-Slanted-x2}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-Upright-x2}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{m}{ui}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-SmallCaps-x2}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-SmallCaps-x2}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{m}{scit}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-Slanted-SmallCaps-x2}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{m}{scsl}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-Upright-SmallCaps-x2}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{m}{scui}{<->\string\droid@scale}
-
-\installfont{DroidSerif-Bold-x2}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{b}{n}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-x2}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{b}{it}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-Slanted-x2}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{b}{sl}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-Upright-x2}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{b}{ui}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-SmallCaps-x2}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{b}{sc}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-SmallCaps-x2}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{b}{scit}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-Slanted-SmallCaps-x2}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{b}{scsl}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-x2}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{b}{scui}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-x2}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{m}{n}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-x2}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{m}{it}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-Slanted-x2}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{m}{sl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-Upright-x2}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{m}{ui}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-SmallCaps-x2}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{m}{sc}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-SmallCaps-x2}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{m}{scit}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-Slanted-SmallCaps-x2}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{m}{scsl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-Upright-SmallCaps-x2}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{m}{scui}{<->\string\droid@fdr@scale}
+
+\installfont{DroidSerif-Bold-x2}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{b}{n}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-x2}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{b}{it}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-Slanted-x2}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{b}{sl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-Upright-x2}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{x2}{X2}{fdr}{b}{ui}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-SmallCaps-x2}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{b}{sc}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-SmallCaps-x2}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{b}{scit}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-Slanted-SmallCaps-x2}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{b}{scsl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-x2}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixcyrillic,newlatin,cyrillic}{x2c}{X2}{fdr}{b}{scui}{<->\string\droid@fdr@scale}
\endinstallfonts
@@ -187,22 +233,22 @@
\installfonts
\installfamily{LGR}{fdr}{}
-\installfont{DroidSerif-Regular-lgr}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{m}{n}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-lgr}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{m}{it}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-Slanted-lgr}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{m}{sl}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-Upright-lgr}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{m}{ui}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-SmallCaps-lgr}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{m}{sc}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-SmallCaps-lgr}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{m}{scit}{<->\string\droid@scale}
-\installfont{DroidSerif-Regular-Slanted-SmallCaps-lgr}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{m}{scsl}{<->\string\droid@scale}
-\installfont{DroidSerif-Italic-Upright-SmallCaps-lgr}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{m}{scui}{<->\string\droid@scale}
-
-\installfont{DroidSerif-Bold-lgr}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{b}{n}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-lgr}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{b}{it}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-Slanted-lgr}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{b}{sl}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-Upright-lgr}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{b}{ui}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-SmallCaps-lgr}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{b}{sc}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-SmallCaps-lgr}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{b}{scit}{<->\string\droid@scale}
-\installfont{DroidSerif-Bold-Slanted-SmallCaps-lgr}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{b}{scsl}{<->\string\droid@scale}
-\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-lgr}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{b}{scui}{<->\string\droid@scale}
+\installfont{DroidSerif-Regular-lgr}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{m}{n}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-lgr}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{m}{it}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-Slanted-lgr}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{m}{sl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-Upright-lgr}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{m}{ui}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-SmallCaps-lgr}{DroidSerif-Regular-01,DroidSerif-Regular-02,DroidSerif-Regular-03,DroidSerif-Regular-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{m}{sc}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-SmallCaps-lgr}{DroidSerif-Italic-01,DroidSerif-Italic-02,DroidSerif-Italic-03,DroidSerif-Italic-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{m}{scit}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Regular-Slanted-SmallCaps-lgr}{DroidSerif-Regular-Slanted-01,DroidSerif-Regular-Slanted-02,DroidSerif-Regular-Slanted-03,DroidSerif-Regular-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{m}{scsl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Italic-Upright-SmallCaps-lgr}{DroidSerif-Italic-Upright-01,DroidSerif-Italic-Upright-02,DroidSerif-Italic-Upright-03,DroidSerif-Italic-Upright-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{m}{scui}{<->\string\droid@fdr@scale}
+
+\installfont{DroidSerif-Bold-lgr}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{b}{n}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-lgr}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{b}{it}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-Slanted-lgr}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{b}{sl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-Upright-lgr}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixgreek,newlatin,greek}{lgr-lig}{LGR}{fdr}{b}{ui}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-SmallCaps-lgr}{DroidSerif-Bold-01,DroidSerif-Bold-02,DroidSerif-Bold-03,DroidSerif-Bold-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{b}{sc}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-SmallCaps-lgr}{DroidSerif-BoldItalic-01,DroidSerif-BoldItalic-02,DroidSerif-BoldItalic-03,DroidSerif-BoldItalic-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{b}{scit}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-Bold-Slanted-SmallCaps-lgr}{DroidSerif-Bold-Slanted-01,DroidSerif-Bold-Slanted-02,DroidSerif-Bold-Slanted-03,DroidSerif-Bold-Slanted-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{b}{scsl}{<->\string\droid@fdr@scale}
+\installfont{DroidSerif-BoldItalic-Upright-SmallCaps-lgr}{DroidSerif-BoldItalic-Upright-01,DroidSerif-BoldItalic-Upright-02,DroidSerif-BoldItalic-Upright-03,DroidSerif-BoldItalic-Upright-04,droid-fixgreek,newlatin,greek}{lgr-ligc}{LGR}{fdr}{b}{scui}{<->\string\droid@fdr@scale}
\endinstallfonts
diff --git a/Master/texmf-dist/tex/latex/droid/droidmono.sty b/Master/texmf-dist/tex/latex/droid/droidmono.sty
index 2438ad3d29a..4dc625047db 100644
--- a/Master/texmf-dist/tex/latex/droid/droidmono.sty
+++ b/Master/texmf-dist/tex/latex/droid/droidmono.sty
@@ -14,7 +14,7 @@
% This work consists of all files listed in manifest.txt.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{droidmono}[2011/08/21 Droid Sans Mono]
+\ProvidesPackage{droidmono}[2011/09/11 Droid Sans Mono]
\RequirePackage{keyval}
\RequirePackage{slantsc}
diff --git a/Master/texmf-dist/tex/latex/droid/droidsans.sty b/Master/texmf-dist/tex/latex/droid/droidsans.sty
index 93c4301185b..5a5106b7efe 100644
--- a/Master/texmf-dist/tex/latex/droid/droidsans.sty
+++ b/Master/texmf-dist/tex/latex/droid/droidsans.sty
@@ -14,7 +14,7 @@
% This work consists of all files listed in manifest.txt.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{droidsans}[2011/08/21 Droid Sans]
+\ProvidesPackage{droidsans}[2011/09/11 Droid Sans]
\RequirePackage{keyval}
\RequirePackage{slantsc}
diff --git a/Master/texmf-dist/tex/latex/droid/droidserif.sty b/Master/texmf-dist/tex/latex/droid/droidserif.sty
index ec21d9baec2..80d1e4fa3e2 100644
--- a/Master/texmf-dist/tex/latex/droid/droidserif.sty
+++ b/Master/texmf-dist/tex/latex/droid/droidserif.sty
@@ -14,7 +14,7 @@
% This work consists of all files listed in manifest.txt.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{droidserif}[2011/08/21 Droid Serif]
+\ProvidesPackage{droidserif}[2011/09/11 Droid Serif]
\RequirePackage{keyval}
\RequirePackage{slantsc}
diff --git a/Master/texmf-dist/tex/latex/droid/lgrfdm.fd b/Master/texmf-dist/tex/latex/droid/lgrfdm.fd
index 4a780bdf167..3b586649198 100644
--- a/Master/texmf-dist/tex/latex/droid/lgrfdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/lgrfdm.fd
@@ -5,28 +5,28 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{lgrfdm.fd}
- [2011/08/21 Fontinst v1.933 font definitions for LGR/fdm.]
+ [2011/09/11 Fontinst v1.933 font definitions for LGR/fdm.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fdm@scale\endcsname\relax
+ \let\droid@fdm@scale\@empty
\fi
\DeclareFontFamily{LGR}{fdm}{}
\DeclareFontShape{LGR}{fdm}{m}{n}{
- <->\droid@scale DroidSansMono-lgr
+ <->\droid@fdm@scale DroidSansMono-lgr
}{}
\DeclareFontShape{LGR}{fdm}{m}{sl}{
- <->\droid@scale DroidSansMono-Slanted-lgr
+ <->\droid@fdm@scale DroidSansMono-Slanted-lgr
}{}
\DeclareFontShape{LGR}{fdm}{m}{sc}{
- <->\droid@scale DroidSansMono-SmallCaps-lgr
+ <->\droid@fdm@scale DroidSansMono-SmallCaps-lgr
}{}
\DeclareFontShape{LGR}{fdm}{m}{scsl}{
- <->\droid@scale DroidSansMono-Slanted-SmallCaps-lgr
+ <->\droid@fdm@scale DroidSansMono-Slanted-SmallCaps-lgr
}{}
\DeclareFontShape{LGR}{fdm}{m}{it}{<->ssub * fdm/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/lgrfdr.fd b/Master/texmf-dist/tex/latex/droid/lgrfdr.fd
index 1b4d1cea7fe..64fc6b54062 100644
--- a/Master/texmf-dist/tex/latex/droid/lgrfdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/lgrfdr.fd
@@ -5,76 +5,76 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{lgrfdr.fd}
- [2011/08/21 Fontinst v1.933 font definitions for LGR/fdr.]
+ [2011/09/11 Fontinst v1.933 font definitions for LGR/fdr.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fdr@scale\endcsname\relax
+ \let\droid@fdr@scale\@empty
\fi
\DeclareFontFamily{LGR}{fdr}{}
\DeclareFontShape{LGR}{fdr}{m}{n}{
- <->\droid@scale DroidSerif-Regular-lgr
+ <->\droid@fdr@scale DroidSerif-Regular-lgr
}{}
\DeclareFontShape{LGR}{fdr}{m}{it}{
- <->\droid@scale DroidSerif-Italic-lgr
+ <->\droid@fdr@scale DroidSerif-Italic-lgr
}{}
\DeclareFontShape{LGR}{fdr}{m}{sl}{
- <->\droid@scale DroidSerif-Regular-Slanted-lgr
+ <->\droid@fdr@scale DroidSerif-Regular-Slanted-lgr
}{}
\DeclareFontShape{LGR}{fdr}{m}{ui}{
- <->\droid@scale DroidSerif-Italic-Upright-lgr
+ <->\droid@fdr@scale DroidSerif-Italic-Upright-lgr
}{}
\DeclareFontShape{LGR}{fdr}{m}{sc}{
- <->\droid@scale DroidSerif-Regular-SmallCaps-lgr
+ <->\droid@fdr@scale DroidSerif-Regular-SmallCaps-lgr
}{}
\DeclareFontShape{LGR}{fdr}{m}{scit}{
- <->\droid@scale DroidSerif-Italic-SmallCaps-lgr
+ <->\droid@fdr@scale DroidSerif-Italic-SmallCaps-lgr
}{}
\DeclareFontShape{LGR}{fdr}{m}{scsl}{
- <->\droid@scale DroidSerif-Regular-Slanted-SmallCaps-lgr
+ <->\droid@fdr@scale DroidSerif-Regular-Slanted-SmallCaps-lgr
}{}
\DeclareFontShape{LGR}{fdr}{m}{scui}{
- <->\droid@scale DroidSerif-Italic-Upright-SmallCaps-lgr
+ <->\droid@fdr@scale DroidSerif-Italic-Upright-SmallCaps-lgr
}{}
\DeclareFontShape{LGR}{fdr}{b}{n}{
- <->\droid@scale DroidSerif-Bold-lgr
+ <->\droid@fdr@scale DroidSerif-Bold-lgr
}{}
\DeclareFontShape{LGR}{fdr}{b}{it}{
- <->\droid@scale DroidSerif-BoldItalic-lgr
+ <->\droid@fdr@scale DroidSerif-BoldItalic-lgr
}{}
\DeclareFontShape{LGR}{fdr}{b}{sl}{
- <->\droid@scale DroidSerif-Bold-Slanted-lgr
+ <->\droid@fdr@scale DroidSerif-Bold-Slanted-lgr
}{}
\DeclareFontShape{LGR}{fdr}{b}{ui}{
- <->\droid@scale DroidSerif-BoldItalic-Upright-lgr
+ <->\droid@fdr@scale DroidSerif-BoldItalic-Upright-lgr
}{}
\DeclareFontShape{LGR}{fdr}{b}{sc}{
- <->\droid@scale DroidSerif-Bold-SmallCaps-lgr
+ <->\droid@fdr@scale DroidSerif-Bold-SmallCaps-lgr
}{}
\DeclareFontShape{LGR}{fdr}{b}{scit}{
- <->\droid@scale DroidSerif-BoldItalic-SmallCaps-lgr
+ <->\droid@fdr@scale DroidSerif-BoldItalic-SmallCaps-lgr
}{}
\DeclareFontShape{LGR}{fdr}{b}{scsl}{
- <->\droid@scale DroidSerif-Bold-Slanted-SmallCaps-lgr
+ <->\droid@fdr@scale DroidSerif-Bold-Slanted-SmallCaps-lgr
}{}
\DeclareFontShape{LGR}{fdr}{b}{scui}{
- <->\droid@scale DroidSerif-BoldItalic-Upright-SmallCaps-lgr
+ <->\droid@fdr@scale DroidSerif-BoldItalic-Upright-SmallCaps-lgr
}{}
\DeclareFontShape{LGR}{fdr}{bx}{n}{<->ssub * fdr/b/n}{}
diff --git a/Master/texmf-dist/tex/latex/droid/lgrfds.fd b/Master/texmf-dist/tex/latex/droid/lgrfds.fd
index a34de05e0bb..dbe9835548c 100644
--- a/Master/texmf-dist/tex/latex/droid/lgrfds.fd
+++ b/Master/texmf-dist/tex/latex/droid/lgrfds.fd
@@ -5,44 +5,44 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{lgrfds.fd}
- [2011/08/21 Fontinst v1.933 font definitions for LGR/fds.]
+ [2011/09/11 Fontinst v1.933 font definitions for LGR/fds.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fds@scale\endcsname\relax
+ \let\droid@fds@scale\@empty
\fi
\DeclareFontFamily{LGR}{fds}{}
\DeclareFontShape{LGR}{fds}{m}{n}{
- <->\droid@scale DroidSans-lgr
+ <->\droid@fds@scale DroidSans-lgr
}{}
\DeclareFontShape{LGR}{fds}{m}{sl}{
- <->\droid@scale DroidSans-Slanted-lgr
+ <->\droid@fds@scale DroidSans-Slanted-lgr
}{}
\DeclareFontShape{LGR}{fds}{m}{sc}{
- <->\droid@scale DroidSans-SmallCaps-lgr
+ <->\droid@fds@scale DroidSans-SmallCaps-lgr
}{}
\DeclareFontShape{LGR}{fds}{m}{scsl}{
- <->\droid@scale DroidSans-Slanted-SmallCaps-lgr
+ <->\droid@fds@scale DroidSans-Slanted-SmallCaps-lgr
}{}
\DeclareFontShape{LGR}{fds}{b}{n}{
- <->\droid@scale DroidSans-Bold-lgr
+ <->\droid@fds@scale DroidSans-Bold-lgr
}{}
\DeclareFontShape{LGR}{fds}{b}{sl}{
- <->\droid@scale DroidSans-Bold-Slanted-lgr
+ <->\droid@fds@scale DroidSans-Bold-Slanted-lgr
}{}
\DeclareFontShape{LGR}{fds}{b}{sc}{
- <->\droid@scale DroidSans-Bold-SmallCaps-lgr
+ <->\droid@fds@scale DroidSans-Bold-SmallCaps-lgr
}{}
\DeclareFontShape{LGR}{fds}{b}{scsl}{
- <->\droid@scale DroidSans-Bold-Slanted-SmallCaps-lgr
+ <->\droid@fds@scale DroidSans-Bold-Slanted-SmallCaps-lgr
}{}
\DeclareFontShape{LGR}{fds}{m}{it}{<->ssub * fds/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/ot1fdm.fd b/Master/texmf-dist/tex/latex/droid/ot1fdm.fd
index 8a4afcde57c..44ce4c33a74 100644
--- a/Master/texmf-dist/tex/latex/droid/ot1fdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/ot1fdm.fd
@@ -5,28 +5,28 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ot1fdm.fd}
- [2011/08/21 Fontinst v1.933 font definitions for OT1/fdm.]
+ [2011/09/11 Fontinst v1.933 font definitions for OT1/fdm.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fdm@scale\endcsname\relax
+ \let\droid@fdm@scale\@empty
\fi
\DeclareFontFamily{OT1}{fdm}{}
\DeclareFontShape{OT1}{fdm}{m}{n}{
- <->\droid@scale DroidSansMono-ot1
+ <->\droid@fdm@scale DroidSansMono-ot1
}{}
\DeclareFontShape{OT1}{fdm}{m}{sl}{
- <->\droid@scale DroidSansMono-Slanted-ot1
+ <->\droid@fdm@scale DroidSansMono-Slanted-ot1
}{}
\DeclareFontShape{OT1}{fdm}{m}{sc}{
- <->\droid@scale DroidSansMono-SmallCaps-ot1
+ <->\droid@fdm@scale DroidSansMono-SmallCaps-ot1
}{}
\DeclareFontShape{OT1}{fdm}{m}{scsl}{
- <->\droid@scale DroidSansMono-Slanted-SmallCaps-ot1
+ <->\droid@fdm@scale DroidSansMono-Slanted-SmallCaps-ot1
}{}
\DeclareFontShape{OT1}{fdm}{m}{it}{<->ssub * fdm/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/ot1fdr.fd b/Master/texmf-dist/tex/latex/droid/ot1fdr.fd
index 578ff67f11f..fbbcc881043 100644
--- a/Master/texmf-dist/tex/latex/droid/ot1fdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/ot1fdr.fd
@@ -5,76 +5,76 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ot1fdr.fd}
- [2011/08/21 Fontinst v1.933 font definitions for OT1/fdr.]
+ [2011/09/11 Fontinst v1.933 font definitions for OT1/fdr.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fdr@scale\endcsname\relax
+ \let\droid@fdr@scale\@empty
\fi
\DeclareFontFamily{OT1}{fdr}{}
\DeclareFontShape{OT1}{fdr}{m}{n}{
- <->\droid@scale DroidSerif-Regular-ot1
+ <->\droid@fdr@scale DroidSerif-Regular-ot1
}{}
\DeclareFontShape{OT1}{fdr}{m}{it}{
- <->\droid@scale DroidSerif-Italic-ot1
+ <->\droid@fdr@scale DroidSerif-Italic-ot1
}{}
\DeclareFontShape{OT1}{fdr}{m}{sl}{
- <->\droid@scale DroidSerif-Regular-Slanted-ot1
+ <->\droid@fdr@scale DroidSerif-Regular-Slanted-ot1
}{}
\DeclareFontShape{OT1}{fdr}{m}{ui}{
- <->\droid@scale DroidSerif-Italic-Upright-ot1
+ <->\droid@fdr@scale DroidSerif-Italic-Upright-ot1
}{}
\DeclareFontShape{OT1}{fdr}{m}{sc}{
- <->\droid@scale DroidSerif-Regular-SmallCaps-ot1
+ <->\droid@fdr@scale DroidSerif-Regular-SmallCaps-ot1
}{}
\DeclareFontShape{OT1}{fdr}{m}{scit}{
- <->\droid@scale DroidSerif-Italic-SmallCaps-ot1
+ <->\droid@fdr@scale DroidSerif-Italic-SmallCaps-ot1
}{}
\DeclareFontShape{OT1}{fdr}{m}{scsl}{
- <->\droid@scale DroidSerif-Regular-Slanted-SmallCaps-ot1
+ <->\droid@fdr@scale DroidSerif-Regular-Slanted-SmallCaps-ot1
}{}
\DeclareFontShape{OT1}{fdr}{m}{scui}{
- <->\droid@scale DroidSerif-Italic-Upright-SmallCaps-ot1
+ <->\droid@fdr@scale DroidSerif-Italic-Upright-SmallCaps-ot1
}{}
\DeclareFontShape{OT1}{fdr}{b}{n}{
- <->\droid@scale DroidSerif-Bold-ot1
+ <->\droid@fdr@scale DroidSerif-Bold-ot1
}{}
\DeclareFontShape{OT1}{fdr}{b}{it}{
- <->\droid@scale DroidSerif-BoldItalic-ot1
+ <->\droid@fdr@scale DroidSerif-BoldItalic-ot1
}{}
\DeclareFontShape{OT1}{fdr}{b}{sl}{
- <->\droid@scale DroidSerif-Bold-Slanted-ot1
+ <->\droid@fdr@scale DroidSerif-Bold-Slanted-ot1
}{}
\DeclareFontShape{OT1}{fdr}{b}{ui}{
- <->\droid@scale DroidSerif-BoldItalic-Upright-ot1
+ <->\droid@fdr@scale DroidSerif-BoldItalic-Upright-ot1
}{}
\DeclareFontShape{OT1}{fdr}{b}{sc}{
- <->\droid@scale DroidSerif-Bold-SmallCaps-ot1
+ <->\droid@fdr@scale DroidSerif-Bold-SmallCaps-ot1
}{}
\DeclareFontShape{OT1}{fdr}{b}{scit}{
- <->\droid@scale DroidSerif-BoldItalic-SmallCaps-ot1
+ <->\droid@fdr@scale DroidSerif-BoldItalic-SmallCaps-ot1
}{}
\DeclareFontShape{OT1}{fdr}{b}{scsl}{
- <->\droid@scale DroidSerif-Bold-Slanted-SmallCaps-ot1
+ <->\droid@fdr@scale DroidSerif-Bold-Slanted-SmallCaps-ot1
}{}
\DeclareFontShape{OT1}{fdr}{b}{scui}{
- <->\droid@scale DroidSerif-BoldItalic-Upright-SmallCaps-ot1
+ <->\droid@fdr@scale DroidSerif-BoldItalic-Upright-SmallCaps-ot1
}{}
\DeclareFontShape{OT1}{fdr}{bx}{n}{<->ssub * fdr/b/n}{}
diff --git a/Master/texmf-dist/tex/latex/droid/ot1fds.fd b/Master/texmf-dist/tex/latex/droid/ot1fds.fd
index 01c2cdc179a..54d84419c74 100644
--- a/Master/texmf-dist/tex/latex/droid/ot1fds.fd
+++ b/Master/texmf-dist/tex/latex/droid/ot1fds.fd
@@ -5,44 +5,44 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ot1fds.fd}
- [2011/08/21 Fontinst v1.933 font definitions for OT1/fds.]
+ [2011/09/11 Fontinst v1.933 font definitions for OT1/fds.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fds@scale\endcsname\relax
+ \let\droid@fds@scale\@empty
\fi
\DeclareFontFamily{OT1}{fds}{}
\DeclareFontShape{OT1}{fds}{m}{n}{
- <->\droid@scale DroidSans-ot1
+ <->\droid@fds@scale DroidSans-ot1
}{}
\DeclareFontShape{OT1}{fds}{m}{sl}{
- <->\droid@scale DroidSans-Slanted-ot1
+ <->\droid@fds@scale DroidSans-Slanted-ot1
}{}
\DeclareFontShape{OT1}{fds}{m}{sc}{
- <->\droid@scale DroidSans-SmallCaps-ot1
+ <->\droid@fds@scale DroidSans-SmallCaps-ot1
}{}
\DeclareFontShape{OT1}{fds}{m}{scsl}{
- <->\droid@scale DroidSans-Slanted-SmallCaps-ot1
+ <->\droid@fds@scale DroidSans-Slanted-SmallCaps-ot1
}{}
\DeclareFontShape{OT1}{fds}{b}{n}{
- <->\droid@scale DroidSans-Bold-ot1
+ <->\droid@fds@scale DroidSans-Bold-ot1
}{}
\DeclareFontShape{OT1}{fds}{b}{sl}{
- <->\droid@scale DroidSans-Bold-Slanted-ot1
+ <->\droid@fds@scale DroidSans-Bold-Slanted-ot1
}{}
\DeclareFontShape{OT1}{fds}{b}{sc}{
- <->\droid@scale DroidSans-Bold-SmallCaps-ot1
+ <->\droid@fds@scale DroidSans-Bold-SmallCaps-ot1
}{}
\DeclareFontShape{OT1}{fds}{b}{scsl}{
- <->\droid@scale DroidSans-Bold-Slanted-SmallCaps-ot1
+ <->\droid@fds@scale DroidSans-Bold-Slanted-SmallCaps-ot1
}{}
\DeclareFontShape{OT1}{fds}{m}{it}{<->ssub * fds/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t1fdm.fd b/Master/texmf-dist/tex/latex/droid/t1fdm.fd
index 73fcb01f41f..2cc58a4327e 100644
--- a/Master/texmf-dist/tex/latex/droid/t1fdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/t1fdm.fd
@@ -5,28 +5,28 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1fdm.fd}
- [2011/08/21 Fontinst v1.933 font definitions for T1/fdm.]
+ [2011/09/11 Fontinst v1.933 font definitions for T1/fdm.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fdm@scale\endcsname\relax
+ \let\droid@fdm@scale\@empty
\fi
\DeclareFontFamily{T1}{fdm}{}
\DeclareFontShape{T1}{fdm}{m}{n}{
- <->\droid@scale DroidSansMono-t1
+ <->\droid@fdm@scale DroidSansMono-t1
}{}
\DeclareFontShape{T1}{fdm}{m}{sl}{
- <->\droid@scale DroidSansMono-Slanted-t1
+ <->\droid@fdm@scale DroidSansMono-Slanted-t1
}{}
\DeclareFontShape{T1}{fdm}{m}{sc}{
- <->\droid@scale DroidSansMono-SmallCaps-t1
+ <->\droid@fdm@scale DroidSansMono-SmallCaps-t1
}{}
\DeclareFontShape{T1}{fdm}{m}{scsl}{
- <->\droid@scale DroidSansMono-Slanted-SmallCaps-t1
+ <->\droid@fdm@scale DroidSansMono-Slanted-SmallCaps-t1
}{}
\DeclareFontShape{T1}{fdm}{m}{it}{<->ssub * fdm/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t1fdr.fd b/Master/texmf-dist/tex/latex/droid/t1fdr.fd
index 69687e540c7..1373cdd18ae 100644
--- a/Master/texmf-dist/tex/latex/droid/t1fdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/t1fdr.fd
@@ -5,76 +5,76 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1fdr.fd}
- [2011/08/21 Fontinst v1.933 font definitions for T1/fdr.]
+ [2011/09/11 Fontinst v1.933 font definitions for T1/fdr.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fdr@scale\endcsname\relax
+ \let\droid@fdr@scale\@empty
\fi
\DeclareFontFamily{T1}{fdr}{}
\DeclareFontShape{T1}{fdr}{m}{n}{
- <->\droid@scale DroidSerif-Regular-t1
+ <->\droid@fdr@scale DroidSerif-Regular-t1
}{}
\DeclareFontShape{T1}{fdr}{m}{it}{
- <->\droid@scale DroidSerif-Italic-t1
+ <->\droid@fdr@scale DroidSerif-Italic-t1
}{}
\DeclareFontShape{T1}{fdr}{m}{sl}{
- <->\droid@scale DroidSerif-Regular-Slanted-t1
+ <->\droid@fdr@scale DroidSerif-Regular-Slanted-t1
}{}
\DeclareFontShape{T1}{fdr}{m}{ui}{
- <->\droid@scale DroidSerif-Italic-Upright-t1
+ <->\droid@fdr@scale DroidSerif-Italic-Upright-t1
}{}
\DeclareFontShape{T1}{fdr}{m}{sc}{
- <->\droid@scale DroidSerif-Regular-SmallCaps-t1
+ <->\droid@fdr@scale DroidSerif-Regular-SmallCaps-t1
}{}
\DeclareFontShape{T1}{fdr}{m}{scit}{
- <->\droid@scale DroidSerif-Italic-SmallCaps-t1
+ <->\droid@fdr@scale DroidSerif-Italic-SmallCaps-t1
}{}
\DeclareFontShape{T1}{fdr}{m}{scsl}{
- <->\droid@scale DroidSerif-Regular-Slanted-SmallCaps-t1
+ <->\droid@fdr@scale DroidSerif-Regular-Slanted-SmallCaps-t1
}{}
\DeclareFontShape{T1}{fdr}{m}{scui}{
- <->\droid@scale DroidSerif-Italic-Upright-SmallCaps-t1
+ <->\droid@fdr@scale DroidSerif-Italic-Upright-SmallCaps-t1
}{}
\DeclareFontShape{T1}{fdr}{b}{n}{
- <->\droid@scale DroidSerif-Bold-t1
+ <->\droid@fdr@scale DroidSerif-Bold-t1
}{}
\DeclareFontShape{T1}{fdr}{b}{it}{
- <->\droid@scale DroidSerif-BoldItalic-t1
+ <->\droid@fdr@scale DroidSerif-BoldItalic-t1
}{}
\DeclareFontShape{T1}{fdr}{b}{sl}{
- <->\droid@scale DroidSerif-Bold-Slanted-t1
+ <->\droid@fdr@scale DroidSerif-Bold-Slanted-t1
}{}
\DeclareFontShape{T1}{fdr}{b}{ui}{
- <->\droid@scale DroidSerif-BoldItalic-Upright-t1
+ <->\droid@fdr@scale DroidSerif-BoldItalic-Upright-t1
}{}
\DeclareFontShape{T1}{fdr}{b}{sc}{
- <->\droid@scale DroidSerif-Bold-SmallCaps-t1
+ <->\droid@fdr@scale DroidSerif-Bold-SmallCaps-t1
}{}
\DeclareFontShape{T1}{fdr}{b}{scit}{
- <->\droid@scale DroidSerif-BoldItalic-SmallCaps-t1
+ <->\droid@fdr@scale DroidSerif-BoldItalic-SmallCaps-t1
}{}
\DeclareFontShape{T1}{fdr}{b}{scsl}{
- <->\droid@scale DroidSerif-Bold-Slanted-SmallCaps-t1
+ <->\droid@fdr@scale DroidSerif-Bold-Slanted-SmallCaps-t1
}{}
\DeclareFontShape{T1}{fdr}{b}{scui}{
- <->\droid@scale DroidSerif-BoldItalic-Upright-SmallCaps-t1
+ <->\droid@fdr@scale DroidSerif-BoldItalic-Upright-SmallCaps-t1
}{}
\DeclareFontShape{T1}{fdr}{bx}{n}{<->ssub * fdr/b/n}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t1fds.fd b/Master/texmf-dist/tex/latex/droid/t1fds.fd
index c01e0f7903e..05864138712 100644
--- a/Master/texmf-dist/tex/latex/droid/t1fds.fd
+++ b/Master/texmf-dist/tex/latex/droid/t1fds.fd
@@ -5,44 +5,44 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1fds.fd}
- [2011/08/21 Fontinst v1.933 font definitions for T1/fds.]
+ [2011/09/11 Fontinst v1.933 font definitions for T1/fds.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fds@scale\endcsname\relax
+ \let\droid@fds@scale\@empty
\fi
\DeclareFontFamily{T1}{fds}{}
\DeclareFontShape{T1}{fds}{m}{n}{
- <->\droid@scale DroidSans-t1
+ <->\droid@fds@scale DroidSans-t1
}{}
\DeclareFontShape{T1}{fds}{m}{sl}{
- <->\droid@scale DroidSans-Slanted-t1
+ <->\droid@fds@scale DroidSans-Slanted-t1
}{}
\DeclareFontShape{T1}{fds}{m}{sc}{
- <->\droid@scale DroidSans-SmallCaps-t1
+ <->\droid@fds@scale DroidSans-SmallCaps-t1
}{}
\DeclareFontShape{T1}{fds}{m}{scsl}{
- <->\droid@scale DroidSans-Slanted-SmallCaps-t1
+ <->\droid@fds@scale DroidSans-Slanted-SmallCaps-t1
}{}
\DeclareFontShape{T1}{fds}{b}{n}{
- <->\droid@scale DroidSans-Bold-t1
+ <->\droid@fds@scale DroidSans-Bold-t1
}{}
\DeclareFontShape{T1}{fds}{b}{sl}{
- <->\droid@scale DroidSans-Bold-Slanted-t1
+ <->\droid@fds@scale DroidSans-Bold-Slanted-t1
}{}
\DeclareFontShape{T1}{fds}{b}{sc}{
- <->\droid@scale DroidSans-Bold-SmallCaps-t1
+ <->\droid@fds@scale DroidSans-Bold-SmallCaps-t1
}{}
\DeclareFontShape{T1}{fds}{b}{scsl}{
- <->\droid@scale DroidSans-Bold-Slanted-SmallCaps-t1
+ <->\droid@fds@scale DroidSans-Bold-Slanted-SmallCaps-t1
}{}
\DeclareFontShape{T1}{fds}{m}{it}{<->ssub * fds/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t2afdm.fd b/Master/texmf-dist/tex/latex/droid/t2afdm.fd
index b83c7148d14..d2bbd3a4a63 100644
--- a/Master/texmf-dist/tex/latex/droid/t2afdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2afdm.fd
@@ -5,28 +5,28 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t2afdm.fd}
- [2011/08/21 Fontinst v1.933 font definitions for T2A/fdm.]
+ [2011/09/11 Fontinst v1.933 font definitions for T2A/fdm.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fdm@scale\endcsname\relax
+ \let\droid@fdm@scale\@empty
\fi
\DeclareFontFamily{T2A}{fdm}{}
\DeclareFontShape{T2A}{fdm}{m}{n}{
- <->\droid@scale DroidSansMono-t2a
+ <->\droid@fdm@scale DroidSansMono-t2a
}{}
\DeclareFontShape{T2A}{fdm}{m}{sl}{
- <->\droid@scale DroidSansMono-Slanted-t2a
+ <->\droid@fdm@scale DroidSansMono-Slanted-t2a
}{}
\DeclareFontShape{T2A}{fdm}{m}{sc}{
- <->\droid@scale DroidSansMono-SmallCaps-t2a
+ <->\droid@fdm@scale DroidSansMono-SmallCaps-t2a
}{}
\DeclareFontShape{T2A}{fdm}{m}{scsl}{
- <->\droid@scale DroidSansMono-Slanted-SmallCaps-t2a
+ <->\droid@fdm@scale DroidSansMono-Slanted-SmallCaps-t2a
}{}
\DeclareFontShape{T2A}{fdm}{m}{it}{<->ssub * fdm/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t2afdr.fd b/Master/texmf-dist/tex/latex/droid/t2afdr.fd
index cda0ed17285..fb30b8faad8 100644
--- a/Master/texmf-dist/tex/latex/droid/t2afdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2afdr.fd
@@ -5,76 +5,76 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t2afdr.fd}
- [2011/08/21 Fontinst v1.933 font definitions for T2A/fdr.]
+ [2011/09/11 Fontinst v1.933 font definitions for T2A/fdr.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fdr@scale\endcsname\relax
+ \let\droid@fdr@scale\@empty
\fi
\DeclareFontFamily{T2A}{fdr}{}
\DeclareFontShape{T2A}{fdr}{m}{n}{
- <->\droid@scale DroidSerif-Regular-t2a
+ <->\droid@fdr@scale DroidSerif-Regular-t2a
}{}
\DeclareFontShape{T2A}{fdr}{m}{it}{
- <->\droid@scale DroidSerif-Italic-t2a
+ <->\droid@fdr@scale DroidSerif-Italic-t2a
}{}
\DeclareFontShape{T2A}{fdr}{m}{sl}{
- <->\droid@scale DroidSerif-Regular-Slanted-t2a
+ <->\droid@fdr@scale DroidSerif-Regular-Slanted-t2a
}{}
\DeclareFontShape{T2A}{fdr}{m}{ui}{
- <->\droid@scale DroidSerif-Italic-Upright-t2a
+ <->\droid@fdr@scale DroidSerif-Italic-Upright-t2a
}{}
\DeclareFontShape{T2A}{fdr}{m}{sc}{
- <->\droid@scale DroidSerif-Regular-SmallCaps-t2a
+ <->\droid@fdr@scale DroidSerif-Regular-SmallCaps-t2a
}{}
\DeclareFontShape{T2A}{fdr}{m}{scit}{
- <->\droid@scale DroidSerif-Italic-SmallCaps-t2a
+ <->\droid@fdr@scale DroidSerif-Italic-SmallCaps-t2a
}{}
\DeclareFontShape{T2A}{fdr}{m}{scsl}{
- <->\droid@scale DroidSerif-Regular-Slanted-SmallCaps-t2a
+ <->\droid@fdr@scale DroidSerif-Regular-Slanted-SmallCaps-t2a
}{}
\DeclareFontShape{T2A}{fdr}{m}{scui}{
- <->\droid@scale DroidSerif-Italic-Upright-SmallCaps-t2a
+ <->\droid@fdr@scale DroidSerif-Italic-Upright-SmallCaps-t2a
}{}
\DeclareFontShape{T2A}{fdr}{b}{n}{
- <->\droid@scale DroidSerif-Bold-t2a
+ <->\droid@fdr@scale DroidSerif-Bold-t2a
}{}
\DeclareFontShape{T2A}{fdr}{b}{it}{
- <->\droid@scale DroidSerif-BoldItalic-t2a
+ <->\droid@fdr@scale DroidSerif-BoldItalic-t2a
}{}
\DeclareFontShape{T2A}{fdr}{b}{sl}{
- <->\droid@scale DroidSerif-Bold-Slanted-t2a
+ <->\droid@fdr@scale DroidSerif-Bold-Slanted-t2a
}{}
\DeclareFontShape{T2A}{fdr}{b}{ui}{
- <->\droid@scale DroidSerif-BoldItalic-Upright-t2a
+ <->\droid@fdr@scale DroidSerif-BoldItalic-Upright-t2a
}{}
\DeclareFontShape{T2A}{fdr}{b}{sc}{
- <->\droid@scale DroidSerif-Bold-SmallCaps-t2a
+ <->\droid@fdr@scale DroidSerif-Bold-SmallCaps-t2a
}{}
\DeclareFontShape{T2A}{fdr}{b}{scit}{
- <->\droid@scale DroidSerif-BoldItalic-SmallCaps-t2a
+ <->\droid@fdr@scale DroidSerif-BoldItalic-SmallCaps-t2a
}{}
\DeclareFontShape{T2A}{fdr}{b}{scsl}{
- <->\droid@scale DroidSerif-Bold-Slanted-SmallCaps-t2a
+ <->\droid@fdr@scale DroidSerif-Bold-Slanted-SmallCaps-t2a
}{}
\DeclareFontShape{T2A}{fdr}{b}{scui}{
- <->\droid@scale DroidSerif-BoldItalic-Upright-SmallCaps-t2a
+ <->\droid@fdr@scale DroidSerif-BoldItalic-Upright-SmallCaps-t2a
}{}
\DeclareFontShape{T2A}{fdr}{bx}{n}{<->ssub * fdr/b/n}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t2afds.fd b/Master/texmf-dist/tex/latex/droid/t2afds.fd
index d89ed7624be..decc1ab765a 100644
--- a/Master/texmf-dist/tex/latex/droid/t2afds.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2afds.fd
@@ -5,44 +5,44 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t2afds.fd}
- [2011/08/21 Fontinst v1.933 font definitions for T2A/fds.]
+ [2011/09/11 Fontinst v1.933 font definitions for T2A/fds.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fds@scale\endcsname\relax
+ \let\droid@fds@scale\@empty
\fi
\DeclareFontFamily{T2A}{fds}{}
\DeclareFontShape{T2A}{fds}{m}{n}{
- <->\droid@scale DroidSans-t2a
+ <->\droid@fds@scale DroidSans-t2a
}{}
\DeclareFontShape{T2A}{fds}{m}{sl}{
- <->\droid@scale DroidSans-Slanted-t2a
+ <->\droid@fds@scale DroidSans-Slanted-t2a
}{}
\DeclareFontShape{T2A}{fds}{m}{sc}{
- <->\droid@scale DroidSans-SmallCaps-t2a
+ <->\droid@fds@scale DroidSans-SmallCaps-t2a
}{}
\DeclareFontShape{T2A}{fds}{m}{scsl}{
- <->\droid@scale DroidSans-Slanted-SmallCaps-t2a
+ <->\droid@fds@scale DroidSans-Slanted-SmallCaps-t2a
}{}
\DeclareFontShape{T2A}{fds}{b}{n}{
- <->\droid@scale DroidSans-Bold-t2a
+ <->\droid@fds@scale DroidSans-Bold-t2a
}{}
\DeclareFontShape{T2A}{fds}{b}{sl}{
- <->\droid@scale DroidSans-Bold-Slanted-t2a
+ <->\droid@fds@scale DroidSans-Bold-Slanted-t2a
}{}
\DeclareFontShape{T2A}{fds}{b}{sc}{
- <->\droid@scale DroidSans-Bold-SmallCaps-t2a
+ <->\droid@fds@scale DroidSans-Bold-SmallCaps-t2a
}{}
\DeclareFontShape{T2A}{fds}{b}{scsl}{
- <->\droid@scale DroidSans-Bold-Slanted-SmallCaps-t2a
+ <->\droid@fds@scale DroidSans-Bold-Slanted-SmallCaps-t2a
}{}
\DeclareFontShape{T2A}{fds}{m}{it}{<->ssub * fds/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t2bfdm.fd b/Master/texmf-dist/tex/latex/droid/t2bfdm.fd
index 94ba346c3ea..1b2520ef347 100644
--- a/Master/texmf-dist/tex/latex/droid/t2bfdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2bfdm.fd
@@ -5,28 +5,28 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t2bfdm.fd}
- [2011/08/21 Fontinst v1.933 font definitions for T2B/fdm.]
+ [2011/09/11 Fontinst v1.933 font definitions for T2B/fdm.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fdm@scale\endcsname\relax
+ \let\droid@fdm@scale\@empty
\fi
\DeclareFontFamily{T2B}{fdm}{}
\DeclareFontShape{T2B}{fdm}{m}{n}{
- <->\droid@scale DroidSansMono-t2b
+ <->\droid@fdm@scale DroidSansMono-t2b
}{}
\DeclareFontShape{T2B}{fdm}{m}{sl}{
- <->\droid@scale DroidSansMono-Slanted-t2b
+ <->\droid@fdm@scale DroidSansMono-Slanted-t2b
}{}
\DeclareFontShape{T2B}{fdm}{m}{sc}{
- <->\droid@scale DroidSansMono-SmallCaps-t2b
+ <->\droid@fdm@scale DroidSansMono-SmallCaps-t2b
}{}
\DeclareFontShape{T2B}{fdm}{m}{scsl}{
- <->\droid@scale DroidSansMono-Slanted-SmallCaps-t2b
+ <->\droid@fdm@scale DroidSansMono-Slanted-SmallCaps-t2b
}{}
\DeclareFontShape{T2B}{fdm}{m}{it}{<->ssub * fdm/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t2bfdr.fd b/Master/texmf-dist/tex/latex/droid/t2bfdr.fd
index 1134f2773a4..f3df1a5db9b 100644
--- a/Master/texmf-dist/tex/latex/droid/t2bfdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2bfdr.fd
@@ -5,76 +5,76 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t2bfdr.fd}
- [2011/08/21 Fontinst v1.933 font definitions for T2B/fdr.]
+ [2011/09/11 Fontinst v1.933 font definitions for T2B/fdr.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fdr@scale\endcsname\relax
+ \let\droid@fdr@scale\@empty
\fi
\DeclareFontFamily{T2B}{fdr}{}
\DeclareFontShape{T2B}{fdr}{m}{n}{
- <->\droid@scale DroidSerif-Regular-t2b
+ <->\droid@fdr@scale DroidSerif-Regular-t2b
}{}
\DeclareFontShape{T2B}{fdr}{m}{it}{
- <->\droid@scale DroidSerif-Italic-t2b
+ <->\droid@fdr@scale DroidSerif-Italic-t2b
}{}
\DeclareFontShape{T2B}{fdr}{m}{sl}{
- <->\droid@scale DroidSerif-Regular-Slanted-t2b
+ <->\droid@fdr@scale DroidSerif-Regular-Slanted-t2b
}{}
\DeclareFontShape{T2B}{fdr}{m}{ui}{
- <->\droid@scale DroidSerif-Italic-Upright-t2b
+ <->\droid@fdr@scale DroidSerif-Italic-Upright-t2b
}{}
\DeclareFontShape{T2B}{fdr}{m}{sc}{
- <->\droid@scale DroidSerif-Regular-SmallCaps-t2b
+ <->\droid@fdr@scale DroidSerif-Regular-SmallCaps-t2b
}{}
\DeclareFontShape{T2B}{fdr}{m}{scit}{
- <->\droid@scale DroidSerif-Italic-SmallCaps-t2b
+ <->\droid@fdr@scale DroidSerif-Italic-SmallCaps-t2b
}{}
\DeclareFontShape{T2B}{fdr}{m}{scsl}{
- <->\droid@scale DroidSerif-Regular-Slanted-SmallCaps-t2b
+ <->\droid@fdr@scale DroidSerif-Regular-Slanted-SmallCaps-t2b
}{}
\DeclareFontShape{T2B}{fdr}{m}{scui}{
- <->\droid@scale DroidSerif-Italic-Upright-SmallCaps-t2b
+ <->\droid@fdr@scale DroidSerif-Italic-Upright-SmallCaps-t2b
}{}
\DeclareFontShape{T2B}{fdr}{b}{n}{
- <->\droid@scale DroidSerif-Bold-t2b
+ <->\droid@fdr@scale DroidSerif-Bold-t2b
}{}
\DeclareFontShape{T2B}{fdr}{b}{it}{
- <->\droid@scale DroidSerif-BoldItalic-t2b
+ <->\droid@fdr@scale DroidSerif-BoldItalic-t2b
}{}
\DeclareFontShape{T2B}{fdr}{b}{sl}{
- <->\droid@scale DroidSerif-Bold-Slanted-t2b
+ <->\droid@fdr@scale DroidSerif-Bold-Slanted-t2b
}{}
\DeclareFontShape{T2B}{fdr}{b}{ui}{
- <->\droid@scale DroidSerif-BoldItalic-Upright-t2b
+ <->\droid@fdr@scale DroidSerif-BoldItalic-Upright-t2b
}{}
\DeclareFontShape{T2B}{fdr}{b}{sc}{
- <->\droid@scale DroidSerif-Bold-SmallCaps-t2b
+ <->\droid@fdr@scale DroidSerif-Bold-SmallCaps-t2b
}{}
\DeclareFontShape{T2B}{fdr}{b}{scit}{
- <->\droid@scale DroidSerif-BoldItalic-SmallCaps-t2b
+ <->\droid@fdr@scale DroidSerif-BoldItalic-SmallCaps-t2b
}{}
\DeclareFontShape{T2B}{fdr}{b}{scsl}{
- <->\droid@scale DroidSerif-Bold-Slanted-SmallCaps-t2b
+ <->\droid@fdr@scale DroidSerif-Bold-Slanted-SmallCaps-t2b
}{}
\DeclareFontShape{T2B}{fdr}{b}{scui}{
- <->\droid@scale DroidSerif-BoldItalic-Upright-SmallCaps-t2b
+ <->\droid@fdr@scale DroidSerif-BoldItalic-Upright-SmallCaps-t2b
}{}
\DeclareFontShape{T2B}{fdr}{bx}{n}{<->ssub * fdr/b/n}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t2bfds.fd b/Master/texmf-dist/tex/latex/droid/t2bfds.fd
index 3f7451709de..7f268b9cb2b 100644
--- a/Master/texmf-dist/tex/latex/droid/t2bfds.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2bfds.fd
@@ -5,44 +5,44 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t2bfds.fd}
- [2011/08/21 Fontinst v1.933 font definitions for T2B/fds.]
+ [2011/09/11 Fontinst v1.933 font definitions for T2B/fds.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fds@scale\endcsname\relax
+ \let\droid@fds@scale\@empty
\fi
\DeclareFontFamily{T2B}{fds}{}
\DeclareFontShape{T2B}{fds}{m}{n}{
- <->\droid@scale DroidSans-t2b
+ <->\droid@fds@scale DroidSans-t2b
}{}
\DeclareFontShape{T2B}{fds}{m}{sl}{
- <->\droid@scale DroidSans-Slanted-t2b
+ <->\droid@fds@scale DroidSans-Slanted-t2b
}{}
\DeclareFontShape{T2B}{fds}{m}{sc}{
- <->\droid@scale DroidSans-SmallCaps-t2b
+ <->\droid@fds@scale DroidSans-SmallCaps-t2b
}{}
\DeclareFontShape{T2B}{fds}{m}{scsl}{
- <->\droid@scale DroidSans-Slanted-SmallCaps-t2b
+ <->\droid@fds@scale DroidSans-Slanted-SmallCaps-t2b
}{}
\DeclareFontShape{T2B}{fds}{b}{n}{
- <->\droid@scale DroidSans-Bold-t2b
+ <->\droid@fds@scale DroidSans-Bold-t2b
}{}
\DeclareFontShape{T2B}{fds}{b}{sl}{
- <->\droid@scale DroidSans-Bold-Slanted-t2b
+ <->\droid@fds@scale DroidSans-Bold-Slanted-t2b
}{}
\DeclareFontShape{T2B}{fds}{b}{sc}{
- <->\droid@scale DroidSans-Bold-SmallCaps-t2b
+ <->\droid@fds@scale DroidSans-Bold-SmallCaps-t2b
}{}
\DeclareFontShape{T2B}{fds}{b}{scsl}{
- <->\droid@scale DroidSans-Bold-Slanted-SmallCaps-t2b
+ <->\droid@fds@scale DroidSans-Bold-Slanted-SmallCaps-t2b
}{}
\DeclareFontShape{T2B}{fds}{m}{it}{<->ssub * fds/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t2cfdm.fd b/Master/texmf-dist/tex/latex/droid/t2cfdm.fd
index 2062286a414..b68b4f29693 100644
--- a/Master/texmf-dist/tex/latex/droid/t2cfdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2cfdm.fd
@@ -5,28 +5,28 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t2cfdm.fd}
- [2011/08/21 Fontinst v1.933 font definitions for T2C/fdm.]
+ [2011/09/11 Fontinst v1.933 font definitions for T2C/fdm.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fdm@scale\endcsname\relax
+ \let\droid@fdm@scale\@empty
\fi
\DeclareFontFamily{T2C}{fdm}{}
\DeclareFontShape{T2C}{fdm}{m}{n}{
- <->\droid@scale DroidSansMono-t2c
+ <->\droid@fdm@scale DroidSansMono-t2c
}{}
\DeclareFontShape{T2C}{fdm}{m}{sl}{
- <->\droid@scale DroidSansMono-Slanted-t2c
+ <->\droid@fdm@scale DroidSansMono-Slanted-t2c
}{}
\DeclareFontShape{T2C}{fdm}{m}{sc}{
- <->\droid@scale DroidSansMono-SmallCaps-t2c
+ <->\droid@fdm@scale DroidSansMono-SmallCaps-t2c
}{}
\DeclareFontShape{T2C}{fdm}{m}{scsl}{
- <->\droid@scale DroidSansMono-Slanted-SmallCaps-t2c
+ <->\droid@fdm@scale DroidSansMono-Slanted-SmallCaps-t2c
}{}
\DeclareFontShape{T2C}{fdm}{m}{it}{<->ssub * fdm/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t2cfdr.fd b/Master/texmf-dist/tex/latex/droid/t2cfdr.fd
index 3f657801243..5822416bc7d 100644
--- a/Master/texmf-dist/tex/latex/droid/t2cfdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2cfdr.fd
@@ -5,76 +5,76 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t2cfdr.fd}
- [2011/08/21 Fontinst v1.933 font definitions for T2C/fdr.]
+ [2011/09/11 Fontinst v1.933 font definitions for T2C/fdr.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fdr@scale\endcsname\relax
+ \let\droid@fdr@scale\@empty
\fi
\DeclareFontFamily{T2C}{fdr}{}
\DeclareFontShape{T2C}{fdr}{m}{n}{
- <->\droid@scale DroidSerif-Regular-t2c
+ <->\droid@fdr@scale DroidSerif-Regular-t2c
}{}
\DeclareFontShape{T2C}{fdr}{m}{it}{
- <->\droid@scale DroidSerif-Italic-t2c
+ <->\droid@fdr@scale DroidSerif-Italic-t2c
}{}
\DeclareFontShape{T2C}{fdr}{m}{sl}{
- <->\droid@scale DroidSerif-Regular-Slanted-t2c
+ <->\droid@fdr@scale DroidSerif-Regular-Slanted-t2c
}{}
\DeclareFontShape{T2C}{fdr}{m}{ui}{
- <->\droid@scale DroidSerif-Italic-Upright-t2c
+ <->\droid@fdr@scale DroidSerif-Italic-Upright-t2c
}{}
\DeclareFontShape{T2C}{fdr}{m}{sc}{
- <->\droid@scale DroidSerif-Regular-SmallCaps-t2c
+ <->\droid@fdr@scale DroidSerif-Regular-SmallCaps-t2c
}{}
\DeclareFontShape{T2C}{fdr}{m}{scit}{
- <->\droid@scale DroidSerif-Italic-SmallCaps-t2c
+ <->\droid@fdr@scale DroidSerif-Italic-SmallCaps-t2c
}{}
\DeclareFontShape{T2C}{fdr}{m}{scsl}{
- <->\droid@scale DroidSerif-Regular-Slanted-SmallCaps-t2c
+ <->\droid@fdr@scale DroidSerif-Regular-Slanted-SmallCaps-t2c
}{}
\DeclareFontShape{T2C}{fdr}{m}{scui}{
- <->\droid@scale DroidSerif-Italic-Upright-SmallCaps-t2c
+ <->\droid@fdr@scale DroidSerif-Italic-Upright-SmallCaps-t2c
}{}
\DeclareFontShape{T2C}{fdr}{b}{n}{
- <->\droid@scale DroidSerif-Bold-t2c
+ <->\droid@fdr@scale DroidSerif-Bold-t2c
}{}
\DeclareFontShape{T2C}{fdr}{b}{it}{
- <->\droid@scale DroidSerif-BoldItalic-t2c
+ <->\droid@fdr@scale DroidSerif-BoldItalic-t2c
}{}
\DeclareFontShape{T2C}{fdr}{b}{sl}{
- <->\droid@scale DroidSerif-Bold-Slanted-t2c
+ <->\droid@fdr@scale DroidSerif-Bold-Slanted-t2c
}{}
\DeclareFontShape{T2C}{fdr}{b}{ui}{
- <->\droid@scale DroidSerif-BoldItalic-Upright-t2c
+ <->\droid@fdr@scale DroidSerif-BoldItalic-Upright-t2c
}{}
\DeclareFontShape{T2C}{fdr}{b}{sc}{
- <->\droid@scale DroidSerif-Bold-SmallCaps-t2c
+ <->\droid@fdr@scale DroidSerif-Bold-SmallCaps-t2c
}{}
\DeclareFontShape{T2C}{fdr}{b}{scit}{
- <->\droid@scale DroidSerif-BoldItalic-SmallCaps-t2c
+ <->\droid@fdr@scale DroidSerif-BoldItalic-SmallCaps-t2c
}{}
\DeclareFontShape{T2C}{fdr}{b}{scsl}{
- <->\droid@scale DroidSerif-Bold-Slanted-SmallCaps-t2c
+ <->\droid@fdr@scale DroidSerif-Bold-Slanted-SmallCaps-t2c
}{}
\DeclareFontShape{T2C}{fdr}{b}{scui}{
- <->\droid@scale DroidSerif-BoldItalic-Upright-SmallCaps-t2c
+ <->\droid@fdr@scale DroidSerif-BoldItalic-Upright-SmallCaps-t2c
}{}
\DeclareFontShape{T2C}{fdr}{bx}{n}{<->ssub * fdr/b/n}{}
diff --git a/Master/texmf-dist/tex/latex/droid/t2cfds.fd b/Master/texmf-dist/tex/latex/droid/t2cfds.fd
index da113f9dbb4..0dc96e96589 100644
--- a/Master/texmf-dist/tex/latex/droid/t2cfds.fd
+++ b/Master/texmf-dist/tex/latex/droid/t2cfds.fd
@@ -5,44 +5,44 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t2cfds.fd}
- [2011/08/21 Fontinst v1.933 font definitions for T2C/fds.]
+ [2011/09/11 Fontinst v1.933 font definitions for T2C/fds.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fds@scale\endcsname\relax
+ \let\droid@fds@scale\@empty
\fi
\DeclareFontFamily{T2C}{fds}{}
\DeclareFontShape{T2C}{fds}{m}{n}{
- <->\droid@scale DroidSans-t2c
+ <->\droid@fds@scale DroidSans-t2c
}{}
\DeclareFontShape{T2C}{fds}{m}{sl}{
- <->\droid@scale DroidSans-Slanted-t2c
+ <->\droid@fds@scale DroidSans-Slanted-t2c
}{}
\DeclareFontShape{T2C}{fds}{m}{sc}{
- <->\droid@scale DroidSans-SmallCaps-t2c
+ <->\droid@fds@scale DroidSans-SmallCaps-t2c
}{}
\DeclareFontShape{T2C}{fds}{m}{scsl}{
- <->\droid@scale DroidSans-Slanted-SmallCaps-t2c
+ <->\droid@fds@scale DroidSans-Slanted-SmallCaps-t2c
}{}
\DeclareFontShape{T2C}{fds}{b}{n}{
- <->\droid@scale DroidSans-Bold-t2c
+ <->\droid@fds@scale DroidSans-Bold-t2c
}{}
\DeclareFontShape{T2C}{fds}{b}{sl}{
- <->\droid@scale DroidSans-Bold-Slanted-t2c
+ <->\droid@fds@scale DroidSans-Bold-Slanted-t2c
}{}
\DeclareFontShape{T2C}{fds}{b}{sc}{
- <->\droid@scale DroidSans-Bold-SmallCaps-t2c
+ <->\droid@fds@scale DroidSans-Bold-SmallCaps-t2c
}{}
\DeclareFontShape{T2C}{fds}{b}{scsl}{
- <->\droid@scale DroidSans-Bold-Slanted-SmallCaps-t2c
+ <->\droid@fds@scale DroidSans-Bold-Slanted-SmallCaps-t2c
}{}
\DeclareFontShape{T2C}{fds}{m}{it}{<->ssub * fds/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/ts1fdm.fd b/Master/texmf-dist/tex/latex/droid/ts1fdm.fd
index ad01bb76b5a..86ac43d3a52 100644
--- a/Master/texmf-dist/tex/latex/droid/ts1fdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/ts1fdm.fd
@@ -5,28 +5,28 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1fdm.fd}
- [2011/08/21 Fontinst v1.933 font definitions for TS1/fdm.]
+ [2011/09/11 Fontinst v1.933 font definitions for TS1/fdm.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fdm@scale\endcsname\relax
+ \let\droid@fdm@scale\@empty
\fi
\DeclareFontFamily{TS1}{fdm}{}
\DeclareFontShape{TS1}{fdm}{m}{n}{
- <->\droid@scale DroidSansMono-ts1
+ <->\droid@fdm@scale DroidSansMono-ts1
}{}
\DeclareFontShape{TS1}{fdm}{m}{sl}{
- <->\droid@scale DroidSansMono-Slanted-ts1
+ <->\droid@fdm@scale DroidSansMono-Slanted-ts1
}{}
\DeclareFontShape{TS1}{fdm}{m}{sc}{
- <->\droid@scale DroidSansMono-ts1
+ <->\droid@fdm@scale DroidSansMono-ts1
}{}
\DeclareFontShape{TS1}{fdm}{m}{scsl}{
- <->\droid@scale DroidSansMono-Slanted-ts1
+ <->\droid@fdm@scale DroidSansMono-Slanted-ts1
}{}
\DeclareFontShape{TS1}{fdm}{m}{it}{<->ssub * fdm/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/ts1fdr.fd b/Master/texmf-dist/tex/latex/droid/ts1fdr.fd
index e86dccb1187..103065406ce 100644
--- a/Master/texmf-dist/tex/latex/droid/ts1fdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/ts1fdr.fd
@@ -5,76 +5,76 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1fdr.fd}
- [2011/08/21 Fontinst v1.933 font definitions for TS1/fdr.]
+ [2011/09/11 Fontinst v1.933 font definitions for TS1/fdr.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fdr@scale\endcsname\relax
+ \let\droid@fdr@scale\@empty
\fi
\DeclareFontFamily{TS1}{fdr}{}
\DeclareFontShape{TS1}{fdr}{m}{n}{
- <->\droid@scale DroidSerif-Regular-ts1
+ <->\droid@fdr@scale DroidSerif-Regular-ts1
}{}
\DeclareFontShape{TS1}{fdr}{m}{it}{
- <->\droid@scale DroidSerif-Italic-ts1
+ <->\droid@fdr@scale DroidSerif-Italic-ts1
}{}
\DeclareFontShape{TS1}{fdr}{m}{sl}{
- <->\droid@scale DroidSerif-Regular-Slanted-ts1
+ <->\droid@fdr@scale DroidSerif-Regular-Slanted-ts1
}{}
\DeclareFontShape{TS1}{fdr}{m}{ui}{
- <->\droid@scale DroidSerif-Italic-Upright-ts1
+ <->\droid@fdr@scale DroidSerif-Italic-Upright-ts1
}{}
\DeclareFontShape{TS1}{fdr}{m}{sc}{
- <->\droid@scale DroidSerif-Regular-ts1
+ <->\droid@fdr@scale DroidSerif-Regular-ts1
}{}
\DeclareFontShape{TS1}{fdr}{m}{scit}{
- <->\droid@scale DroidSerif-Italic-ts1
+ <->\droid@fdr@scale DroidSerif-Italic-ts1
}{}
\DeclareFontShape{TS1}{fdr}{m}{scsl}{
- <->\droid@scale DroidSerif-Regular-Slanted-ts1
+ <->\droid@fdr@scale DroidSerif-Regular-Slanted-ts1
}{}
\DeclareFontShape{TS1}{fdr}{m}{scui}{
- <->\droid@scale DroidSerif-Italic-Upright-ts1
+ <->\droid@fdr@scale DroidSerif-Italic-Upright-ts1
}{}
\DeclareFontShape{TS1}{fdr}{b}{n}{
- <->\droid@scale DroidSerif-Bold-ts1
+ <->\droid@fdr@scale DroidSerif-Bold-ts1
}{}
\DeclareFontShape{TS1}{fdr}{b}{it}{
- <->\droid@scale DroidSerif-BoldItalic-ts1
+ <->\droid@fdr@scale DroidSerif-BoldItalic-ts1
}{}
\DeclareFontShape{TS1}{fdr}{b}{sl}{
- <->\droid@scale DroidSerif-Bold-Slanted-ts1
+ <->\droid@fdr@scale DroidSerif-Bold-Slanted-ts1
}{}
\DeclareFontShape{TS1}{fdr}{b}{ui}{
- <->\droid@scale DroidSerif-BoldItalic-Upright-ts1
+ <->\droid@fdr@scale DroidSerif-BoldItalic-Upright-ts1
}{}
\DeclareFontShape{TS1}{fdr}{b}{sc}{
- <->\droid@scale DroidSerif-Bold-ts1
+ <->\droid@fdr@scale DroidSerif-Bold-ts1
}{}
\DeclareFontShape{TS1}{fdr}{b}{scit}{
- <->\droid@scale DroidSerif-BoldItalic-ts1
+ <->\droid@fdr@scale DroidSerif-BoldItalic-ts1
}{}
\DeclareFontShape{TS1}{fdr}{b}{scsl}{
- <->\droid@scale DroidSerif-Bold-Slanted-ts1
+ <->\droid@fdr@scale DroidSerif-Bold-Slanted-ts1
}{}
\DeclareFontShape{TS1}{fdr}{b}{scui}{
- <->\droid@scale DroidSerif-BoldItalic-Upright-ts1
+ <->\droid@fdr@scale DroidSerif-BoldItalic-Upright-ts1
}{}
\DeclareFontShape{TS1}{fdr}{bx}{n}{<->ssub * fdr/b/n}{}
diff --git a/Master/texmf-dist/tex/latex/droid/ts1fds.fd b/Master/texmf-dist/tex/latex/droid/ts1fds.fd
index d496959d06a..2dcc639c290 100644
--- a/Master/texmf-dist/tex/latex/droid/ts1fds.fd
+++ b/Master/texmf-dist/tex/latex/droid/ts1fds.fd
@@ -5,44 +5,44 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1fds.fd}
- [2011/08/21 Fontinst v1.933 font definitions for TS1/fds.]
+ [2011/09/11 Fontinst v1.933 font definitions for TS1/fds.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fds@scale\endcsname\relax
+ \let\droid@fds@scale\@empty
\fi
\DeclareFontFamily{TS1}{fds}{}
\DeclareFontShape{TS1}{fds}{m}{n}{
- <->\droid@scale DroidSans-ts1
+ <->\droid@fds@scale DroidSans-ts1
}{}
\DeclareFontShape{TS1}{fds}{m}{sl}{
- <->\droid@scale DroidSans-Slanted-ts1
+ <->\droid@fds@scale DroidSans-Slanted-ts1
}{}
\DeclareFontShape{TS1}{fds}{m}{sc}{
- <->\droid@scale DroidSans-ts1
+ <->\droid@fds@scale DroidSans-ts1
}{}
\DeclareFontShape{TS1}{fds}{m}{scsl}{
- <->\droid@scale DroidSans-Slanted-ts1
+ <->\droid@fds@scale DroidSans-Slanted-ts1
}{}
\DeclareFontShape{TS1}{fds}{b}{n}{
- <->\droid@scale DroidSans-Bold-ts1
+ <->\droid@fds@scale DroidSans-Bold-ts1
}{}
\DeclareFontShape{TS1}{fds}{b}{sl}{
- <->\droid@scale DroidSans-Bold-Slanted-ts1
+ <->\droid@fds@scale DroidSans-Bold-Slanted-ts1
}{}
\DeclareFontShape{TS1}{fds}{b}{sc}{
- <->\droid@scale DroidSans-Bold-ts1
+ <->\droid@fds@scale DroidSans-Bold-ts1
}{}
\DeclareFontShape{TS1}{fds}{b}{scsl}{
- <->\droid@scale DroidSans-Bold-Slanted-ts1
+ <->\droid@fds@scale DroidSans-Bold-Slanted-ts1
}{}
\DeclareFontShape{TS1}{fds}{m}{it}{<->ssub * fds/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/x2fdm.fd b/Master/texmf-dist/tex/latex/droid/x2fdm.fd
index b3c90d76bb0..56788dda023 100644
--- a/Master/texmf-dist/tex/latex/droid/x2fdm.fd
+++ b/Master/texmf-dist/tex/latex/droid/x2fdm.fd
@@ -5,28 +5,28 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{x2fdm.fd}
- [2011/08/21 Fontinst v1.933 font definitions for X2/fdm.]
+ [2011/09/11 Fontinst v1.933 font definitions for X2/fdm.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fdm@scale\endcsname\relax
+ \let\droid@fdm@scale\@empty
\fi
\DeclareFontFamily{X2}{fdm}{}
\DeclareFontShape{X2}{fdm}{m}{n}{
- <->\droid@scale DroidSansMono-x2
+ <->\droid@fdm@scale DroidSansMono-x2
}{}
\DeclareFontShape{X2}{fdm}{m}{sl}{
- <->\droid@scale DroidSansMono-Slanted-x2
+ <->\droid@fdm@scale DroidSansMono-Slanted-x2
}{}
\DeclareFontShape{X2}{fdm}{m}{sc}{
- <->\droid@scale DroidSansMono-SmallCaps-x2
+ <->\droid@fdm@scale DroidSansMono-SmallCaps-x2
}{}
\DeclareFontShape{X2}{fdm}{m}{scsl}{
- <->\droid@scale DroidSansMono-Slanted-SmallCaps-x2
+ <->\droid@fdm@scale DroidSansMono-Slanted-SmallCaps-x2
}{}
\DeclareFontShape{X2}{fdm}{m}{it}{<->ssub * fdm/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/droid/x2fdr.fd b/Master/texmf-dist/tex/latex/droid/x2fdr.fd
index 51435d608d8..fd05ff15f4f 100644
--- a/Master/texmf-dist/tex/latex/droid/x2fdr.fd
+++ b/Master/texmf-dist/tex/latex/droid/x2fdr.fd
@@ -5,76 +5,76 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{x2fdr.fd}
- [2011/08/21 Fontinst v1.933 font definitions for X2/fdr.]
+ [2011/09/11 Fontinst v1.933 font definitions for X2/fdr.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fdr@scale\endcsname\relax
+ \let\droid@fdr@scale\@empty
\fi
\DeclareFontFamily{X2}{fdr}{}
\DeclareFontShape{X2}{fdr}{m}{n}{
- <->\droid@scale DroidSerif-Regular-x2
+ <->\droid@fdr@scale DroidSerif-Regular-x2
}{}
\DeclareFontShape{X2}{fdr}{m}{it}{
- <->\droid@scale DroidSerif-Italic-x2
+ <->\droid@fdr@scale DroidSerif-Italic-x2
}{}
\DeclareFontShape{X2}{fdr}{m}{sl}{
- <->\droid@scale DroidSerif-Regular-Slanted-x2
+ <->\droid@fdr@scale DroidSerif-Regular-Slanted-x2
}{}
\DeclareFontShape{X2}{fdr}{m}{ui}{
- <->\droid@scale DroidSerif-Italic-Upright-x2
+ <->\droid@fdr@scale DroidSerif-Italic-Upright-x2
}{}
\DeclareFontShape{X2}{fdr}{m}{sc}{
- <->\droid@scale DroidSerif-Regular-SmallCaps-x2
+ <->\droid@fdr@scale DroidSerif-Regular-SmallCaps-x2
}{}
\DeclareFontShape{X2}{fdr}{m}{scit}{
- <->\droid@scale DroidSerif-Italic-SmallCaps-x2
+ <->\droid@fdr@scale DroidSerif-Italic-SmallCaps-x2
}{}
\DeclareFontShape{X2}{fdr}{m}{scsl}{
- <->\droid@scale DroidSerif-Regular-Slanted-SmallCaps-x2
+ <->\droid@fdr@scale DroidSerif-Regular-Slanted-SmallCaps-x2
}{}
\DeclareFontShape{X2}{fdr}{m}{scui}{
- <->\droid@scale DroidSerif-Italic-Upright-SmallCaps-x2
+ <->\droid@fdr@scale DroidSerif-Italic-Upright-SmallCaps-x2
}{}
\DeclareFontShape{X2}{fdr}{b}{n}{
- <->\droid@scale DroidSerif-Bold-x2
+ <->\droid@fdr@scale DroidSerif-Bold-x2
}{}
\DeclareFontShape{X2}{fdr}{b}{it}{
- <->\droid@scale DroidSerif-BoldItalic-x2
+ <->\droid@fdr@scale DroidSerif-BoldItalic-x2
}{}
\DeclareFontShape{X2}{fdr}{b}{sl}{
- <->\droid@scale DroidSerif-Bold-Slanted-x2
+ <->\droid@fdr@scale DroidSerif-Bold-Slanted-x2
}{}
\DeclareFontShape{X2}{fdr}{b}{ui}{
- <->\droid@scale DroidSerif-BoldItalic-Upright-x2
+ <->\droid@fdr@scale DroidSerif-BoldItalic-Upright-x2
}{}
\DeclareFontShape{X2}{fdr}{b}{sc}{
- <->\droid@scale DroidSerif-Bold-SmallCaps-x2
+ <->\droid@fdr@scale DroidSerif-Bold-SmallCaps-x2
}{}
\DeclareFontShape{X2}{fdr}{b}{scit}{
- <->\droid@scale DroidSerif-BoldItalic-SmallCaps-x2
+ <->\droid@fdr@scale DroidSerif-BoldItalic-SmallCaps-x2
}{}
\DeclareFontShape{X2}{fdr}{b}{scsl}{
- <->\droid@scale DroidSerif-Bold-Slanted-SmallCaps-x2
+ <->\droid@fdr@scale DroidSerif-Bold-Slanted-SmallCaps-x2
}{}
\DeclareFontShape{X2}{fdr}{b}{scui}{
- <->\droid@scale DroidSerif-BoldItalic-Upright-SmallCaps-x2
+ <->\droid@fdr@scale DroidSerif-BoldItalic-Upright-SmallCaps-x2
}{}
\DeclareFontShape{X2}{fdr}{bx}{n}{<->ssub * fdr/b/n}{}
diff --git a/Master/texmf-dist/tex/latex/droid/x2fds.fd b/Master/texmf-dist/tex/latex/droid/x2fds.fd
index 028e5eb7a38..505c383c31b 100644
--- a/Master/texmf-dist/tex/latex/droid/x2fds.fd
+++ b/Master/texmf-dist/tex/latex/droid/x2fds.fd
@@ -5,44 +5,44 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{x2fds.fd}
- [2011/08/21 Fontinst v1.933 font definitions for X2/fds.]
+ [2011/09/11 Fontinst v1.933 font definitions for X2/fds.]
-\expandafter\ifx\csname droid@scale\endcsname\relax
- \let\droid@scale\@empty
+\expandafter\ifx\csname droid@fds@scale\endcsname\relax
+ \let\droid@fds@scale\@empty
\fi
\DeclareFontFamily{X2}{fds}{}
\DeclareFontShape{X2}{fds}{m}{n}{
- <->\droid@scale DroidSans-x2
+ <->\droid@fds@scale DroidSans-x2
}{}
\DeclareFontShape{X2}{fds}{m}{sl}{
- <->\droid@scale DroidSans-Slanted-x2
+ <->\droid@fds@scale DroidSans-Slanted-x2
}{}
\DeclareFontShape{X2}{fds}{m}{sc}{
- <->\droid@scale DroidSans-SmallCaps-x2
+ <->\droid@fds@scale DroidSans-SmallCaps-x2
}{}
\DeclareFontShape{X2}{fds}{m}{scsl}{
- <->\droid@scale DroidSans-Slanted-SmallCaps-x2
+ <->\droid@fds@scale DroidSans-Slanted-SmallCaps-x2
}{}
\DeclareFontShape{X2}{fds}{b}{n}{
- <->\droid@scale DroidSans-Bold-x2
+ <->\droid@fds@scale DroidSans-Bold-x2
}{}
\DeclareFontShape{X2}{fds}{b}{sl}{
- <->\droid@scale DroidSans-Bold-Slanted-x2
+ <->\droid@fds@scale DroidSans-Bold-Slanted-x2
}{}
\DeclareFontShape{X2}{fds}{b}{sc}{
- <->\droid@scale DroidSans-Bold-SmallCaps-x2
+ <->\droid@fds@scale DroidSans-Bold-SmallCaps-x2
}{}
\DeclareFontShape{X2}{fds}{b}{scsl}{
- <->\droid@scale DroidSans-Bold-Slanted-SmallCaps-x2
+ <->\droid@fds@scale DroidSans-Bold-Slanted-SmallCaps-x2
}{}
\DeclareFontShape{X2}{fds}{m}{it}{<->ssub * fds/m/sl}{}