dozenal update (6jul09)

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

79 files changed, 251 insertions, 23 deletions

diff --git a/Master/texmf-dist/doc/fonts/dozenal/README b/Master/texmf-dist/doc/fonts/dozenal/README
index 515e9efd3fc..794a634d36c 100644
--- a/Master/texmf-dist/doc/fonts/dozenal/README
+++ b/Master/texmf-dist/doc/fonts/dozenal/README
@@ -23,8 +23,25 @@ dozchbx5.mf, dozchbx6.mf, dozchbx7.mf, dozchbx8.mf, dozchbx9.mf,
 dozchbx10.mf, dozchbx12.mf, dozchit7.mf, dozchit8.mf, 
 dozchit9.mf, dozchit10.mf, dozchit12.mf, dozchbxi10.mf, 
 dozchbxsl10.mf, dozenal.mf, dozenalb.mf, dozenali.mf, 
-testdozchars.tex, dozenal.sty, and dozenal.pdf, along with 
-the README.
+fdzb8a.pfb, fdzbi8a.pfb, fdzbs8a.pfb, fdzi8a.pfb,
+fdzr8a.pfb, fdzs8a.pfb, fdz.map, , fdzb7t.tfm, fdzb8a.tfm,
+fdzb8c.tfm, fdzb8r.tfm, fdzb8t.tfm, fdzbc7t.tfm,
+fdzbc8t.tfm, fdzbi7t.tfm, fdzbi8a.tfm, fdzbi8c.tfm,
+fdzbi8r.tfm, fdzbi8t.tfm, fdzbo7t.tfm, fdzbo8c.tfm,
+fdzbo8r.tfm, fdzbo8t.tfm, fdzbs8a.tfm, fdzi8a.tfm,
+fdzr7t.tfm, fdzr8a.tfm, fdzr8c.tfm, fdzr8r.tfm, fdzr8t.tfm,
+fdzrc7t.tfm, fdzrc8t.tfm, fdzro7t.tfm, fdzro8c.tfm,
+fdzro8r.tfm, fdzro8t.tfm, fdzs7t.tfm, fdzs8a.tfm,
+fdzs8c.tfm, fdzs8r.tfm, fdzs8t.tfm, fdzsc7t.tfm,
+fdzsc8t.tfm, fdzso7t.tfm, fdzso8c.tfm, fdzso8r.tfm,
+fdzso8t.tfm,, fdzb7t.vf, fdzb8c.vf, fdzb8t.vf, fdzbc7t.vf,
+fdzbc8t.vf, fdzbi7t.vf, fdzbi8c.vf, fdzbi8t.vf, fdzbo7t.vf,
+fdzbo8c.vf, fdzbo8t.vf, fdzr7t.vf, fdzr8c.vf, fdzr8t.vf,
+fdzrc7t.vf, fdzrc8t.vf, fdzro7t.vf, fdzro8c.vf, fdzro8t.vf,
+fdzs7t.vf, fdzs8c.vf, fdzs8t.vf, fdzsc7t.vf, fdzsc8t.vf,
+fdzso7t.vf, fdzso8c.vf, fdzso8t.vf, testfdzchars.tex,
+testdozchars.tex, dozenal.sty, and dozenal.pdf, along with
+this README.
 
 dozenal provides macros and characters in a variety of
 styles and sizes, designed to blend with the Computer Modern
@@ -45,3 +62,10 @@ math mode was added.  Submitted to CTAN on 6 June 2009.
 For version 1.3, \mainmatter's slaughter of the dozenal
 counter redefinitions was stopped.  Submitted to CTAN on 20
 June 2009.
+
+For version 2.0, Type 1 versions of the fonts were uploaded.
+Some trouble with the normal weight italic, which is
+therefore replaced with the simple slanted version.  Was
+annoyed at having to do this at all; only did it because
+acroread is terrible and won't display bitmap fonts
+properly.  Submitted to CTAN on 2 July 2009.
diff --git a/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf b/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf
index 2a3612d4006..c74657d4875 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/testdozchars.tex b/Master/texmf-dist/doc/fonts/dozenal/testdozchars.tex
index a5443d044a6..f69641426db 100644
--- a/Master/texmf-dist/doc/fonts/dozenal/testdozchars.tex
+++ b/Master/texmf-dist/doc/fonts/dozenal/testdozchars.tex
@@ -6,13 +6,14 @@
 \date{\today}
 
 \usepackage{fix-cm}
-
 \usepackage{dozenal}
 
 \begin{document}
 
 \maketitle
 
+\mainmatter
+
 \noindent
 Tiny: \\
 \tiny 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
@@ -36,13 +37,9 @@ Really, really big:  \\
 \fontsize{50pt}{65pt}\selectfont\ldots 5 6 7 8 9 \x\ \e\
 10 \\\normalsize
 
-$34\x5897\e45383\e4325$
+34\x5897\e45383\e4325
 \textbf{34\x5897\e45383\e4325}
 
-\begin{equation}
-\sum_{n = \x}
-\end{equation}
-
 \clearpage
 
 \bfseries
@@ -69,7 +66,7 @@ Really, really big:  \\
 \fontsize{50pt}{65pt}\selectfont\ldots 7 8 9 \x\ \e\
 10 \\\normalsize\normalfont
 
-$34\x5897\e45383\e4325$
+34\x5897\e45383\e4325
 \textbf{34\x5897\e45383\e4325}
 
 \clearpage
@@ -97,7 +94,7 @@ Huge: \\
 Really, really big:  \\
 \fontsize{50pt}{65pt}\selectfont\ldots 7 8 9 \x\ \e\
 10\\\normalsize\normalfont
-$34\x5897\e45383\e4325$
+34\x5897\e45383\e4325
 \textbf{\textsl{34\x5897\e45383\e4325}}
 
 \clearpage
@@ -125,7 +122,7 @@ Huge: \\
 Really, really big:  \\
 \fontsize{50pt}{65pt}\selectfont\ldots 7 8 9 \x\ \e\
 10\\\normalsize\normalfont
-$34\x5897\e45383\e4325$
+34\x5897\e45383\e4325
 \textbf{\textsl{34\x5897\e45383\e4325}}
 
 \clearpage
diff --git a/Master/texmf-dist/doc/fonts/dozenal/testfdzchars.tex b/Master/texmf-dist/doc/fonts/dozenal/testfdzchars.tex
new file mode 100644
index 00000000000..7c94180087d
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/dozenal/testfdzchars.tex
@@ -0,0 +1,181 @@
+% +AMDG
+
+\documentclass{article}
+\title{Testing Dozenal Characters for Computer Modern}
+\author{Donald P.\ Goodman III}
+\date{\today}
+
+\usepackage{fix-cm}
+\usepackage{dozenal}
+\usepackage[T1]{fontenc}
+
+\begin{document}
+
+\maketitle
+
+\noindent
+Tiny: \\
+\tiny 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Footnotesize: \\
+\footnotesize 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Small: \\
+\small 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Normalsize: \\
+\normalsize 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+large: \\
+\large 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Large: \\
+\Large 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+LARGE: \\
+\LARGE 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+huge: \\
+\huge 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Huge: \\
+\Huge 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Really, really big:  \\
+\fontsize{50pt}{65pt}\selectfont\ldots 5 6 7 8 9 \x\ \e\
+10 \\\normalsize
+
+34\x5897\e45383\e4325
+\textbf{34\x5897\e45383\e4325}
+
+\clearpage
+
+\bfseries
+\noindent
+Tiny: \\
+\tiny 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Footnotesize: \\
+\footnotesize 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Small: \\
+\small 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Normalsize: \\
+\normalsize 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+large: \\
+\large 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Large: \\
+\Large 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+LARGE: \\
+\LARGE 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+huge: \\
+\huge 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Huge: \\
+\Huge 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Really, really big:  \\
+\fontsize{50pt}{65pt}\selectfont\ldots 7 8 9 \x\ \e\
+10 \\\normalsize\normalfont
+
+34\x5897\e45383\e4325
+\textbf{34\x5897\e45383\e4325}
+
+\clearpage
+
+\slshape
+\noindent
+Tiny:\\ 
+\tiny 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Footnotesize: \\
+\footnotesize 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Small: \\
+\small 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Normalsize: \\
+\normalsize 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+large: \\
+\large 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Large: \\
+\Large 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+LARGE: \\
+\LARGE 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+huge: \\
+\huge 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Huge: \\
+\Huge 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Really, really big:  \\
+\fontsize{50pt}{65pt}\selectfont\ldots 7 8 9 \x\ \e\
+10\\\normalsize\normalfont
+34\x5897\e45383\e4325
+\textbf{\textsl{34\x5897\e45383\e4325}}
+
+\clearpage
+
+\slshape\bfseries
+\noindent
+Tiny:\\ 
+\tiny 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Footnotesize: \\
+\footnotesize 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Small: \\
+\small 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Normalsize: \\
+\normalsize 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+large: \\
+\large 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Large: \\
+\Large 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+LARGE: \\
+\LARGE 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+huge: \\
+\huge 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Huge: \\
+\Huge 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Really, really big:  \\
+\fontsize{50pt}{65pt}\selectfont\ldots 7 8 9 \x\ \e\
+10\\\normalsize\normalfont
+34\x5897\e45383\e4325
+\textbf{\textsl{34\x5897\e45383\e4325}}
+
+\clearpage
+
+\itshape
+\noindent
+Tiny:\\ 
+\tiny 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Footnotesize: \\
+\footnotesize 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Small: \\
+\small 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Normalsize: \\
+\normalsize 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+large: \\
+\large 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Large: \\
+\Large 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+LARGE: \\
+\LARGE 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+huge: \\
+\huge 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Huge: \\
+\Huge 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Really, really big:  \\
+\fontsize{50pt}{65pt}\selectfont\ldots 7 8 9 \x\ \e\
+10\\\normalsize
+\textit{7452\x578\e33\e\x567}
+
+\clearpage
+
+\itshape\bfseries
+\noindent
+Tiny:\\ 
+\tiny 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Footnotesize: \\
+\footnotesize 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Small: \\
+\small 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Normalsize: \\
+\normalsize 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+large: \\
+\large 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Large: \\
+\Large 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+LARGE: \\
+\LARGE 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+huge: \\
+\huge 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Huge: \\
+\Huge 1 2 3 4 5 6 7 8 9 \x\ \e\ 10 \\\normalsize
+Really, really big:  \\
+\fontsize{50pt}{65pt}\selectfont\ldots 8 9 \x\ \e\
+10\\\normalsize
+\textit{7452\x578\e33\e\x567}
+
+\end{document}
diff --git a/Master/texmf-dist/fonts/map/dvips/dozenal/fdz.map b/Master/texmf-dist/fonts/map/dvips/dozenal/fdz.map
new file mode 100644
index 00000000000..bee0e5ca115
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/dozenal/fdz.map
@@ -0,0 +1,7 @@
+fdzr8r fdzr8a <8r.enc <fdzr8a.pfb " TeXBase1Encoding ReEncodeFont "
+fdzro8r fdzr8a <8r.enc <fdzr8a.pfb " TeXBase1Encoding ReEncodeFont 0.167 SlantFont "
+fdzb8r fdzb8a <8r.enc <fdzb8a.pfb " TeXBase1Encoding ReEncodeFont "
+fdzbo8r fdzb8a <8r.enc <fdzb8a.pfb " TeXBase1Encoding ReEncodeFont 0.167 SlantFont "
+fdzbi8r fdzbi8a <8r.enc <fdzbi8a.pfb " TeXBase1Encoding ReEncodeFont "
+fdzs8r fdzs8a <8r.enc <fdzs8a.pfb " TeXBase1Encoding ReEncodeFont "
+fdzso8r fdzs8a <8r.enc <fdzs8a.pfb " TeXBase1Encoding ReEncodeFont 0.167 SlantFont "
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb7t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb7t.tfm
new file mode 100644
index 00000000000..1abce92673b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb7t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb8a.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb8a.tfm
new file mode 100644
index 00000000000..f49d15e4b59
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb8a.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb8c.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb8c.tfm
new file mode 100644
index 00000000000..210902360d3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb8c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb8r.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb8r.tfm
new file mode 100644
index 00000000000..908938c05d5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb8r.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb8t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb8t.tfm
new file mode 100644
index 00000000000..5e90bfe06b1
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb8t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbc7t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbc7t.tfm
new file mode 100644
index 00000000000..92a6fe6dff0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbc7t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbc8t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbc8t.tfm
new file mode 100644
index 00000000000..41db6b2485c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbc8t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi7t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi7t.tfm
new file mode 100644
index 00000000000..e0526c7ddff
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi7t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi8a.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi8a.tfm
new file mode 100644
index 00000000000..dfea9e88f7c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi8a.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi8c.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi8c.tfm
new file mode 100644
index 00000000000..210902360d3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi8c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi8r.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi8r.tfm
new file mode 100644
index 00000000000..3b17026365f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi8r.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi8t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi8t.tfm
new file mode 100644
index 00000000000..560bbedd52b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi8t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbo7t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbo7t.tfm
new file mode 100644
index 00000000000..2c12173bffd
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbo7t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbo8c.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbo8c.tfm
new file mode 100644
index 00000000000..44408393960
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbo8c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbo8r.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbo8r.tfm
new file mode 100644
index 00000000000..92daba3be82
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbo8r.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbo8t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbo8t.tfm
new file mode 100644
index 00000000000..0ef8f05deff
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbo8t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbs8a.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbs8a.tfm
new file mode 100644
index 00000000000..235d9f35d4c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbs8a.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzi8a.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzi8a.tfm
new file mode 100644
index 00000000000..39f4050b3c5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzi8a.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr7t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr7t.tfm
new file mode 100644
index 00000000000..a7014ef0a9d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr7t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr8a.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr8a.tfm
new file mode 100644
index 00000000000..f8583d12267
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr8a.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr8c.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr8c.tfm
new file mode 100644
index 00000000000..210902360d3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr8c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr8r.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr8r.tfm
new file mode 100644
index 00000000000..955f15e40b0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr8r.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr8t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr8t.tfm
new file mode 100644
index 00000000000..c3795aadbee
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr8t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzrc7t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzrc7t.tfm
new file mode 100644
index 00000000000..b0bdb0bc72c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzrc7t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzrc8t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzrc8t.tfm
new file mode 100644
index 00000000000..cd697318eb6
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzrc8t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzro7t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzro7t.tfm
new file mode 100644
index 00000000000..a7c9a9b9946
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzro7t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzro8c.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzro8c.tfm
new file mode 100644
index 00000000000..44408393960
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzro8c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzro8r.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzro8r.tfm
new file mode 100644
index 00000000000..e098714c229
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzro8r.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzro8t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzro8t.tfm
new file mode 100644
index 00000000000..547be7f7392
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzro8t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs7t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs7t.tfm
new file mode 100644
index 00000000000..c87dd36ece4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs7t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs8a.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs8a.tfm
new file mode 100644
index 00000000000..722a4f506b1
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs8a.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs8c.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs8c.tfm
new file mode 100644
index 00000000000..210902360d3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs8c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs8r.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs8r.tfm
new file mode 100644
index 00000000000..844559ec874
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs8r.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs8t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs8t.tfm
new file mode 100644
index 00000000000..7e505ffb794
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs8t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzsc7t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzsc7t.tfm
new file mode 100644
index 00000000000..6c7c578ab95
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzsc7t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzsc8t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzsc8t.tfm
new file mode 100644
index 00000000000..33c9c796aea
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzsc8t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzso7t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzso7t.tfm
new file mode 100644
index 00000000000..93019e28081
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzso7t.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzso8c.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzso8c.tfm
new file mode 100644
index 00000000000..44408393960
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzso8c.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzso8r.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzso8r.tfm
new file mode 100644
index 00000000000..b98cd6659f8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzso8r.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzso8t.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzso8t.tfm
new file mode 100644
index 00000000000..886512446dd
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzso8t.tfm
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/fdzb8a.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/fdzb8a.pfb
new file mode 100644
index 00000000000..eb74767334b
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/fdzb8a.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/fdzbi8a.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/fdzbi8a.pfb
new file mode 100644
index 00000000000..57d3da01367
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/fdzbi8a.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/fdzbs8a.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/fdzbs8a.pfb
new file mode 100644
index 00000000000..0f62d3c8e3c
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/fdzbs8a.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/fdzi8a.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/fdzi8a.pfb
new file mode 100644
index 00000000000..9dd7d2c3b37
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/fdzi8a.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/fdzr8a.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/fdzr8a.pfb
new file mode 100644
index 00000000000..a2b8613785d
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/fdzr8a.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/fdzs8a.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/fdzs8a.pfb
new file mode 100644
index 00000000000..2d87e02285f
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/fdzs8a.pfb
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzb7t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzb7t.vf
new file mode 100644
index 00000000000..a44ce1b3b22
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzb7t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzb8c.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzb8c.vf
new file mode 100644
index 00000000000..bbc07db63dd
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzb8c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzb8t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzb8t.vf
new file mode 100644
index 00000000000..048c1b38d5e
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzb8t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzbc7t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzbc7t.vf
new file mode 100644
index 00000000000..960e9d93b70
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzbc7t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzbc8t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzbc8t.vf
new file mode 100644
index 00000000000..26a7a8922da
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzbc8t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzbi7t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzbi7t.vf
new file mode 100644
index 00000000000..3a013f32563
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzbi7t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzbi8c.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzbi8c.vf
new file mode 100644
index 00000000000..bbc07db63dd
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzbi8c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzbi8t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzbi8t.vf
new file mode 100644
index 00000000000..b989c30c441
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzbi8t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzbo7t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzbo7t.vf
new file mode 100644
index 00000000000..b612ad5c1eb
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzbo7t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzbo8c.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzbo8c.vf
new file mode 100644
index 00000000000..72d060a1a2b
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzbo8c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzbo8t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzbo8t.vf
new file mode 100644
index 00000000000..7714b403ab1
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzbo8t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzr7t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzr7t.vf
new file mode 100644
index 00000000000..d6bfa06f170
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzr7t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzr8c.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzr8c.vf
new file mode 100644
index 00000000000..bbc07db63dd
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzr8c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzr8t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzr8t.vf
new file mode 100644
index 00000000000..4785e3a7cca
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzr8t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzrc7t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzrc7t.vf
new file mode 100644
index 00000000000..a1e0f08a3b7
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzrc7t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzrc8t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzrc8t.vf
new file mode 100644
index 00000000000..4c5727ca7e9
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzrc8t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzro7t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzro7t.vf
new file mode 100644
index 00000000000..308a0d6d11b
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzro7t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzro8c.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzro8c.vf
new file mode 100644
index 00000000000..72d060a1a2b
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzro8c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzro8t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzro8t.vf
new file mode 100644
index 00000000000..2c373e82074
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzro8t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzs7t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzs7t.vf
new file mode 100644
index 00000000000..1aef7c08518
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzs7t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzs8c.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzs8c.vf
new file mode 100644
index 00000000000..bbc07db63dd
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzs8c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzs8t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzs8t.vf
new file mode 100644
index 00000000000..30c57f142e2
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzs8t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzsc7t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzsc7t.vf
new file mode 100644
index 00000000000..61601b5ff64
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzsc7t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzsc8t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzsc8t.vf
new file mode 100644
index 00000000000..ffe83c4bf9f
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzsc8t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzso7t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzso7t.vf
new file mode 100644
index 00000000000..34c28792340
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzso7t.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzso8c.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzso8c.vf
new file mode 100644
index 00000000000..72d060a1a2b
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzso8c.vf
diff --git a/Master/texmf-dist/fonts/vf/public/dozenal/fdzso8t.vf b/Master/texmf-dist/fonts/vf/public/dozenal/fdzso8t.vf
new file mode 100644
index 00000000000..67f5fc711c6
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/dozenal/fdzso8t.vf
diff --git a/Master/texmf-dist/tex/latex/dozenal/dozenal.sty b/Master/texmf-dist/tex/latex/dozenal/dozenal.sty
index 1bdb6e114f6..4e935b0a465 100644
--- a/Master/texmf-dist/tex/latex/dozenal/dozenal.sty
+++ b/Master/texmf-dist/tex/latex/dozenal/dozenal.sty
@@ -1,4 +1,4 @@
-% \iffalse
+%\iffalse
 % +AMDG  This document 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
@@ -27,8 +27,26 @@
 % dozchbx10.mf, dozchbx12.mf, dozchit7.mf, dozchit8.mf, 
 % dozchit9.mf, dozchit10.mf, dozchit12.mf, dozchbxi10.mf, 
 % dozchbxsl10.mf, dozenal.mf, dozenalb.mf, dozenali.mf, 
-% testdozchars.tex, dozenal.sty, and dozenal.pdf, along with 
-% the README.
+% fdzb8a.pfb, fdzbi8a.pfb, fdzbs8a.pfb, fdzi8a.pfb,
+% fdzr8a.pfb, fdzs8a.pfb, fdz.map, , fdzb7t.tfm, fdzb8a.tfm,
+% fdzb8c.tfm, fdzb8r.tfm, fdzb8t.tfm, fdzbc7t.tfm,
+% fdzbc8t.tfm, fdzbi7t.tfm, fdzbi8a.tfm, fdzbi8c.tfm,
+% fdzbi8r.tfm, fdzbi8t.tfm, fdzbo7t.tfm, fdzbo8c.tfm,
+% fdzbo8r.tfm, fdzbo8t.tfm, fdzbs8a.tfm, fdzi8a.tfm,
+% fdzr7t.tfm, fdzr8a.tfm, fdzr8c.tfm, fdzr8r.tfm, fdzr8t.tfm,
+% fdzrc7t.tfm, fdzrc8t.tfm, fdzro7t.tfm, fdzro8c.tfm,
+% fdzro8r.tfm, fdzro8t.tfm, fdzs7t.tfm, fdzs8a.tfm,
+% fdzs8c.tfm, fdzs8r.tfm, fdzs8t.tfm, fdzsc7t.tfm,
+% fdzsc8t.tfm, fdzso7t.tfm, fdzso8c.tfm, fdzso8r.tfm,
+% fdzso8t.tfm,, fdzb7t.vf, fdzb8c.vf, fdzb8t.vf, fdzbc7t.vf,
+% fdzbc8t.vf, fdzbi7t.vf, fdzbi8c.vf, fdzbi8t.vf, fdzbo7t.vf,
+% fdzbo8c.vf, fdzbo8t.vf, fdzr7t.vf, fdzr8c.vf, fdzr8t.vf,
+% fdzrc7t.vf, fdzrc8t.vf, fdzro7t.vf, fdzro8c.vf, fdzro8t.vf,
+% fdzs7t.vf, fdzs8c.vf, fdzs8t.vf, fdzsc7t.vf, fdzsc8t.vf,
+% fdzso7t.vf, fdzso8c.vf, fdzso8t.vf, testfdzchars.tex,
+% testdozchars.tex, dozenal.sty, and dozenal.pdf, along with
+% this README.
+% 
 % \fi
 %
 % \maketitle
@@ -40,8 +58,10 @@
 % decimal numbers into dozenal, and provides new, real
 % Metafont characters for ten and eleven, though the
 % commands for producing them can be redefined to produce
-% any figure.  This package uses the |\basexii| algorithm 
-% by David Kastrup.
+% any figure.  As of v2.0, it also includes Type 1 versions
+% of the fonts, used automatically whenever T1 encoding is
+% selected for the document.  This package uses the |\basexii| 
+% algorithm by David Kastrup.
 % \end{abstract}
 % 
 % \tableofcontents
@@ -189,13 +209,12 @@
 \DeclareFontShape{OT1}{dozch}{m}{it}{<-7> dozchit7 <8> dozchit8 <9> dozchit9 <10-11> dozchit10 <12-> dozchit12 }{}
 \DeclareFontShape{OT1}{dozch}{bx}{it}{<-> dozchbxi10 }{}
 \DeclareFontFamily{T1}{dozch}{}
-\DeclareFontShape{T1}{dozch}{m}{n}{<-7> dozchars6 <7> dozchars7 <8> dozchars8 <9> dozchars9 <10-11> dozchars10 <12-16> dozchars12 <17-> dozchars17  }{}
-\DeclareFontShape{T1}{dozch}{b}{n}{<-> dozchb10 }{}
-\DeclareFontShape{T1}{dozch}{bx}{n}{<-6> dozchbx6 <7> dozchbx7 <8> dozchbx8 <9> dozchbx9 <10-11> dozchbx10 <12-> dozchbx12 }{}
-\DeclareFontShape{T1}{dozch}{m}{sl}{<-8> dozchsl8 <9> dozchsl9 <10-11> dozchsl10 <12-> dozchsl12 }{}
-\DeclareFontShape{T1}{dozch}{bx}{sl}{<-> dozchbxsl10 }{}
-\DeclareFontShape{T1}{dozch}{m}{it}{<-7> dozchit7 <8> dozchit8 <9> dozchit9 <10-11> dozchit10 <12-> dozchit12 }{}
-\DeclareFontShape{T1}{dozch}{bx}{it}{<-> dozchbxi10 }{}
+\DeclareFontShape{T1}{dozch}{m}{n}{<-> fdzr8r  }{}
+\DeclareFontShape{T1}{dozch}{bx}{n}{<-> fdzb8r }{}
+\DeclareFontShape{T1}{dozch}{m}{sl}{<-> fdzs8r }{}
+\DeclareFontShape{T1}{dozch}{bx}{sl}{<-> fdzbo8r }{}
+\DeclareFontShape{T1}{dozch}{m}{it}{<-> fdzso8r }{}
+\DeclareFontShape{T1}{dozch}{bx}{it}{<-> fdzbi8r }{}
 \newcommand\doz[1]{{\fontfamily{dozch}\selectfont #1}}
 \newcommand\x{\TextOrMath{\protect\doz{{X}}}{\X}}%
 \newcommand\e{\TextOrMath{\protect\doz{{E}}}{\E}}%