schulschriften (3dec14)

git-svn-id: svn://tug.org/texlive/trunk@35730 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2014-12-03 22:41:27 +0000
committer: Karl Berry <karl@freefriends.org> 2014-12-03 22:41:27 +0000
commit: a038a87d3262e71bf179f9169cbcf7059b681dab (patch)
tree: 6d042857ad9a217a76ec317294411626694270f4 /Master/texmf-dist/fonts/source
parent: 6ff4c0023bf5aaaac432e8b934235ba1fe4e02a8 (diff)
59 files changed, 1845 insertions, 1563 deletions
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wedn14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wedn14.mf
index 986f9159970..0eaac9ad286 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/wedn14.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wedn14.mf
@@ -29,11 +29,17 @@ Wz#:=(35/40)*Hz#; % Ziffernbreite
 define_pixels(ut,Ht,ht,dt,Hz,Wz);
 
 % Federn:
+if unknown fetter: fetter:=0; fi
+fetter:=sqrt(2)**fetter;
 % runde Feder (Redisfeder)
-  pickup pencircle scaled 1.4ut;
+  pickup pencircle scaled (fetter*1.4*ut);
 wedn_pen:=savepen;
 % fuer Punkte etc.
-  pickup pencircle scaled 4ut;
+if fetter>3:  pickup pencircle scaled 7.8ut;
+elseif fetter>2.5:  pickup pencircle scaled 5.5ut;
+  else:
+    pickup pencircle scaled 4ut;
+    fi
 wedn_pen_thick := savepen;
 %
 % Current Transformation, slanted
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wedn14_def.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wedn14_def.mf
index 26ec753be56..d15db1d5c13 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/wedn14_def.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wedn14_def.mf
@@ -105,7 +105,7 @@ mt:=m;
 % Parameter fuer Ziffern:
 s':=Hz/8;    % seitlicher Abstand
 w':=Wz-2s';  % effektive Breite der Ziffern
-r:=w'/2;     % Radius bei "2"
+r:=(w'-dd)/2;     % Radius bei "2"
 % Zeichen:
 hmath:=ht/2;
 hdash:=ht/2;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wedn14_sz.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wedn14_sz.mf
index 0f8213182e5..f2f886cc143 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/wedn14_sz.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wedn14_sz.mf
@@ -4,8 +4,233 @@
 % 21.09.2011
 % 07.10.2011: e-Problem
 % 22.11.2011: Verbindung zu spitzen Buchstaben
+% 14.11.2014: einheitliche Sonderzeichen $,%,&,...
 %
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% #
+beginchar("#",50ut#,Ht#,0);
+  pickup wedn_pen;
+  p:=(0,0)--(0,Ht);
+  draw p slanted 0.176 shifted (15ut,0);
+  draw p slanted 0.176 shifted (30ut,0);
+  q:=((0,0)--(35ut,0)) shifted (5ut,0);
+  draw q shifted(0,Ht/3) slanted 0.176;
+  draw q shifted(0,2Ht/3) slanted 0.176;
+endchar;
+
+% §
+  beginchar(oct"237",43.333ut#,Ht#,dt#);
+  pickup wedn_pen;
+sep:=10ut; breit:=20ut;
+p := ((8ut,20ut){curl 10}..(0ut,30ut){left}..(-breit/2,22ut){down}..
+  (breit/2,-2.5ut){down}..{-1,2/3}(2ut,-11ut)) scaled ((Ht+dt)/60ut);
+  draw p shifted (sep+breit*0.583,ht/2);
+  draw p rotated 180 shifted (sep+breit*0.583,ht/2);
+  endchar;
+  
+% *
+beginchar("*",30ut#,Ht#,0);
+  pickup wedn_pen;
+  p:= (-dt/2,0)--(dt/2,0);
+  draw p rotated 90 shifted (15ut,ht+dt/2);
+  draw p rotated 30 shifted (15ut,ht+dt/2);
+  draw p rotated -30 shifted (15ut,ht+dt/2);
+endchar;
+
+% Prozentzeichen (%)
+beginchar("%",50ut#,Ht#,0);
+  pickup wedn_pen;
+  q := (-23.6ut,0)--(23.6ut,0);
+  breit:=12.5ut;hoch:=17.5ut;
+  p := (breit/2,0){up}..(0,hoch/2){left}..(-breit/2,0){down}..(0,-hoch/2){right}..{up}(breit/2,0);
+  x0:=whatever;y0:=whatever;
+  z0=(directionpoint (-1,2) of (subpath (0,1) of p)) shifted (7.5ut+breit/2,40ut-hoch/2);
+  draw (p shifted (7.5ut+breit/2,40ut-hoch/2)) scaled1.25;
+  draw (p shifted (7.5ut+25ut-breit/2,hoch/2)) scaled1.25;
+  draw( q rotated 58 shifted (20ut,20ut)) scaled1.25;
+  draw (z0{1,-2}..{dir 58}(7.5ut+25ut,40ut)) scaled1.25;
+endchar;
+
+% &
+  beginchar("&",50ut#,Ht#,0);
+  pickup wedn_pen;
+  p := ((22.5ut,12.5ut)..tension 1.2..(7.5ut,0){left}..(0,8ut){up}..
+  %(8.167ut,21ut){3,2}..
+  tension 1.2..(17ut,34.5ut){up}..(11.5ut,40ut){left}..(4ut,30ut){down}..{2,-3}(8.167ut,21ut)--(22.5ut,0)) scaled 1.25;
+  draw p shifted (5ut,0);
+  endchar;
+
+% $
+beginchar("$",30ut#,Ht#,0);
+  pickup wedn_pen;
+  draw (halfcircle xscaled 20ut yscaled 20ut shifted (15ut,30ut)) scaled 1.25;
+   draw ((halfcircle rotated 180 xscaled 20ut yscaled 20ut) shifted (15ut,10ut)) scaled 1.25;
+   draw (((-10ut,10ut){down}..{down}(10ut,-10ut)) shifted (15ut,20ut)) scaled 1.25;
+   draw (((0,20ut+2.5ut)--(0,-20ut-2.5ut)) shifted (15ut,20ut)) scaled 1.25;
+endchar;
+
+% "+"
+beginchar("+",30ut#,22.5ut#,0);
+  path p;
+  pickup wedn_pen;
+  z0=(15ut,hmath);
+  z1=(0ut,10ut);
+  z2=(0ut,-10ut);
+  p := z1--z2;
+  draw p   shifted z0 ;
+  draw p   rotated 90 shifted z0 ;
+  labels(range 0 thru 2); 
+endchar;
+
+% ASCII Bindestrich oct"055" (OT1: auch Trennstrich)
+beginchar("-",27.5ut#,ht#,0);
+  pickup wedn_pen;
+  draw ((0,0)--(12.5ut,0)) shifted (7.5ut,hdash);
+endchar;
+
+% T1: Trennstrich
+beginchar(oct"177",27.5ut#,ht#,0);
+  pickup wedn_pen;
+  draw ((0,0)--(12.5ut,0)) shifted (7.5ut,hdash);
+endchar;
+
+% "/" 
+beginchar("/",25ut#,Ht#,0);
+  pickup wedn_pen;
+draw ((5ut,0)--(20ut,Ht));
+endchar;
+
+% ">" 
+beginchar(">",30ut#,Ht#,0);
+  path p;
+  pickup wedn_pen;
+p:=(0,0)--(20ut,0);
+draw p rotated 30 shifted (6.33ut,hmath);
+  draw p rotated -30 shifted (6.33ut,hmath);
+endchar;
+
+% "=" 
+beginchar("=",30ut#,ht#,0);
+    pickup wedn_pen;
+  draw((0,0)--(20ut,0)) shifted (5ut,hmath-2.5ut);
+  draw((0,0)--(20ut,0)) shifted (5ut,hmath+2.5ut);
+endchar;
+
+% "<" 
+beginchar("<",30ut#,Ht#,0);
+  path p;
+  pickup wedn_pen;
+p:=(0,0)--(-20ut,0);
+draw p rotated 30 shifted (23.66ut,hmath);
+  draw p rotated -30 shifted (23.66ut,hmath);
+endchar;
+
+% oct"025" Bis-Strich --, Gedankenstrich 
+beginchar(oct"025",30ut#,ht#,0);
+  pickup wedn_pen;
+draw ((0,0)--(20ut,0)) shifted (5ut,hdash);
+endchar;
+
+% engl. Gedankenstrich ---
+beginchar(oct"026",45ut#,ht#,0);
+  pickup wedn_pen;
+draw ((0,0)--(30ut,0)) shifted (7.5ut,hdash);
+endchar;
+
+% oct"023" franz. Anfz. <<
+beginchar(oct"023",32.5ut#,ht#,0);
+  path p, q;
+  pickup wedn_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+  z4=(6,1);
+  z5=(7.5ut,ht/2);
+z6=(15ut,ht/2);
+  p := (z1{z3}..z2) rotated 45;
+    q := (z1{z4}..z2) rotated -45;
+  draw p shifted z5  ;
+  draw p shifted z6 ;
+    draw q shifted z5 ;
+  draw q shifted z6 ;
+  labels(range 1 thru 6);
+endchar;  
+
+% oct"024" franz. Anfz. >>
+beginchar(oct"024",32.5ut#,ht#,0);
+  path p, q;
+  pickup wedn_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+    z4=(6,1);
+  z5=(17.5ut,ht/2);
+  z6=(25ut,ht/2);
+
+  p := (z1{z4}..z2) rotated 135;
+    q := (z1{z3}..z2) rotated -135;
+  draw p shifted z5 ;
+  draw p shifted z6 ;
+    draw q shifted z5 ;
+  draw q shifted z6 ;
+  labels(range 1 thru 6);
+endchar;  
+
+% oct"016" franz. Anfz. <
+beginchar(oct"016",25ut#,ht#,0);
+  path p, q;
+  pickup wedn_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+  z4=(6,1);
+  z5=(7.5ut,ht/2);
+  p := (z1{z3}..z2) rotated 45;
+    q := (z1{z4}..z2) rotated -45;
+  draw p shifted z5  ;
+    draw q shifted z5 ;
+  labels(range 1 thru 5);
+endchar;  
+
+% oct"017" franz. Anfz. >
+beginchar(oct"017",25ut#,ht#,0);
+  path p, q;
+  pickup wedn_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+    z4=(6,1);
+  z5=(17.5ut,ht/2);
+  p := (z1{z4}..z2) rotated 135;
+    q := (z1{z3}..z2) rotated -135;
+  draw p shifted z5 ;
+    draw q shifted z5 ;
+  labels(range 1 thru 5);
+endchar;  
+
+% "@":
+beginchar("@",50ut#,Ht#,0);
+  pickup wedn_pen;
+sep:=10ut;gap:=8ut;
+draw ((superellipse((dt/(2k),0),(0,dt/2),(-dt/(2k),0),(0,-dt/2),sigma)) shifted (gap+dt/(2k)+sep,dt)) xscaled1.1 yscaled1.25;
+draw (((0,dt)--(0,5ut){down}..(2ut,0){right}..tension 1.5..(gap,dt/2){up}..
+  (-dt/(2k),3dt/2){left}..(-2*dt/(2k)-gap,dt/2){down}..
+  (-dt/(2k),-dt/2){right}..(7.5ut,-5ut)) shifted (2*dt/(2k)+gap+sep,dt/2)) xscaled1.1 yscaled1.25;
+endchar;
+
+% Euro (\symbol{160})
+beginchar(oct"240",60ut#,Ht#,0);
+  pickup wedn_pen;
+  sep:=7.5ut; gap:=7.5ut;
+    draw ((halfcircle rotated 90) xscaled 30ut yscaled 40ut shifted (15ut+gap+sep,20ut)) scaled1.25;
+  draw (((0,0){right}..(7.5ut,-3ut)) shifted (15ut+gap+sep,40ut)) scaled1.25;
+  draw (((0,0){right}..(7.5ut,3ut)) shifted (15ut+gap+sep,0)) scaled1.25;
+  draw ((((-25ut,2.5ut)--(0,2.5ut))  shifted (15ut+gap+sep,20ut)) slanted 0.25) scaled1.25;
+  draw ((((-25ut,-2.5ut)--(0,-2.5ut)) shifted (15ut+gap+sep,20ut)) slanted 0.25) scaled1.25;
+endchar;
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 % Aufstrich am Wortanfang bei spitzen Buchstaben i j p u ü, nicht t
 beginchar(oct"030",6ut#,ht#,0);
   pickup wedn_pen;
@@ -231,68 +456,12 @@ beginchar(oct"042",25ut#,Ht#,0);
   komma(Ht,15ut);
 endchar;
 
-% #
-beginchar("#",80ut#,Ht#,dt#);
-  pickup wedn_pen;
-sep:=17.5ut; gap:=10ut;
-p:= ((0,(Ht+dt)/2)--(0,-(Ht+dt)/2));
-draw p shifted (sep+ht/2,ht/2)  slanted 1/6;
-draw p shifted (sep+ht/2+gap,ht/2)  slanted 1/6;
-q:= ((-Ht/2,0)--(Ht/2,0));
-  draw q shifted (sep+ht/2+gap/2,-gap/2+ht/2) slanted 1/6 ;
-  draw q shifted (sep+ht/2+gap/2,gap/2+ht/2) slanted 1/6;
-endchar;
-  
-% $
-beginchar("$",55ut#,Ht#,0);
-  pickup wedn_pen;
-sep:=15ut; radi:=Ht/4;
-  draw halfcircle scaled (2*radi) shifted (sep+radi,Ht-radi);
-   draw (halfcircle rotated 180 scaled (2*radi)) shifted (sep+radi,radi);
-   draw ((-radi,Ht-radi){down}..{down}(radi,radi)) shifted (sep+radi,0);
-   draw ((0,Ht+dd)--(0,-dd)) shifted (sep+radi,0);
-endchar;
-
-% %
-beginchar("%",45ut#,Ht#,0);
-  pickup wedn_pen;
-sep:=10ut;
-  q := ((0,0)--(Ht*xpart(dir 60),Ht));
-  breit:=12.5ut; hoch:=17.5ut;
-  p := (breit/2,0){up}..(0,hoch/2){left}..(-breit/2,0){down}..(0,-hoch/2){right}..{up}(breit/2,0);
-  x0:=whatever;y0:=whatever;
-  z0=(directionpoint (-1,2) of (subpath (0,1) of p)) shifted (sep+breit/2,Ht-hoch/2);
-  draw p shifted (sep+breit/2,Ht-hoch/2);
-  draw p shifted (sep+Ht*xpart(dir 60)-breit/2,hoch/2);
-  draw q  shifted (sep,0);
-  draw z0{1,-2}..{dir 58}(sep+Ht*xpart(dir 60),Ht);
-  endchar;
-
-% &
-  beginchar("&",40ut#,Ht#,0);
-  pickup wedn_pen;
-  p := (25ut,30ut){down}..tension 1.2..(7.5ut,0){left}..(-3ut,13ut){up}..
-(17ut,42.5ut){up}..(11ut,Ht){left}..(4ut,42.5ut){down}..tension1.5 and 5..{right}(22.5ut,0)..{1,2}(28ut,5ut);
-  draw p shifted (10ut,0);
-  endchar;
-
-% §
-  beginchar(oct"237",43.333ut#,Ht#,dt#);
-  pickup wedn_pen;
-sep:=10ut; breit:=20ut;
-p := ((8ut,20ut){curl 10}..(0ut,30ut){left}..(-breit/2,22ut){down}..
-  (breit/2,-2.5ut){down}..{-1,2/3}(2ut,-11ut)) scaled ((Ht+dt)/60ut);
-  draw p shifted (sep+breit*0.583,ht/2);
-  draw p rotated 180 shifted (sep+breit*0.583,ht/2);
-  endchar;
-
 % ' (Apostroph)
 beginchar("'",20ut#,Ht#,0);
   pickup wedn_pen;
 komma(Ht,10ut);
 endchar;
 
-
 % "("
 beginchar("(",27.5ut#,Ht#,dt#);
   pickup wedn_pen;
@@ -305,63 +474,18 @@ beginchar(")",27.5ut#,Ht#,dt#);
 draw ((-7.5ut,Ht)..(0,ht/2){down}..(-7.5ut,-dt)) shifted (17.5ut,0);
 endchar;
 
-% "*"
-beginchar("*",30ut#,Ht#,0);
-  path p;
-  pickup wedn_pen;
-  z0=(15ut,ht+dt/4);
-  z1=(0ut,7.5ut);
-  z2=(0ut,-7.5ut);
-  p := z1--z2;
-  draw p   shifted z0 ;
-  draw p   rotated 60 shifted z0 ;
-  draw p   rotated -60 shifted z0 ;
-  labels(range 0 thru 2); 
-endchar;
-
-% "+"
-beginchar("+",30ut#,22.5ut#,0);
-  path p;
-  pickup wedn_pen;
-  z0=(15ut,hmath);
-  z1=(0ut,10ut);
-  z2=(0ut,-10ut);
-  p := z1--z2;
-  draw p   shifted z0 ;
-  draw p   rotated 90 shifted z0 ;
-  labels(range 0 thru 2); 
-endchar;
-
 % "," Komma
 beginchar(",",25ut#,ht#,dt#);
   pickup wedn_pen;
 komma(2.5ut,12.5ut);
 endchar;
 
-% ASCII Bindestrich oct"055" (OT1: auch Trennstrich)
-beginchar("-",27.5ut#,ht#,0);
-  pickup wedn_pen;
-  draw ((0,0)--(12.5ut,0)) shifted (7.5ut,hdash);
-endchar;
-
-% T1: Trennstrich
-beginchar(oct"177",27.5ut#,ht#,0);
-  pickup wedn_pen;
-  draw ((0,0)--(12.5ut,0)) shifted (7.5ut,hdash);
-endchar;
-
 % "." Punkt
 beginchar(".",25ut#,ht#,0);
   pickup wedn_pen_thick;
   drawdot (0,0) shifted (12.5ut,0);
 endchar;
 
-% "/" 
-beginchar("/",25ut#,Ht#,dt#);
-  pickup wedn_pen;
-draw ((0,-dt)--(15ut,Ht)) shifted (2.5ut,0);
-endchar;
-
 % ":" Doppelpunkt
 beginchar(":",25ut#,ht#,0);
   pickup wedn_pen_thick;
@@ -377,34 +501,6 @@ komma(2.5ut,12.5ut);
   drawdot (0,0) shifted (12.5ut,17.5ut);
 endchar;
 
-% ">" 
-beginchar(">",25ut#,Ht#,0);
-  path p;
-  pickup wedn_pen;
-p:=(0,0)--(17.5ut,0);
-draw p rotated 30 shifted (5ut,hmath);
-  draw p rotated -30 shifted (5ut,hmath);
-endchar;
-
-
-% "=" 
-beginchar("=",30ut#,ht#,0);
-    pickup wedn_pen;
-  draw((0,0)--(20ut,0)) shifted (5ut,hmath-2.5ut);
-  draw((0,0)--(20ut,0)) shifted (5ut,hmath+2.5ut);
-endchar;
-
-
-% "<" 
-beginchar("<",25ut#,Ht#,0);
-  path p;
-  pickup wedn_pen;
-p:=(0,0)--(-17.5ut,0);
-draw p rotated 30 shifted (20ut,hmath);
-  draw p rotated -30 shifted (20ut,hmath);
-endchar;
-
-
 % ?
 beginchar("?",35ut#,Hz#,0);
   radi:=7.5ut;
@@ -436,93 +532,6 @@ beginchar(oct"022",25ut#,ht#,dt#);
   komma(2.5ut,15ut);
 endchar;
 
-% oct"025" Bis-Strich --, Gedankenstrich 
-beginchar(oct"025",30ut#,ht#,0);
-  pickup wedn_pen;
-draw ((0,0)--(20ut,0)) shifted (5ut,hdash);
-endchar;
-
-% engl. Gedankenstrich ---
-beginchar(oct"026",40ut#,ht#,0);
-  pickup wedn_pen;
-draw ((0,0)--(30ut,0)) shifted (5ut,hdash);
-endchar;
-
-
-% oct"023" franz. Anfz. <<
-beginchar(oct"023",37.5ut#,ht#,0);
-  path p, q;
-  pickup wedn_pen;
-  z1=(0ut,0ut);
-  z2=(1.1*ht/2,0);
-  z3=(6,-1);
-  z4=(6,1);
-  z5=(10ut,ht/2);
-z6=(17.5ut,ht/2);
-  
-  p := (z1{z3}..z2) rotated 45;
-    q := (z1{z4}..z2) rotated -45;
-  draw p shifted z5  ;
-  draw p shifted z6 ;
-    draw q shifted z5 ;
-  draw q shifted z6 ;
-  labels(range 1 thru 6);
-endchar;  
-
-
-% oct"024" franz. Anfz. >>
-beginchar(oct"024",37.5ut#,ht#,0);
-  path p, q;
-  pickup wedn_pen;
-  z1=(0ut,0ut);
-  z2=(1.1*ht/2,0);
-  z3=(6,-1);
-    z4=(6,1);
-  z5=(20ut,ht/2);
-  z6=(27.5ut,ht/2);
-
-  p := (z1{z4}..z2) rotated 135;
-    q := (z1{z3}..z2) rotated -135;
-  draw p shifted z5 ;
-  draw p shifted z6 ;
-    draw q shifted z5 ;
-  draw q shifted z6 ;
-  labels(range 1 thru 6);
-endchar;  
-
-% oct"016" franz. Anfz. <
-beginchar(oct"016",30ut#,ht#,0);
-  path p, q;
-  pickup wedn_pen;
-  z1=(0ut,0ut);
-  z2=(1.1*ht/2,0);
-  z3=(6,-1);
-  z4=(6,1);
-  z5=(10ut,ht/2);
-  p := (z1{z3}..z2) rotated 45;
-    q := (z1{z4}..z2) rotated -45;
-  draw p shifted z5  ;
-    draw q shifted z5 ;
-  labels(range 1 thru 5);
-endchar;  
-
-
-% oct"017" franz. Anfz. >
-beginchar(oct"017",30ut#,ht#,0);
-  path p, q;
-  pickup wedn_pen;
-  z1=(0ut,0ut);
-  z2=(1.1*ht/2,0);
-  z3=(6,-1);
-    z4=(6,1);
-  z5=(20ut,ht/2);
-  p := (z1{z4}..z2) rotated 135;
-    q := (z1{z3}..z2) rotated -135;
-  draw p shifted z5 ;
-    draw q shifted z5 ;
-  labels(range 1 thru 5);
-endchar;  
-
 % oct"133" [
 beginchar("[",17.5ut#,Ht#,dt#);
   pickup wedn_pen;
@@ -539,24 +548,6 @@ beginchar("]",17.5ut#,Ht#,dt#);
   draw ((0,0)--(5ut,0)) shifted (5ut,-dt);
 endchar;
 
-% "@":
-beginchar("@",70ut#,Ht#,0);
-  pickup wedn_pen;
-sep:=dt/2;
-draw (superellipse((a,0),(0,b),(-a,0),(0,-b),sigma)) shifted (a+sep+10ut,b+sep);
-draw ((0,ht)--(0,5ut){down}..(2ut,0){right}..tension 1.5..(sep,ht/2){up}..
-  (-10ut,ht+sep){left}..(-2*a-sep,ht/2){down}..
-  (-10ut,-sep){right}..{1,2}(2.5ut,-3.5ut)) shifted (2*a+sep+10ut,sep);
-endchar;
 
-% Euro
-beginchar(oct"240",60ut#,Ht#,0);
-  pickup wedn_pen;
-    draw (halfcircle rotated 90) xscaled 37.5ut yscaled Ht shifted (37.5ut,Ht/2);
-  draw ((0,0){right}..(10ut,-5ut)) shifted (37.5ut,Ht);
-  draw ((0,0){right}..(10ut,5ut)) shifted (37.5ut,0);
-  draw (((-30ut,0)--(0,0)) shifted (35ut,Ht/2+2.5ut)) slanted 0.29;
-  draw (((-30ut,0)--(0,0)) shifted (35ut,Ht/2-2.5ut)) slanted 0.29;
-endchar;
 
 %%%%%%%%%%%%%%%%%%%% End of File %%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wednbx14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wednbx14.mf
new file mode 100644
index 00000000000..c951ed8d19e
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wednbx14.mf
@@ -0,0 +1,3 @@
+% wedn bold
+fetter:=2;
+input wedn14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wednbxsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wednbxsl14.mf
new file mode 100644
index 00000000000..152cda6acb3
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wednbxsl14.mf
@@ -0,0 +1,3 @@
+% wedn bold, slanted
+fetter:=2;
+input wednsl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wedneb14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wedneb14.mf
new file mode 100644
index 00000000000..cbb20157031
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wedneb14.mf
@@ -0,0 +1,3 @@
+% wedn extra bold
+fetter:=3;
+input wedn14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wednebsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wednebsl14.mf
new file mode 100644
index 00000000000..306d6db6d57
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wednebsl14.mf
@@ -0,0 +1,3 @@
+% wedn extra bold, slanted
+fetter:=3;
+input wednsl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wednsb14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wednsb14.mf
new file mode 100644
index 00000000000..49c283a8349
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wednsb14.mf
@@ -0,0 +1,3 @@
+% wedn semi bold
+fetter:=1;
+input wedn14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wednsbsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wednsbsl14.mf
new file mode 100644
index 00000000000..e0ff5b55c7f
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wednsbsl14.mf
@@ -0,0 +1,3 @@
+% wedn semi bold, slanted
+fetter:=1;
+input wednsl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wednub14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wednub14.mf
new file mode 100644
index 00000000000..cbf82fc1834
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wednub14.mf
@@ -0,0 +1,3 @@
+% wedn ultra bold
+fetter:=4;
+input wedn14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wednubsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wednubsl14.mf
new file mode 100644
index 00000000000..cf5dbb5d74c
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wednubsl14.mf
@@ -0,0 +1,3 @@
+% wedn ultra bold, slanted
+fetter:=4;
+input wednsl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wela14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wela14.mf
index a4161d5cb40..623fee6ea90 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/wela14.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wela14.mf
@@ -2,6 +2,7 @@
 % Walter Entenmann
 % 16.10.2011
 % 12.09.2012
+% 14.11.2014: Hz# geaendert
 
 %%%%%%%%%%%%%%% wela Metafont-Hauptfile %%%%%%%%%%%%%%%%%%
 font_identifier:= "WELA";
@@ -22,18 +23,24 @@ ut#:=0.233pt#;
 ht#:=20ut#; % x-Hoehe
 dt#:=ht#; % Unterlaenge, Oberlaenge
 Ht#:=ht#+dt#;% Versalhoehe
-Hz#:=Ht#; % Ziffernhoehe
+Hz#:=ht#+0.5dt#; % Ziffernhoehe
 Wz#:=30ut#; % Ziffernbreite
 
 % Umrechnung in Pixel-Groessen
 define_pixels(ut,Ht,ht,dt,Hz,Wz);
 
 % Federn:
+if unknown fetter: fetter:=0; fi
+fetter:=sqrt(2)**fetter;
 % runde Feder (Redisfeder)
-  pickup pencircle scaled 1.25ut;
+  pickup pencircle scaled (fetter*1.25*ut);
 wela_pen:=savepen;
 % fuer Punkte etc.
-  pickup pencircle scaled 3ut;
+if fetter>3: pickup pencircle scaled 7ut;
+elseif fetter>2.5: pickup pencircle scaled 5ut;
+  else:
+    pickup pencircle scaled 3.5ut;
+    fi
 wela_pen_thick := savepen;
 %
 % Current Transformation, slanted
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wela14_def.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wela14_def.mf
index a60a32cd603..3592a3926db 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/wela14_def.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wela14_def.mf
@@ -1,7 +1,18 @@
 % Lateinische Ausgangsschrift (LA)  wela
 % Parameter und Makrodefinitionen
 % 16.10.2011
-
+% 11.09.2014: Schleifchen-e modifiziert
+%             e am Wortanfang
+%             latin_e, latin_eg,
+%             latin_er, latin_eb, e mit langem Schweif, latin_e_form,
+%             Oberlaengen bei b,f,h,k,l Schnittpunkt tiefer gelegt (ht-Delta)
+%             n,m,r,v,w Spazierstock Biegung verschaerft
+%             a,ä,d,h,i,m,n,p,u,ü Stock staerker verrundet (0,2rho)..(1.5rho,0)
+%             s beginn jetzt oben abwaerts in Richtung Anstrich {-1,-m}
+%                 und Bauch etwas tiefer gelegt
+% 15.09.2014: Als neue Version von wela verwendet
+% 14.11.2014: s', r' geaendert
+%             
 % Parameter:
 
 % kl. Abstand in der Groesse der Strichstaerke
@@ -98,9 +109,9 @@ Hfx:=0.35;
 Hbreite:=12.5ut; %%
 mt:=m;
 % Parameter fuer Ziffern:
-s':=Hz/8;    % seitlicher Abstand
+s':=5ut;    % seitlicher Abstand
 w':= Wz-2s';  % effektive Breite der Ziffern
-r:=w'/2;     % Radius bei "2"
+r:=(w'-dd)/2;     % Radius bei "2"
 % Zeichen:
 hmath:=ht/2;
 hdash:=ht/2;
@@ -162,16 +173,16 @@ def oval(expr sx)=
   
   \def stock(expr sx)=
     if not wortende:
-    draw ((0,rho){down}..(rho,0){right}..tension2.5 and 4..{1,m}(2*rho+(ht-Delta)/m,ht-Delta)) shifted (sx,0);
-    xpos:=sx+2*rho+(ht-Delta)/m;
+    draw ((0,2*rho){down}..(1.5rho,0){right}..tension2.5 and 4..{1,m}(2.5*rho+(ht-Delta)/m,ht-Delta)) shifted (sx,0);
+    xpos:=sx+2.5*rho+(ht-Delta)/m;
   else:
-    draw ((0,rho){down}..{right}(rho,0)) shifted (sx,0);
+    draw ((0,2*rho){down}..{right}(1.5rho,0)) shifted (sx,0);
     xpos:=sx+rho;
     fi
   enddef;
 
   def oschl(expr sx)=
-  draw ((0,ht){1,m}..tension1.5..(sb'',Ht-dt*sbfh''){up}..((1-sbf'')*sb'',Ht){left}..tension 1.5..{down}(0,ht)) shifted (sx,0);
+  draw ((0,ht-Delta){1,m}..tension1.5..(sb'',Ht-dt*sbfh''){up}..((1-sbf'')*sb'',Ht){left}..tension 1.5..{down}(0,ht-Delta)) shifted (sx,0);
   xpos:=sx;
 enddef;
 
@@ -181,9 +192,10 @@ xpos:=sx;
 enddef;
 
 def latin_eg (expr sx) =
-  draw ((0,0)--(0.5ht/m',ht/2))  shifted (sx,0);
-  draw ((0.5ht/m',ht/2){1,me}..(ebreite+0.5ht/m',ht-ef*ebreite){up}..(ebreite*(1-ef)+0.5ht/m',ht){left}..(0.5ht/m',ht/2){down}..{right}(ebreite*(1-ef)+0.5ht/m',0))  shifted (sx,0);
-xpos:=sx+ebreite*(1-ef)+0.5ht/m';
+%  draw ((0,0)--(0.5ht/m',ht/2))  shifted (sx,0);
+%  draw ((0.5ht/m',ht/2){1,me}..(ebreite+0.5ht/m',ht-ef*ebreite){up}..(ebreite*(1-ef)+0.5ht/m',ht){left}..(0.5ht/m',ht/2){down}..{right}(ebreite*(1-ef)+0.5ht/m',0))  shifted (sx,0);
+  draw ((0,0){1,m'}..(ebreite+8ut,ht-ef*ebreite){up}..(ebreite*(1-ef)+8ut,ht){left}..(8ut,ht/2){down}..{right}(ebreite*(1-ef)+8ut,0))  shifted (sx,0);
+xpos:=sx+ebreite*(1-ef)+8ut;
 enddef;
 
 def uschl_e (expr sx) =
@@ -291,12 +303,13 @@ fi
   enddef;
 
   def spazierstock (expr sx)=
-    draw ((0,ht-Delta){1,m}..(Delta+rho,ht){right}..{down}(Delta+2*rho,ht-rho)) shifted (sx,0);
-    xpos:=sx+Delta+2*rho;
+%    draw ((0,ht-Delta){1,m}..(Delta+rho,ht){right}..{down}(Delta+2*rho,ht-rho)) shifted (sx,0);
+     draw ((0,ht-Delta){1,m}..(Delta,ht){right}..{down}(Delta+rho,ht-rho)) shifted (sx,0);
+    xpos:=sx+Delta+rho;
   enddef;
 
   def s_form(expr sx)=
-    p:= ((0,ht){down}..(sbreite,sbreite){down}..(0,0){left}..(-sbreite+2ut,dd));
+    p:= ((0,ht){-1,-m}..(sbreite,sbreite-2ut){down}..(0,0){left}..(-sbreite+2ut,dd));
     draw p shifted (sx,0);
     x0:=whatever;y0:=whatever;
     z0=(directionpoint(1,mt) of (reverse (subpath (1,2) of p))) shifted (sx,0);
@@ -321,7 +334,7 @@ def ss_ansatz(expr sx)=
 
 def a_char=
 oval(xpos);
- stamm(ht,rho,xpos);
+ stamm(ht,2rho,xpos);
 stock(xpos);
 enddef;
 
@@ -335,7 +348,7 @@ def u_char=
 spitz(xpos);
 stamm(ht,ht/6,xpos);
 bogen(ht/6,0,3ht/4,ht/kh,0.2,-90,90,1,1.2,xpos);
-stamm(ht,rho,xpos);
+stamm(ht,2rho,xpos);
 stock(xpos);
 enddef;
 
@@ -353,13 +366,14 @@ enddef;
 
 % lat. e, Normalform
 def latin_e (expr sx)=
-  draw ((0,0){right}..tension1..{1,m}(3.5ut+0.5ht/m,ht/2)) shifted (sx,0);
-  draw ((3.5ut+0.5ht/m,ht/2){1,me}..(ebreite+3.5ut+0.5ht/m,ht-ebreite*ef){up}..(ebreite*(1-ef)+3.5ut+0.5ht/m,ht){left}..(3.5ut+0.5ht/m,ht/2){down}..{right}(ebreite*(1-ef)+3.5ut+0.5ht/m,0)) shifted (sx,0);
-  xpos:=sx+ebreite*(1-ef)+3.5ut+0.5ht/m;
+%  draw ((0,0){right}..tension1..{1,m}(3.5ut+0.5ht/m,ht/2)) shifted (sx,0);
+%  draw ((3.5ut+0.5ht/m,ht/2){1,me}..(ebreite+3.5ut+0.5ht/m,ht-ebreite*ef){up}..(ebreite*(1-ef)+3.5ut+0.5ht/m,ht){left}..(3.5ut+0.5ht/m,ht/2){down}..{right}(ebreite*(1-ef)+3.5ut+0.5ht/m,0)) shifted (sx,0);
+draw ((0,0){right}..(ebreite+0.5ut+0.5ht/m,ht-ebreite*ef){up}..(ebreite*(1-ef)+0.5ut+0.5ht/m,ht){left}..(0.5ut+0.5ht/m,ht/2){down}..{right}(ebreite*(1-ef)+0.5ut+0.5ht/m,0)) shifted (sx,0);
+  xpos:=sx+ebreite*(1-ef)+0.5ut+0.5ht/m;
 enddef;
 
 def latin_e_form (expr sx)=
-  draw ((0,ht/2){1,me}..(ebreite,ht-ebreite*ef){up}..(ebreite*(1-ef),ht){left}..(0,ht/2){down}..{right}(ebreite*(1-ef),0)) shifted (sx,0);
+  draw ((ebreite,ht-ebreite*ef){up}..(ebreite*(1-ef),ht){left}..(0,ht/2){down}..{right}(ebreite*(1-ef),0)) shifted (sx,0);
   xpos:=sx+ebreite*(1-ef);
   enddef;
 
@@ -367,14 +381,14 @@ def latin_e_form (expr sx)=
 
 % lat. e nach b, o, v, w
 def latin_eb (expr sx)=
-  draw ((0,ht){1,-mfahne}..(12.5ut,ht/2){right}..(20ut,ht-2.5ut){up}..(17.5ut,ht){left}..(12.5ut,ht/2){down}..{right}(20ut,0)) shifted (sx,0);
-  xpos:=sx+20ut;
+  draw ((0,ht){1,-mfahne}..(10ut,ht/2){right}..(17.5ut,ht-2.5ut){up}..(15ut,ht){left}..(10ut,ht/2){down}..{right}(15ut,0)) shifted (sx,0);
+  xpos:=sx+15ut;
 enddef;
 
 % lat. e nach r
 def latin_er (expr sx)=
-  draw ((0,ht){down}..(10ut,ht/2){right}..(17.5ut,ht-2.5ut){up}..(15ut,ht){left}..(10ut,ht/2){down}..{right}(17.5ut,0)) shifted (sx,0);
-  xpos:=sx+17.5ut;
+  draw ((0,ht){down}..(7.5ut,ht/2){right}..(15ut,ht-2.5ut){up}..(12.5ut,ht){left}..(7.5ut,ht/2){down}..{right}(12.5ut,0)) shifted (sx,0);
+  xpos:=sx+12.5ut;
 enddef;
 
 def x_form (expr bt, ha, sx)=
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wela14_kl.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wela14_kl.mf
index 95416a5c6fa..684c9a75df3 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/wela14_kl.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wela14_kl.mf
@@ -2,11 +2,14 @@
 % Walter Entenmann
 % Kleinbuchstaben
 % 16.10.2011
+% 15.09.2014: Schleifchen-e, etc. modifiziert
+%             siehe wela14_def.mf
+%
 
 if not wortende:
-  beginchar("a",27.724ut#,ht#,0);
+  beginchar("a",28.724ut#,ht#,0);
   else:
-    beginchar(oct"241",14.278ut#,ht#,0);
+    beginchar(oct"241",15.278ut#,ht#,0);
  fi     
   pickup wela_pen;
 xpos:=0;
@@ -15,15 +18,15 @@ a_char;
 endchar;
 
 if not wortende:
-  beginchar("b",25.936ut#,Ht#,0);
+  beginchar("b",24.048ut#,Ht#,0);
   else:
-beginchar(oct"242",11.713ut#,Ht#,0);
+beginchar(oct"242",9.826ut#,Ht#,0);
     fi
   pickup wela_pen;
 xpos:=0;
-kurzstrich(xpos);
+%kurzstrich(xpos);
 oschl(xpos);
-stamm(ht,ht/2,xpos);
+stamm(ht-Delta,ht/2,xpos);
 bogen(ht/2,0,ht/2,ht/kh,0.5,-90,90,1,1,xpos);
 schweif(ht/2,ht,-einroll,90,angle(-1,mfahne),1,xpos);
 fahne(ht,ht-Delta,bfahne,angle(1,-mfahne),angle(1,m),1,xpos);
@@ -43,23 +46,23 @@ fahne(0,ht-Delta,rho+(ht-Delta)/m,0,angle(1,m),2.5,xpos);
 endchar;
 
 if not wortende:
-  beginchar("d",27.724ut#,Ht#,0);
+  beginchar("d",28.724ut#,Ht#,0);
   else:
-beginchar(oct"244",14.278ut#,Ht#,0);
+beginchar(oct"244",15.278ut#,Ht#,0);
     fi
   pickup wela_pen;
 xpos:=0;
 oval(xpos);
- stamm(Ht,rho,xpos);
+ stamm(Ht,2rho,xpos);
  stock(xpos);
   zeigen;
 endchar;
 
 % lat. e, Normalform
 if not wortende:
-  beginchar("e",15.767ut#,ht#,0);
+  beginchar("e",12.767ut#,ht#,0);
   else:
-beginchar(oct"245",15.767ut#,ht#,0);
+beginchar(oct"245",12.767ut#,ht#,0);
     fi
   pickup wela_pen;
 xpos:=0;
@@ -70,7 +73,7 @@ endchar;
 % Ligaturen:
 % e nach r
 if not wortende:
-beginchar(oct"010",17.5ut#,ht#,0);
+beginchar(oct"010",12.5ut#,ht#,0);
   pickup wela_pen;
   xpos:=0;
   latin_er(xpos);
@@ -80,7 +83,7 @@ fi
 
 % e nach b,o,v,w
 if not wortende:
-beginchar(oct"011",20ut#,ht#,0);
+beginchar(oct"011",15ut#,ht#,0);
   pickup wela_pen;
   xpos:=0;
   latin_eb(xpos);
@@ -90,7 +93,7 @@ fi
 
 % e nach g,j,y
 if not wortende:
-beginchar(oct"012",17.094ut#,ht#,0);
+beginchar(oct"012",13.6ut#,ht#,0);
   pickup wela_pen;
   xpos:=0;
   latin_eg(xpos);
@@ -99,15 +102,15 @@ endchar;
 fi
 
 if not wortende:
-  beginchar("f",15.333ut#,Ht#,dt#);
+  beginchar("f",13.446ut#,Ht#,dt#);
   else:
-beginchar(oct"246",1.888ut#,Ht#,dt#);
+beginchar(oct"246",0ut#,Ht#,dt#);
     fi
   pickup wela_pen;
   xpos:=0;
-  kurzstrich(xpos);
+%  kurzstrich(xpos);
 oschl(xpos);
-stamm(ht,-dt,xpos);
+stamm(ht-Delta,-dt,xpos);
 schweif(ht/6,0,D,-90,0,1,xpos-D);
 fahne(0,ht-Delta,rho+(ht-Delta)/m,0,angle(1,m),2,xpos);
  zeigen;
@@ -132,25 +135,25 @@ else:
 endchar;
 
 if not wortende:
-  beginchar("h",29.382ut#,Ht#,0);
+  beginchar("h",28.494ut#,Ht#,0);
   else:
-beginchar(oct"250",15.936ut#,Ht#,0);
+beginchar(oct"250",14.048ut#,Ht#,0);
     fi
   pickup wela_pen;
 xpos:=0;
-    kurzstrich(xpos);
+%    kurzstrich(xpos);
 oschl(xpos);
-stamm(ht,0,xpos);
+stamm(ht-Delta,0,xpos);
 bogen(ht/4,ht,5*ht/6,ht/kh,0.8,90,-90,1.2,1,xpos);
-stamm(5*ht/6,rho,xpos);
+stamm(5*ht/6,2*rho,xpos);
 stock(xpos);  
  zeigen;
 endchar;
 
 if not wortende:
-  beginchar("i",15.446ut#,Ht#,0); %%%% um 1ut schmaler
+  beginchar("i",16.446ut#,Ht#,0); %%%% um 1ut schmaler
   else:
-beginchar(oct"251",2ut#,Ht#,0);
+beginchar(oct"251",3ut#,Ht#,0);
     fi
   pickup wela_pen;
 xpos:=0;
@@ -158,7 +161,7 @@ spitz(xpos);
  pickup wela_pen_thick;
  ipunkt(xpos);
  pickup wela_pen;
-stamm(ht,rho,xpos);
+stamm(ht,2rho,xpos);
 stock(xpos);
  zeigen;
 endchar;
@@ -185,39 +188,39 @@ uschl_e(xpos);
 endchar;
 
 if not wortende:
-  beginchar("k",27.368ut#,Ht#,0);
+  beginchar("k",25.481ut#,Ht#,0);
   else:
-beginchar(oct"253",13.923ut#,Ht#,0);
+beginchar(oct"253",12.035ut#,Ht#,0);
     fi
   pickup wela_pen;
 xpos:=0;
-    kurzstrich(xpos);
+%    kurzstrich(xpos);
 oschl(xpos);
-stamm(ht,0,xpos);
+stamm(ht-Delta,0,xpos);
 k_form(xpos);
 fahne(0,ht-Delta,rho+(ht-Delta)/m,0,angle(1,m),2.5,xpos);
  zeigen;
 endchar;
 
 if not wortende:
-  beginchar("l",19.333ut#,Ht#,0);
+  beginchar("l",17.446ut#,Ht#,0);
   else:
-beginchar(oct"254",5.888ut#,Ht#,0);
+beginchar(oct"254",4ut#,Ht#,0);
     fi
   pickup wela_pen;  
 xpos:=0;
-    kurzstrich(xpos);
+%    kurzstrich(xpos);
 oschl(xpos);
-stamm(ht,2*rho,xpos);
+stamm(ht-Delta,2*rho,xpos);
 fuss(xpos);
 fahne(0,ht-Delta,rho+(ht-Delta)/m,0,angle(1,m),2.5,xpos);
  zeigen;
 endchar;
 
 if not wortende:
-  beginchar("m",46.373ut#,ht#,0);
+  beginchar("m",45.373ut#,ht#,0);
   else:
-beginchar(oct"255",32.928ut#,ht#,0);
+beginchar(oct"255",31.928ut#,ht#,0);
     fi
   pickup wela_pen;  
 xpos:=0;
@@ -226,22 +229,22 @@ stamm(ht-rho,0,xpos);
 bogen(ht/4,ht,5*ht/6,ht/kh,0.8,90,-90,1.2,1,xpos);
 stamm(5*ht/6,0,xpos);
 bogen(ht/4,ht,5*ht/6,ht/kh,0.8,90,-90,1.2,1,xpos);
-stamm(5*ht/6,rho,xpos);
+stamm(5*ht/6,2rho,xpos);
 stock(xpos);
  zeigen;
 endchar;
 
 if not wortende:
-  beginchar("n",34.325ut#,ht#,0);
+  beginchar("n",33.325ut#,ht#,0);
   else:
-beginchar(oct"256",20.880ut#,ht#,0);
+beginchar(oct"256",19.880ut#,ht#,0);
     fi
   pickup wela_pen;  
 xpos:=0;
 spazierstock(xpos);
 stamm(ht-rho,0,xpos);
 bogen(ht/4,ht,5*ht/6,ht/kh,0.8,90,-90,1.2,1,xpos);
-stamm(5*ht/6,rho,xpos);
+stamm(5*ht/6,2rho,xpos);
 stock(xpos);
  zeigen;
 endchar;
@@ -258,16 +261,16 @@ o_char;
 endchar;
 
 if not wortende:
-  beginchar("p",27.494ut#,ht#,dt#); % um 1ut schmaler
+  beginchar("p",28.494ut#,ht#,dt#); % um 1ut schmaler
   else:
-beginchar(oct"260",14.048ut#,ht#,dt#);
+beginchar(oct"260",15.048ut#,ht#,dt#);
     fi
   pickup wela_pen;
 xpos:=0;
 spitz(xpos);
 stamm(ht,-dt,xpos);
 bogen(ht/4,ht,5*ht/6,ht/kh,0.8,90,-90,1.2,1,xpos);
-stamm(5*ht/6,rho,xpos);
+stamm(5*ht/6,2rho,xpos);
 stock(xpos);
  zeigen;
 endchar;
@@ -286,9 +289,9 @@ strich(xpos);
 endchar;
 
 if not wortende:
-  beginchar("r",23.831ut#,ht#,0);
+  beginchar("r",21.831ut#,ht#,0);
   else:
-beginchar(oct"262",11.831ut#,ht#,0);
+beginchar(oct"262",9.831ut#,ht#,0);
     fi
     pickup wela_pen;
 xpos:=0;
@@ -300,7 +303,7 @@ fahne(ht,ht-Delta,rfahne,-90,angle(1,m),1,xpos);
 endchar;
 
 if not wortende:
-  beginchar("s",19.172ut#,ht#,0);
+  beginchar("s",19.966ut#,ht#,0);
   else:
 beginchar(oct"263",9.388ut#,ht#,0);
     fi
@@ -329,9 +332,9 @@ fahne(0,ht-Delta,rho+(ht-Delta)/m,0,angle(1,m),2.5,xpos);
 endchar;
 
 if not wortende:
-  beginchar("u",27.494ut#,ht#,0); % um 1ut schmaler
+  beginchar("u",28.494ut#,ht#,0); % um 1ut schmaler
   else:
-beginchar(oct"265",14.048ut#,ht#,0);
+beginchar(oct"265",15.048ut#,ht#,0);
     fi
   pickup wela_pen;
 xpos:=0;
@@ -340,9 +343,9 @@ u_char;
 endchar;
 
 if not wortende:
-  beginchar("v",30.880ut#,ht#,0);
+  beginchar("v",28.880ut#,ht#,0);
   else:
-beginchar(oct"266",16.657ut#,ht#,0);
+beginchar(oct"266",14.657ut#,ht#,0);
     fi
       pickup wela_pen;
 xpos:=0;
@@ -355,9 +358,9 @@ fahne(ht,ht-Delta,ofahne,angle(1,-mfahne),angle(1,m),1,xpos);
 endchar;
 
 if not wortende:
-  beginchar("w",42.928ut#,ht#,0);
+  beginchar("w",40.928ut#,ht#,0);
   else:
-beginchar(oct"267",28.706ut#,ht#,0);
+beginchar(oct"267",26.706ut#,ht#,0);
     fi
       pickup wela_pen;
 xpos:=0;
@@ -437,9 +440,9 @@ tangente(3.5ut);
 % Umlaute
 % ä
     if not wortende:
-      beginchar(oct"344",27.724ut#,Ht#,0);
+      beginchar(oct"344",28.724ut#,Ht#,0);
       else:
-beginchar(oct"273",14.278ut#,Ht#,0);
+beginchar(oct"273",15.278ut#,Ht#,0);
 	fi
       pickup wela_pen;
 xpos:=0;
@@ -464,9 +467,9 @@ endchar;
 
 % ü
 if not wortende:
-  beginchar(oct"374",27.494ut#,Ht#,0); % um 1ut schmaler
+  beginchar(oct"374",28.494ut#,Ht#,0); % um 1ut schmaler
   else:
-beginchar(oct"275",14.048ut#,Ht#,0);
+beginchar(oct"275",15.048ut#,Ht#,0);
     fi
       pickup wela_pen;
 xpos:=0;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wela14_sz.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wela14_sz.mf
index bff99b2d995..6cff0dd2c5f 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/wela14_sz.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wela14_sz.mf
@@ -1,7 +1,236 @@
 % Lateinische Ausgangsschrift (LA) wela
 % Walter Entenmann
 % 16.10.2011
-%
+% 14.11.2014: Aenderungen
+%             1. 3/4 hohe Ziffern 0-9
+%             2. 3/4 hohe Zeichen ? und !
+%             3. Einheitliche Sonderzeichen 
+%                # % & § $ @ / * euro
+%                franz < > << >>
+%                Bindestrich/Trennstrich  -
+%                -- --- + < > =
+
+% #
+beginchar("#",35ut#,Ht#,0);
+  pickup wela_pen;
+  p:=(0,0)--(0,Ht);
+  draw p slanted 0.176 shifted (10ut,0);
+  draw p slanted 0.176 shifted (20ut,0);
+  q:=((0,0)--(26ut,0)) shifted (2ut,0);
+  draw q shifted(0,Ht/3) slanted 0.176;
+  draw q shifted(0,2Ht/3) slanted 0.176;
+endchar;
+
+% §
+  beginchar(oct"237",43.333ut#,Ht#,dt#);
+  pickup wela_pen;
+sep:=10ut; breit:=20ut;
+p := ((8ut,20ut){curl 10}..(0ut,30ut){left}..(-breit/2,22ut){down}..
+  (breit/2,-2.5ut){down}..{-1,2/3}(2ut,-11ut)) scaled ((Ht+dt)/60ut);
+  draw p shifted (sep+breit*0.583,ht/2);
+  draw p rotated 180 shifted (sep+breit*0.583,ht/2);
+  endchar;
+  
+% *
+beginchar("*",30ut#,Ht#,0);
+  pickup wela_pen;
+  p:= (-ht/2,0)--(ht/2,0);
+  draw p rotated 90 shifted (15ut,1.5ht);
+  draw p rotated 30 shifted (15ut,1.5ht);
+  draw p rotated -30 shifted (15ut,1.5ht);
+endchar;
+
+% Prozentzeichen (%)
+beginchar("%",40ut#,Ht#,0);
+  pickup wela_pen;
+  q := (-23.6ut,0)--(23.6ut,0);
+  breit:=12.5ut;hoch:=17.5ut;
+  p := (breit/2,0){up}..(0,hoch/2){left}..(-breit/2,0){down}..(0,-hoch/2){right}..{up}(breit/2,0);
+  x0:=whatever;y0:=whatever;
+  z0=(directionpoint (-1,2) of (subpath (0,1) of p)) shifted (7.5ut+breit/2,Ht-hoch/2);
+  draw p shifted (7.5ut+breit/2,Ht-hoch/2);
+  draw p shifted (7.5ut+25ut-breit/2,hoch/2);
+  draw q rotated 58 shifted (w/2,h/2);
+  draw z0{1,-2}..{dir 58}(7.5ut+25ut,Ht);
+endchar;
+
+% &
+  beginchar("&",40ut#,Ht#,0);
+  pickup wela_pen;
+  p := (22.5ut,12.5ut)..tension 1.2..(7.5ut,0){left}..(0,8ut){up}..
+  %(8.167ut,21ut){3,2}..
+  tension 1.2..(17ut,34.5ut){up}..(11.5ut,Ht){left}..(4ut,30ut){down}..{2,-3}(8.167ut,21ut)--(22.5ut,0);
+  draw p shifted (10ut,0);
+  endchar;
+
+% $
+beginchar("$",30ut#,Ht#,0);
+  pickup wela_pen;
+  draw halfcircle xscaled 20ut yscaled 20ut shifted (15ut,30ut);
+   draw (halfcircle rotated 180 xscaled 20ut yscaled 20ut) shifted (15ut,10ut);
+   draw ((-10ut,10ut){down}..{down}(10ut,-10ut)) shifted (15ut,ht);
+   draw ((0,ht+2.5ut)--(0,-ht-2.5ut)) shifted (15ut,ht);
+endchar;
+
+% "+"
+beginchar("+",30ut#,22.5ut#,0);
+  path p;
+  pickup wela_pen;
+  z0=(15ut,hmath);
+  z1=(0ut,10ut);
+  z2=(0ut,-10ut);
+  p := z1--z2;
+  draw p   shifted z0 ;
+  draw p   rotated 90 shifted z0 ;
+  labels(range 0 thru 2); 
+endchar;
+
+% ASCII Bindestrich oct"055" (OT1: auch Trennstrich)
+beginchar("-",27.5ut#,ht#,0);
+  pickup wela_pen;
+  draw ((0,0)--(12.5ut,0)) shifted (7.5ut,hdash);
+endchar;
+
+% T1: Trennstrich
+beginchar(oct"177",27.5ut#,ht#,0);
+  pickup wela_pen;
+  draw ((0,0)--(12.5ut,0)) shifted (7.5ut,hdash);
+endchar;
+
+% "/" 
+beginchar("/",25ut#,Ht#,0);
+  pickup wela_pen;
+draw ((5ut,0)--(20ut,Ht));
+endchar;
+
+% ">" 
+beginchar(">",30ut#,Ht#,0);
+  path p;
+  pickup wela_pen;
+p:=(0,0)--(20ut,0);
+draw p rotated 30 shifted (6.33ut,hmath);
+  draw p rotated -30 shifted (6.33ut,hmath);
+endchar;
+
+% "=" 
+beginchar("=",30ut#,ht#,0);
+    pickup wela_pen;
+  draw((0,0)--(20ut,0)) shifted (5ut,hmath-2.5ut);
+  draw((0,0)--(20ut,0)) shifted (5ut,hmath+2.5ut);
+endchar;
+
+% "<" 
+beginchar("<",30ut#,Ht#,0);
+  path p;
+  pickup wela_pen;
+p:=(0,0)--(-20ut,0);
+draw p rotated 30 shifted (23.66ut,hmath);
+  draw p rotated -30 shifted (23.66ut,hmath);
+endchar;
+
+% oct"025" Bis-Strich --, Gedankenstrich 
+beginchar(oct"025",30ut#,ht#,0);
+  pickup wela_pen;
+draw ((0,0)--(20ut,0)) shifted (5ut,hdash);
+endchar;
+
+% engl. Gedankenstrich ---
+beginchar(oct"026",45ut#,ht#,0);
+  pickup wela_pen;
+draw ((0,0)--(30ut,0)) shifted (7.5ut,hdash);
+endchar;
+
+% oct"023" franz. Anfz. <<
+beginchar(oct"023",32.5ut#,ht#,0);
+  path p, q;
+  pickup wela_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+  z4=(6,1);
+  z5=(7.5ut,ht/2);
+z6=(15ut,ht/2);
+  p := (z1{z3}..z2) rotated 45;
+    q := (z1{z4}..z2) rotated -45;
+  draw p shifted z5  ;
+  draw p shifted z6 ;
+    draw q shifted z5 ;
+  draw q shifted z6 ;
+  labels(range 1 thru 6);
+endchar;  
+
+% oct"024" franz. Anfz. >>
+beginchar(oct"024",32.5ut#,ht#,0);
+  path p, q;
+  pickup wela_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+    z4=(6,1);
+  z5=(17.5ut,ht/2);
+  z6=(25ut,ht/2);
+
+  p := (z1{z4}..z2) rotated 135;
+    q := (z1{z3}..z2) rotated -135;
+  draw p shifted z5 ;
+  draw p shifted z6 ;
+    draw q shifted z5 ;
+  draw q shifted z6 ;
+  labels(range 1 thru 6);
+endchar;  
+
+% oct"016" franz. Anfz. <
+beginchar(oct"016",25ut#,ht#,0);
+  path p, q;
+  pickup wela_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+  z4=(6,1);
+  z5=(7.5ut,ht/2);
+  p := (z1{z3}..z2) rotated 45;
+    q := (z1{z4}..z2) rotated -45;
+  draw p shifted z5  ;
+    draw q shifted z5 ;
+  labels(range 1 thru 5);
+endchar;  
+
+% oct"017" franz. Anfz. >
+beginchar(oct"017",25ut#,ht#,0);
+  path p, q;
+  pickup wela_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+    z4=(6,1);
+  z5=(17.5ut,ht/2);
+  p := (z1{z4}..z2) rotated 135;
+    q := (z1{z3}..z2) rotated -135;
+  draw p shifted z5 ;
+    draw q shifted z5 ;
+  labels(range 1 thru 5);
+endchar;  
+
+% "@":
+beginchar("@",50ut#,Ht#,0);
+  pickup wela_pen;
+sep:=10ut;gap:=8ut;
+draw (superellipse((a,0),(0,b),(-a,0),(0,-b),sigma)) shifted (gap+a+sep,ht);
+draw ((0,ht)--(0,5ut){down}..(2ut,0){right}..tension 1.5..(gap,ht/2){up}..
+  (-a,3ht/2){left}..(-2*a-gap,ht/2){down}..
+  (-a,-ht/2){right}..(7.5ut,-5ut)) shifted (2*a+gap+sep,ht/2);
+endchar;
+
+% Euro (\symbol{160})
+beginchar(oct"240",47.5ut#,Ht#,0);
+  pickup wela_pen;
+  sep:=7.5ut; gap:=7.5ut;
+    draw (halfcircle rotated 90) xscaled 30ut yscaled Ht shifted (15ut+gap+sep,Ht/2);
+  draw ((0,0){right}..(7.5ut,-3ut)) shifted (15ut+gap+sep,Ht);
+  draw ((0,0){right}..(7.5ut,3ut)) shifted (15ut+gap+sep,0);
+  draw (((-25ut,2.5ut)--(0,2.5ut))  shifted (15ut+gap+sep,ht)) slanted 0.25;
+  draw (((-25ut,-2.5ut)--(0,-2.5ut)) shifted (15ut+gap+sep,ht)) slanted 0.25;
+endchar;
 
 % Aufstrich am Wortanfang 
 beginchar(oct"200",11.446ut#,ht#,0);
@@ -22,10 +251,15 @@ endchar;
  % "e" mit Aufstrich am Wortanfang 
 beginchar(oct"030",12.267ut#,ht#,0);
   pickup wela_pen;
-     xpos:=0;
-     draw ((0,0)--(0.5ht/m,ht/2)) shifted (xpos,0);
-     xpos:=xpos+0.5ht/m;
-     latin_e_form(xpos);
+%      xpos:=0;
+%     draw ((0,0)--(0.5ht/m,ht/2)) shifted (xpos,0);
+%     xpos:=xpos+0.5ht/m;
+%     latin_e_form(xpos);
+  xpos:=0;
+  draw ((0,0)..(ebreite+0.5ht/m,ht-ebreite*ef){up})  shifted (xpos,0);
+  xpos:=xpos+0.5ht/m;
+   latin_e_form(xpos);
+%  xpos:=ebreite*(1-ef)+0.5ht/m;
      zeigen;
 endchar;
 
@@ -46,7 +280,7 @@ draw ((0,0){right}..{1,m}(3.5ut,2.5ut));
   beginchar(oct"000",22.267ut#,ht#,0);
      pickup wela_pen;
      xpos:=0;
-     draw ((0,0){right}..(8ut+rho+0.5ht/m,ht/2){1,m}) shifted (xpos,0);
+     draw ((0,0){right}..{up}(8ut+rho+0.5ht/m+ebreite,ht-ebreite*ef)) shifted (xpos,0);
      xpos:=xpos+8ut+rho+0.5ht/m;
      latin_e_form(xpos);
      zeigen;
@@ -56,7 +290,7 @@ endchar;
   beginchar(oct"001",24.267ut#,ht#,0);
      pickup wela_pen;
      xpos:=0;
-     draw ((0,0){right}..(10ut+rho+0.5ht/m,ht/2){1,m}) shifted (xpos,0);
+     draw ((0,0){right}..{up}(10ut+rho+0.5ht/m+ebreite,ht-ebreite*ef)) shifted (xpos,0);
      xpos:=xpos+10ut+rho+0.5ht/m;
      latin_e_form(xpos);
      zeigen;
@@ -66,7 +300,7 @@ endchar;
   beginchar(oct"002",26.267ut#,ht#,0);
      pickup wela_pen;
      xpos:=0;
-     draw ((0,0){right}..(12ut+rho+0.5ht/m,ht/2){1,m}) shifted (xpos,0);
+     draw ((0,0){right}..{up}(12ut+rho+0.5ht/m+ebreite,ht-ebreite*ef)) shifted (xpos,0);
      xpos:=xpos+12ut+rho+0.5ht/m;
      latin_e_form(xpos);
      zeigen;
@@ -76,7 +310,7 @@ endchar;
   beginchar(oct"003",28.267ut#,ht#,0);
      pickup wela_pen;
      xpos:=0;
-     draw ((0,0){right}..(14ut+rho+0.5ht/m,ht/2){1,m}) shifted (xpos,0);
+     draw ((0,0){right}..{up}(14ut+rho+0.5ht/m+ebreite,ht-ebreite*ef)) shifted (xpos,0);
       xpos:=xpos+14ut+rho+0.5ht/m;
       latin_e_form(xpos);
       zeigen;
@@ -86,7 +320,7 @@ endchar;
   beginchar(oct"004",30.267ut#,ht#,0);
      pickup wela_pen;
      xpos:=0;
-     draw ((0,0){right}..(16ut+rho+0.5ht/m,ht/2){1,m}) shifted (xpos,0);
+     draw ((0,0){right}..{up}(16ut+rho+0.5ht/m+ebreite,ht-ebreite*ef)) shifted (xpos,0);
       xpos:=xpos+16ut+rho+0.5ht/m;
       latin_e_form(xpos);
       zeigen;
@@ -191,28 +425,25 @@ endchar;
 
 beginchar("4",Wz#,Hz#,0);
   pickup wela_pen;
-draw ((w'/4,h)--(0,h/4)--(w',h/4)) shifted (s',0);
-draw ((0.675w',3h/4)--(0.675w',0)) shifted (s',0);
+draw ((w'/2,h)--(0,h/4)--(w',h/4)) shifted (s',0);
+draw ((0.75w',h/2)--(0.75w',0)) shifted (s',0);
 endchar;
 
-
 beginchar("5",Wz#,Hz#,0);
   pickup wela_pen;
-draw ((w',h)--(0,h)--(0,5h/8-dd){1,1}..(w'/2,5h/8){right}..(w',2.5h/8){down}..(w'/2,0){left}..(0,h/8)) shifted (s',0);
+draw ((0.8w',h){dir190}..{dir170}(0,h)--(0,5h/8-dd){1,1}..(w'/2,5h/8){right}..(w',2.5h/8){down}..(w'/2,0){left}..(0,h/8)) shifted (s',0);
 endchar;
 
-
 beginchar("6",Wz#,Hz#,0);
     pickup wela_pen;
-draw ((w'/2+D,h-dd)..(w'/2,h){left}..(0,3h/8){down}..(w'/2,0){right}..(w',3h/8){up}..(w'/2,5h/8){left}..(0,3h/8){down}) shifted (s',0);
+draw ((0.8w',h){left}..tension0.8..(0,3h/8){down}..(w'/2,0){right}..(w',3h/8){up}..(w'/2,5h/8){left}..(0,3h/8){down}) shifted (s',0);
 endchar;
 
-
 beginchar("7",Wz#,Hz#,0);
   pickup wela_pen;
   xpos:=0;
-bogen(Ht-D,Ht,Ht,w',0.3,75,angle(1,2.67),1,1,xpos+s');
-draw ((w',h)--(w'/4,0)) shifted (s',0);
+bogen(h-D,h,h,w',0.3,75,angle(1,2.67),1,1,xpos+s');
+draw ((w',h)--(0.4w',0)) shifted (s',0);
 quer(bot(h/2),xpos-7.5ut)
 endchar;
 
@@ -223,8 +454,6 @@ draw ((0,0.5625h){1,0.15}..(3w'/8,h-3w'/8){up}..(0,h){left}..(-3w'/8,h-3w'/8){do
 draw ((w/2,h){down}..(s'+w'-dd/2,h));
 endchar;
 
-
-
 beginchar("9",Wz#,Hz#,0);
   pickup wela_pen;
 draw (fullcircle xscaled w' yscaled (5h/8)) shifted (w/2,0.6875h);
@@ -249,68 +478,12 @@ beginchar(oct"042",20ut#,Ht#,0);
   komma(Ht,12.5ut);
 endchar;
 
-% #
-beginchar("#",60ut#,Ht#,dt#);
-  pickup wela_pen;
- gap:=10ut;
-p:= ((0,-(Ht+dt)/2)--(0,(Ht+dt)/2));
-draw (p shifted (-gap/2,0) slanted 1/4) shifted (w/2,ht/2);
-draw (p shifted (gap/2,0) slanted 1/4) shifted (w/2,ht/2);
-q:= ((-20ut,0)--(20ut,0));
-  draw (q shifted (0,-gap/2) slanted 1/4) shifted (w/2,ht/2);
-  draw (q shifted (0,gap/2) slanted 1/4) shifted (w/2,ht/2);
-endchar;
-  
-% $
-beginchar("$",35ut#,Ht#,0);
-  pickup wela_pen;
- radi:=10ut;
-  draw halfcircle scaled (2*radi) shifted (0,Ht-radi) shifted (w/2,0);
-   draw (halfcircle rotated 180 scaled (2*radi)) shifted (0,radi) shifted (w/2,0);
-   draw ((-radi,Ht-radi){down}..{down}(radi,radi)) shifted (w/2,0);
-   draw ((0,Ht+dd)--(0,-dd)) shifted (w/2,0);
-endchar;
-
-% %
-beginchar("%",40ut#,Ht#,0);
-  pickup wela_pen;
-  sep:=7.5ut;
-  q := ((0,0)--(25ut,Ht));
-  breit:=10ut; hoch:=15ut;
-  p := (breit/2,0){up}..(0,hoch/2){left}..(-breit/2,0){down}..(0,-hoch/2){right}..{up}(breit/2,0);
-  x0:=whatever;y0:=whatever;
-  z0=(directionpoint (-1,2) of (subpath (0,1) of p)) shifted (sep+breit/2,Ht-hoch/2);
-  draw (p shifted (sep+breit/2,Ht-hoch/2));
-  draw (p shifted (sep+25ut-breit/2,hoch/2));
-  draw (q  shifted (sep,0));
-  draw (z0{1,-2}..{dir 58}(sep+25ut,Ht));
-  endchar;
-
-% &
-  beginchar("&",40ut#,Ht#,0);
-  pickup wela_pen;
-  p := (25ut,20ut){down}..tension 1.2..(10ut,0){left}..(0,10ut){up}..
-(15ut,Ht-5ut){up}..(10ut,Ht){left}..(2.5ut,Ht-7.5ut){down}..tension1.5 and 5..{right}(22.5ut,0)..{1,2}(27.5ut,2.5ut);
-  draw p shifted (7.5ut,0);
-  endchar;
-
-% §
-  beginchar(oct"237",43.333ut#,Ht#,dt#);
-  pickup wela_pen;
-sep:=10ut; breit:=20ut;
-p := ((8ut,20ut){curl 10}..(0ut,30ut){left}..(-breit/2,22ut){down}..
-  (breit/2,-2.5ut){down}..{-1,2/3}(2ut,-11ut)) scaled ((Ht+dt)/60ut);
-  draw p shifted (sep+breit*0.583,ht/2);
-  draw p rotated 180 shifted (sep+breit*0.583,ht/2);
-  endchar;
-
 % ' (Apostroph)
 beginchar("'",15ut#,Ht#,0);
   pickup wela_pen;
 komma(Ht,7.5ut);
 endchar;
 
-
 % "("
 beginchar("(",20ut#,Ht#,0);
   pickup wela_pen;
@@ -323,63 +496,18 @@ beginchar(")",20ut#,Ht#,0);
 draw ((5ut,Ht)..(10ut,ht){down}..(5ut,0));
 endchar;
 
-% "*"
-beginchar("*",30ut#,Ht#,0);
-  path p;
-  pickup wela_pen;
-  z0=(15ut,ht+dt/4);
-  z1=(0ut,7.5ut);
-  z2=(0ut,-7.5ut);
-  p := z1--z2;
-  draw p   shifted z0 ;
-  draw p   rotated 60 shifted z0 ;
-  draw p   rotated -60 shifted z0 ;
-  labels(range 0 thru 2); 
-endchar;
-
-% "+"
-beginchar("+",30ut#,22.5ut#,0);
-  path p;
-  pickup wela_pen;
-  z0=(15ut,hmath);
-  z1=(0ut,10ut);
-  z2=(0ut,-10ut);
-  p := z1--z2;
-  draw p   shifted z0 ;
-  draw p   rotated 90 shifted z0 ;
-  labels(range 0 thru 2); 
-endchar;
-
 % "," Komma
 beginchar(",",20ut#,ht#,dt#);
   pickup wela_pen;
 komma(2.5ut,10ut);
 endchar;
 
-% ASCII Bindestrich oct"055" (OT1: auch Trennstrich)
-beginchar("-",27.5ut#,ht#,0);
-  pickup wela_pen;
-  draw ((0,0)--(12.5ut,0)) shifted (7.5ut,hdash);
-endchar;
-
-% T1: Trennstrich
-beginchar(oct"177",27.5ut#,ht#,0);
-  pickup wela_pen;
-  draw ((0,0)--(12.5ut,0)) shifted (7.5ut,hdash);
-endchar;
-
 % "." Punkt
 beginchar(".",20ut#,ht#,0);
   pickup wela_pen_thick;
   drawdot top(0,0) shifted (10ut,0);
 endchar;
 
-% "/" 
-beginchar("/",25ut#,Ht#,0);
-  pickup wela_pen;
-draw ((5ut,0)--(20ut,Ht));
-endchar;
-
 % ":" Doppelpunkt
 beginchar(":",20ut#,ht#,0);
   pickup wela_pen_thick;
@@ -395,48 +523,20 @@ komma(2.5ut,10ut);
   drawdot (0,0) shifted (10ut,15ut);
 endchar;
 
-% ">" 
-beginchar(">",30ut#,Ht#,0);
-  path p;
-  pickup wela_pen;
-p:=(0,0)--(20ut,0);
-draw p rotated 30 shifted (6.33ut,hmath);
-  draw p rotated -30 shifted (6.33ut,hmath);
-endchar;
-
-
-% "=" 
-beginchar("=",30ut#,ht#,0);
-    pickup wela_pen;
-  draw((0,0)--(20ut,0)) shifted (5ut,hmath-2.5ut);
-  draw((0,0)--(20ut,0)) shifted (5ut,hmath+2.5ut);
-endchar;
-
-
-% "<" 
-beginchar("<",30ut#,Ht#,0);
-  path p;
-  pickup wela_pen;
-p:=(0,0)--(-20ut,0);
-draw p rotated 30 shifted (23.66ut,hmath);
-  draw p rotated -30 shifted (23.66ut,hmath);
-endchar;
-
-
 % ?
-beginchar("?",35ut#,Hz#,0);
-  radi:=7.5ut;
-  pickup wela_pen;
-  z1=(-radi,Hz-radi);
-  z2=(0,Hz);
-  z3=(radi,Hz-radi);
-  z5=(-radi,10ut+radi);
-  z6=(0,10ut);
-  z7=(radi,10ut+radi);
+beginchar("?",30ut#,Hz#,0);
+  radi:=5ut;
+  pickup wela_pen;
+  z1=(-1.5radi,h-0.5radi);
+  z2=(0,h);
+  z3=(1.5radi,h-radi);
+  z5=(-1.5radi,2.5radi);
+  z6=(0,1.5radi);
+  z7=(1.5radi,2radi);
   p := z1..z2{right}..z3{down}..{down}z5..z6{right}..z7;
-  draw p shifted (17.5ut,0);
+  draw p shifted (15ut,0);
   pickup wela_pen_thick;
-  drawdot top(0,0) shifted (17.5ut,0);
+  drawdot top(0,0) shifted (15ut,0);
 endchar;
 
 % spezielle Sonderzeichen (ec-Kodierung(
@@ -454,92 +554,6 @@ beginchar(oct"022",25ut#,ht#,dt#);
   komma(2.5ut,15ut);
 endchar;
 
-% oct"025" Bis-Strich --, Gedankenstrich 
-beginchar(oct"025",30ut#,ht#,0);
-  pickup wela_pen;
-draw ((0,0)--(20ut,0)) shifted (5ut,hdash);
-endchar;
-
-% engl. Gedankenstrich ---
-beginchar(oct"026",45ut#,ht#,0);
-  pickup wela_pen;
-draw ((0,0)--(30ut,0)) shifted (7.5ut,hdash);
-endchar;
-
-
-% oct"023" franz. Anfz. <<
-beginchar(oct"023",32.5ut#,ht#,0);
-  path p, q;
-  pickup wela_pen;
-  z1=(0ut,0ut);
-  z2=(1.1*ht/2,0);
-  z3=(6,-1);
-  z4=(6,1);
-  z5=(7.5ut,ht/2);
-z6=(15ut,ht/2);
-  p := (z1{z3}..z2) rotated 45;
-    q := (z1{z4}..z2) rotated -45;
-  draw p shifted z5  ;
-  draw p shifted z6 ;
-    draw q shifted z5 ;
-  draw q shifted z6 ;
-  labels(range 1 thru 6);
-endchar;  
-
-
-% oct"024" franz. Anfz. >>
-beginchar(oct"024",32.5ut#,ht#,0);
-  path p, q;
-  pickup wela_pen;
-  z1=(0ut,0ut);
-  z2=(1.1*ht/2,0);
-  z3=(6,-1);
-    z4=(6,1);
-  z5=(17.5ut,ht/2);
-  z6=(25ut,ht/2);
-
-  p := (z1{z4}..z2) rotated 135;
-    q := (z1{z3}..z2) rotated -135;
-  draw p shifted z5 ;
-  draw p shifted z6 ;
-    draw q shifted z5 ;
-  draw q shifted z6 ;
-  labels(range 1 thru 6);
-endchar;  
-
-% oct"016" franz. Anfz. <
-beginchar(oct"016",25ut#,ht#,0);
-  path p, q;
-  pickup wela_pen;
-  z1=(0ut,0ut);
-  z2=(1.1*ht/2,0);
-  z3=(6,-1);
-  z4=(6,1);
-  z5=(7.5ut,ht/2);
-  p := (z1{z3}..z2) rotated 45;
-    q := (z1{z4}..z2) rotated -45;
-  draw p shifted z5  ;
-    draw q shifted z5 ;
-  labels(range 1 thru 5);
-endchar;  
-
-
-% oct"017" franz. Anfz. >
-beginchar(oct"017",25ut#,ht#,0);
-  path p, q;
-  pickup wela_pen;
-  z1=(0ut,0ut);
-  z2=(1.1*ht/2,0);
-  z3=(6,-1);
-    z4=(6,1);
-  z5=(17.5ut,ht/2);
-  p := (z1{z4}..z2) rotated 135;
-    q := (z1{z3}..z2) rotated -135;
-  draw p shifted z5 ;
-    draw q shifted z5 ;
-  labels(range 1 thru 5);
-endchar;  
-
 % oct"133" [
 beginchar("[",25ut#,Ht#,0);
   pickup wela_pen;
@@ -552,25 +566,6 @@ beginchar("]",25ut#,Ht#,0);
 draw ((5ut,Ht)--(10ut,Ht)--(10ut,0)--(5ut,0)) shifted (5ut,0);
 endchar;
 
-% "@":
-beginchar("@",50ut#,Ht#,0);
-  pickup wela_pen;
-sep:=10ut;gap:=8ut;
-draw (superellipse((a,0),(0,b),(-a,0),(0,-b),sigma)) shifted (gap+a+sep,ht);
-draw ((0,ht)--(0,5ut){down}..(2ut,0){right}..tension 1.5..(gap,ht/2){up}..
-  (-a,3ht/2){left}..(-2*a-gap,ht/2){down}..
-  (-a,-ht/2){right}..(7.5ut,-5ut)) shifted (2*a+gap+sep,ht/2);
-endchar;
 
-% Euro
-beginchar(oct"240",47.5ut#,Ht#,0);
-  pickup wela_pen;
-  sep:=7.5ut; gap:=7.5ut;
-    draw (halfcircle rotated 90) xscaled 30ut yscaled Ht shifted (15ut+gap+sep,Ht/2);
-  draw ((0,0){right}..(7.5ut,-3ut)) shifted (15ut+gap+sep,Ht);
-  draw ((0,0){right}..(7.5ut,3ut)) shifted (15ut+gap+sep,0);
-  draw (((-25ut,2.5ut)--(0,2.5ut))  shifted (15ut+gap+sep,ht)) slanted 0.25;
-  draw (((-25ut,-2.5ut)--(0,-2.5ut)) shifted (15ut+gap+sep,ht)) slanted 0.25;
-endchar;
 
 %%%%%%%%%%%%%%%%%%%% End of File %%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/welabx14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/welabx14.mf
new file mode 100644
index 00000000000..1ea8faa747d
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/welabx14.mf
@@ -0,0 +1,3 @@
+% wela bold
+fetter:=2;
+input wela14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/welabxsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/welabxsl14.mf
new file mode 100644
index 00000000000..e801ca5ab1d
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/welabxsl14.mf
@@ -0,0 +1,3 @@
+% wela bold, slanted
+fetter:=2;
+input welasl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/welaeb14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/welaeb14.mf
new file mode 100644
index 00000000000..4a6c6d8086c
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/welaeb14.mf
@@ -0,0 +1,3 @@
+% wela extra bold
+fetter:=3;
+input wela14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/welaebsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/welaebsl14.mf
new file mode 100644
index 00000000000..8d7c6acaa10
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/welaebsl14.mf
@@ -0,0 +1,3 @@
+% wela extra bold, slanted
+fetter:=3;
+input welasl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/welasb14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/welasb14.mf
new file mode 100644
index 00000000000..45261c5cba6
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/welasb14.mf
@@ -0,0 +1,3 @@
+% wela semi bold
+fetter:=1;
+input wela14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/welasbsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/welasbsl14.mf
new file mode 100644
index 00000000000..f598f290380
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/welasbsl14.mf
@@ -0,0 +1,3 @@
+% wela semi bold, slanted
+fetter:=1;
+input welasl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/welaub14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/welaub14.mf
new file mode 100644
index 00000000000..ccf3d9f06ea
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/welaub14.mf
@@ -0,0 +1,3 @@
+% wela ultra bold
+fetter:=4;
+input wela14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/welaubsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/welaubsl14.mf
new file mode 100644
index 00000000000..cea97b03fa6
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/welaubsl14.mf
@@ -0,0 +1,3 @@
+% wela ultra bold, slanted
+fetter:=4;
+input welasl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesa14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesa14.mf
index 715dd70df17..732c539556e 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/wesa14.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesa14.mf
@@ -22,18 +22,24 @@ ut#:=0.233pt#;
 ht#:=20ut#; % x-Hoehe
 dt#:=ht#; % Unterlaenge, Oberlaenge
 Ht#:=ht#+dt#;% Versalhoehe
-Hz#:=Ht#; % Ziffernhoehe
+Hz#:=ht#+0.5dt#; % Ziffernhoehe
 Wz#:=30ut#; % Ziffernbreite
 
 % Umrechnung in Pixel-Groessen
 define_pixels(ut,Ht,ht,dt,Hz,Wz);
 
 % Federn:
+if unknown fetter: fetter:=0; fi
+fetter:=sqrt(2)**fetter;
 % runde Feder (Redisfeder)
-  pickup pencircle scaled 1.25ut;
+  pickup pencircle scaled (fetter*1.25*ut);
 wesa_pen:=savepen;
 % fuer Punkte etc.
-  pickup pencircle scaled 3ut;
+if fetter>3: pickup pencircle scaled 7ut;
+elseif fetter>2.5: pickup pencircle scaled 5ut;
+  else:
+    pickup pencircle scaled 3.5ut;
+    fi
 wesa_pen_thick := savepen;
 %
 % Current Transformation, slanted
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_def.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_def.mf
index b4207f0d809..0586140c65e 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_def.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_def.mf
@@ -1,26 +1,30 @@
 % Schulausgangsschrift (SAS)  wesa
 % Parameter und Makrodefinitionen
 % 23.10.2011
+% 23.11.2014: modifiziert
+% 30.11.2014: modifiziert, Duktus
+%
 
-% Parameter:
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Parameter:
 % kl. Abstand in der Groesse der Strichstaerke
 eta:=1ut;
 % Steigung des Verbindungsstrichs
 m:=1.5;
-% Superellipse
-b=ht/2;
-k:=1.5; % SAS
-a*k=b;
+% Viertelbogen links oben               % geandert 
+b:=ht/2;
+k:=1.481;                               % k geaendert
+k*a=b;
 sigma:=0.73345;
+t:=0.85;                                % geaendert  
 
-% Delta, delta
-  z1=(0,b); z2=(-a,0);
-  z5=(-sigma*a,sigma*b);
-  p := z1{left}..z5{z2-z1}..{down}z2;
-  x0:=whatever;y0:=whatever;
-    z0=(directionpoint(1,m) of (reverse (subpath (0,2) of p)));
-    delta:=a+x0;Delta:=b-y0;
+% Delta, delta                           % geaendert
+p:=(a,2b){left}..tension t..{down}(0,b);
+x0:=whatever;y0:=whatever;
+z0=directionpoint (-1,-m) of p;
+Delta:=2b-y0;
+delta:=x0;                               % geaendert
 
 % typische kleine Masse
 dd:=2.5ut; 
@@ -31,21 +35,21 @@ rho:=2ut;
 
 % Unterschleife, Schnittpunkt bei (0,0)
 % Steigung m
-sb:=9ut;
+sb:=8ut;                                % geaendert von 9 auf 8
 sbf:=0.35; % sb*sbf
 sbfh:=0.23; % dt*sbfh 
 % vor lat. e, Steigung m'=1
 m':=0.87;
-sb':=9ut;
+sb':=8ut;                                % geaendert von 9 auf 8
 sbf':=sbf;
 sbfh':=0.28;
 % Oberschleife, Schnittpunkt bei (0,ht)
 % Steigung m
-sb'':=9ut;
+sb'':=8ut;                                 % geaendert von 9 auf 8
 sbf'':=0.35; % sb''*sbf''
 sbfh'':=0.23; % dt*sbfh''
 % Breite von "h" etc (breite=ht/kh)
-kh:=1.66;
+kh:=1.6;                                    % kh geaendert von 1.66 auf 1.6
 % Breite der Fahne bei r
 rfahne:=12ut;
 % Einrollmass
@@ -63,6 +67,7 @@ sbreite:=6ut;
 me:=0.8;
 ebreite:=8ut;
 ef:=0.2;
+ef':=0.25;                                  % geaendert neu
 he:=ht/2-2eta;
 %Steigung im Beruehrpunkt
 mt:=m;
@@ -70,27 +75,43 @@ mt:=m;
 s_kurzstrichbreite:=(Delta-ht+(ht))/m;
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Parameter fuer Grossbuchstaben:
+% Unterschleife:
+Sb:=10ut;
+  Sbf:=0.35;
+  Sbfh:=0.23;
+  Sb':=10ut;
+  Sbf':=0.35;
+  Sbfh':=0.23;
 % Radius bei "Flanke"
-R:=3.5ut;
+R:=2ut;%
 % Abstand der Umlautstriche bei Grossbuchstaben:
 dumlaut:=5ut;
 % Breitenmasse:
-Sporn:=D; % Horn bei B, D, etc.
-sporn:=10ut;
-Abreite:=25ut;
-Bbreite:=20ut;
+Breite:=20ut; % Breite von vielen Grossbuchstaben, typ. "H"
+Sporn:=6ut; % Horn bei B, D, etc.
+Sporn':=4ut;
+sporn:=5ut;
+Abreite:=30ut;%
+Bbreite:=Breite;
 Bbreite':=15ut; % oberer Bauch
-Hbreite:=17.5ut;
-Nbreite:=18ut;
-Lbreite:=22.5ut;
-Obreite:=27.5ut;
+Fdach:=Breite;
+Fdach':=Fdach-dd-(Sporn-Sporn');
+Gbreite:=25ut;
+Hbreite:=Breite;
+Jbreite:=15ut;
+Mbreite:=Abreite-5ut;
+Nbreite:=Breite;
+Lbreite:=25ut;
+Obreite:=4a;
+Dbreite:=Obreite;
+Tbreite:=32ut;
 % Oval
-A:=Obreite/2; B:=ht;
+A:=Obreite/2; B:=Ht/2;
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Parameter fuer Ziffern:
-s':=Hz/8;    % seitlicher Abstand
+s':=5ut;    % seitlicher Abstand
 w':= Wz-2s';  % effektive Breite der Ziffern
-r:=w'/2;     % Radius bei "2"
+r:=(w'-dd)/2;% Radius bei "2"
 % Zeichen:
 hmath:=ht/2;
 hdash:=ht/2;
@@ -98,14 +119,14 @@ hdash:=ht/2;
 skern#:=-6ut#;
 sskern#:=-7.5ut#;
 Bkern#:=-15ut#;
-Dkern#:=-17.5ut#;
-Ikern#:=-8.75ut#; 
-Nkern#:=-18ut#;  
-Okern#:=-13.75ut#; % auch Ö
+Dkern#:=-16ut#;
+Ikern#:=-10ut#; 
+Nkern#:=-25ut#;  
+Okern#:=-13.5ut#; % auch Ö
 Pkern#:=-15ut#;
-Skern#:=-7.5ut#;
-Tkern#:=-15ut#;
-Vkern#:=-17.5ut#;   % auch W
+Skern#:=-9ut#;
+Tkern#:=-16ut#;
+Vkern#:=-20.278ut#;   % auch W
 
 %%%%%%%%%%%%%% Makros %%%%%
 Kern:=0;
@@ -147,7 +168,7 @@ def oval(expr sx)=
     xpos:=sx+2a-delta;
   enddef;
 
-  \def stock(expr sx)=
+  def stock(expr sx)=
     if not wortende:
     draw ((0,rho){down}..(rho,0){right}..tension2.5 and 4..{1,m}(2*rho+((ht)-Delta)/m,ht-Delta)) shifted (sx,0);
     xpos:=sx+2*rho+((ht)-Delta)/m;
@@ -215,16 +236,16 @@ fi
 enddef;
 
 def Fahne=
-fahne((0),ht-Delta,rho+((ht)-Delta)/m,0,angle(1,m),2,xpos);
+fahne((0),ht-Delta,2rho+((ht)-Delta)/m,0,angle(1,m),2,xpos);% um rho verbreit.
 enddef;
 
 def Schulter=
-bogen(ht/4,(ht),(5ht/6),ht/kh,0.8,90,-90,1.2,1,xpos);
+bogen(ht/4,(ht),(5ht/6),ht/kh,0.75,90,-90,1.8,1,xpos); % geaendert neu
   enddef;
 
-      def fuss(expr sx)=
-     draw ((0,2rho)..{right}(2*rho,0)) shifted (sx,0);
-     xpos:=sx+2*rho;
+      def fuss(expr sx)=                             % 2rho --> a/2
+     draw ((0,2rho)..{right}(a/2,0)) shifted (sx,0);
+     xpos:=sx+a/2;
    enddef;
 
    def kurzstrich(expr sx)=
@@ -237,12 +258,6 @@ enddef;
   xpos:=sx+s_kurzstrichbreite;
 enddef;
 
-   def spitz(expr sx)=
-%     draw ((0,ht-Delta){1,m}..{up}(eta,ht)) shifted (sx,0);
-%     xpos:=sx+eta;
-     xpos:=sx;
-   enddef;
-
    def ipunkt(expr sx)=
   draw ((0,dd)--(0,-dd))  shifted (sx,ht+dt/2);
      enddef;
@@ -258,9 +273,9 @@ schweif((ht),ht/2,12.5ut,angle(1,-mfahne),0,1,sx);
 latin_e_lig(xpos);
 enddef;
 
-def latin_e_form (expr sx)=
-  draw ((0,he){1,me}..(ebreite,ht-ebreite*ef){up}..(ebreite*(1-ef),ht){left}..(0,ht/2){down}..{right}(ebreite*(1-ef),0)) shifted (sx,0);
-  xpos:=sx+ebreite*(1-ef);
+def latin_e_form (expr sx)=                     % geaendert
+  draw ((ebreite,ht-ebreite*ef'){up}..(ebreite*(1-ef'),ht){left}..tension0.9..(0,ht/2){down}..tension0.75..{right}(a/2,0)) shifted (sx,0);
+  xpos:=sx+a/2;           % ebreite*(1-ef) -> a/2
 enddef;
 
 % lat. e nach r
@@ -270,52 +285,42 @@ latin_e_lig(xpos);
 enddef;
 
 def a_char=
-oval(xpos);
+  myoval(xpos);                                  % geaendert neu
+  dach(xpos);                                    % geaendert neu
 stamm((ht),(rho),xpos);
 stock(xpos);
 enddef;
 
 def o_char=
-  oval(xpos);
+  myoval(xpos);                                  % geaendert neu
+  achsel(xpos);                                  % geaendert neu
   ohr;
   fahne((ht),ht-Delta,ofahne,angle(1,-mfahne),angle(1,m),1,xpos);
 enddef;
 
 def u_char=
-spitz(xpos);
 usack;
 stamm((ht),(rho),xpos);
 stock(xpos);
 enddef;
 
-def usack=
-  stamm((ht),ht/4,xpos);
-bogen(ht/4,(0),(5ht/6),ht/kh,0.3,-90,90,1,1.2,xpos);
+def usack=                                     
+  stamm((ht),ht/2,xpos);
+bogen(ht/2,(0),(0.625ht),ht/kh,0.25,-90,90,1.5,1.2,xpos);  %geaendert
 enddef;
 
 def vsack=
-  stamm((ht),ht/4,xpos);
-  bogen(ht/4,(0),2ht/3,ht/kh,0.3,-90,90,1,1.3,xpos);
-  schweif(2ht/3,(ht),-einroll,90,180,2,xpos);
+  stamm((ht),ht/2,xpos);
+  bogen(ht/2,(0),0.75ht,ht/kh,0.25,-90,90,1.5,1.3,xpos);     % geaendert
+  schweif(0.75ht,(ht),-einroll,90,180,2,xpos);
 enddef;
 
-       def c_form (expr sx)=
-	         x1:=whatever;y1:=whatever;
-    x2:=whatever;y2:=whatever;
-    x3:=whatever;y3:=whatever;
-    x4:=whatever;y4:=whatever;
-    x5:=whatever;y5:=whatever;
-    x6:=whatever;y6:=whatever;
-    x7:=whatever;y7:=whatever;
-    x8:=whatever;y8:=whatever; 
-  z1=(0,b); z2=(-a,0); z3=(0,-b); z4=(a,0);
-  z5=(-sigma*a,sigma*b);
-  z6=(-sigma*a,-sigma*b);
-  z7=(sigma*a,-sigma*b);
-  z8=(sigma*a,sigma*b);
-  draw ( z8{z1-z4}.. z1{left}.. z5{z2-z1}..z2{down}.. z6{z3-z2}..
-    {right} z3) shifted (sx+a-delta,b);
-    xpos:=sx+a-delta;
+       def c_form (expr sx)=                                  % geaendert
+draw ((a,2b){left}..tension t..{down}(0,kl*b) ..tension 1.2..{right}(2a/4,0))
+	   shifted (sx-delta,0);
+%	 dach(sx+2a-delta);  % neu
+	 draw ((0,ht){right}..(D,ht-dd)) shifted(sx+a-delta,0);
+	  xpos:=sx+a/2-delta;
   enddef;
 
     def ohr=
@@ -328,8 +333,8 @@ enddef;
     xpos:=sx+Delta+2*rho;
   enddef;
 
-    def s_form(expr sx)=
-    p:= ((0,ht){down}..(sbreite,sbreite){down}..(0,0){left}..(-sbreite+1ut,2ut));
+    def s_form(expr sx)=                           % geandert (erster Punkt)
+    p:= ((0,ht){-1,-m}..tension 1 and 0.75..(sbreite,sbreite){down}..(0,0){left}..(-sbreite+1ut,2ut));
     draw p shifted (sx,0);
     x0:=whatever;y0:=whatever;
     z0=(directionpoint(1,mt) of (reverse (subpath (1,2) of p))) shifted (sx,0);
@@ -385,7 +390,7 @@ enddef;
 
      def Flanke(expr sp,bt,sx)=
   mA:=(Ht)/bt;
-  draw ((0,R)..(0.6sp,0){right}..tension1..{1,mA}(sp+R/mA,R)--(sp+bt,Ht)) shifted (sx,0);
+  draw ((0,1ut)..(0.5sp,0){right}..tension1.8 and 3.5..{1,mA}(sp+bt,Ht)) shifted (sx,0);
   xpos:=sx+sp+bt;
 enddef;
 
@@ -404,8 +409,6 @@ def Bauch(expr bt,ha,hb,flach,sx)=
   xpos:=sx;
 enddef;
 
-
-
        def C_form (expr sx)=
 	         x1:=whatever;y1:=whatever;
     x2:=whatever;y2:=whatever;
@@ -426,9 +429,10 @@ enddef;
   enddef;
 
   def A_char=
-     Flanke(sporn,Abreite,xpos);
+    Flanke(sporn,Abreite,xpos);
+    wA:=Sporn+Abreite*(ht+Delta+eta)/Ht;
      stamm((Ht),(0),xpos);
-     gerade((ht-Delta-eta),(ht-Delta-eta),22.5ut,xpos-22.5ut);
+     gerade((ht-Delta-eta),(ht-Delta-eta),wA,xpos-wA);
 %     schweif((ht-Delta),(ht-Delta-eta),22.5ut,-45,0,1.8,xpos-22.5ut);
      fahne((ht-Delta-eta),ht-Delta,11ut,0,angle(1,m),2.5,xpos);
    enddef;
@@ -439,28 +443,30 @@ enddef;
      mt:=0.1;
      oval(xpos+delta);
      a:=aalt;b:=balt;
-tangente(10.5ut);
+     tangente(10.5ut);
+     Kern:=A;
      enddef;
 
    def U_char=
      V_kurzstrich(xpos);
-     stamm((Ht),ht/2,xpos);
-     bogen(ht/2,(0),ht,Hbreite,0.4,-90,90,1,1,xpos);
+     stamm((Ht),ht,xpos);
+     bogen(ht,(0),1.5ht,Hbreite,0.25,-90,90,1.5,1.2,xpos);
      stamm((Ht),(rho),xpos);
      stock(xpos);
    enddef;
 
    def S_form(expr sx)=
-     p:=((Bbreite'/2,Ht-D)..(0,Ht){left}..(-Bbreite'/2,ht+dt/2){down}..(Bbreite'/2,ht/2){down}..(0,0){left}..(-Bbreite'/2,D));
-     draw p shifted (sx+Bbreite'/2,0);
+     p:=((Bbreite'/2-eta,Ht-dd)..(0,Ht){left}..(-Bbreite'/2-eta,ht+dt/2){down}..(Bbreite/2-eta,ht/2){down}..(0,0){left}..(-Bbreite/2-eta,D));
+     draw p shifted (sx+Bbreite/2+eta,0);
      x0:=whatever; y0:=whatever;
-     z0 = (directionpoint (-1,-mt) of (subpath (3,4) of p)) shifted (sx+Bbreite'/2,0);
-     xpos:=sx+Bbreite';
+     z0 = (directionpoint (-1,-mt) of (subpath (3,4) of p)) shifted (sx+Bbreite/2+eta,0);
+     xpos:=sx+Bbreite;
+     Kern:=Bbreite/2-eta;
    enddef;
 
       def latin_e_lig (expr sx)=
- draw ((0,ht/2){right}..(ebreite,ht-ebreite*ef){up}..(ebreite*(1-ef),ht){left}..(0,ht/2){down}..{right}(ebreite*(1-ef),0)) shifted (sx,0);
-  xpos:=sx+ebreite*(1-ef);
+ draw ((0,ht/2){right}..(ebreite,ht-ebreite*ef){up}..(ebreite*(1-ef),ht){left}..(0,ht/2){down}..{right}(a/2,0)) shifted (sx,0);
+  xpos:=sx+a/2;          % ebreite*(1-ef) --> a/2
 enddef;
 
    def latin_eA (expr sx)=
@@ -493,5 +499,45 @@ enddef;
 
           def quer(expr ha, sx)=
        draw ((-s+dd/2,0)--(s-dd/2,0)) shifted (sx,ha);
+	  enddef;
+	  
+% Parameter fuer a-, o-Form
+Sigma:=0.77;
+kl:=1;
+kr:=1.25;
+
+% Offenes 'Oval' fuer a, d, g, o, q (neu, Ersatz fuer oval)
+          def myoval(expr sx)=
+draw   ((a,2b){left}..tension t..{down}(0,kl*b) ..tension 1.2..(2a/4,0){right}..tension 1.2..{up}(2a,kr*b))
+    shifted (sx-delta,0);
+xpos:=sx+2a-delta;
+     enddef;
+
+% Dach fuer a, d, g, q   (neu)  
+     def dach(expr sx)=
+draw ((0,2b-Delta)..{left}(-a,2b)) shifted (sx,0);
+       xpos:=sx;
+     enddef;
+
+% Achsel fuer o mit z1 fuer Schleife (neu)    
+     def achsel(expr sx)=
+       p:=(0,kr*b){up}
+	   ..(-a+a*Sigma,b+b*Sigma){-a,b}..{left}(-a,2b);
+       draw p shifted (sx,0);
+       x1:=whatever;y1:=whatever;
+        z1=(directionpoint (-1,mfahne) of p) shifted (sx,0);
+       xpos:=sx;
      enddef;
+
+  def Uschl(expr sx)=
+draw ((0,0){down}..tension 1.5..(-(1-Sbf)*Sb,-dt){left}..(-Sb,-dt*(1-Sbfh)){up}..tension1.5..{1,m}(0,0))  shifted (sx,0);
+xpos:=sx;
+enddef;
+
+def Uschl_e (expr sx) =
+  draw ((0,0){down}..tension 1.5..(-(1-Sbf')*Sb',-dt){left}..(-Sb',-dt*(1-Sbfh')){up}..tension1.5..{1,m'}(0,0))  shifted (sx,0);
+xpos:=sx;
+  enddef;     
+
+
 %%%%%%%%%%%%%%%%%%%%%% Ende Makros %%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_gr.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_gr.mf
index 582ecc16049..c5fa6f221b0 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_gr.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_gr.mf
@@ -1,7 +1,9 @@
 % Schulausgangsschrift (SAS) wesa
 % Walter Entenmann
 % 23.10.2011
+% 30.11.2014: modifiziert, Duktus
 %
+
 % Grossbuchstaben
 if not wortende:
   beginchar("A",46ut#,Ht#,0);
@@ -15,7 +17,7 @@ zeigen;
 endchar;
 
 % Ligatur Ae
-  beginchar(oct"013",53.4ut#,Ht#,0);
+  beginchar(oct"013",50.376ut#,Ht#,0);
 pickup wesa_pen;
 xpos:=0;
 latin_eA(xpos);
@@ -23,26 +25,27 @@ zeigen;
 endchar;
 
 if not wortende:
-  beginchar("B",34.641ut#,Ht#,0);
+  beginchar("B",35.438ut#,Ht#,0);
   else:
-beginchar(oct"202",25ut#,Ht#,0); 
+beginchar(oct"202",26ut#,Ht#,0); 
     fi
   pickup wesa_pen;
 xpos:=0;
  Horn(xpos);
      stamm((Ht),(0),xpos);
-     Bauch(Bbreite',(Ht),ht,D,xpos);
+     Bauch(Bbreite',(Ht),ht+eta,D,xpos);
      mt:=0.5;
-     Bauch(Bbreite,ht,(0),D,xpos);
+     Bauch(Bbreite,ht+eta,(0),D,xpos);
      xpos:=Sporn+Bbreite;
-     tangente(D);
+    tangente(D);
+    Kern:=Bbreite-D;
 zeigen;
 endchar;
 
 if not wortende:
-  beginchar("C",27.306ut#,Ht#,0);
+  beginchar("C",29.192ut#,Ht#,0);
       else:
-beginchar(oct"203",13.75ut#,Ht#,0);
+beginchar(oct"203",13.504ut#,Ht#,0);
     fi
   pickup wesa_pen;
   xpos:=0;
@@ -52,23 +55,24 @@ zeigen;
 endchar;
 
 if not wortende:
-  beginchar("D",34.176ut#,Ht#,0);
+  beginchar("D",42.623ut#,Ht#,0);
       else:
-beginchar(oct"204",25ut#,Ht#,0);
+beginchar(oct"204",33.009ut#,Ht#,0);
     fi
   pickup wesa_pen;
     xpos:=0;
  Horn(xpos);
      stamm((Ht),(0),xpos);
      mt:=0.3;
-     Bauch(Bbreite,(Ht),(0),dd,xpos);
-     xpos:=Sporn+Bbreite;
-     tangente(11ut);
+     Bauch(Dbreite,(Ht),(0),2D,xpos);
+     xpos:=Sporn+Dbreite;
+    tangente(11ut);
+    Kern:=Dbreite-2D;
 zeigen;
 endchar;
 
 if not wortende:
-  beginchar("E",29.056ut#,Ht#,0);
+  beginchar("E",29.188ut#,Ht#,0);
       else:
 beginchar(oct"205",12.5ut#,Ht#,0);
     fi
@@ -76,7 +80,7 @@ beginchar(oct"205",12.5ut#,Ht#,0);
 xpos:=0;
  Bauch(-10ut,(Ht),(ht),0,xpos+12.5ut);
      Bauch(-12.5ut,(ht),(0),0,xpos);
-     schweif((Ht),(Ht-dd),D,0,-45,1,xpos);
+     schweif((Ht),(Ht-dd),D,0,-45,0.8,xpos);
      gerade((ht),(ht),dd,xpos-D);
      fahne((0),ht-Delta,D+((ht)-Delta)/m,0,angle(1,m),1.5,xpos-dd);
 zeigen;
@@ -85,23 +89,24 @@ endchar;
 if not wortende:
   beginchar("F",24ut#,Ht#,0);
       else:
-beginchar(oct"206",22.5ut#,Ht#,0);
+beginchar(oct"206",20ut#,Ht#,0);
     fi
   pickup wesa_pen;
   xpos:=0;
-stamm((Ht),(0),xpos+7.5ut);
-gerade((Ht),(Ht),22.5ut,xpos-7.5ut);
+stamm((Ht),(0),xpos+Sporn);
+gerade((Ht),(Ht),Fdach,xpos-Sporn);
 % schweif((ht-Delta),(ht-Delta-eta),15ut,-45,0,1.8,xpos-20ut);
-     gerade((ht-Delta-eta),(ht-Delta-eta),15ut,xpos-20ut);
+     gerade((ht-Delta-eta),(ht-Delta-eta),Fdach',xpos-Fdach+Sporn-Sporn');
      fahne((ht-Delta-eta),ht-Delta,6.5ut,0,angle(1,m),1.5,xpos);
      if wortende:
-       xpos:=22.5ut;
-       fi
+       xpos:=Fdach;
+     fi
+     Kern:=Fdach-Sporn;
 zeigen;
 endchar;
 
 % Ligatur Fe
-beginchar(oct"014",29.9ut#,Ht#,0);
+beginchar(oct"014",26.876ut#,Ht#,0);
     pickup wesa_pen;
     xpos:=0;
     latin_eF(xpos);
@@ -109,28 +114,28 @@ zeigen;
 endchar;
 
 if not wortende:
-  beginchar("G",31.556ut#,Ht#,dt#);
+  beginchar("G",36.688ut#,Ht#,dt#);
       else:
-beginchar(oct"207",20ut#,Ht#,dt#);
+beginchar(oct"207",25ut#,Ht#,dt#);
     fi
   pickup wesa_pen;
 xpos:=0;
-bogen((Ht-D),(Ht),ht,-Bbreite,0.375,120,-90,1,1,xpos+Bbreite);
-bogen(ht,(0),5ht/6,Bbreite,0.4,-90,90,1,1.2,xpos);
+bogen((Ht-dd),(Ht),ht,-Gbreite,0.4,150,-90,1,1,xpos+Gbreite);
+bogen(ht,(0),5ht/6,Gbreite,0.4,-90,90,1,1.2,xpos);
 stamm((ht),0,xpos);
 if not wortende:
-uschl(xpos);
+Uschl(xpos);
 strich(xpos);
 else:
-  uschl_e(xpos);
+  Uschl_e(xpos);
   fi
 zeigen;
 endchar;
 
 if not wortende:
-  beginchar("H",33.5ut#,Ht#,0);
+  beginchar("H",37ut#,Ht#,0);
       else:
-beginchar(oct"210",22.5ut#,Ht#,0);
+beginchar(oct"210",26ut#,Ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
@@ -143,7 +148,7 @@ zeigen;
 endchar;
 
 % Ligatur He
-  beginchar(oct"015",40.9ut#,Ht#,0);
+  beginchar(oct"015",37.876ut#,Ht#,0);
   pickup wesa_pen;
   xpos:=0;
   latin_eH(xpos);
@@ -151,9 +156,9 @@ zeigen;
 endchar;
 
 if not wortende:
-  beginchar("I",28.295ut#,Ht#,0);
+  beginchar("I",30.454ut#,Ht#,0);
       else:
-beginchar(oct"211",17.5ut#,Ht#,0);
+beginchar(oct"211",20ut#,Ht#,0);
     fi
   pickup wesa_pen;
   xpos:=0;
@@ -162,64 +167,65 @@ beginchar(oct"211",17.5ut#,Ht#,0);
      mt:=0.5;
      bogen(10ut,(0),(dd),-Hbreite,0.5,-90,135,1,1,xpos);
      xpos:=Hbreite;
-     tangente(D);
+    tangente(D);
+    Kern:=Hbreite/2;
 zeigen;
 endchar;
 
 if not wortende:
-  beginchar("J",29.056ut#,Ht#,dt#);
+  beginchar("J",26.688ut#,Ht#,dt#);
       else:
-beginchar(oct"212",17.5ut#,Ht#,dt#);
+beginchar(oct"212",15ut#,Ht#,dt#);
     fi
 pickup wesa_pen;
   xpos:=0;
- gerade((Ht),(Ht),Hbreite,xpos);
+ gerade((Ht),(Ht),Jbreite,xpos);
      stamm((Ht),0,xpos);
 if not wortende:
-  uschl(xpos);
+  Uschl(xpos);
   strich(xpos);
 else:
-  uschl_e(xpos);
+  Uschl_e(xpos);
   fi
 zeigen;
   endchar;
 
   if not wortende:
-    beginchar("K",31.573ut#,Ht#,0);
+    beginchar("K",34.894ut#,Ht#,0);
         else:
-beginchar(oct"213",18.017ut#,Ht#,0);
+beginchar(oct"213",19.206ut#,Ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
 stamm((Ht),(0),xpos);
      gerade((ht),(Ht),Hbreite,xpos+rt(0));
-     schweif((ht),(0),Hbreite,angle(Hbreite,-ht),0,3.5,xpos-Hbreite);
+     schweif((ht),(0),Hbreite-2eta,angle(Hbreite-2eta,-ht),0,2,xpos-Hbreite+rt(0));
      Fahne;
 zeigen;
 endchar;
 
 if not wortende:
-  beginchar("L",36.056ut#,Ht#,0);
+  beginchar("L",40.688ut#,Ht#,0);
       else:
-beginchar(oct"214",22.5ut#,Ht#,0);
+beginchar(oct"214",25ut#,Ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
- schweif((Ht-dd),(Ht),-D,135,180,1,xpos+Lbreite);
-     schweif((Ht),(0),-(Lbreite-D),180,-150,1,xpos);
+ schweif((Ht-D),(Ht),-D-dd,125,180,1,xpos+Lbreite);
+     schweif((Ht),(0),-(Lbreite-D-dd),180,-150,1.5,xpos);
      schweif((0),(0),Lbreite,30,0,1,xpos);
      Fahne;
 zeigen;
 endchar;
 
 if not wortende:
-  beginchar("M",61.556ut#,Ht#,0);
+  beginchar("M",65.688ut#,Ht#,0);
       else:
-beginchar(oct"215",48.0ut#,Ht#,0);
+beginchar(oct"215",52ut#,Ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
- Flanke(sporn,Nbreite,xpos);
+ Flanke(sporn,Mbreite,xpos);
      stamm((Ht),(0),xpos);
      gerade((0),(Ht),Nbreite,xpos);
      stamm((Ht),(rho),xpos);
@@ -228,38 +234,39 @@ zeigen;
 endchar;
 
 if not wortende:
-  beginchar("N",47.056ut#,Ht#,0);
+  beginchar("N",54.188ut#,Ht#,0);
       else:
-beginchar(oct"216",46ut#,Ht#,0);
+beginchar(oct"216",55ut#,Ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
-Flanke(sporn,Nbreite-D,xpos);
-gerade((Ht),(0),D,xpos);
-mN:=Ht/(Nbreite-D);
+Flanke(sporn,Mbreite,xpos);
+stamm((Ht),(0),xpos);
+mN:=Ht/(Nbreite);
 gerade((0),Ht-10ut,(Ht-10ut)/mN,xpos);
-bogen(Ht-10ut,(Ht),(Ht-eta/2),10ut/mN+D,0.8,angle(1,mN),-30,1,1,xpos);
+bogen(Ht-10ut,(Ht),(Ht-eta/2),10ut/mN+D,0.75,angle(1,mN),-30,1.8,1,xpos);
 if not wortende:
-  fahne((0),ht-Delta,s+((ht)-Delta)/m,10,angle(1,m),1,xpos-Nbreite);
-  fi
+  fahne((0),ht-Delta,2D+dd+((ht)-Delta)/m,10,angle(1,m),1,xpos-Nbreite-D);
+fi
+Kern:=Nbreite+D;
 zeigen;
 endchar;
 
 if not wortende:
-  beginchar("O",36.974ut#,Ht#,0);
+  beginchar("O",36.817ut#,Ht#,0);
       else:
-beginchar(oct"217",27.5ut#,Ht#,0);
+beginchar(oct"217",27.009ut#,Ht#,0);
     fi
   pickup wesa_pen;
   xpos:=0;
-  O_char;
+    O_char;   % mit Kern
   zeigen;
 endchar;
 
 if not wortende:
-  beginchar("P",26.556ut#,Ht#,0);
+  beginchar("P",27.688ut#,Ht#,0);
       else:
-beginchar(oct"220",20ut#,Ht#,0);
+beginchar(oct"220",21ut#,Ht#,0);
     fi
   pickup wesa_pen;
   xpos:=0;
@@ -269,14 +276,15 @@ beginchar(oct"220",20ut#,Ht#,0);
      fahne((0),ht-Delta,10ut+((ht)-Delta)/m,10,angle(1,m),1,xpos);
      if wortende:
        xpos:=Sporn+Bbreite';
-       fi
+     fi
+     Kern:=Bbreite';
      zeigen;
 endchar;
 
 if not wortende:
-  beginchar("Q",39.806ut#,Ht#,0);
+  beginchar("Q",41.692ut#,Ht#,0);
       else:
-beginchar(oct"221",26.250ut#,Ht#,0);
+beginchar(oct"221",26.004ut#,Ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
@@ -291,52 +299,53 @@ zeigen;
 endchar;
 
 if not wortende:
-  beginchar("R",34.073ut#,Ht#,0);
+  beginchar("R",39.291ut#,Ht#,0);
       else:
-beginchar(oct"222",20.517ut#,Ht#,0);
+beginchar(oct"222",23.603ut#,Ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
 Horn(xpos);
      stamm((Ht),(0),xpos);
      Bauch(Bbreite',(Ht),ht,D,xpos);
-     schweif(ht,(0),Bbreite',angle(Bbreite',-ht),0,3.5,xpos+rt(0));
+     schweif(ht,(0),Bbreite'+2eta,angle(Bbreite',-ht),0,2,xpos+rt(0));
      Fahne;
 zeigen;
 endchar;
 
 if not wortende:
-  beginchar("S",26.412ut#,Ht#,0);
+  beginchar("S",30.820ut#,Ht#,0);
       else:
-beginchar(oct"223",15ut#,Ht#,0);
+beginchar(oct"223",20ut#,Ht#,0);
     fi
   pickup wesa_pen;
     xpos:=0;
  mt:=0.5;
-     S_form(xpos);
-     tangente(D);
+     S_form(xpos); % mit Kern
+    tangente(D);
 zeigen;
 endchar;
 
 if not wortende:
-  beginchar("T",32.833ut#,Ht#,0);
+  beginchar("T",33.833ut#,Ht#,0);
       else:
-beginchar(oct"224",30ut#,Ht#,0);
+beginchar(oct"224",32ut#,Ht#,0);
     fi
   pickup wesa_pen;
   xpos:=0;
- stamm((Ht),(0),xpos+15ut);
- gerade((Ht),(Ht),30ut,xpos-15ut);
+ stamm((Ht),(0),xpos+Tbreite/2);
+ gerade((Ht),(Ht),Tbreite,xpos-Tbreite/2);
  if not wortende:
-   fahne((0),ht-Delta,2ut+dd+ht/m,10,angle(1,m),2,xpos-15ut);
-   fi
+   fahne((0),ht-Delta,2ut+dd+ht/m,10,angle(1,m),2,xpos-Tbreite/2);
+ fi
+ Kern:=Tbreite/2;
 zeigen;
 endchar;
 
 if not wortende:
-  beginchar("U",36.390ut#,Ht#,0);
+  beginchar("U",39.021ut#,Ht#,0);
       else:
-beginchar(oct"225",22.833ut#,Ht#,0);
+beginchar(oct"225",25.333ut#,Ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
@@ -345,90 +354,96 @@ zeigen;
 endchar;
 
 if not wortende:
-  beginchar("V",32.548ut#,Ht#,0);
+  beginchar("V",33.349ut#,Ht#,0);
       else:
-beginchar(oct"226",26.111ut#,Ht#,0);
+beginchar(oct"226",28.611ut#,Ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
  V_kurzstrich(xpos);
-      stamm((Ht),ht/3,xpos);
+      stamm((Ht),ht/2,xpos);
       mt:=0.1;
-      bogen(ht/2,(0),ht+dt/2,Hbreite,0.25,-90,90,1,1.2,xpos);
+      bogen(ht,(0),ht+dt/2,Hbreite,0.25,-90,90,1.5,1.2,xpos);
       xtmp:=x0;ytmp:=y0;
       schweif(ht+dt/2,(Ht),-einroll,90,180,2,xpos);
-      schweif((Ht),(Ht),s,angle(1,-mfahne),angle(1,2),1,xpos);
+    schweif((Ht),(Ht),s,angle(1,-mfahne),angle(1,2),1,xpos);
+     if wortende:
+      Kern:=xpos-D/m-0.25Hbreite;
+      fi
       x0:=whatever; y0:=whatever;
       z0=(xtmp,ytmp);
-      tangente(s+D);
+    tangente(s+D);
 zeigen;
 endchar;
 
 if not wortende:
-  beginchar("W",50.048ut#,Ht#,0);
+  beginchar("W",53.349ut#,Ht#,0);
       else:
-beginchar(oct"227",43.611ut#,Ht#,0);
+beginchar(oct"227",48.611ut#,Ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
  V_kurzstrich(xpos);
      stamm((Ht),ht/2,xpos);
-     bogen(ht/2,(0),ht,Hbreite,0.4,-90,90,1,1,xpos);
-     stamm((Ht),ht/2,xpos);
+     bogen(ht,(0),1.5ht,Hbreite,0.25,-90,90,1.5,1.2,xpos);
+     stamm((Ht),ht,xpos);
       mt:=0.1;
-      bogen(ht/2,(0),ht+dt/2,Hbreite,0.25,-90,90,1,1.2,xpos);
+      bogen(ht,(0),ht+dt/2,Hbreite,0.25,-90,90,1.5,1.2,xpos);
       xtmp:=x0;ytmp:=y0;
       schweif(ht+dt/2,(Ht),-einroll,90,180,2,xpos);
-      schweif((Ht),(Ht),s,angle(1,-mfahne),angle(1,2),1,xpos);
+    schweif((Ht),(Ht),s,angle(1,-mfahne),angle(1,2),1,xpos);
+           if wortende:
+      Kern:=xpos-D/m-0.25Hbreite-Hbreite;
+      fi
       x0:=whatever; y0:=whatever;
       z0=(xtmp,ytmp);
-      tangente(s+D);
+    tangente(s+D);
 zeigen;
 endchar;
 
 if not wortende:
-  beginchar("X",36.056ut#,Ht#,0);
+  beginchar("X",40.688ut#,Ht#,0);
       else:
-beginchar(oct"230",22.5ut#,Ht#,0);
+beginchar(oct"230",25ut#,Ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
 gerade((0),(Ht),Hbreite+D,xpos);
-schweif((Ht),(0),Hbreite,angle(Hbreite,-Ht),0,5,xpos-Hbreite);
+schweif((Ht),(0),Hbreite,angle(Hbreite-eta,-Ht),0,3.5,xpos-Hbreite);
 Fahne;
 zeigen;
 endchar;
 
 if not wortende:
-  beginchar("Y",32.390ut#,Ht#,dt#);
+  beginchar("Y",35.021ut#,Ht#,dt#);
       else:
-beginchar(oct"231",20.833ut#,Ht#,dt#);
+beginchar(oct"231",23.333ut#,Ht#,dt#);
     fi
   pickup wesa_pen;
  xpos:=0;
  V_kurzstrich(xpos);
-     stamm((Ht),ht/2,xpos);
-     bogen(ht/2,(0),ht,Hbreite,0.4,-90,90,1,1,xpos);
+     stamm((Ht),ht,xpos);
+     bogen(ht,(0),1.5ht,Hbreite,0.25,-90,90,1.5,1.2,xpos);
      stamm((Ht),0,xpos);
      if not wortende:
-       uschl(xpos);
+       Uschl(xpos);
        strich(xpos);
      else:
-       uschl_e(xpos);
+       Uschl_e(xpos);
        fi
 zeigen;
 endchar;
 
 if not wortende:
-  beginchar("Z",36.056ut#,Ht#,0);
+  beginchar("Z",40.688ut#,Ht#,0);
       else:
-beginchar(oct"232",22.5ut#,Ht#,0);
+beginchar(oct"232",25ut#,Ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
  gerade((Ht),(Ht),Lbreite,xpos);
      gerade((Ht),(0),-Lbreite,xpos);
-     schweif((0),(0),Lbreite,45,0,1,xpos);
+     schweif((0),(0),Lbreite,30,0,1,xpos);
      Fahne;
 zeigen;
 endchar;
@@ -449,9 +464,9 @@ endchar;
   
 %\"O
 if not wortende:
-  beginchar(oct"326",36.974ut#,80ut#,0);
+  beginchar(oct"326",36.817ut#,80ut#,0);
       else:
-beginchar(oct"234",27.5ut#,42.5ut#,0);
+beginchar(oct"234",27.009ut#,42.5ut#,0);
     fi
   pickup wesa_pen;
   xpos:=0;
@@ -463,9 +478,9 @@ endchar;
 %
 %\"U
 if not wortende:
-  beginchar(oct"334",36.390ut#,42.5ut#,0);
+  beginchar(oct"334",39.021ut#,42.5ut#,0);
       else:
-beginchar(oct"235",22.833ut#,80ut#,0);
+beginchar(oct"235",25.333ut#,80ut#,0);
     fi
   pickup wesa_pen;
   xpos:=0;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_kl.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_kl.mf
index cb16195f68a..928233f0ff7 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_kl.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_kl.mf
@@ -2,11 +2,13 @@
 % Walter Entenmann
 % Kleinbuchstaben
 % 23.10.2011
+% 30.11.2014: modifiziert, Duktus
+%
 
 if not wortende:
-  beginchar("a",27.113ut#,ht#,0);
+  beginchar("a",27.589ut#,ht#,0);
   else:
-    beginchar(oct"241",13.556ut#,ht#,0);
+    beginchar(oct"241",13.901ut#,ht#,0);
  fi     
   pickup wesa_pen;
 xpos:=0;
@@ -15,24 +17,23 @@ a_char;
 endchar;
 
 if not wortende:
-  beginchar("b",25.825ut#,Ht#,0);
+  beginchar("b",26.146ut#,Ht#,0);
   else:
-beginchar(oct"242",11.603ut#,Ht#,0);
+beginchar(oct"242",11.923ut#,Ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
 kurzstrich(xpos);
 oschl(xpos);
-stamm(ht,(ht),xpos);
  vsack;
 fahne((ht),ht-Delta,bfahne,angle(1,-mfahne),angle(1,m),1,xpos);
  zeigen;
 endchar;
 
 if not wortende:
-  beginchar("c",18.446ut#,ht#,0);
+  beginchar("c",17.460ut#,ht#,0);
   else:
-beginchar(oct"243",4.890ut#,ht#,0);
+beginchar(oct"243",1.773ut#,ht#,0);%geaendert w 
     fi
   pickup wesa_pen;
 xpos:=0;
@@ -42,27 +43,29 @@ Fahne;
 endchar;
 
 if not wortende:
-  beginchar("d",27.113ut#,Ht#,0);
+  beginchar("d",27.589ut#,Ht#,0);
   else:
-beginchar(oct"244",13.556ut#,Ht#,0);
+beginchar(oct"244",13.901ut#,Ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
-oval(xpos);
+     myoval(xpos);
+     dach(xpos);
 stamm((Ht),(rho),xpos);
  stock(xpos);
   zeigen;
 endchar;
 
-% lat. e, Normalform
+% lat. e, Normalform                 % vorne um dd+eta verbreitert
 if not wortende:
-  beginchar("e",16.733ut#,ht#,0);
+  beginchar("e",17.209ut#,ht#,0);
   else:
-beginchar(oct"245",16.389ut#,ht#,0);
+beginchar(oct"245",17.209ut#,ht#,0);
     fi
   pickup wesa_pen;
   xpos:=0;
-schweif((0),he,D+(he)/m,0,angle(1,m),1.5,xpos);
+schweif((0),ht-ebreite*ef',dd+eta+D+(he)/m+ebreite,0,90,1.5,xpos);
+xpos:=xpos-ebreite;
 latin_e_form(xpos);
  zeigen;
 endchar;
@@ -70,7 +73,7 @@ endchar;
 % Ligaturen:
 % e nach r
 if not wortende:
-beginchar(oct"010",16.4ut#,ht#,0);
+beginchar(oct"010",13.376ut#,ht#,0);
   pickup wesa_pen;
   xpos:=0;
   latin_er(xpos);
@@ -80,7 +83,7 @@ fi
 
 % e nach b,o,v,w
 if not wortende:
-beginchar(oct"011",18.9ut#,ht#,0);
+beginchar(oct"011",15.876ut#,ht#,0);
   pickup wesa_pen;
   xpos:=0;
   latin_eb(xpos);
@@ -90,19 +93,20 @@ fi
 
 % e nach g,j,y
 if not wortende:
-beginchar(oct"012",14.4ut#,ht#,0);
+beginchar(oct"012",12.209ut#,ht#,0);
   pickup wesa_pen;
   xpos:=0;
-gerade((0),he,(he)/m',xpos);
+schweif((0),ht-ebreite*ef',(he)/m+dd+eta+ebreite,angle(1,m'),90,1.5,xpos);
+xpos:=xpos-ebreite;
 latin_e_form(xpos);
   zeigen;
 endchar;
 fi
 
 if not wortende:
-  beginchar("f",15.333ut#,Ht#,dt#);
+  beginchar("f",17.333ut#,Ht#,dt#);
   else:
-beginchar(oct"246",1.777ut#,Ht#,dt#);
+beginchar(oct"246",1.646ut#,Ht#,dt#);
     fi
   pickup wesa_pen;
   xpos:=0;
@@ -115,13 +119,14 @@ Fahne;
 endchar;
 
 if not wortende:
-  beginchar("g",23.113ut#,ht#,dt#);
+  beginchar("g",23.589ut#,ht#,dt#);
   else:
-beginchar(oct"247",11.556ut#,ht#,dt#);
+beginchar(oct"247",11.901ut#,ht#,dt#);
     fi
   pickup wesa_pen;
 xpos:=0;
-oval(xpos);
+     myoval(xpos);
+     dach(xpos);
 stamm((ht),0,xpos);
 if not wortende:
   uschl(xpos);
@@ -133,9 +138,9 @@ else:
 endchar;
 
 if not wortende:
-  beginchar("h",29.382ut#,Ht#,0);
+  beginchar("h",29.833ut#,Ht#,0);
   else:
-beginchar(oct"250",15.825ut#,Ht#,0);
+beginchar(oct"250",16.146ut#,Ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
@@ -149,13 +154,12 @@ stock(xpos);
 endchar;
 
 if not wortende:
-  beginchar("i",15.556ut#,Ht#,0);
+  beginchar("i",15.688ut#,Ht#,0);
   else:
 beginchar(oct"251",2ut#,Ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
-spitz(xpos);
  ipunkt(xpos);
  stamm((ht),(rho),xpos);
 stock(xpos);
@@ -163,13 +167,12 @@ stock(xpos);
 endchar;
 
 if not wortende:
-  beginchar("j",11.556ut#,Ht#,dt#);
+  beginchar("j",11.688ut#,Ht#,dt#);
   else:
 beginchar(oct"252",0ut#,Ht#,dt#);
     fi
   pickup wesa_pen;
 xpos:=0;
-spitz(xpos);
 ipunkt(xpos);
 stamm((ht),0,xpos);
 if not wortende:
@@ -182,9 +185,9 @@ uschl_e(xpos);
 endchar;
 
 if not wortende:
-  beginchar("k",26.667ut#,Ht#,0);
+  beginchar("k",28.838ut#,Ht#,0);
   else:
-beginchar(oct"253",13.110ut#,Ht#,0);
+beginchar(oct"253",13.150ut#,Ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
@@ -197,9 +200,9 @@ Fahne;
 endchar;
 
 if not wortende:
-  beginchar("l",19.333ut#,Ht#,0);
+  beginchar("l",20.709ut#,Ht#,0);
   else:
-beginchar(oct"254",5.777ut#,Ht#,0);
+beginchar(oct"254",5.022ut#,Ht#,0);
     fi
   pickup wesa_pen;  
 xpos:=0;
@@ -212,9 +215,9 @@ Fahne;
 endchar;
 
 if not wortende:
-  beginchar("m",46.318ut#,ht#,0);
+  beginchar("m",47.156ut#,ht#,0);
   else:
-beginchar(oct"255",32.762ut#,ht#,0);
+beginchar(oct"255",33.468ut#,ht#,0);
     fi
   pickup wesa_pen;  
 xpos:=0;
@@ -229,9 +232,9 @@ stock(xpos);
 endchar;
 
 if not wortende:
-  beginchar("n",34.270ut#,ht#,0);
+  beginchar("n",34.656ut#,ht#,0);
   else:
-beginchar(oct"256",20.713ut#,ht#,0);
+beginchar(oct"256",20.968ut#,ht#,0);
     fi
   pickup wesa_pen;  
 xpos:=0;
@@ -244,9 +247,9 @@ stock(xpos);
 endchar;
 
 if not wortende:
-  beginchar("o",22.744ut#,ht#,0);
+  beginchar("o",23.503ut#,ht#,0);
   else:
-beginchar(oct"257",8.522ut#,ht#,0);
+beginchar(oct"257",9.281ut#,ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
@@ -255,13 +258,12 @@ o_char;
 endchar;
 
 if not wortende:
-  beginchar("p",27.604ut#,ht#,dt#);
+  beginchar("p",28.188ut#,ht#,dt#);
   else:
-beginchar(oct"260",14.048ut#,ht#,dt#);
+beginchar(oct"260",14.5ut#,ht#,dt#);
     fi
   pickup wesa_pen;
 xpos:=0;
-spitz(xpos);
 stamm((ht),(-dt),xpos);
 Schulter;
 stamm((5ht/6),(rho),xpos);
@@ -270,22 +272,23 @@ stock(xpos);
 endchar;
 
 if not wortende:
-  beginchar("q",23.113ut#,ht#,dt#);
+  beginchar("q",23.589ut#,ht#,dt#);
   else:
-beginchar(oct"261",11.556ut#,ht#,dt#);
+beginchar(oct"261",11.901ut#,ht#,dt#);
     fi
   pickup wesa_pen;
 xpos:=0;
-oval(xpos);
+    myoval(xpos);
+     dach(xpos);
 stamm((ht),(-dt),xpos);
 strich(xpos);
  zeigen;
 endchar;
 
 if not wortende:
-  beginchar("r",23.666ut#,ht#,0);
+  beginchar("r",23.468ut#,ht#,0);
   else:
-beginchar(oct"262",11.665ut#,ht#,0);
+beginchar(oct"262",11.468ut#,ht#,0);
     fi
     pickup wesa_pen;
 xpos:=0;
@@ -299,7 +302,7 @@ endchar;
 if not wortende:
   beginchar("s",18.904ut#,ht#,0);
   else:
-beginchar(oct"263",7.777ut#,ht#,0);
+beginchar(oct"263",7.646ut#,ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
@@ -311,7 +314,7 @@ tangente(dd);
   endchar;
 
   if not wortende:
-    beginchar("t",20.556ut#,Ht#,0);
+    beginchar("t",22.688ut#,Ht#,0);
     else:
 beginchar(oct"264",7ut#,Ht#,0);
       fi
@@ -325,9 +328,9 @@ xpos:=0;
 endchar;
 
 if not wortende:
-  beginchar("u",27.604ut#,ht#,0);
+  beginchar("u",28.188ut#,ht#,0);
   else:
-beginchar(oct"265",14.048ut#,ht#,0);
+beginchar(oct"265",14.5ut#,ht#,0);
     fi
   pickup wesa_pen;
 xpos:=0;
@@ -336,9 +339,9 @@ u_char;
 endchar;
 
 if not wortende:
-  beginchar("v",25.825ut#,ht#,0);
+  beginchar("v",26.146ut#,ht#,0);
   else:
-beginchar(oct"266",11.603ut#,ht#,0);
+beginchar(oct"266",11.923ut#,ht#,0);
     fi
       pickup wesa_pen;
 xpos:=0;
@@ -349,9 +352,9 @@ xpos:=0;
 endchar;
 
 if not wortende:
-  beginchar("w",37.873ut#,ht#,0);
+  beginchar("w",38.646ut#,ht#,0);
   else:
-beginchar(oct"267",23.651ut#,ht#,0);
+beginchar(oct"267",24.423ut#,ht#,0);
     fi
       pickup wesa_pen;
 xpos:=0;
@@ -363,28 +366,28 @@ xpos:=0;
 endchar;
 
 if not wortende:
-  beginchar("x",24.610ut#,ht#,0);
+  beginchar("x",23.774ut#,ht#,0);
   else:
-beginchar(oct"270",12.610ut#,ht#,0);
+beginchar(oct"270",11.774ut#,ht#,0);
     fi
       pickup wesa_pen;
       xpos:=0;
       s_kurzstrich(xpos);
- gerade((ht),(0),2a,xpos);
-    gerade((0),ht/2,a,xpos-2a);
-    schweif(ht/2,(ht),a-dd,angle(1,k),90,1,xpos);
+gerade((ht),(0),1.5a,xpos);
+xpos:=xpos-2a;
+    gerade((0),ht/2,1.25a,xpos);
+    schweif(ht/2,(ht),0.75a,angle(1.25,k),90,1,xpos);
     fahne((ht),ht-Delta,rfahne,-90,angle(1,m),1,xpos);
  zeigen;
     endchar;
 
     if not wortende:
-      beginchar("y",23.604ut#,ht#,dt#);
+      beginchar("y",24.188ut#,ht#,dt#);
       else:
-beginchar(oct"271",12.048ut#,ht#,dt#);
+beginchar(oct"271",12.5ut#,ht#,dt#);
 	fi
       pickup wesa_pen;
 xpos:=0;
-    spitz(xpos);
     usack;
  stamm((ht),(0),xpos);
     if not wortende:
@@ -397,9 +400,9 @@ xpos:=0;
     endchar;
 
     if not wortende:
-      beginchar("z",26.890ut#,ht#,0);
+      beginchar("z",29.192ut#,ht#,0);
       else:
-beginchar(oct"272",13.333ut#,ht#,0);
+beginchar(oct"272",13.504ut#,ht#,0);
 	fi
       pickup wesa_pen;
 xpos:=0;
@@ -412,13 +415,12 @@ endchar;
 
 % scharfes s
 if not wortende:
-  beginchar(oct"377",25.359ut#,ht#,0);
+  beginchar(oct"377",25.490ut#,ht#,0);
   else:
 beginchar(oct"337",15ut#,ht#,0);
     fi
       pickup wesa_pen;
 xpos:=0;
-spitz(xpos);
  stamm((Ht),(-dt),xpos);
 mt:=1;
 ss_form(xpos); % mit Kern
@@ -429,9 +431,9 @@ tangente(dd);
 % Umlaute
 % ä
     if not wortende:
-      beginchar(oct"344",27.113ut#,Ht#,0);
+      beginchar(oct"344",27.589ut#,Ht#,0);
       else:
-beginchar(oct"273",13.556ut#,Ht#,0);
+beginchar(oct"273",13.901ut#,Ht#,0);
 	fi
       pickup wesa_pen;
 xpos:=0;
@@ -443,9 +445,9 @@ a_char;
 
   % ö
   if not wortende:
-    beginchar(oct"366",22.744ut#,Ht#,0);
+    beginchar(oct"366",23.503ut#,Ht#,0);
     else:
-beginchar(oct"274",8.522ut#,Ht#,0);
+beginchar(oct"274",9.281ut#,Ht#,0);
       fi
       pickup wesa_pen;
 xpos:=0;
@@ -456,9 +458,9 @@ endchar;
 
 % ü
 if not wortende:
-  beginchar(oct"374",27.604ut#,Ht#,0);
+  beginchar(oct"374",28.188ut#,Ht#,0);
   else:
-beginchar(oct"275",14.048ut#,Ht#,0);
+beginchar(oct"275",14.5ut#,Ht#,0);
     fi
       pickup wesa_pen;
 xpos:=0;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_lig.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_lig.mf
index 3dd12981026..4ae19c69ee7 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_lig.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_lig.mf
@@ -1,6 +1,8 @@
 % Ligaturtabellen Schulausgangsschrift (SAS), wesa
 % Walter Entenmann
 % 23.10.2011
+% 30.11.2014: modifiziert, Verbdg. nach "N" zu spitzen BSt. '021-->'031
+%             Kerning N
 %
 
 % Gedankenstriche
@@ -1868,14 +1870,14 @@ oct"023" |=:| oct"211", % fr. Anfz. <<
 oct"177" =:| oct"211"
 ; % Wortende fertig
 ligtable "N": "e"  |=: oct"000", oct"000" =:| oct"216",
-oct"021" =:| oct"216", 
-"i" |=:| oct"021",
-"j" |=:| oct"021",
-"p" |=:| oct"021",
-"u" |=:| oct"021",
-oct"374" |=:| oct"021",
-"y" |=:| oct"021",
-oct"377" |=:| oct"021",
+oct"031" =:| oct"216", 
+"i" |=:| oct"031",
+"j" |=:| oct"031",
+"p" |=:| oct"031",
+"u" |=:| oct"031",
+oct"374" |=:| oct"031",
+"y" |=:| oct"031",
+oct"377" |=:| oct"031",
 % Wortende erkennen:
 oct"040" =:| oct"216",
 "." =:| oct"216",
@@ -2191,7 +2193,7 @@ ligtable oct"202": oct"003" kern Bkern#, % B
   ligtable oct"211": oct"001" kern Ikern#, % I
   oct"031" kern Ikern#;
   ligtable oct"216":  oct"000" kern Nkern#, % N
-   oct"021" kern Nkern#;
+   oct"031" kern Nkern#;
    ligtable oct"217":  oct"002" kern Okern#, % O
     oct"033" kern Okern#;
     ligtable oct"234": oct"002" kern Okern#, % Ö
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_sz.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_sz.mf
index a8a66dd9815..c4de273d00e 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_sz.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesa14_sz.mf
@@ -1,29 +1,259 @@
 % Schulausgangsschrift (SAS) wesa
 % Walter Entenmann
 % 16.10.2011
+% 18.11.2014: einheitliche Sonderzeichen
+%             Ziffern nur 3/4-hoch und korrigiert
+%             Gross- und Kleinbuchstaben korrigiert
+% 30.11.2014: modifiziert, Duktus
 %
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% #
+beginchar("#",35ut#,Ht#,0);
+  pickup wesa_pen;
+  p:=(0,0)--(0,Ht);
+  draw p slanted 0.176 shifted (10ut,0);
+  draw p slanted 0.176 shifted (20ut,0);
+  q:=((0,0)--(26ut,0)) shifted (2ut,0);
+  draw q shifted(0,Ht/3) slanted 0.176;
+  draw q shifted(0,2Ht/3) slanted 0.176;
+endchar;
+
+% §
+  beginchar(oct"237",43.333ut#,Ht#,dt#);
+  pickup wesa_pen;
+sep:=10ut; breit:=20ut;
+p := ((8ut,20ut){curl 10}..(0ut,30ut){left}..(-breit/2,22ut){down}..
+  (breit/2,-2.5ut){down}..{-1,2/3}(2ut,-11ut)) scaled ((Ht+dt)/60ut);
+  draw p shifted (sep+breit*0.583,ht/2);
+  draw p rotated 180 shifted (sep+breit*0.583,ht/2);
+  endchar;
+  
+% *
+beginchar("*",30ut#,Ht#,0);
+  pickup wesa_pen;
+  p:= (-ht/2,0)--(ht/2,0);
+  draw p rotated 90 shifted (15ut,1.5ht);
+  draw p rotated 30 shifted (15ut,1.5ht);
+  draw p rotated -30 shifted (15ut,1.5ht);
+endchar;
+
+% Prozentzeichen (%)
+beginchar("%",40ut#,Ht#,0);
+  pickup wesa_pen;
+  q := (-23.6ut,0)--(23.6ut,0);
+  breit:=12.5ut;hoch:=17.5ut;
+  p := (breit/2,0){up}..(0,hoch/2){left}..(-breit/2,0){down}..(0,-hoch/2){right}..{up}(breit/2,0);
+  x0:=whatever;y0:=whatever;
+  z0=(directionpoint (-1,2) of (subpath (0,1) of p)) shifted (7.5ut+breit/2,Ht-hoch/2);
+  draw p shifted (7.5ut+breit/2,Ht-hoch/2);
+  draw p shifted (7.5ut+25ut-breit/2,hoch/2);
+  draw q rotated 58 shifted (w/2,h/2);
+  draw z0{1,-2}..{dir 58}(7.5ut+25ut,Ht);
+endchar;
+
+% &
+  beginchar("&",40ut#,Ht#,0);
+  pickup wesa_pen;
+  p := (22.5ut,12.5ut)..tension 1.2..(7.5ut,0){left}..(0,8ut){up}..
+  %(8.167ut,21ut){3,2}..
+  tension 1.2..(17ut,34.5ut){up}..(11.5ut,Ht){left}..(4ut,30ut){down}..{2,-3}(8.167ut,21ut)--(22.5ut,0);
+  draw p shifted (10ut,0);
+  endchar;
+
+% $
+beginchar("$",30ut#,Ht#,0);
+  pickup wesa_pen;
+  draw halfcircle xscaled 20ut yscaled 20ut shifted (15ut,30ut);
+   draw (halfcircle rotated 180 xscaled 20ut yscaled 20ut) shifted (15ut,10ut);
+   draw ((-10ut,10ut){down}..{down}(10ut,-10ut)) shifted (15ut,ht);
+   draw ((0,ht+2.5ut)--(0,-ht-2.5ut)) shifted (15ut,ht);
+endchar;
+
+% "+"
+beginchar("+",30ut#,22.5ut#,0);
+  path p;
+  pickup wesa_pen;
+  z0=(15ut,hmath);
+  z1=(0ut,10ut);
+  z2=(0ut,-10ut);
+  p := z1--z2;
+  draw p   shifted z0 ;
+  draw p   rotated 90 shifted z0 ;
+  labels(range 0 thru 2); 
+endchar;
+
+% ASCII Bindestrich oct"055" (OT1: auch Trennstrich)
+beginchar("-",27.5ut#,ht#,0);
+  pickup wesa_pen;
+  draw ((0,0)--(12.5ut,0)) shifted (7.5ut,hdash);
+endchar;
+
+% T1: Trennstrich
+beginchar(oct"177",27.5ut#,ht#,0);
+  pickup wesa_pen;
+  draw ((0,0)--(12.5ut,0)) shifted (7.5ut,hdash);
+endchar;
+
+% "/" 
+beginchar("/",25ut#,Ht#,0);
+  pickup wesa_pen;
+draw ((5ut,0)--(20ut,Ht));
+endchar;
+
+% ">" 
+beginchar(">",30ut#,Ht#,0);
+  path p;
+  pickup wesa_pen;
+p:=(0,0)--(20ut,0);
+draw p rotated 30 shifted (6.33ut,hmath);
+  draw p rotated -30 shifted (6.33ut,hmath);
+endchar;
+
+% "=" 
+beginchar("=",30ut#,ht#,0);
+    pickup wesa_pen;
+  draw((0,0)--(20ut,0)) shifted (5ut,hmath-2.5ut);
+  draw((0,0)--(20ut,0)) shifted (5ut,hmath+2.5ut);
+endchar;
+
+% "<" 
+beginchar("<",30ut#,Ht#,0);
+  path p;
+  pickup wesa_pen;
+p:=(0,0)--(-20ut,0);
+draw p rotated 30 shifted (23.66ut,hmath);
+  draw p rotated -30 shifted (23.66ut,hmath);
+endchar;
+
+% oct"025" Bis-Strich --, Gedankenstrich 
+beginchar(oct"025",30ut#,ht#,0);
+  pickup wesa_pen;
+draw ((0,0)--(20ut,0)) shifted (5ut,hdash);
+endchar;
+
+% engl. Gedankenstrich ---
+beginchar(oct"026",45ut#,ht#,0);
+  pickup wesa_pen;
+draw ((0,0)--(30ut,0)) shifted (7.5ut,hdash);
+endchar;
+
+% oct"023" franz. Anfz. <<
+beginchar(oct"023",32.5ut#,ht#,0);
+  path p, q;
+  pickup wesa_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+  z4=(6,1);
+  z5=(7.5ut,ht/2);
+z6=(15ut,ht/2);
+  p := (z1{z3}..z2) rotated 45;
+    q := (z1{z4}..z2) rotated -45;
+  draw p shifted z5  ;
+  draw p shifted z6 ;
+    draw q shifted z5 ;
+  draw q shifted z6 ;
+  labels(range 1 thru 6);
+endchar;  
+
+% oct"024" franz. Anfz. >>
+beginchar(oct"024",32.5ut#,ht#,0);
+  path p, q;
+  pickup wesa_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+    z4=(6,1);
+  z5=(17.5ut,ht/2);
+  z6=(25ut,ht/2);
+
+  p := (z1{z4}..z2) rotated 135;
+    q := (z1{z3}..z2) rotated -135;
+  draw p shifted z5 ;
+  draw p shifted z6 ;
+    draw q shifted z5 ;
+  draw q shifted z6 ;
+  labels(range 1 thru 6);
+endchar;  
+
+% oct"016" franz. Anfz. <
+beginchar(oct"016",25ut#,ht#,0);
+  path p, q;
+  pickup wesa_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+  z4=(6,1);
+  z5=(7.5ut,ht/2);
+  p := (z1{z3}..z2) rotated 45;
+    q := (z1{z4}..z2) rotated -45;
+  draw p shifted z5  ;
+    draw q shifted z5 ;
+  labels(range 1 thru 5);
+endchar;  
+
+% oct"017" franz. Anfz. >
+beginchar(oct"017",25ut#,ht#,0);
+  path p, q;
+  pickup wesa_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+    z4=(6,1);
+  z5=(17.5ut,ht/2);
+  p := (z1{z4}..z2) rotated 135;
+    q := (z1{z3}..z2) rotated -135;
+  draw p shifted z5 ;
+    draw q shifted z5 ;
+  labels(range 1 thru 5);
+endchar;  
+
+% "@":
+beginchar("@",50ut#,Ht#,0);
+  pickup wesa_pen;
+sep:=10ut;gap:=8ut;
+draw (superellipse((a,0),(0,b),(-a,0),(0,-b),sigma)) shifted (gap+a+sep,ht);
+draw ((0,ht)--(0,5ut){down}..(2ut,0){right}..tension 1.5..(gap,ht/2){up}..
+  (-a,3ht/2){left}..(-2*a-gap,ht/2){down}..
+  (-a,-ht/2){right}..(7.5ut,-5ut)) shifted (2*a+gap+sep,ht/2);
+endchar;
+
+% Euro (\symbol{160})
+beginchar(oct"240",47.5ut#,Ht#,0);
+  pickup wesa_pen;
+  sep:=7.5ut; gap:=7.5ut;
+    draw (halfcircle rotated 90) xscaled 30ut yscaled Ht shifted (15ut+gap+sep,Ht/2);
+  draw ((0,0){right}..(7.5ut,-3ut)) shifted (15ut+gap+sep,Ht);
+  draw ((0,0){right}..(7.5ut,3ut)) shifted (15ut+gap+sep,0);
+  draw (((-25ut,2.5ut)--(0,2.5ut))  shifted (15ut+gap+sep,ht)) slanted 0.25;
+  draw (((-25ut,-2.5ut)--(0,-2.5ut)) shifted (15ut+gap+sep,ht)) slanted 0.25;
+endchar;
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 % Aufstrich am Wortanfang 
-beginchar(oct"200",11.556ut#,ht#,0);
+beginchar(oct"200",11.688ut#,ht#,0);
   pickup wesa_pen;
   draw ((0,0)--(((ht)-Delta)/m,ht-Delta));
   xpos:=((ht)-Delta)/m;
   zeigen;
 endchar;
 
-% Verbindungsstrich normal
-beginchar(oct"005",13.556ut#,ht#,0);
+% Verbindungsstrich normal                   um rho verbreitert
+beginchar(oct"005",15.688ut#,ht#,0);
   pickup wesa_pen;
-  draw ((0,0){right}..tension2 and 3.5..{1,m}(rho+((ht)-Delta)/m,ht-Delta));
-  xpos:=rho+((ht)-Delta)/m;
+  draw ((0,0){right}..tension2 and 3.5..{1,m}(2rho+((ht)-Delta)/m,ht-Delta));
+  xpos:=2rho+((ht)-Delta)/m;
   zeigen;
 endchar;
 
  % "e" mit Aufstrich am Wortanfang 
-beginchar(oct"030",11.733ut#,ht#,0);
+beginchar(oct"030",8.709ut#,ht#,0);
   pickup wesa_pen;
      xpos:=0;
-     draw ((0,0)--((he)/m,he)) shifted (xpos,0);
+  draw ((0,0){dir30}..tension1.5..{up}((he)/m+ebreite,ht-ef'*ebreite))
+    shifted (xpos,0);
      xpos:=xpos+(he)/m;
      latin_e_form(xpos);
      zeigen;
@@ -43,60 +273,60 @@ draw ((0,0){right}..(5ut,2ut));
 
 % Verlaengerungsstriche mit e,
 % 10ut
-  beginchar(oct"000",23.733ut#,ht#,0);
+  beginchar(oct"000",20.709ut#,ht#,0);
      pickup wesa_pen;
      xpos:=0;
-     draw ((0,0){right}..(10ut+rho+(he)/m,he){1,m}) shifted (xpos,0);
-     xpos:=xpos+10ut+rho+(he)/m;
+schweif((0),ht-ebreite*ef',10ut+rho+(he)/m+ebreite,0,90,1.2,xpos);
+xpos:=xpos-ebreite;
      latin_e_form(xpos);
      zeigen;
 endchar;
 
 % 12.5ut
-  beginchar(oct"001",26.233ut#,ht#,0);
+  beginchar(oct"001",23.209ut#,ht#,0);
      pickup wesa_pen;
      xpos:=0;
-     draw ((0,0){right}..(12.5ut+rho+(he)/m,he){1,m}) shifted (xpos,0);
-     xpos:=xpos+12.5ut+rho+(he)/m;
+schweif((0),ht-ebreite*ef',12.5ut+rho+(he)/m+ebreite,0,90,1.2,xpos);
+xpos:=xpos-ebreite;
      latin_e_form(xpos);
       zeigen;
 endchar;
 
 % 15ut
-  beginchar(oct"002",28.733ut#,ht#,0);
+  beginchar(oct"002",25.709ut#,ht#,0);
      pickup wesa_pen;
      xpos:=0;
-     draw ((0,0){right}..(15ut+rho+(he)/m,he){1,m}) shifted (xpos,0);
-     xpos:=xpos+15ut+rho+(he)/m;
+schweif((0),ht-ebreite*ef',15ut+rho+(he)/m+ebreite,0,90,1.2,xpos);
+xpos:=xpos-ebreite;
      latin_e_form(xpos);
       zeigen;
 endchar;
 
 % 17.5ut
-  beginchar(oct"003",31.233ut#,ht#,0);
+  beginchar(oct"003",28.209ut#,ht#,0);
      pickup wesa_pen;
      xpos:=0;
-     draw ((0,0){right}..(17.5ut+rho+(he)/m,he){1,m}) shifted (xpos,0);
-      xpos:=xpos+17.5ut+rho+(he)/m;
+schweif((0),ht-ebreite*ef',17.5ut+rho+(he)/m+ebreite,0,90,1.2,xpos);
+xpos:=xpos-ebreite;
       latin_e_form(xpos);
        zeigen;
 endchar;
 
 % 20ut
-  beginchar(oct"004",33.733ut#,ht#,0);
+  beginchar(oct"004",30.709ut#,ht#,0);
      pickup wesa_pen;
      xpos:=0;
-     draw ((0,0){right}..(20ut+rho+(he)/m,he){1,m}) shifted (xpos,0);
-      xpos:=xpos+20ut+rho+(he)/m;
+schweif((0),ht-ebreite*ef',20ut+rho+(he)/m+ebreite,0,90,1.2,xpos);
+xpos:=xpos-ebreite;
       latin_e_form(xpos);
        zeigen;
      endchar;
 
      % Aufstriche zu spitzen Buchstaben:
-% normal
-   beginchar(oct"035",12.5ut#,ht#,0);
+% normal                                  um rho verbreitert, tension 1.2-->1.5
+   beginchar(oct"035",14.5ut#,ht#,0);
   pickup wesa_pen;
-  draw ((0,0){right}..tension 1.2..{up}(12.5ut,ht));
+     draw ((0,0){right}..tension 1.5..{up}(12.5ut+rho,ht));
 endchar;
 
 % nach Unterlaengen
@@ -182,41 +412,41 @@ endchar;
 
 beginchar("2",Wz#,Hz#,0);
   pickup wesa_pen;
-draw ((0,h-r)..(r,h){right}..(2r,h-r){down}..tension2 and 3..{-1,-1}(0,0))  shifted (s',0);
+draw ((0,h-r)..(r,h){right}..(2r,h-r){down}..tension2 and 3..{-5,-6}(0,0))  shifted (s',0);
 draw ((0,0)--(w',0)) shifted (s',0);
 endchar;
 
 beginchar("3",Wz#,Hz#,0);
     pickup wesa_pen;
-    draw ((w'/8,7h/8)..(w'/2,h){right}..(7w'/8,0.75h){down}..(w'/2,0.5h){left})
+    draw ((0,10h/12){up}..(3w'/8,h){right}..(6w'/8,9h/12){down}..tension1.2..{left}(0,h/2+1.5ut))
  shifted (s',0);
-    draw ((w'/2,0.5h){right}..tension1..(w',w'/2){down}..(w'/2,0){left}..(0,w'/4)) shifted (s',0);
+    draw ((0,h/2+1.5ut){right}..tension1..(w',3h/12){down}..(w'/2,0){left}..(0,h/12)) shifted (s',0);
 endchar;
 
 beginchar("4",Wz#,Hz#,0);
   pickup wesa_pen;
-draw ((w'/4,h)--(0,h/4)--(w',h/4)) shifted (s',0);
-draw ((0.675w',3h/4)--(0.675w',0)) shifted (s',0);
+draw ((0.5w',h)--(0,h/3)--(w',h/3)) shifted (s',0);
+draw ((0.75w',3h/4)--(0.75w',0)) shifted (s',0);
 endchar;
 
 
 beginchar("5",Wz#,Hz#,0);
   pickup wesa_pen;
-draw ((w',h)--(0,h)--(0,5h/8-dd){1,1}..(w'/2,5h/8){right}..(w',2.5h/8){down}..(w'/2,0){left}..(0,h/8)) shifted (s',0);
+draw ((0.75w',h)--(0,h)--(0,5h/8-dd){1,1}..(w'/2,5h/8){right}..(w',2.5h/8){down}..(w'/2,0){left}..(0,h/8)) shifted (s',0);
 endchar;
 
 
 beginchar("6",Wz#,Hz#,0);
     pickup wesa_pen;
-draw ((7w'/8,15h/16)..(w'/2,h){left}..(0,3h/8){down}..(w'/2,0){right}..(w',3h/8){up}..(w'/2,5h/8){left}..(0,3h/8){down}) shifted (s',0);
+draw ((0.75w',h){left}..tension0.8..(0,3h/8){down}..(w'/2,0){right}..(w',3h/8){up}..(w'/2,5h/8){left}..(0,3h/8){down}) shifted (s',0);
 endchar;
 
 
 beginchar("7",Wz#,Hz#,0);
   pickup wesa_pen;
   xpos:=0;
-draw ((0,h)--(w',h)--(w'/4,0)) shifted (s',0);
-quer((h/2),xpos+12.5ut+s')
+draw ((0,h)--(w',h)--(0.375w',0)) shifted (s',0);
+quer((h/2),xpos+13.75ut+s')
 endchar;
 
 beginchar("8",Wz#,Hz#,0);
@@ -238,9 +468,9 @@ endchar;
 % Satzzeichen
 % ASCII-Zeichen
 % !
-beginchar("!",20ut#,Hz#,0);
+beginchar("!",20ut#,Ht#,0);
   pickup wesa_pen;
-  stamm((Hz),10ut,10ut);
+  stamm(h,10ut,10ut);
   pickup wesa_pen_thick;
   drawdot (0,0) shifted (10ut,0);
 endchar;
@@ -252,105 +482,22 @@ beginchar(oct"042",25ut#,Ht#,0);
   komma(Ht,15ut);
 endchar;
 
-% #
-beginchar("#",60ut#,Ht#,dt#);
-  pickup wesa_pen;
- gap:=10ut;
-p:= ((0,-(Ht+dt)/2)--(0,(Ht+dt)/2));
-draw (p shifted (-gap/2,0) slanted 1/4) shifted (w/2,ht/2);
-draw (p shifted (gap/2,0) slanted 1/4) shifted (w/2,ht/2);
-q:= ((-20ut,0)--(20ut,0));
-  draw (q shifted (0,-gap/2) slanted 1/4) shifted (w/2,ht/2);
-  draw (q shifted (0,gap/2) slanted 1/4) shifted (w/2,ht/2);
-endchar;
-  
-% $
-beginchar("$",35ut#,Ht#,0);
-  pickup wesa_pen;
-  radi:=10ut;
-draw ((radi,0){up}..(0,radi){left}..{down}(-radi,0)) shifted (w/2,Ht-radi);
-  draw ((-radi,0){down}..(0,-radi){right}..{up}(radi,0))  shifted (w/2,radi);
-   draw ((-radi,Ht-radi){down}..{down}(radi,radi)) shifted (w/2,0);
-   draw ((0,Ht+dd)--(0,-dd)) shifted (w/2,0);
-endchar;
-
-% %
-beginchar("%",40ut#,Ht#,0);
-  pickup wesa_pen;
-  sep:=7.5ut;
-  q := ((0,0)--(25ut,Ht));
-  breit:=10ut; hoch:=15ut;
-  p := (breit/2,0){up}..(0,hoch/2){left}..(-breit/2,0){down}..(0,-hoch/2){right}..{up}(breit/2,0);
-  x0:=whatever;y0:=whatever;
-  z0=(directionpoint (-1,2) of (subpath (0,1) of p)) shifted (sep+breit/2,Ht-hoch/2);
-  draw (p shifted (sep+breit/2,Ht-hoch/2));
-  draw (p shifted (sep+25ut-breit/2,hoch/2));
-  draw (q  shifted (sep,0));
-  draw ( z0{1,-2}..{dir 58}(sep+25ut,Ht));
-  endchar;
-
-% &
-  beginchar("&",40ut#,Ht#,0);
-  pickup wesa_pen;
-  p := (25ut,20ut){down}..tension 1.2..(10ut,0){left}..(0,10ut){up}..
-(15ut,Ht-5ut){up}..(10ut,Ht){left}..(2.5ut,Ht-7.5ut){down}..tension1.5 and 5..{right}(22.5ut,0)..{1,2}(27.5ut,2.5ut);
-  draw p shifted (7.5ut,0);
-  endchar;
-
-% §
-  beginchar(oct"237",43.333ut#,Ht#,dt#);
-  pickup wesa_pen;
-sep:=10ut; breit:=20ut;
-p := ((8ut,20ut){curl 10}..(0ut,30ut){left}..(-breit/2,22ut){down}..
-  (breit/2,-2.5ut){down}..{-1,2/3}(2ut,-11ut)) scaled ((Ht+dt)/60ut);
-  draw p shifted (sep+breit*0.583,ht/2);
-  draw p rotated 180 shifted (sep+breit*0.583,ht/2);
-  endchar;
-
 % ' (Apostroph)
 beginchar("'",15ut#,Ht#,0);
   pickup wesa_pen;
 komma((Ht),7.5ut);
 endchar;
 
-
 % "("
-beginchar("(",20ut#,Ht#,0);
+beginchar("(",20ut#,Ht#,dt#);
   pickup wesa_pen;
-draw ((5ut,Ht)..(0,ht){down}..(5ut,0)) shifted (10ut,0);
+draw ((10ut,Ht)..(2.5ut,ht/2){down}..(10ut,-dt)) shifted (5ut,0);
 endchar;
 
 % ")"
-beginchar(")",20ut#,Ht#,0);
+beginchar(")",20ut#,Ht#,dt#);
   pickup wesa_pen;
-draw ((5ut,Ht)..(10ut,ht){down}..(5ut,0));
-endchar;
-
-% "*"
-beginchar("*",30ut#,Ht#,0);
-  path p;
-  pickup wesa_pen;
-  z0=(15ut,ht+dt/4);
-  z1=(0ut,7.5ut);
-  z2=(0ut,-7.5ut);
-  p := z1--z2;
-  draw p   shifted z0 ;
-  draw p   rotated 60 shifted z0 ;
-  draw p   rotated -60 shifted z0 ;
-  labels(range 0 thru 2); 
-endchar;
-
-% "+"
-beginchar("+",30ut#,22.5ut#,0);
-  path p;
-  pickup wesa_pen;
-  z0=(15ut,hmath);
-  z1=(0ut,10ut);
-  z2=(0ut,-10ut);
-  p := z1--z2;
-  draw p   shifted z0 ;
-  draw p   rotated 90 shifted z0 ;
-  labels(range 0 thru 2); 
+draw ((5ut,Ht)..(12.5ut,ht/2){down}..(5ut,-dt));
 endchar;
 
 % "," Komma
@@ -359,30 +506,12 @@ beginchar(",",20ut#,ht#,dt#);
 komma(2.5ut,10ut);
 endchar;
 
-% ASCII Bindestrich oct"055" (OT1: auch Trennstrich)
-beginchar("-",27.5ut#,ht#,0);
-  pickup wesa_pen;
-  draw ((0,0)--(12.5ut,0)) shifted (7.5ut,hdash);
-endchar;
-
-% T1: Trennstrich
-beginchar(oct"177",27.5ut#,ht#,0);
-  pickup wesa_pen;
-  draw ((0,0)--(12.5ut,0)) shifted (7.5ut,hdash);
-endchar;
-
 % "." Punkt
 beginchar(".",20ut#,ht#,0);
   pickup wesa_pen_thick;
   drawdot (0,0) shifted (10ut,0);
 endchar;
 
-% "/" 
-beginchar("/",25ut#,Ht#,0);
-  pickup wesa_pen;
-draw ((5ut,0)--(20ut,Ht));
-endchar;
-
 % ":" Doppelpunkt
 beginchar(":",20ut#,ht#,0);
   pickup wesa_pen_thick;
@@ -398,41 +527,13 @@ komma(2.5ut,10ut);
   drawdot (0,0) shifted (10ut,15ut);
 endchar;
 
-% ">" 
-beginchar(">",30ut#,Ht#,0);
-  path p;
-  pickup wesa_pen;
-p:=(0,0)--(20ut,0);
-draw p rotated 30 shifted (6.33ut,hmath);
-  draw p rotated -30 shifted (6.33ut,hmath);
-endchar;
-
-
-% "=" 
-beginchar("=",30ut#,ht#,0);
-    pickup wesa_pen;
-  draw((0,0)--(20ut,0)) shifted (5ut,hmath-2.5ut);
-  draw((0,0)--(20ut,0)) shifted (5ut,hmath+2.5ut);
-endchar;
-
-
-% "<" 
-beginchar("<",30ut#,Ht#,0);
-  path p;
-  pickup wesa_pen;
-p:=(0,0)--(-20ut,0);
-draw p rotated 30 shifted (23.66ut,hmath);
-  draw p rotated -30 shifted (23.66ut,hmath);
-endchar;
-
-
 % ?
-beginchar("?",35ut#,Hz#,0);
+beginchar("?",35ut#,Ht#,0);
   radi:=7.5ut;
   pickup wesa_pen;
-  z1=(-radi,Hz-radi);
-  z2=(0,Hz);
-  z3=(radi,Hz-radi);
+  z1=(-radi,h-radi);
+  z2=(0,h);
+  z3=(radi,h-radi);
   z5=(-radi,10ut+radi);
   z6=(0,10ut);
   z7=(radi,10ut+radi);
@@ -457,121 +558,16 @@ beginchar(oct"022",25ut#,ht#,dt#);
   komma(2.5ut,15ut);
 endchar;
 
-% oct"025" Bis-Strich --, Gedankenstrich 
-beginchar(oct"025",30ut#,ht#,0);
-  pickup wesa_pen;
-draw ((0,0)--(20ut,0)) shifted (5ut,hdash);
-endchar;
-
-% engl. Gedankenstrich ---
-beginchar(oct"026",45ut#,ht#,0);
-  pickup wesa_pen;
-draw ((0,0)--(30ut,0)) shifted (7.5ut,hdash);
-endchar;
-
-
-% oct"023" franz. Anfz. <<
-beginchar(oct"023",32.5ut#,ht#,0);
-  path p, q;
-  pickup wesa_pen;
-  z1=(0ut,0ut);
-  z2=(1.1*ht/2,0);
-  z3=(6,-1);
-  z4=(6,1);
-  z5=(7.5ut,ht/2);
-z6=(15ut,ht/2);
-  p := (z1{z3}..z2) rotated 45;
-    q := (z1{z4}..z2) rotated -45;
-  draw p shifted z5  ;
-  draw p shifted z6 ;
-    draw q shifted z5 ;
-  draw q shifted z6 ;
-  labels(range 1 thru 6);
-endchar;  
-
-
-% oct"024" franz. Anfz. >>
-beginchar(oct"024",32.5ut#,ht#,0);
-  path p, q;
-  pickup wesa_pen;
-  z1=(0ut,0ut);
-  z2=(1.1*ht/2,0);
-  z3=(6,-1);
-    z4=(6,1);
-  z5=(17.5ut,ht/2);
-  z6=(25ut,ht/2);
-
-  p := (z1{z4}..z2) rotated 135;
-    q := (z1{z3}..z2) rotated -135;
-  draw p shifted z5 ;
-  draw p shifted z6 ;
-    draw q shifted z5 ;
-  draw q shifted z6 ;
-  labels(range 1 thru 6);
-endchar;  
-
-% oct"016" franz. Anfz. <
-beginchar(oct"016",25ut#,ht#,0);
-  path p, q;
-  pickup wesa_pen;
-  z1=(0ut,0ut);
-  z2=(1.1*ht/2,0);
-  z3=(6,-1);
-  z4=(6,1);
-  z5=(7.5ut,ht/2);
-  p := (z1{z3}..z2) rotated 45;
-    q := (z1{z4}..z2) rotated -45;
-  draw p shifted z5  ;
-    draw q shifted z5 ;
-  labels(range 1 thru 5);
-endchar;  
-
-
-% oct"017" franz. Anfz. >
-beginchar(oct"017",25ut#,ht#,0);
-  path p, q;
-  pickup wesa_pen;
-  z1=(0ut,0ut);
-  z2=(1.1*ht/2,0);
-  z3=(6,-1);
-    z4=(6,1);
-  z5=(17.5ut,ht/2);
-  p := (z1{z4}..z2) rotated 135;
-    q := (z1{z3}..z2) rotated -135;
-  draw p shifted z5 ;
-    draw q shifted z5 ;
-  labels(range 1 thru 5);
-endchar;  
-
 % oct"133" [
-beginchar("[",25ut#,Ht#,0);
+beginchar("[",20ut#,Ht#,dt#);
   pickup wesa_pen;
-draw ((5ut,Ht)--(0,Ht)--(0,0)--(5ut,0)) shifted (10ut,0);
+draw ((5ut,Ht)--(0,Ht)--(0,-dt)--(5ut,-dt)) shifted (10ut,0);
 endchar;
 
 % oct"135" ]
-beginchar("]",25ut#,Ht#,0);
-  pickup wesa_pen;
-draw ((5ut,Ht)--(10ut,Ht)--(10ut,0)--(5ut,0)) shifted (5ut,0);
-endchar;
-
-% "@":
-beginchar("@",50ut#,Ht#,0);
+beginchar("]",20ut#,Ht#,dt#);
   pickup wesa_pen;
-sep:=10ut;gap:=8ut;
-draw (superellipse((a,0),(0,b),(-a,0),(0,-b),sigma)) shifted (gap+a+sep,ht);
-draw ((0,ht)--(0,5ut){down}..(2ut,0){right}..tension 1.5..(gap,ht/2){up}..
-  (-a,3ht/2){left}..(-2*a-gap,ht/2){down}..
-  (-a,-ht/2){right}..(7.5ut,-5ut)) shifted (2*a+gap+sep,ht/2);
-endchar;
-
-% Euro
-beginchar(oct"240",47.5ut#,Ht#,0);
-  pickup wesa_pen;
-  sep:=7.5ut; gap:=7.5ut;
-draw ((7.5ut,Ht/2-2.5ut)..(0,Ht/2){left}..(-15ut,0){down}..{right}(0,-Ht/2)..(7.5ut,-Ht/2+2.5ut)) shifted (15ut+gap+sep,Ht/2);
-  draw (((-25ut,2.5ut)--(0,2.5ut))  shifted (15ut+gap+sep,ht)) slanted 0.25;
-  draw (((-25ut,-2.5ut)--(0,-2.5ut)) shifted (15ut+gap+sep,ht)) slanted 0.25;
+draw ((0,Ht)--(5ut,Ht)--(5ut,-dt)--(0,-dt)) shifted (5ut,0);
 endchar;
 
 %%%%%%%%%%%%%%%%%%%% End of File %%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesabx14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesabx14.mf
new file mode 100644
index 00000000000..9859dc6d681
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesabx14.mf
@@ -0,0 +1,3 @@
+% wesa  bold
+fetter:=2;
+input wesa14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesabxsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesabxsl14.mf
new file mode 100644
index 00000000000..d4ff5a90105
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesabxsl14.mf
@@ -0,0 +1,3 @@
+% wesa  bold, slanted
+fetter:=2;
+input wesasl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesaeb14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesaeb14.mf
new file mode 100644
index 00000000000..cc00dcc9b7e
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesaeb14.mf
@@ -0,0 +1,3 @@
+% wesa extra bold
+fetter:=3;
+input wesa14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesaebsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesaebsl14.mf
new file mode 100644
index 00000000000..3caccad015f
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesaebsl14.mf
@@ -0,0 +1,3 @@
+% wesa extra bold, slanted
+fetter:=3;
+input wesasl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesasb14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesasb14.mf
new file mode 100644
index 00000000000..88cde38fa8b
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesasb14.mf
@@ -0,0 +1,3 @@
+% wesa semi bold
+fetter:=1;
+input wesa14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesasbsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesasbsl14.mf
new file mode 100644
index 00000000000..9679f6638e1
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesasbsl14.mf
@@ -0,0 +1,3 @@
+% wesa semi bold, slanted
+fetter:=1;
+input wesasl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesaub14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesaub14.mf
new file mode 100644
index 00000000000..8443f3dbbe5
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesaub14.mf
@@ -0,0 +1,3 @@
+% wesa ultra bold
+fetter:=4;
+input wesa14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesaubsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesaubsl14.mf
new file mode 100644
index 00000000000..051fc4192ae
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesaubsl14.mf
@@ -0,0 +1,3 @@
+% wesa ultra bold, slanted
+fetter:=4;
+input wesasl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesu14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesu14.mf
index c5ba81e842d..5ab9926c31f 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/wesu14.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesu14.mf
@@ -29,12 +29,19 @@ define_pixels(ut,ht,Ht,dt);
 
 % Federn:
 % runde Feder (Redisfeder) oder Bandzugfeder
+if unknown fetter: fetter:=0; fi
+fetter:=sqrt(2)**fetter;
+
 if unknown bold:
-  pickup pencircle scaled 1.25ut; else:
+  pickup pencircle scaled (fetter*1.25*ut); else:
   pickup pencircle xscaled if unknown slant: 3ut else: 3.5ut fi yscaled 0.5ut rotated if unknown slant: 45 else: 39 fi; fi
 wesu_pen:=savepen;
 % fuer Punkte etc.
+if fetter>3: pickup pencircle scaled 7ut;
+elseif fetter>2.5: pickup pencircle scaled 5ut;
+else:
   pickup pencircle scaled 4ut;
+  fi
 wesu_pen_thick := savepen;
 
 % Current Transformation, slanted:
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesu14_def.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesu14_def.mf
index d6a001119c8..fd911011bc0 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/wesu14_def.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesu14_def.mf
@@ -4,6 +4,9 @@
 % 09.06.2011
 %
 % Parameterdefinitionen:
+% fuer math. Sonderzeichen wie < > ...
+hmath:=ht/2;
+hdash:=ht/2;
 % Superellipse fuer @-Zeichen
 atb:=ht/2;
 ata:=7ut;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesu14_sz.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesu14_sz.mf
index 534c5b62f95..623a4432f9b 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/wesu14_sz.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesu14_sz.mf
@@ -2,7 +2,234 @@
 % Program-File Sonderzeichen
 % Walter Entenmann
 % 09.06.2011
+% 14.11.2014: einheitliche Sonderzeichen # $ § ...
 %
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% #
+beginchar("#",35ut#,Ht#,0);
+  pickup wesu_pen;
+  p:=(0,0)--(0,Ht);
+  draw p slanted 0.176 shifted (10ut,0);
+  draw p slanted 0.176 shifted (20ut,0);
+  q:=((0,0)--(26ut,0)) shifted (2ut,0);
+  draw q shifted(0,Ht/3) slanted 0.176;
+  draw q shifted(0,2Ht/3) slanted 0.176;
+endchar;
+
+% §
+  beginchar(oct"237",43.333ut#,Ht#,dt#);
+  pickup wesu_pen;
+sep:=10ut; breit:=20ut;
+p := ((8ut,20ut){curl 10}..(0ut,30ut){left}..(-breit/2,22ut){down}..
+  (breit/2,-2.5ut){down}..{-1,2/3}(2ut,-11ut)) scaled ((Ht+dt)/60ut);
+  draw p shifted (sep+breit*0.583,ht/2);
+  draw p rotated 180 shifted (sep+breit*0.583,ht/2);
+  endchar;
+  
+% *
+beginchar("*",30ut#,Ht#,0);
+  pickup wesu_pen;
+  p:= (-ht/2,0)--(ht/2,0);
+  draw p rotated 90 shifted (15ut,1.5ht);
+  draw p rotated 30 shifted (15ut,1.5ht);
+  draw p rotated -30 shifted (15ut,1.5ht);
+endchar;
+
+% Prozentzeichen (%)
+beginchar("%",40ut#,Ht#,0);
+  pickup wesu_pen;
+  q := (-23.6ut,0)--(23.6ut,0);
+  breit:=12.5ut;hoch:=17.5ut;
+  p := (breit/2,0){up}..(0,hoch/2){left}..(-breit/2,0){down}..(0,-hoch/2){right}..{up}(breit/2,0);
+  x0:=whatever;y0:=whatever;
+  z0=(directionpoint (-1,2) of (subpath (0,1) of p)) shifted (7.5ut+breit/2,Ht-hoch/2);
+  draw p shifted (7.5ut+breit/2,Ht-hoch/2);
+  draw p shifted (7.5ut+25ut-breit/2,hoch/2);
+  draw q rotated 58 shifted (w/2,h/2);
+  draw z0{1,-2}..{dir 58}(7.5ut+25ut,Ht);
+endchar;
+
+% &
+  beginchar("&",40ut#,Ht#,0);
+  pickup wesu_pen;
+  p := (22.5ut,12.5ut)..tension 1.2..(7.5ut,0){left}..(0,8ut){up}..
+  %(8.167ut,21ut){3,2}..
+  tension 1.2..(17ut,34.5ut){up}..(11.5ut,Ht){left}..(4ut,30ut){down}..{2,-3}(8.167ut,21ut)--(22.5ut,0);
+  draw p shifted (10ut,0);
+  endchar;
+
+% $
+beginchar("$",30ut#,Ht#,0);
+  pickup wesu_pen;
+  draw halfcircle xscaled 20ut yscaled 20ut shifted (15ut,30ut);
+   draw (halfcircle rotated 180 xscaled 20ut yscaled 20ut) shifted (15ut,10ut);
+   draw ((-10ut,10ut){down}..{down}(10ut,-10ut)) shifted (15ut,ht);
+   draw ((0,ht+2.5ut)--(0,-ht-2.5ut)) shifted (15ut,ht);
+endchar;
+
+% "+"
+beginchar("+",30ut#,22.5ut#,0);
+  path p;
+  pickup wesu_pen;
+  z0=(15ut,hmath);
+  z1=(0ut,10ut);
+  z2=(0ut,-10ut);
+  p := z1--z2;
+  draw p   shifted z0 ;
+  draw p   rotated 90 shifted z0 ;
+  labels(range 0 thru 2); 
+endchar;
+
+% ASCII Bindestrich oct"055" (OT1: auch Trennstrich)
+beginchar("-",27.5ut#,ht#,0);
+  pickup wesu_pen;
+  draw ((0,0)--(12.5ut,0)) shifted (7.5ut,hdash);
+endchar;
+
+% T1: Trennstrich
+beginchar(oct"177",27.5ut#,ht#,0);
+  pickup wesu_pen;
+  draw ((0,0)--(12.5ut,0)) shifted (7.5ut,hdash);
+endchar;
+
+% "/" 
+beginchar("/",25ut#,Ht#,0);
+  pickup wesu_pen;
+draw ((5ut,0)--(20ut,Ht));
+endchar;
+
+% ">" 
+beginchar(">",30ut#,Ht#,0);
+  path p;
+  pickup wesu_pen;
+p:=(0,0)--(20ut,0);
+draw p rotated 30 shifted (6.33ut,hmath);
+  draw p rotated -30 shifted (6.33ut,hmath);
+endchar;
+
+% "=" 
+beginchar("=",30ut#,ht#,0);
+    pickup wesu_pen;
+  draw((0,0)--(20ut,0)) shifted (5ut,hmath-2.5ut);
+  draw((0,0)--(20ut,0)) shifted (5ut,hmath+2.5ut);
+endchar;
+
+% "<" 
+beginchar("<",30ut#,Ht#,0);
+  path p;
+  pickup wesu_pen;
+p:=(0,0)--(-20ut,0);
+draw p rotated 30 shifted (23.66ut,hmath);
+  draw p rotated -30 shifted (23.66ut,hmath);
+endchar;
+
+% oct"025" Bis-Strich --, Gedankenstrich 
+beginchar(oct"025",30ut#,ht#,0);
+  pickup wesu_pen;
+draw ((0,0)--(20ut,0)) shifted (5ut,hdash);
+endchar;
+
+% engl. Gedankenstrich ---
+beginchar(oct"026",45ut#,ht#,0);
+  pickup wesu_pen;
+draw ((0,0)--(30ut,0)) shifted (7.5ut,hdash);
+endchar;
+
+% oct"023" franz. Anfz. <<
+beginchar(oct"023",32.5ut#,ht#,0);
+  path p, q;
+  pickup wesu_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+  z4=(6,1);
+  z5=(7.5ut,ht/2);
+z6=(15ut,ht/2);
+  p := (z1{z3}..z2) rotated 45;
+    q := (z1{z4}..z2) rotated -45;
+  draw p shifted z5  ;
+  draw p shifted z6 ;
+    draw q shifted z5 ;
+  draw q shifted z6 ;
+  labels(range 1 thru 6);
+endchar;  
+
+% oct"024" franz. Anfz. >>
+beginchar(oct"024",32.5ut#,ht#,0);
+  path p, q;
+  pickup wesu_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+    z4=(6,1);
+  z5=(17.5ut,ht/2);
+  z6=(25ut,ht/2);
+
+  p := (z1{z4}..z2) rotated 135;
+    q := (z1{z3}..z2) rotated -135;
+  draw p shifted z5 ;
+  draw p shifted z6 ;
+    draw q shifted z5 ;
+  draw q shifted z6 ;
+  labels(range 1 thru 6);
+endchar;  
+
+% oct"016" franz. Anfz. <
+beginchar(oct"016",25ut#,ht#,0);
+  path p, q;
+  pickup wesu_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+  z4=(6,1);
+  z5=(7.5ut,ht/2);
+  p := (z1{z3}..z2) rotated 45;
+    q := (z1{z4}..z2) rotated -45;
+  draw p shifted z5  ;
+    draw q shifted z5 ;
+  labels(range 1 thru 5);
+endchar;  
+
+% oct"017" franz. Anfz. >
+beginchar(oct"017",25ut#,ht#,0);
+  path p, q;
+  pickup wesu_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+    z4=(6,1);
+  z5=(17.5ut,ht/2);
+  p := (z1{z4}..z2) rotated 135;
+    q := (z1{z3}..z2) rotated -135;
+  draw p shifted z5 ;
+    draw q shifted z5 ;
+  labels(range 1 thru 5);
+endchar;  
+
+% "@":
+beginchar("@",50ut#,Ht#,0);
+  pickup wesu_pen;
+sep:=10ut;gap:=8ut;
+draw (superellipse((ata,0),(0,atb),(-ata,0),(0,-atb),sigma)) shifted (gap+ata+sep,ht);
+draw ((0,ht)--(0,5ut){down}..(2ut,0){right}..tension 1.5..(gap,ht/2){up}..
+  (-ata,3ht/2){left}..(-2*ata-gap,ht/2){down}..
+  (-ata,-ht/2){right}..(7.5ut,-5ut)) shifted (2*ata+gap+sep,ht/2);
+endchar;
+
+% Euro (\symbol{160})
+beginchar(oct"240",47.5ut#,Ht#,0);
+  pickup wesu_pen;
+  sep:=7.5ut; gap:=7.5ut;
+    draw (halfcircle rotated 90) xscaled 30ut yscaled Ht shifted (15ut+gap+sep,Ht/2);
+  draw ((0,0){right}..(7.5ut,-3ut)) shifted (15ut+gap+sep,Ht);
+  draw ((0,0){right}..(7.5ut,3ut)) shifted (15ut+gap+sep,0);
+  draw (((-25ut,2.5ut)--(0,2.5ut))  shifted (15ut+gap+sep,ht)) slanted 0.25;
+  draw (((-25ut,-2.5ut)--(0,-2.5ut)) shifted (15ut+gap+sep,ht)) slanted 0.25;
+endchar;
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 % Spitzes s ohne Verbindungsstrich, z.B. vor Apostroph
 beginchar(oct"032",10ut#,Ht#,dt#);
   pickup wesu_pen;
@@ -98,55 +325,6 @@ beginchar(oct"042",25ut#,Ht#,0);
   komma(17.5ut,Ht);
 endchar;
 
-% #
-beginchar("#",50ut#,Ht#,dt#);
-  pickup wesu_pen;
-draw ((0,1.5*ht)--(0,-1.5*ht)) slanted 1/6 shifted (20ut,ht/2);
-draw ((0,1.5*ht)--(0,-1.5*ht)) slanted 1/6 shifted (20ut+10ut,ht/2);
-draw (((-ht,0)--(ht,0)) shifted (0,5ut) slanted 1/6) shifted (25ut,ht/2);
-draw (((-ht,0)--(ht,0)) shifted (0,-5ut) slanted 1/6) shifted (25ut,ht/2);
-endchar;
-
-% $
-beginchar("$",30ut#,Ht#,0);
-  pickup wesu_pen;
-  draw halfcircle xscaled 20ut yscaled 20ut shifted (15ut,30ut);
-   draw (halfcircle rotated 180 xscaled 20ut yscaled 20ut) shifted (15ut,10ut);
-   draw ((-10ut,10ut){down}..{down}(10ut,-10ut)) shifted (15ut,ht);
-   draw ((0,ht+2.5ut)--(0,-ht-2.5ut)) shifted (15ut,ht);
-endchar;
-
-% %
-beginchar("%",40ut#,Ht#,0);
-  pickup wesu_pen;
-  q := (-23.6ut,0)--(23.6ut,0);
-  breit:=12.5ut;hoch:=17.5ut;
-  p := (breit/2,0){up}..(0,hoch/2){left}..(-breit/2,0){down}..(0,-hoch/2){right}..{up}(breit/2,0);
-  x0:=whatever;y0:=whatever;
-  z0=(directionpoint (-1,2) of (subpath (0,1) of p)) shifted (7.5ut+breit/2,Ht-hoch/2);
-  draw p shifted (7.5ut+breit/2,Ht-hoch/2);
-  draw p shifted (7.5ut+25ut-breit/2,hoch/2);
-  draw q rotated 58 shifted (w/2,h/2);
-  draw z0{1,-2}..{dir 58}(7.5ut+25ut,Ht);
-  endchar;
-
-% &
-  beginchar("&",40ut#,Ht#,0);
-  pickup wesu_pen;
-  p := (22.5ut,12.5ut)..tension 1.2..(7.5ut,0){left}..(0,8ut){up}..
-  %(8.167ut,21ut){3,2}..
-  tension 1.2..(17ut,34.5ut){up}..(11.5ut,Ht){left}..(4ut,30ut){down}..{2,-3}(8.167ut,21ut)--(22.5ut,0);
-  draw p shifted (10ut,0);
-  endchar;
-
-% §
-  beginchar(oct"237",30ut#,Ht#,dt#);
-  pickup wesu_pen;
-  p := (7.5ut,20ut){up}..(0,30ut){left}..(-7.5ut,20ut){down}..(-2.5ut,10ut){3,-2}..tension 1.2..(7.5ut,-2.5ut){down}..{left}(2.5ut,-10ut);
-  draw p shifted (w/2,ht/2);
-  draw p rotated 180 shifted (w/2,ht/2);
-  endchar;
-
 % [
 beginchar("[",25ut#,Ht#,0);
   pickup wesu_pen;
@@ -182,73 +360,21 @@ beginchar(")",20ut#,Ht#,0);
   z2=(10ut,ht);
   z3=(5ut,0);
   p := z1..z2{down}..z3;
-  draw p   ;
+  draw p;
   labels(range 1 thru 3); 
 endchar;
 
-beginchar("*",38ut#,42.5ut#,0);
-  pickup wesu_pen;
-z3=(19ut,30ut);
-  z1=(-12.5ut,0);
-  z2=(12.5ut,0);
-  p := z1--z2;
-  draw p   rotated  30  shifted z3 ;
-  draw p   rotated -30  shifted z3 ;
-  draw p   rotated  90 shifted z3 ;
-  labels(range 0 thru 3); 
-endchar;
-
-beginchar("+",40ut#,Ht#,0);
-  pickup wesu_pen;
-z3=(20ut,12.5ut);
-  z1=(-12.5ut,0);
-  z2=(12.5ut,0);
-  p := z1--z2;
-  draw p   shifted z3 ;
-  draw p   rotated 90 shifted z3 ;
-  labels(range 0 thru 3); 
-endchar;
-
 beginchar(",",15ut#,ht#,dt#);
   pickup wesu_pen;
 komma(7.5ut,3.5ut); 
 endchar;
 
-% ASCII Bindestrich oct"055" (OT1: auch Trennstrich)
-beginchar("-",27.5ut#,ht#,0);
-  pickup wesu_pen;
-  z1=(0,0);
-  z2=(12.5ut,0);
-  p := z1--z2;
-  draw p  shifted (7.5ut,ht/2);
-  labels(range 1 thru 2); 
-endchar;
-
-% T1: Trennstrich
-beginchar(oct"177",27.5ut#,ht#,0);
-  pickup wesu_pen;
-  z1=(0,0);
-  z2=(12.5ut,0);
-  p := z1--z2;
-  draw p  shifted (7.5ut,ht/2);
-  labels(range 1 thru 2); 
-endchar;
-
 beginchar(".",15ut#,ht#,0);
   pickup wesu_pen_thick;
   z1=(7.5ut,0ut);
   drawdot z1  ;
   labels(1); 
 endchar;
- 
-beginchar("/",25ut#,Ht#,0);
-  pickup wesu_pen;
-  z1=(20ut,Ht);
-  z2=(5ut,0);
-  p := z1--z2;
-  draw p  ;
-  labels(range 1 thru 2); 
-endchar;
 
 beginchar(":",20ut#,ht#,0);
   pickup wesu_pen_thick;
@@ -263,31 +389,6 @@ komma(10ut,3.5ut);
   drawdot (0,0) shifted (10ut,17.5ut);
 endchar;
  
-beginchar(">",37.5ut#,Ht#,0);
-  pickup wesu_pen;
-  z1=(7.5ut+20ut*sqrt(3)/2,12.5ut);
-  p := (0,0)--(20ut,0);
-  draw p rotated  150 shifted z1;
-  draw p rotated -150 shifted z1;
-  labels(1); 
-endchar;
-
-beginchar("=",40ut#,Ht#,0);
-  pickup wesu_pen;
-p := (0,0)--(25ut,0);
-draw p shifted (7.5ut,12.5ut+3.5ut);
-draw p shifted (7.5ut,12.5ut-3.5ut);
-endchar;
-
-beginchar("<",37.5ut#,Ht#,0);
-  pickup wesu_pen;
-  z1=(7.5ut,12.5ut);
-  p := (0,0)--(20ut,0);
-  draw p rotated  30 shifted z1;
-  draw p rotated -30 shifted z1;
-  labels(1); 
-endchar;
-
 beginchar("?",30ut#,Ht#,0);
   pickup wesu_pen;
 draw ((-bt/2,ht+dt/2){up}..(0,Ht){right}..(bt/2,ht+dt/2+1ut){down}..tension1.2..(-5ut,15ut){down}..(0,ht/2){right}..(5ut,ht/2+2ut)) shifted (s'+bt/2,0);
@@ -295,13 +396,6 @@ draw ((-bt/2,ht+dt/2){up}..(0,Ht){right}..(bt/2,ht+dt/2+1ut){down}..tension1.2..
   drawdot (0,0) shifted (w/2,0);
 endchar;
 
-% @
-beginchar("@",50ut#,Ht#,0);
-  pickup wesu_pen;
-draw (superellipse((ata,0),(0,atb),(-ata,0),(0,-atb),sigma)) shifted (25ut,ht);
-draw ((ata,atb-2.5ut)--(ata,-atb+r){down}..(ata+r,-atb){right}..tension1.5..(ata+9ut,0){up}..(0,ht){left}..(-ata-9ut,0){down}..(0,-ht){right}..(ata+9ut,-ht+9ut)) shifted (ata+9ut+9ut,ht);
-endchar;
-
 %
 % spezielle Sonderzeichen (T1-Kodierung)
 % dt. Anfuehrungszeichen oben (\grqq), wie oct"042"
@@ -318,69 +412,5 @@ beginchar(oct"022",25ut#,ht#,dt#);
   komma(12.5ut,3.5ut);
 endchar;
 
-% Bis-Strich, Gedankenstrich ( -- )
-beginchar(oct"025",40ut#,ht#,0);
-  pickup wesu_pen;
-  p :=(0,0)--(25ut,0);
-draw p shifted (7.5ut,12.5ut);
-endchar;
-
-% langer (engl.) Gedankenstrich (---)
-beginchar(oct"026",65ut#,ht#,0);
-  pickup wesu_pen;
-  p := (0,0)--(50ut,0);
-  draw p shifted (7.5ut,12.5ut);
-endchar;
-
-% franz. Anfz. << (\flqq)
-beginchar(oct"023",30ut#,ht#,0);
-  pickup wesu_pen;
-p := (0,0){dir 10}..(11.5ut,0);
-q := (0,0){dir -10}..(11.5ut,0);
-draw p rotated -60 shifted (10ut,10ut);
-draw q rotated 60 shifted (10ut,10ut);
-draw p rotated -60 shifted (15ut,10ut);
-draw q rotated 60 shifted (15ut,10ut);
-endchar;
-
-% franz. Anfz. < (\flq)
-beginchar(oct"016",25ut#,ht#,0);
-  pickup wesu_pen;
-p := (0,0){dir 10}..(11.5ut,0);
-q := (0,0){dir -10}..(11.5ut,0);
-draw p rotated -60 shifted (10ut,10ut);
-draw q rotated 60 shifted (10ut,10ut);
-endchar;
-
-
-% franz. Anfz. >> (\frqq)
-beginchar(oct"024",30ut#,ht#,0);
-  pickup wesu_pen;
-p := (0,0){dir 10}..(11.5ut,0);
-q := (0,0){dir -10}..(11.5ut,0);
-draw p rotated 120 shifted (20ut,10ut);
-draw q rotated -120 shifted (20ut,10ut);
-draw p rotated 120 shifted (15ut,10ut);
-draw q rotated -120 shifted (15ut,10ut);
-endchar;
-
-% franz. Anfz. > (\frq)
-beginchar(oct"017",25ut#,ht#,0);
-  pickup wesu_pen;
-p := (0,0){dir 10}..(11.5ut,0);
-q := (0,0){dir -10}..(11.5ut,0);
-draw p rotated 120 shifted (15ut,10ut);
-draw q rotated -120 shifted (15ut,10ut);
-endchar;
-
-% Euro (\euros)
-beginchar(oct"027",50ut#,Ht#,0);
-  pickup wesu_pen;
-    draw (halfcircle rotated 90) xscaled 30ut yscaled Ht shifted (30ut,ht);
-  draw ((0,0){right}..(10ut,-5ut)) shifted (30ut,Ht);
-  draw ((0,0){right}..(10ut,5ut)) shifted (30ut,0);
-  draw (((-27.5ut,0)--(0,0)) shifted (30ut,ht+2.5ut)) slanted 0.29;
-  draw (((-27.5ut,0)--(0,0)) shifted (30ut,ht-2.5ut)) slanted 0.29;
-  endchar;
 
 %%%%%%%%%%%%%%%% File-Ende %%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesubx14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesubx14.mf
new file mode 100644
index 00000000000..5c5af40a67e
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesubx14.mf
@@ -0,0 +1,3 @@
+% wesu bold
+fetter:=2;
+input wesu14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesubxsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesubxsl14.mf
new file mode 100644
index 00000000000..de620c16ef2
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesubxsl14.mf
@@ -0,0 +1,3 @@
+% wesu bold, slanted
+fetter:=2;
+input wesusl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesueb14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesueb14.mf
new file mode 100644
index 00000000000..e942ab9c029
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesueb14.mf
@@ -0,0 +1,3 @@
+% wesu extra bold
+fetter:=3;
+input wesu14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesuebsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesuebsl14.mf
new file mode 100644
index 00000000000..fd3e9a11b14
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesuebsl14.mf
@@ -0,0 +1,3 @@
+% wesu extra bold, slanted
+fetter:=3;
+input wesusl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesusb14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesusb14.mf
new file mode 100644
index 00000000000..47d69b27da4
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesusb14.mf
@@ -0,0 +1,3 @@
+% wesu semi bold
+fetter:=1;
+input wesu14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesusbsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesusbsl14.mf
new file mode 100644
index 00000000000..819c816b4b2
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesusbsl14.mf
@@ -0,0 +1,3 @@
+% wesu semi bold, slanted
+fetter:=1;
+input wesusl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesuub14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesuub14.mf
new file mode 100644
index 00000000000..5093d136b67
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesuub14.mf
@@ -0,0 +1,3 @@
+% wesu ultra bold
+fetter:=4;
+input wesu14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wesuubsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wesuubsl14.mf
new file mode 100644
index 00000000000..f839c2f4309
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wesuubsl14.mf
@@ -0,0 +1,3 @@
+% wesu ultra bold, slanted
+fetter:=4;
+input wesusl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/weva14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/weva14.mf
index 45bcd3ee4a5..045b5430ad3 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/weva14.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/weva14.mf
@@ -25,12 +25,17 @@ Ht# := ht#+dt#;
 % Umrechnung von sharp Variablen in Pixelgroessen:
 define_pixels(ut,ht,Ht,dt);
 
-
+if unknown fetter: fetter:=0; fi
+fetter:=sqrt(2)**fetter;
 % Federn:
- pickup pencircle scaled 1.25ut;
+ pickup pencircle scaled (fetter*1.25*ut);
 weva_pen := savepen;
 % fuer i-Punkte etc.
-pickup  pencircle scaled 3.5ut;
+if fetter>3: pickup  pencircle scaled 7ut;
+  elseif fetter>2.5: pickup  pencircle scaled 5ut;
+  else:
+  pickup  pencircle scaled 3.5ut;
+  fi
 weva_pen_thick := savepen;
 %
 
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/weva14_def.mf b/Master/texmf-dist/fonts/source/public/schulschriften/weva14_def.mf
index 7b93e53a9b7..516d9182e0d 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/weva14_def.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/weva14_def.mf
@@ -4,6 +4,9 @@
 % 13.09.2012
 %
 % Parameter und Makros
+% Math. Sonderzeichen
+hmath:=ht/2;
+hdash:=ht/2;
 
 % Steigung des Verbindungsstrichs
 m:=4/3;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/weva14_sz.mf b/Master/texmf-dist/fonts/source/public/schulschriften/weva14_sz.mf
index 625659fbc8d..f02d49ce6b9 100644
--- a/Master/texmf-dist/fonts/source/public/schulschriften/weva14_sz.mf
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/weva14_sz.mf
@@ -3,7 +3,231 @@
 % Walter Entenmann
 % 11.09.2011
 % 13.09.2012
-%
+% 14.11.2014: einheitliche Sonderzeichen
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% #
+beginchar("#",35ut#,Ht#,0);
+  pickup weva_pen;
+  p:=(0,0)--(0,Ht);
+  draw p slanted 0.176 shifted (10ut,0);
+  draw p slanted 0.176 shifted (20ut,0);
+  q:=((0,0)--(26ut,0)) shifted (2ut,0);
+  draw q shifted(0,Ht/3) slanted 0.176;
+  draw q shifted(0,2Ht/3) slanted 0.176;
+endchar;
+
+% §
+  beginchar(oct"237",43.333ut#,Ht#,dt#);
+  pickup weva_pen;
+sep:=10ut; breit:=20ut;
+p := ((8ut,20ut){curl 10}..(0ut,30ut){left}..(-breit/2,22ut){down}..
+  (breit/2,-2.5ut){down}..{-1,2/3}(2ut,-11ut)) scaled ((Ht+dt)/60ut);
+  draw p shifted (sep+breit*0.583,ht/2);
+  draw p rotated 180 shifted (sep+breit*0.583,ht/2);
+  endchar;
+  
+% *
+beginchar("*",30ut#,Ht#,0);
+  pickup weva_pen;
+  p:= (-ht/2,0)--(ht/2,0);
+  draw p rotated 90 shifted (15ut,1.5ht);
+  draw p rotated 30 shifted (15ut,1.5ht);
+  draw p rotated -30 shifted (15ut,1.5ht);
+endchar;
+
+% Prozentzeichen (%)
+beginchar("%",40ut#,Ht#,0);
+  pickup weva_pen;
+  q := (-23.6ut,0)--(23.6ut,0);
+  breit:=12.5ut;hoch:=17.5ut;
+  p := (breit/2,0){up}..(0,hoch/2){left}..(-breit/2,0){down}..(0,-hoch/2){right}..{up}(breit/2,0);
+  x0:=whatever;y0:=whatever;
+  z0=(directionpoint (-1,2) of (subpath (0,1) of p)) shifted (7.5ut+breit/2,Ht-hoch/2);
+  draw p shifted (7.5ut+breit/2,Ht-hoch/2);
+  draw p shifted (7.5ut+25ut-breit/2,hoch/2);
+  draw q rotated 58 shifted (w/2,h/2);
+  draw z0{1,-2}..{dir 58}(7.5ut+25ut,Ht);
+endchar;
+
+% &
+  beginchar("&",40ut#,Ht#,0);
+  pickup weva_pen;
+  p := (22.5ut,12.5ut)..tension 1.2..(7.5ut,0){left}..(0,8ut){up}..
+  %(8.167ut,21ut){3,2}..
+  tension 1.2..(17ut,34.5ut){up}..(11.5ut,Ht){left}..(4ut,30ut){down}..{2,-3}(8.167ut,21ut)--(22.5ut,0);
+  draw p shifted (10ut,0);
+  endchar;
+
+% $
+beginchar("$",30ut#,Ht#,0);
+  pickup weva_pen;
+  draw halfcircle xscaled 20ut yscaled 20ut shifted (15ut,30ut);
+   draw (halfcircle rotated 180 xscaled 20ut yscaled 20ut) shifted (15ut,10ut);
+   draw ((-10ut,10ut){down}..{down}(10ut,-10ut)) shifted (15ut,ht);
+   draw ((0,ht+2.5ut)--(0,-ht-2.5ut)) shifted (15ut,ht);
+endchar;
+
+% "+"
+beginchar("+",30ut#,22.5ut#,0);
+  path p;
+  pickup weva_pen;
+  z0=(15ut,hmath);
+  z1=(0ut,10ut);
+  z2=(0ut,-10ut);
+  p := z1--z2;
+  draw p   shifted z0 ;
+  draw p   rotated 90 shifted z0 ;
+  labels(range 0 thru 2); 
+endchar;
+
+% ASCII Bindestrich oct"055" (OT1: auch Trennstrich)
+beginchar("-",27.5ut#,ht#,0);
+  pickup weva_pen;
+  draw ((0,0)--(12.5ut,0)) shifted (7.5ut,hdash);
+endchar;
+
+% T1: Trennstrich
+beginchar(oct"177",27.5ut#,ht#,0);
+  pickup weva_pen;
+  draw ((0,0)--(12.5ut,0)) shifted (7.5ut,hdash);
+endchar;
+
+% "/" 
+beginchar("/",25ut#,Ht#,0);
+  pickup weva_pen;
+draw ((5ut,0)--(20ut,Ht));
+endchar;
+
+% ">" 
+beginchar(">",30ut#,Ht#,0);
+  path p;
+  pickup weva_pen;
+p:=(0,0)--(20ut,0);
+draw p rotated 30 shifted (6.33ut,hmath);
+  draw p rotated -30 shifted (6.33ut,hmath);
+endchar;
+
+% "=" 
+beginchar("=",30ut#,ht#,0);
+    pickup weva_pen;
+  draw((0,0)--(20ut,0)) shifted (5ut,hmath-2.5ut);
+  draw((0,0)--(20ut,0)) shifted (5ut,hmath+2.5ut);
+endchar;
+
+% "<" 
+beginchar("<",30ut#,Ht#,0);
+  path p;
+  pickup weva_pen;
+p:=(0,0)--(-20ut,0);
+draw p rotated 30 shifted (23.66ut,hmath);
+  draw p rotated -30 shifted (23.66ut,hmath);
+endchar;
+
+% oct"025" Bis-Strich --, Gedankenstrich 
+beginchar(oct"025",30ut#,ht#,0);
+  pickup weva_pen;
+draw ((0,0)--(20ut,0)) shifted (5ut,hdash);
+endchar;
+
+% engl. Gedankenstrich ---
+beginchar(oct"026",45ut#,ht#,0);
+  pickup weva_pen;
+draw ((0,0)--(30ut,0)) shifted (7.5ut,hdash);
+endchar;
+
+% oct"023" franz. Anfz. <<
+beginchar(oct"023",32.5ut#,ht#,0);
+  path p, q;
+  pickup weva_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+  z4=(6,1);
+  z5=(7.5ut,ht/2);
+z6=(15ut,ht/2);
+  p := (z1{z3}..z2) rotated 45;
+    q := (z1{z4}..z2) rotated -45;
+  draw p shifted z5  ;
+  draw p shifted z6 ;
+    draw q shifted z5 ;
+  draw q shifted z6 ;
+  labels(range 1 thru 6);
+endchar;  
+
+% oct"024" franz. Anfz. >>
+beginchar(oct"024",32.5ut#,ht#,0);
+  path p, q;
+  pickup weva_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+    z4=(6,1);
+  z5=(17.5ut,ht/2);
+  z6=(25ut,ht/2);
+
+  p := (z1{z4}..z2) rotated 135;
+    q := (z1{z3}..z2) rotated -135;
+  draw p shifted z5 ;
+  draw p shifted z6 ;
+    draw q shifted z5 ;
+  draw q shifted z6 ;
+  labels(range 1 thru 6);
+endchar;  
+
+% oct"016" franz. Anfz. <
+beginchar(oct"016",25ut#,ht#,0);
+  path p, q;
+  pickup weva_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+  z4=(6,1);
+  z5=(7.5ut,ht/2);
+  p := (z1{z3}..z2) rotated 45;
+    q := (z1{z4}..z2) rotated -45;
+  draw p shifted z5  ;
+    draw q shifted z5 ;
+  labels(range 1 thru 5);
+endchar;  
+
+% oct"017" franz. Anfz. >
+beginchar(oct"017",25ut#,ht#,0);
+  path p, q;
+  pickup weva_pen;
+  z1=(0ut,0ut);
+  z2=(1.1*ht/2,0);
+  z3=(6,-1);
+    z4=(6,1);
+  z5=(17.5ut,ht/2);
+  p := (z1{z4}..z2) rotated 135;
+    q := (z1{z3}..z2) rotated -135;
+  draw p shifted z5 ;
+    draw q shifted z5 ;
+  labels(range 1 thru 5);
+endchar;  
+
+% "@":
+beginchar("@",50ut#,Ht#,0);
+  pickup weva_pen;
+sep:=10ut;gap:=8ut;
+draw (superellipse((a,0),(0,b),(-a,0),(0,-b),sigma)) shifted (gap+a+sep,ht);
+draw ((0,ht)--(0,5ut){down}..(2ut,0){right}..tension 1.5..(gap,ht/2){up}..
+  (-a,3ht/2){left}..(-2*a-gap,ht/2){down}..
+  (-a,-ht/2){right}..(7.5ut,-5ut)) shifted (2*a+gap+sep,ht/2);
+endchar;
+
+% Euro (\symbol{160})
+beginchar(oct"240",47.5ut#,Ht#,0);
+  pickup weva_pen;
+  sep:=7.5ut; gap:=7.5ut;
+    draw (halfcircle rotated 90) xscaled 30ut yscaled Ht shifted (15ut+gap+sep,Ht/2);
+  draw ((0,0){right}..(7.5ut,-3ut)) shifted (15ut+gap+sep,Ht);
+  draw ((0,0){right}..(7.5ut,3ut)) shifted (15ut+gap+sep,0);
+  draw (((-25ut,2.5ut)--(0,2.5ut))  shifted (15ut+gap+sep,ht)) slanted 0.25;
+  draw (((-25ut,-2.5ut)--(0,-2.5ut)) shifted (15ut+gap+sep,ht)) slanted 0.25;
+endchar;
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % Ziffern
 beginchar("0",30ut#,Ht#,0);
@@ -20,8 +244,8 @@ endchar;
 
 beginchar("2",30ut#,Ht#,0);
   pickup weva_pen;
-  draw halfcircle xscaled 20ut yscaled ht shifted (15ut,1.5*ht);
-  draw ((25ut,1.5*ht){down}..tension2and 5..{-20ut,-27.5ut}(5ut,0));
+  draw halfcircle xscaled 17.5ut yscaled ht shifted (13.75ut,1.5*ht);
+  draw ((22.5ut,1.5*ht){down}..tension2and 5..{-17.5ut,-27.5ut}(5ut,0));
   gerade(0,0,20ut,5ut);
 endchar;
 
@@ -33,8 +257,8 @@ endchar;
 
 beginchar("4",30ut#,Ht#,0);
   pickup weva_pen;
-draw ((5ut,h)--(0,h/4)--(20ut,h/4)) shifted (5ut,0);
-draw ((13.5ut,30ut)--(13.5ut,0)) shifted (5ut,0);
+draw ((10ut,h)--(0,h/4)--(20ut,h/4)) shifted (5ut,0);
+draw ((15ut,25ut)--(15ut,0)) shifted (5ut,0);
 endchar;
 
 beginchar("5",30ut#,Ht#,0);
@@ -52,11 +276,10 @@ beginchar("6",30ut#,Ht#,0);
   draw ((0,13.75ut){up}..(10ut,Ht){right}..(16ut,Ht-2.5ut)) shifted (5ut,0);
 endchar;
 
-
 beginchar("7",30ut#,Ht#,0);
   pickup weva_pen;
-  draw ((0,Ht)--(20ut,Ht)--(5ut,0)) shifted (5ut,0);
-    draw ((0,ht)--(10ut,ht)) shifted (12.5ut,0);
+  draw ((0,Ht)--(20ut,Ht)--(10ut,0)) shifted (5ut,0);
+    draw ((0,ht)--(10ut,ht)) shifted (15ut,0);
 endchar;
 
 beginchar("8",30ut#,Ht#,0);
@@ -93,65 +316,16 @@ beginchar(oct"042",25ut#,Ht#,0);
   komma(17.5ut,Ht);
 endchar;
 
-% #
-beginchar("#",50ut#,Ht#,dt#);
-  pickup weva_pen;
-draw ((0,1.5*ht)--(0,-1.5*ht)) slanted 1/6 shifted (20ut,ht/2);
-draw ((0,1.5*ht)--(0,-1.5*ht)) slanted 1/6 shifted (20ut+10ut,ht/2);
-draw (((-ht,0)--(ht,0)) shifted (0,5ut) slanted 1/6) shifted (25ut,ht/2);
-draw (((-ht,0)--(ht,0)) shifted (0,-5ut) slanted 1/6) shifted (25ut,ht/2);
-endchar;
-  
-% $
-beginchar("$",30ut#,Ht#,0);
-  pickup weva_pen;
-  draw halfcircle xscaled 20ut yscaled 20ut shifted (15ut,30ut);
-   draw (halfcircle rotated 180 xscaled 20ut yscaled 20ut) shifted (15ut,10ut);
-   draw ((-10ut,10ut){down}..{down}(10ut,-10ut)) shifted (15ut,ht);
-   draw ((0,ht+2.5ut)--(0,-ht-2.5ut)) shifted (15ut,ht);
-endchar;
-
-% %
-beginchar("%",40ut#,Ht#,0);
-  pickup weva_pen;
-  q := (-23.6ut,0)--(23.6ut,0);
-  breit:=12.5ut;hoch:=17.5ut;
-  p := (breit/2,0){up}..(0,hoch/2){left}..(-breit/2,0){down}..(0,-hoch/2){right}..{up}(breit/2,0);
-  x0:=whatever;y0:=whatever;
-  z0=(directionpoint (-1,2) of (subpath (0,1) of p)) shifted (7.5ut+breit/2,Ht-hoch/2);
-  draw p shifted (7.5ut+breit/2,Ht-hoch/2);
-  draw p shifted (7.5ut+25ut-breit/2,hoch/2);
-  draw q rotated 58 shifted (w/2,h/2);
-  draw z0{1,-2}..{dir 58}(7.5ut+25ut,Ht);
-  endchar;
-
-% &
-  beginchar("&",40ut#,Ht#,0);
-  pickup weva_pen;
-  p := (22.5ut,12.5ut)..tension 1.2..(7.5ut,0){left}..(0,8ut){up}..
-  %(8.167ut,21ut){3,2}..
-  tension 1.2..(17ut,34.5ut){up}..(11.5ut,Ht){left}..(4ut,30ut){down}..{2,-3}(8.167ut,21ut)--(22.5ut,0);
-  draw p shifted (10ut,0);
-  endchar;
-
-% §
-  beginchar(oct"237",30ut#,Ht#,dt#);
-  pickup weva_pen;
-  p := (7.5ut,20ut){up}..(0,30ut){left}..(-7.5ut,20ut){down}..(-2.5ut,10ut){3,-2}..tension 1.2..(7.5ut,-2.5ut){down}..{left}(2.5ut,-10ut);
-  draw p shifted (w/2,ht/2);
-  draw p rotated 180 shifted (w/2,ht/2);
-  endchar;
-
 % [
-beginchar("[",25ut#,Ht#,0);
+beginchar("[",25ut#,Ht#,ht#);
   pickup weva_pen;
-draw ((5ut,Ht)--(0,Ht)--(0,0)--(5ut,0)) shifted (10ut,0);
+draw ((10ut,Ht)--(5ut,Ht)--(5ut,-ht)--(10ut,-ht)) shifted (5ut,0);
   endchar;
 
 % ]
-beginchar("]",25ut#,Ht#,0);
+beginchar("]",25ut#,Ht#,ht#);
   pickup weva_pen;
-draw ((5ut,Ht)--(10ut,Ht)--(10ut,0)--(5ut,0)) shifted (5ut,0);
+draw ((0,Ht)--(5ut,Ht)--(5ut,-ht)--(0,-ht)) shifted (5ut,0);
   endchar;
 
 beginchar("'",20ut#,Ht#,0);
@@ -159,37 +333,14 @@ beginchar("'",20ut#,Ht#,0);
 komma(12.5ut,Ht);
 endchar;
 
-beginchar("(",20ut#,Ht#,0);
-  pickup weva_pen;
-draw ((5ut,Ht)..(0,ht){down}..(5ut,0)) shifted (10ut,0);
-endchar;
-
-beginchar(")",20ut#,Ht#,0);
-  pickup weva_pen;
-draw ((5ut,Ht)..(10ut,ht){down}..(5ut,0));
-endchar;
-
-beginchar("*",38ut#,42.5ut#,0);
+beginchar("(",20ut#,60ut#,ht#);
   pickup weva_pen;
-z3=(19ut,30ut);
-  z1=(-12.5ut,0);
-  z2=(12.5ut,0);
-  p := z1--z2;
-  draw p   rotated  30  shifted z3 ;
-  draw p   rotated -30  shifted z3 ;
-  draw p   rotated  90 shifted z3 ;
-  labels(range 0 thru 3); 
+draw ((10ut,Ht)..(2.5,ht/2){down}..(10ut,-ht)) shifted (5ut,0);
 endchar;
 
-beginchar("+",40ut#,Ht#,0);
+beginchar(")",20ut#,60ut#,ht#);
   pickup weva_pen;
-z3=(20ut,12.5ut);
-  z1=(-12.5ut,0);
-  z2=(12.5ut,0);
-  p := z1--z2;
-  draw p   shifted z3 ;
-  draw p   rotated 90 shifted z3 ;
-  labels(range 0 thru 3); 
+draw ((0,Ht)..(7.5ut,ht/2){down}..(0,-ht)) shifted(5ut,0);
 endchar;
 
 beginchar(",",15ut#,ht#,dt#);
@@ -197,37 +348,12 @@ beginchar(",",15ut#,ht#,dt#);
 komma(7.5ut,3.5ut); 
 endchar;
 
-% ASCII Bindestrich oct"055" (OT1: auch Trennstrich)
-beginchar("-",27.5ut#,ht#,0);
-  pickup weva_pen;
-  z1=(0,0);
-  z2=(12.5ut,0);
-  p := z1--z2;
-  draw p  shifted (7.5ut,ht/2);
-  labels(range 1 thru 2); 
-endchar;
-
-% T1: Trennstrich
-beginchar(oct"177",27.5ut#,ht#,0);
-  pickup weva_pen;
-  z1=(0,0);
-  z2=(12.5ut,0);
-  p := z1--z2;
-  draw p  shifted (7.5ut,ht/2);
-  labels(range 1 thru 2); 
-endchar;
-
 beginchar(".",15ut#,ht#,0);
   pickup weva_pen_thick;
   z1=(7.5ut,0ut);
   drawdot z1  ;
   labels(1); 
 endchar;
- 
-beginchar("/",25ut#,Ht#,0);
-  pickup weva_pen;
-draw ((5ut,0)--(20ut,Ht));
-endchar;
 
 beginchar(":",20ut#,ht#,0);
   pickup weva_pen_thick;
@@ -241,31 +367,6 @@ komma(10ut,3.5ut);
   pickup weva_pen_thick;
   drawdot (0,0) shifted (10ut,17.5ut);
 endchar;
- 
-beginchar(">",37.5ut#,Ht#,0);
-  pickup weva_pen;
-  z1=(7.5ut+20ut*sqrt(3)/2,12.5ut);
-  p := (0,0)--(20ut,0);
-  draw p rotated  150 shifted z1;
-  draw p rotated -150 shifted z1;
-  labels(1); 
-endchar;
-
-beginchar("=",40ut#,Ht#,0);
-  pickup weva_pen;
-p := (0,0)--(25ut,0);
-draw p shifted (7.5ut,12.5ut+3.5ut);
-draw p shifted (7.5ut,12.5ut-3.5ut);
-endchar;
-
-beginchar("<",37.5ut#,Ht#,0);
-  pickup weva_pen;
-  z1=(7.5ut,12.5ut);
-  p := (0,0)--(20ut,0);
-  draw p rotated  30 shifted z1;
-  draw p rotated -30 shifted z1;
-  labels(1); 
-endchar;
 
 beginchar("?",35ut#,Ht#,0);
   pickup weva_pen;
@@ -283,13 +384,6 @@ beginchar("?",35ut#,Ht#,0);
   labels(range 1 thru 7); 
 endchar;
 
-% @
-beginchar("@",50ut#,Ht#,0);
-  pickup weva_pen;
-draw (superellipse((a,0),(0,b),(-a,0),(0,-b),sigma)) shifted (25ut,ht);
-draw ((a,b-2.5ut)--(a,-b+r){down}..(a+r,-b){right}..tension1.5..(a+9ut,0){up}..(0,ht){left}..(-a-9ut,0){down}..(0,-ht){right}..(a+9ut,-ht+9ut)) shifted (a+9ut+9ut,ht);
-endchar;
-
 %
 % spezielle Sonderzeichen (T1-Kodierung)
 % dt. Anfuehrungszeichen oben (\grqq), wie oct"042"
@@ -306,69 +400,6 @@ beginchar(oct"022",25ut#,ht#,dt#);
   komma(12.5ut,3.5ut);
 endchar;
 
-% Bis-Strich, Gedankenstrich ( -- )
-beginchar(oct"025",40ut#,ht#,0);
-  pickup weva_pen;
-  p :=(0,0)--(25ut,0);
-draw p shifted (7.5ut,12.5ut);
-endchar;
-
-% langer (engl.) Gedankenstrich (---)
-beginchar(oct"026",65ut#,ht#,0);
-  pickup weva_pen;
-  p := (0,0)--(50ut,0);
-  draw p shifted (7.5ut,12.5ut);
-endchar;
-
-% franz. Anfz. << (\flqq)
-beginchar(oct"023",30ut#,ht#,0);
-  pickup weva_pen;
-p := (0,0){dir 10}..(11.5ut,0);
-q := (0,0){dir -10}..(11.5ut,0);
-draw p rotated -60 shifted (10ut,10ut);
-draw q rotated 60 shifted (10ut,10ut);
-draw p rotated -60 shifted (15ut,10ut);
-draw q rotated 60 shifted (15ut,10ut);
-endchar;
 
-% franz. Anfz. < (\flq)
-beginchar(oct"016",25ut#,ht#,0);
-  pickup weva_pen;
-p := (0,0){dir 10}..(11.5ut,0);
-q := (0,0){dir -10}..(11.5ut,0);
-draw p rotated -60 shifted (10ut,10ut);
-draw q rotated 60 shifted (10ut,10ut);
-endchar;
-
-
-% franz. Anfz. >> (\frqq)
-beginchar(oct"024",30ut#,ht#,0);
-  pickup weva_pen;
-p := (0,0){dir 10}..(11.5ut,0);
-q := (0,0){dir -10}..(11.5ut,0);
-draw p rotated 120 shifted (20ut,10ut);
-draw q rotated -120 shifted (20ut,10ut);
-draw p rotated 120 shifted (15ut,10ut);
-draw q rotated -120 shifted (15ut,10ut);
-endchar;
-
-% franz. Anfz. > (\frq)
-beginchar(oct"017",25ut#,ht#,0);
-  pickup weva_pen;
-p := (0,0){dir 10}..(11.5ut,0);
-q := (0,0){dir -10}..(11.5ut,0);
-draw p rotated 120 shifted (15ut,10ut);
-draw q rotated -120 shifted (15ut,10ut);
-endchar;
-
-% Euro
-beginchar(oct"027",50ut#,Ht#,0);
-  pickup weva_pen;
-    draw (halfcircle rotated 90) xscaled 30ut yscaled Ht shifted (30ut,ht);
-  draw ((0,0){right}..(10ut,-5ut)) shifted (30ut,Ht);
-  draw ((0,0){right}..(10ut,5ut)) shifted (30ut,0);
-  draw (((-27.5ut,0)--(0,0)) shifted (30ut,ht+2.5ut)) slanted 0.29;
-  draw (((-27.5ut,0)--(0,0)) shifted (30ut,ht-2.5ut)) slanted 0.29;
-  endchar;
 
 %%%%%%%%%%%%%%%% File-Ende %%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wevabx14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wevabx14.mf
new file mode 100644
index 00000000000..fa0caea063e
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wevabx14.mf
@@ -0,0 +1,3 @@
+% weva bold
+fetter:=2;
+input weva14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wevabxsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wevabxsl14.mf
new file mode 100644
index 00000000000..d1c7fe0ec02
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wevabxsl14.mf
@@ -0,0 +1,3 @@
+% weva bold, slanted
+fetter:=2;
+input wevasl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wevaeb14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wevaeb14.mf
new file mode 100644
index 00000000000..4a0b26b6bd5
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wevaeb14.mf
@@ -0,0 +1,3 @@
+% weva extra bold
+fetter:=3;
+input weva14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wevaebsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wevaebsl14.mf
new file mode 100644
index 00000000000..5c99ac62121
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wevaebsl14.mf
@@ -0,0 +1,3 @@
+% weva extra bold, slanted
+fetter:=3;
+input wevasl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wevasb14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wevasb14.mf
new file mode 100644
index 00000000000..8eb12bded73
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wevasb14.mf
@@ -0,0 +1,3 @@
+% weva semi bold
+fetter:=1;
+input weva14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wevasbsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wevasbsl14.mf
new file mode 100644
index 00000000000..0dea57946ab
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wevasbsl14.mf
@@ -0,0 +1,3 @@
+% weva semi bold, slanted
+fetter:=1;
+input wevasl14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wevaub14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wevaub14.mf
new file mode 100644
index 00000000000..92bfd8cd2e2
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wevaub14.mf
@@ -0,0 +1,3 @@
+% weva ultra bold
+fetter:=4;
+input weva14;
diff --git a/Master/texmf-dist/fonts/source/public/schulschriften/wevaubsl14.mf b/Master/texmf-dist/fonts/source/public/schulschriften/wevaubsl14.mf
new file mode 100644
index 00000000000..c4ae992c35f
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/schulschriften/wevaubsl14.mf
@@ -0,0 +1,3 @@
+% weva ultra bold, slanted
+fetter:=4;
+input wevasl14;
author	Karl Berry <karl@freefriends.org>	2014-12-03 22:41:27 +0000
committer	Karl Berry <karl@freefriends.org>	2014-12-03 22:41:27 +0000
commit	a038a87d3262e71bf179f9169cbcf7059b681dab (patch)
tree	6d042857ad9a217a76ec317294411626694270f4 /Master/texmf-dist/fonts/source
parent	6ff4c0023bf5aaaac432e8b934235ba1fe4e02a8 (diff)