* lily/simultaneous-music-iterator.cc

(Simultaneous_music_iterator): protection bugfix.

* Documentation/user/tutorial.itely: replace grob by
object. Explain \once.

diff --git a/ChangeLog b/ChangeLog
index ebf06d76708fea460de12a4b97bb349b4e008167..fdb94e746b8f345f78d09374900514ace10daed9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-09-14  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * lily/simultaneous-music-iterator.cc
+       (Simultaneous_music_iterator): protection bugfix.
+
        * debian/: debian patches by Anthony Fok.
        
        * lily/clef-engraver.cc (create_clef): bugfix for octavate clef

diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi
index 67bafae06f01d3064498e207aa2d92177cbee82c..eeba2e1737a3d95a077bbb5374f1ff2153c213c7 100644 (file)
--- a/Documentation/user/invoking.itexi
+++ b/Documentation/user/invoking.itexi
@@ -316,6 +316,8 @@ generate titling:
     Name of the arranger, right flushed below the opus.
 @item instrument
     Name of the instrument, centered below the arranger
+@item dedication
+      [docme]    
 @item piece
     Name of the piece, left flushed below the instrument
 @item head

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index f3c8703a9ecdd51ef59bb8c78ed48b12e4338b02..1d351ba3e141a7af545aecfc9c57cdce5092217e 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -246,7 +246,7 @@ LilyPond source file looks like:
 
 In the last section we explained what kind of things you could enter
 in a lilypond file.  In this section we explain how to run LilyPond 
-and how view or print the output.  If you have not used LilyPond
+and how to view or print the output.  If you have not used LilyPond
 before, want to test your setup of LilyPond, or want to run an example
 file yourself, read this section.   The instructions that follow
 are for running LilyPond on Unix-like systems.  Some additional

diff --git a/lily/interpretation-context-handle.cc b/lily/interpretation-context-handle.cc
index 0d4186586bca1afa43cc50acb505323b311a831c..7b0afb6a1e60019737c8f61cd0671b851c098759 100644 (file)
--- a/lily/interpretation-context-handle.cc
+++ b/lily/interpretation-context-handle.cc
@@ -59,14 +59,16 @@ void
 Interpretation_context_handle::quit ()
 {
   if (report_to_)
-    report_to_->iterator_count_ --;
+    {
+      report_to_->iterator_count_ --;
+      report_to_ = 0;
+    }
 }
 
-
 bool
 Interpretation_context_handle::try_music (Music *m)
 {
-  return  report_to_->try_music (m);
+  return report_to_->try_music (m);
 }
 
 void

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index 692ceb4d565cebfc2827e3a12cbc81a310c820b7..f75d60010d9fe4b77ed52fff763508f26c6e1de6 100644 (file)
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -21,10 +21,11 @@ Simultaneous_music_iterator::Simultaneous_music_iterator ()
 Simultaneous_music_iterator::Simultaneous_music_iterator (Simultaneous_music_iterator const& src)
   : Music_iterator (src)
 {
-  separate_contexts_b_ = src.separate_contexts_b_;
+  separate_contexts_b_
+    = src.separate_contexts_b_;
   
   SCM children_list = SCM_EOL;
-  SCM *tail  = &children_list_; 
+  SCM *tail  = &children_list; 
   for (SCM s = src.children_list_; gh_pair_p (s); s = gh_cdr(s))
     {
       Music_iterator *i = unsmob_iterator (gh_car (s));