lilypond-0.1.27

diff --git a/lily/main.cc b/lily/main.cc
index 0f250ceba1ccb7e7a9f32346e0ffb6b893fb6d5a..73e4dc087659ac2e8c095d9efe9f4be639f1a34b 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -20,9 +20,10 @@
 #include "debug.hh"
 #include "my-lily-parser.hh"
 
+static bool version_ignore_b = false;
 Sources* source_l_g = 0;
 bool only_midi = false;
-bool version_ignore_b_ = false;
+bool experimental_features_global_b = false;
 int exit_status_i_;
 
 void destill_inname (String &name_str_r);
@@ -31,6 +32,7 @@ Long_option_init theopts[] = {
   {1, "output", 'o'},
   {0, "warranty", 'w'},
   {0, "help", 'h'},
+  {0, "test", 't'},
   {0, "debug", 'd'},
   {1, "init", 'i'},
   {1, "include", 'I'},
@@ -53,6 +55,7 @@ usage()
     "  -h, --help             this help\n"
     "  -w, --warranty         show warranty and copyright\n"
     "  -o, --output=FILE      set FILE as default output\n"
+    "  -t, --test             switch on experimental features\n"
     "  -M, --midi             produce midi output only\n"
     "  -V, --ignore-version   ignore mudela version\n"
     "\n"
@@ -122,7 +125,7 @@ do_one_file (String init_str, String file_str)
   source_l_g->set_path (&path);
   {
     My_lily_parser parser (source_l_g);
-    parser.set_version_check (version_ignore_b_);
+    parser.set_version_check (version_ignore_b);
     parser.parse_file (init_str, file_str);
     exit_status_i_ |= parser.error_level_i_;
   }
@@ -155,6 +158,9 @@ main (int argc, char **argv)
     {
       switch (opt->shortname)
        {
+       case 't':
+         experimental_features_global_b = true;
+         break;
        case 'o':
          set_default_output (oparser.optional_argument_ch_C_);
          break;
@@ -173,7 +179,7 @@ main (int argc, char **argv)
          exit (0);
          break;
        case 'V':
-         version_ignore_b_ = true;
+         version_ignore_b = true;
          break;
        case 'd':
          set_debug (true);

diff --git a/mf/feta-nummer.mf b/mf/feta-nummer.mf
index 8e816ab04391cf464860364140f2ff2237bc1c94..fb1bb559e5fb139a2b370ffd0f770f19dc91899d 100644 (file)
--- a/mf/feta-nummer.mf
+++ b/mf/feta-nummer.mf
@@ -2,6 +2,7 @@
 % part of LilyPond's pretty-but-neat music font
 
 fet_begingroup("nummer")
+code := 47;
 
 define_pixels(height,thick,norm,thin,hair);
 foot_top#:=2thin#;
@@ -77,7 +78,7 @@ def draw_six =
        penpos5(norm-hair,180);
        z5r=(0,y1);
        penpos6(hair,90);
-       z6r=(w-norm,h);
+       z6r=(w-norm-hair,h);
        penpos7(norm-hair,180);
        z7r=(0,h/2);
        penpos10(norm-hair,180);
@@ -163,7 +164,9 @@ fet_beginchar("Numeral 2", "2", "two")
        penpos6(thin,90);
        z6r=(w/2-thin-hair,h);
        penlabels(4,5,6);
-       fill z1l{dir(beta)}..z4l{dir(15)}..z5r{up}..z6r{left}
+       fill z1l{dir(beta)}..z4l{dir(15)}..z5r{up}..
+               tension 0.9 ..          
+               z6r{left}
                ..z6l{right}..z5l{down}..z4r{dir(180+15)}
                ..{dir(180+beta)}z1r..cycle;
        draw_flare(z6r,180,90,thin,thick);
@@ -339,8 +342,9 @@ fet_beginchar("Numeral 8", "8", "eight")
        save beta; beta=alpha-15;
        z1=(w/2,h/2+hair);
        penpos2(hair,90+180+beta);
-       z2=(w/4,h/2+thin);
-       z3=(0,h/4+thin/2);
+       z2=(w/3,h/2+thin);
+       penpos3(thin+hair,0);
+       z3l=(0,h/4+thin/2);
        penpos4(hair,90);
        z4l=(x1,0);
        penpos5(norm,90+90+alpha);
@@ -349,12 +353,18 @@ fet_beginchar("Numeral 8", "8", "eight")
        z6=z1+w/4*dir(90+alpha);
        penpos7(hair,90);
        z7r=(x1,h);
-       z8=(w-hair,3/4h+thin/2);
+       penpos8(thin+hair,0);
+       z8r=(w-hair,3/4h+thin/2);
        penpos9(hair,90+180+beta);
-       z9=(3/4w,h/2);
+       z9=(2/3w,h/2);
        penlabels(1,2,3,4,5,6,7,8,9);
        save t; t=0.85;
-       fill z2r{dir(180+beta)}..tension t..z4r{right}..z5r{dir(90+alpha)}..z6r{dir(90+alpha)}..tension t..z7r{right}..z8{down}..z9r{dir(180+beta)}..z9l{dir(beta)}..tension t..z7l{left}..z6l{dir(alpha-90)}..z5l{dir(alpha-90)}..tension t..z4l{left}..z3{up}..z2l{dir(beta)}..cycle;
+       fill z2r{dir(180+beta)}..z3r{down}..z4r{right}
+               ..z5r{dir(90+alpha)}..z6r{dir(90+alpha)}
+               ..tension t..z7r{right}..z8r{down}..z9r{dir(180+beta)}
+               ..z9l{dir(beta)}..z8l{up}..z7l{left}..z6l{dir(alpha-90)}
+               ..z5l{dir(alpha-90)}..tension t..z4l{left}..z3l{up}
+               ..z2l{dir(beta)}..cycle;
 fet_endchar;
 
 fet_beginchar("Numeral 9", "9", "nine")