fetamont (15may15)

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

3 files changed, 184 insertions, 34 deletions

diff --git a/Master/texmf-dist/fonts/source/public/fetamont/ffmbase.mf b/Master/texmf-dist/fonts/source/public/fetamont/ffmbase.mf
index d4a74796d3a..c1ed8a63d30 100644
--- a/Master/texmf-dist/fonts/source/public/fetamont/ffmbase.mf
+++ b/Master/texmf-dist/fonts/source/public/fetamont/ffmbase.mf
@@ -710,7 +710,6 @@ code_offset:=0;
 u#:=u#/.9;   
 define_pixels(u); 
 
-
 ffmcopiedchar("dotlessi","i");
 ffmcopiedchar("dotlessj","j");
 ffmcopiedchar("dcroat","eth");
@@ -844,6 +843,7 @@ addkernclassf("S","Sacute","Scedilla","Scaron");
 addkernclassf("T","Tcaron","Tcedilla");
 addkernclassf("V","W");
 addkernclassf("Y","Ydieresis","Yacute");
+addkernclassf("Z","Zacute","Zcaron","Zdotaccent");
 addkernclassf("a","abreve","aogonek","agrave","aacute","acircumflex","atilde","adieresis","aring");
 addkernclassf("b");
 addkernclassf("c","cacute","ccaron","ccedilla");
@@ -860,6 +860,11 @@ addkernclassf("s","scedilla","sacute","scaron");
 addkernclassf("t","tcaron","tcedilla");
 addkernclassf("v","w");
 addkernclassf("y","ydieresis","yacute");
+addkernclassf("zero","three","eight","nine");
+addkernclassf("two");
+addkernclassf("four");
+addkernclassf("five","six");
+addkernclassf("seven");
 
 addkernclasss("A","Abreve","Aogonek","Agrave","Aacute","Acircumflex","Atilde","Adieresis","Aring","AE","Germandbls");
 addkernclasss("C","G","O","Q","Cacute","Ccaron","Gbreve","Ohungarumlaut","Ccedilla","Ograve","Oacute","Ocircumflex","Otilde","Odieresis","OE","Oslash");
@@ -890,31 +895,65 @@ addkernclasss("ydieresis","yacute");
 addkernclasss("z");
 addkernclasss("zacute","zcaron","zdotaccent");
 addkernclasss("period","comma");
+addkernclasss("zero","six","eight");
+addkernclasss("one");
+addkernclasss("two");
+addkernclasss("three");
+addkernclasss("four");
+addkernclasss("five");
+addkernclasss("seven");
+addkernclasss("nine");
 
 addclasskern("A","T",-.5u#); 
 addclasskern("A","V",-.25u#);
+addclasskern("A","one",-.25u#);
+addclasskern("A","three",-.5u#);
+addclasskern("A","seven",-u#); 
 addclasskern("B","C",.5u#);  
 addclasskern("B","T",-u#); 
 addclasskern("B","V",-.5u#);
 addclasskern("B","c",.5u#);  
 addclasskern("B","cacute",.5u#);  
+addclasskern("B","zero",.5u#); 
+addclasskern("B","seven",-u#); 
 addclasskern("C","C",-.5u#);  
+addclasskern("C","zero",-.5u#);  
+addclasskern("C","one",-u#);  
+addclasskern("C","four",-u#);  
 addclasskern("D","C",u#);  
 addclasskern("D","S",.5u#); % make compatible with METAPOST-logo
 addclasskern("D","T",-.5u#); 
 addclasskern("D","X",-.5u#); 
 addclasskern("D","c",.5u#);  
 addclasskern("D","cacute",.5u#);  
-addclasskern("D","s",.5u#); % make compatible with METAPOST-logo
+addclasskern("D","s",.5u#); 
 addclasskern("D","period",-u#); 
+addclasskern("D","zero",.5u#);  
+addclasskern("D","one",.5u#);  
+addclasskern("D","two",.5u#);  
+addclasskern("D","four",.5u#); 
+addclasskern("D","nine",u#); 
 addclasskern("F","C",-u#); % original
 addclasskern("F","J",-3u#);
 addclasskern("F","c",-u#); 
 addclasskern("F","cacute",-u#); 
 addclasskern("F","j",-3u#);
-addclasskern("J","period",-u#); 
+addclasskern("F","period",-3u#);
+addclasskern("F","zero",-u#); 
+addclasskern("F","one",-.5u#); 
+addclasskern("F","two",-.5u#); 
+addclasskern("F","three",-.5u#);
+addclasskern("F","four",-u#); 
+addclasskern("F","seven",-.5u#); 
+addclasskern("J","period",-u#);  
+addclasskern("J","three",-.5u#); 
+addclasskern("J","four",-.5u#);
 addclasskern("K","C",-.5u#); 
 addclasskern("K","t",-u#); 
+addclasskern("K","one",-.5u#); 
+addclasskern("K","two",.5u#); 
+addclasskern("K","three",.5u#); 
+addclasskern("K","four",-.5u#); 
 addclasskern("L","T",-2.5u#);
 addclasskern("L","V",-2u#); 
 addclasskern("L","Y",-2u#); 
@@ -923,6 +962,11 @@ addclasskern("L","tcaron",-2.5u#);
 addclasskern("L","v",-1.5u#);
 addclasskern("L","y",-1.5u#);
 addclasskern("L","ydieresis",-1.5u#);  
+addclasskern("L","zero",.5u#);
+addclasskern("L","one",-u#);
+addclasskern("L","two",.5u#);
+addclasskern("L","three",.5u#);
+addclasskern("L","seven",-u#);
 addclasskern("P","C",u#); % original
 addclasskern("P","J",-2u#);
 addclasskern("P","V",-.25u#);
@@ -930,17 +974,46 @@ addclasskern("P","c",u#);
 addclasskern("P","cacute",u#); 
 addclasskern("P","j",-2u#);
 addclasskern("P","period",-3u#); 
+addclasskern("P","zero",.5u#); 
+addclasskern("P","one",.5u#); 
+addclasskern("P","two",-.5u#); 
+addclasskern("P","three",-.5u#); 
+addclasskern("P","four",-.5u#); 
+addclasskern("P","seven",-.25u#); 
+addclasskern("P","nine",u#);
 addclasskern("Thorn","T",-.5u#); 
 addclasskern("Thorn","V",-.25u#); 
 addclasskern("Thorn","X",-u#); 
 addclasskern("Thorn","period",-3u#); 
+addclasskern("Thorn","one",.5u#); 
+addclasskern("Thorn","three",-u#); 
+addclasskern("Thorn","seven",-.5u#); 
+addclasskern("Q","C",u#);  
+addclasskern("Q","S",.5u#); 
 addclasskern("Q","T",-.5u#); 
-addclasskern("Q","period",-u#); 
+addclasskern("Q","c",.5u#);  
+addclasskern("Q","cacute",.5u#);  
+addclasskern("Q","s",.5u#); 
+addclasskern("Q","zero",u#);  
+addclasskern("Q","one",.5u#);  
+addclasskern("Q","two",u#);
+addclasskern("Q","three",.5u#); 
+addclasskern("Q","four",.5u#); 
+addclasskern("Q","five",.5u#); 
+addclasskern("Q","nine",u#);
 addclasskern("R","C",u#);
+addclasskern("R","zero",u#);
+addclasskern("R","one",.5u#);  
+addclasskern("R","two",.5u#); 
+addclasskern("R","five",.5u#); 
+addclasskern("R","nine",u#);
 addclasskern("S","C",u#);
 addclasskern("S","T",-.5u#); % make compatible with METAPOST-logo
 addclasskern("S","c",.5u#);
 addclasskern("S","cacute",.5u#); 
+addclasskern("S","zero",.5u#);
+addclasskern("S","three",-.5u#);
+addclasskern("S","seven",-.5u#);
 addclasskern("T","A",-.5u#); % original
 addclasskern("T","C",-.5u#); 
 addclasskern("T","J",-2.5u#); 
@@ -964,7 +1037,12 @@ addclasskern("T","y",-1.5u#);
 addclasskern("T","ydieresis",-u#); 
 addclasskern("T","z",-1.5u#); 
 addclasskern("T","zacute",-u#); 
-addclasskern("T","period",-3u#);
+addclasskern("T","period",-3u#); 
+addclasskern("T","one",-.5u#); 
+addclasskern("T","two",.5u#); 
+addclasskern("T","three",.5u#); 
+addclasskern("T","four",-u#); 
+addclasskern("T","seven",u#);
 addclasskern("V","A",-.25u#);
 addclasskern("V","C",-.25u#);
 addclasskern("V","J",-u#);
@@ -982,9 +1060,27 @@ addclasskern("V","x",-.5u#);
 addclasskern("V","ydieresis",.5u#); 
 addclasskern("V","z",-.5u#); 
 addclasskern("V","period",-3u#);
+addclasskern("V","zero",-.25u#);
+addclasskern("V","four",-u#);
+addclasskern("Y","C",-.5u#);
 addclasskern("Y","J",-u#);
 addclasskern("Y","j",-u#);
 addclasskern("Y","period",-u#);
+addclasskern("Y","zero",-.5u#);
+addclasskern("Y","two",-u#);
+addclasskern("Y","three",-.5u#);
+addclasskern("Y","four",-u#);
+addclasskern("Y","five",-.5u#);
+addclasskern("Y","seven",-.5u#);
+addclasskern("Z","C",-.5u#);  
+addclasskern("Z","zero",-.5u#);  
+addclasskern("Z","one",-u#);
+addclasskern("Z","two",-.5u#);
+addclasskern("Z","three",-.5u#);
+addclasskern("Z","four",-u#);
+addclasskern("Z","five",-.5u#);
+addclasskern("Z","seven",-.5u#);
+addclasskern("Z","nine",-.5u#);
 addclasskern("a","t",-.5u#); 
 addclasskern("a","tcaron",-.5u#); 
 addclasskern("a","v",-.25u#);
@@ -995,25 +1091,33 @@ addclasskern("b","tcaron",-u#);
 addclasskern("b","v",-.5u#);
 addclasskern("c","c",-.5u#);  
 addclasskern("c","cacute",-.5u#);  
+addclasskern("c","four",-.5u#);
 addclasskern("d","c",u#);  
 addclasskern("d","cacute",u#);  
 addclasskern("d","s",.5u#); % make compatible with METAPOST-logo
 addclasskern("d","t",-.5u#); 
 addclasskern("d","tcaron",-.5u#); 
 addclasskern("d","x",-.5u#); 
-addclasskern("d","period",-u#); 
+addclasskern("d","period",-u#);
+addclasskern("d","zero",.5u#);   
+addclasskern("d","two",.5u#); 
+addclasskern("d","four",.5u#); 
 addclasskern("f","c",-u#); 
 addclasskern("f","cacute",-u#); 
 addclasskern("f","j",-3u#);
+addclasskern("f","period",-3u#);
+addclasskern("f","two",-u#);
+addclasskern("f","four",-.5u#);
 addclasskern("j","period",-u#); 
 addclasskern("k","c",-.5u#); 
 addclasskern("k","cacute",-.5u#); 
+addclasskern("k","zero",.5u#);  
 addclasskern("l","t",-2.5u#);
 addclasskern("l","tcaron",-2.5u#);
 addclasskern("l","v",-1.5u#);
 addclasskern("l","y",-1.5u#); 
-addclasskern("l","ydieresis",-1.5u#); 
-addclasskern("p","C",u#); 
+addclasskern("l","ydieresis",-1.5u#);
+addclasskern("p","c",u#); 
 addclasskern("p","j",-2u#);
 addclasskern("p","v",-.25u#);
 addclasskern("p","period",-3u#); 
@@ -1024,6 +1128,10 @@ addclasskern("thorn","x",-u#);
 addclasskern("thorn","period",-3u#); 
 addclasskern("q","t",-.5u#); 
 addclasskern("q","period",-u#); 
+addclasskern("q","zero",u#);  
+addclasskern("q","two",u#);
+addclasskern("q","four",.5u#); 
+addclasskern("q","five",.5u#); 
 addclasskern("r","c",u#);
 addclasskern("r","cacute",u#);
 addclasskern("s","t",-.5u#); % make compatible with METAPOST-logo
@@ -1037,6 +1145,7 @@ addclasskern("t","j",-2.5u#);
 addclasskern("t","t",u#);
 addclasskern("t","tcaron",u#);
 addclasskern("t","period",-3u#);
+addclasskern("t","zero",.5u#);  
 addclasskern("v","a",-.25u#);
 addclasskern("v","abreve",-.25u#);
 addclasskern("v","c",-.25u#);
@@ -1044,8 +1153,47 @@ addclasskern("v","cacute",-.25u#);
 addclasskern("v","j",-u#);
 addclasskern("v","v",u#);
 addclasskern("v","period",-3u#);
+addclasskern("v","zero",.5u#);  
 addclasskern("y","j",-u#);
 addclasskern("y","period",-u#);
+addclasskern("y","zero",-.5u#);  
+addclasskern("y","four",-.5u#);
+
+addclasskern("zero","C",.5u#); 
+addclasskern("zero","S",.5u#);
+addclasskern("zero","V",-.5u#); 
+addclasskern("zero","c",.5u#);  
+addclasskern("zero","cacute",.5u#);  
+addclasskern("zero","j",.5u#);  
+addclasskern("zero","s",.5u#); 
+addclasskern("zero","sacute",.5u#); 
+addclasskern("zero","t",.5u#); 
+addclasskern("zero","tcaron",.5u#); 
+addclasskern("zero","v",.5u#); 
+addclasskern("zero","x",.5u#); 
+addclasskern("zero","y",-.5u#);
+addclasskern("zero","ydieresis",-.5u#);
+addclasskern("zero","period",-u#); 
+addclasskern("two","U",-.25u#);
+addclasskern("two","V",-.5u#);
+addclasskern("two","Y",-.5u#);
+addclasskern("two","j",.5u#);
+addclasskern("two","t",.5u#);
+addclasskern("two","tcaron",.5u#);
+addclasskern("two","y",-.5u#);
+addclasskern("two","ydieresis",-.5u#);
+addclasskern("four","C",.5u#);  
+addclasskern("four","V",-.5u#); 
+addclasskern("four","Y",-.5u#);
+addclasskern("four","c",.5u#); 
+addclasskern("four","cacute",.5u#); 
+addclasskern("four","y",-.5u#);
+addclasskern("four","ydieresis",-.5u#);
+addclasskern("four","z",-.5u#);
+addclasskern("five","y",-.5u#);
+addclasskern("five","ydieresis",-.5u#);
+addclasskern("seven","t",.5u#);
+addclasskern("seven","tcaron",.5u#);
 
 %remember: ligatures will overwrite existing kerning pairs
 addlig("f","i","fi"); 
diff --git a/Master/texmf-dist/fonts/source/public/fetamont/ffmchars_nonscalable.mf b/Master/texmf-dist/fonts/source/public/fetamont/ffmchars_nonscalable.mf
index af15ef561ec..6be204d2fc6 100644
--- a/Master/texmf-dist/fonts/source/public/fetamont/ffmchars_nonscalable.mf
+++ b/Master/texmf-dist/fonts/source/public/fetamont/ffmchars_nonscalable.mf
@@ -56,10 +56,13 @@ bot y4=.2[x_ht,h]+noise;
 top y2=h+noise;
 top y5=h+noise;
 y3=.6[x_ht,h]+noise;
-if angle direction 1 of (z2{right}...z3...z4{right}) < -90:
- draw z1{randup}...z2{randrt}...z3{-randup}...z4{randrt}...z5{randup};
+if (1.3px>(top y2-bot y1)) or (4.5px>w): 
+ draw z1{randup}..tension 2..z2{randrt}
+  ..tension 2..z4{randrt}
+  ..tension 2..z5{randup};
 else:
- draw z1{randup}...z2{randrt}...z3...z4{randrt}...z5{randup};
+ draw z1{randup}...z2{randrt}...z3
+  ...z4{randrt}...z5{randup};
 fi
 charanchortops_[charcode]=(.5w,x_ht);
 labels(1,2,3,4,5); 
@@ -178,9 +181,9 @@ endchar;
 ffmchar("zero",11,ht#,0);
 italcorr .6ht#*slant;
 x1=.5w+noise;
-x2=good.x(1.5u+s+noise);
+x2=good.x(2u+s+noise);
 x3=.5w+noise; 
-w-x4=good.x(1.5u+s+noise);  
+w-x4=good.x(2u+s+noise);  
 top y1=h+o+noise; 
 y2=barheight+noise;
 bot y3=noise-o;
@@ -203,12 +206,12 @@ endchar;
 
 ffmchar("two",11,ht#,0);
 italcorr .8ht#*slant;
-x1=leftstemloc-ho+noise; 
+x1=leftstemloc-ho+noise;
+x5=good.x(2u+s+noise);
 x2=.5[x1,x6]+noise;
-w-x3=good.x(1.5u+s+noise);
+w-x3=leftstemloc+noise;
 x4=.5[x1,x6]+noise;
-x5=good.x(2u+s+noise);
-x6=.5[w-x1,lft w]+ho+noise;
+w-x6=leftstemloc-ho+noise; 
 top y2=h+noise;
 y3=.5[y4,y2]+noise;
 y4=barheight+noise; 
@@ -226,11 +229,11 @@ endchar;
 
 ffmchar("three",11,ht#,0);
 italcorr .8ht#*slant;
-x1=leftstemloc-ho+noise; 
-x8=leftstemloc-ho+noise; 
-w-x3=good.x(1.5u+s+noise);
-w-x6=good.x(2u+s+noise);
-x5=.618[x1,x2]+noise;
+x1=leftstemloc-ho+noise;
+x8=leftstemloc-ho+noise;
+w-x3=good.x(2u+s+noise);
+w-x6=good.x(2.5u+s+noise);
+x5=.618[x2,x1]+noise;
 x2=.55w+noise;
 x4=.55w+noise;
 x7=.55w+noise;
@@ -256,7 +259,7 @@ x2=good.x(1.5u+s+noise);
 w-rt x3=eps+noise;
 w-x4=good.x(3.5u+s+noise);
 w-x5=good.x(3.5u+s+noise);
-rt x1=lft x4+noise;
+rt x1+.5u=lft x4+noise;
 y4=.618h+noise; 
 top y1=h+o+noise; 
 bot y5=noise-o;
@@ -272,10 +275,10 @@ italcorr .8ht#*slant;
 x5=leftstemloc+noise; 
 x6=leftstemloc+noise; 
 x7=w-x5+noise; 
-x1=x5-ho+noise; 
-w-x3=good.x(1.5u+s+noise);
-x2=.618[x5,x3]+noise;
-x4=.618[x5,x3]+noise;
+x1=leftstemloc-ho+noise; 
+w-x3=good.x(2u+s+noise);
+x2=.5[x5,x3]+noise;
+x4=.5[x5,x3]+noise;
 bot y1=noise; 
 bot y2=noise; 
 top y6=h+noise;
@@ -294,14 +297,14 @@ italcorr .8ht#*slant;
 x1=.5[x2,x4]+noise;
 x2=good.x(2u+s+noise);
 x3=.5[x2,x4]+noise; 
-w-x4=good.x(1.5u+s+noise);  
+w-x4=good.x(1.75u+s+noise);  
 x5=.618[x2,x4]+noise;
 w-x6=leftstemloc+noise;
 y1=barheight+noise; 
 y2=.5[y1,y3]+noise;
 bot y3=noise-o;
 y4=.5[y1,y3]+noise;
-top y5=h+o+noise;
+top y5=h+noise;
 z6=z5+whatever*randrt;
 pair randir;
 randir:=randup;
@@ -313,8 +316,8 @@ endchar;
 
 ffmchar("seven",11,ht#,0);
 italcorr ht#*slant;
-x1=good.x(1.5u+s+noise);
-w-x2=good.x(1.5u+s+noise);
+x1=good.x(2u+s+noise);
+w-x2=good.x(2u+s+noise);
 x3=.618[x2,x1]+noise;
 top y1=h+noise; 
 top y2=h+noise; 
@@ -349,7 +352,7 @@ endchar;
 ffmchar("nine",11,ht#,0);
 italcorr .7ht#*slant;
 x1=.5[x2,x4]+noise;
-x2=good.x(1.5u+s+noise);
+x2=good.x(1.75u+s+noise);
 x3=.5[x2,x4]+noise;
 w-x4=good.x(2u+s+noise);  
 x5=.618[x4,x2]+noise;
@@ -357,7 +360,7 @@ x6=leftstemloc+noise;
 top y1=h+o+noise; 
 y2=.5[y1,y3]+noise;
 y4=.5[y1,y3]+noise;
-bot y5=noise-o;
+bot y5=noise;
 y3=barheight+noise;
 z6=z5+whatever*randrt;
 pair randir;
diff --git a/Master/texmf-dist/fonts/source/public/fetamont/ffmchars_scalable.mf b/Master/texmf-dist/fonts/source/public/fetamont/ffmchars_scalable.mf
index 12abe68c84f..66a18d1629d 100644
--- a/Master/texmf-dist/fonts/source/public/fetamont/ffmchars_scalable.mf
+++ b/Master/texmf-dist/fonts/source/public/fetamont/ffmchars_scalable.mf
@@ -471,7 +471,6 @@ bot y3=noise-o;
 y4=barheight+noise;
 y5=.618[y3,y4]+noise;
 bot y6=noise-o;
-%z5=z6+whatever*dir(100+angle(direction 1 of (arc(z3,randrt,z4,randup))));
 draw full(z1,-randrt,z2,-randup,z3,randrt,z4,randup);
 draw z5--z6;
 labels(1,2,3,4,5,6);