From 789c6e6b0452e2201f299d893573b9ec8b960fe3 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 26 Aug 2003 08:57:04 +0000 Subject: [PATCH] * scripts/convert-ly.py (conv): dashes rule. * Documentation/user/lilypond-book.itely: syntax fixes. --- ChangeLog | 6 ++++++ Documentation/user/lilypond-book.itely | 12 ++++++------ Documentation/user/refman.itely | 5 +++-- VERSION | 2 +- input/regression/GNUmakefile | 8 ++++++++ input/template/melody-chords.ly | 3 +-- input/test/rhythm-excercise.ly | 2 +- lily/auto-beam-engraver.cc | 8 ++------ scripts/convert-ly.py | 14 ++++++++++++++ 9 files changed, 42 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3608606716..cd66ccd1bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-08-26 Han-Wen Nienhuys + + * scripts/convert-ly.py (conv): dashes rule. + + * Documentation/user/lilypond-book.itely: syntax fixes. + 2003-08-25 Han-Wen Nienhuys * VERSION (PACKAGE_NAME): release 1.9.0 diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely index c05b68b256..0291645ee0 100644 --- a/Documentation/user/lilypond-book.itely +++ b/Documentation/user/lilypond-book.itely @@ -257,23 +257,23 @@ of the code is used. @item 11pt @lilypond[11pt, eps] \relative c' { - r16 [c d e][f d e c] [g'8 c][b-\prall c] | - [d16 g, a b][c a b g][d'8 g f-\prall g] + r16 c[ d e] f[ d e c] g'8[ c] b[\prall c] | + d16[ g, a b] c[ a b g] d'8[ g f\prall g] } @end lilypond @item 13pt @lilypond[13pt, eps] \relative c' { - r16 [c d e][f d e c] [g'8 c][b-\prall c] | - [d16 g, a b][c a b g][d'8 g f-\prall g] + r16 c[ d e] f[ d e c] g'8[ c] b[\prall c] | + d16[ g, a b] c[ a b g] d'8[ g f\prall g] } @end lilypond @item 16pt @lilypond[16pt, eps] \relative c' { - r16 [c d e][f d e c] [g'8 c][b-\prall c] | + r16 c[ d e] f[ d e c] g'8[ c] b[\prall c] | } @end lilypond @@ -287,7 +287,7 @@ of the code is used. @item 26pt @lilypond[26pt, eps] \relative c' { - r16 [c d e][f d e c] [g'8 c][b-\prall c] | + r16 c[ d e] f[ d e c] g'8[ c] b[\prall c] | } @end lilypond diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 87f7cc0584..5a3fae2142 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -2155,8 +2155,9 @@ longer be computed. Grace notes are ornaments that are written out, like accaciatura and appogiatura notes. -@lilypond[relative=2,verbatim,fragment] c4 \grace c16 c4 \grace { -[c16 d16] } c4 +@lilypond[relative=2,verbatim,fragment] +c4 \grace c16 c4 \grace { +c16[ d16] } c4 @end lilypond From the point of view of typesetting, their characteristic is that diff --git a/VERSION b/VERSION index 8eb53d816d..d148e35d90 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=9 -PATCH_LEVEL=0 +PATCH_LEVEL=1 MY_PATCH_LEVEL= # Use the above to send patches: MY_PATCH_LEVEL is always empty for a diff --git a/input/regression/GNUmakefile b/input/regression/GNUmakefile index 036407306c..a7e07b3f60 100644 --- a/input/regression/GNUmakefile +++ b/input/regression/GNUmakefile @@ -9,3 +9,11 @@ include $(depth)/make/stepmake.make TITLE=LilyPond Regression Tests +local-clean: local-delete + +# have to do it in 2 steps to prevent +# argument-list too long. +local-delete: + rm -f $(outdir)/lily-1* + rm -f $(outdir)/* + diff --git a/input/template/melody-chords.ly b/input/template/melody-chords.ly index 91b218a098..f5039ef23e 100644 --- a/input/template/melody-chords.ly +++ b/input/template/melody-chords.ly @@ -1,4 +1,3 @@ -#(ly:set-option 'old-relative) \version "1.9.0" \header { @@ -10,7 +9,7 @@ harmonies = \chords { } melody = \notes \relative c' { - f4 [e8 c] d4 g | a2 ~ a2 + f4 e8[ c] d4 g | a2 ~ a2 } \score { diff --git a/input/test/rhythm-excercise.ly b/input/test/rhythm-excercise.ly index cddbd6b0fb..5ebd3647aa 100644 --- a/input/test/rhythm-excercise.ly +++ b/input/test/rhythm-excercise.ly @@ -4,7 +4,7 @@ This example shows a way to generate rhythm exercises with LilyPond (e.g. no staff but retaining the barlines). " } -\score { \notes { c4 c4 [ c8 c8 ] c2 c2 } +\score { \notes { c4 c4 c8[ c8] c2 c2 } \paper { \translator { \StaffContext diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 2a05a239fb..9a816a42ab 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -481,12 +481,8 @@ Auto_beam_engraver::process_acknowledged_grobs () } } } - - /* - count_++ -> - - auto-beam-engraver.cc:459: warning: value computed is not used (gcc: 2.96) */ - count_ = count_ + 1; + + count_ ++; } ENTER_DESCRIPTION (Auto_beam_engraver, diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 749b42b6b0..519be984fa 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -1405,6 +1405,20 @@ if 1: conversions.append (((1,9,0), conv, """New relative mode, Postfix articulations, new chord syntax.""")) +def conv (str): + + str = re.sub ('-\\markup', '@\\markup', str) + str = re.sub (r'-\\', r'\\', str) + str = re.sub (r'-\)', ')', str) + str = re.sub (r'-\(', '(', str) + str = re.sub ('-\[', '[', str) + str = re.sub ('-\]', ']', str) + str = re.sub ('-~', '~', str) + str = re.sub ('@\\markup', r'-\\markup', str) + return str + +conversions.append (((1,9,1), conv, """Remove - before articulation""")) + ################################ # END OF CONVERSIONS ################################ -- 2.39.5