* The grand 2005-2006 replace.

[lilypond.git] / lily / separating-line-group-engraver.cc

diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc
index 09214afeb015a2dd41b87cd938bb6374d7def640..6ac3af3fc1e72e343cd8d2111457de8b3bc02367 100644 (file)
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -1,9 +1,9 @@
 /*
-  '  separating-line-group-engraver.cc -- implement Separating_line_group_engraver
+  separating-line-group-engraver.cc -- implement Separating_line_group_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -54,11 +54,11 @@ protected:
 
   Spanner *sep_span_;
 
-  DECLARE_ACKNOWLEDGER(item);
-  PRECOMPUTED_VIRTUAL void process_music ();
+  DECLARE_ACKNOWLEDGER (item);
+  void process_music ();
   virtual void finalize ();
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void start_translation_timestep ();
+  void stop_translation_timestep ();
+  void start_translation_timestep ();
 public:
   TRANSLATOR_DECLARATIONS (Separating_line_group_engraver);
 };
@@ -73,7 +73,6 @@ Separating_line_group_engraver::Separating_line_group_engraver ()
 void
 Separating_line_group_engraver::process_music ()
 {
-
   if (!sep_span_)
     {
       sep_span_ = make_spanner ("SeparatingGroupSpanner", SCM_EOL);
@@ -102,9 +101,7 @@ Separating_line_group_engraver::finalize ()
 
   if (last_spacings_.staff_spacing_
       && last_spacings_.staff_spacing_->get_column () == column)
-    {
-      last_spacings_.staff_spacing_->suicide ();
-    }
+    last_spacings_.staff_spacing_->suicide ();
 }
 
 void
@@ -114,8 +111,7 @@ Separating_line_group_engraver::acknowledge_item (Grob_info i)
   if (!it)
     return;
   if (it->get_parent (X_AXIS)
-      && it->get_parent (X_AXIS)
-      ->has_extent_callback (Axis_group_interface::group_extent_callback_proc, X_AXIS))
+      && Axis_group_interface::has_axis (it->get_parent (X_AXIS), X_AXIS))
     return;
 
   if (to_boolean (it->get_property ("no-spacing-rods")))
@@ -146,7 +142,7 @@ Separating_line_group_engraver::acknowledge_item (Grob_info i)
        {
          Item *it = make_item ("StaffSpacing", SCM_EOL);
          current_spacings_.staff_spacing_ = it;
-         Pointer_group_interface::add_grob (it,  ly_symbol2scm ("left-items"),
+         Pointer_group_interface::add_grob (it, ly_symbol2scm ("left-items"),
                                             break_item_);
 
          if (int i = last_spacings_.note_spacings_.size ())
@@ -159,7 +155,7 @@ Separating_line_group_engraver::acknowledge_item (Grob_info i)
          else if (last_spacings_.staff_spacing_)
            {
              SCM ri = last_spacings_.staff_spacing_->get_object ("right-items");
-             Grob_array *ga  = unsmob_grob_array (ri);
+             Grob_array *ga = unsmob_grob_array (ri);
              if (!ga)
                {
                  SCM ga_scm = Grob_array::make_array ();
@@ -193,9 +189,7 @@ void
 Separating_line_group_engraver::stop_translation_timestep ()
 {
   if (break_item_)
-    {
-      Separating_group_spanner::add_spacing_unit (sep_span_, break_item_);
-    }
+    Separating_group_spanner::add_spacing_unit (sep_span_, break_item_);
 
   if (Item *sp = current_spacings_.staff_spacing_)
     {
@@ -209,25 +203,24 @@ Separating_line_group_engraver::stop_translation_timestep ()
     }
 
   if (!current_spacings_.is_empty ())
-    {
-      last_spacings_ = current_spacings_;
-    }
+    last_spacings_ = current_spacings_;
 
   current_spacings_.clear ();
 
   if (musical_item_)
-    {
-      Separating_group_spanner::add_spacing_unit (sep_span_, musical_item_);
-    }
+    Separating_group_spanner::add_spacing_unit (sep_span_, musical_item_);
 
   musical_item_ = 0;
 }
 
-ADD_ACKNOWLEDGER(Separating_line_group_engraver, item);
+ADD_ACKNOWLEDGER (Separating_line_group_engraver, item);
 ADD_TRANSLATOR (Separating_line_group_engraver,
-               /* descr */ "Generates objects for computing spacing parameters.",
-               /* creats*/ "SeparationItem SeparatingGroupSpanner StaffSpacing",
-               /* accepts */ "",
-               /* acks  */ "",
-               /* reads */ "createSpacing",
+               /* doc */ "Generates objects for computing spacing parameters.",
+
+               /* create */
+               "SeparationItem "
+               "SeparatingGroupSpanner "
+               "StaffSpacing",
+               /* accept */ "",
+               /* read */ "createSpacing",
                /* write */ "breakableSeparationItem");