Run `make grand-replace'.

[lilypond.git] / lily / score-engraver.cc

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index 91cca081e727f21c6611a460d329e4c79973ceae..5fea2032105a7121880b626f3506fe01af051764 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "score-engraver.hh"
@@ -79,8 +79,7 @@ Score_engraver::initialize ()
 
   SCM props = updated_grob_properties (context (), ly_symbol2scm ("System"));
 
-  Object_key const *sys_key = context ()->get_grob_key ("System");
-  pscore_->typeset_system (new System (props, sys_key));
+  pscore_->typeset_system (new System (props));
   
   system_ = pscore_->root_system ();
   context ()->set_property ("rootSystem", system_->self_scm ());
@@ -99,6 +98,20 @@ Score_engraver::connect_to_context (Context *c)
   d->add_listener (GET_LISTENER (finish), ly_symbol2scm ("Finish"));
 }
 
+/*
+  uncovered:
+  
+  check_removal always returns false for Score contexts, it has been that way 
+since I joined the project. There is a reason for this: The typeset score is 
+stored in the Score_engraver, which in turn is accessed through the 
+Global_context returned by ly:run-translator. So the score-translator must be 
+connected to the score-context after run-translator finishes.
+
+I plan to change this: we should junk run-translator, and instead keep track 
+of both context and translator in the SCM code, and access the typeset score 
+directly via the created global-translator. Then it would be possible to 
+disconnect score-translators at iteration time. -es
+ */
 void
 Score_engraver::disconnect_from_context ()
 {
@@ -118,7 +131,7 @@ Score_engraver::finalize ()
   typeset_all ();
 }
 
-IMPLEMENT_LISTENER(Score_engraver, one_time_step);
+IMPLEMENT_LISTENER (Score_engraver, one_time_step);
 void
 Score_engraver::one_time_step (SCM)
 {
@@ -157,21 +170,28 @@ Score_engraver::typeset_all ()
 }
 
 ADD_TRANSLATOR_GROUP (Score_engraver,
-                     /* doc */ "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, every Bar_engraver "
-                     "that does not have a barline at a certain point will set "
-                      "forbidBreaks 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.) ",
+                     /* doc */
+                     "The top-level engraver.  Takes care of generating"
+                     " columns and the complete system (i.e.,"
+                     " @code{System}).\n"
+                     "\n"
+                     "This engraver decides whether a column is breakable."
+                     "  The default is that a column is always breakable."
+                     "  However, every @code{Bar_engraver} that does not have"
+                     " a bar line at a certain point sets @code{forbidBreaks}"
+                     " to stop line breaks.  In practice, this means that you"
+                     " can make a break point by creating a bar line"
+                     " (assuming that there are no beams or notes that"
+                     " prevent a break point).",
+
                      /* create */
                      "System ",
                      
                      /* read */
                      "currentMusicalColumn "
                      "currentCommandColumn "
-                     "verticallySpacedContexts",
+                     "verticallySpacedContexts ",
 
                      /* write */
-                     "");
+                     ""
+                     );