* scripts/convert-ly.py (conv): dashes rule.

* Documentation/user/lilypond-book.itely: syntax fixes.

diff --git a/ChangeLog b/ChangeLog
index 36086067166d72991bda528fb0c496c7301b13e1..cd66ccd1bd1d1487a5cf4ae140fa5ad476ff5908 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-26  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * scripts/convert-ly.py (conv): dashes rule.
+
+       * Documentation/user/lilypond-book.itely: syntax fixes. 
+
 2003-08-25  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * VERSION (PACKAGE_NAME): release 1.9.0

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index c05b68b256062e0e667b6a56d93194fc8b8285ec..0291645ee0482dc329ee0a88d1cf389910ae6927 100644 (file)
--- 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 87f7cc0584268f27a37bdb48b4c23f9a180b13b7..5a3fae21422eaa00ed814c9b16f5dd03009ac1e4 100644 (file)
--- 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 8eb53d816d32a9a3359bb4bd8ad35c89c0854729..d148e35d905675d605c94c22ab7befb4c134c412 100644 (file)
--- 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 036407306ca18d0c492263ce25c2c2605da3f5d8..a7e07b3f60cb1f23a46756d904827615cbed88a7 100644 (file)
--- 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 91b218a098ce37d849cc669467c67b0f384132c9..f5039ef23e1f7597e9bbbd8bdf47b82dc0dad426 100644 (file)
--- 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 cddbd6b0fba571827cff3fe3dbe2b6cca4945e50..5ebd3647aa31bf159152f014dcfe11b240651517 100644 (file)
--- 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 2a05a239fb7db2e1eab1504a6a5dff82f99b3fd9..9a816a42abbb55b7090439222adb5c7ace3b9fa6 100644 (file)
--- 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 749b42b6b02036f865d4804391622c13eeb97be8..519be984fa76c457c7f6d6dd9fc58506f9bc38cc 100644 (file)
--- 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      
 ################################