Translation of MIDI tempo is now the new sytax. Also the annoying
erroneous error message about not being able to translate a numerator
of 1 is fixed.
? scripts/out
Index: ChangeLog
===================================================================
RCS file: /sources/lilypond/lilypond/ChangeLog,v
retrieving revision 1.5342
diff -u -r1.5342 ChangeLog
--- ChangeLog 30 Sep 2006 12:35:37 -0000 1.5342
+++ ChangeLog 30 Sep 2006 14:46:57 -0000
@@ -1,3 +1,17 @@
+2006-09-30 Laura Conrad <[EMAIL PROTECTED]>
+
+ * Fix abc2ly translation of Q: so that it uses new tempo syntax.
+ * Also fixes annoying error message about numerator of 1.
+
+2006-09-30 Laura Conrad <[EMAIL PROTECTED]>
+
+ * abc2ly.py adds segno (S) and Coda (O) to articulations.
+
+2006-09-29 Laura Conrad <[EMAIL PROTECTED]>
+
+ * abc2ly.py fix so that entering " -- " will translate to a -- in
+ the lilypond instead of a " - - "
+
2006-09-30 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lily/align-interface.cc: fix typo
@@ -55,6 +69,7 @@
* lily/source-file.cc (get_line): fix off-by-one error
and clean up some of the logic
+>>>>>>> 1.5342
2006-09-29 Joe Neeman <[EMAIL PROTECTED]>
* lily/page-breaking.cc (make_pages): honour the first-page-number
Index: VERSION
===================================================================
RCS file: /sources/lilypond/lilypond/VERSION,v
retrieving revision 1.713
diff -u -r1.713 VERSION
--- VERSION 27 Sep 2006 09:36:54 -0000 1.713
+++ VERSION 30 Sep 2006 14:46:57 -0000
@@ -2,5 +2,5 @@
MAJOR_VERSION=2
MINOR_VERSION=9
PATCH_LEVEL=20
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=lec3
Index: scripts/abc2ly.py
===================================================================
RCS file: /sources/lilypond/lilypond/scripts/abc2ly.py,v
retrieving revision 1.60
diff -u -r1.60 abc2ly.py
--- scripts/abc2ly.py 19 Sep 2006 13:10:25 -0000 1.60
+++ scripts/abc2ly.py 30 Sep 2006 14:47:01 -0000
@@ -254,13 +254,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)
@@ -617,6 +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 ( '\\\\- ', '-', a) # unless \-
a = re.sub ( '~', '_', a) # ~ to space('_')
a = re.sub ( '\*', '_ ', a) # * to to space
@@ -889,6 +890,8 @@
'~' : '^"~" ',
'J' : '', # ignore slide
'R' : '', # ignore roll
+ 'S' : '^\\segno',
+ 'O' : '^\\coda',
'v' : '^\\downbow'
}
--
Laura (mailto:[EMAIL PROTECTED] , http://www.laymusic.org/ )
(617) 661-8097 fax: (501) 641-5011
233 Broadway, Cambridge, MA 02139
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel
