From 6b3b6993bbcec6989ba36ba72853ec3c5dd255e1 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Thu, 21 Feb 2008 20:03:04 +0100
Subject: [PATCH] MusicXML: Add a way to implement compatibility modes, ignore
 beams for Sibelius

---
 .../musicxml/99a-Sibelius5-IgnoreBeaming.xml  | Bin 0 -> 5218 bytes
 python/musicexp.py                            |   1 -
 python/musicxml.py                            |  10 +++++++++
 scripts/musicxml2ly.py                        |  21 +++++++++++++++++-
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 input/regression/musicxml/99a-Sibelius5-IgnoreBeaming.xml

diff --git a/input/regression/musicxml/99a-Sibelius5-IgnoreBeaming.xml b/input/regression/musicxml/99a-Sibelius5-IgnoreBeaming.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e0a922d0a8f786170a64e964ec1065cba7939f03
GIT binary patch
literal 5218
zcmeHLU2hUW6uqxC@jt9jJOOQ~pV_WSZEH-bHfj@nM7B^A7Q#ZYe_lQ3PNy@oyA&i<
zd1wgTW$vAGzs|k0+h0Fpc_}|+C<BS)QqE-}x%6cune0nVcBCQOxJHm<(!qKPX(m0D
zp2;UUmO8Yas7@|ZX+xUg??5rmRWHMR4R#WFC=Vo-M{+3d<rQ{+kyAMWdal?LSgFex
zyC*=J!%~iw2s&qSASdz$dm<p!rHRi6$mr2T?Qt(x4}p3Jt+z7MNILQv_a|6kEIW!8
z;&a!LyweD3askUz`0zr}=I~;UeZw0xldFc>?LjAnb_z?)lHZMMS?wn7+oP<`{to;y
zdD}wfhOkS$A-)+b*YWM+JHYP*`RQSm8DZAG;%^(8re2X=BkAHw?Hn3iXpW!}A!8$5
zo#MWw5~4)%5!%EV;L3c)i1T(ISYdkFNA$+WzS``-7y3$O*?6c|<du_AnnS;feRJgm
zV=Q_U$z!c6Ju7P)Z?@E<vNVjkA$v<AFC&EbGjL!GkI7!<mw9uwVn4OP*p8PQ_6fUd
zDp%O)cT3aDlF7t!^eHT}|8n($y|Wyfd0SKi%2ugkthMgK_6+ebcISNzUrfK%l|`Hp
zuEwme>0!U~$<<UR$0<72@!!<Z;blN(CnT5<#s<5bURUYZS{bI4ty-_b{bauLnX{{o
z&;CFE(5my$#<w_AoE7Z<95pfXAj92IyLqCyEoYV;N)EB-XSm~(ur`@{@{sfYQgdQ@
znHo<q|DS2ztE4vXX8(7fUKLP@%ell(zfhaoiWaW<INZTG#2J&|t}WlR?^rvx?(d+a
z%61H!ee5BQuTKkRf|Ab(rXmsil||Z|$)=kVOcZ~YFY$L%r`n4c-N6~st?-WLH0OOH
zuhokC?PD_zayZincU9B<_BH86l{Ky}V@3@85n|xElOlT4nSJ2p$~E#M>|^>hhF??Y
zTvSF!v@s+{*U{PEzRyG%0fEmQJQou%k^Y8j{tikP*(JN#E&fUM{2H+=2~jU$lkw6A
zGlTq<P}lLJCA-K~sy@5bP}`p45j3khn3Igp0<7^2_8Fnw6LQ)znkRk{Ygg;TeLY25
z52f`7D26dE*Tq@G+UDRcD-xcN<~ft6EYG)MB%EvR{IPSZ2|Y4&kv+z1IqYX`8M9lZ
z6KZv4A8V}`jbXZ9ccSp=fU?OAr~H+ocF6hrK3I>zrVs9>r%X4jinT5S_i+BMJ6r9^
zanHa_o5ZWKhI7JB`|>Q@d<GsYnSu9H?e0$Z|G_Ep^Y)Y1ycaA!=|^~8``hO{XK(nv
aWS#*w<$ce+(Qb}k%vsgjyZyhN@$@(M4cRFG

literal 0
HcmV?d00001

diff --git a/python/musicexp.py b/python/musicexp.py
index b266830d07..1596cd392b 100644
--- a/python/musicexp.py
+++ b/python/musicexp.py
@@ -835,7 +835,6 @@ class BracketSpannerEvent (SpanEvent):
             1:'\\stopGroup'}.get (self.span_direction, '')
 
 
-# type==-1 means octave up, type==-2 means octave down
 class OctaveShiftEvent (SpanEvent):
     def wait_for_note (self):
         return False
diff --git a/python/musicxml.py b/python/musicxml.py
index 9d6fa054db..f028cce8a3 100644
--- a/python/musicxml.py
+++ b/python/musicxml.py
@@ -179,6 +179,16 @@ class Identification (Xml_node):
         return self.get_encoding_information ('encoder')
     def get_encoding_description (self):
         return self.get_encoding_information ('encoding-description')
+    
+    def get_encoding_software_list (self):
+        enc = self.get_named_children ('encoding')
+        software = []
+        for e in enc:
+            softwares = e.get_named_children ('software')
+            for s in softwares:
+                software.append (s.get_text ())
+        return software
+
 
 
 class Duration (Music_xml_node):
diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index 2e22f8e76c..5e791abf44 100644
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -24,6 +24,12 @@ from rational import Rational
 # Store command-line options in a global variable, so we can access them everythwere
 options = None
 
+class Conversion_Settings:
+    def __init__(self):
+       self.ignore_beaming = False
+
+conversion_settings = Conversion_Settings ()
+
 def progress (str):
     ly.stderr_write (str + '\n')
     sys.stderr.flush ()
@@ -177,6 +183,19 @@ def extract_score_information (tree):
         set_if_exists ('encoder', ids.get_encoding_person ())
         set_if_exists ('encodingdescription', ids.get_encoding_description ())
 
+        # Finally, apply the required compatibility modes
+        # Some applications created wrong MusicXML files, so we need to 
+        # apply some compatibility mode, e.g. ignoring some features/tags
+        # in those files
+        software = ids.get_encoding_software_list ()
+        global conversion_settings
+
+        # Case 1: "Sibelius 5.1" with the "Dolet 3.4 for Sibelius" plugin
+        #         is missing all beam ends => ignore all beaming information
+        if "Dolet 3.4 for Sibelius" in software:
+            conversion_settings.ignore_beaming = True
+        # TODO: Check for other unsupported features
+
     return header
 
 class PartGroupInfo:
@@ -1675,7 +1694,7 @@ def musicxml_voice_to_lily_voice (voice):
         mxl_beams = [b for b in n.get_named_children ('beam')
                      if (b.get_type () in ('begin', 'end')
                          and b.is_primary ())] 
-        if mxl_beams:
+        if mxl_beams and not conversion_settings.ignore_beaming:
             beam_ev = musicxml_spanner_to_lily_event (mxl_beams[0])
             if beam_ev:
                 ev_chord.append (beam_ev)
-- 
2.39.2