*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index c6215187e0b03d42ba20fdbf5e7a2a7e23ea442d..6b7d18f5092006a49e8cfdaf6638a608ba49fd51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-30  Laura Conrad <lconrad@laymusic.org>
+
+       * abc2ly.py adds segno (S) and Coda (O) to articulations.
+       
+       * abc2ly.py fix so that entering " -- " will translate to a -- in
+       the lilypond instead of a " - - "
+       
 2006-09-30  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * lily/align-interface.cc: fix typo
@@ -55,6 +62,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  <joeneeman@gmail.com>
 
        * lily/page-breaking.cc (make_pages): honour the first-page-number

diff --git a/VERSION b/VERSION
index 2c634f62e5c5a6930b2f2b86eb1a223fe10da891..6d0ebc80c9b8b47b4ce7f3f6dd88966a1bf63c6a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,5 +2,5 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=9
 PATCH_LEVEL=20
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=lec2
 

diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index 9b15bfceb0e2d2d1971149ec04f14100300d11db..91067a9e1a052c5a69841ac89ef2bb76561bf43f 100644 (file)
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -617,6 +617,7 @@ def fix_lyric(str):
 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 @@ artic_tbl = {
     '~' : '^"~" ',
     'J' : '',                # ignore slide
     'R' : '',                # ignore roll
+    'S' : '^\\segno',
+    'O' : '^\\coda',
     'v' : '^\\downbow'
 }