release: 1.5.10

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 0d3f2a67f83c82f751dac14a1d11481851d899aa..9059624ce660f249c0ea9b2e6a1c860f65821161 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -3,25 +3,27 @@
 
   Sourcefile of GNU LilyPond music type setter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "music.hh"
 #include "engraver.hh"
 #include "engraver-group-engraver.hh"
 #include "grob.hh"
+#include "main.hh"
 
 
 void
 Engraver::announce_grob (Grob_info inf)
 {
-  daddy_grav_l()->announce_grob (inf);
+  daddy_grav_l ()->announce_grob (inf);
 }
 
 void
 Engraver::announce_grob (Grob* e, Music *m)
 {
-  if (m && m->origin ()->location_str ().length_i ())
+  if (m && store_locations_global_b 
+      && m->origin ()->location_str ().length_i ())
     {
       e->set_grob_property ("origin", m->get_mus_property ("origin"));
     }
@@ -29,7 +31,7 @@ Engraver::announce_grob (Grob* e, Music *m)
   Grob_info i (e, m);
   if (!i.origin_trans_l_)
     i.origin_trans_l_ = this;
-  daddy_grav_l()->announce_grob (i);
+  daddy_grav_l ()->announce_grob (i);
 }
 
 
@@ -37,14 +39,14 @@ Engraver::announce_grob (Grob* e, Music *m)
 void
 Engraver::typeset_grob (Grob*p)
 {
-  daddy_grav_l()->typeset_grob (p);
+  daddy_grav_l ()->typeset_grob (p);
 }
 
 
 Engraver_group_engraver*
 Engraver::daddy_grav_l () const
 {
-  return (daddy_trans_l_ )
+  return (daddy_trans_l_)
        ? dynamic_cast<Engraver_group_engraver *> (daddy_trans_l_)
        : 0;
 }