(construct_children):

only change  translator if found. This fixes a core dump problem.

diff --git a/ChangeLog b/ChangeLog
index 632d8ceb79a192e99051cb4534150159a4d7a21e..0ce091af2460c0467aa17fcd7055b036ad44b247 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-02  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * lily/context-specced-music-iterator.cc (construct_children): 
+       only change  translator if found. This fixes a core dump problem.
+
 2003-09-30  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * scm/slur.scm (default-slur-extremity-rules): use equal? for

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 7ea49d592e3795c6c7516a660177f51b25b167d8..96af610b064caac7ca62c352bc25e278ec7fd237 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -8072,11 +8072,17 @@ their center lines:
  c1^\markup { \line < a b c > }
 @end lilypond
 
+Markups can be stored in variables, and these variables
+may be attached to notes, like
+@verbatim
+allegro = \markup { \bold \large { Allegro } }
+\notes { a^\allegro b c d }
+@end verbatim
+
 The markup mechanism is extensible.  Refer to
 @file{scm/new-markup.scm} for more information.
 
 
-
 @seealso
 
 @internalsref{Markup-functions}, and @file{scm/new-markup.scm}.

diff --git a/lily/context-specced-music-iterator.cc b/lily/context-specced-music-iterator.cc
index a5b808a9ba0c0b62b50e7b3f9871a1c8e60d76a3..44111de30f4c88bf1e625c325aac6d7207c49f48 100644 (file)
--- a/lily/context-specced-music-iterator.cc
+++ b/lily/context-specced-music-iterator.cc
@@ -31,8 +31,9 @@ Context_specced_music_iterator::construct_children ()
   
   Translator_group* a
     =report_to ()->find_create_translator (ct, c_id);
-  
-  set_translator (a);
+
+  if (a)
+    set_translator (a);
 
   Music_wrapper_iterator::construct_children();
 }