mdsymbol (29nov12)

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

1 files changed, 45 insertions, 39 deletions

diff --git a/Master/texmf-dist/fonts/source/public/mdsymbol/mdgeometric.mf b/Master/texmf-dist/fonts/source/public/mdsymbol/mdgeometric.mf
index 32c6a604fbf..7d608a1d6fd 100644
--- a/Master/texmf-dist/fonts/source/public/mdsymbol/mdgeometric.mf
+++ b/Master/texmf-dist/fonts/source/public/mdsymbol/mdgeometric.mf
@@ -1,5 +1,5 @@
 %
-% Copyright (c) 2011, Sebastian Schubert <schubert.seb@googlemail.com>
+% Copyright (c) 2011, 2012, Sebastian Schubert <schubert.seb@googlemail.com>
 %
 % This Font Software is licensed under the SIL Open Font License,
 % Version 1.1. This license is in the accompanying file OFL.txt, and
@@ -934,10 +934,11 @@ beginsymbol(18/10order_width# + 2side_bearing#, vcentre(2equal_spread# + line_th
   pair centre;
   centre := (w/2, (h-d)/2);
   thick := line_thickness;
+  thin  := letter_line_thickness;
   alpha := 0;
 
-  z0 = centre - (9/10order_width - 1/2thick) * dir alpha;
-  z1 = centre + (9/10order_width - 1/2thick) * dir alpha;
+  z0 = centre - (9/10order_width - 1/2thin) * dir alpha;
+  z1 = centre + (9/10order_width - 1/2thin) * dir alpha;
   z6 = 1/5[z0,z1];
   z7 = 4/5[z0,z1];
   z2 = z6 + equal_spread * dir (alpha + 90);
@@ -946,14 +947,14 @@ beginsymbol(18/10order_width# + 2side_bearing#, vcentre(2equal_spread# + line_th
   z5 = z7 - equal_spread * dir (alpha + 90);
   z8 = z9 = centre;
 
-  penpos0(thick, alpha);
-  penpos1(thick, alpha);
+  penpos0(thin,  alpha);
+  penpos1(thin,  alpha);
   penpos2(thick, alpha - 90);
   penpos3(thick, alpha + 90);
   penpos4(thick, alpha + 90);
   penpos5(thick, alpha - 90);
-  penpos8(thick, alpha - 135);
-  penpos9(thick, alpha + 135);
+  penpos8(thin,  alpha - 135);
+  penpos9(thin,  alpha + 135);
 
   fill stroke z4.e{dir (alpha + 180)}
     .. {dir (alpha + 225)}z9.e
@@ -1235,7 +1236,7 @@ endchar;
 
 for sign = 1, -1:
   beginoperator(plus_size#, 1); "product";
-    draw_product(centre, plus_size, plus_size, sign, line_thickness);
+    draw_product(centre, plus_size, plus_size, sign, letter_line_thickness);
   endchar;
 endfor;
 
@@ -1364,13 +1365,13 @@ for filled = false, true:
     p1 = z7{dir (90+35)} .. {dir 90}z2r;
     p2 = z3r{dir 270} .. {dir (270-35)}z8;
     (t1,t2) = p1 intersectiontimes p2;
-
+      
     fill z0{dir (90+35)} .. {dir 90}z2l .. {dir 0}z4l .. {dir (270+45)}z1l{dir (90-45)} .. {dir 0}z5l .. {dir 270}z3l .. {dir (270-35)}z0 & cycle;
     if not filled:
       unfill subpath (t1,1) of p1 & z2r{dir 90} .. {dir 0}z4r .. {dir (270+45)}z1r -- z6 -- z1'r{dir (90-45)} .. {dir 0}z5r .. {dir 270}z3r & subpath (0,t2) of p2 -- cycle;
     fi;
 
-    penlabels(0,1,1',2,3,4,5,6,7,8);
+    penlabels(0,1,1',2,3,4,5,6,7,8,10);
   endchar;
 endfor;
 
@@ -1391,9 +1392,8 @@ beginsymbol(13u#, cap_height#, 0); "spade suit";
   penpos1(2u, 0);
   penpos6(3u, 0);
 
-  fill z0{dir (270-30)} .. z2 .. z4 .. {dir (90-30)}z1l
-    -- z1r{dir (270+30)} .. z5 .. z3 .. {dir (90+30)}z0 -- cycle;
-  fill stroke z1e -- z6e;
+  fill z0{dir (270-30)} .. z2 .. z4 .. {dir (90-30)}z1l -- z6l --
+    z6r -- z1r{dir (270+30)} .. z5 .. z3 .. {dir (90+30)}z0 -- cycle;
 
   penlabels(0,1,2,3,4,5,6);
 endchar;
@@ -1705,8 +1705,8 @@ beginsymbol(4u# + line_thickness# + 2side_bearing#, asc_height#, desc_depth#); "
   penlabels (0,1,2,3,4,5,6,7);
 endchar;
 
-beginsymbol(8u# + line_thickness# + 2side_bearing#, cap_height#, 0); "aleph";
-  thick := line_thickness;
+beginsymbol(8u# + letter_line_thickness# + 2side_bearing#, cap_height#, 0); "aleph";
+  thick := letter_line_thickness;
 
   x0l = x2l = side_bearing;
   x1r = x3r = w - side_bearing;
@@ -1739,8 +1739,8 @@ beginsymbol(8u# + line_thickness# + 2side_bearing#, cap_height#, 0); "aleph";
   penlabels(0,1,2,3,4,5,6);
 endchar;
 
-beginsymbol(8u# + line_thickness# + 2side_bearing#, cap_height#, 0); "beth";
-  thick := line_thickness;
+beginsymbol(8u# + letter_line_thickness# + 2side_bearing#, cap_height#, 0); "beth";
+  thick := letter_line_thickness;
 
   x0 = u + side_bearing;
   x1 = 5/8[x2,x4];
@@ -1767,8 +1767,8 @@ beginsymbol(8u# + line_thickness# + 2side_bearing#, cap_height#, 0); "beth";
   penlabels(0,1,2,3,4,5);
 endchar;
 
-beginsymbol(6u# + line_thickness# + 2side_bearing#, cap_height#, 0); "gimel";
-  thick := line_thickness;
+beginsymbol(6u# + letter_line_thickness# + 2side_bearing#, cap_height#, 0); "gimel";
+  thick := letter_line_thickness;
 
   x0 = x2 = side_bearing;
   x2'r = 1/8[x0,x1];
@@ -1797,16 +1797,16 @@ beginsymbol(6u# + line_thickness# + 2side_bearing#, cap_height#, 0); "gimel";
   z7 = z8 + whatever * dir 60;
 
   penpos7(5/6thick, 150);
-  penpos8(thick, 150);
+  penpos8(thick, 125);
 
   fill stroke z4.e -- z5.e{dir -30} .. {dir -82}z6.e .. {dir -67}z3.e;
-  fill stroke z2.e -- z2'.e{right} ..tension 3/4 and 1.. {dir 60}z8.e -- z7.e;
+  fill stroke z2.e -- z2'.e{right} ... {dir 60}z8.e -- z7.e;
 
-  penlabels(2,2',3,4,5,6,7,8);
+  penlabels(0,1,2,2',3,4,5,6,7,8);
 endchar;
 
-beginsymbol(7u# + line_thickness# + 2side_bearing#, cap_height#, 0); "daleth";
-  thick := line_thickness;
+beginsymbol(7u# + letter_line_thickness# + 2side_bearing#, cap_height#, 0); "daleth";
+  thick := letter_line_thickness;
 
   x0 = side_bearing;
   x1 = w - side_bearing;
@@ -1833,24 +1833,24 @@ slant := 0.212557;
 transform currenttransform;
 currenttransform := identity slanted slant yscaled aspect_ratio scaled granularity shifted (-u,0);
 
-beginsymbol(9u# + 2line_thickness#, x_height#, desc_depth#); "Weierstrass p";
+beginsymbol(9u# + 2letter_line_thickness#, x_height#, desc_depth#); "Weierstrass p";
   numeric theta;
   theta = 90 - angle(8u,h);
   slope := -h/8u;  % angle at middle
   superness := 1/sqrt 2;
   superpull := 1/6;
 
-  penpos2(line_thickness, -60);
-  penpos1(line_thickness, theta);
-  penpos7(line_thickness, -90);
+  penpos2(letter_line_thickness, -60);
+  penpos1(letter_line_thickness, theta);
+  penpos7(letter_line_thickness, -90);
 
   x2 + 1/2u = x1 = x7 - 1/2u = 3u;
   y2l = h;
   y7r = -d;
   y1 = 2/5[-d, h];
   x3l = 1/2u;
-  x6r = max(x7 + line_thickness, 1/2w - 1/4u);
-  x3r - x3l = x6r - x6l =line_thickness;
+  x6r = max(x7 + letter_line_thickness, 1/2w - 1/4u);
+  x3r - x3l = x6r - x6l =letter_line_thickness;
 
   ellipse_set(2l,3l,4l,1l);
   ellipse_set(2r,3r,4r,1r);
@@ -1862,13 +1862,13 @@ beginsymbol(9u# + 2line_thickness#, x_height#, desc_depth#); "Weierstrass p";
 
   fill stroke super_arc.e(2,3) & z3e{down} .. z4e .. z5e .. z6e{down} & super_arc.e(6,7);  % flourish
 
-  penpos8(line_thickness, 180);
-  penpos9(line_thickness, 90);
-  penpos10(line_thickness, 0);
-  penpos11(line_thickness, -90);
-  penpos12(line_thickness, -100);
+  penpos8(letter_line_thickness, 180);
+  penpos9(letter_line_thickness, 90);
+  penpos10(letter_line_thickness, 0);
+  penpos11(letter_line_thickness, -90);
+  penpos12(letter_line_thickness, -100);
 
-  x10r = w - 3/2u + 1/2line_thickness;
+  x10r = w - 3/2u + 1/2letter_line_thickness;
   x8r = u;
   x9 = x11 = 1/2w + 3/2u;
   x12l = max(x6r, .5w + .5u);
@@ -1883,10 +1883,10 @@ beginsymbol(9u# + 2line_thickness#, x_height#, desc_depth#); "Weierstrass p";
 endchar;
 endgroup;
 
-beginsymbol(8u# + line_thickness# + 2side_bearing#, cap_height#, 0); "nabla";
-  thick:=line_thickness;
+beginsymbol(8u# + letter_line_thickness# + 2side_bearing#, cap_height#, 0); "nabla";
+  thick:=letter_line_thickness;
   thin := 4/5thick;
-  thicker := 8/7thick;
+  thicker := thick;
 
   y0r = y1r = h;
   y2  = 0;
@@ -1910,3 +1910,9 @@ beginsymbol(8u# + line_thickness# + 2side_bearing#, cap_height#, 0); "nabla";
 
   penlabels(0,1,2,3,4,5);
 endchar;
+
+for sign = 1, -1:
+  beginoperator(plus_size#, 1); "product integral";
+    draw_productintegral(centre, plus_size, plus_size, sign, letter_line_thickness);
+  endchar;
+endfor;