From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 16 Jul 2004 15:00:07 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.3.7~34
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=661868d5a3e37b857f14b792e6639ec8c7914c27;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 193f0e0fe1..fc50d92cdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-07-16  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* scripts/lilypond-book.py (Lilypond_snippet.is_outdated): fix
+	stat calls.
+
 	* Documentation/bibliography/SConscript (bibs): failed try to get
 	bib2html find html-long.bst.
 
diff --git a/lily/new-slur.cc b/lily/new-slur.cc
index 87275b2b2f..fdef450f4f 100644
--- a/lily/new-slur.cc
+++ b/lily/new-slur.cc
@@ -274,9 +274,7 @@ New_slur::set_end_points (Grob *me)
       // c&p
       Grob *stem = Note_column::get_stem (extremes[d]);
       Grob * h = Stem::extremal_heads (stem)[dir];
-     
       Real y;
-
       if (stem
 	&& get_grob_direction (stem) == dir
 	&& Stem::get_beam (stem))
@@ -291,14 +289,17 @@ New_slur::set_end_points (Grob *me)
       y += dir * 0.5 * staff_space;
 
       Grob * staff = Staff_symbol_referencer::get_staff_symbol (h);
-      Real pos = 2.0 * (y - staff->relative_coordinate (common[Y_AXIS], Y_AXIS)) / Staff_symbol::staff_space (staff);
+      Real pos = 2.0 * (y - staff->relative_coordinate (common[Y_AXIS], Y_AXIS))
+	/ Staff_symbol::staff_space (staff);
 
       
-	    /*
-	      start off staffline.
-	    */
+      /*
+	start off staffline.
+      */
       if (fabs (pos - round (pos)) < 0.2
-	  && Staff_symbol_referencer::on_staffline (h, (int) rint (pos)))
+	  && Staff_symbol_referencer::on_staffline (h, (int) rint (pos))
+	  && Staff_symbol_referencer::line_count (h) -1 >= rint (pos)
+	  )
 	    y += staff_space * dir / 10 ;	  
 
       
diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index 96d1dccebb..629d796cee 100644
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -27,11 +27,15 @@ Staff_symbol_referencer::on_staffline (Grob *me)
   return on_staffline (me, (int) rint (get_position (me)));
 }
 
+/*
+  This does not take size into account.
+  maybe rename: on_virtual_staffline, on_staff_or_ledger_line?
+ */
 bool
 Staff_symbol_referencer::on_staffline (Grob *me, int pos)
 {
   int sz = line_count (me) - 1;
-  return ((pos + sz) % 2) == 0 && abs (pos) <= sz;
+  return ((pos + sz) % 2) == 0;
 }
 
 Grob*
diff --git a/mf/feta-din-code.mf b/mf/feta-din-code.mf
index 438b923f4b..4f097510a0 100644
--- a/mf/feta-din-code.mf
+++ b/mf/feta-din-code.mf
@@ -1,4 +1,3 @@
-
 %%
 %
 % TODO: blot diameter should be fixed, not scalable.
@@ -25,7 +24,7 @@ fet_endchar;
 %
 
 code := 121;
-fet_beginchar ("dynamic z", "z", "dynz");
+fet_beginchar ("dynamic z", "z", "z");
  	set_char_box (0, .98 ex#, 0, 0.9 ex#);
 
 	save thin_thick, top_narrow, over_shoot;
@@ -112,7 +111,7 @@ slant_angle = 20;
 
 
 code := 101;
-fet_beginchar("dynamic f", "f", "dynf");
+fet_beginchar("dynamic f", "f", "f");
 	set_char_box (0, 1.1 ex#, descender#, ex# + ascender#);
 
 	save left_angle, right_angle;
@@ -210,7 +209,7 @@ fet_endchar;
 
 
 code := 114;
-fet_beginchar("dynamic s", "s", "dyns");
+fet_beginchar("dynamic s", "s", "s");
 	set_char_box (0, 17/24  ex#, 0, 1 ex#);
 
 	save left_angle, right_angle;
@@ -316,7 +315,7 @@ currenttransform := currenttransform slanted slant;
 code := 111;
 
 
-fet_beginchar("dynamic p", "p", "dynp")
+fet_beginchar("dynamic p", "p", "p")
 	%
 	% TODO w really   is 13/12 ex
 	% but should do kerning
@@ -468,7 +467,7 @@ fet_endchar;
 %
 code := 108;
 
-fet_beginchar("dynamic m", "m", "dynm");
+fet_beginchar("dynamic m", "m", "m");
 	set_char_box (0, 1.5 ex#, 0, 1.0 ex#);
 
 	% should share code with p for twiddle.
@@ -617,7 +616,7 @@ code := 113;
 
 
 currenttransform := identity slanted ypart(dir(15));
-fet_beginchar("dynamic r", "r", "dynr");
+fet_beginchar("dynamic r", "r", "r");
 	set_char_box (0, .75 ex#, 0, 1ex#);