lilypond-0.1.32

diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf
index bdad5b6ea1faac8278ced9a0c6628fc3c89627b0..51d35462aa0f01096c8618266ed9c90409371abe 100644 (file)
--- a/mf/feta-eindelijk.mf
+++ b/mf/feta-eindelijk.mf
@@ -37,24 +37,9 @@ block_rest_x# = 3/2 interline#;
 
 define_pixels(block_rest_y, block_rest_x);
 
-def block_rest=
-       pickup pencircle scaled blot_diameter;
-
-       bot y1 = 0;
-       top y2 = block_rest_y;
-       y3 = y2;
-       y4 = y1;
-
-       rt x1 = block_rest_x;
-       x2 = x1;
-       lft x3 = 0;
-       x4 = x3;
-       save p;
-       path p;
-       p:=z1 -- z2 -- z3 -- z4 -- cycle;
-
-       filldraw p;
-enddef;
+def block_rest =
+       draw_block ((0,0), (block_rest_x, block_rest_y));
+       enddef;
 
 fet_beginchar( "whole rest", "0", "wholerest");
        set_char_box(0, block_rest_x#,

diff --git a/mf/feta-macros.mf b/mf/feta-macros.mf
index d7708f793232f7fdf2011f52c47f6a44583b7536..c03e97c7b056abf30271888446da3c4e21d0a7b6 100644 (file)
--- a/mf/feta-macros.mf
+++ b/mf/feta-macros.mf
@@ -100,6 +100,27 @@ def distorted_ellipse(expr a,b,err_y,err_x,super) =
        superellipse((a,err_x),(-err_y,b),(-a,-err_x),(err_y,-b),super);
        enddef;
 
+% stolen from feta-eindelijk, but still
+% FIXME: too high
+def draw_block (expr bottom_left, top_right) =
+       pickup pencircle scaled blot_diameter;
+
+       begingroup;
+       save x,y;
+       bot y1 = ypart bottom_left;
+       top y2 = ypart top_right;
+       y3 = y2;
+       y4 = y1;
+
+       rt x1 = xpart top_right;
+       x2 = x1;
+       lft x3 = xpart bottom_left;
+       x4 = x3;
+
+       filldraw z1--z2--z3--z4--cycle;
+       endgroup;
+       enddef;
+
 def draw_brush(expr a,w,b,v) =
        save x,y;
        z1=a; z2=b;
@@ -113,6 +134,25 @@ def draw_brush(expr a,w,b,v) =
        fill z3r{z3r-z5l}..z4l..{z5r-z3l}z3l..z5r{z5r-z3l}..z6l..{z3r-z5l}z5l..cycle;
 enddef;
 
+def draw_flare(expr pos,alpha,beta,line,flare) =
+       begingroup;
+       clearxy;
+       penpos1(line,180+beta+alpha);
+       z1r=pos;
+       penpos2(flare,180+beta+alpha);
+       z2=z3;
+       penpos3(flare,0+alpha);
+       z3l=z1r+(1/2+0.43)*flare*dir(alpha+beta);
+       z4=z2r-1/6flare*dir(alpha);
+       penlabels(1,2,3,4);
+       pickup pencircle;
+       save t; t=0.833;
+       fill z1r{dir(alpha)}..z3r{dir(180+alpha-beta)}..z2l{dir(alpha+180)}
+               ..z3l{dir(180+alpha+beta)}..tension t
+               ..z4{dir(180+alpha+beta)}..z1l{dir(alpha+180)}..cycle;
+       endgroup;
+       enddef;
+
 def brush(expr a,w,b,v) =
        begingroup;
        draw_brush(a,w,b,v);    

diff --git a/mf/feta-nummer.mf b/mf/feta-nummer.mf
index fb1bb559e5fb139a2b370ffd0f770f19dc91899d..496015828ec97784a396cc1f670129f1ce6aa77f 100644 (file)
--- a/mf/feta-nummer.mf
+++ b/mf/feta-nummer.mf
@@ -43,24 +43,6 @@ def draw_foot(expr xpos) =
        endgroup;
        enddef;
 
-def draw_flare(expr pos,alpha,beta,line,flare) =
-       begingroup;
-       clearxy;
-       penpos1(line,180+beta+alpha);
-       z1r=pos;
-       penpos2(flare,180+beta+alpha);
-       z2=z3;
-       penpos3(flare,0+alpha);
-       z3l=z1r+(1/2+0.43)*flare*dir(alpha+beta);
-       z4=z2r-1/6flare*dir(alpha);
-       penlabels(1,2,3,4);
-       pickup pencircle;
-       save t; t=0.833;
-       fill z1r{dir(alpha)}..z3r{dir(180+alpha-beta)}..z2l{dir(alpha+180)}
-               ..z3l{dir(180+alpha+beta)}..tension t..z4{dir(180+alpha+beta)}..z1l{dir(alpha+180)}..cycle;
-       endgroup;
-       enddef;
-
 def draw_six =
        set_char_box(0, 2thick#+2thin#, 0, height#);
        message "w:"&decimal w;

diff --git a/mi2mu/VERSION b/mi2mu/VERSION
index 4ecc91f7f8ccb2fef843c27ee8eddce26e270151..361ecac43602d8426b2b3d7ad719e11d91ac20ce 100644 (file)
--- a/mi2mu/VERSION
+++ b/mi2mu/VERSION
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
-PATCH_LEVEL = 21
+PATCH_LEVEL = 22
 # use to send patches, always empty for released version:
 MY_PATCH_LEVEL = 
 #

diff --git a/mi2mu/mudela-item.cc b/mi2mu/mudela-item.cc
index b21d2acc2fe18f9eb8c983db99c9100fbe2f0f10..b4b1d46b290daec0a48c6e1b73ef57fb30d5913b 100644 (file)
--- a/mi2mu/mudela-item.cc
+++ b/mi2mu/mudela-item.cc
@@ -173,8 +173,6 @@ Mudela_note::duration ()
 Moment
 Mudela_note::duration_mom ()
 {
-// ugh
-//    return Duration_convert::dur2_mom (duration ());
   assert (end_column_l_);
   return end_column_l_->at_mom () - at_mom ();
 }
@@ -210,6 +208,13 @@ Mudela_note::str ()
   if (dur.plet_b ())
        str += String (" \\plet 1/1;");
 
+  /* 
+    note of zero duration is nonsense, 
+    but let's output anyway for convenient debugging
+   */
+  if (!duration_mom ())
+    return String ("\n% ") + str + "\n";
+
   return str + " ";
 }