new file.

diff --git a/ChangeLog b/ChangeLog
index e7474d525db3a6c4be81308e753e2d804af5dbb1..0e0c8693dd96301d9d3629a0b19444857d4f6bbb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-07-25  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * input/test/lyrics-melisma-variants.ly (texidoc): new file.
+
+       * input/test/lyrics-melisma-faster.ly: new file.
+
        * lily/new-lyric-combine-music-iterator.cc (find_voice): allow
        change of melody by setting associatedVoice.
 

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index 10b5f2ef70226f368fc3d35a16afc246e817cb72..e384ae98794f5c3f617aa4e5f615cbb85f11bd04 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -21,7 +21,8 @@ a grouping object, composed of @code{AmbitusLine},
 @code{AmbitusAccidental} and @code{AmbitusNoteHead}. These objects may
 be tuned similar to accidentals and note heads.
 
-@item Ledger lines are now shortened to prevent them from colliding.
+@item Ledger lines are now shortened when the spacing is tight. This
+prevents ledger lines from colliding with each other.
 
 @item Slur formatting has been rewritten. The new slur code
 works similar to the Beam formatter: scores are assigned for all
@@ -31,8 +32,8 @@ account collisions with staff lines, scripts (like staccato and
 accent) and accidentals.
 
 
-@item In the LilyPond  emacs mode, the @code{|} will now display the
-  current beat within the measure. 
+@item In the LilyPond  emacs mode, entering @code{|} will  display the
+  current beat within the measure.
 
 @item Colliding notes are now correctly aligned relative to notes in other staves.
 

diff --git a/input/test/lyrics-melisma-faster.ly b/input/test/lyrics-melisma-faster.ly
index 20c6c08e50b260edf7550587d68c02757b2c12eb..ea86ba3efd0ef4657b02c363a56f6f0a87fb1312 100644 (file)
--- a/input/test/lyrics-melisma-faster.ly
+++ b/input/test/lyrics-melisma-faster.ly
@@ -19,13 +19,15 @@ must be set  a syllable too soon."
        c4
        \slurDotted
        f8.[( g16])
+       a4
     }
     \new Lyrics \lyricsto "lahlah" {
-       slo -- ow
+       more slow -- ly
     }
     \new Lyrics \lyricsto "lahlah" {
        \set ignoreMelismata = ##t % applies to "fas"
        go fas -- ter
        \unset ignoreMelismata
+       still
     }
 >>    

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index 31d084b31ffc153bb6607a45b7692e509a59b5ff..ff702b79daf9ddf3e6ac1f35e49a45dd3f62a1c0 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -268,6 +268,19 @@ check_meshing_chords (Grob *me,
     {
       Grob *d = unsmob_grob (nd->get_property ("dot"));
       Grob *parent = d->get_parent (X_AXIS);
+
+
+      /*
+       FIXME:
+        
+              |
+        x . o
+       |
+
+       
+       the . is put right of o which is erroneous o force-shifted
+       far to the right.
+      */
       if (Dot_column::has_interface (parent))
        Side_position_interface::add_support (parent, nu);
     }