From 8d78730f5e39c66eee5d33a1f2480c2730ec4985 Mon Sep 17 00:00:00 2001
From: Matthias Neeracher <neeri@users.sourceforge.net>
Date: Thu, 6 Sep 2007 00:42:25 +0000
Subject: [PATCH] More MusicXML bug fixes

---
 Filters/VLMusicXMLType.reader |  2 +-
 Filters/VLMusicXMLType.writer | 16 ++++++++++++----
 Resources/Info.plist          |  6 ++++--
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Filters/VLMusicXMLType.reader b/Filters/VLMusicXMLType.reader
index 1d4ff4b..db95d74 100755
--- a/Filters/VLMusicXMLType.reader
+++ b/Filters/VLMusicXMLType.reader
@@ -119,7 +119,7 @@ class MusicXMLListener
       when 'composer' 
         @kind = 'textProp'
         @key  = 'composer'
-      when 'poet' 
+      when 'poet', 'lyricist' 
         @kind = 'textProp'
         @key  = 'lyricist'
       end
diff --git a/Filters/VLMusicXMLType.writer b/Filters/VLMusicXMLType.writer
index ee9c2bd..3f489dd 100755
--- a/Filters/VLMusicXMLType.writer
+++ b/Filters/VLMusicXMLType.writer
@@ -32,7 +32,7 @@ def _identification
     composer.add_attribute('type', 'composer')
   ident.add_element(composer)
     poet = newTextElement('creator', INPUT['lyricist'])
-    poet.add_attribute('type', 'poet')
+    poet.add_attribute('type', 'lyricist')
   ident.add_element(poet)
     encoding = REXML::Element.new('encoding')
     if INPUT['saved']
@@ -109,7 +109,9 @@ def _pitch(name, pitch, prefix="")
   return pitch
 end
 
-def _note(pitch, dur, tied=0)
+TYPE = %w[whole half quarter eighth 16th 32nd]
+
+def _note(pitch, dur, visual, tied)
   note = REXML::Element.new('note')
   if pitch == VL::NoPitch
     note.add_element(REXML::Element.new('rest'))
@@ -127,6 +129,7 @@ def _note(pitch, dur, tied=0)
     note.add_element 'tie', {'type' => 'start' }
   end
   note.add_element newTextElement('voice', 1)
+  note.add_element newTextElement('type', TYPE[visual & 7]) 
 
   return note
 end
@@ -221,12 +224,17 @@ def _chord(pitch, steps, root)
     best = 0
     kind = 'none'
     CHORD.each do |k,mask|
+      extra = mask & ~steps
       mask &= steps
       score = 0
       while mask > 0
-        score += 1
+        score += 10
         mask  &= mask-1
       end
+      while extra > 0
+        score -= 1
+        extra &= extra-1
+      end
       if score > best
         kind = k
         best = score
@@ -357,7 +365,7 @@ def _melody
         m.add_element(bk)
         tempAt = noteAt        
       end
-      n   = _note(note['pitch'], dur, note['tied'] || 0)
+      n   = _note(note['pitch'], dur, note['visual'], note['tied'] || 0)
       stanza = 1
       note['lyrics'].each do |syll|
         if syll['text']
diff --git a/Resources/Info.plist b/Resources/Info.plist
index b5e90be..ab316d0 100644
--- a/Resources/Info.plist
+++ b/Resources/Info.plist
@@ -47,9 +47,11 @@
 				<string>TEXT</string>
 			</array>
 			<key>CFBundleTypeRole</key>
-			<string>None</string>
+			<string>Viewer</string>
 			<key>LSTypeIsPackage</key>
 			<false/>
+			<key>NSDocumentClass</key>
+			<string>VLDocument</string>
 			<key>NSPersistentStoreTypeKey</key>
 			<string>Binary</string>
 		</dict>
@@ -65,7 +67,7 @@
 			<key>CFBundleTypeName</key>
 			<string>VLMusicXMLType</string>
 			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
+			<string>Viewer</string>
 			<key>LSTypeIsPackage</key>
 			<false/>
 			<key>NSDocumentClass</key>