? scripts/out
Index: ChangeLog
===================================================================
RCS file: /sources/lilypond/lilypond/ChangeLog,v
retrieving revision 1.5335
diff -u -r1.5335 ChangeLog
--- ChangeLog	28 Sep 2006 22:40:05 -0000	1.5335
+++ ChangeLog	29 Sep 2006 15:23:10 -0000
@@ -1,3 +1,8 @@
+2006-09-29  Laura Conrad <address@hidden>
+
+	* abc2ly.py fix so that entering " -- " will translate to a -- in
+	the lilypond instead of a " - - "
+	
 2006-09-29  Joe Neeman  <address@hidden>
 
 	* 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	29 Sep 2006 15:23:10 -0000
@@ -2,5 +2,5 @@
 MAJOR_VERSION=2
 MINOR_VERSION=9
 PATCH_LEVEL=20
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=lec1
 
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	29 Sep 2006 15:23:13 -0000
@@ -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