drm (2may15)

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

4 files changed, 107 insertions, 52 deletions

diff --git a/Master/texmf-dist/doc/fonts/drm/CHANGES b/Master/texmf-dist/doc/fonts/drm/CHANGES
index 64e5a311d7e..c87cfb1e38c 100644
--- a/Master/texmf-dist/doc/fonts/drm/CHANGES
+++ b/Master/texmf-dist/doc/fonts/drm/CHANGES
@@ -1,3 +1,10 @@
+Version 4.2, submitted to CTAN on 1 May 11EE.  Realized that
+the font-size commands based on the traditional
+typographical size names were inexplicably commented out and
+didn't work.  They now work.  Changed \diamond to
+\diamondsize so that it wouldn't conflict with the
+mathematics symbol.
+
 Version 4.1, submitted to CTAN on 7 April 11EE. Thanks to
 some messages from Wolf-Rainer Novender, I realized that
 packages greek-fontenc and cbfonts-fd are required for drm
diff --git a/Master/texmf-dist/doc/fonts/drm/drm.pdf b/Master/texmf-dist/doc/fonts/drm/drm.pdf
index 697f9e995cc..eaefd062939 100644
--- a/Master/texmf-dist/doc/fonts/drm/drm.pdf
+++ b/Master/texmf-dist/doc/fonts/drm/drm.pdf
diff --git a/Master/texmf-dist/source/fonts/drm/drm.dtx b/Master/texmf-dist/source/fonts/drm/drm.dtx
index 96ddaea30c2..7dfec618438 100644
--- a/Master/texmf-dist/source/fonts/drm/drm.dtx
+++ b/Master/texmf-dist/source/fonts/drm/drm.dtx
@@ -24,7 +24,7 @@
 
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{drm}[2015/01/01 v4.1 support for drm fonts]
+%<package>\ProvidesPackage{drm}[2015/01/01 v4.2 support for drm fonts]
 %<*driver>
 \documentclass{ltxdoc}
 
@@ -80,7 +80,7 @@
 %</driver>
 % \fi
 %
-% \title{The \texttt{drm} Font Package, v4.1}
+% \title{The \texttt{drm} Font Package, v4.2}
 % \author{Donald P.\ Goodman III}
 % \date{\today}
 %
@@ -487,7 +487,7 @@
 % \midrule
 % 3 & Excelsior & Minikin & |\excelsior|, |\minikin| \\
 % 4 & Brilliant & {} & |\brilliant| \\
-% 4.5 & Diamond & {} & |\diamond| \\
+% 4.5 & Diamond & {} & |\diamondsize| \\
 % 5 & Pearl & {} & |\pearl| \\
 % 5.5 & Agate & Ruby & |\agate|, |\ruby| \\
 % 6 & Nonpareille & {} & |\nonpareille| \\
@@ -2295,54 +2295,54 @@
 % traditional English-language printers' names.  Why?
 % \emph{Because we can}, that's why.
 %    \begin{macrocode}
-% \def\loosen{\addtolength{\baselineskip}{1pt}}
-% \def\excelsior{\fontsize{3pt}{3.5pt}\selectfont}
-% \def\minikin{\excelsior}
-% \def\brilliant{\fontsize{4pt}{4.5pt}\selectfont}
-% \def\diamond{\fontsize{4.5pt}{5pt}\selectfont}
-% \def\pearl{\fontsize{5pt}{6pt}\selectfont}
-% \def\agate{\fontsize{5.5pt}{6.5pt}\selectfont}
-% \def\ruby{\agate}
-% \def\nonpareille{\fontsize{6pt}{7pt}\selectfont}
-% \def\minionette{\fontsize{6.5pt}{7.5pt}\selectfont}
-% \def\emerald{\minionette}
-% \def\minion{\fontsize{7pt}{8pt}\selectfont}
-% \def\brevier{\fontsize{8pt}{9pt}\selectfont}
-% \def\petit{\brevier}
-% \def\smalltext{\brevier}
-% \def\bourgeois{\fontsize{9pt}{10pt}\selectfont}
-% \def\galliard{\bourgeois}
-% \def\longprimer{\fontsize{10pt}{12pt}\selectfont}
-% \def\corpus{\longprimer}
-% \def\garamond{\longprimer}
-% \def\smallpica{\fontsize{11pt}{13pt}\selectfont}
-% \def\philosophy{\smallpica}
-% \def\pica{\fontsize{12pt}{15pt}\selectfont}
-% \def\english{\fontsize{14pt}{17pt}\selectfont}
-% \def\mittel{\english}
-% \def\augustin{\english}
-% \def\columbian{\fontsize{16pt}{19pt}\selectfont}
-% \def\twolinebrevier{\columbian}
-% \def\greatprimer{\fontsize{18pt}{22pt}\selectfont}
-% \def\paragon{\fontsize{20pt}{24pt}\selectfont}
-% \def\doublesmallpica{\fontsize{21pt}{25pt}\selectfont}
-% \def\doublesmallpicaus{\fontsize{22pt}{26pt}\selectfont}
-% \def\doublepicabrit{\doublesmallpicaus}
-% \def\doublepica{\fontsize{24pt}{28pt}\selectfont}
-% \def\twolinepica{\doublepica}
-% \def\doubleenglish{\fontsize{28pt}{33pt}\selectfont}
-% \def\twolineenglish{\doubleenglish}
-% \def\fivelinenonpareil{\fontsize{30pt}{35pt}\selectfont}
-% \def\fourlinebrevier{\fontsize{32pt}{38pt}\selectfont}
-% \def\doublegreatprimer{\fontsize{36pt}{42pt}\selectfont}
-% \def\twolinegreatprimer{\doublegreatprimer}
-% \def\meridian{\fontsize{44pt}{50pt}\selectfont}
-% \def\twolinedoublepica{\meridian}
-% \def\trafalgar{\meridian}
-% \def\canon{\fontsize{48pt}{54pt}\selectfont}
-% \def\fourline{\canon}
-% \def\fivelinepica{\fontsize{60pt}{66pt}\selectfont}
-% \def\inch{\fontsize{72pt}{78pt}\selectfont}
+\def\loosen{\addtolength{\baselineskip}{1pt}}
+\def\excelsior{\fontsize{3pt}{3.5pt}\selectfont}
+\def\minikin{\excelsior}
+\def\brilliant{\fontsize{4pt}{4.5pt}\selectfont}
+\def\diamondsize{\fontsize{4.5pt}{5pt}\selectfont}
+\def\pearl{\fontsize{5pt}{6pt}\selectfont}
+\def\agate{\fontsize{5.5pt}{6.5pt}\selectfont}
+\def\ruby{\agate}
+\def\nonpareille{\fontsize{6pt}{7pt}\selectfont}
+\def\minionette{\fontsize{6.5pt}{7.5pt}\selectfont}
+\def\emerald{\minionette}
+\def\minion{\fontsize{7pt}{8pt}\selectfont}
+\def\brevier{\fontsize{8pt}{9pt}\selectfont}
+\def\petit{\brevier}
+\def\smalltext{\brevier}
+\def\bourgeois{\fontsize{9pt}{10pt}\selectfont}
+\def\galliard{\bourgeois}
+\def\longprimer{\fontsize{10pt}{12pt}\selectfont}
+\def\corpus{\longprimer}
+\def\garamond{\longprimer}
+\def\smallpica{\fontsize{11pt}{13pt}\selectfont}
+\def\philosophy{\smallpica}
+\def\pica{\fontsize{12pt}{15pt}\selectfont}
+\def\english{\fontsize{14pt}{17pt}\selectfont}
+\def\mittel{\english}
+\def\augustin{\english}
+\def\columbian{\fontsize{16pt}{19pt}\selectfont}
+\def\twolinebrevier{\columbian}
+\def\greatprimer{\fontsize{18pt}{22pt}\selectfont}
+\def\paragon{\fontsize{20pt}{24pt}\selectfont}
+\def\doublesmallpica{\fontsize{21pt}{25pt}\selectfont}
+\def\doublesmallpicaus{\fontsize{22pt}{26pt}\selectfont}
+\def\doublepicabrit{\doublesmallpicaus}
+\def\doublepica{\fontsize{24pt}{28pt}\selectfont}
+\def\twolinepica{\doublepica}
+\def\doubleenglish{\fontsize{28pt}{33pt}\selectfont}
+\def\twolineenglish{\doubleenglish}
+\def\fivelinenonpareil{\fontsize{30pt}{35pt}\selectfont}
+\def\fourlinebrevier{\fontsize{32pt}{38pt}\selectfont}
+\def\doublegreatprimer{\fontsize{36pt}{42pt}\selectfont}
+\def\twolinegreatprimer{\doublegreatprimer}
+\def\meridian{\fontsize{44pt}{50pt}\selectfont}
+\def\twolinedoublepica{\meridian}
+\def\trafalgar{\meridian}
+\def\canon{\fontsize{48pt}{54pt}\selectfont}
+\def\fourline{\canon}
+\def\fivelinepica{\fontsize{60pt}{66pt}\selectfont}
+\def\inch{\fontsize{72pt}{78pt}\selectfont}
 %    \end{macrocode}
 % Now we move on to define the math fonts.  This turned out
 % to be a surprisingly convoluted process, and I only
diff --git a/Master/texmf-dist/tex/latex/drm/drm.sty b/Master/texmf-dist/tex/latex/drm/drm.sty
index 1fecfb90625..c0494ea6f2b 100644
--- a/Master/texmf-dist/tex/latex/drm/drm.sty
+++ b/Master/texmf-dist/tex/latex/drm/drm.sty
@@ -25,7 +25,7 @@
 %% This work consists of the files listed in drmfilelist.txt.
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{drm}[2015/01/01 v4.1 support for drm fonts]
+\ProvidesPackage{drm}[2015/01/01 v4.2 support for drm fonts]
 \RequirePackage[LGR,OML,OMS,TS1,T1]{fontenc}
 \RequirePackage{modroman}
 \RequirePackage{amsmath}
@@ -339,6 +339,54 @@ drmdozittc10 <12-14> drmdozittc12 <14-17> drmdozittc14
 \def\textl#1{{\lseries#1}}
 \def\bseries{\fontseries{b}\selectfont}
 \def\textb#1{{\bseries#1}}
+\def\loosen{\addtolength{\baselineskip}{1pt}}
+\def\excelsior{\fontsize{3pt}{3.5pt}\selectfont}
+\def\minikin{\excelsior}
+\def\brilliant{\fontsize{4pt}{4.5pt}\selectfont}
+\def\diamondsize{\fontsize{4.5pt}{5pt}\selectfont}
+\def\pearl{\fontsize{5pt}{6pt}\selectfont}
+\def\agate{\fontsize{5.5pt}{6.5pt}\selectfont}
+\def\ruby{\agate}
+\def\nonpareille{\fontsize{6pt}{7pt}\selectfont}
+\def\minionette{\fontsize{6.5pt}{7.5pt}\selectfont}
+\def\emerald{\minionette}
+\def\minion{\fontsize{7pt}{8pt}\selectfont}
+\def\brevier{\fontsize{8pt}{9pt}\selectfont}
+\def\petit{\brevier}
+\def\smalltext{\brevier}
+\def\bourgeois{\fontsize{9pt}{10pt}\selectfont}
+\def\galliard{\bourgeois}
+\def\longprimer{\fontsize{10pt}{12pt}\selectfont}
+\def\corpus{\longprimer}
+\def\garamond{\longprimer}
+\def\smallpica{\fontsize{11pt}{13pt}\selectfont}
+\def\philosophy{\smallpica}
+\def\pica{\fontsize{12pt}{15pt}\selectfont}
+\def\english{\fontsize{14pt}{17pt}\selectfont}
+\def\mittel{\english}
+\def\augustin{\english}
+\def\columbian{\fontsize{16pt}{19pt}\selectfont}
+\def\twolinebrevier{\columbian}
+\def\greatprimer{\fontsize{18pt}{22pt}\selectfont}
+\def\paragon{\fontsize{20pt}{24pt}\selectfont}
+\def\doublesmallpica{\fontsize{21pt}{25pt}\selectfont}
+\def\doublesmallpicaus{\fontsize{22pt}{26pt}\selectfont}
+\def\doublepicabrit{\doublesmallpicaus}
+\def\doublepica{\fontsize{24pt}{28pt}\selectfont}
+\def\twolinepica{\doublepica}
+\def\doubleenglish{\fontsize{28pt}{33pt}\selectfont}
+\def\twolineenglish{\doubleenglish}
+\def\fivelinenonpareil{\fontsize{30pt}{35pt}\selectfont}
+\def\fourlinebrevier{\fontsize{32pt}{38pt}\selectfont}
+\def\doublegreatprimer{\fontsize{36pt}{42pt}\selectfont}
+\def\twolinegreatprimer{\doublegreatprimer}
+\def\meridian{\fontsize{44pt}{50pt}\selectfont}
+\def\twolinedoublepica{\meridian}
+\def\trafalgar{\meridian}
+\def\canon{\fontsize{48pt}{54pt}\selectfont}
+\def\fourline{\canon}
+\def\fivelinepica{\fontsize{60pt}{66pt}\selectfont}
+\def\inch{\fontsize{72pt}{78pt}\selectfont}
 \DeclareFontFamily{OML}{drm}{}
 \DeclareFontShape{OML}{drm}{m}{n}{ <-> drmmi10 }{}
 \DeclareFontFamily{OMS}{drm}{}