From 5a908dbb39ea475acc9e62b9343f7a655b74b758 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 25 Jul 2004 14:53:23 +0000 Subject: [PATCH] new file. --- ChangeLog | 4 ++++ Documentation/topdocs/NEWS.texi | 7 ++++--- input/test/lyrics-melisma-faster.ly | 4 +++- lily/note-collision.cc | 13 +++++++++++++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e7474d525d..0e0c8693dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-07-25 Han-Wen Nienhuys + * 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 10b5f2ef70..e384ae9879 100644 --- 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 20c6c08e50..ea86ba3efd 100644 --- 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 31d084b31f..ff702b79da 100644 --- 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); } -- 2.39.5