From 9b62b00eb512393747797ae53f460223db50e7f4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 25 Feb 2015 22:37:48 +0000 Subject: drm (25feb15) git-svn-id: svn://tug.org/texlive/trunk@36381 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/fonts/drm/drm.dtx | 179 ++++++++++++++++++++++++++++- 1 file changed, 177 insertions(+), 2 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/fonts/drm/drm.dtx b/Master/texmf-dist/source/fonts/drm/drm.dtx index 08d97b9a227..4fa8c09c7cd 100644 --- a/Master/texmf-dist/source/fonts/drm/drm.dtx +++ b/Master/texmf-dist/source/fonts/drm/drm.dtx @@ -24,7 +24,7 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%\ProvidesPackage{drm}[2015/01/01 v3.2 support for drm fonts] +%\ProvidesPackage{drm}[2015/01/01 v4.0 support for drm fonts] %<*driver> \documentclass{ltxdoc} @@ -45,6 +45,7 @@ \usepackage[greek,english]{babel} \languageattribute{greek}{polutoniko} \usepackage[colorlinks]{hyperref} +\usepackage{dozenal} \usepackage[typeone]{drm} \usepackage{makeidx} \EnableCrossrefs @@ -79,7 +80,7 @@ % % \fi % -% \title{The \texttt{drm} Font Package, v3.2} +% \title{The \texttt{drm} Font Package, v4.0} % \author{Donald P.\ Goodman III} % \date{\today} % @@ -940,6 +941,35 @@ % better than the automatic solution.} This ensures an % overall better appearance when these figures are used. % +% Finally, as of v4.0, DRM offers \emph{real dozenal +% characters}. In conjunction with the |dozenal| package +% (available, like |drm|, on CTAN), DRM will redefine the +% commands |\x| and |\e| to produce DRM dozenal characters, +% rather than the Computer Modernish characters of the +% |dozenal| package. By default, these are old-style; +% lining dozenal figures are also available. +% +% \begin{center}\LARGE +% \begin{tabular}{ll} +% 0123456789\x\e0 & \textit{0123456789\x\e0} \\ +% \textl{0123456789\x\e0} & \textb{0123456789\x\e0} \\ +% \textbf{0123456789\x\e0} & \textbf{\textit{0123456789\x\e0}} \\ +% \textui{0123456789\x\e0} & \textui{\textbf{0123456789\x\e0}} \\ +% \textsc{0123456789\x\e0} & \texttc{0123456789\x\e0} \\ +% \textbf{\textsc{0123456789\x\e0}} & \texttc{\textbf{0123456789\x\e0}} \\ +% \textitsc{0123456789\x\e0} & \textittc{0123456789\x\e0} \\ +% \liningthree\textdrmsupfigs{0123456789\x\e0} & +% \liningthree\textdrminffigs{0123456789\x\e0} \\ +% \end{tabular} +% \end{center} +% +% In all the dozenal fonts, the ``default'' ten and eleven +% characters are held in the |X| and |E| slots; this means +% old-style in the roman and italic fonts, in all weights, +% but lining in the rest. In the roman and italic fonts, in +% all weights, lining figures are held in the |x| and |e| +% slots. +% % \subsection{Symbols and Ornaments} % \label{sub:symbols} % @@ -1930,6 +1960,67 @@ \DeclareFontFamily{LGR}{drm}{} \DeclareFontFamily{U}{drmsups}{} \DeclareFontFamily{U}{drminfs}{} + \DeclareFontFamily{T1}{drmdoz}{} + \DeclareFontShape{T1}{drmdoz}{m}{n}{ <-7> drmdoz6 + <7> drmdoz7 <8> drmdoz8 <9> drmdoz9 <10-12> drmdoz10 + <12-13> drmdoz12 <14-17> drmdoz14 <17-24> drmdoz17 + <24-> drmdoz24 }{} + \DeclareFontShape{T1}{drmdoz}{m}{sl}{ <-7> drmdozsl6 + <7> drmdozsl7 <8> drmdozsl8 <9> drmdozsl9 <10-12> drmdozsl10 + <12-13> drmdozsl12 <14-17> drmdozsl14 <17-24> drmdozsl17 + <24-> drmdozsl24 }{} + \DeclareFontShape{T1}{drmdoz}{m}{it}{ <-7> drmdozit6 + <7> drmdozit7 <8> drmdozit8 <9> drmdozit9 <10-12> drmdozit10 + <12-13> drmdozit12 <14-17> drmdozit14 <17-24> drmdozit17 + <24-> drmdozit24 }{} + \DeclareFontShape{T1}{drmdoz}{l}{n}{ <-7> drmdozl6 + <7> drmdozl7 <8> drmdozl8 <9> drmdozl9 <10-12> drmdozl10 + <12-13> drmdozl12 <14-17> drmdozl14 <17-24> drmdozl17 + <24-> drmdozl24 }{} + \DeclareFontShape{T1}{drmdoz}{b}{n}{ <-7> drmdozb6 + <7> drmdozb7 <8> drmdozb8 <9> drmdozb9 <10-12> drmdozb10 + <12-13> drmdozb12 <14-17> drmdozb14 <17-24> drmdozb17 + <24-> drmdozb24 }{} + \DeclareFontShape{T1}{drmdoz}{bx}{n}{ <-7> drmdozbx6 + <7> drmdozbx7 <8> drmdozbx8 <9> drmdozbx9 <10-12> drmdozbx10 + <12-13> drmdozbx12 <14-17> drmdozbx14 <17-24> drmdozbx17 + <24-> drmdozbx24 }{} + \DeclareFontShape{T1}{drmdoz}{bx}{it}{ <-7> drmdozitbx6 + <7> drmdozitbx7 <8> drmdozitbx8 <9> drmdozitbx9 <10-12> drmdozitbx10 + <12-13> drmdozitbx12 <14-17> drmdozitbx14 <17-24> drmdozitbx17 + <24-> drmdozitbx24 }{} + \DeclareFontShape{T1}{drmdoz}{m}{ui}{ <-7> drmdozui6 + <7> drmdozui7 <8> drmdozui8 <9> drmdozui9 <10-12> drmdozui10 + <12-13> drmdozui12 <14-17> drmdozui14 <17-24> drmdozui17 + <24-> drmdozui24 }{} + \DeclareFontShape{T1}{drmdoz}{bx}{ui}{ <-7> drmdozuibx6 + <7> drmdozuibx7 <8> drmdozuibx8 <9> drmdozuibx9 <10-12> drmdozuibx10 + <12-13> drmdozuibx12 <14-17> drmdozuibx14 <17-24> drmdozuibx17 + <24-> drmdozuibx24 }{} + \DeclareFontShape{T1}{drmdoz}{m}{sc}{ <-7> drmdozsc6 + <7> drmdozsc7 <8> drmdozsc8 <9> drmdozsc9 <10-12> drmdozsc10 + <12-13> drmdozsc12 <14-17> drmdozsc14 <17-24> drmdozsc17 + <24-> drmdozsc24 }{} + \DeclareFontShape{T1}{drmdoz}{m}{tc}{ <-7> drmdoztc6 + <7> drmdoztc7 <8> drmdoztc8 <9> drmdoztc9 <10-12> drmdoztc10 + <12-13> drmdoztc12 <14-17> drmdoztc14 <17-24> drmdoztc17 + <24-> drmdoztc24 }{} + \DeclareFontShape{T1}{drmdoz}{bx}{sc}{ <-7> drmdozscbx6 + <7> drmdozscbx7 <8> drmdozscbx8 <9> drmdozscbx9 <10-12> drmdozscbx10 + <12-13> drmdozscbx12 <14-17> drmdozscbx14 <17-24> drmdozscbx17 + <24-> drmdozscbx24 }{} + \DeclareFontShape{T1}{drmdoz}{bx}{tc}{ <-7> drmdoztcbx6 + <7> drmdoztcbx7 <8> drmdoztcbx8 <9> drmdoztcbx9 <10-12> drmdoztcbx10 + <12-13> drmdoztcbx12 <14-17> drmdoztcbx14 <17-24> drmdoztcbx17 + <24-> drmdoztcbx24 }{} + \DeclareFontShape{T1}{drmdoz}{m}{itsc}{<-7> drmdozitsc6 <7> + drmdozitsc7 <8> drmdozitsc8 <9> drmdozitsc9 <10-12> + drmdozitsc10 <12-14> drmdozitsc12 <14-17> drmdozitsc14 + <17-24> drmdozitsc17 <24-> drmdozitsc24 }{} + \DeclareFontShape{T1}{drmdoz}{m}{ittc}{<-7> drmdozittc6 <7> + drmdozittc7 <8> drmdozittc8 <9> drmdozittc9 <10-12> + drmdozittc10 <12-14> drmdozittc12 <14-17> drmdozittc14 + <17-24> drmdozittc17 <24-> drmdozittc24 }{} \DeclareFontShape{U}{drminfs}{m}{n}{ <-7> drminf6 <7> drminf7 <8> drminf8 <9> drminf9 <10-12> drminf10 <12-13> drminf12 <14-17> drminf14 <17-24> drminf17 @@ -1987,12 +2078,74 @@ <8> drmsym8 <9> drmsym9 <10-12> drmsym10 <12-14> drmsym12 <14-17> drmsym14 <17-24> drmsym17 <24-> drmsym24 }{} \DeclareFontShape{LGR}{drm}{m}{n}{<-> drmgrk10 }{} + \DeclareSymbolFont{dozens}{T1}{drmdoz}{m}{n} \else \DeclareFontFamily{T1}{drm}{} \DeclareFontFamily{TS1}{drm}{} \DeclareFontFamily{LGR}{drm}{} \DeclareFontFamily{U}{drmsups}{} \DeclareFontFamily{U}{drminfs}{} + \DeclareFontFamily{T1}{drmdoz}{} + \DeclareFontShape{T1}{drmdoz}{m}{n}{ <-7> drmdoz6 + <7> drmdoz7 <8> drmdoz8 <9> drmdoz9 <10-12> drmdoz10 + <12-13> drmdoz12 <14-17> drmdoz14 <17-24> drmdoz17 + <24-> drmdoz24 }{} + \DeclareFontShape{T1}{drmdoz}{m}{sl}{ <-7> drmdozsl6 + <7> drmdozsl7 <8> drmdozsl8 <9> drmdozsl9 <10-12> drmdozsl10 + <12-13> drmdozsl12 <14-17> drmdozsl14 <17-24> drmdozsl17 + <24-> drmdozsl24 }{} + \DeclareFontShape{T1}{drmdoz}{m}{it}{ <-7> drmdozit6 + <7> drmdozit7 <8> drmdozit8 <9> drmdozit9 <10-12> drmdozit10 + <12-13> drmdozit12 <14-17> drmdozit14 <17-24> drmdozit17 + <24-> drmdozit24 }{} + \DeclareFontShape{T1}{drmdoz}{l}{n}{ <-7> drmdozl6 + <7> drmdozl7 <8> drmdozl8 <9> drmdozl9 <10-12> drmdozl10 + <12-13> drmdozl12 <14-17> drmdozl14 <17-24> drmdozl17 + <24-> drmdozl24 }{} + \DeclareFontShape{T1}{drmdoz}{b}{n}{ <-7> drmdozb6 + <7> drmdozb7 <8> drmdozb8 <9> drmdozb9 <10-12> drmdozb10 + <12-13> drmdozb12 <14-17> drmdozb14 <17-24> drmdozb17 + <24-> drmdozb24 }{} + \DeclareFontShape{T1}{drmdoz}{bx}{n}{ <-7> drmdozbx6 + <7> drmdozbx7 <8> drmdozbx8 <9> drmdozbx9 <10-12> drmdozbx10 + <12-13> drmdozbx12 <14-17> drmdozbx14 <17-24> drmdozbx17 + <24-> drmdozbx24 }{} + \DeclareFontShape{T1}{drmdoz}{bx}{it}{ <-7> drmdozitbx6 + <7> drmdozitbx7 <8> drmdozitbx8 <9> drmdozitbx9 <10-12> drmdozitbx10 + <12-13> drmdozitbx12 <14-17> drmdozitbx14 <17-24> drmdozitbx17 + <24-> drmdozitbx24 }{} + \DeclareFontShape{T1}{drmdoz}{m}{ui}{ <-7> drmdozui6 + <7> drmdozui7 <8> drmdozui8 <9> drmdozui9 <10-12> drmdozui10 + <12-13> drmdozui12 <14-17> drmdozui14 <17-24> drmdozui17 + <24-> drmdozui24 }{} + \DeclareFontShape{T1}{drmdoz}{bx}{ui}{ <-7> drmdozuibx6 + <7> drmdozuibx7 <8> drmdozuibx8 <9> drmdozuibx9 <10-12> drmdozuibx10 + <12-13> drmdozuibx12 <14-17> drmdozuibx14 <17-24> drmdozuibx17 + <24-> drmdozuibx24 }{} + \DeclareFontShape{T1}{drmdoz}{m}{sc}{ <-7> drmdozsc6 + <7> drmdozsc7 <8> drmdozsc8 <9> drmdozsc9 <10-12> drmdozsc10 + <12-13> drmdozsc12 <14-17> drmdozsc14 <17-24> drmdozsc17 + <24-> drmdozsc24 }{} + \DeclareFontShape{T1}{drmdoz}{m}{tc}{ <-7> drmdoztc6 + <7> drmdoztc7 <8> drmdoztc8 <9> drmdoztc9 <10-12> drmdoztc10 + <12-13> drmdoztc12 <14-17> drmdoztc14 <17-24> drmdoztc17 + <24-> drmdoztc24 }{} + \DeclareFontShape{T1}{drmdoz}{bx}{sc}{ <-7> drmdozscbx6 + <7> drmdozscbx7 <8> drmdozscbx8 <9> drmdozscbx9 <10-12> drmdozscbx10 + <12-13> drmdozscbx12 <14-17> drmdozscbx14 <17-24> drmdozscbx17 + <24-> drmdozscbx24 }{} + \DeclareFontShape{T1}{drmdoz}{bx}{tc}{ <-7> drmdoztcbx6 + <7> drmdoztcbx7 <8> drmdoztcbx8 <9> drmdoztcbx9 <10-12> drmdoztcbx10 + <12-13> drmdoztcbx12 <14-17> drmdoztcbx14 <17-24> drmdoztcbx17 + <24-> drmdoztcbx24 }{} + \DeclareFontShape{T1}{drmdoz}{m}{itsc}{<-7> drmdozitsc6 <7> + drmdozitsc7 <8> drmdozitsc8 <9> drmdozitsc9 <10-12> + drmdozitsc10 <12-14> drmdozitsc12 <14-17> drmdozitsc14 + <17-24> drmdozitsc17 <24-> drmdozitsc24 }{} + \DeclareFontShape{T1}{drmdoz}{m}{ittc}{<-7> drmdozittc6 <7> + drmdozittc7 <8> drmdozittc8 <9> drmdozittc9 <10-12> + drmdozittc10 <12-14> drmdozittc12 <14-17> drmdozittc14 + <17-24> drmdozittc17 <24-> drmdozittc24 }{} \DeclareFontShape{U}{drminfs}{m}{n}{ <-7> drminf6 <7> drminf7 <8> drminf8 <9> drminf9 <10-12> drminf10 <12-13> drminf12 <14-17> drminf14 <17-24> drminf17 @@ -2050,8 +2203,30 @@ <8> drmsym8 <9> drmsym9 <10-12> drmsym10 <12-14> drmsym12 <14-17> drmsym14 <17-24> drmsym17 <24-> drmsym24 }{} \DeclareFontShape{LGR}{drm}{m}{n}{<-> drmgrk10 }{} + \DeclareSymbolFont{dozens}{T1}{drmdoz}{m}{n} \fi % \end{macrocode} +% Next, we define the appropriate dozenal characters using +% the DRM dozenal fonts if and only if the |dozenal| package +% is loaded. If you want to override this behavior and use +% the default, Computer Modern-ish |dozenal| fonts, load +% |dozenal| \emph{after} |drm|. +% \begin{macrocode} +\@ifpackageloaded{dozenal}{% + \def\doz#1{{\fontfamily{drmdoz}\fontencoding{T1}\selectfont #1}}% + \def\drmsupfont{drmsups}\def\drminffont{drminfs}% + \renewcommand\x{% + \ifx\f@family\drmsupfont X% + \else\ifx\f@family\drminffont X% + \else\TextOrMath{\protect\doz{{X}}}{\doz@X}\fi\fi}% + \renewcommand\e{% + \ifx\f@family\drmsupfont E% + \else\ifx\f@family\drminffont E% + \else\TextOrMath{\protect\doz{{E}}}{\doz@E}\fi\fi}% + \DeclareMathSymbol{\doz@X}{\mathord}{dozens}{88}% + \DeclareMathSymbol{\doz@E}{\mathord}{dozens}{69}% +}{} +% \end{macrocode} % Now, set the default text font as DRM unless |nodefault| % or |nodefaulttext| has been specified. Also redefine the % default footnote counters to use superior figures rather -- cgit v1.2.3