droid (8may11)

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

18 files changed, 264 insertions, 20 deletions

diff --git a/Master/texmf-dist/source/droid/CHANGES b/Master/texmf-dist/source/droid/CHANGES
index 2580c6050db..b585d73a7fc 100644
--- a/Master/texmf-dist/source/droid/CHANGES
+++ b/Master/texmf-dist/source/droid/CHANGES
@@ -3,3 +3,8 @@ Changelog for version 1.1:
 
 Changelog for version 1.2:
 	- clean comfortaa-fixlatin.etx (again...)
+
+Changelog for version 1.3:
+	- fix metrics bugs in TS1 encoding
+	- fix documentation
+	- add samples PDFs
diff --git a/Master/texmf-dist/source/droid/Makefile b/Master/texmf-dist/source/droid/Makefile
index 5f375372f70..a7128c2dedc 100644
--- a/Master/texmf-dist/source/droid/Makefile
+++ b/Master/texmf-dist/source/droid/Makefile
@@ -1,5 +1,5 @@
 ## Makefile
-## Copyright 2010 Mohamed El Morabity
+## Copyright 2010, 2011 Mohamed El Morabity
 #
 # This work may be distributed and/or modified under the conditions of the LaTeX
 # Project Public License, either version 1.3 of this license or (at your option)
@@ -60,7 +60,7 @@ ETX_FILES = $(CUSTOM_ENCODINGS:=.etx)
 
 STYLE_FILES = $(wildcard *.sty)
 
-DOCUMENTATION = $(FONT_NAME).tex $(FONT_NAME).pdf CHANGES README
+DOCUMENTATION = $(FONT_NAME).tex $(FONT_NAME).pdf $(FONT_NAME)serif-samples.tex $(FONT_NAME)serif-samples.pdf $(FONT_NAME)sans-samples.tex $(FONT_NAME)sans-samples.pdf $(FONT_NAME)sansmono-samples.tex $(FONT_NAME)sansmono-samples.pdf CHANGES README
 
 # Files to be installed in texmf/source
 BUILD_FILES = $(FONTINST_FILE) $(FONTINST_REGLYPH_FILE) $(FONTINST_MAP_FILE) $(ETX_FILES) Makefile ttf2type1.pe $(DOCUMENTATION)
diff --git a/Master/texmf-dist/source/droid/README b/Master/texmf-dist/source/droid/README
index cdc6a2c9df8..aea1e529c03 100644
--- a/Master/texmf-dist/source/droid/README
+++ b/Master/texmf-dist/source/droid/README
@@ -1,5 +1,5 @@
 --------------------
- Droid, version 1.2
+ Droid, version 1.3
 --------------------
 
 The Droid typeface family was designed in the fall of 2006 by Ascender's Steve
diff --git a/Master/texmf-dist/source/droid/droid-drv.tex b/Master/texmf-dist/source/droid/droid-drv.tex
index 324763cc637..5f16a8c70c2 100644
--- a/Master/texmf-dist/source/droid/droid-drv.tex
+++ b/Master/texmf-dist/source/droid/droid-drv.tex
@@ -1,5 +1,5 @@
 %% droid-drv.tex
-%% Copyright 2010 Mohamed El Morabity
+%% Copyright 2010, 2011 Mohamed El Morabity
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License, either version 1.3 of this license or (at your option)
@@ -174,7 +174,7 @@
 \installfontas{ts1-DroidSerif-Regular-Slanted}{TS1}{fdr}{m}{scsl}{<->\string\droid@fdr@scale}
 
 \installfont{ts1-DroidSerif-Italic}{ts1-DroidSerif-Italic,fixtextcomp-DroidSerif-Italic,textcomp}{ts1}{TS1}{fdr}{m}{n}{<->\string\droid@fdr@scale}
-\installfont{ts1-DroidSerif-Italic-Upright}{ts1-DroidSerif-Italic-Upright,fixlatin-DroidSerif-Italic-Upright,newlatin}{ts1}{TS1}{fdr}{m}{up}{<->\string\droid@fdr@scale}
+\installfont{ts1-DroidSerif-Italic-Upright}{ts1-DroidSerif-Italic-Upright,fixtextcomp-DroidSerif-Italic-Upright,textcomp}{ts1}{TS1}{fdr}{m}{up}{<->\string\droid@fdr@scale}
 \installfontas{ts1-DroidSerif-Italic}{TS1}{fdr}{m}{scit}{<->\string\droid@fdr@scale}
 \installfontas{ts1-DroidSerif-Italic-Upright}{TS1}{fdr}{m}{scup}{<->\string\droid@fdr@scale}
 
@@ -184,7 +184,7 @@
 \installfontas{ts1-DroidSerif-Bold-Slanted}{TS1}{fdr}{b}{scsl}{<->\string\droid@fdr@scale}
 
 \installfont{ts1-DroidSerif-BoldItalic}{ts1-DroidSerif-BoldItalic,fixtextcomp-DroidSerif-BoldItalic,textcomp}{ts1}{TS1}{fdr}{b}{n}{<->\string\droid@fdr@scale}
-\installfont{ts1-DroidSerif-BoldItalic-Upright}{ts1-DroidSerif-BoldItalic-Upright,fixlatin-DroidSerif-BoldItalic-Upright,newlatin}{ts1}{TS1}{fdr}{b}{up}{<->\string\droid@fdr@scale}
+\installfont{ts1-DroidSerif-BoldItalic-Upright}{ts1-DroidSerif-BoldItalic-Upright,fixtextcomp-DroidSerif-BoldItalic-Upright,textcomp}{ts1}{TS1}{fdr}{b}{up}{<->\string\droid@fdr@scale}
 \installfontas{ts1-DroidSerif-BoldItalic}{TS1}{fdr}{b}{scit}{<->\string\droid@fdr@scale}
 \installfontas{ts1-DroidSerif-BoldItalic-Upright}{TS1}{fdr}{b}{scup}{<->\string\droid@fdr@scale}
 \endinstallfonts
diff --git a/Master/texmf-dist/source/droid/droid-fixcyrillic.etx b/Master/texmf-dist/source/droid/droid-fixcyrillic.etx
index cbcab0c03b4..ff6e998c79e 100644
--- a/Master/texmf-dist/source/droid/droid-fixcyrillic.etx
+++ b/Master/texmf-dist/source/droid/droid-fixcyrillic.etx
@@ -1,5 +1,5 @@
 %% droid-fixcyrillic.etx
-%% Copyright 2010 Mohamed El Morabity
+%% Copyright 2010, 2011 Mohamed El Morabity
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License, either version 1.3 of this license or (at your option)
diff --git a/Master/texmf-dist/source/droid/droid-fixgreek.etx b/Master/texmf-dist/source/droid/droid-fixgreek.etx
index 8874cb4b048..523f39acb64 100644
--- a/Master/texmf-dist/source/droid/droid-fixgreek.etx
+++ b/Master/texmf-dist/source/droid/droid-fixgreek.etx
@@ -1,5 +1,5 @@
 %% droid-fixgreek.etx
-%% Copyright 2010 Mohamed El Morabity
+%% Copyright 2010, 2011 Mohamed El Morabity
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License, either version 1.3 of this license or (at your option)
diff --git a/Master/texmf-dist/source/droid/droid-fixtextcomp.etx b/Master/texmf-dist/source/droid/droid-fixtextcomp.etx
index 9ff69c7428d..0b4adbe000d 100644
--- a/Master/texmf-dist/source/droid/droid-fixtextcomp.etx
+++ b/Master/texmf-dist/source/droid/droid-fixtextcomp.etx
@@ -1,5 +1,5 @@
 %% droid-fixtextcomp.etx
-%% Copyright 2010 Mohamed El Morabity
+%% Copyright 2010, 2011 Mohamed El Morabity
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License, either version 1.3 of this license or (at your option)
diff --git a/Master/texmf-dist/source/droid/droid-map.tex b/Master/texmf-dist/source/droid/droid-map.tex
index 1e39235ca7f..7c0909500fc 100644
--- a/Master/texmf-dist/source/droid/droid-map.tex
+++ b/Master/texmf-dist/source/droid/droid-map.tex
@@ -1,5 +1,5 @@
 %% droid-map.etx
-%% Copyright 2010 Mohamed El Morabity
+%% Copyright 2010, 2011 Mohamed El Morabity
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License, either version 1.3 of this license or (at your option)
diff --git a/Master/texmf-dist/source/droid/droid-reglyph.tex b/Master/texmf-dist/source/droid/droid-reglyph.tex
index 493ab414191..4033be77195 100644
--- a/Master/texmf-dist/source/droid/droid-reglyph.tex
+++ b/Master/texmf-dist/source/droid/droid-reglyph.tex
@@ -1,5 +1,5 @@
 %% droid-reglyph.tex
-%% Copyright 2010 Mohamed El Morabity
+%% Copyright 2010, 2011 Mohamed El Morabity
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License, either version 1.3 of this license or (at your option)
diff --git a/Master/texmf-dist/source/droid/droid.pdf b/Master/texmf-dist/source/droid/droid.pdf
index 54ba268fd16..f56e4f18bff 100644
--- a/Master/texmf-dist/source/droid/droid.pdf
+++ b/Master/texmf-dist/source/droid/droid.pdf
diff --git a/Master/texmf-dist/source/droid/droid.tex b/Master/texmf-dist/source/droid/droid.tex
index 4c178595eaa..6bdfe019021 100644
--- a/Master/texmf-dist/source/droid/droid.tex
+++ b/Master/texmf-dist/source/droid/droid.tex
@@ -39,7 +39,7 @@
 \newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
 \newcommand{\program}{}
 
-\title{\LaTeX{} support for Droid\\\relsize{-1}Version~1.2}
+\title{\LaTeX{} support for Droid\\\relsize{-1}Version~1.3}
 
 \author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
 
@@ -148,12 +148,12 @@ Finally, to set Droid Sans Mono as the default typewriter font:
 
 The font can be up- and downscaled by any factor. This can be used to make the
 Droid fonts more friendly when used in company with other type faces, e.g., to
-adapt the x-height. The package option \code{scaled=\parameter{ratio}} will
-scale the font according to \parameter{ratio} (1.0 by default), for example:
+adapt the x-height. The package option \code{scale=\parameter{ratio}} will scale
+the font according to \parameter{ratio} (1.0 by default), for example:
 \begin{verbatim}
-\usepackage[scaled=0.95]{droidserif}
-\usepackage[scaled=0.95]{droidsans}
-\usepackage[scaled=0.95]{droidmono}
+\usepackage[scale=0.95]{droidserif}
+\usepackage[scale=0.95]{droidsans}
+\usepackage[scale=0.95]{droidmono}
 \end{verbatim}
 
 \subsection{Encodings}
@@ -184,7 +184,7 @@ treated poorly, if at all. Note difference in kerning between e.g.
     \toprule
     OT1-encoded&{\fdsfamily To Ta Té}\\
     \midrule
-    T1-encoded&{\fontencoding{T1}\selectfont\fdsfamily To Ta Té}\\
+    T1-encoded&{\fdsfamily\fontencoding{T1}\selectfont To Ta Té}\\
     \bottomrule
   \end{tabular}
 \end{center}
@@ -201,7 +201,7 @@ substitutions.
     \toprule
     family&encoding&series&shape\\
     \midrule
-    \fdrfamily\multirow{4}{*}{fdr}&OT1, T1,&\multirow{3}{*}{m, b (bx)}&\multirow{2}{*}{n, it, sl, up}\\
+    \multirow{4}{*}{fdr}&OT1, T1,&\multirow{3}{*}{m, b (bx)}&\multirow{2}{*}{n, it, sl, up}\\
     &T2A, T2B, T2C, X2,&&\multirow{2}{*}{sc, scit, scsl, scup}\\
     &LGR&&\\
     \cmidrule{2-4}
diff --git a/Master/texmf-dist/source/droid/droidsans-samples.pdf b/Master/texmf-dist/source/droid/droidsans-samples.pdf
new file mode 100644
index 00000000000..c72b1ab6702
--- /dev/null
+++ b/Master/texmf-dist/source/droid/droidsans-samples.pdf
diff --git a/Master/texmf-dist/source/droid/droidsans-samples.tex b/Master/texmf-dist/source/droid/droidsans-samples.tex
new file mode 100644
index 00000000000..7e71f890ea0
--- /dev/null
+++ b/Master/texmf-dist/source/droid/droidsans-samples.tex
@@ -0,0 +1,79 @@
+%% droidsans-samples.tex
+%% Copyright 2011 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\documentclass{article}
+
+\usepackage[greek,russian,francais,american]{babel}
+\usepackage{droidsans}
+\usepackage[LGR,T2A,T1,OT1]{fontenc}
+\usepackage[utf8x]{inputenc}
+\usepackage{microtype}
+\usepackage{textcomp}
+
+\newcommand{\latinSample}{%
+  \foreignlanguage{francais}{%
+    Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils sont doués de raison et de conscience et doivent agir les uns envers les autres dans un esprit de fraternité.%
+  }%
+}
+
+\newcommand{\cyrillicSample}{%
+  \foreignlanguage{russian}{%
+    Все люди рождаются свободными и равными в своем достоинстве и правах. Они наделены разумом и совестью и должны поступать в отношении друг друга в духе братства.%
+  }%
+}
+
+\newcommand{\greekSample}{%
+  \foreignlanguage{greek}{%
+    'Ολοι οι άνθρωποι γεννιούνται ελεύθεροι και ίσοι στην αξιοπρέπεια και τα δικαιώματα. Είναι προικισμένοι με λογική και συνείδηση, και οφείλουν να συμπεριφέρονται μεταξύ τους με πνεύμα αδελφοσύνης.%
+  }%
+}
+
+\newcommand{\miscSample}{%
+  0123456789 fi fl ffi ffl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
+}
+
+\newcommand{\fontSample}[2]{%
+  {\usefont{T1}{fds}{#1}{#2} \latinSample}
+
+  {\usefont{T2A}{fds}{#1}{#2} \cyrillicSample}
+
+  {\usefont{LGR}{fds}{#1}{#2} \greekSample}%
+
+  {\fontfamily{fds}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
+}
+
+\begin{document}
+
+\section*{Droid Sans Regular}
+
+\fontSample{m}{n}
+
+\fontSample{m}{sl}
+
+\fontSample{m}{sc}
+
+\fontSample{m}{scsl}
+
+\section*{Droid Sans Bold}
+
+\fontSample{b}{n}
+
+\fontSample{b}{sl}
+
+\fontSample{b}{sc}
+
+\fontSample{b}{scsl}
+
+\end{document}
diff --git a/Master/texmf-dist/source/droid/droidsansmono-samples.pdf b/Master/texmf-dist/source/droid/droidsansmono-samples.pdf
new file mode 100644
index 00000000000..7378988fb26
--- /dev/null
+++ b/Master/texmf-dist/source/droid/droidsansmono-samples.pdf
diff --git a/Master/texmf-dist/source/droid/droidsansmono-samples.tex b/Master/texmf-dist/source/droid/droidsansmono-samples.tex
new file mode 100644
index 00000000000..4818bc283a3
--- /dev/null
+++ b/Master/texmf-dist/source/droid/droidsansmono-samples.tex
@@ -0,0 +1,69 @@
+%% droidsansmono-samples.tex
+%% Copyright 2011 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\documentclass{article}
+
+\usepackage[greek,russian,francais,american]{babel}
+\usepackage{droidmono}
+\usepackage[LGR,T2A,T1,OT1]{fontenc}
+\usepackage[utf8x]{inputenc}
+\usepackage{microtype}
+\usepackage{textcomp}
+
+\newcommand{\latinSample}{%
+  \foreignlanguage{francais}{%
+    Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils sont doués de raison et de conscience et doivent agir les uns envers les autres dans un esprit de fraternité.%
+  }%
+}
+
+\newcommand{\cyrillicSample}{%
+  \foreignlanguage{russian}{%
+    Все люди рождаются свободными и равными в своем достоинстве и правах. Они наделены разумом и совестью и должны поступать в отношении друг друга в духе братства.%
+  }%
+}
+
+\newcommand{\greekSample}{%
+  \foreignlanguage{greek}{%
+    'Ολοι οι άνθρωποι γεννιούνται ελεύθεροι και ίσοι στην αξιοπρέπεια και τα δικαιώματα. Είναι προικισμένοι με λογική και συνείδηση, και οφείλουν να συμπεριφέρονται μεταξύ τους με πνεύμα αδελφοσύνης.%
+  }%
+}
+
+\newcommand{\miscSample}{%
+  0123456789 fi fl ffi ffl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
+}
+
+\newcommand{\fontSample}[2]{%
+  {\usefont{T1}{fdm}{#1}{#2} \latinSample}
+
+  {\usefont{T2A}{fdm}{#1}{#2} \cyrillicSample}
+
+  {\usefont{LGR}{fdm}{#1}{#2} \greekSample}%
+
+  {\fontfamily{fdm}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
+}
+
+\begin{document}
+
+\section*{Droid Sans Mono}
+
+\fontSample{m}{n}
+
+\fontSample{m}{sl}
+
+\fontSample{m}{sc}
+
+\fontSample{m}{scsl}
+
+\end{document}
diff --git a/Master/texmf-dist/source/droid/droidserif-samples.pdf b/Master/texmf-dist/source/droid/droidserif-samples.pdf
new file mode 100644
index 00000000000..cef74da4b9d
--- /dev/null
+++ b/Master/texmf-dist/source/droid/droidserif-samples.pdf
diff --git a/Master/texmf-dist/source/droid/droidserif-samples.tex b/Master/texmf-dist/source/droid/droidserif-samples.tex
new file mode 100644
index 00000000000..9de7b897972
--- /dev/null
+++ b/Master/texmf-dist/source/droid/droidserif-samples.tex
@@ -0,0 +1,91 @@
+%% droidserif-samples.tex
+%% Copyright 2011 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\documentclass{article}
+
+\usepackage[greek,russian,francais,american]{babel}
+\usepackage{droidserif}
+\usepackage[LGR,T2A,T1,OT1]{fontenc}
+\usepackage[utf8x]{inputenc}
+\usepackage{microtype}
+\usepackage{textcomp}
+
+\newcommand{\latinSample}{%
+  \foreignlanguage{francais}{%
+    Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils sont doués de raison et de conscience et doivent agir les uns envers les autres dans un esprit de fraternité.%
+  }%
+}
+
+\newcommand{\cyrillicSample}{%
+  \foreignlanguage{russian}{%
+    Все люди рождаются свободными и равными в своем достоинстве и правах. Они наделены разумом и совестью и должны поступать в отношении друг друга в духе братства.%
+  }%
+}
+
+\newcommand{\greekSample}{%
+  \foreignlanguage{greek}{%
+    'Ολοι οι άνθρωποι γεννιούνται ελεύθεροι και ίσοι στην αξιοπρέπεια και τα δικαιώματα. Είναι προικισμένοι με λογική και συνείδηση, και οφείλουν να συμπεριφέρονται μεταξύ τους με πνεύμα αδελφοσύνης.%
+  }%
+}
+
+\newcommand{\miscSample}{%
+  0123456789 fi fl ffi ffl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
+}
+
+\newcommand{\fontSample}[2]{%
+  {\usefont{T1}{fdr}{#1}{#2} \latinSample}
+
+  {\usefont{T2A}{fdr}{#1}{#2} \cyrillicSample}
+
+  {\usefont{LGR}{fdr}{#1}{#2} \greekSample}%
+
+  {\fontfamily{fdr}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
+}
+
+\begin{document}
+
+\section*{Droid Serif Regular}
+
+\fontSample{m}{n}
+
+\fontSample{m}{it}
+
+\fontSample{m}{sl}
+
+\fontSample{m}{up}
+
+\fontSample{m}{sc}
+
+\fontSample{m}{scit}
+
+\fontSample{m}{scsl}
+
+\section*{Droid Serif Bold}
+
+\fontSample{b}{n}
+
+\fontSample{b}{it}
+
+\fontSample{b}{sl}
+
+\fontSample{b}{up}
+
+\fontSample{b}{sc}
+
+\fontSample{b}{scit}
+
+\fontSample{b}{scsl}
+
+\end{document}
diff --git a/Master/texmf-dist/source/droid/ttf2type1.pe b/Master/texmf-dist/source/droid/ttf2type1.pe
index 4c71df2b326..0719858b891 100644
--- a/Master/texmf-dist/source/droid/ttf2type1.pe
+++ b/Master/texmf-dist/source/droid/ttf2type1.pe
@@ -1,6 +1,6 @@
 #!/usr/bin/env fontforge
 ## ttf2ype1.pe
-## Copyright 2010 Mohamed El Morabity
+## Copyright 2010, 2011 Mohamed El Morabity
 #
 # This work may be distributed and/or modified under the conditions of the LaTeX
 # Project Public License, either version 1.3 of this license or (at your option)