dozenal (2jul17)

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

5 files changed, 25 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/fonts/dozenal/CHANGES b/Master/texmf-dist/doc/fonts/dozenal/CHANGES
index 94c81d23747..4685e76748f 100644
--- a/Master/texmf-dist/doc/fonts/dozenal/CHANGES
+++ b/Master/texmf-dist/doc/fonts/dozenal/CHANGES
@@ -1,3 +1,10 @@
+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
+regularly.  This was fixed by requiring ifluatex and
+defining \pdfmapfile if luatex is being used.  Submitted to
+CTAN on 1 July 1201 (1 July 2017).
+
 For version 7.0, added the "\doman" and "\Doman" macros for
 dozenal-style Roman numerals.  Also reorganized the
 documentation.  Submitted to CTAN on 25 Nov 1200 (29 Nov
diff --git a/Master/texmf-dist/doc/fonts/dozenal/README b/Master/texmf-dist/doc/fonts/dozenal/README
index 2b52a09fd49..79f02fbf116 100644
--- a/Master/texmf-dist/doc/fonts/dozenal/README
+++ b/Master/texmf-dist/doc/fonts/dozenal/README
@@ -23,6 +23,6 @@ styles and sizes, designed to blend with the Computer Modern
 family, for typesetting dozenal documents.  It employs the
 \basexii algorithm by David Kastrup.
 
-This document should run properly on any properly running LaTeX
-system.  It's been tested specifically with TeXLive on Linux (2.6.2
-kernel).
+This document should run properly on any properly running
+LaTeX system.  It's been tested specifically with TeXLive on
+Linux.
diff --git a/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf b/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf
index fd0046cef7e..580d2bcd2c6 100644
--- a/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf
+++ b/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf
diff --git a/Master/texmf-dist/source/fonts/dozenal/dozenal.dtx b/Master/texmf-dist/source/fonts/dozenal/dozenal.dtx
index 1d9edc67e2d..6493d4f3199 100644
--- a/Master/texmf-dist/source/fonts/dozenal/dozenal.dtx
+++ b/Master/texmf-dist/source/fonts/dozenal/dozenal.dtx
@@ -24,7 +24,7 @@
 
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{dozenal}[2015/01/29 v7.0 support for dozenal fonts]
+%<package>\ProvidesPackage{dozenal}[2017/07/01 v7.1 support for dozenal fonts]
 %<*driver>
 
 \documentclass{ltxdoc}
@@ -54,7 +54,7 @@
 \end{document}
 %</driver>
 % \fi
-% \title{The \texttt{dozenal} Package, v7.0}
+% \title{The \texttt{dozenal} Package, v7.1}
 % \author{Donald P.\ Goodman III}
 % \date{\today}
 %
@@ -599,9 +599,16 @@
 \RequirePackage{xstring}
 %    \end{macrocode}
 % Now we ensure that |ifpdf| is loaded, so that we can test
-% for pdf or dvi modes.
+% for pdf or dvi modes.  We also make sure we have
+% |ifluatex|, so that |dozenal| won't choke when you use it
+% with the |typeone| option.  We'll take care of the
+% |luatex| stuff right away, while we're at it:
 %    \begin{macrocode}
 \RequirePackage{ifpdf}
+\RequirePackage{ifluatex}
+\ifluatex
+	\protected\def\pdfmapfile {\pdfextension mapfile }
+\fi
 %    \end{macrocode}
 % We also require |mfirstuc|, because it's \emph{great}:
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/tex/latex/dozenal/dozenal.sty b/Master/texmf-dist/tex/latex/dozenal/dozenal.sty
index bed19e412d2..ad4e3d77960 100644
--- a/Master/texmf-dist/tex/latex/dozenal/dozenal.sty
+++ b/Master/texmf-dist/tex/latex/dozenal/dozenal.sty
@@ -25,10 +25,14 @@
 %% This work consists of the files listed in dozenalfilelist.txt.
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{dozenal}[2015/01/29 v7.0 support for dozenal fonts]
+\ProvidesPackage{dozenal}[2017/07/01 v7.1 support for dozenal fonts]
 \RequirePackage{fixltx2e}
 \RequirePackage{xstring}
 \RequirePackage{ifpdf}
+\RequirePackage{ifluatex}
+\ifluatex
+\protected\def\pdfmapfile {\pdfextension mapfile }
+\fi
 \RequirePackage{mfirstuc}
 \DeclareOption{nocounters}{%
 \def\nocounters{}%