summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-06-29 00:14:57 +0000
committerKarl Berry <karl@freefriends.org>2015-06-29 00:14:57 +0000
commita11217252edfb77b9feb9901511e71ec21c90665 (patch)
tree3c686e4e2a7483a5b7a6d15508b3916e32f62f1a /Master
parent6215934e06b2e5d056857ea1147e2c6210d2dfdf (diff)
dozenal (28jun15)
git-svn-id: svn://tug.org/texlive/trunk@37698 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/fonts/dozenal/CHANGES118
-rw-r--r--Master/texmf-dist/doc/fonts/dozenal/dozenal.pdfbin292846 -> 306055 bytes
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchars10.afm16
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchars12.afm16
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchars17.afm16
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchars6.afm16
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchars7.afm16
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchars8.afm16
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchars9.afm16
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchb10.afm2
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchbx10.afm2
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchbx12.afm2
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchbx5.afm2
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchbx6.afm2
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchbx7.afm2
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchbx8.afm2
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchbx9.afm2
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchbxi10.afm16
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchbxsl10.afm2
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchit10.afm16
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchit12.afm16
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchit7.afm16
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchit8.afm16
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchit9.afm16
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchsl10.afm16
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchsl12.afm16
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchsl8.afm16
-rw-r--r--Master/texmf-dist/fonts/afm/public/dozenal/dozchsl9.afm16
-rw-r--r--Master/texmf-dist/fonts/source/public/dozenal/dozenal.mf18
-rw-r--r--Master/texmf-dist/fonts/source/public/dozenal/dozenali.mf204
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchars10.pfbbin3666 -> 3646 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchars12.pfbbin3629 -> 8417 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchars17.pfbbin8485 -> 8441 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchars6.pfbbin8527 -> 8556 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchars7.pfbbin8509 -> 8486 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchars8.pfbbin8480 -> 8475 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchars9.pfbbin8480 -> 8484 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchb10.pfbbin8457 -> 8457 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchbx10.pfbbin8598 -> 8598 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchbx12.pfbbin8395 -> 8395 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchbx5.pfbbin40067 -> 40067 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchbx6.pfbbin8552 -> 8552 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchbx7.pfbbin8514 -> 8514 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchbx8.pfbbin8461 -> 8461 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchbx9.pfbbin8563 -> 8563 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchbxi10.pfbbin8848 -> 9867 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchbxsl10.pfbbin8758 -> 8758 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchit10.pfbbin3981 -> 5097 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchit12.pfbbin8776 -> 9973 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchit7.pfbbin4051 -> 5029 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchit8.pfbbin8757 -> 10001 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchit9.pfbbin4055 -> 5043 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchsl10.pfbbin8651 -> 8728 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchsl12.pfbbin8596 -> 8661 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchsl8.pfbbin8611 -> 8694 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/dozenal/dozchsl9.pfbbin8682 -> 3901 bytes
-rw-r--r--Master/texmf-dist/source/fonts/dozenal/dozenal.dtx423
-rw-r--r--Master/texmf-dist/tex/latex/dozenal/dozenal.sty217
58 files changed, 881 insertions, 389 deletions
diff --git a/Master/texmf-dist/doc/fonts/dozenal/CHANGES b/Master/texmf-dist/doc/fonts/dozenal/CHANGES
index 660c3917501..7beee9b10f1 100644
--- a/Master/texmf-dist/doc/fonts/dozenal/CHANGES
+++ b/Master/texmf-dist/doc/fonts/dozenal/CHANGES
@@ -1,37 +1,42 @@
-For version 1.1, minor bugs, in which section and subsection
-numbers were not properly redefined, have been fixed.
+For version 6.0, added the "\doznumtowords" macro, which
+will take a counter and output it in dozenal words. Which
+words it uses can be customized; I have made no attempt to
+internationalize this will different languages, because I
+haven't the foggiest how to do so other than simply writing
+option packs with different definitions in them. Also did a
+complete rewrite of |\basex|, so its workings are now
+(almost) comprehensible. Finally, darkened the tally marks
+and put in hand-written italic shapes.
-For version 1.2, support for using dozenal characters in
-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 5.3, removed a conflict with another package
+that defined an "\X" and "\E" command by adding a "doz@"
+prefix to these. Also made the tally marks work with the
+Type1 fonts.
-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.
+For version 5.2, removed some contradiction in the code about
+version numbers. Completely redid the conversions to Type1
+fonts, so now they work consistently. Did away with the
+"fdz" prefix for these. Substantially reworked the
+documentation.
-For version 3.0, I was kindly informed that my \x was
-actually a backwards Pitman ten; so I fixed that, which
-included redrawing the italics font (the rest were simply
-mirrored). Also, made the version numbers "real" by
-including them in the \ProvidesPackage command; thanks to
-Robin Fairbairns for telling me to.
+For version 5.1, and four files had CRLF line endings; also,
+the version was incorrectly reported in the \ProvidesPackage
+line. These problems are now fixed.
-For version 3.1, I've updated things to allow TeXLive to
-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 5.0, the documentation and code structure was
+substantially cleansed, and a git repository was created for
+the package. I've also added the appropriate fontdimens to
+the font files, so that microtype won't complain about them.
+Finally, I've added \basex, a macro which will convert
+dozenal numbers to base X, but doesn't work on counters,
+which is frustrating.
-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.
+For version 4.0, I've included the tally mark characters, as
+well, for whatever they may be worth. The documentation
+also now contains examples of the characters. Finally,
+there's also an option to make available the dozenal
+characters without dozenalizing every counter. Submitted to
+CTAN on 17 May 11E9 (decimal 19 May 2013).
For version 3.3, I was kindly notified by Karl Berry that
the Type 1 italic TFM wasn't properly formed; I switched
@@ -39,32 +44,37 @@ from mftrace to mf2pt1 for converting from Metafont, and
this seems to have resolved the problem. Submitted to CTAN
on 3 Nov 11E8 (decimal 2012).
-For version 4.0, I've included the tally mark characters, as
-well, for whatever they may be worth. The documentation
-also now contains examples of the characters. Finally,
-there's also an option to make available the dozenal
-characters without dozenalizing every counter. Submitted to
-CTAN on 17 May 11E9 (decimal 19 May 2013).
+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.
-For version 5.0, the documentation and code structure was
-substantially cleansed, and a git repository was created for
-the package. I've also added the appropriate fontdimens to
-the font files, so that microtype won't complain about them.
-Finally, I've added \basex, a macro which will convert
-dozenal numbers to base X, but doesn't work on counters,
-which is frustrating.
+For version 3.1, I've updated things to allow TeXLive to
+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 5.1, and four files had CRLF line endings; also,
-the version was incorrectly reported in the \ProvidesPackage
-line. These problems are now fixed.
+For version 3.0, I was kindly informed that my \x was
+actually a backwards Pitman ten; so I fixed that, which
+included redrawing the italics font (the rest were simply
+mirrored). Also, made the version numbers "real" by
+including them in the \ProvidesPackage command; thanks to
+Robin Fairbairns for telling me to.
-For version 5.2, removed some contradiction in the code about
-version numbers. Completely redid the conversions to Type1
-fonts, so now they work consistently. Did away with the
-"fdz" prefix for these. Substantially reworked the
-documentation.
+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.
-For version 5.3, removed a conflict with some another package
-that defined an "\X" and "\E" command by adding a "doz@"
-prefix to these. Also made the tally marks work with the
-Type1 fonts.
+For version 1.3, \mainmatter's slaughter of the dozenal
+counter redefinitions was stopped. Submitted to CTAN on 20
+June 2009.
+
+For version 1.2, support for using dozenal characters in
+math mode was added. Submitted to CTAN on 6 June 2009.
+
+For version 1.1, 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 7f590d022ae..9d96bef5a6d 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/afm/public/dozenal/dozchars10.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchars10.afm
index ca3567680bc..8443a676868 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchars10.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchars10.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:17:37 2015
+Comment Creation Date: Sat Jun 27 10:57:11 2015
FontName dozchars10
FullName dozchars10
FamilyName dozchars10
@@ -12,15 +12,15 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 19 -25 625 669
+FontBBox 3 -42 641 687
CapHeight 655
StartCharMetrics 8
-C 49 ; WX 500 ; N one ; B 247 -25 253 669 ;
-C 50 ; WX 700 ; N two ; B 19 -25 625 669 ;
-C 51 ; WX 700 ; N three ; B 53 -25 625 669 ;
-C 52 ; WX 700 ; N four ; B 53 -25 625 669 ;
-C 53 ; WX 700 ; N five ; B 53 -25 625 669 ;
-C 54 ; WX 700 ; N six ; B 53 -25 625 669 ;
+C 49 ; WX 500 ; N one ; B 231 -42 270 686 ;
+C 50 ; WX 700 ; N two ; B 3 -42 641 686 ;
+C 51 ; WX 700 ; N three ; B 36 -42 641 687 ;
+C 52 ; WX 700 ; N four ; B 36 -42 641 686 ;
+C 53 ; WX 700 ; N five ; B 36 -42 641 686 ;
+C 54 ; WX 700 ; N six ; B 36 -42 641 686 ;
C 69 ; WX 500 ; N E ; B 32 -22 446 666 ;
C 88 ; WX 500 ; N X ; B 53 -22 445 655 ;
EndCharMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchars12.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchars12.afm
index 5b3efb18463..417e999ae47 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchars12.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchars12.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:17:40 2015
+Comment Creation Date: Sat Jun 27 10:57:13 2015
FontName dozchars12
FullName dozchars12
FamilyName dozchars12
@@ -12,15 +12,15 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 18 -24 626 668
+FontBBox 2 -40 642 684
CapHeight 654
StartCharMetrics 8
-C 49 ; WX 490 ; N one ; B 242 -24 248 668 ;
-C 50 ; WX 699 ; N two ; B 18 -24 626 668 ;
-C 51 ; WX 699 ; N three ; B 51 -24 626 668 ;
-C 52 ; WX 699 ; N four ; B 51 -24 626 668 ;
-C 53 ; WX 699 ; N five ; B 51 -24 626 668 ;
-C 54 ; WX 699 ; N six ; B 51 -24 626 668 ;
+C 49 ; WX 490 ; N one ; B 226 -40 264 684 ;
+C 50 ; WX 699 ; N two ; B 2 -40 642 684 ;
+C 51 ; WX 699 ; N three ; B 35 -40 642 684 ;
+C 52 ; WX 699 ; N four ; B 35 -40 642 684 ;
+C 53 ; WX 699 ; N five ; B 35 -40 642 684 ;
+C 54 ; WX 699 ; N six ; B 35 -40 642 684 ;
C 69 ; WX 490 ; N E ; B 33 -21 437 665 ;
C 88 ; WX 490 ; N X ; B 52 -21 436 654 ;
EndCharMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchars17.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchars17.afm
index 4586b2a3612..aa46f1a4815 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchars17.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchars17.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:17:42 2015
+Comment Creation Date: Sat Jun 27 10:57:15 2015
FontName dozchars17
FullName dozchars17
FamilyName dozchars17
@@ -12,15 +12,15 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 13 -19 632 664
+FontBBox -2 -35 647 681
CapHeight 653
StartCharMetrics 8
-C 49 ; WX 470 ; N one ; B 232 -19 238 664 ;
-C 50 ; WX 697 ; N two ; B 13 -19 632 664 ;
-C 51 ; WX 697 ; N three ; B 49 -19 632 664 ;
-C 52 ; WX 697 ; N four ; B 49 -19 632 664 ;
-C 53 ; WX 697 ; N five ; B 49 -19 632 664 ;
-C 54 ; WX 697 ; N six ; B 49 -19 632 664 ;
+C 49 ; WX 470 ; N one ; B 217 -35 254 680 ;
+C 50 ; WX 697 ; N two ; B -2 -35 647 680 ;
+C 51 ; WX 697 ; N three ; B 34 -35 647 681 ;
+C 52 ; WX 697 ; N four ; B 34 -35 647 680 ;
+C 53 ; WX 697 ; N five ; B 34 -35 647 680 ;
+C 54 ; WX 697 ; N six ; B 34 -35 647 680 ;
C 69 ; WX 470 ; N E ; B 36 -16 422 661 ;
C 88 ; WX 470 ; N X ; B 51 -17 418 653 ;
EndCharMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchars6.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchars6.afm
index 76ddce58171..6b2a5b5a92b 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchars6.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchars6.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:17:45 2015
+Comment Creation Date: Sat Jun 27 10:57:17 2015
FontName dozchars6
FullName dozchars6
FamilyName dozchars6
@@ -12,15 +12,15 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 18 -24 626 668
+FontBBox -2 -44 646 689
CapHeight 654
StartCharMetrics 8
-C 49 ; WX 583 ; N one ; B 289 -24 295 668 ;
-C 50 ; WX 709 ; N two ; B 18 -24 626 668 ;
-C 51 ; WX 709 ; N three ; B 62 -24 626 668 ;
-C 52 ; WX 709 ; N four ; B 62 -24 626 668 ;
-C 53 ; WX 709 ; N five ; B 62 -24 626 668 ;
-C 54 ; WX 709 ; N six ; B 62 -24 626 668 ;
+C 49 ; WX 583 ; N one ; B 269 -44 315 688 ;
+C 50 ; WX 709 ; N two ; B -2 -44 646 688 ;
+C 51 ; WX 709 ; N three ; B 42 -44 646 689 ;
+C 52 ; WX 709 ; N four ; B 42 -44 646 688 ;
+C 53 ; WX 709 ; N five ; B 42 -44 646 688 ;
+C 54 ; WX 709 ; N six ; B 42 -44 646 688 ;
C 69 ; WX 583 ; N E ; B 44 -21 519 665 ;
C 88 ; WX 583 ; N X ; B 63 -21 518 654 ;
EndCharMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchars7.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchars7.afm
index 96bb81b5fc2..d09168bd89b 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchars7.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchars7.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:17:48 2015
+Comment Creation Date: Sat Jun 27 10:57:19 2015
FontName dozchars7
FullName dozchars7
FamilyName dozchars7
@@ -12,15 +12,15 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 17 -23 627 667
+FontBBox -2 -41 646 685
CapHeight 654
StartCharMetrics 8
-C 49 ; WX 554 ; N one ; B 274 -23 280 667 ;
-C 50 ; WX 706 ; N two ; B 17 -23 627 667 ;
-C 51 ; WX 706 ; N three ; B 59 -23 627 667 ;
-C 52 ; WX 706 ; N four ; B 59 -23 627 667 ;
-C 53 ; WX 706 ; N five ; B 59 -23 627 667 ;
-C 54 ; WX 706 ; N six ; B 59 -23 627 667 ;
+C 49 ; WX 554 ; N one ; B 256 -41 299 685 ;
+C 50 ; WX 706 ; N two ; B -2 -41 646 685 ;
+C 51 ; WX 706 ; N three ; B 40 -41 646 685 ;
+C 52 ; WX 706 ; N four ; B 40 -41 646 685 ;
+C 53 ; WX 706 ; N five ; B 40 -41 646 685 ;
+C 54 ; WX 706 ; N six ; B 40 -41 646 685 ;
C 69 ; WX 554 ; N E ; B 41 -20 493 664 ;
C 88 ; WX 554 ; N X ; B 61 -20 492 654 ;
EndCharMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchars8.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchars8.afm
index 8b72c6cb604..51ed68a48a6 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchars8.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchars8.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:17:50 2015
+Comment Creation Date: Sat Jun 27 10:57:21 2015
FontName dozchars8
FullName dozchars8
FamilyName dozchars8
@@ -12,15 +12,15 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 18 -24 626 668
+FontBBox 0 -42 644 687
CapHeight 654
StartCharMetrics 8
-C 49 ; WX 531 ; N one ; B 263 -24 269 668 ;
-C 50 ; WX 703 ; N two ; B 18 -24 626 668 ;
-C 51 ; WX 703 ; N three ; B 56 -24 626 668 ;
-C 52 ; WX 703 ; N four ; B 56 -24 626 668 ;
-C 53 ; WX 703 ; N five ; B 56 -24 626 668 ;
-C 54 ; WX 703 ; N six ; B 56 -24 626 668 ;
+C 49 ; WX 531 ; N one ; B 245 -42 287 686 ;
+C 50 ; WX 703 ; N two ; B 0 -42 644 686 ;
+C 51 ; WX 703 ; N three ; B 38 -42 644 687 ;
+C 52 ; WX 703 ; N four ; B 38 -42 644 686 ;
+C 53 ; WX 703 ; N five ; B 38 -42 644 686 ;
+C 54 ; WX 703 ; N six ; B 38 -42 644 686 ;
C 69 ; WX 531 ; N E ; B 37 -21 473 665 ;
C 88 ; WX 531 ; N X ; B 57 -21 472 654 ;
EndCharMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchars9.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchars9.afm
index 77b5969675f..b8929fd94e1 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchars9.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchars9.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:17:53 2015
+Comment Creation Date: Sat Jun 27 10:57:23 2015
FontName dozchars9
FullName dozchars9
FamilyName dozchars9
@@ -12,15 +12,15 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 19 -25 625 669
+FontBBox 2 -42 642 686
CapHeight 655
StartCharMetrics 8
-C 49 ; WX 514 ; N one ; B 254 -25 260 669 ;
-C 50 ; WX 702 ; N two ; B 19 -25 625 669 ;
-C 51 ; WX 702 ; N three ; B 54 -25 625 669 ;
-C 52 ; WX 702 ; N four ; B 54 -25 625 669 ;
-C 53 ; WX 702 ; N five ; B 54 -25 625 669 ;
-C 54 ; WX 702 ; N six ; B 54 -25 625 669 ;
+C 49 ; WX 514 ; N one ; B 237 -42 277 686 ;
+C 50 ; WX 702 ; N two ; B 2 -42 642 686 ;
+C 51 ; WX 702 ; N three ; B 37 -42 642 686 ;
+C 52 ; WX 702 ; N four ; B 37 -42 642 686 ;
+C 53 ; WX 702 ; N five ; B 37 -42 642 686 ;
+C 54 ; WX 702 ; N six ; B 37 -42 642 686 ;
C 69 ; WX 514 ; N E ; B 34 -21 457 666 ;
C 88 ; WX 514 ; N X ; B 55 -23 457 655 ;
EndCharMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchb10.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchb10.afm
index 274d63adab6..3fee446f259 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchb10.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchb10.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:17:55 2015
+Comment Creation Date: Sat Jun 27 10:57:25 2015
FontName dozchb10
FullName dozchb10
FamilyName dozchb10
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx10.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx10.afm
index 727fd8f14f6..2a24f2aa93b 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx10.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx10.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:17:58 2015
+Comment Creation Date: Sat Jun 27 10:57:28 2015
FontName dozchbx10
FullName dozchbx10
FamilyName dozchbx10
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx12.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx12.afm
index 8c474d5c292..9907c996242 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx12.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx12.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:18:00 2015
+Comment Creation Date: Sat Jun 27 10:57:30 2015
FontName dozchbx12
FullName dozchbx12
FamilyName dozchbx12
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx5.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx5.afm
index 34301764f2e..5da756cc0ff 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx5.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx5.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:18:12 2015
+Comment Creation Date: Sat Jun 27 10:57:42 2015
FontName dozchbx5
FullName dozchbx5
FamilyName dozchbx5
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx6.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx6.afm
index 0e8f5b8d1fb..13d69e34da6 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx6.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx6.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:18:14 2015
+Comment Creation Date: Sat Jun 27 10:57:44 2015
FontName dozchbx6
FullName dozchbx6
FamilyName dozchbx6
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx7.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx7.afm
index f1aadd44775..80fbad54b0c 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx7.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx7.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:18:17 2015
+Comment Creation Date: Sat Jun 27 10:57:46 2015
FontName dozchbx7
FullName dozchbx7
FamilyName dozchbx7
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx8.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx8.afm
index 85d35d53a5f..fbc79aa2422 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx8.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx8.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:18:19 2015
+Comment Creation Date: Sat Jun 27 10:57:48 2015
FontName dozchbx8
FullName dozchbx8
FamilyName dozchbx8
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx9.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx9.afm
index 1ad78781f02..33a1b8649e5 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx9.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchbx9.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:18:21 2015
+Comment Creation Date: Sat Jun 27 10:57:50 2015
FontName dozchbx9
FullName dozchbx9
FamilyName dozchbx9
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchbxi10.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchbxi10.afm
index ba454179190..f9ff90c093d 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchbxi10.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchbxi10.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:18:24 2015
+Comment Creation Date: Sat Jun 27 10:57:52 2015
FontName dozchbxi10
FullName dozchbxi10
FamilyName dozchbxi10
@@ -12,15 +12,15 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 10 -37 795 686
+FontBBox -11 -48 875 692
CapHeight 683
StartCharMetrics 8
-C 49 ; WX 530 ; N one ; B 258 -20 433 664 ;
-C 50 ; WX 703 ; N two ; B 10 -20 626 664 ;
-C 51 ; WX 703 ; N three ; B 52 -20 795 664 ;
-C 52 ; WX 703 ; N four ; B 52 -20 795 664 ;
-C 53 ; WX 703 ; N five ; B 52 -20 795 664 ;
-C 54 ; WX 703 ; N six ; B 52 -20 795 664 ;
+C 49 ; WX 530 ; N one ; B 253 -27 470 692 ;
+C 50 ; WX 703 ; N two ; B -11 -48 694 691 ;
+C 51 ; WX 703 ; N three ; B -11 -48 859 691 ;
+C 52 ; WX 703 ; N four ; B -11 -48 875 691 ;
+C 53 ; WX 703 ; N five ; B -11 -48 875 692 ;
+C 54 ; WX 703 ; N six ; B -11 -48 875 692 ;
C 69 ; WX 530 ; N E ; B 31 -37 632 681 ;
C 88 ; WX 530 ; N X ; B 94 0 636 686 ;
EndCharMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchbxsl10.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchbxsl10.afm
index da87e9e9fb5..968d6d37013 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchbxsl10.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchbxsl10.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:18:27 2015
+Comment Creation Date: Sat Jun 27 10:57:54 2015
FontName dozchbxsl10
FullName dozchbxsl10
FamilyName dozchbxsl10
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchit10.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchit10.afm
index be18246df87..4417a0a0514 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchit10.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchit10.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:18:29 2015
+Comment Creation Date: Sat Jun 27 10:57:56 2015
FontName dozchit10
FullName dozchit10
FamilyName dozchit10
@@ -12,15 +12,15 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 14 -27 791 672
+FontBBox -3 -49 860 693
CapHeight 671
StartCharMetrics 8
-C 49 ; WX 460 ; N one ; B 222 -25 399 669 ;
-C 50 ; WX 696 ; N two ; B 14 -25 619 669 ;
-C 51 ; WX 696 ; N three ; B 43 -25 791 669 ;
-C 52 ; WX 696 ; N four ; B 43 -25 791 669 ;
-C 53 ; WX 696 ; N five ; B 43 -25 791 669 ;
-C 54 ; WX 696 ; N six ; B 43 -25 791 669 ;
+C 49 ; WX 460 ; N one ; B 218 -31 430 693 ;
+C 50 ; WX 696 ; N two ; B -3 -49 679 693 ;
+C 51 ; WX 696 ; N three ; B -3 -49 847 693 ;
+C 52 ; WX 696 ; N four ; B -3 -49 860 693 ;
+C 53 ; WX 696 ; N five ; B -3 -49 860 693 ;
+C 54 ; WX 696 ; N six ; B -3 -49 860 693 ;
C 69 ; WX 460 ; N E ; B 43 -27 565 671 ;
C 88 ; WX 460 ; N X ; B 99 -1 575 672 ;
EndCharMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchit12.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchit12.afm
index b89a206fc65..e3e55f1ef21 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchit12.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchit12.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:18:32 2015
+Comment Creation Date: Sat Jun 27 10:57:58 2015
FontName dozchit12
FullName dozchit12
FamilyName dozchit12
@@ -12,15 +12,15 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 13 -25 792 669
+FontBBox -4 -47 859 691
CapHeight 668
StartCharMetrics 8
-C 49 ; WX 450 ; N one ; B 217 -24 394 668 ;
-C 50 ; WX 694 ; N two ; B 13 -24 621 668 ;
-C 51 ; WX 694 ; N three ; B 42 -24 792 668 ;
-C 52 ; WX 694 ; N four ; B 42 -24 792 668 ;
-C 53 ; WX 694 ; N five ; B 42 -24 792 668 ;
-C 54 ; WX 694 ; N six ; B 42 -24 792 668 ;
+C 49 ; WX 450 ; N one ; B 213 -30 425 691 ;
+C 50 ; WX 694 ; N two ; B -4 -47 678 691 ;
+C 51 ; WX 694 ; N three ; B -4 -47 846 691 ;
+C 52 ; WX 694 ; N four ; B -4 -47 859 691 ;
+C 53 ; WX 694 ; N five ; B -4 -47 859 691 ;
+C 54 ; WX 694 ; N six ; B -4 -47 859 691 ;
C 69 ; WX 450 ; N E ; B 46 -25 556 668 ;
C 88 ; WX 450 ; N X ; B 98 0 566 669 ;
EndCharMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchit7.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchit7.afm
index 60886ae3d5e..a92a364618e 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchit7.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchit7.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:18:35 2015
+Comment Creation Date: Sat Jun 27 10:58:00 2015
FontName dozchit7
FullName dozchit7
FamilyName dozchit7
@@ -12,15 +12,15 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 12 -33 793 676
+FontBBox -8 -51 872 695
CapHeight 675
StartCharMetrics 8
-C 49 ; WX 529 ; N one ; B 257 -22 433 666 ;
-C 50 ; WX 703 ; N two ; B 12 -23 622 667 ;
-C 51 ; WX 703 ; N three ; B 51 -23 793 667 ;
-C 52 ; WX 703 ; N four ; B 51 -23 793 667 ;
-C 53 ; WX 703 ; N five ; B 51 -23 793 667 ;
-C 54 ; WX 703 ; N six ; B 51 -23 793 667 ;
+C 49 ; WX 529 ; N one ; B 252 -29 470 695 ;
+C 50 ; WX 703 ; N two ; B -8 -51 691 694 ;
+C 51 ; WX 703 ; N three ; B -8 -51 857 694 ;
+C 52 ; WX 703 ; N four ; B -8 -51 872 695 ;
+C 53 ; WX 703 ; N five ; B -8 -51 872 695 ;
+C 54 ; WX 703 ; N six ; B -8 -51 871 695 ;
C 69 ; WX 529 ; N E ; B 48 -33 629 676 ;
C 88 ; WX 529 ; N X ; B 112 -2 636 675 ;
EndCharMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchit8.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchit8.afm
index 2cb22a666f2..08f10e886f8 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchit8.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchit8.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:18:37 2015
+Comment Creation Date: Sat Jun 27 10:58:02 2015
FontName dozchit8
FullName dozchit8
FamilyName dozchit8
@@ -12,15 +12,15 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 13 -34 792 677
+FontBBox -6 -50 866 694
CapHeight 675
StartCharMetrics 8
-C 49 ; WX 494 ; N one ; B 239 -24 416 668 ;
-C 50 ; WX 699 ; N two ; B 13 -24 621 668 ;
-C 51 ; WX 699 ; N three ; B 47 -24 792 668 ;
-C 52 ; WX 699 ; N four ; B 47 -24 792 668 ;
-C 53 ; WX 699 ; N five ; B 47 -24 792 668 ;
-C 54 ; WX 699 ; N six ; B 47 -24 792 668 ;
+C 49 ; WX 494 ; N one ; B 235 -30 450 694 ;
+C 50 ; WX 699 ; N two ; B -6 -50 685 694 ;
+C 51 ; WX 699 ; N three ; B -6 -50 851 694 ;
+C 52 ; WX 699 ; N four ; B -6 -50 866 694 ;
+C 53 ; WX 699 ; N five ; B -6 -50 866 694 ;
+C 54 ; WX 699 ; N six ; B -6 -50 866 694 ;
C 69 ; WX 494 ; N E ; B 46 -34 600 677 ;
C 88 ; WX 494 ; N X ; B 105 0 605 673 ;
EndCharMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchit9.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchit9.afm
index e527ccf76f1..d2b69436df2 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchit9.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchit9.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:18:40 2015
+Comment Creation Date: Sat Jun 27 10:58:05 2015
FontName dozchit9
FullName dozchit9
FamilyName dozchit9
@@ -12,15 +12,15 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 13 -29 792 673
+FontBBox -4 -49 862 693
CapHeight 672
StartCharMetrics 8
-C 49 ; WX 472 ; N one ; B 228 -24 405 668 ;
-C 50 ; WX 697 ; N two ; B 13 -25 620 669 ;
-C 51 ; WX 697 ; N three ; B 44 -25 792 669 ;
-C 52 ; WX 697 ; N four ; B 44 -25 792 669 ;
-C 53 ; WX 697 ; N five ; B 44 -25 792 669 ;
-C 54 ; WX 697 ; N six ; B 44 -25 792 669 ;
+C 49 ; WX 472 ; N one ; B 224 -31 437 693 ;
+C 50 ; WX 697 ; N two ; B -4 -49 681 693 ;
+C 51 ; WX 697 ; N three ; B -4 -49 849 693 ;
+C 52 ; WX 697 ; N four ; B -4 -49 862 693 ;
+C 53 ; WX 697 ; N five ; B -4 -49 862 693 ;
+C 54 ; WX 697 ; N six ; B -4 -49 862 693 ;
C 69 ; WX 472 ; N E ; B 44 -29 578 673 ;
C 88 ; WX 472 ; N X ; B 101 0 586 672 ;
EndCharMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchsl10.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchsl10.afm
index 3791e93f986..72f23f80639 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchsl10.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchsl10.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:18:42 2015
+Comment Creation Date: Sat Jun 27 10:58:07 2015
FontName dozchsl10
FullName dozchsl10
FamilyName dozchsl10
@@ -12,15 +12,15 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 16 -25 736 669
+FontBBox -1 -42 752 686
CapHeight 655
StartCharMetrics 8
-C 49 ; WX 500 ; N one ; B 244 -25 364 669 ;
-C 50 ; WX 700 ; N two ; B 16 -25 621 669 ;
-C 51 ; WX 700 ; N three ; B 49 -25 736 669 ;
-C 52 ; WX 700 ; N four ; B 49 -25 736 669 ;
-C 53 ; WX 700 ; N five ; B 49 -25 736 669 ;
-C 54 ; WX 700 ; N six ; B 49 -25 736 669 ;
+C 49 ; WX 500 ; N one ; B 227 -42 381 686 ;
+C 50 ; WX 700 ; N two ; B -1 -42 637 686 ;
+C 51 ; WX 700 ; N three ; B 32 -42 752 686 ;
+C 52 ; WX 700 ; N four ; B 32 -42 752 686 ;
+C 53 ; WX 700 ; N five ; B 32 -42 752 686 ;
+C 54 ; WX 700 ; N six ; B 32 -42 752 686 ;
C 69 ; WX 500 ; N E ; B 59 -21 539 666 ;
C 88 ; WX 500 ; N X ; B 82 -23 554 655 ;
EndCharMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchsl12.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchsl12.afm
index 012424f2c37..65af1e5ae9a 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchsl12.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchsl12.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:18:45 2015
+Comment Creation Date: Sat Jun 27 10:58:09 2015
FontName dozchsl12
FullName dozchsl12
FamilyName dozchsl12
@@ -12,15 +12,15 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 14 -24 737 669
+FontBBox -2 -40 753 684
CapHeight 654
StartCharMetrics 8
-C 49 ; WX 490 ; N one ; B 239 -23 359 668 ;
-C 50 ; WX 699 ; N two ; B 14 -24 622 668 ;
-C 51 ; WX 699 ; N three ; B 48 -24 737 669 ;
-C 52 ; WX 699 ; N four ; B 48 -24 737 668 ;
-C 53 ; WX 699 ; N five ; B 48 -24 737 668 ;
-C 54 ; WX 699 ; N six ; B 48 -24 737 668 ;
+C 49 ; WX 490 ; N one ; B 223 -38 375 684 ;
+C 50 ; WX 699 ; N two ; B -2 -40 639 684 ;
+C 51 ; WX 699 ; N three ; B 32 -40 753 684 ;
+C 52 ; WX 699 ; N four ; B 32 -40 753 684 ;
+C 53 ; WX 699 ; N five ; B 32 -40 753 684 ;
+C 54 ; WX 699 ; N six ; B 32 -40 753 684 ;
C 69 ; WX 490 ; N E ; B 58 -21 530 665 ;
C 88 ; WX 490 ; N X ; B 81 -22 545 654 ;
EndCharMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchsl8.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchsl8.afm
index d156b89255e..b57329f45a3 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchsl8.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchsl8.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:18:48 2015
+Comment Creation Date: Sat Jun 27 10:58:11 2015
FontName dozchsl8
FullName dozchsl8
FamilyName dozchsl8
@@ -12,15 +12,15 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 14 -24 737 669
+FontBBox -4 -42 755 686
CapHeight 654
StartCharMetrics 8
-C 49 ; WX 531 ; N one ; B 259 -24 379 668 ;
-C 50 ; WX 703 ; N two ; B 14 -24 622 668 ;
-C 51 ; WX 703 ; N three ; B 53 -24 737 669 ;
-C 52 ; WX 703 ; N four ; B 53 -24 737 668 ;
-C 53 ; WX 703 ; N five ; B 53 -24 737 668 ;
-C 54 ; WX 703 ; N six ; B 53 -24 737 668 ;
+C 49 ; WX 531 ; N one ; B 240 -41 397 686 ;
+C 50 ; WX 703 ; N two ; B -4 -42 641 686 ;
+C 51 ; WX 703 ; N three ; B 35 -42 755 686 ;
+C 52 ; WX 703 ; N four ; B 35 -42 755 686 ;
+C 53 ; WX 703 ; N five ; B 35 -42 755 686 ;
+C 54 ; WX 703 ; N six ; B 35 -42 755 686 ;
C 69 ; WX 531 ; N E ; B 63 -21 566 665 ;
C 88 ; WX 531 ; N X ; B 87 -21 581 654 ;
EndCharMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/dozchsl9.afm b/Master/texmf-dist/fonts/afm/public/dozenal/dozchsl9.afm
index f7d34cf95bf..605ea584997 100644
--- a/Master/texmf-dist/fonts/afm/public/dozenal/dozchsl9.afm
+++ b/Master/texmf-dist/fonts/afm/public/dozenal/dozchsl9.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20120731
-Comment Creation Date: Tue Jan 27 08:18:50 2015
+Comment Creation Date: Sat Jun 27 10:58:13 2015
FontName dozchsl9
FullName dozchsl9
FamilyName dozchsl9
@@ -12,15 +12,15 @@ UnderlinePosition -100
UnderlineThickness 50
Version 001.001
EncodingScheme FontSpecific
-FontBBox 15 -25 736 669
+FontBBox -2 -42 753 686
CapHeight 655
StartCharMetrics 8
-C 49 ; WX 514 ; N one ; B 250 -25 371 669 ;
-C 50 ; WX 702 ; N two ; B 15 -25 622 669 ;
-C 51 ; WX 702 ; N three ; B 51 -25 736 669 ;
-C 52 ; WX 702 ; N four ; B 51 -25 736 669 ;
-C 53 ; WX 702 ; N five ; B 51 -25 736 669 ;
-C 54 ; WX 702 ; N six ; B 51 -25 736 669 ;
+C 49 ; WX 514 ; N one ; B 233 -42 388 686 ;
+C 50 ; WX 702 ; N two ; B -2 -42 639 686 ;
+C 51 ; WX 702 ; N three ; B 34 -42 753 686 ;
+C 52 ; WX 702 ; N four ; B 34 -42 753 686 ;
+C 53 ; WX 702 ; N five ; B 34 -42 753 686 ;
+C 54 ; WX 702 ; N six ; B 34 -42 753 686 ;
C 69 ; WX 514 ; N E ; B 60 -22 551 667 ;
C 88 ; WX 514 ; N X ; B 84 -21 566 655 ;
EndCharMetrics
diff --git a/Master/texmf-dist/fonts/source/public/dozenal/dozenal.mf b/Master/texmf-dist/fonts/source/public/dozenal/dozenal.mf
index 42a4d8fd631..9fbbdeec7ed 100644
--- a/Master/texmf-dist/fonts/source/public/dozenal/dozenal.mf
+++ b/Master/texmf-dist/fonts/source/public/dozenal/dozenal.mf
@@ -79,7 +79,7 @@ beginchar("1",9u#,fig_height#,0); "The Tally Mark 1";
z0 = (w/2,h+o);
z1 = (w/2,0-o);
-pickup pencircle xscaled 8 rotated 45;
+pickup pencircle xscaled u rotated 45;
draw z0--z1;
endchar;
@@ -90,7 +90,7 @@ z0 = (0+o,h+o);
z1 = (0+o,0-o);
z2 = (h-o,0-o);
-pickup pencircle xscaled 8 rotated 45;
+pickup pencircle xscaled u rotated 45;
draw z0--z1--z2;
endchar;
@@ -102,7 +102,7 @@ z1 = (0+u,0-o);
z2 = (h-o,0-o);
z3 = (h-o,h+o);
-pickup pencircle xscaled 8 rotated 45;
+pickup pencircle xscaled u rotated 45;
draw z0--z1--z2--z3;
endchar;
@@ -113,7 +113,7 @@ z1 = (0+u,0-o);
z2 = (h-o,0-o);
z3 = (h-o,h+o);
-pickup pencircle xscaled 8 rotated 45;
+pickup pencircle xscaled u rotated 45;
draw z0--z1--z2--z3--z0;
endchar;
@@ -124,9 +124,9 @@ z1 = (0+u,0-o);
z2 = (h-o,0-o);
z3 = (h-o,h+o);
-pickup pencircle xscaled 8 rotated 45;
+pickup pencircle xscaled u rotated 45;
draw z0--z1--z2--z3--z0;
-pickup pencircle xscaled 6 rotated 45;
+pickup pencircle xscaled u rotated 45;
draw z0--z2;
endchar;
@@ -137,11 +137,11 @@ z1 = (0+u,0-o);
z2 = (h-o,0-o);
z3 = (h-o,h+o);
-pickup pencircle xscaled 8 rotated 45;
+pickup pencircle xscaled u rotated 45;
draw z0--z1--z2--z3--z0;
-pickup pencircle xscaled 6 rotated 45;
+pickup pencircle xscaled u rotated 45;
draw z0--z2;
-pickup pencircle xscaled 6 rotated -45;
+pickup pencircle xscaled u rotated -45;
draw z3--z1;
endchar;
diff --git a/Master/texmf-dist/fonts/source/public/dozenal/dozenali.mf b/Master/texmf-dist/fonts/source/public/dozenal/dozenali.mf
index e5c6432be5f..ad75a85e600 100644
--- a/Master/texmf-dist/fonts/source/public/dozenal/dozenali.mf
+++ b/Master/texmf-dist/fonts/source/public/dozenal/dozenali.mf
@@ -96,73 +96,203 @@ endchar;
beginchar("1",9u#,fig_height#,0); "The Tally Mark 1";
+penpos0(1.5u,45);
+penpos1(0.5u,-45);
+penpos2(1.0u,0);
z0 = (w/2,h+o);
z1 = (w/2,0-o);
+z2 = (w/2+w/12,h/2);
-pickup pencircle xscaled 8 rotated 45;
-draw z0--z1;
+pickup pencircle scaled u;
+penstroke z1e..z2e..z0e;
endchar;
beginchar("2",fig_height#+u#,fig_height#,0); "The Tally Mark 2";
+penpos0(1.5u,45);
+penpos1(0.5u,-45);
+penpos2(1.0u,0);
+penpos3(1.5u,-45);
+penpos4(1.0u,-90);
+penpos5(0.5u,-135);
z0 = (0+o,h+o);
z1 = (0+o,0-o);
-z2 = (h-o,0-o);
+z2 = (0+o+w/12,h/2);
+z3 = z1;
+z4 = (w/2,0+w/12);
+z5 = (w-o,0-o);
-pickup pencircle xscaled 8 rotated 45;
-draw z0--z1--z2;
+pickup pencircle scaled u;
+penstroke z0e..z2e..z1e;
+penstroke z3e..z4e..z5e;
+
+%pickup pencircle xscaled 8 rotated 45;
+%draw z0--z1--z2;
+penlabels(0,1,2,3,4,5,6);
endchar;
beginchar("3",fig_height#+u#,fig_height#,0); "The Tally Mark 3";
-z0 = (0+u,h+o);
-z1 = (0+u,0-o);
-z2 = (h-o,0-o);
-z3 = (h-o,h+o);
+penpos0(1.5u,45);
+penpos1(0.5u,-45);
+penpos2(1.0u,0);
+penpos3(1.5u,-45);
+penpos4(1.0u,-90);
+penpos5(0.5u,-135);
+penpos6(1.5u,45);
+penpos7(1.0u,0);
+penpos8(0.5u,-45);
+z0 = (0+o,h+o);
+z1 = (0+o,0-o);
+z2 = (0+o+w/12,h/2);
+z3 = z1;
+z4 = (w/2,0+w/12);
+z5 = (w-o,0-o);
+z6 = z5;
+z7 = (w-o-w/12,h/2);
+z8 = (w-o,h+o);
+
+pickup pencircle scaled u;
+penstroke z0e..z2e..z1e;
+penstroke z3e..z4e..z5e;
+penstroke z6e..z7e..z8e;
+
+penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12);
-pickup pencircle xscaled 8 rotated 45;
-draw z0--z1--z2--z3;
endchar;
beginchar("4",fig_height#+u#,fig_height#,0); "The Tally Mark 4";
-z0 = (0+u,h+o);
-z1 = (0+u,0-o);
-z2 = (h-o,0-o);
-z3 = (h-o,h+o);
-
-pickup pencircle xscaled 8 rotated 45;
-draw z0--z1--z2--z3--z0;
+penpos0(1.5u,45);
+penpos1(0.5u,-45);
+penpos2(1.0u,0);
+penpos3(1.5u,-45);
+penpos4(1.0u,-90);
+penpos5(0.5u,-135);
+penpos6(1.5u,45);
+penpos7(1.0u,0);
+penpos8(0.5u,-45);
+penpos9(1.5u,-45);
+penpos10(1.0u,-90);
+penpos11(0.5u,-135);
+z0 = (0+o,h+o);
+z1 = (0+o,0-o);
+z2 = (0+o+w/12,h/2);
+z3 = z1;
+z4 = (w/2,0+w/12);
+z5 = (w-o,0-o);
+z6 = z5;
+z7 = (w-o-w/12,h/2);
+z8 = (w-o,h+o);
+z9 = z8;
+z10 = (w/2,h-o-w/12);
+z11 = z0;
+
+pickup pencircle scaled u;
+penstroke z0e..z2e..z1e;
+penstroke z3e..z4e..z5e;
+penstroke z6e..z7e..z8e;
+penstroke z9e..z10e..z11e;
+
+penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12);
endchar;
beginchar("5",fig_height#+u#,fig_height#,0); "The Tally Mark 5";
-z0 = (0+u,h+o);
-z1 = (0+u,0-o);
-z2 = (h-o,0-o);
-z3 = (h-o,h+o);
+penpos0(1.5u,45);
+penpos1(0.5u,-45);
+penpos2(1.0u,0);
+penpos3(1.5u,-45);
+penpos4(1.0u,-90);
+penpos5(0.5u,-135);
+penpos6(1.5u,45);
+penpos7(1.0u,0);
+penpos8(0.5u,-45);
+penpos9(1.5u,-45);
+penpos10(1.0u,-90);
+penpos11(0.5u,-135);
+penpos12(1.5u,45);
+penpos13(1.0u,45);
+penpos14(0.5u,45);
+z0 = (0+o,h+o);
+z1 = (0+o,0-o);
+z2 = (0+o+w/12,h/2);
+z3 = z1;
+z4 = (w/2,0+w/12);
+z5 = (w-o,0-o);
+z6 = z5;
+z7 = (w-o-w/12,h/2);
+z8 = (w-o,h+o);
+z9 = z8;
+z10 = (w/2,h-o-w/12);
+z11 = z0;
+z12 = z0;
+z13 = (w/2-w/24,h/2);
+z14 = z5;
+
+pickup pencircle scaled u;
+penstroke z0e..z2e..z1e;
+penstroke z3e..z4e..z5e;
+penstroke z6e..z7e..z8e;
+penstroke z9e..z10e..z11e;
+penstroke z12e..z13e..z14e;
+
+penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12);
+penlabels(13,14,15,16,17,18);
-pickup pencircle xscaled 8 rotated 45;
-draw z0--z1--z2--z3--z0;
-pickup pencircle xscaled 6 rotated 45;
-draw z0--z2;
endchar;
beginchar("6",fig_height#+u#,fig_height#,0); "The Tally Mark 6";
-z0 = (0+u,h+o);
-z1 = (0+u,0-o);
-z2 = (h-o,0-o);
-z3 = (h-o,h+o);
-
-pickup pencircle xscaled 8 rotated 45;
-draw z0--z1--z2--z3--z0;
-pickup pencircle xscaled 6 rotated 45;
-draw z0--z2;
-pickup pencircle xscaled 6 rotated -45;
-draw z3--z1;
+penpos0(1.5u,45);
+penpos1(0.5u,-45);
+penpos2(1.0u,0);
+penpos3(1.5u,-45);
+penpos4(1.0u,-90);
+penpos5(0.5u,-135);
+penpos6(1.5u,45);
+penpos7(1.0u,0);
+penpos8(0.5u,-45);
+penpos9(1.5u,-45);
+penpos10(1.0u,-90);
+penpos11(0.5u,-135);
+penpos12(1.5u,45);
+penpos13(1.0u,45);
+penpos14(0.5u,45);
+penpos15(1.5u,-45);
+penpos16(1.0u,-45);
+penpos17(0.5u,-45);
+z0 = (0+o,h+o);
+z1 = (0+o,0-o);
+z2 = (0+o+w/12,h/2);
+z3 = z1;
+z4 = (w/2,0+w/12);
+z5 = (w-o,0-o);
+z6 = z5;
+z7 = (w-o-w/12,h/2);
+z8 = (w-o,h+o);
+z9 = z8;
+z10 = (w/2,h-o-w/12);
+z11 = z0;
+z12 = z0;
+z13 = (w/2-w/24,h/2);
+z14 = z5;
+z15 = z9;
+z16 = z13;
+z17 = z3;
+
+pickup pencircle scaled u;
+penstroke z0e..z2e..z1e;
+penstroke z3e..z4e..z5e;
+penstroke z6e..z7e..z8e;
+penstroke z9e..z10e..z11e;
+penstroke z12e..z13e..z14e;
+penstroke z15e..z16e..z17e;
+
+penlabels(0,1,2,3,4,5,6,7,8,9,10,11,12);
+penlabels(13,14,15,16,17,18);
endchar;
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchars10.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchars10.pfb
index d8d85b42edc..9b2f16853bd 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchars10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchars10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchars12.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchars12.pfb
index ce4cf3a6aa1..b6d9599c89a 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchars12.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchars12.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchars17.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchars17.pfb
index c2ca15783ba..6eb4c9a7e8e 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchars17.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchars17.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchars6.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchars6.pfb
index 5a32092cb3b..ee913ad43c0 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchars6.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchars6.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchars7.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchars7.pfb
index 5aabe8d41af..22b3bd94f5a 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchars7.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchars7.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchars8.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchars8.pfb
index 4d55a1623ea..a473ccdad82 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchars8.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchars8.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchars9.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchars9.pfb
index 81b71ca3ac3..b27b3ffc40b 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchars9.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchars9.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchb10.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchb10.pfb
index d85ad85a04a..8f62bd754f6 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchb10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchb10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx10.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx10.pfb
index 5d342652030..0a615048616 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx12.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx12.pfb
index 6271876c63e..dd061941707 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx12.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx12.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx5.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx5.pfb
index 72293c6004f..df2eca0f432 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx5.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx5.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx6.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx6.pfb
index b59167e7ce4..e71f404fc4e 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx6.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx6.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx7.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx7.pfb
index 26769f51680..9be884d01b6 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx7.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx7.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx8.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx8.pfb
index bed0157004c..a24c4f04ce2 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx8.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx8.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx9.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx9.pfb
index 319b7972cac..931c84c7076 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx9.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchbx9.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchbxi10.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchbxi10.pfb
index 3b1502da1c7..c7002b56c06 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchbxi10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchbxi10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchbxsl10.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchbxsl10.pfb
index bf1d0b4af70..e103a95193f 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchbxsl10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchbxsl10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchit10.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchit10.pfb
index 553b1ce544b..fe69758f6f9 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchit10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchit10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchit12.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchit12.pfb
index f9b7225f492..c20243047cf 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchit12.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchit12.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchit7.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchit7.pfb
index b03e88e3fd4..ae7820f7873 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchit7.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchit7.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchit8.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchit8.pfb
index 777b48ed552..fd162e1e596 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchit8.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchit8.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchit9.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchit9.pfb
index ce2971ac114..0aa7f3c63fb 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchit9.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchit9.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchsl10.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchsl10.pfb
index 76ab96dcdf8..ed591b2ca55 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchsl10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchsl10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchsl12.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchsl12.pfb
index bad7595015a..e3150ad74ed 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchsl12.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchsl12.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchsl8.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchsl8.pfb
index 221097a57d3..201c377e077 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchsl8.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchsl8.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/dozchsl9.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/dozchsl9.pfb
index 4af85abfaed..fdd62a8ecf5 100644
--- a/Master/texmf-dist/fonts/type1/public/dozenal/dozchsl9.pfb
+++ b/Master/texmf-dist/fonts/type1/public/dozenal/dozchsl9.pfb
Binary files differ
diff --git a/Master/texmf-dist/source/fonts/dozenal/dozenal.dtx b/Master/texmf-dist/source/fonts/dozenal/dozenal.dtx
index c357cc9b505..1a911b0d0e3 100644
--- a/Master/texmf-dist/source/fonts/dozenal/dozenal.dtx
+++ b/Master/texmf-dist/source/fonts/dozenal/dozenal.dtx
@@ -24,23 +24,37 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{dozenal}[2015/01/29 v5.3 support for dozenal fonts]
+%<package>\ProvidesPackage{dozenal}[2015/01/29 v6.0 support for dozenal fonts]
%<*driver>
\documentclass{ltxdoc}
\usepackage{doc}
+\usepackage{verbatim}
\usepackage{url}
\usepackage[typeone]{dozenal}
\usepackage{mflogo}
\usepackage{makeidx}
\makeindex
+\long\def\demonstrate#1#2{%
+ \bigskip%
+ \hrule%
+ \hbox to\linewidth{%
+ \hbox to0.5\linewidth{%
+ \vbox to2in{\vfil#1\vfil}%
+ }\hbox to0.5\linewidth{%
+ \vbox to2in{\vfil#2\vfil}%
+ }%
+ }%
+ \hrule%
+ \bigskip%
+}
\begin{document}
\DocInput{dozenal.dtx}
\end{document}
%</driver>
% \fi
-% \title{The \texttt{dozenal} Package, v5.3}
+% \title{The \texttt{dozenal} Package, v6.0}
% \author{Donald P.\ Goodman III}
% \date{\today}
%
@@ -113,10 +127,9 @@
% \item Provides default characters for the two transdecimal
% digits, ``\x'' for ten and ``\e'' for eleven; these
% correspond to the accepted Unicode standard digits
-% ``turned digit two'' and ``turned digit three,'' which
-% have been approved for inclusion in Unicode, and are
-% expected to be part of the official standard sometime in
-% 1200 (2016.). These characters copy-paste as ``X'' and
+% ``turned digit two'' and ``turned digit three,'' which (as
+% of June 11\e\e) are now part of the Unicode standard.
+% These characters copy-paste as ``X'' and
% ``E,'' the (somewhat) standard ASCII representations of
% these two digits. However, other characters can easily be
% substituted if desired.
@@ -124,6 +137,8 @@
% classes (such as |article|, |book|, and so forth) to use
% dozenal rather than decimal. This behavior can be shut
% off if desired.
+% \item Provides macros for converting dozenal numbers to
+% words; e.g., ``3\e'' to ``three dozen eleven.''
% \end{itemize}
%
% That covered, we can now move on to how these features are
@@ -172,12 +187,11 @@
% decimal from dozenal, if we wish. We do this with the
% \DescribeMacro{\basex}|\basex| macro, which takes a single
% argument, which is the dozenal number you wish to convert
-% to decimal. This is subject to some pretty harsh
-% restrictions, however. First, the only tokens allowed in
-% the number are 0--9, |\x|, and |\e|. Second, these will
-% only work with \emph{unexpanded} |\x| and |\e|. If you
-% don't know what this means, then good for you; \TeX\
-% programmers will envy you.
+% to decimal. This is subject to a pretty harsh
+% restriction, however: the only tokens allowed in
+% the number are 0--9, |X|, and |E|; putting in anything
+% else will cause violent choking with ``expected a
+% number''-type errors.
%
% To illustrate these limitations, let's define a new
% counter and dozenize it. Here, we define the counter and
@@ -197,35 +211,103 @@
% |\renewcommand\thetestcount{\basexii{\value{testcount}}{\x}{\e}}|
% \end{quotation}
%
-% Now we get to do lovely things like the following:
+% Now |dozenal| allow us to do lovely things like the following:
%
% \begin{quotation}
% |\thetestcount| = \thetestcount
% \end{quotation}
%
-% Now we can try to get that number in decimal with
-% |\basex|. But don't try it; |\basex{\thetestcount}|
-% doesn't work because the |\x| and |\e| are already
-% expanded. Instead, use \LaTeX's built-in functions for
-% chores like this:
+% It's tempting to try to put that number into |\basex| to
+% get it in decimal; but don't try it;
+% |\basex{\thetestcount}| doesn't work because it contains
+% expanded versions of |\x| and |\e|. Fortunately, you
+% don't need it; \LaTeX\ already has the value of the
+% |testcount| counter in its innards, and is quite used to
+% outputting it in decimal:
%
% \begin{quotation}
% |\arabic{testcount}| = \arabic{testcount}
% \end{quotation}
%
% On the other hand, if you have an actual string you want
-% converted, you can send it directly to |\basex| without
-% worrying about expansion, because through much trial and
-% error and banging head against wall, the expansion issues
-% have already been resolved:
+% converted, you can send it directly to |\basex|:
%
% \begin{quotation}
-% |\basex{3\e}| = \basex{3\e}
+% |\basex{3E}| = \basex{3E}
% \end{quotation}
%
% So |\basex| is of limited utility, but it's a nice tool to
% add to the box.
%
+% Finally, we can convert counters into \emph{words}, by
+% supplying said counter's name to the
+% \DescribeMacro{\doznumtoword}|\doznumtoword| macro. It
+% takes as its argument the name of a \emph{counter} (not a
+% number itself!) and converts this into words:
+%
+% \newcounter{somecount}\setcounter{somecount}{851}
+% \begin{quote}
+% |This page's number is ``\doznumtoword{page}.''| \\
+% This page's number is ``\doznumtoword{page}.''
+% \end{quote}
+%
+% This macro works with much larger numbers, as well.
+% Purely for exemplary purposes, let's define a counter
+% |somecount| with |\newcounter{somecount}|, and set it
+% equal to (decimal) 851 with |\setcounter{somecount}{851}|.
+% ``851''
+% in dozenal is ``5\x\e.'' Therefore,
+% |\doznumtoword{somecount}| will yield
+% ``\doznumtoword{somecount}.'' If you want to change the
+% capitalization, use other macros; e.g.,
+% \DescribeMacro{\DOZnumtoword}|\DOZnumtoword{somecount}| gives
+% ``\DOZnumtoword{somecount},'' while
+% \DescribeMacro{\Doznumtoword}|\Doznumtoword{somecount| gives
+% ``\Doznumtoword{somecount}.''
+%
+% |\doznumtoword| (and friends) do act correctly when there
+% are zeroes in the middle of the number, e.g., when
+% |somecount| is equal to decimal 6977, which is dozenal
+% 4055, it will output
+% \setcounter{somecount}{6977}``\doznumtoword{somecount}.''
+% When there's a zero at the \emph{end} of the number, that
+% zero is still output: |\doznumtoword{somecount}| where
+% |somecount|\setcounter{somecount}{144} is equal to 144 gives
+% ``\doznumtoword{somecount},'' not simply ``one biqua.'' I
+% haven't decided yet if this is a bug or a feature; when I
+% do, I'll act accordingly.
+%
+% The rank words (``unqua,'' ``biqua,'' and so forth) are
+% all customizable by user-level commands, which are named
+% |\dozrankoneword| for ``unqua,'' |\dozranktwoword| for
+% ``biqua,'' and so forth. Simply redefine them like so:
+%
+% \begin{quote}
+% |\def\dozrankoneword{dozen}|\def\dozrankoneword{dozen} \\
+% |\setcounter{somecount}{51}|\setcounter{somecount}{51} \\
+% |\doznumtoword{somecount}| = \doznumtoword{somecount}
+% \end{quote}
+% \def\dozrankoneword{unqua}
+%
+% This type of macro is useful for putting page numbers in
+% both digits and words, for example.
+%
+% Lastly, |dozenal| allows the use of the common dozenal
+% radix point, ``;'', to work properly in math mode. Some
+% dozenalists prefer to use ``;'' rather than ``.'' (or
+% ``,'') to mark the transition from integers to fractions
+% in numbers; e.g., three-and-a-half is ``3;6.'' In math
+% mode, however, this doesn't work; a semicolon in math
+% mode is punctuation, and a spurious space is inserted
+% (quite correctly) afterward. We don't want this space
+% when we're using it as a radix point. So |dozenal| (using
+% code adapted from Walter Schmidt's |icomma| package) fixes
+% this:
+%
+% |$3;6$| = 3;6
+%
+% And all is right with the world.
+%
% \section{Dozenal Characters and Fonts}
% \label{sect:fonts}
%
@@ -309,6 +391,20 @@
% will yield ``\x'' or ``\e'' respectively. Other
% characters will produce nothing.
%
+% As of v6.0, there are separate, hand-written versions of
+% the tally marks, accessed by putting tallies in italic:
+%
+% \begin{center}\itshape
+% \begin{tabular}{cccccc}
+% 1 & 2 & 3 & 4 & 5 & 6 \\
+% \Huge\tally{1} & \Huge\tally{2} & \Huge\tally{3} & \Huge\tally{4} & \Huge\tally{5} & \Huge\tally{6} \\
+% \end{tabular}
+% \end{center}
+%
+% In other words, to get these shapes, say
+% |\textit{\tally{6}}|; this will give you
+% ``\textit{\tally{6}}.''
+%
% The fonts are all prefixed |dozch|, if for some reason
% direct access to them is needed.
%
@@ -338,7 +434,7 @@
% package (|\basexii|, |\dozens|, etc.) are made available,
% but all the counters will still be in decimal. This
% permits using dozenal characters in an otherwise decimal
-% document; it also proves useful in dozenal document in
+% document; it also proves useful in document classes in
% which these counters are undefined (e.g., |minimal|).
%
% The |dozenal| fonts were designed in \MF, and they are
@@ -355,16 +451,23 @@
% \section{Implementation}
% \label{sect:code}
%
-% Make sure that we have fixltx2e loaded, so that the
-% |\TextorMath| magic will work.
+% Make sure that we have |fixltx2e| loaded, so that the
+% |\TextorMath| magic will work. Also, as of v6.0, we also
+% require |xstring| to use |\IfStrEq| in the number-to-word
+% code.
% \begin{macrocode}
\RequirePackage{fixltx2e}
+\RequirePackage{xstring}
% \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 also require |mfirstuc|, because it's \emph{great}:
+% \begin{macrocode}
+\RequirePackage{mfirstuc}
+% \end{macrocode}
% Now we declare the option ``nocounters'', which prevents
% |dozenal| from redefining all the counters. This prevents
% errors in document classes which don't have these counters,
@@ -433,8 +536,8 @@
\fi%
\newcommand\x{\TextOrMath{\protect\doz{{X}}}{\doz@X}}%
\newcommand\e{\TextOrMath{\protect\doz{{E}}}{\doz@E}}%
-\DeclareMathSymbol{\doz@X}{\mathord}{dozens}{88}
-\DeclareMathSymbol{\doz@E}{\mathord}{dozens}{69}
+\DeclareMathSymbol{\doz@X}{\mathord}{dozens}{88}%
+\DeclareMathSymbol{\doz@E}{\mathord}{dozens}{69}%
% \end{macrocode}
% Put in some additional code for the tally marks.
% \begin{macrocode}
@@ -459,73 +562,74 @@
% \end{macrocode}
% Now that we can convert numbers \emph{to} dozenal, let's
% set it up so that we can convert them \emph{from} dozenal.
-% This is pretty ugly stuff here, because it's mostly
-% straight \TeX\ (and e-\TeX) without higher-level
-% conveniences, and because it's an expansion nightmare. If
-% we didn't have to account for |\x| and |\e| because
-% included in such strings, it's fairly easy; but it took a
-% great deal of troubleshooting to make it work with them.
-%
-% First, we work up some macros to help us count the
-% characters in an argument (the same, more or less, as is
-% used in the |basicarith| package, adapted from those by
-% ``Florent'' at \url{tex-and-stuff.blogspot.com}); then, we convert to
-% decimal with |\basex|.
+% I use |xstring| here, replacing a messy macro mesh from
+% the last version (5.3).
% \begin{macrocode}
-\newcount\b@charcount
-\def\gobblechar{\let\char= }
-\def\assignthencheck{\afterassignment\checknil\gobblechar}
-\def\countunlessnil{%
- \ifx\char\nil \let\next=\relax%
- \else%
- \let\next=\auxcountchar%
- \advance\b@charcount by1%
- \fi%
- \ifx\char\backslash\advance\b@charcount by-1\fi%
- \next%
+\newcount\doz@countchar
+\def\doz@charcount#1{%
+ \StrLen{#1}[\doz@filler]%
+ \doz@countchar=\doz@filler%
}%
-\def\auxcountchar{%
- \afterassignment\countunlessnil\gobblechar%
+% \end{macrocode}
+% Now we develop our conversion routines for |\basex|. For
+% v6.0, these were hugely simplified by using the |xstring|
+% package instead of trying to bash through in plain
+% \TeX, which eventually worked but was \emph{not} pretty.
+% We start by defining a few counters to help us out:
+% \begin{macrocode}
+\newcount\doz@lfiller\doz@lfiller=-1%
+\newcount\doz@total\doz@total=0%
+\newcount\doz@loopi\doz@loopi=0%
+\newcount\doz@multiplier\doz@multiplier=1%
+% \end{macrocode}
+% Next we adopt a macro from TeX.SE question 140476, from
+% user "Dan", which works like a charm even when using
+% counter values rather than simple integers. These macros
+% let us grab an individual character from a string; in this
+% case, from the argument of |\basex|.
+% \begin{macrocode}
+% macro from TeX.SE question 140476, posted by user "Dan"
+\def\ninthofmany#1#2#3#4#5#6#7#8#9{#9\gobbletorelax}
+\def\gobbletorelax#1\relax{}
+\def\doz@CharAt#1#2{%
+ \expandafter\ninthofmany\romannumeral\numexpr(9000-\number#1000)#2\relax}
+% end "Dan" macro
+% \end{macrocode}
+% Here's where the money happens. We loop through each
+% digit of the argument, multiplying it by the appropriate
+% factor of 10 (the dozen, of course), and then add that to
+% a rolling total. At the end, we output the number.
+% \begin{macrocode}
+\def\doz@ten{X}%
+\def\doz@elv{E}%
+\def\doz@basex#1{%
+ \doz@total=0%
+ \doz@loopi=\doz@countchar%
+ \doz@multiplier=1%
+ \def\doz@wholenum{#1}%
+ \loop\ifnum\doz@loopi>0%
+ \def\doz@currchar{\doz@CharAt{\number\doz@loopi}{\doz@wholenum}}%
+ \if\doz@currchar\doz@ten%
+ \doz@lfiller=10%
+ \else\if\doz@currchar\doz@elv%
+ \doz@lfiller=11%
+ \else%
+ \doz@lfiller=\doz@currchar%
+ \fi\fi%
+ \multiply\doz@lfiller by\doz@multiplier%
+ \multiply\doz@multiplier by12%
+ \advance\doz@total by\doz@lfiller%
+ \advance\doz@loopi by-1%
+ \repeat%
+ \the\doz@total%
}%
-\def\countchar#1{\def\xx{#1}\b@charcount=0\expandafter\auxcountchar\xx\nil}
-%end Florent code
-\def\gobble#1{}%
-\newcount\@numdigs%
-\newcount\@decmult%
-\newcount\@loopindex\@loopindex=1%
-\newcount\@decnum\@decnum=0%
-\newcount\@digit\@digit=1%
\def\basex#1{%
- \countchar{#1}\@numdigs=\b@charcount%
- \@decmult=1\@loopindex=1%
- \loop\ifnum\@loopindex<\@numdigs%
- \multiply\@decmult by12%
- \advance\@loopindex by1%
- \repeat%
- \@loopindex=0%
- \def\isten{x}\def\iselv{e}\def\isquote{\backslash}%
- \edef\@doznum{\detokenize{#1}\relax}%
- \@decnum=0%
- \loop\ifnum\@loopindex<\@numdigs%
- \def\@firstchar{\expandafter\@car\@doznum\@nil}%
- \if\@firstchar\@backslashchar
- \edef\@doznum{\@removefirstdig{\@doznum}}%
- \else
- \if\@firstchar\isten\def\@firstchar{10}\fi
- \if\@firstchar\iselv\def\@firstchar{11}\fi
- \advance\@loopindex by1%
- \@digit=\@firstchar%
- \edef\@doznum{\@removefirstdig{\@doznum}}%
- \multiply\@digit by\@decmult%
- \advance\@decnum by\@digit%
- \divide\@decmult by12%
- \fi
- \repeat
- \the\@decnum%
-}
-\def\@removefirstdig#1{%
- \expandafter\expandafter\expandafter\gobble\expandafter\string#1%
-}
+ \doz@charcount{#1}%
+ \doz@loopi=0%
+ \doz@basex{#1}%
+ \doz@multiplier=1%
+ \doz@total=0%
+}%
% \end{macrocode}
% Now, of course, we simply redefine all the counters. This
% covers only those counters included in the basic \LaTeX\
@@ -662,6 +766,143 @@
}
}{} % end redefinition of counters block
% \end{macrocode}
+% Now we begin the number-to-word macros. First, we define
+% the macros which allow the user to specify his own words
+% for each rank:
+% \begin{macrocode}
+\def\dozrankoneword{unqua}
+\def\dozranktwoword{biqua}
+\def\dozrankthreeword{triqua}
+\def\dozrankfourword{quadqua}
+\def\dozrankfiveword{pentqua}
+\def\dozranksixword{hexqua}
+\def\dozranksevenword{septqua}
+\def\dozrankeightword{octqua}
+\def\dozranknineword{ennqua}
+\def\dozranktenword{decqua}
+\def\dozrankelvword{elvqua}
+% \end{macrocode}
+% Then we define some |\if|s to help us decide how we should
+% capitalize the end result.
+% \begin{macrocode}
+\newif\ifDOZcaps\DOZcapsfalse
+\newif\ifDozcaps\Dozcapsfalse
+% \end{macrocode}
+% Then, we give some utility macros:
+% \begin{macrocode}
+\def\doz@expandloop#1{\doz@xloop#1\relax}
+\def\doz@xloop#1{%
+ \ifx\relax#1\else%
+ \doz@numword#1%
+ \expandafter\doz@xloop\fi%
+}
+\def\printdozrankword{}
+\def\doz@rankword{%
+ \ifnum\doz@countchar=12
+ \def\printdozrankword{\dozrankelvword}%
+ \fi
+ \ifnum\doz@countchar=11
+ \def\printdozrankword{\dozranktenword}%
+ \fi
+ \ifnum\doz@countchar=10
+ \def\printdozrankword{\dozranknineword}%
+ \fi
+ \ifnum\doz@countchar=9
+ \def\printdozrankword{\dozrankeightword}%
+ \fi
+ \ifnum\doz@countchar=8
+ \def\printdozrankword{\dozranksevenword}%
+ \fi
+ \ifnum\doz@countchar=7
+ \def\printdozrankword{\dozranksixword}%
+ \fi
+ \ifnum\doz@countchar=6
+ \def\printdozrankword{\dozrankfiveword}%
+ \fi
+ \ifnum\doz@countchar=5
+ \def\printdozrankword{\dozrankfourword}%
+ \fi
+ \ifnum\doz@countchar=4
+ \def\printdozrankword{\dozrankthreeword}%
+ \fi
+ \ifnum\doz@countchar=3
+ \def\printdozrankword{\dozranktwoword}%
+ \fi
+ \ifnum\doz@countchar=2
+ \def\printdozrankword{\dozrankoneword}%
+ \fi
+ \ifnum\doz@countchar=1
+ \def\printdozrankword{\relax}%
+ \fi
+ \advance\doz@countchar by-1
+ \ifDOZcaps
+ \edef\printdozrankword{\uppercase{\printdozrankword}}%
+ \fi
+ \ifDozcaps
+ \edef\printdozrankword{\capitalisewords{\printdozrankword}}%
+ \fi
+ \ifnum\doz@countchar>0
+ \ \printdozrankword\ %
+ \else
+ \printdozrankword%
+ \fi
+}%
+\def\doz@numword#1{%
+ \IfStrEq{#1}{0}{\def\doz@numberword{zero}}{}%
+ \IfStrEq{#1}{1}{\def\doz@numberword{one}}{}%
+ \IfStrEq{#1}{2}{\def\doz@numberword{two}}{}%
+ \IfStrEq{#1}{3}{\def\doz@numberword{three}}{}%
+ \IfStrEq{#1}{4}{\def\doz@numberword{four}}{}%
+ \IfStrEq{#1}{5}{\def\doz@numberword{five}}{}%
+ \IfStrEq{#1}{6}{\def\doz@numberword{six}}{}%
+ \IfStrEq{#1}{7}{\def\doz@numberword{seven}}{}%
+ \IfStrEq{#1}{8}{\def\doz@numberword{eight}}{}%
+ \IfStrEq{#1}{9}{\def\doz@numberword{nine}}{}%
+ \IfStrEq{#1}{X}{\def\doz@numberword{ten}}{}%
+ \IfStrEq{#1}{E}{\def\doz@numberword{eleven}}{}%
+ \ifDOZcaps
+ \edef\doz@numberword{\uppercase{\doz@numberword}}%
+ \fi
+ \ifDozcaps
+ \edef\doz@numberword{\makefirstuc{\doz@numberword}}%
+ \fi
+ \doz@numberword%
+ \doz@rankword%
+}%
+\def\doznumtoword#1{%
+ \edef\thenumber{\basexii{\value{#1}}{X}{E}}%
+ \expandafter\doz@charcount\expandafter{\thenumber}%
+ \expandafter\doz@expandloop\expandafter{\thenumber}%
+ \doz@countchar=0%
+}%
+\def\DOZnumtoword#1{%
+ \DOZcapstrue%
+ \doznumtoword{#1}%
+ \DOZcapsfalse%
+}%
+\def\Doznumtoword#1{%
+ \Dozcapstrue%
+ \doznumtoword{#1}%
+ \Dozcapsfalse%
+}%
+% \end{macrocode}
+% Our last job is to make sure the semicolon (Humphrey
+% point) works correctly as a radix point in math mode.
+% This code is adapted from the |icomma| package by Walter
+% Schmidt.
+% \begin{macrocode}
+\AtBeginDocument{%
+ \mathchardef\humphrey\mathcode`\;%
+ \mathcode`\;="8000 %
+}
+{\catcode`;=\active
+ \gdef;{\futurelet\@let@token\sm@rtsemi}
+}
+\def\sm@rtsemi{%
+ \ifx\@let@token\@sptoken \else
+ \ifx\@let@token\space \else
+ \mathord\fi\fi \humphrey}
+% \end{macrocode}
% And that's the end. Thanks for reading,
% folks; please email me with any suggestions or improvements.
% \printindex
diff --git a/Master/texmf-dist/tex/latex/dozenal/dozenal.sty b/Master/texmf-dist/tex/latex/dozenal/dozenal.sty
index c89806b8c64..b2becd88c90 100644
--- a/Master/texmf-dist/tex/latex/dozenal/dozenal.sty
+++ b/Master/texmf-dist/tex/latex/dozenal/dozenal.sty
@@ -25,9 +25,11 @@
%% This work consists of the files listed in dozenalfilelist.txt.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{dozenal}[2015/01/29 v5.3 support for dozenal fonts]
+\ProvidesPackage{dozenal}[2015/01/29 v6.0 support for dozenal fonts]
\RequirePackage{fixltx2e}
+\RequirePackage{xstring}
\RequirePackage{ifpdf}
+\RequirePackage{mfirstuc}
\DeclareOption{nocounters}{%
\def\nocounters{}%
}%
@@ -76,8 +78,8 @@ dozchbx10 <12-> dozchbx12 }{}
\fi%
\newcommand\x{\TextOrMath{\protect\doz{{X}}}{\doz@X}}%
\newcommand\e{\TextOrMath{\protect\doz{{E}}}{\doz@E}}%
-\DeclareMathSymbol{\doz@X}{\mathord}{dozens}{88}
-\DeclareMathSymbol{\doz@E}{\mathord}{dozens}{69}
+\DeclareMathSymbol{\doz@X}{\mathord}{dozens}{88}%
+\DeclareMathSymbol{\doz@E}{\mathord}{dozens}{69}%
\newcommand\tally[1]{%
\doz{#1}%
}%
@@ -85,59 +87,49 @@ dozchbx10 <12-> dozchbx12 }{}
0\or1\or2\or3\or4\or5\or6\or7\or8\or9\or#2\or#3\else
\expandafter\basexii\expandafter{\number\numexpr((#1)-6)/12}{#2}{#3}\expandafter\basexii\expandafter{\number\numexpr(#1)-((#1)-6)/12*12}{#2}{#3}\fi}
\newcommand\dozens[1]{\basexii{#1}{\x}{\e}}
-\newcount\b@charcount
-\def\gobblechar{\let\char= }
-\def\assignthencheck{\afterassignment\checknil\gobblechar}
-\def\countunlessnil{%
-\ifx\char\nil \let\next=\relax%
-\else%
-\let\next=\auxcountchar%
-\advance\b@charcount by1%
-\fi%
-\ifx\char\backslash\advance\b@charcount by-1\fi%
-\next%
+\newcount\doz@countchar
+\def\doz@charcount#1{%
+\StrLen{#1}[\doz@filler]%
+\doz@countchar=\doz@filler%
}%
-\def\auxcountchar{%
-\afterassignment\countunlessnil\gobblechar%
+\newcount\doz@lfiller\doz@lfiller=-1%
+\newcount\doz@total\doz@total=0%
+\newcount\doz@loopi\doz@loopi=0%
+\newcount\doz@multiplier\doz@multiplier=1%
+\def\ninthofmany#1#2#3#4#5#6#7#8#9{#9\gobbletorelax}
+\def\gobbletorelax#1\relax{}
+\def\doz@CharAt#1#2{%
+\expandafter\ninthofmany\romannumeral\numexpr(9000-\number#1000)#2\relax}
+\def\doz@ten{X}%
+\def\doz@elv{E}%
+\def\doz@basex#1{%
+\doz@total=0%
+\doz@loopi=\doz@countchar%
+\doz@multiplier=1%
+\def\doz@wholenum{#1}%
+\loop\ifnum\doz@loopi>0%
+\def\doz@currchar{\doz@CharAt{\number\doz@loopi}{\doz@wholenum}}%
+\if\doz@currchar\doz@ten%
+\doz@lfiller=10%
+\else\if\doz@currchar\doz@elv%
+\doz@lfiller=11%
+\else%
+\doz@lfiller=\doz@currchar%
+\fi\fi%
+\multiply\doz@lfiller by\doz@multiplier%
+\multiply\doz@multiplier by12%
+\advance\doz@total by\doz@lfiller%
+\advance\doz@loopi by-1%
+\repeat%
+\the\doz@total%
}%
-\def\countchar#1{\def\xx{#1}\b@charcount=0\expandafter\auxcountchar\xx\nil}
-\def\gobble#1{}%
-\newcount\@numdigs%
-\newcount\@decmult%
-\newcount\@loopindex\@loopindex=1%
-\newcount\@decnum\@decnum=0%
-\newcount\@digit\@digit=1%
\def\basex#1{%
-\countchar{#1}\@numdigs=\b@charcount%
-\@decmult=1\@loopindex=1%
-\loop\ifnum\@loopindex<\@numdigs%
-\multiply\@decmult by12%
-\advance\@loopindex by1%
-\repeat%
-\@loopindex=0%
-\def\isten{x}\def\iselv{e}\def\isquote{\backslash}%
-\edef\@doznum{\detokenize{#1}\relax}%
-\@decnum=0%
-\loop\ifnum\@loopindex<\@numdigs%
-\def\@firstchar{\expandafter\@car\@doznum\@nil}%
-\if\@firstchar\@backslashchar
-\edef\@doznum{\@removefirstdig{\@doznum}}%
-\else
-\if\@firstchar\isten\def\@firstchar{10}\fi
-\if\@firstchar\iselv\def\@firstchar{11}\fi
-\advance\@loopindex by1%
-\@digit=\@firstchar%
-\edef\@doznum{\@removefirstdig{\@doznum}}%
-\multiply\@digit by\@decmult%
-\advance\@decnum by\@digit%
-\divide\@decmult by12%
-\fi
-\repeat
-\the\@decnum%
-}
-\def\@removefirstdig#1{%
-\expandafter\expandafter\expandafter\gobble\expandafter\string#1%
-}
+\doz@charcount{#1}%
+\doz@loopi=0%
+\doz@basex{#1}%
+\doz@multiplier=1%
+\doz@total=0%
+}%
\@ifundefined{nocounters}{%
\@ifundefined{c@page}{}{%
\renewcommand\thepage{\basexii{\value{page}}{\x}{\e}}}
@@ -252,6 +244,125 @@ dozchbx10 <12-> dozchbx12 }{}
}
}
}{} % end redefinition of counters block
+\def\dozrankoneword{unqua}
+\def\dozranktwoword{biqua}
+\def\dozrankthreeword{triqua}
+\def\dozrankfourword{quadqua}
+\def\dozrankfiveword{pentqua}
+\def\dozranksixword{hexqua}
+\def\dozranksevenword{septqua}
+\def\dozrankeightword{octqua}
+\def\dozranknineword{ennqua}
+\def\dozranktenword{decqua}
+\def\dozrankelvword{elvqua}
+\newif\ifDOZcaps\DOZcapsfalse
+\newif\ifDozcaps\Dozcapsfalse
+\def\doz@expandloop#1{\doz@xloop#1\relax}
+\def\doz@xloop#1{%
+\ifx\relax#1\else%
+\doz@numword#1%
+\expandafter\doz@xloop\fi%
+}
+\def\printdozrankword{}
+\def\doz@rankword{%
+\ifnum\doz@countchar=12
+\def\printdozrankword{\dozrankelvword}%
+\fi
+\ifnum\doz@countchar=11
+\def\printdozrankword{\dozranktenword}%
+\fi
+\ifnum\doz@countchar=10
+\def\printdozrankword{\dozranknineword}%
+\fi
+\ifnum\doz@countchar=9
+\def\printdozrankword{\dozrankeightword}%
+\fi
+\ifnum\doz@countchar=8
+\def\printdozrankword{\dozranksevenword}%
+\fi
+\ifnum\doz@countchar=7
+\def\printdozrankword{\dozranksixword}%
+\fi
+\ifnum\doz@countchar=6
+\def\printdozrankword{\dozrankfiveword}%
+\fi
+\ifnum\doz@countchar=5
+\def\printdozrankword{\dozrankfourword}%
+\fi
+\ifnum\doz@countchar=4
+\def\printdozrankword{\dozrankthreeword}%
+\fi
+\ifnum\doz@countchar=3
+\def\printdozrankword{\dozranktwoword}%
+\fi
+\ifnum\doz@countchar=2
+\def\printdozrankword{\dozrankoneword}%
+\fi
+\ifnum\doz@countchar=1
+\def\printdozrankword{\relax}%
+\fi
+\advance\doz@countchar by-1
+\ifDOZcaps
+\edef\printdozrankword{\uppercase{\printdozrankword}}%
+\fi
+\ifDozcaps
+\edef\printdozrankword{\capitalisewords{\printdozrankword}}%
+\fi
+\ifnum\doz@countchar>0
+\ \printdozrankword\ %
+\else
+\printdozrankword%
+\fi
+}%
+\def\doz@numword#1{%
+\IfStrEq{#1}{0}{\def\doz@numberword{zero}}{}%
+\IfStrEq{#1}{1}{\def\doz@numberword{one}}{}%
+\IfStrEq{#1}{2}{\def\doz@numberword{two}}{}%
+\IfStrEq{#1}{3}{\def\doz@numberword{three}}{}%
+\IfStrEq{#1}{4}{\def\doz@numberword{four}}{}%
+\IfStrEq{#1}{5}{\def\doz@numberword{five}}{}%
+\IfStrEq{#1}{6}{\def\doz@numberword{six}}{}%
+\IfStrEq{#1}{7}{\def\doz@numberword{seven}}{}%
+\IfStrEq{#1}{8}{\def\doz@numberword{eight}}{}%
+\IfStrEq{#1}{9}{\def\doz@numberword{nine}}{}%
+\IfStrEq{#1}{X}{\def\doz@numberword{ten}}{}%
+\IfStrEq{#1}{E}{\def\doz@numberword{eleven}}{}%
+\ifDOZcaps
+\edef\doz@numberword{\uppercase{\doz@numberword}}%
+\fi
+\ifDozcaps
+\edef\doz@numberword{\makefirstuc{\doz@numberword}}%
+\fi
+\doz@numberword%
+\doz@rankword%
+}%
+\def\doznumtoword#1{%
+\edef\thenumber{\basexii{\value{#1}}{X}{E}}%
+\expandafter\doz@charcount\expandafter{\thenumber}%
+\expandafter\doz@expandloop\expandafter{\thenumber}%
+\doz@countchar=0%
+}%
+\def\DOZnumtoword#1{%
+\DOZcapstrue%
+\doznumtoword{#1}%
+\DOZcapsfalse%
+}%
+\def\Doznumtoword#1{%
+\Dozcapstrue%
+\doznumtoword{#1}%
+\Dozcapsfalse%
+}%
+\AtBeginDocument{%
+ \mathchardef\humphrey\mathcode`\;%
+ \mathcode`\;="8000 %
+}
+{\catcode`;=\active
+ \gdef;{\futurelet\@let@token\sm@rtsemi}
+}
+\def\sm@rtsemi{%
+ \ifx\@let@token\@sptoken \else
+ \ifx\@let@token\space \else
+ \mathord\fi\fi \humphrey}
\endinput
%%
%% End of file `dozenal.sty'.