>>>>> "Han-Wen" == Han-Wen Nienhuys <[EMAIL PROTECTED]> writes:
Han-Wen> can you send a patch that actually applies ?
This one works for me:
? scripts/myabc2ly.py
? scripts/out
? scripts/test.diff
Index: ChangeLog
===================================================================
RCS file: /sources/lilypond/lilypond/ChangeLog,v
retrieving revision 1.5544
diff -u -r1.5544 ChangeLog
--- ChangeLog 3 Nov 2006 15:59:51 -0000 1.5544
+++ ChangeLog 3 Nov 2006 16:06:57 -0000
@@ -1,3 +1,8 @@
+2006-11-03 Laura Conrad <[EMAIL PROTECTED]>
+
+ * abc2ly new tempo syntax
+
+
2006-11-03 Nicolas Sceaux <[EMAIL PROTECTED]>
* scm/display-lily.scm: add a parser argument to display methods,
Index: VERSION
===================================================================
RCS file: /sources/lilypond/lilypond/VERSION,v
retrieving revision 1.723
diff -u -r1.723 VERSION
--- VERSION 28 Oct 2006 22:59:16 -0000 1.723
+++ VERSION 3 Nov 2006 16:06:57 -0000
@@ -2,5 +2,6 @@
MAJOR_VERSION=2
MINOR_VERSION=9
PATCH_LEVEL=28
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=lec1
+
Index: scripts/abc2ly.py
===================================================================
RCS file: /sources/lilypond/lilypond/scripts/abc2ly.py,v
retrieving revision 1.61
diff -u -r1.61 abc2ly.py
--- scripts/abc2ly.py 30 Sep 2006 14:23:17 -0000 1.61
+++ scripts/abc2ly.py 3 Nov 2006 16:07:01 -0000
@@ -33,6 +33,7 @@
# %%LY now supported.
# \breve and \longa supported.
# M:none doesn't crash lily.
+# lilypond '--' supported.
# Enhancements (Guy Gascoigne-Piggford)
#
@@ -254,13 +255,13 @@
if string.count(a, '/') == 1:
array=string.split(a,'/')
numerator=array[0]
- if numerator != 1:
+ if int(numerator) != 1:
sys.stderr.write("abc2ly: Warning, unable to translate a Q
specification with a numerator of %s: %s\n" % (numerator, a))
array2=string.split(array[1],'=')
denominator=array2[0]
perminute=array2[1]
duration=str(string.atoi(denominator)/string.atoi(numerator))
- midi_specs=string.join(["\\tempo", duration, "=", perminute])
+ midi_specs=string.join([" \n\t\t\context {\n\t\t \Score
tempoWholesPerMinute = #(ly:make-moment ", perminute, " ", duration, ")\n\t\t
}\n"])
else:
sys.stderr.write("abc2ly: Warning, unable to parse Q specification:
%s\n" % a)
@@ -616,8 +617,7 @@
def slyrics_append(a):
a = re.sub ( '_', ' _ ', a) # _ to ' _ '
- a = re.sub ( '-', '- ', a) # split words with -
- a = re.sub ( ' - - ', ' -- ', a) # unless was originally " -- "
+ a = re.sub ( '([^-])-([^-])', '\\1- \\2', a) # split words with "-"
unless was originally "--"
a = re.sub ( '\\\\- ', '-', a) # unless \-
a = re.sub ( '~', '_', a) # ~ to space('_')
a = re.sub ( '\*', '_ ', a) # * to to space
--
Laura (mailto:[EMAIL PROTECTED] , http://www.laymusic.org/ )
(617) 661-8097 fax: (501) 641-5011
233 Broadway, Cambridge, MA 02139
_______________________________________________
lilypond-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-devel
