dozenal (3apr09)

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

7 files changed, 17 insertions, 135 deletions

diff --git a/Master/texmf-dist/doc/fonts/dozenal/README b/Master/texmf-dist/doc/fonts/dozenal/README
index 8912d9232e5..4c799425f42 100644
--- a/Master/texmf-dist/doc/fonts/dozenal/README
+++ b/Master/texmf-dist/doc/fonts/dozenal/README
@@ -34,3 +34,7 @@ family, for typesetting dozenal documents.  It employs the
 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 is version 1.1 of dozenal; minor bugs, in which section
+and subsection numbers were not properly redefined, have
+been fixed.
diff --git a/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf b/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf
index 3c942b161d8..09ef22c03ce 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/doc/fonts/dozenal/doztest.tex b/Master/texmf-dist/doc/fonts/dozenal/doztest.tex
deleted file mode 100644
index b2f5a9bc4f6..00000000000
--- a/Master/texmf-dist/doc/fonts/dozenal/doztest.tex
+++ /dev/null
@@ -1,41 +0,0 @@
-% +AMDG
-
-\documentclass{book}
-\title{A Base Twelve Test}
-\author{Donald P.\ Goodman}
-\date{\today}
-
-\usepackage{dozenal}
-
-\begin{document}
-
-\maketitle
-\tableofcontents
-
-\chapter{Just}
-
-\chapter{Checking}
-
-\chapter{To}
-
-\chapter{See}
-
-\chapter{If}
-
-\chapter{The}
-
-\chapter{Dozenal}
-
-\chapter{Package}
-
-\chapter{Is}
-
-\chapter{Working}
-
-\chapter{Properly}
-
-\chapter{As}
-
-\chapter{Expected.}
-
-\end{document}
diff --git a/Master/texmf-dist/fonts/source/public/dozenal/dozchars.mf b/Master/texmf-dist/fonts/source/public/dozenal/dozchars.mf
deleted file mode 100644
index b061f1a3972..00000000000
--- a/Master/texmf-dist/fonts/source/public/dozenal/dozchars.mf
+++ /dev/null
@@ -1,14 +0,0 @@
-% +AMDG  This program was begun on 14 November 2008, the
-% feast of St. Josaphat, and it is humbly dedicated to him
-% and to the Immaculate Heart of Mary for their prayers, and
-% to the Sacred Heart of Jesus, for His mercy.
-
-input dozchars6;
-input dozchars7;
-input dozchars8;
-input dozchars9;
-input dozchars10;
-input dozchars11;
-input dozchars12;
-input dozchars17;
-bye.
diff --git a/Master/texmf-dist/fonts/source/public/dozenal/dozchars11.mf b/Master/texmf-dist/fonts/source/public/dozenal/dozchars11.mf
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/Master/texmf-dist/fonts/source/public/dozenal/dozchars11.mf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/source/public/dozenal/dozchars5.mf b/Master/texmf-dist/fonts/source/public/dozenal/dozchars5.mf
deleted file mode 100644
index b3e3672a12d..00000000000
--- a/Master/texmf-dist/fonts/source/public/dozenal/dozchars5.mf
+++ /dev/null
@@ -1,77 +0,0 @@
-% +AMDG  This program was begun on 14 November 2008, the
-% feast of St. Josaphat, and it is humbly dedicated to him
-% and to the Immaculate heart of Mary for their prayers, and
-% to the Sacred Heart of Jesus for His mercy.
-
-font_identifier:="dozchars"; font_size 5pt#;
-
-u#:=12.5/36pt#;      % unit width
-width_adj#:=0pt#;    % width adjustment for certain characters
-serif_fit#:=0pt#;    % extra sidebar near lowercase serifs
-cap_serif_fit#:=2/36pt#;  % extra sidebar near uppercase serifs
-letter_fit#:=5/36pt#;    % extra space added to all sidebars
-
-body_height#:=135/36pt#;  % height of tallest characters
-asc_height#:=125/36pt#;    % height of lowercase ascenders
-cap_height#:=123/36pt#;    % height of caps
-fig_height#:=116/36pt#;    % height of numerals
-x_height#:=77.5/36pt#;    % height of lowercase without ascenders
-math_axis#:=45/36pt#;    % axis of symmetry for math symbols
-bar_height#:=43.5/36pt#;  % height of crossbar in lowercase e
-comma_depth#:=35/36pt#;    % depth of comma below baseline
-desc_depth#:=35/36pt#;    % depth of lowercase descenders
-
-crisp#:=0pt#;      % diameter of serif corners
-tiny#:=6/36pt#;      % diameter of rounded corners
-fine#:=5/36pt#;      % diameter of sharply rounded corners
-thin_join#:=5/36pt#;    % width of extrafine details
-hair#:=7.5/36pt#;    % lowercase hairline breadth
-stem#:=16/36pt#;    % lowercase stem breadth
-curve#:=18/36pt#;    % lowercase curve breadth
-ess#:=12/36pt#;      % breadth in middle of lowercase s
-flare#:=19/36pt#;    % diameter of bulbs or breadth of terminals
-dot_size#:=22/36pt#;    % diameter of dots
-cap_hair#:=8/36pt#;    % uppercase hairline breadth
-cap_stem#:=19/36pt#;    % uppercase stem breadth
-cap_curve#:=21/36pt#;    % uppercase curve breadth
-cap_ess#:=14/36pt#;    % breadth in middle of uppercase s
-rule_thickness#:=.28pt#;  % thickness of lines in math symbols
-
-dish#:=.7/36pt#;    % amount erased at top or bottom of serifs
-bracket#:=10/36pt#;    % vertical distance from serif base to tangent
-jut#:=15/36pt#;      % protrusion of lowercase serifs
-cap_jut#:=20/36pt#;    % protrusion of uppercase serifs
-beak_jut#:=6/36pt#;    % horizontal protrusion of beak serifs
-beak#:=35/36pt#;    % vertical protrusion of beak serifs
-vair#:=6/36pt#;      % vertical diameter of hairlines
-notch_cut#:=5pt#;    % maximum breadth above or below notches
-bar#:=8/36pt#;      % lowercase bar thickness
-slab#:=8/36pt#;      % serif and arm thickness
-cap_bar#:=8/36pt#;    % uppercase bar thickness
-cap_band#:=8/36pt#;    % uppercase thickness above/below lobes
-cap_notch_cut#:=5pt#;    % max breadth above/below uppercase notches
-serif_drop#:=2/36pt#;    % vertical drop of sloped serifs
-stem_corr#:=.7/36pt#;    % for small refinements of stem breadth
-vair_corr#:=.5/36pt#;    % for small refinements of hairline height
-apex_corr#:=0pt#;    % extra width at diagonal junctions
-
-o#:=4/36pt#;      % amount of overshoot for curves
-apex_o#:=4/36pt#;    % amount of overshoot for diagonal junctions
-
-slant:=0;      % tilt ratio $(\Delta x/\Delta y)$
-fudge:=1;      % factor applied to weights of heavy characters
-math_spread:=1;      % extra openness of math symbols
-superness:=1/sqrt2;    % parameter for superellipses
-superpull:=1/6;      % extra openness inside bowls
-beak_darkness:=11/30;    % fraction of triangle inside beak serifs
-ligs:=1;      % level of ligatures to be included
-
-square_dots:=false;    % should dots be square?
-hefty:=false;      % should we try hard not to be overweight?
-serifs:=true;      % should serifs and bulbs be attached?
-monospace:=false;    % should all characters have the same width?
-variant_g:=false;    % should an italic-style g be used?
-low_asterisk:=false;    % should the asterisk be centered at the axis?
-math_fitting:=false;    % should math-mode spacing be used?
-
-generate dozenal      % switch to the driver file
diff --git a/Master/texmf-dist/tex/latex/dozenal/dozenal.sty b/Master/texmf-dist/tex/latex/dozenal/dozenal.sty
index a7b112fc91a..a89d7e5b5df 100644
--- a/Master/texmf-dist/tex/latex/dozenal/dozenal.sty
+++ b/Master/texmf-dist/tex/latex/dozenal/dozenal.sty
@@ -207,9 +207,6 @@
 \@ifundefined{c@page}{}{\renewcommand\thepage{\basexii{\arabic{page}}{\x}{\e}}}
 \@ifundefined{c@chapter}{}{\renewcommand\thechapter{\basexii{\arabic{chapter}}{\x}{\e}}}
 \@ifundefined{c@footnote}{}{\renewcommand\thefootnote{\basexii{\arabic{footnote}}{\x}{\e}}}
-\@ifundefined{c@section}{}{\renewcommand\thesection{\basexii{\arabic{section}}{\x}{\e}}}
-\@ifundefined{c@subsection}{}{\renewcommand\thesubsection{\basexii{\arabic{subsection}}{\x}{\e}}}
-\@ifundefined{c@subsubsection}{}{\renewcommand\thesubsubsection{\basexii{\arabic{subsubsection}}{\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}}}
@@ -221,6 +218,19 @@
 \@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{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}}
+} % end undefined
+{%if it's defined
+\renewcommand\thesection{\thechapter.\basexii{\arabic{section}}{\x}{\e}}
+\renewcommand\thesubsection{\thesection.\basexii{\arabic{subsection}}{\x}{\e}}
+\renewcommand\thesubsubsection{\thesubsection.\basexii{\arabic{subsubsection}}{\x}{\e}}
+} % end if it's defined
+
+
 %    \end{macrocode}
 % And that's the end.  Thanks for reading, 
 % folks; please email me with any suggestions or improvements.