typo.

diff --git a/ChangeLog b/ChangeLog
index fcb4ef31cd88e8df51109a1015548fd3c94d6f2c..27cc759899546256916797b3aa4a81003824709e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-03  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * flower/include/array.hh: typo. 
+
 2006-02-02  Graham Percival  <gpermus@gmail.com>
 
        * Documentation/user/advanced-notation.itely: doc "\#" in text.

diff --git a/flower/include/array.hh b/flower/include/array.hh
index a881c778d41e9f49aba0c626fe0d5e40e0c62536..85992a5f0f3a9630a596313bd462fa71508f8994 100644 (file)
--- a/flower/include/array.hh
+++ b/flower/include/array.hh
@@ -305,7 +305,7 @@ public:
   boundary (Array<T> const &v, int dir, vsize i)
   {
     assert (dir);
-    return v[dir = -1 ? i : v.size () - 1 - i];
+    return v[dir == -1 ? i : v.size () - 1 - i];
   }
 
   template<typename T>

diff --git a/lily/parser.yy b/lily/parser.yy
index 4c5413acdd595138a48d1dfe441c97c63ce3f267..080406a08a83c1600568623e7c020aae12d23ef2 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -963,7 +963,6 @@ Simple_music:
        | context_change
        ;
 
-
 optional_context_mod:
        /**/ { $$ = SCM_EOL; }
        | WITH { THIS->lexer_->push_initial_state (); }
@@ -981,7 +980,6 @@ context_mod_list:
        }
        ;
 
-
 Composite_music:
        Prefix_composite_music { $$ = $1; }
        | Grouped_music_list { $$ = $1; }
@@ -992,7 +990,6 @@ Grouped_music_list:
        | Sequential_music              { $$ = $1; }
        ;
 
-
 function_scm_argument:
        embedded_scm  
        | simple_string