From 9f6d55f258bfb289dd7fb4a63b9d2e8deba0712b Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 14 Sep 2002 20:04:07 +0000 Subject: [PATCH] * lily/simultaneous-music-iterator.cc (Simultaneous_music_iterator): protection bugfix. * Documentation/user/tutorial.itely: replace grob by object. Explain \once. --- ChangeLog | 3 +++ Documentation/user/invoking.itexi | 2 ++ Documentation/user/tutorial.itely | 2 +- lily/interpretation-context-handle.cc | 8 +++++--- lily/simultaneous-music-iterator.cc | 5 +++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ebf06d7670..fdb94e746b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2002-09-14 Han-Wen Nienhuys + * 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 67bafae06f..eeba2e1737 100644 --- 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 f3c8703a9e..1d351ba3e1 100644 --- 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 0d4186586b..7b0afb6a1e 100644 --- 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 692ceb4d56..f75d60010d 100644 --- 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)); -- 2.39.5