* lily/slur.cc: remove slur over rest warnings.

* lily/note-spacing.cc (get_spacing): include left part of right
object in fixed space. This fixes stretched space before
accidentals.

diff --git a/ChangeLog b/ChangeLog
index 349994c73a48105307d4cd2d6a8d447d163b3710..d85873081c5aef8c61d5e8d41034c35561975bc7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-06-16  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * lily/slur.cc: remove slur over rest warnings.
+
        * lily/note-spacing.cc (get_spacing): include left part of right
        object in fixed space. This fixes stretched space before
        accidentals.

diff --git a/input/regression/spacing-clef-first-note.ly b/input/regression/spacing-clef-first-note.ly
index 84f8c1a86d1ab9a58b1c77d8b0cb6767751bf2d3..23e1e892ad6b3e540c2f9b3de8c880f1a010c745 100644 (file)
--- a/input/regression/spacing-clef-first-note.ly
+++ b/input/regression/spacing-clef-first-note.ly
@@ -6,14 +6,14 @@ than clef changes halfway the line."
 
 }
 
-\score  {\notes {
+\score  {\notes  {
     < \context Staff = SA {
-       c2
+       c'2
        \clef bass e16 f a
        \clef treble b
        }
       \context Staff = SB  {
-         c4 c4 c4 
+         c'4 c'4 c'4 
       }>
     }
     \paper { raggedright = ##t

diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly
index 27e85a5eed91f3797d7fe6fe71e6614e5a049097..7f9e36527a29b07fcae92fa45d8803c4d904875a 100644 (file)
--- a/input/regression/spacing-note-flags.ly
+++ b/input/regression/spacing-note-flags.ly
@@ -8,7 +8,8 @@ texidoc = "The flags of 8th notes take some space, but not
 
 \score { \notes \relative c'' \context Staff {
     \property Voice.autoBeaming = ##f
-     a8-[ a8 a8 a8] a8 a8 a8 a8
+    a8-[ a8 a8 a8]
+    a8 a8 a8 a8
 }
 \paper {
 %stafflinethickness = 0.0

diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc
index e37f4ff68c244cf5d1093682e4c565e2e472aec0..664588ebc7945978988b953d010b396b73e9df1c 100644 (file)
--- a/lily/note-spacing.cc
+++ b/lily/note-spacing.cc
@@ -108,7 +108,20 @@ Note_spacing::get_spacing (Grob *me, Item* right_col,
     FIXED also includes the left part of the right object.
   */
   *fixed =
-    (left_head_wid.empty_b () ? increment : left_head_wid[RIGHT])
+    (left_head_wid.empty_b () ? increment :
+     /*
+       Size of the head:
+      */
+     (left_head_wid[RIGHT]+
+
+      /*
+       What's sticking out of the head, eg. a flag: 
+      */
+      (extents[LEFT][RIGHT] - left_head_wid[RIGHT])/2))
+
+    /*
+      What is sticking out of the right note:
+     */
     + (extents[RIGHT].empty_b() ?  0.0 : - extents[RIGHT][LEFT] / 2);
 
   /*

diff --git a/lily/slur.cc b/lily/slur.cc
index 4f71cc62a33add572e182748f1e4f3a84ac45794..eba766cc31666bb142456bc9709657186979c22a 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -49,9 +49,6 @@ Slur::set_interface (Grob*me)
 void
 Slur::add_column (Grob*me, Grob*n)
 {
-  if (!gh_pair_p (n->get_grob_property ("note-heads")))
-    me->warning (_ ("Putting slur over rest."));
-
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-columns"), n);
   me->add_dependency (n);
 
@@ -421,7 +418,7 @@ Slur::encompass_offset (Grob*me,
   
   if (!stem)
     {
-      me->warning (_ ("Slur over rest?"));
+      programming_error ("No stem for note column?");
       o[X_AXIS] = col->relative_coordinate (common[X_AXIS], X_AXIS);
       o[Y_AXIS] = col->relative_coordinate (common[Y_AXIS], Y_AXIS);
       return o;