From e5e0aeb7fe58d7adb35199774ede1ac6da9ad454 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 30 Jan 2015 22:02:44 +0000 Subject: dozenal (30jan15) git-svn-id: svn://tug.org/texlive/trunk@36169 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/fonts/dozenal/CHANGES | 5 +++++ Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf | Bin 292664 -> 292846 bytes Master/texmf-dist/source/fonts/dozenal/dozenal.dtx | 20 +++++++++++--------- Master/texmf-dist/tex/latex/dozenal/dozenal.sty | 15 ++++++++------- 4 files changed, 24 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/fonts/dozenal/CHANGES b/Master/texmf-dist/doc/fonts/dozenal/CHANGES index 387c0c31e40..660c3917501 100644 --- a/Master/texmf-dist/doc/fonts/dozenal/CHANGES +++ b/Master/texmf-dist/doc/fonts/dozenal/CHANGES @@ -63,3 +63,8 @@ version numbers. Completely redid the conversions to Type1 fonts, so now they work consistently. Did away with the "fdz" prefix for these. Substantially reworked the documentation. + +For version 5.3, removed a conflict with some another package +that defined an "\X" and "\E" command by adding a "doz@" +prefix to these. Also made the tally marks work with the +Type1 fonts. diff --git a/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf b/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf index ab77fe1c330..7f590d022ae 100644 Binary files a/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf and b/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf differ diff --git a/Master/texmf-dist/source/fonts/dozenal/dozenal.dtx b/Master/texmf-dist/source/fonts/dozenal/dozenal.dtx index bb2f417396b..c357cc9b505 100644 --- a/Master/texmf-dist/source/fonts/dozenal/dozenal.dtx +++ b/Master/texmf-dist/source/fonts/dozenal/dozenal.dtx @@ -24,7 +24,7 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%\ProvidesPackage{dozenal}[2015/01/27 v5.2 support for dozenal fonts] +%\ProvidesPackage{dozenal}[2015/01/29 v5.3 support for dozenal fonts] %<*driver> \documentclass{ltxdoc} @@ -40,7 +40,7 @@ \end{document} % % \fi -% \title{The \texttt{dozenal} Package, v5.2} +% \title{The \texttt{dozenal} Package, v5.3} % \author{Donald P.\ Goodman III} % \date{\today} % @@ -299,7 +299,7 @@ % \begin{center} % \begin{tabular}{cccccc} % 1 & 2 & 3 & 4 & 5 & 6 \\ -% \Huge\tally{2}{\usefont{T1}{dozch}{m}{n}\selectfont 1} & \Huge\tally{2} & \Huge\tally{3} & \Huge\tally{4} & \Huge\tally{5} & \Huge\tally{6} \\ +% \Huge\tally{1} & \Huge\tally{2} & \Huge\tally{3} & \Huge\tally{4} & \Huge\tally{5} & \Huge\tally{6} \\ % \end{tabular} % \end{center} % @@ -411,6 +411,7 @@ <12-> dozchit12 }{} \DeclareFontShape{T1}{dozch}{bx}{it}{<-> dozchbxi10 }{} \def\doz#1{{\fontfamily{dozch}\fontencoding{T1}\selectfont #1}}% + \DeclareSymbolFont{dozens}{T1}{dozch}{m}{n} \else% \DeclareFontFamily{OT1}{dozch}{} \DeclareFontShape{OT1}{dozch}{m}{n}{<-6> dozchars6 @@ -428,17 +429,18 @@ <12-> dozchit12 }{} \DeclareFontShape{OT1}{dozch}{bx}{it}{<-> dozchbxi10 }{} \def\doz#1{{\fontfamily{dozch}\fontencoding{OT1}\selectfont #1}}% + \DeclareSymbolFont{dozens}{OT1}{dozch}{m}{n} \fi% -\newcommand\x{\TextOrMath{\protect\doz{{X}}}{\X}}% -\newcommand\e{\TextOrMath{\protect\doz{{E}}}{\E}}% -\DeclareSymbolFont{dozens}{OT1}{dozch}{m}{n} -\DeclareMathSymbol{\X}{\mathord}{dozens}{88} -\DeclareMathSymbol{\E}{\mathord}{dozens}{69} +\newcommand\x{\TextOrMath{\protect\doz{{X}}}{\doz@X}}% +\newcommand\e{\TextOrMath{\protect\doz{{E}}}{\doz@E}}% +\DeclareMathSymbol{\doz@X}{\mathord}{dozens}{88} +\DeclareMathSymbol{\doz@E}{\mathord}{dozens}{69} % \end{macrocode} % Put in some additional code for the tally marks. % \begin{macrocode} \newcommand\tally[1]{% - \usefont{OT1}{dozch}{m}{n}\selectfont{#1}% +% \usefont{OT1}{dozch}{m}{n}\selectfont{#1}% + \doz{#1}% }% % \end{macrocode} % Then we define our command which will produce the dozenal diff --git a/Master/texmf-dist/tex/latex/dozenal/dozenal.sty b/Master/texmf-dist/tex/latex/dozenal/dozenal.sty index d94f9dd810b..c89806b8c64 100644 --- a/Master/texmf-dist/tex/latex/dozenal/dozenal.sty +++ b/Master/texmf-dist/tex/latex/dozenal/dozenal.sty @@ -25,7 +25,7 @@ %% This work consists of the files listed in dozenalfilelist.txt. \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{dozenal}[2015/01/27 v5.2 support for dozenal fonts] +\ProvidesPackage{dozenal}[2015/01/29 v5.3 support for dozenal fonts] \RequirePackage{fixltx2e} \RequirePackage{ifpdf} \DeclareOption{nocounters}{% @@ -54,6 +54,7 @@ dozchbx10 <12-> dozchbx12 }{} <12-> dozchit12 }{} \DeclareFontShape{T1}{dozch}{bx}{it}{<-> dozchbxi10 }{} \def\doz#1{{\fontfamily{dozch}\fontencoding{T1}\selectfont #1}}% +\DeclareSymbolFont{dozens}{T1}{dozch}{m}{n} \else% \DeclareFontFamily{OT1}{dozch}{} \DeclareFontShape{OT1}{dozch}{m}{n}{<-6> dozchars6 @@ -71,14 +72,14 @@ dozchbx10 <12-> dozchbx12 }{} <12-> dozchit12 }{} \DeclareFontShape{OT1}{dozch}{bx}{it}{<-> dozchbxi10 }{} \def\doz#1{{\fontfamily{dozch}\fontencoding{OT1}\selectfont #1}}% -\fi% -\newcommand\x{\TextOrMath{\protect\doz{{X}}}{\X}}% -\newcommand\e{\TextOrMath{\protect\doz{{E}}}{\E}}% \DeclareSymbolFont{dozens}{OT1}{dozch}{m}{n} -\DeclareMathSymbol{\X}{\mathord}{dozens}{88} -\DeclareMathSymbol{\E}{\mathord}{dozens}{69} +\fi% +\newcommand\x{\TextOrMath{\protect\doz{{X}}}{\doz@X}}% +\newcommand\e{\TextOrMath{\protect\doz{{E}}}{\doz@E}}% +\DeclareMathSymbol{\doz@X}{\mathord}{dozens}{88} +\DeclareMathSymbol{\doz@E}{\mathord}{dozens}{69} \newcommand\tally[1]{% -\usefont{OT1}{dozch}{m}{n}\selectfont{#1}% +\doz{#1}% }% \def\basexii#1#2#3{\ifcase\numexpr(#1)\relax 0\or1\or2\or3\or4\or5\or6\or7\or8\or9\or#2\or#3\else -- cgit v1.2.3