diff options
Diffstat (limited to 'Master/texmf-dist')
49 files changed, 373 insertions, 21 deletions
diff --git a/Master/texmf-dist/doc/fonts/dozenal/README b/Master/texmf-dist/doc/fonts/dozenal/README index 59c9b51b87f..a7d8b82eabd 100644 --- a/Master/texmf-dist/doc/fonts/dozenal/README +++ b/Master/texmf-dist/doc/fonts/dozenal/README @@ -102,3 +102,8 @@ the Type 1 italic TFM wasn't properly formed; I switched 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. Submitted to +CTAN on 17 May 11E9 (decimal 19 May 2013). diff --git a/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf b/Master/texmf-dist/doc/fonts/dozenal/dozenal.pdf Binary files differindex 1798d8c10b0..d6a3dacab3a 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/fonts/afm/public/dozenal/fdzb8a.afm b/Master/texmf-dist/fonts/afm/public/dozenal/fdzb8a.afm index 64d561f6441..2c3f1b0c975 100644 --- a/Master/texmf-dist/fonts/afm/public/dozenal/fdzb8a.afm +++ b/Master/texmf-dist/fonts/afm/public/dozenal/fdzb8a.afm @@ -6,13 +6,19 @@ FamilyName dozchbx Weight Medium Notice Font converted to Type 1 by mf2pt1, written by Scott Pakin. ItalicAngle 0 -IsFixedPitch true +IsFixedPitch false UnderlinePosition -100 UnderlineThickness 50 Version 001.000 EncodingScheme FontSpecific -FontBBox 53 -11 513 656 -StartCharMetrics 2 +FontBBox 5 -17 639 661 +StartCharMetrics 8 +C 49 ; WX 575 ; N one ; B 282 -17 293 661 ; +C 50 ; WX 708 ; N two ; B 5 -17 639 661 ; +C 51 ; WX 708 ; N three ; B 58 -17 639 661 ; +C 52 ; WX 708 ; N four ; B 58 -17 639 661 ; +C 53 ; WX 708 ; N five ; B 58 -17 639 661 ; +C 54 ; WX 708 ; N six ; B 58 -17 639 661 ; C 69 ; WX 575 ; N E ; B 53 -11 513 656 ; C 88 ; WX 575 ; N X ; B 63 -11 511 650 ; EndCharMetrics diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/fdzbi8a.afm b/Master/texmf-dist/fonts/afm/public/dozenal/fdzbi8a.afm index 4becec92a31..3b8fee88b8e 100644 --- a/Master/texmf-dist/fonts/afm/public/dozenal/fdzbi8a.afm +++ b/Master/texmf-dist/fonts/afm/public/dozenal/fdzbi8a.afm @@ -6,13 +6,19 @@ FamilyName dozchbxi Weight Medium Notice Font converted to Type 1 by mf2pt1, written by Scott Pakin. ItalicAngle -14.0362 -IsFixedPitch true +IsFixedPitch false UnderlinePosition -100 UnderlineThickness 50 Version 001.000 EncodingScheme FontSpecific -FontBBox 31 -36 636 686 -StartCharMetrics 2 +FontBBox 7 -36 799 686 +StartCharMetrics 8 +C 49 ; WX 530 ; N one ; B 255 -22 436 667 ; +C 50 ; WX 703 ; N two ; B 7 -22 629 667 ; +C 51 ; WX 703 ; N three ; B 49 -22 799 667 ; +C 52 ; WX 703 ; N four ; B 49 -22 799 667 ; +C 53 ; WX 703 ; N five ; B 49 -22 799 667 ; +C 54 ; WX 703 ; N six ; B 49 -22 799 667 ; C 69 ; WX 530 ; N E ; B 31 -36 633 681 ; C 88 ; WX 530 ; N X ; B 96 0 636 686 ; EndCharMetrics diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/fdzbs8a.afm b/Master/texmf-dist/fonts/afm/public/dozenal/fdzbs8a.afm index 6d2e3e701bd..66c612b927d 100644 --- a/Master/texmf-dist/fonts/afm/public/dozenal/fdzbs8a.afm +++ b/Master/texmf-dist/fonts/afm/public/dozenal/fdzbs8a.afm @@ -6,14 +6,20 @@ FamilyName dozchbxsl Weight Medium Notice Font converted to Type 1 by mf2pt1, written by Scott Pakin. ItalicAngle -9.46251 -IsFixedPitch true +IsFixedPitch false UnderlinePosition -100 UnderlineThickness 50 Version 001.000 EncodingScheme FontSpecific -FontBBox 78 -11 619 656 -StartCharMetrics 2 +FontBBox 4 -17 748 661 +StartCharMetrics 8 +C 49 ; WX 575 ; N one ; B 280 -17 402 661 ; +C 50 ; WX 708 ; N two ; B 4 -17 637 661 ; +C 51 ; WX 708 ; N three ; B 56 -17 748 661 ; +C 52 ; WX 708 ; N four ; B 56 -17 748 661 ; +C 53 ; WX 708 ; N five ; B 56 -17 748 661 ; +C 54 ; WX 708 ; N six ; B 56 -17 748 661 ; C 69 ; WX 575 ; N E ; B 78 -11 607 656 ; -C 88 ; WX 575 ; N X ; B 94 -11 619 650 ; +C 88 ; WX 575 ; N X ; B 93 -11 619 650 ; EndCharMetrics EndFontMetrics diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/fdzi8a.afm b/Master/texmf-dist/fonts/afm/public/dozenal/fdzi8a.afm index 2e4fa0d83ac..c4aebe1011b 100644 --- a/Master/texmf-dist/fonts/afm/public/dozenal/fdzi8a.afm +++ b/Master/texmf-dist/fonts/afm/public/dozenal/fdzi8a.afm @@ -6,13 +6,19 @@ FamilyName dozchit Weight Medium Notice Font converted to Type 1 by mf2pt1, written by Scott Pakin. ItalicAngle -14.0362 -IsFixedPitch true +IsFixedPitch false UnderlinePosition -100 UnderlineThickness 50 Version 001.000 EncodingScheme FontSpecific -FontBBox 45 -25 576 672 -StartCharMetrics 2 +FontBBox 11 -28 795 672 +StartCharMetrics 8 +C 49 ; WX 460 ; N one ; B 219 -28 402 672 ; +C 50 ; WX 696 ; N two ; B 11 -28 622 672 ; +C 51 ; WX 696 ; N three ; B 40 -28 795 672 ; +C 52 ; WX 696 ; N four ; B 40 -28 795 672 ; +C 53 ; WX 696 ; N five ; B 40 -28 795 672 ; +C 54 ; WX 696 ; N six ; B 40 -28 795 672 ; C 69 ; WX 460 ; N E ; B 45 -25 566 670 ; C 88 ; WX 460 ; N X ; B 99 0 576 672 ; EndCharMetrics diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/fdzr8a.afm b/Master/texmf-dist/fonts/afm/public/dozenal/fdzr8a.afm index c0d0d15b899..f55fef571ad 100644 --- a/Master/texmf-dist/fonts/afm/public/dozenal/fdzr8a.afm +++ b/Master/texmf-dist/fonts/afm/public/dozenal/fdzr8a.afm @@ -6,13 +6,19 @@ FamilyName dozchars Weight Medium Notice Font converted to Type 1 by mf2pt1, written by Scott Pakin. ItalicAngle 0 -IsFixedPitch true +IsFixedPitch false UnderlinePosition -100 UnderlineThickness 50 Version 001.000 EncodingScheme FontSpecific -FontBBox 33 -22 445 667 -StartCharMetrics 2 +FontBBox 17 -28 628 672 +StartCharMetrics 8 +C 49 ; WX 500 ; N one ; B 244 -28 256 672 ; +C 50 ; WX 700 ; N two ; B 17 -28 628 672 ; +C 51 ; WX 700 ; N three ; B 50 -28 628 672 ; +C 52 ; WX 700 ; N four ; B 50 -28 628 672 ; +C 53 ; WX 700 ; N five ; B 50 -28 628 672 ; +C 54 ; WX 700 ; N six ; B 50 -28 628 672 ; C 69 ; WX 500 ; N E ; B 33 -22 445 667 ; C 88 ; WX 500 ; N X ; B 54 -22 444 656 ; EndCharMetrics diff --git a/Master/texmf-dist/fonts/afm/public/dozenal/fdzs8a.afm b/Master/texmf-dist/fonts/afm/public/dozenal/fdzs8a.afm index 506648958f8..ad0b6868cf8 100644 --- a/Master/texmf-dist/fonts/afm/public/dozenal/fdzs8a.afm +++ b/Master/texmf-dist/fonts/afm/public/dozenal/fdzs8a.afm @@ -6,13 +6,19 @@ FamilyName dozchsl Weight Medium Notice Font converted to Type 1 by mf2pt1, written by Scott Pakin. ItalicAngle -9.46251 -IsFixedPitch true +IsFixedPitch false UnderlinePosition -100 UnderlineThickness 50 Version 001.000 EncodingScheme FontSpecific -FontBBox 58 -22 554 667 -StartCharMetrics 2 +FontBBox 13 -28 739 672 +StartCharMetrics 8 +C 49 ; WX 500 ; N one ; B 241 -28 367 672 ; +C 50 ; WX 700 ; N two ; B 13 -28 624 672 ; +C 51 ; WX 700 ; N three ; B 46 -28 739 672 ; +C 52 ; WX 700 ; N four ; B 46 -28 739 672 ; +C 53 ; WX 700 ; N five ; B 46 -28 739 672 ; +C 54 ; WX 700 ; N six ; B 46 -28 739 672 ; C 69 ; WX 500 ; N E ; B 58 -22 538 667 ; C 88 ; WX 500 ; N X ; B 82 -22 554 656 ; EndCharMetrics diff --git a/Master/texmf-dist/fonts/source/public/dozenal/dozenal.mf b/Master/texmf-dist/fonts/source/public/dozenal/dozenal.mf index f7c27e350e4..42a4d8fd631 100644 --- a/Master/texmf-dist/fonts/source/public/dozenal/dozenal.mf +++ b/Master/texmf-dist/fonts/source/public/dozenal/dozenal.mf @@ -69,4 +69,81 @@ fill z5..{left}z1{left}..{down}z7{down}..{right}z3{left}..{down}z6{down}..{right penlabels(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19); endchar; + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Prepare the character for the tally mark 1 % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +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; +draw z0--z1; + +endchar; + +beginchar("2",fig_height#+u#,fig_height#,0); "The Tally Mark 2"; + +z0 = (0+o,h+o); +z1 = (0+o,0-o); +z2 = (h-o,0-o); + +pickup pencircle xscaled 8 rotated 45; +draw z0--z1--z2; + +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); + +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; +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); + +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; +endchar; + + end; diff --git a/Master/texmf-dist/fonts/source/public/dozenal/dozenalb.mf b/Master/texmf-dist/fonts/source/public/dozenal/dozenalb.mf index 3633aa4a235..402ee79702e 100644 --- a/Master/texmf-dist/fonts/source/public/dozenal/dozenalb.mf +++ b/Master/texmf-dist/fonts/source/public/dozenal/dozenalb.mf @@ -69,4 +69,81 @@ fill z5..{left}z1{left}..{down}z7{down}..{right}z3{left}..{down}z6{down}..{right penlabels(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19); endchar; + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Prepare the character for the tally mark 1 % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +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; +draw z0--z1; + +endchar; + +beginchar("2",fig_height#+u#,fig_height#,0); "The Tally Mark 2"; + +z0 = (0+o,h+o); +z1 = (0+o,0-o); +z2 = (h-o,0-o); + +pickup pencircle xscaled 8 rotated 45; +draw z0--z1--z2; + +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); + +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; +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); + +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; +endchar; + + end; diff --git a/Master/texmf-dist/fonts/source/public/dozenal/dozenali.mf b/Master/texmf-dist/fonts/source/public/dozenal/dozenali.mf index 7efd270c0c5..e5c6432be5f 100644 --- a/Master/texmf-dist/fonts/source/public/dozenal/dozenali.mf +++ b/Master/texmf-dist/fonts/source/public/dozenal/dozenali.mf @@ -89,4 +89,81 @@ penstroke z12e..z2e..z10e..z7e..z5e..{right}z9e; penlabels(1,2,3,4,5,6,7,8,9,10,11,12); endchar; + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Prepare the character for the tally mark 1 % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +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; +draw z0--z1; + +endchar; + +beginchar("2",fig_height#+u#,fig_height#,0); "The Tally Mark 2"; + +z0 = (0+o,h+o); +z1 = (0+o,0-o); +z2 = (h-o,0-o); + +pickup pencircle xscaled 8 rotated 45; +draw z0--z1--z2; + +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); + +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; +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); + +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; +endchar; + + end; diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars10.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars10.tfm Binary files differindex 8baea66b480..8a8a0f54345 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars10.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars10.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars12.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars12.tfm Binary files differindex a60241d4b10..5dadfdfb23c 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars12.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars12.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars17.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars17.tfm Binary files differindex d61eba95e8d..c7879e26999 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars17.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars17.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars6.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars6.tfm Binary files differindex 2290c25a9a1..f7994560b85 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars6.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars6.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars7.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars7.tfm Binary files differindex 27f007ee530..bb507ba6b3c 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars7.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars7.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars8.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars8.tfm Binary files differindex e98fc4b7043..0e38fb33678 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars8.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars8.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars9.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars9.tfm Binary files differindex 363f0c11531..7394a07301b 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars9.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchars9.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchb10.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchb10.tfm Binary files differindex 8baea66b480..8a8a0f54345 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchb10.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchb10.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx10.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx10.tfm Binary files differindex 4e1365a72c6..36ccbe002ff 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx10.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx10.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx12.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx12.tfm Binary files differindex 75cdfd31428..c7b127e8c84 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx12.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx12.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx6.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx6.tfm Binary files differindex 14151e49517..ac456916308 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx6.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx6.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx7.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx7.tfm Binary files differindex d4165014230..51f451ba650 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx7.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx7.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx8.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx8.tfm Binary files differindex 1c14ad07ec8..c739aeace72 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx8.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx8.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx9.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx9.tfm Binary files differindex 01fdc9101c3..93c70cbe956 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx9.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbx9.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbxi10.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbxi10.tfm Binary files differindex 4fec03ec709..55775a6fa12 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbxi10.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbxi10.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbxsl10.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbxsl10.tfm Binary files differindex c7f3a6fbabf..004006f2052 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbxsl10.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchbxsl10.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit10.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit10.tfm Binary files differindex d95de169129..555331fe397 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit10.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit10.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit12.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit12.tfm Binary files differindex 1b0ff8c3998..9dcd6a51b71 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit12.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit12.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit7.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit7.tfm Binary files differindex f53b75e8ad2..9d4dd48a8f4 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit7.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit7.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit8.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit8.tfm Binary files differindex 4a7a5d0aeab..23234f689b1 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit8.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit8.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit9.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit9.tfm Binary files differindex 9d1c32cad8e..b915061285a 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit9.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchit9.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchsl10.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchsl10.tfm Binary files differindex f295394693e..a6cf3743f54 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchsl10.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchsl10.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchsl12.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchsl12.tfm Binary files differindex bf83981d286..2b3b1a16812 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchsl12.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchsl12.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchsl8.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchsl8.tfm Binary files differindex e3fe9b7e15d..9154cc8b9cc 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchsl8.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchsl8.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchsl9.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchsl9.tfm Binary files differindex b3327a00f59..5a830ed6731 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/dozchsl9.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/dozchsl9.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb8a.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb8a.tfm Binary files differindex 8a689e40e21..0b5347c5696 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb8a.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzb8a.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi8a.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi8a.tfm Binary files differindex d246d038a28..62569a2c2c3 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi8a.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbi8a.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbs8a.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbs8a.tfm Binary files differindex 8c622406441..5e61b3a73fc 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzbs8a.tfm +++ 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 Binary files differindex d03651e01c2..b19f38786ad 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzi8a.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzi8a.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr8a.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr8a.tfm Binary files differindex cb48d122cac..8cc700f1c7c 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr8a.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzr8a.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs8a.tfm b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs8a.tfm Binary files differindex 09cb1291f85..c9521dfb7bb 100644 --- a/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs8a.tfm +++ b/Master/texmf-dist/fonts/tfm/public/dozenal/fdzs8a.tfm diff --git a/Master/texmf-dist/fonts/type1/public/dozenal/fdzb8a.pfb b/Master/texmf-dist/fonts/type1/public/dozenal/fdzb8a.pfb Binary files differindex e319afcd972..fb0f6efde07 100644 --- a/Master/texmf-dist/fonts/type1/public/dozenal/fdzb8a.pfb +++ 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 Binary files differindex 8a1594e4e9e..dda319214c3 100644 --- a/Master/texmf-dist/fonts/type1/public/dozenal/fdzbi8a.pfb +++ 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 Binary files differindex 6687f91bb8f..f0d706aabad 100644 --- a/Master/texmf-dist/fonts/type1/public/dozenal/fdzbs8a.pfb +++ 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 Binary files differindex b467b7e35fd..3e959c8bba7 100644 --- a/Master/texmf-dist/fonts/type1/public/dozenal/fdzi8a.pfb +++ 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 Binary files differindex 575b3b6d189..0c7f7d3a86e 100644 --- a/Master/texmf-dist/fonts/type1/public/dozenal/fdzr8a.pfb +++ 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 Binary files differindex d5e265d58c9..1089a7d2e5f 100644 --- a/Master/texmf-dist/fonts/type1/public/dozenal/fdzs8a.pfb +++ b/Master/texmf-dist/fonts/type1/public/dozenal/fdzs8a.pfb diff --git a/Master/texmf-dist/tex/latex/dozenal/dozenal.sty b/Master/texmf-dist/tex/latex/dozenal/dozenal.sty index c7a73460df2..4b81f53e146 100644 --- a/Master/texmf-dist/tex/latex/dozenal/dozenal.sty +++ b/Master/texmf-dist/tex/latex/dozenal/dozenal.sty @@ -177,6 +177,63 @@ % would use the same characters), or you could use the % |\dozens| command instead. Whatever your pleasure might % be. +% +% The |nocounters|\DescribeMacro{nocounters}\ option to the +% package prevents the redefinition of these counters. The +% effect of this is that the commands of the 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 which these +% counters are undefined (e.g., |minimal|). +% +% \section{The Fonts} +% \label{sect:fonts} +% +% The fonts provided by the dozenal package are essentially +% complete fonts which contain only the Pitman dozenal +% characters; these are \x\ for ten and \e\ for eleven. +% These characters are designed to blend well with the +% Computer Modern fonts; they work passable well with +% Times-type fonts and with kpfonts, and possibly with +% others. +% +% The characters also come in all the appropriate shapes and +% sizes; a few examples follow. +% +% \begin{center} +% \begin{tabular}{lccc} +% {} & Roman & \textit{Italic} & \textbf{Boldface} \\ +% \footnotesize Footnotesize & \footnotesize\x\ \e & \footnotesize\itshape +% \x\ \e & \footnotesize\bfseries \x \e \\ +% \normalsize Normalsize & \normalsize\x\ \e & \normalsize\itshape +% \x\ \e & \normalsize\bfseries \x \e \\ +% \LARGE LARGE & \LARGE\x\ \e & \LARGE\itshape +% \x\ \e & \LARGE\bfseries \x \e \\ +% \Huge Huge & \Huge\x\ \e & \Huge\itshape +% \x\ \e & \Huge\bfseries \x \e \\ +% \end{tabular} +% \end{center} +% +% They will work in paragraph or math mode without +% distinction. +% +% As of v4.0, |dozenal| also includes fonts for tally marks +% specifically designed for use in the dozenal base. In many +% European countries tallies are kept in a very similar way; +% this font demonstrates a way that such tally marks can be +% made consistent as well as dozenal. +% +% \begin{center} +% \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} +% +% The fonts are called |dozch|, if for some reason direct +% access to them is needed. The Type 1 versions are +% prefixed |fdz|; e.g., |fdzr8a|. % % \section{Implementation} % \label{sect:code} @@ -184,7 +241,7 @@ % First, we name the package that we provide. This is % not exactly the most difficult part of the code. % \begin{macrocode} -\ProvidesPackage{dozenal}[2012/05/13 v3.3 support for dozenal fonts] +\ProvidesPackage{dozenal}[2012/05/13 v4.0 support for dozenal fonts] % \end{macrocode} % Now we need to make sure that we have fixltx2e loaded, so % that the |\TextorMath| magic will work. @@ -196,6 +253,17 @@ % \begin{macrocode} \RequirePackage{ifpdf} % \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, +% such as |minimal|. Defines the command |\nocounters| if +% and only if the options is named. +% \begin{macrocode} +\DeclareOption{nocounters}{% + \def\nocounters{}% +}% +\ProcessOptions\relax +% \end{macrocode} % We then define the font that we're using for our % \MF-produced Pitman characters. Incidentally, we also % define the command |\doz|, though I can't foresee any @@ -206,7 +274,7 @@ % so it will work with either. % \begin{macrocode} \DeclareFontFamily{OT1}{dozch}{} -\DeclareFontShape{OT1}{dozch}{m}{n}{<-7> dozchars6 <7> dozchars7 <8> dozchars8 <9> dozchars9 <10-11> dozchars10 <12-16> dozchars12 <17-> dozchars17 }{} +\DeclareFontShape{OT1}{dozch}{m}{n}{<-6> dozchars6 <7> dozchars7 <8> dozchars8 <9> dozchars9 <10-11> dozchars10 <12-16> dozchars12 <17-> dozchars17 }{} \DeclareFontShape{OT1}{dozch}{b}{n}{<-> dozchb10 }{} \DeclareFontShape{OT1}{dozch}{bx}{n}{<-6> dozchbx6 <7> dozchbx7 <8> dozchbx8 <9> dozchbx9 <10-11> dozchbx10 <12-> dozchbx12 }{} \DeclareFontShape{OT1}{dozch}{m}{sl}{<-8> dozchsl8 <9> dozchsl9 <10-11> dozchsl10 <12-> dozchsl12 }{} @@ -230,6 +298,12 @@ \DeclareMathSymbol{\X}{\mathord}{dozens}{88} \DeclareMathSymbol{\E}{\mathord}{dozens}{69} % \end{macrocode} +% Put in some additional code for the tally marks. +% \begin{macrocode} +\newcommand\tally[1]{% + \doz{#1}% +}% +% \end{macrocode} % Then we define our command which will produce the dozenal % numbers from decimal sources. This algorithm was taken % directly from the publicly available archives of @@ -255,7 +329,12 @@ % otherwise, in documents where |\mainmatter| is defined but % not used, the counters will not be redefined. This way, % they're redefined in all cases. +% +% This also takes care of ensuring that the counters are +% only redefined if the ``nocounters'' options was +% \emph{not} specified. % \begin{macrocode} +\@ifundefined{nocounters}{% \@ifundefined{c@page}{}{\renewcommand\thepage{\basexii{\value{page}}{\x}{\e}}} \@ifundefined{c@footnote}{}{\renewcommand\thefootnote{\basexii{\value{footnote}}{\x}{\e}}} \@ifundefined{c@part}{}{\renewcommand\thepart{\basexii{\value{part}}{\x}{\e}}} @@ -311,6 +390,7 @@ \renewcommand\thesubsubsection{\thesubsection.\basexii{\value{subsubsection}}{\x}{\e}} } % end if it's defined }} +}{} % end redefinition of counters block % \end{macrocode} % And that's the end. Thanks for reading, % folks; please email me with any suggestions or improvements. |