? 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 13:41:26 -0000
@@ -1,3 +1,12 @@
+2006-09-30  Laura Conrad <address@hidden>
+
+	* abc2ly.py adds segno (S) and Coda (O) to articulations.
+	
+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-30  Han-Wen Nienhuys  <address@hidden>
 
 	* lily/align-interface.cc: fix typo
@@ -55,6 +64,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  <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	30 Sep 2006 13:41:26 -0000
@@ -2,5 +2,5 @@
 MAJOR_VERSION=2
 MINOR_VERSION=9
 PATCH_LEVEL=20
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=lec2
 
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 13:41:29 -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
@@ -889,6 +890,8 @@
     '~' : '^"~" ',
     'J' : '',                # ignore slide
     'R' : '',                # ignore roll
+    'S' : '^\\segno',
+    'O' : '^\\coda',
     'v' : '^\\downbow'
 }