From c0fc6f08ac435f1171b1349d429fce172e37a3f2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 12 Sep 2011 23:12:57 +0000 Subject: droid 2.0 (12sep11) git-svn-id: svn://tug.org/texlive/trunk@23912 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/droid/droidmono.sty | 2 +- Master/texmf-dist/tex/latex/droid/droidsans.sty | 2 +- Master/texmf-dist/tex/latex/droid/droidserif.sty | 2 +- Master/texmf-dist/tex/latex/droid/lgrfdm.fd | 14 ++++----- Master/texmf-dist/tex/latex/droid/lgrfdr.fd | 38 ++++++++++++------------ Master/texmf-dist/tex/latex/droid/lgrfds.fd | 22 +++++++------- Master/texmf-dist/tex/latex/droid/ot1fdm.fd | 14 ++++----- Master/texmf-dist/tex/latex/droid/ot1fdr.fd | 38 ++++++++++++------------ Master/texmf-dist/tex/latex/droid/ot1fds.fd | 22 +++++++------- Master/texmf-dist/tex/latex/droid/t1fdm.fd | 14 ++++----- Master/texmf-dist/tex/latex/droid/t1fdr.fd | 38 ++++++++++++------------ Master/texmf-dist/tex/latex/droid/t1fds.fd | 22 +++++++------- Master/texmf-dist/tex/latex/droid/t2afdm.fd | 14 ++++----- Master/texmf-dist/tex/latex/droid/t2afdr.fd | 38 ++++++++++++------------ Master/texmf-dist/tex/latex/droid/t2afds.fd | 22 +++++++------- Master/texmf-dist/tex/latex/droid/t2bfdm.fd | 14 ++++----- Master/texmf-dist/tex/latex/droid/t2bfdr.fd | 38 ++++++++++++------------ Master/texmf-dist/tex/latex/droid/t2bfds.fd | 22 +++++++------- Master/texmf-dist/tex/latex/droid/t2cfdm.fd | 14 ++++----- Master/texmf-dist/tex/latex/droid/t2cfdr.fd | 38 ++++++++++++------------ Master/texmf-dist/tex/latex/droid/t2cfds.fd | 22 +++++++------- Master/texmf-dist/tex/latex/droid/ts1fdm.fd | 14 ++++----- Master/texmf-dist/tex/latex/droid/ts1fdr.fd | 38 ++++++++++++------------ Master/texmf-dist/tex/latex/droid/ts1fds.fd | 22 +++++++------- Master/texmf-dist/tex/latex/droid/x2fdm.fd | 14 ++++----- Master/texmf-dist/tex/latex/droid/x2fdr.fd | 38 ++++++++++++------------ Master/texmf-dist/tex/latex/droid/x2fds.fd | 22 +++++++------- 27 files changed, 299 insertions(+), 299 deletions(-) (limited to 'Master/texmf-dist/tex/latex/droid') 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}{} -- cgit v1.2.3