lilypond-1.3.74

diff --git a/input/test/lyric-phrasing.ly b/input/test/lyric-phrasing.ly
new file mode 100644 (file)
index 0000000..2edfa2d
--- /dev/null
+++ b/input/test/lyric-phrasing.ly
@@ -0,0 +1,48 @@
+\header{
+filename =      "twinkle-pop.ly";
+%title =        "Ah, vous dirais-je, maman ";
+description =   "twinkle twinkle in pop-song-settings";
+composer =      "traditional";
+enteredby =     "HWN, chords by Johan Vromans";
+copyright =     "public domain";
+}
+
+\version "1.3.59";
+
+m =\notes  \relative c'' {
+       \property Staff.automaticMelismata = ##t
+       \autoBeamOff
+       g4  r8 \times 2/3 { g'8( f )e } r8 \grace { [d16 c b] } e4
+       \emptyText
+       d8.^"melisma"   \melisma c16
+       \melismaEnd
+       b c d e }
+
+textI =  \lyrics  { la4 __ la -- la  I, la dargh la dargh.  }
+textII =  \lyrics  { dar -- dargh __ dargh dargh; dargh la dargh loo.  }
+textIII =  \lyrics  { la -- da __ doo dah; dargh la dargh loo.  }
+
+\score {
+
+    \notes < \context Staff = SA \context Voice = VA { s1 }
+      \context LyricVoice = "VA-1" { s1 }
+      \context LyricVoice = "VA-2" { s1 }
+      
+      \addlyrics
+         \context Staff = SA \m
+         < \context LyricVoice = "VA-1" \textI
+           \context LyricVoice = "VA-2" \textII
+           \context LyricVoice = "VA-3" \textIII
+         >
+         
+    >
+
+  \paper {
+    \translator {
+      \ScoreContext
+      \consists "Lyric_phrasing_engraver";
+      automaticPhrasing = ##t;
+    }
+  }
+
+}
\ No newline at end of file

diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh
index b63843e6d16dd874916dc323b4e2b7820cfbf607..d0de6ff36ba6834d7bd273dc8f3e07ba00b77b3f 100644 (file)
--- a/lily/include/lily-proto.hh
+++ b/lily/include/lily-proto.hh
@@ -84,6 +84,7 @@ class Lyric_combine_music;
 class Lyric_combine_music_iterator;
 class Lyric_engraver;
 class Lyric_performer;
+class Lyric_phrasing_engraver;
 class Lyric_req;
 class Mark_req;
 class Melisma_playing_req;

diff --git a/ly/engraver.ly b/ly/engraver.ly
index b9bbb9fb10fda06d00ff5dca7f1db55d836e45a0..d189cae32a9bc7e85f09a53db4278fe9f280d7ec 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -264,13 +264,15 @@ StaffGroupContext= \translator {
 LyricsVoiceContext= \translator{
        \type "Engraver_group_engraver";
        \consistsend "Axis_group_engraver";
-       LyricVoiceMinimumVerticalExtent = #(cons -2.5 2.5)
+       LyricVoiceMinimumVerticalExtent = #(cons -1.2 1.2)
 
        \name LyricVoice ;
        \consists "Separating_line_group_engraver";
        \consists "Lyric_engraver";
        \consists "Extender_engraver";
        \consists "Hyphen_engraver";
+
+       phrasingPunctuation = #".,;:!?"
 };
 \translator{ \LyricsVoiceContext }
 
@@ -376,6 +378,10 @@ ScoreContext = \translator {
        \consists "Spacing_engraver";
 
        \consists "Vertical_align_engraver";
+
+       \consists "Lyric_phrasing_engraver";
+        automaticPhrasing = ##f;
+
        \consists "Bar_number_engraver";
        alignmentReference = \down;
        defaultClef = #"treble"
@@ -536,7 +542,7 @@ ScoreContext = \translator {
                (molecule-callback . ,Text_item::brew_molecule)
                (self-alignment-X . 0)
                (non-rhythmic . #t)
-               (interfaces .  (text-item-interface))
+               (interfaces .  (lyric-syllable-interface text-item-interface))
        )
        basicMarkProperties = #`(
          (molecule-callback . ,Text_item::brew_molecule)