patch::: 0.1.37.jcn1: toch kleiner

diff --git a/VERSION b/VERSION
index 07f66a40d7c0640479c03f8fa7a7db9c657736f8..13c7b2006ae3b5fb49cac6701f707ed51020b584 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 TOPLEVEL_MAJOR_VERSION = 0
 TOPLEVEL_MINOR_VERSION = 1
 TOPLEVEL_PATCH_LEVEL = 37
-TOPLEVEL_MY_PATCH_LEVEL = jcn1
+TOPLEVEL_MY_PATCH_LEVEL = jcn2
 
 # use the above to send patches, always empty for released version:
 # please don't move these comments up; the patch should fail if 

diff --git a/init/feta16.ly b/init/feta16.ly
index 0e66f80eddb4db71d4b96d49d14d04c1bfd4f47b..747be0a7ac42c3e19d6269aa390301010498e6ce 100644 (file)
--- a/init/feta16.ly
+++ b/init/feta16.ly
@@ -1,5 +1,5 @@
 % Creator: mf-to-table.py version 0.4
-% Automatically generated on Sat Dec 13 19:36:32 1997
+% Automatically generated on Sat Dec 13 20:07:15 1997
 % Do not edit
 % input from out/feta16.log
 % name=\symboltables {
@@ -56,7 +56,7 @@
         "trill"        "\\trill"       -0.00\pt        8.00\pt -0.00\pt        9.00\pt 
         "pedalheel"    "\\pedalheel"   -2.00\pt        2.00\pt -2.00\pt        2.67\pt 
         "pedaltoe"     "\\pedaltoe"    -2.00\pt        2.00\pt -0.00\pt        6.00\pt 
-        "flageolet"    "\\flageolet"   -0.00\pt        2.40\pt -0.00\pt        2.40\pt 
+        "flageolet"    "\\flageolet"   2.13\pt 2.13\pt 2.13\pt 2.13\pt 
         }
     "flags"     = \table {
         "u3"   "\\eighthflag"  -0.20\pt        4.94\pt -12.26\pt       0.20\pt 

diff --git a/init/feta20.ly b/init/feta20.ly
index 4f4614f6cb1133ab084c8f124f9b91cc3423c87e..84dc1d2f2f5148cdbc1f76d7931b36f9aa61bbe2 100644 (file)
--- a/init/feta20.ly
+++ b/init/feta20.ly
@@ -1,5 +1,5 @@
 % Creator: mf-to-table.py version 0.4
-% Automatically generated on Sat Dec 13 19:36:55 1997
+% Automatically generated on Sat Dec 13 20:07:39 1997
 % Do not edit
 % input from out/feta20.log
 % name=\symboltables {
@@ -56,7 +56,7 @@
         "trill"        "\\trill"       -0.00\pt        10.00\pt        -0.00\pt        11.25\pt        
         "pedalheel"    "\\pedalheel"   -2.50\pt        2.50\pt -2.50\pt        3.33\pt 
         "pedaltoe"     "\\pedaltoe"    -2.50\pt        2.50\pt -0.00\pt        7.50\pt 
-        "flageolet"    "\\flageolet"   -0.00\pt        3.00\pt -0.00\pt        3.00\pt 
+        "flageolet"    "\\flageolet"   2.67\pt 2.67\pt 2.67\pt 2.67\pt 
         }
     "flags"     = \table {
         "u3"   "\\eighthflag"  -0.25\pt        6.17\pt -15.33\pt       0.25\pt 

diff --git a/mf/feta-nummer4.mf b/mf/feta-nummer4.mf
index 9906d3ed3b45f4d691107caa258170790e028ef1..efa2f9ac48078482aba88d2e9657768a4806a710 100644 (file)
--- a/mf/feta-nummer4.mf
+++ b/mf/feta-nummer4.mf
@@ -1,7 +1,8 @@
 % feta-nummer4.mf
 % part of LilyPond's pretty-but-neat music font
 
-size:=4;
+% size:=4;
+size:=16*4/15;
 
 input feta-nummer-generic.mf;
 

diff --git a/mf/feta-nummer5.mf b/mf/feta-nummer5.mf
index 10c91913b8bd2205efacfc3b55e97d8275bcb08a..0a9fb3ffa36279167d17d0b491c7afc20ae96572 100644 (file)
--- a/mf/feta-nummer5.mf
+++ b/mf/feta-nummer5.mf
@@ -1,7 +1,8 @@
 % feta-nummer5.mf
 % part of LilyPond's pretty-but-neat music font
 
-size:=5;
+% size:=5;
+size:=20*4/15;
 
 input feta-nummer-generic.mf;
 

diff --git a/mf/feta-nummer6.mf b/mf/feta-nummer6.mf
index a67855d7761e5cb31514f7d2ec8d375ff01a5aee..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/mf/feta-nummer6.mf
+++ b/mf/feta-nummer6.mf
@@ -1,9 +0,0 @@
-% feta-nummer6.mf
-% part of LilyPond's pretty-but-neat music font
-
-size:=6;
-
-input feta-nummer-generic.mf;
-
-end.
-

diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index c600381d7a12711fd05f0a7a5432008bdf28223d..4f1ab3cf63f78576e155a473ef40a3b0b784b599 100644 (file)
--- a/mf/feta-schrift.mf
+++ b/mf/feta-schrift.mf
@@ -502,17 +502,17 @@ fet_endchar;
 
 fet_beginchar("Flageolet", "flageolet", "flageolet")
        save height,width,thickness;
-       height#=6/5interline#/2;
+       height#=4/15staffsize#/2;
        width#=height#;
        thickness#=blot_diameter#;
        define_pixels(height,width,thickness);
-       set_char_box(0,width#,0,height#);
+       set_char_box(-width#,width#,-height#,height#);
        
        pickup pencircle scaled thickness;
-       x1=width/2; top y1=height;
-       lft x2=0; y2 = height/2;
-       x3=x1; bot y3=0;
-       rt x4=width; y4=y2;
+       x1=0; top y1=height;
+       lft x2=-width; y2=0;
+       x3=x1; y3=-y1;
+       x4=-x2; y4=y2;
        penlabels(1,2,3,4);
        draw z1..z2..z3..z4..cycle;
 fet_endchar;

diff --git a/tex/feta16.tex b/tex/feta16.tex
index 1fc157833ad6ec6c7a834f4b428bc84acf6a4f3d..7ef33a9b589d796830ddee68791f9b512f30948e 100644 (file)
--- a/tex/feta16.tex
+++ b/tex/feta16.tex
@@ -1,5 +1,5 @@
 % Creator: mf-to-table.py version 0.4
-% Automatically generated on Sat Dec 13 19:36:32 1997
+% Automatically generated on Sat Dec 13 20:07:15 1997
 % Do not edit
 % input from out/feta16.log
 % name

diff --git a/tex/feta20.tex b/tex/feta20.tex
index efc164ab5757cef50c6afe140541f3d52fa889f8..fcdb256a0d3fef0906dcbe2046152f1a723300db 100644 (file)
--- a/tex/feta20.tex
+++ b/tex/feta20.tex
@@ -1,5 +1,5 @@
 % Creator: mf-to-table.py version 0.4
-% Automatically generated on Sat Dec 13 19:36:55 1997
+% Automatically generated on Sat Dec 13 20:07:39 1997
 % Do not edit
 % input from out/feta20.log
 % name

diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex
index ef2c5d39650cc3b203ebaa9143614f9a2ad8da71..2a6385abf4293f4b0050d19d4651555b268a4c50 100644 (file)
--- a/tex/fetdefs.tex
+++ b/tex/fetdefs.tex
@@ -7,7 +7,7 @@
         \font\fetanummer=feta-nummer8
         \font\dynfont=feta-din10 scaled \magstep1
         \font\bracefont=feta-braces16
-        \font\fingerfont=feta-nummer5
+        \font\fingerfont=feta-nummer4
 }
 \def\fettwentydefs{
         \font\fontentja=feta20
@@ -15,7 +15,7 @@
         \font\fetanummer=feta-nummer10
         \font\dynfont=feta-din10 scaled \magstep2
         \font\bracefont=feta-braces20
-        \font\fingerfont=feta-nummer6
+        \font\fingerfont=feta-nummer5
 }
 
 \def\fetdef#1#2{\def#1{%