Oops use [\]proper[ty] 2.2 syntax.

diff --git a/ChangeLog b/ChangeLog
index 734a6fb249cf39e4aaaf30e03d247ed686978334..6c7f4b279c55b009aa3dae3fac011e07d896b758 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-20  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scripts/abc2ly.py: Oops use [\]proper[ty] 2.2 syntax.
+
 2004-04-19  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scripts/abc2ly.py: ABC beams preserve support (courtesy Guy

diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index 943cc94b3b821e64192db3c27a9fb34395f961c4..2e6181b16637760589d8e4ec854ef45e3fba6800 100644 (file)
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -163,10 +163,14 @@ def select_voice (name, rol):
                                        check_clef(value)
                                elif keyword == "name":
                                        value = re.sub ('\\\\','\\\\\\\\', value)
-                                       voices_append ("\\property Staff.instrument = %s\n" % value )
+                                       ## < 2.2
+                                       ##voices_append ("\\property Staff.instrument = %s\n" % value )
+                                       voices_append ("\\set Staff.instrument = %s\n" % value )
+                                       
                                        __main__.part_names = 1
                                elif keyword == "sname" or keyword == "snm":
-                                       voices_append ("\\property Staff.instr = %s\n" % value )
+                                       ##voices_append ("\\property Staff.instr = %s\n" % value )
+                                       voices_append ("\\set Staff.instr = %s\n" % value )
                else:
                        break
 
@@ -191,7 +195,9 @@ def dump_default_bar (outf):
        """
        Nowadays abc2ly outputs explicits barlines (?)
        """
-       outf.write ("\n\\property Score.defaultBarType=\"empty\"\n")
+       ## < 2.2
+       ##outf.write ("\n\\property Score.defaultBarType = \"empty\"\n")
+       outf.write ("\n\\set Score.defaultBarType = \"empty\"\n")
 
 
 def dump_slyrics (outf):