From c1557ff78151d5ecd06b9ab110c4d1c62eb15032 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 23:24:59 +0000
Subject: [PATCH] lilypond-1.3.74

---
 input/test/lyric-phrasing.ly | 48 ++++++++++++++++++++++++++++++++++++
 lily/include/lily-proto.hh   |  1 +
 ly/engraver.ly               | 10 ++++++--
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 input/test/lyric-phrasing.ly

diff --git a/input/test/lyric-phrasing.ly b/input/test/lyric-phrasing.ly
new file mode 100644
index 0000000000..2edfa2dbeb
--- /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 b63843e6d1..d0de6ff36b 100644
--- 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 b9bbb9fb10..d189cae32a 100644
--- 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)	
-- 
2.39.5