dozenal (28jun15)

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

2 files changed, 176 insertions, 46 deletions

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;