X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-engraver.cc;h=3f4d3dc97ac598aa88de0c6d41d9b2a4f02e920e;hb=77706635f33adff837dc7af0482f51ff3f0f5cb1;hp=09d1aa6a0f9e5da00693e33bc319944f0964ba3b;hpb=c4c0ba811cd526f047de3f4d3c77abcc32a3e076;p=lilypond.git

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index 09d1aa6a0f..3f4d3dc97a 100644
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  score-engraver.cc -- implement Score_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "score-engraver.hh"
@@ -20,7 +31,6 @@
 #include "paper-column-engraver.hh"
 #include "paper-column.hh"
 #include "paper-score.hh"
-#include "stream-event.hh"
 #include "system.hh"
 #include "warn.hh"
 
@@ -80,8 +90,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 ());
@@ -100,6 +109,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 ()
 {
@@ -119,7 +142,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)
 {
@@ -158,24 +181,27 @@ 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 ",
-
-		      /* accept */
-		      "break-event",
 		      
 		      /* read */
 		      "currentMusicalColumn "
-		      "currentCommandColumn "
-		      "verticallySpacedContexts",
+		      "currentCommandColumn ",
 
 		      /* write */
-		      "");
+		      ""
+		      );