From 442adc89121785181eb90f87b2cd7e64d72d3c31 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 20:01:49 +0000
Subject: [PATCH] lilypond-0.1.32

---
 mf/feta-eindelijk.mf | 21 +++------------------
 mf/feta-macros.mf    | 40 ++++++++++++++++++++++++++++++++++++++++
 mf/feta-nummer.mf    | 18 ------------------
 mi2mu/VERSION        |  2 +-
 mi2mu/mudela-item.cc |  9 +++++++--
 5 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf
index bdad5b6ea1..51d35462aa 100644
--- 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 d7708f7932..c03e97c7b0 100644
--- 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 fb1bb559e5..496015828e 100644
--- 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 4ecc91f7f8..361ecac436 100644
--- 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 b21d2acc2f..b4b1d46b29 100644
--- 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 + " ";
 }
 
-- 
2.39.5