]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/score-engraver.cc
* lily/staff-symbol.cc (print): span staff-symbol on column
[lilypond.git] / lily / score-engraver.cc
index c2c377fa1f3a19dfda5b43f544136ee31ddcdba3..452f40d43b66b85a4335c05367771ee51862d802 100644 (file)
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "all-font-metrics.hh"
 #include "score-engraver.hh"
 #include "paper-score.hh"
 #include "paper-column.hh"
-#include "command-request.hh"
 #include "paper-def.hh"
 #include "axis-group-interface.hh"
-#include "translator-def.hh"
-
+#include "context-def.hh"
 #include "staff-spacing.hh"
 #include "note-spacing.hh"
+#include "context.hh"
+#include "global-context.hh"
+
+
+
 
 /*
   TODO: the column creation logic is rather hairy. Revise it.
  */
 Score_engraver::Score_engraver ()
 {
-  scoreline_l_ =0;
-  command_column_l_ =0;
-  musical_column_l_ =0;
-  breaks_i_ =0;
-  pscore_p_ = 0;
+  system_ =0;
+  command_column_ =0;
+  musical_column_ =0;
+  breaks_ =0;
+  pscore_ = 0;
 }
 
 void
@@ -41,54 +44,52 @@ Score_engraver::make_columns ()
   /*
     ugh.
    */
-  if (!command_column_l_)
+  if (!command_column_)
     {
-      set_columns (new Paper_column (get_property ("NonMusicalPaperColumn")),
-                  new Paper_column (get_property ("PaperColumn")));
-  
-      command_column_l_->set_grob_property ("breakable", SCM_BOOL_T);
-
-
-      Grob_info i1 (command_column_l_);
-      i1.origin_trans_l_ = this;
-  
-      Grob_info i2 (musical_column_l_);
-      i2.origin_trans_l_ = this;
+      SCM nmp
+       = updated_grob_properties (daddy_context_,
+                                  ly_symbol2scm ("NonMusicalPaperColumn"));
+      SCM pc = updated_grob_properties (daddy_context_,
+                                       ly_symbol2scm ("PaperColumn"));
+      
+      set_columns (new Paper_column (nmp), new Paper_column (pc));
 
+      Grob_info i1;
+      i1.grob_ = command_column_;
+      i1.origin_trans_ = this;
   
       announce_grob (i1);
-      announce_grob (i2);
 
-      
+      Grob_info i2;
+      i2.grob_ = musical_column_;
+      i2.origin_trans_ = this;
+
+      announce_grob (i2);
     }
 }
 
 void
-Score_engraver::prepare (Moment w)
+Score_engraver::prepare (Moment m)
 {
-  Global_translator::prepare (w);
-
   /*
     TODO: don't make columns when skipTypesetting is true.
    */
   make_columns ();
-  
-  command_column_l_->set_grob_property ("when", now_mom_.smobbed_copy ());
-  musical_column_l_->set_grob_property ("when", now_mom_.smobbed_copy ());
 
+  SCM w = m.smobbed_copy ();
+  command_column_->set_property ("when", w);
+  musical_column_->set_property ("when", w);
   
-  Translator_group::start_translation_timestep();
+  recurse_down_translators (daddy_context_, &Translator::start_translation_timestep, DOWN);
 }
 
 void
 Score_engraver::finish ()
 {
-  if ((breaks_i_%8))
-    progress_indication ("[" + to_str (breaks_i_) + "]");
-   
-  check_removal ();
-  removal_processing ();
+  if ((breaks_%8))
+    progress_indication ("[" + to_string (breaks_) + "]");
 
+  recurse_down_translators (daddy_context_, &Translator::finalize, UP);
 }
 
 /*
@@ -97,26 +98,23 @@ Score_engraver::finish ()
 void
 Score_engraver::initialize ()
 {
-  Font_metric *fm =
-    all_fonts_global_p->find_afm("feta20");
+  Font_metric *fm = all_fonts_global->find_afm ("feta20");
   if (!fm)
-    error (_("Could not find feta20.afm. Fonts have not been installed properly; Aborting"));
+    error (_f ("can't find `%s'", "feta20.afm")
+          + "\n" +_ ("Fonts have not been installed properly.  Aborting"));
    
-  unsmob_translator_def (definition_)->apply_property_operations (this);
 
-  assert (dynamic_cast<Paper_def *> (output_def_l_));
-  assert (!daddy_trans_l_);
-  pscore_p_ = new Paper_score;
-  pscore_p_->paper_l_ = dynamic_cast<Paper_def*> (output_def_l_);
+  pscore_ = new Paper_score;
+  pscore_->paper_ = dynamic_cast<Paper_def*> (get_output_def ());
 
-  SCM props = get_property ("System");
+  SCM props = updated_grob_properties (daddy_context_, ly_symbol2scm ("System"));
 
-  pscore_p_->typeset_line (new System (props));
+  pscore_->typeset_line (new System (props));
   
   make_columns ();
-  scoreline_l_ = pscore_p_->line_l_;
-  scoreline_l_->set_bound (LEFT, command_column_l_);
-  command_column_l_->set_grob_property ("breakable", SCM_BOOL_T);
+  system_ = pscore_->system_;
+  system_->set_bound (LEFT, command_column_);
+  command_column_->set_property ("breakable", SCM_BOOL_T);
 
   Engraver_group_engraver::initialize ();
 }
@@ -125,69 +123,53 @@ Score_engraver::initialize ()
 void
 Score_engraver::finalize ()
 {
-  Engraver_group_engraver::finalize ();
+  Score_translator::finalize ();
 
   Grob * cc
     = unsmob_grob (get_property ("currentCommandColumn"));
-  scoreline_l_->set_bound (RIGHT, cc);
-  cc->set_grob_property ("breakable", SCM_BOOL_T);
+  system_->set_bound (RIGHT, cc);
+  cc->set_property ("breakable", SCM_BOOL_T);
   
   typeset_all ();
 }
 
+
 void
 Score_engraver::one_time_step ()
 {
   if (!to_boolean (get_property ("skipTypesetting")))
     {
-      process_music ();
-      do_announces ();
+      recurse_down_translators (daddy_context_, &Engraver::process_music, UP);
+      recurse_down_translators (daddy_context_, &Engraver::do_announces, UP);
     }
   
-  stop_translation_timestep ();
-  check_removal ();
-
-
-  for (int i = announce_info_arr_.size(); i--;)
-    {
-      Grob *g = announce_info_arr_[i].grob_l_;
-      if (!dynamic_cast<Paper_column*> (g)) // ugh.
-       {
-      
-         String msg= "Grob "
-           + g->name()
-           + " was created too late!";
-         g->programming_error (msg);
-       }
-    }
-  announce_info_arr_.clear ();
+  recurse_down_translators (daddy_context_, &Translator::stop_translation_timestep, UP);
 }
 
 void
 Score_engraver::announce_grob (Grob_info info)
 {
-  announce_info_arr_.push (info);
-  pscore_p_->line_l_->typeset_grob (info.grob_l_);
+  announce_infos_.push (info);
+  pscore_->system_->typeset_grob (info.grob_);
 }
 
 void
-Score_engraver::typeset_grob (Grob *elem_p)
+Score_engraver::typeset_grob (Grob *elem)
 {
-  if (!elem_p)
+  if (!elem)
     programming_error ("Score_engraver: empty elt\n");
   else
-
-    elem_p_arr_.push (elem_p);
+    elems_.push (elem);
 }
 
 void
 Score_engraver::typeset_all ()
 {
-  for (int i =0; i < elem_p_arr_.size (); i++) 
+  for (int i =0; i < elems_.size (); i++) 
     {
-      Grob * elem_p = elem_p_arr_[i];
+      Grob * elem = elems_[i];
       
-      if (Spanner *s = dynamic_cast <Spanner *> (elem_p))
+      if (Spanner *s = dynamic_cast <Spanner *> (elem))
        {
          /*
            do something sensible if spanner not 
@@ -197,14 +179,14 @@ Score_engraver::typeset_all ()
          do {
            if (!s->get_bound (d))
              {
-               s->set_bound (d, command_column_l_);
+               Grob * cc
+                 = unsmob_grob (get_property ("currentCommandColumn"));
+               s->set_bound (d, cc);
                /* don't warn for empty/suicided spanners,
                   it makes real warningsinvisible.
                   maybe should be junked earlier? */
-               if (!elem_p->live())
-                 ; // gdb hook
-               else
-                 elem_p->warning (_f ("unbound spanner `%s'", s->name ().ch_C ()));
+               if (elem->live ())
+                 elem->warning (_f ("unbound spanner `%s'", s->name ().to_str0 ()));
              }
          }
          while (flip (&d) != LEFT);
@@ -214,17 +196,17 @@ Score_engraver::typeset_all ()
        }
       else 
        {
-         if (!elem_p->get_parent (X_AXIS))
+         if (!elem->get_parent (X_AXIS))
            {
-             bool br = to_boolean (elem_p->get_grob_property ("breakable"));
-             Axis_group_interface::add_element (br ? command_column_l_ : musical_column_l_, elem_p);
+             bool br = to_boolean (elem->get_property ("breakable"));
+             Axis_group_interface::add_element (br ? command_column_ : musical_column_, elem);
 
            }
        }
-      if (!elem_p->get_parent (Y_AXIS))
-       Axis_group_interface::add_element (scoreline_l_, elem_p);
+      if (!elem->get_parent (Y_AXIS))
+       Axis_group_interface::add_element (system_, elem);
     }
-  elem_p_arr_.clear ();
+  elems_.clear ();
 }
 
 void
@@ -234,45 +216,45 @@ Score_engraver::stop_translation_timestep ()
   Engraver_group_engraver::stop_translation_timestep ();
   
   typeset_all ();
-  if (to_boolean (command_column_l_->get_grob_property ("breakable")))
+  if (to_boolean (command_column_->get_property ("breakable")))
     {
-      breaks_i_ ++;
-      if (! (breaks_i_%8))
-       progress_indication ("[" + to_str (breaks_i_) + "]");
+      breaks_ ++;
+      if (! (breaks_%8))
+       progress_indication ("[" + to_string (breaks_) + "]");
     }
 
 
-  scoreline_l_->add_column (command_column_l_);
-  scoreline_l_->add_column (musical_column_l_);
+  system_->add_column (command_column_);
+  system_->add_column (musical_column_);
   
-  command_column_l_ = 0;
-  musical_column_l_ = 0;
+  command_column_ = 0;
+  musical_column_ = 0;
 }
 
 void
-Score_engraver::set_columns (Paper_column *new_command_l
-                            Paper_column *new_musical_l)
+Score_engraver::set_columns (Paper_column *new_command, 
+                            Paper_column *new_musical)
 {
-  assert (!command_column_l_ && !musical_column_l_);
+  assert (!command_column_ && !musical_column_);
 
-  command_column_l_ = new_command_l;
-  musical_column_l_ = new_musical_l;
-  if (new_command_l)
+  command_column_ = new_command;
+  musical_column_ = new_musical;
+  if (new_command)
     {
-      set_property ("currentCommandColumn", new_command_l->self_scm ());  
+      daddy_context_->set_property ("currentCommandColumn", new_command->self_scm ());  
     }
   
-  if (new_musical_l)
+  if (new_musical)
     {
-      set_property ("currentMusicalColumn", new_musical_l->self_scm ());
+      daddy_context_->set_property ("currentMusicalColumn", new_musical->self_scm ());
     }
 }
 
 Music_output*
-Score_engraver::get_output_p ()
+Score_engraver::get_output ()
 {
-  Music_output * o = pscore_p_;
-  pscore_p_=0;
+  Music_output *o = pscore_;
+  ///FIXME WTF?  pscore_ = 0;
   return o;
 }
 
@@ -281,78 +263,66 @@ Score_engraver::try_music (Music*r)
 {
   bool gotcha = Engraver_group_engraver::try_music (r);  
 
-  if (!gotcha)
+  if (!gotcha && r->is_mus_type ("break-event"))
     {
-      if (Break_req* b = dynamic_cast<Break_req *> (r))
-       {
-         gotcha = true;
-
+      gotcha = true;
 
-         SCM pen = command_column_l_->get_grob_property ("penalty");
-         Real total_penalty = gh_number_p (pen)
-           ? gh_scm2double (pen)
-           : 0.0;
+      SCM pen = command_column_->get_property ("penalty");
+      Real total_penalty = gh_number_p (pen)
+       ? gh_scm2double (pen)
+       : 0.0;
 
-         SCM rpen = b->get_mus_property ("penalty");
-         if (gh_number_p (rpen))
-           total_penalty +=  gh_scm2double (rpen);
+      SCM rpen = r->get_property ("penalty");
+      if (gh_number_p (rpen))
+       total_penalty +=  gh_scm2double (rpen);
          
-         if (total_penalty > 10000.0) //  ugh. arbitrary.
-           forbid_breaks ();
+      if (total_penalty > 10000.0) //  ugh. arbitrary.
+       forbid_breaks ();
 
-         command_column_l_->set_grob_property ("penalty",
-                                              gh_double2scm (total_penalty));
-       }
+      command_column_->set_property ("penalty",
+                                         gh_double2scm (total_penalty));
     }
-   return gotcha;
+  return gotcha;
 }
 
-/*
-  TODO:  use property Score.breakForbidden = #t
- */
 void
 Score_engraver::forbid_breaks ()
 {
-  /*
-    result is junked.
-   */
-  if (command_column_l_)
-    command_column_l_->remove_grob_property ("breakable");
+  if (command_column_)
+    command_column_->set_property ("breakable", SCM_EOL);
 }
   
 void
 Score_engraver::acknowledge_grob (Grob_info gi)
 {
-  if (Staff_spacing::has_interface (gi.grob_l_))
+  if (Staff_spacing::has_interface (gi.grob_))
     {
-      Pointer_group_interface::add_grob (command_column_l_,
+      Pointer_group_interface::add_grob (command_column_,
                                         ly_symbol2scm ("spacing-wishes"),
-                                        gi.grob_l_);
+                                        gi.grob_);
     }
-  if (Note_spacing::has_interface (gi.grob_l_))
+  if (Note_spacing::has_interface (gi.grob_))
     {
-      Pointer_group_interface::add_grob (musical_column_l_,
+      Pointer_group_interface::add_grob (musical_column_,
                                         ly_symbol2scm ("spacing-wishes"),
-                                        gi.grob_l_);
+                                        gi.grob_);
     }
 }
 
 
 
-ENTER_DESCRIPTION(Score_engraver,
-/* descr */       "Top level engraver. Takes care of generating columns and the complete  system (ie. System)
-
-
-This engraver decides whether a column is breakable. The default is
-that a column is always breakable. However, when every Bar_engraver
-that does not have a barline at a certain point will call
-Score_engraver::forbid_breaks to stop linebreaks.  In practice, this
-means that you can make a breakpoint by creating a barline (assuming
-that there are no beams or notes that prevent a breakpoint.)
-
-
-",
-/* creats*/       "System PaperColumn NonMusicalPaperColumn",
+ENTER_DESCRIPTION (Score_engraver,
+/* descr */       "Top level engraver. Takes care of generating columns and the complete  system (ie. System) "
+"\n\n "
+"This engraver decides whether a column is breakable. The default is "
+"that a column is always breakable. However, when every Bar_engraver "
+"that does not have a barline at a certain point will call "
+"Score_engraver::forbid_breaks to stop linebreaks.  In practice, this "
+"means that you can make a breakpoint by creating a barline (assuming "
+"that there are no beams or notes that prevent a breakpoint.) "
+,
+/* creats*/       "System PaperColumn NonMusicalPaperColumn", 
+/* accepts */     "break-event",
 /* acks  */       "note-spacing-interface staff-spacing-interface",
 /* reads */       "currentMusicalColumn currentCommandColumn",
 /* write */       "");