From dfd449236b0a48051c6e59d0f96010ec5ce124a2 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 30 Sep 2006 14:23:17 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 8 ++++++++ VERSION | 2 +- scripts/abc2ly.py | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c6215187e0..6b7d18f509 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-09-30 Laura Conrad + + * 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 * 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 * lily/page-breaking.cc (make_pages): honour the first-page-number diff --git a/VERSION b/VERSION index 2c634f62e5..6d0ebc80c9 100644 --- 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 9b15bfceb0..91067a9e1a 100644 --- 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' } -- 2.39.5