* configure.in: Test for and accept lmodern if EC fonts not found.

[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 80b446534b694254d98391a41ca4d1383bbefa46..1a784ad1521fd837b13b6e9d173c1b525fe5a810 100644 (file)
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -10,16 +10,13 @@
 #include "separating-group-spanner.hh"
 #include "separation-item.hh"
 #include "paper-column.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "engraver.hh"
 #include "axis-group-interface.hh"
 #include "note-spacing.hh"
-#include "group-interface.hh"
 #include "accidental-placement.hh"
 #include "context.hh"
 
-
-
 struct Spacings
 {
   Item * staff_spacing_;
@@ -75,9 +72,9 @@ Separating_line_group_engraver::process_music ()
 
   if (!sep_span_)
     {
-      sep_span_ = make_spanner ("SeparatingGroupSpanner");
+      sep_span_ = make_spanner ("SeparatingGroupSpanner", SCM_EOL);
 
-      announce_grob (sep_span_, SCM_EOL);
+      
       sep_span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
     }
 }
@@ -91,7 +88,6 @@ Separating_line_group_engraver::finalize ()
   Grob *column = unsmob_grob (ccol);
   
   sep_span_->set_bound (RIGHT, unsmob_grob (ccol));
-  typeset_grob (sep_span_);
   sep_span_ =0;
 
   for  (int i= 0 ; i < last_spacings_.note_spacings_.size (); i++)
@@ -135,23 +131,23 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
 
   if (!p_ref_)
     {
-      p_ref_ = make_item ("SeparationItem");
+      p_ref_ = make_item ("SeparationItem", SCM_EOL);
 
       if (ib)
        {
          p_ref_->set_property ("breakable", SCM_BOOL_T);
-         daddy_context_->set_property ("breakableSeparationItem", p_ref_->self_scm ());
+         context ()->set_property ("breakableSeparationItem", p_ref_->self_scm ());
        }
-      announce_grob (p_ref_, SCM_EOL);
+      
 
       if (to_boolean (get_property ("createSpacing"))
          && p_ref_ == break_item_)
        {
-         Item *it  = make_item ("StaffSpacing");
+         Item *it  = make_item ("StaffSpacing", SCM_EOL);
          current_spacings_.staff_spacing_ = it;
-         it->set_property ("left-items", gh_cons (break_item_->self_scm (), SCM_EOL));
+         it->set_property ("left-items", scm_cons (break_item_->self_scm (), SCM_EOL));
+         
          
-         announce_grob (it, SCM_EOL);
 
          if (int i = last_spacings_.note_spacings_.size ())
            {
@@ -163,9 +159,8 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
            }
          else if (last_spacings_.staff_spacing_)
            {
-             
              last_spacings_.staff_spacing_->set_property ("right-items",
-                                                               gh_cons (break_item_->self_scm (), SCM_EOL));
+                                                               scm_cons (break_item_->self_scm (), SCM_EOL));
            }
        }
     }
@@ -180,7 +175,7 @@ void
 Separating_line_group_engraver::start_translation_timestep ()
 {
   if (break_item_)
-    daddy_context_->unset_property (ly_symbol2scm ("breakableSeparationItem"));
+    context ()->unset_property (ly_symbol2scm ("breakableSeparationItem"));
   break_item_ =0;
 }
 
@@ -190,7 +185,6 @@ Separating_line_group_engraver::stop_translation_timestep ()
   if (break_item_)
     {
       Separating_group_spanner::add_spacing_unit (sep_span_, break_item_);
-      typeset_grob (break_item_);
     }
   
   if (Item * sp = current_spacings_.staff_spacing_)
@@ -203,7 +197,6 @@ Separating_line_group_engraver::stop_translation_timestep ()
        Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"),
                                           musical_item_);
 
-      typeset_grob (sp);
     }
 
   
@@ -217,7 +210,6 @@ Separating_line_group_engraver::stop_translation_timestep ()
   if (musical_item_)
     {
       Separating_group_spanner::add_spacing_unit (sep_span_, musical_item_);
-      typeset_grob (musical_item_);
     }
   
   musical_item_ =0;