From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Mon, 8 Dec 2008 21:28:56 +0000 (+0100)
Subject: MusicXML: Implement lyrics extenders
X-Git-Tag: release/2.12.0-1~13^2~27^2~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=413aeab5abbb9ebe01f41154ac6cd49bd806b2fe;p=lilypond.git

MusicXML: Implement lyrics extenders
---

diff --git a/input/regression/musicxml/61a-Lyrics.xml b/input/regression/musicxml/61a-Lyrics.xml
index 81e0d60835..69642ea874 100644
--- a/input/regression/musicxml/61a-Lyrics.xml
+++ b/input/regression/musicxml/61a-Lyrics.xml
@@ -82,7 +82,6 @@
         <lyric number="1">
           <syllabic>single</syllabic>
           <text>Ja!</text>
-          <extend/>
         </lyric>
       </note>
     </measure>
@@ -130,7 +129,6 @@
         <lyric number="1">
           <syllabic>end</syllabic>
           <text>ra!</text>
-          <extend/>
         </lyric>
       </note>
     </measure>
@@ -144,9 +142,6 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
-        <lyric number="1">
-          <extend/>
-        </lyric>
       </note>
       <note>
         <pitch>
@@ -157,9 +152,8 @@
         <voice>1</voice>
         <type>quarter</type>
         <lyric number="1">
-          <syllabic>begin</syllabic>
+          <syllabic>single</syllabic>
           <text>Bah!</text>
-          <extend/>
         </lyric>
       </note>
       <note>
@@ -170,9 +164,6 @@
         <duration>2</duration>
         <voice>1</voice>
         <type>half</type>
-        <lyric number="1">
-          <extend/>
-        </lyric>
       </note>
       <barline location="right">
         <bar-style>light-heavy</bar-style>
diff --git a/input/regression/musicxml/61k-Lyrics-SpannersExtenders.xml b/input/regression/musicxml/61k-Lyrics-SpannersExtenders.xml
new file mode 100644
index 0000000000..95293128d3
--- /dev/null
+++ b/input/regression/musicxml/61k-Lyrics-SpannersExtenders.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Lyrics spanners: continued 
+            syllables and extenders, possibly spanning multiple notes. The 
+            intermediate notes do not have any &lt;lyric&gt; 
+            element.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name print-object="no">MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric justify="left" number="1">
+          <syllabic>single</syllabic>
+          <text>A</text>
+          <extend/>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>begin</syllabic>
+          <text>b</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric justify="left" number="1">
+          <syllabic>end</syllabic>
+          <text>CC</text>
+          <extend/>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric justify="left" number="1">
+          <syllabic>single</syllabic>
+          <text>e</text>
+          <extend/>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/python/musicxml.py b/python/musicxml.py
index 9a918ba6b3..b6a5bbeac8 100644
--- a/python/musicxml.py
+++ b/python/musicxml.py
@@ -539,6 +539,8 @@ class Syllabic (Music_xml_node):
         return (text == "begin") or (text == "middle")
 class Elision (Music_xml_node):
     pass
+class Extend (Music_xml_node):
+    pass
 class Text (Music_xml_node):
     pass
 
@@ -1173,6 +1175,7 @@ class_dict = {
         'direction-type': DirType,
 	'duration': Duration,
         'elision': Elision,
+        'extend': Extend,
         'frame': Frame,
         'frame-note': Frame_Note,
         'figured-bass': FiguredBass,
diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index dca950e8f7..e37702686e 100644
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -1763,6 +1763,7 @@ def musicxml_note_to_lily_main_event (n):
 def musicxml_lyrics_to_text (lyrics):
     # TODO: Implement text styles for lyrics syllables
     continued = False
+    extended = False
     text = ''
     for e in lyrics.get_all_children ():
         if isinstance (e, musicxml.Syllabic):
@@ -1775,15 +1776,24 @@ def musicxml_lyrics_to_text (lyrics):
             if text:
                 text += " "
             continued = False
+            extended = False
+        elif isinstance (e, musicxml.Extend):
+            if text:
+                text += " "
+            extended = True
 
     if text == "-" and continued:
         return "--"
-    elif text == "_" and continued:
+    elif text == "_" and extended:
         return "__"
     elif continued and text:
         return musicxml.escape_ly_output_string (text) + " --"
     elif continued:
         return "--"
+    elif extended and text:
+        return musicxml.escape_ly_output_string (text) + " __"
+    elif extended:
+        return "__"
     elif text:
         return musicxml.escape_ly_output_string (text)
     else: