X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/8d95e04bbc4a87d88159dd722260228157afe664..58f8fcfb15531fc052f9cdd02543cafe93428698:/src/songs/musicxmltosong.py?ds=sidebyside

diff --git a/src/songs/musicxmltosong.py b/src/songs/musicxmltosong.py
index 00903a1..39df188 100755
--- a/src/songs/musicxmltosong.py
+++ b/src/songs/musicxmltosong.py
@@ -9,7 +9,7 @@ import sys
 from types import StringTypes
 from xml.dom.minidom import parse
 from optparse import OptionParser
-from Song import Song
+#from Song import Song
 
 # Do4 <=> midi 60
 OCTAVE_REF = 4
@@ -20,6 +20,15 @@ DIATO_SCALE = {'C' : 60,
                'G' : 67,
                'A' : 69,
                'B' : 71}
+
+FR_NOTES = {'C' : u'Do',
+            'D' : u'Ré',
+            'E' : u'Mi',
+            'F' : u'Fa',
+            'G' : u'Sol',
+            'A' : u'La',
+            'B' : u'Si'}
+
 _marker = []
 
 class Part(object) :
@@ -81,13 +90,16 @@ class Part(object) :
     def iterNotes(self) :
         "exécution de la chanson avec l'alternance couplets / refrains"
         for verse in self.verses :
+            print "---partie---"
             repeats = len(verse[0].lyrics)
             if repeats > 1 :
                 for i in range(repeats) :
                     # couplet
+                    print "---couplet%d---" % i
                     for note in verse :
                         yield note, i
                     # refrain
+                    print "---refrain---"
                     for note in self.chorus :
                         yield note, 0
             else :
@@ -96,7 +108,7 @@ class Part(object) :
         
     def pprint(self) :
         for note, verseIndex in self.iterNotes() :
-            print note.name, note.midi, note.duration, note.lyrics[verseIndex]
+            print note.nom, note.name, note.midi, note.duration, note.lyrics[verseIndex]
         
         
 
@@ -136,15 +148,34 @@ class Note(object) :
         name = '%s%s' % (name, abs(self.alter) * alterext)
         return name
     
+    @property
+    def nom(self) :
+        name = FR_NOTES[self.step]
+        if self.alter < 0 :
+            alterext = 'b'
+        else :
+            alterext = '#'
+        name = '%s%s' % (name, abs(self.alter) * alterext)
+        return name
+    
 
 class Lyric(object) :
+    
+    _syllabicModifiers = {
+        'single' : '%s',
+        'begin'  : '%s -',
+        'middle' : '- %s -',
+        'end'    : '- %s'
+        }
+    
     def __init__(self, node) :
         self.node = node
         self.syllabic = _getNodeValue(node, 'syllabic', 'single')
         self.text = _getNodeValue(node, 'text')
     
     def __str__(self) :
-        return self.text.encode('utf-8')
+        text = self._syllabicModifiers[self.syllabic] % self.text
+        return text.encode('utf-8')
     __repr__  = __str__
         
         
@@ -161,7 +192,7 @@ def _getNodeValue(node, path, default=_marker) :
         else :
             return default
 
-def musicXml2Song(input, output, partIndex=0, printNotes=False) :
+def musicXml2Song(input, partIndex=0, printNotes=False) :
     if isinstance(input, StringTypes) :
         input = open(input, 'r')
     
@@ -178,6 +209,9 @@ def musicXml2Song(input, output, partIndex=0, printNotes=False) :
     
     if printNotes :
         part.pprint()
+
+    return part
+
     
     # divisions de la noire
 #    divisions = 0
@@ -214,10 +248,10 @@ def main() :
     
     options, args = op.parse_args()
     
-    if len(args) != 2 :
+    if len(args) != 1 :
         raise SystemExit(op.format_help())
     
-    musicXml2Song(args[0], args[1], partIndex=options.partIndex, printNotes=options.printNotes)
+    musicXml2Song(args[0], partIndex=options.partIndex, printNotes=options.printNotes)