(LY_DEFINE): add ly:stencil-origin

[lilypond.git] / scripts / etf2ly.py

diff --git a/scripts/etf2ly.py b/scripts/etf2ly.py
index 34a1c9e01860e2aba8d835a20512973af5d97052..599ddfccb3e101befb84745873ad55c940a93ea0 100644 (file)
--- a/scripts/etf2ly.py
+++ b/scripts/etf2ly.py
@@ -26,11 +26,6 @@
 #
 
 
-program_name = 'etf2ly'
-version = '@TOPLEVEL_VERSION@'
-if version == '@' + 'TOPLEVEL_VERSION' + '@':
-       version = '(unknown version)'      # uGUHGUHGHGUGH
-  
 import __main__
 import getopt
 import sys
@@ -38,6 +33,12 @@ import re
 import string
 import os
 
+program_name = sys.argv[0]
+
+version = '@TOPLEVEL_VERSION@'
+if version == '@' + 'TOPLEVEL_VERSION' + '@':
+       version = '(unknown version)'      # uGUHGUHGHGUGH
+  
 finale_clefs= ['treble', 'alto', 'tenor', 'bass', 'percussion', 'treble_8', 'bass_8', 'baritone']
 
 def lily_clef (fin):
@@ -394,7 +395,7 @@ class Verse:
                                str = str + ' ' * 4 + line + '\n'
                                line = ''
                        
-               str = """\nverse%s = \\lyrics {\n %s}\n""" %  (encodeint (self.number - 1) ,str)
+               str = """\nverse%s = \\lyricmode {\n %s}\n""" %  (encodeint (self.number - 1) ,str)
                return str
 
 class KeySignature:
@@ -559,7 +560,7 @@ class Staff:
 
                                        str = string.join (map (lambda x: '(volta %s)' % x, strs))
                                        
-                                       e = e + ' \\property Score.repeatCommands =  #\'(%s) ' % str
+                                       e = e + ' \\set Score.repeatCommands =  #\'(%s) ' % str
 
                                if g.force_break:
                                        e = e + ' \\break '  
@@ -578,7 +579,7 @@ class Staff:
                                if 'stop' in g.repeats:
                                        k = k + ' \\bar ":|" '
                                
-               k = '%sglobal = \\notes  { %s }\n\n ' % (self.staffid (), k)
+               k = '%sglobal = { %s }\n\n ' % (self.staffid (), k)
                return k
        
        def dump (self):
@@ -617,7 +618,7 @@ class Staff:
                                                        % (self.number, m.number))
                        if first_frame:
                                l = self.layerid (x)
-                               laystr = '%s =  \\notes { { %s } }\n\n' % (l, laystr)
+                               laystr = '%s = { { %s } }\n\n' % (l, laystr)
                                str = str  + laystr
                                layerids.append (l)