3 files changed, 55 insertions, 43 deletions
diff --git a/Master/texmf-dist/doc/fonts/dozenal/README b/Master/texmf-dist/doc/fonts/dozenal/README
index dd9fc93c9ac..da2d309ea1f 100644
--- a/Master/texmf-dist/doc/fonts/dozenal/README
+++ b/Master/texmf-dist/doc/fonts/dozenal/README
@@ -82,3 +82,8 @@ install the package correctly automatically; previously,
 some manual work was required.  This was essentially just
 adding a \pdfmapfile statement to dozenal.sty.  Submitted to
 CTAN on 25 November 2009.
+
+For version 3.2, I've made minor changes because a new
+version of hyperref for some reason seemed to break things,
+for reasons that aren't really clear to me.  Submitted to
+CTAN on 13 May 2012.
diff --git a/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf b/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf
index da3339f7a25..1798d8c10b0 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/tex/latex/dozenal/dozenal.sty b/Master/texmf-dist/tex/latex/dozenal/dozenal.sty
index c984d6a6af9..bada50126e3 100644
--- a/Master/texmf-dist/tex/latex/dozenal/dozenal.sty
+++ b/Master/texmf-dist/tex/latex/dozenal/dozenal.sty
@@ -17,7 +17,7 @@
 % This work has the LPPL maintenance status 'maintained'.
 % 
 % The Current Maintainer of this work is Donald P. Goodman
-% (dgoodmaniii@gmail.com).
+% (dgoodmaniii@fastmail.fm).
 % 
 % This work consists of the files dozenal.dtx, dozenal.sty,
 % dozchars6.mf, dozchars7.mf, dozchars8.mf, dozchars9.mf,
@@ -184,13 +184,18 @@
 % First, we name the package that we provide.  This is
 % not exactly the most difficult part of the code.
 %    \begin{macrocode}
-\ProvidesPackage{dozenal}[2009/11/25 v3.0 support for dozenal fonts]
+\ProvidesPackage{dozenal}[2012/05/13 v3.2 support for dozenal fonts]
 %    \end{macrocode}
 % Now we need to make sure that we have fixltx2e loaded, so
 % that the |\TextorMath| magic will work.
 %    \begin{macrocode}
 \RequirePackage{fixltx2e}
 %    \end{macrocode}
+% Now we ensure that |ifpdf| is loaded, so that we can test
+% for pdf or dvi modes.
+%    \begin{macrocode}
+\RequirePackage{ifpdf}
+%    \end{macrocode}
 % We then define the font that we're using for our
 % \MF-produced Pitman characters.  Incidentally, we also
 % define the command |\doz|, though I can't foresee any
@@ -208,7 +213,9 @@
 \DeclareFontShape{OT1}{dozch}{bx}{sl}{<-> dozchbxsl10 }{}
 \DeclareFontShape{OT1}{dozch}{m}{it}{<-7> dozchit7 <8> dozchit8 <9> dozchit9 <10-11> dozchit10 <12-> dozchit12 }{}
 \DeclareFontShape{OT1}{dozch}{bx}{it}{<-> dozchbxi10 }{}
-\pdfmapfile{=fdz.map}
+\ifpdf
+	\pdfmapfile{=fdz.map}
+\fi
 \DeclareFontFamily{T1}{dozch}{}
 \DeclareFontShape{T1}{dozch}{m}{n}{<-> fdzr8r  }{}
 \DeclareFontShape{T1}{dozch}{bx}{n}{<-> fdzb8r }{}
@@ -249,29 +256,29 @@
 % not used, the counters will not be redefined.  This way,
 % they're redefined in all cases.
 %    \begin{macrocode}
-\@ifundefined{c@page}{}{\renewcommand\thepage{\basexii{\arabic{page}}{\x}{\e}}}
-\@ifundefined{c@footnote}{}{\renewcommand\thefootnote{\basexii{\arabic{footnote}}{\x}{\e}}}
-\@ifundefined{c@part}{}{\renewcommand\thepart{\basexii{\arabic{part}}{\x}{\e}}}
-\@ifundefined{c@subparagraph}{}{\renewcommand\thesubparagraph{\basexii{\arabic{subparagraph}}{\x}{\e}}}
-\@ifundefined{c@paragraph}{}{\renewcommand\theparagraph{\basexii{\arabic{paragraph}}{\x}{\e}}}
-\@ifundefined{c@equation}{}{\renewcommand\theequation{\basexii{\arabic{equation}}{\x}{\e}}}
-\@ifundefined{c@figure}{}{\renewcommand\thefigure{\basexii{\arabic{figure}}{\x}{\e}}}
-\@ifundefined{c@table}{}{\renewcommand\thetable{\basexii{\arabic{table}}{\x}{\e}}}
-\@ifundefined{c@table}{}{\renewcommand\thempfootnote{\basexii{\arabic{mpfootnote}}{\x}{\e}}}
-\@ifundefined{c@enumi}{}{\renewcommand\theenumi{\basexii{\arabic{enumi}}{\x}{\e}}}
-\@ifundefined{c@enumii}{}{\renewcommand\theenumii{\basexii{\arabic{enumii}}{\x}{\e}}}
-\@ifundefined{c@enumiii}{}{\renewcommand\theenumiii{\basexii{\arabic{enumiii}}{\x}{\e}}}
-\@ifundefined{c@enumiv}{}{\renewcommand\theenumiv{\basexii{\arabic{enumiv}}{\x}{\e}}}
+\@ifundefined{c@page}{}{\renewcommand\thepage{\basexii{\value{page}}{\x}{\e}}}
+\@ifundefined{c@footnote}{}{\renewcommand\thefootnote{\basexii{\value{footnote}}{\x}{\e}}}
+\@ifundefined{c@part}{}{\renewcommand\thepart{\basexii{\value{part}}{\x}{\e}}}
+\@ifundefined{c@subparagraph}{}{\renewcommand\thesubparagraph{\basexii{\value{subparagraph}}{\x}{\e}}}
+\@ifundefined{c@paragraph}{}{\renewcommand\theparagraph{\basexii{\value{paragraph}}{\x}{\e}}}
+\@ifundefined{c@equation}{}{\renewcommand\theequation{\basexii{\value{equation}}{\x}{\e}}}
+\@ifundefined{c@figure}{}{\renewcommand\thefigure{\basexii{\value{figure}}{\x}{\e}}}
+\@ifundefined{c@table}{}{\renewcommand\thetable{\basexii{\value{table}}{\x}{\e}}}
+\@ifundefined{c@table}{}{\renewcommand\thempfootnote{\basexii{\value{mpfootnote}}{\x}{\e}}}
+\@ifundefined{c@enumi}{}{\renewcommand\theenumi{\basexii{\value{enumi}}{\x}{\e}}}
+\@ifundefined{c@enumii}{}{\renewcommand\theenumii{\basexii{\value{enumii}}{\x}{\e}}}
+\@ifundefined{c@enumiii}{}{\renewcommand\theenumiii{\basexii{\value{enumiii}}{\x}{\e}}}
+\@ifundefined{c@enumiv}{}{\renewcommand\theenumiv{\basexii{\value{enumiv}}{\x}{\e}}}
 \@ifundefined{c@chapter}{% if it's undefined
-\renewcommand\thesection{\basexii{\arabic{section}}{\x}{\e}}
-\renewcommand\thesubsection{\thesection.\basexii{\arabic{subsection}}{\x}{\e}}
-\renewcommand\thesubsubsection{\thesubsection.\basexii{\arabic{subsubsection}}{\x}{\e}}
+\renewcommand\thesection{\basexii{\value{section}}{\x}{\e}}
+\renewcommand\thesubsection{\thesection.\basexii{\value{subsection}}{\x}{\e}}
+\renewcommand\thesubsubsection{\thesubsection.\basexii{\value{subsubsection}}{\x}{\e}}
 } % end undefined
 {%if it's defined
-\renewcommand\thechapter{\basexii{\arabic{chapter}}{\x}{\e}}
-\renewcommand\thesection{\thechapter.\basexii{\arabic{section}}{\x}{\e}}
-\renewcommand\thesubsection{\thesection.\basexii{\arabic{subsection}}{\x}{\e}}
-\renewcommand\thesubsubsection{\thesubsection.\basexii{\arabic{subsubsection}}{\x}{\e}}
+\renewcommand\thechapter{\basexii{\value{chapter}}{\x}{\e}}
+\renewcommand\thesection{\thechapter.\basexii{\value{section}}{\x}{\e}}
+\renewcommand\thesubsection{\thesection.\basexii{\value{subsection}}{\x}{\e}}
+\renewcommand\thesubsubsection{\thesubsection.\basexii{\value{subsubsection}}{\x}{\e}}
 }%end if chapter's defined
 %    \end{macrocode}
 % Finally, if the ``mainmatter'' command is used, we need to
@@ -279,29 +286,29 @@
 %    \begin{macrocode}
 \@ifundefined{mainmatter}{}{%
 \g@addto@macro\mainmatter{%
-\@ifundefined{c@page}{}{\renewcommand\thepage{\basexii{\arabic{page}}{\x}{\e}}}
-\@ifundefined{c@footnote}{}{\renewcommand\thefootnote{\basexii{\arabic{footnote}}{\x}{\e}}}
-\@ifundefined{c@part}{}{\renewcommand\thepart{\basexii{\arabic{part}}{\x}{\e}}}
-\@ifundefined{c@subparagraph}{}{\renewcommand\thesubparagraph{\basexii{\arabic{subparagraph}}{\x}{\e}}}
-\@ifundefined{c@paragraph}{}{\renewcommand\theparagraph{\basexii{\arabic{paragraph}}{\x}{\e}}}
-\@ifundefined{c@equation}{}{\renewcommand\theequation{\basexii{\arabic{equation}}{\x}{\e}}}
-\@ifundefined{c@figure}{}{\renewcommand\thefigure{\basexii{\arabic{figure}}{\x}{\e}}}
-\@ifundefined{c@table}{}{\renewcommand\thetable{\basexii{\arabic{table}}{\x}{\e}}}
-\@ifundefined{c@table}{}{\renewcommand\thempfootnote{\basexii{\arabic{mpfootnote}}{\x}{\e}}}
-\@ifundefined{c@enumi}{}{\renewcommand\theenumi{\basexii{\arabic{enumi}}{\x}{\e}}}
-\@ifundefined{c@enumii}{}{\renewcommand\theenumii{\basexii{\arabic{enumii}}{\x}{\e}}}
-\@ifundefined{c@enumiii}{}{\renewcommand\theenumiii{\basexii{\arabic{enumiii}}{\x}{\e}}}
-\@ifundefined{c@enumiv}{}{\renewcommand\theenumiv{\basexii{\arabic{enumiv}}{\x}{\e}}}
+\@ifundefined{c@page}{}{\renewcommand\thepage{\basexii{\value{page}}{\x}{\e}}}
+\@ifundefined{c@footnote}{}{\renewcommand\thefootnote{\basexii{\value{footnote}}{\x}{\e}}}
+\@ifundefined{c@part}{}{\renewcommand\thepart{\basexii{\value{part}}{\x}{\e}}}
+\@ifundefined{c@subparagraph}{}{\renewcommand\thesubparagraph{\basexii{\value{subparagraph}}{\x}{\e}}}
+\@ifundefined{c@paragraph}{}{\renewcommand\theparagraph{\basexii{\value{paragraph}}{\x}{\e}}}
+\@ifundefined{c@equation}{}{\renewcommand\theequation{\basexii{\value{equation}}{\x}{\e}}}
+\@ifundefined{c@figure}{}{\renewcommand\thefigure{\basexii{\value{figure}}{\x}{\e}}}
+\@ifundefined{c@table}{}{\renewcommand\thetable{\basexii{\value{table}}{\x}{\e}}}
+\@ifundefined{c@table}{}{\renewcommand\thempfootnote{\basexii{\value{mpfootnote}}{\x}{\e}}}
+\@ifundefined{c@enumi}{}{\renewcommand\theenumi{\basexii{\value{enumi}}{\x}{\e}}}
+\@ifundefined{c@enumii}{}{\renewcommand\theenumii{\basexii{\value{enumii}}{\x}{\e}}}
+\@ifundefined{c@enumiii}{}{\renewcommand\theenumiii{\basexii{\value{enumiii}}{\x}{\e}}}
+\@ifundefined{c@enumiv}{}{\renewcommand\theenumiv{\basexii{\value{enumiv}}{\x}{\e}}}
 \@ifundefined{c@chapter}{% if it's undefined
-\renewcommand\thesection{\basexii{\arabic{section}}{\x}{\e}}
-\renewcommand\thesubsection{\thesection.\basexii{\arabic{subsection}}{\x}{\e}}
-\renewcommand\thesubsubsection{\thesubsection.\basexii{\arabic{subsubsection}}{\x}{\e}}
+\renewcommand\thesection{\basexii{\value{section}}{\x}{\e}}
+\renewcommand\thesubsection{\thesection.\basexii{\value{subsection}}{\x}{\e}}
+\renewcommand\thesubsubsection{\thesubsection.\basexii{\value{subsubsection}}{\x}{\e}}
 } % end undefined
 {%if it's defined
-\renewcommand\thechapter{\basexii{\arabic{chapter}}{\x}{\e}}
-\renewcommand\thesection{\thechapter.\basexii{\arabic{section}}{\x}{\e}}
-\renewcommand\thesubsection{\thesection.\basexii{\arabic{subsection}}{\x}{\e}}
-\renewcommand\thesubsubsection{\thesubsection.\basexii{\arabic{subsubsection}}{\x}{\e}}
+\renewcommand\thechapter{\basexii{\value{chapter}}{\x}{\e}}
+\renewcommand\thesection{\thechapter.\basexii{\value{section}}{\x}{\e}}
+\renewcommand\thesubsection{\thesection.\basexii{\value{subsection}}{\x}{\e}}
+\renewcommand\thesubsubsection{\thesubsection.\basexii{\value{subsubsection}}{\x}{\e}}
 } % end if it's defined
 }}
 %    \end{macrocode}