summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-11 21:15:07 +0000
committerKarl Berry <karl@freefriends.org>2018-05-11 21:15:07 +0000
commit32b1581fb0ea8bf3a801d33788b735a1a4f3d297 (patch)
tree6061c98fb94f4209516d6fe144b6415423646fbc
parent7398208350735657f9576bd2a63e946cef51ca64 (diff)
dozenal (11may18)
git-svn-id: svn://tug.org/texlive/trunk@47680 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/dozenal/CHANGES3
-rw-r--r--Master/texmf-dist/doc/fonts/dozenal/README2
-rw-r--r--Master/texmf-dist/doc/fonts/dozenal/dozenal.pdfbin303388 -> 303416 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/dozenal/gray.tfmbin0 -> 640 bytes
-rw-r--r--Master/texmf-dist/source/fonts/dozenal/dozenal.dtx12
-rw-r--r--Master/texmf-dist/source/fonts/dozenal/dozenal.ins2
-rw-r--r--Master/texmf-dist/tex/latex/dozenal/dozenal.sty6
7 files changed, 14 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/fonts/dozenal/CHANGES b/Master/texmf-dist/doc/fonts/dozenal/CHANGES
index 4685e76748f..a1d54a0e59b 100644
--- a/Master/texmf-dist/doc/fonts/dozenal/CHANGES
+++ b/Master/texmf-dist/doc/fonts/dozenal/CHANGES
@@ -1,3 +1,6 @@
+For version 7.2, wrapped both \x and \e in \unexpanded, so
+that dozenal would play nicely with the texdate package.
+
For version 7.1, I finally realized that lualatex will choke
on the dozenal package, because it calls \pdfmapfile. I
realized this because I finally started using lualatex
diff --git a/Master/texmf-dist/doc/fonts/dozenal/README b/Master/texmf-dist/doc/fonts/dozenal/README
index 79f02fbf116..fd888ca4ea0 100644
--- a/Master/texmf-dist/doc/fonts/dozenal/README
+++ b/Master/texmf-dist/doc/fonts/dozenal/README
@@ -1,6 +1,6 @@
+AMDG
-This document is copyright 2009 by Donald P. Goodman, and is
+This document is copyright 2009-2018 by Donald P. Goodman, and is
released publicly under the LaTeX Project Public License. The
distribution and modification of this work is constrained by the
conditions of that license. See
diff --git a/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf b/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf
index 580d2bcd2c6..a2a11e85383 100644
--- a/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf
+++ b/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/gray.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/gray.tfm
new file mode 100644
index 00000000000..a470b22b6ca
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/gray.tfm
Binary files differ
diff --git a/Master/texmf-dist/source/fonts/dozenal/dozenal.dtx b/Master/texmf-dist/source/fonts/dozenal/dozenal.dtx
index 6493d4f3199..05b8716de73 100644
--- a/Master/texmf-dist/source/fonts/dozenal/dozenal.dtx
+++ b/Master/texmf-dist/source/fonts/dozenal/dozenal.dtx
@@ -4,7 +4,7 @@
% and to the Immaculate Heart of Mary for their prayers, and
% to the Sacred Heart of Jesus for His mercy.
%
-% This document is copyright 2008 by Donald P. Goodman, and is
+% This document is copyright 2008-2018 by Donald P. Goodman, and is
% released publicly under the LaTeX Project Public License. The
% distribution and modification of this work is constrained by the
% conditions of that license. See
@@ -24,7 +24,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{dozenal}[2017/07/01 v7.1 support for dozenal fonts]
+%<package>\ProvidesPackage{dozenal}[2018/05/11 v7.2 support for dozenal fonts]
%<*driver>
\documentclass{ltxdoc}
@@ -54,7 +54,7 @@
\end{document}
%</driver>
% \fi
-% \title{The \texttt{dozenal} Package, v7.1}
+% \title{The \texttt{dozenal} Package, v7.2}
% \author{Donald P.\ Goodman III}
% \date{\today}
%
@@ -591,7 +591,7 @@
% \label{sect:code}
%
% Make sure that we have |fixltx2e| loaded, so that the
-% |\TextorMath| magic will work. Also, as of v6.0, we also
+% |\TextOrMath| magic will work. Also, as of v6.0, we also
% require |xstring| to use |\IfStrEq| in the number-to-word
% code.
% \begin{macrocode}
@@ -680,8 +680,8 @@
\def\doz#1{{\fontfamily{dozch}\fontencoding{OT1}\selectfont #1}}%
\DeclareSymbolFont{dozens}{OT1}{dozch}{m}{n}
\fi%
-\newcommand\x{\TextOrMath{\protect\doz{{X}}}{\doz@X}}%
-\newcommand\e{\TextOrMath{\protect\doz{{E}}}{\doz@E}}%
+\newcommand\x{\unexpanded{\TextOrMath{\protect\doz{{X}}}{\doz@X}}}%
+\newcommand\e{\unexpanded{\TextOrMath{\protect\doz{{E}}}{\doz@E}}}%
\DeclareMathSymbol{\doz@X}{\mathord}{dozens}{88}%
\DeclareMathSymbol{\doz@E}{\mathord}{dozens}{69}%
% \end{macrocode}
diff --git a/Master/texmf-dist/source/fonts/dozenal/dozenal.ins b/Master/texmf-dist/source/fonts/dozenal/dozenal.ins
index 2d0664d769f..c3ea430f896 100644
--- a/Master/texmf-dist/source/fonts/dozenal/dozenal.ins
+++ b/Master/texmf-dist/source/fonts/dozenal/dozenal.ins
@@ -4,7 +4,7 @@
% them and to the Immaculate Heart of Mary for their
% prayers, and to the Sacred Heart of Jesus for His mercy.
%
-% This document is copyright 2015 by Donald P. Goodman, and is
+% This document is copyright 2015-2018 by Donald P. Goodman, and is
% released publicly under the LaTeX Project Public License. The
% distribution and modification of this work is constrained by the
% conditions of that license. See
diff --git a/Master/texmf-dist/tex/latex/dozenal/dozenal.sty b/Master/texmf-dist/tex/latex/dozenal/dozenal.sty
index ad4e3d77960..8938d214017 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}[2017/07/01 v7.1 support for dozenal fonts]
+\ProvidesPackage{dozenal}[2018/05/11 v7.2 support for dozenal fonts]
\RequirePackage{fixltx2e}
\RequirePackage{xstring}
\RequirePackage{ifpdf}
@@ -80,8 +80,8 @@ dozchbx10 <12-> dozchbx12 }{}
\def\doz#1{{\fontfamily{dozch}\fontencoding{OT1}\selectfont #1}}%
\DeclareSymbolFont{dozens}{OT1}{dozch}{m}{n}
\fi%
-\newcommand\x{\TextOrMath{\protect\doz{{X}}}{\doz@X}}%
-\newcommand\e{\TextOrMath{\protect\doz{{E}}}{\doz@E}}%
+\newcommand\x{\unexpanded{\TextOrMath{\protect\doz{{X}}}{\doz@X}}}%
+\newcommand\e{\unexpanded{\TextOrMath{\protect\doz{{E}}}{\doz@E}}}%
\DeclareMathSymbol{\doz@X}{\mathord}{dozens}{88}%
\DeclareMathSymbol{\doz@E}{\mathord}{dozens}{69}%
\newcommand\tally[1]{%