X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-engraver.cc;h=08f7b9c460ef410928df82bc1ff428d005e12a6e;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=cb3808d948c6ae8b984b6f27201f152eff76ed88;hpb=7ce94ab2bcd9d12b6f7e40020db4c51185fe99db;p=lilypond.git diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index cb3808d948..08f7b9c460 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,6 +24,7 @@ #include "context-def.hh" #include "dispatcher.hh" #include "global-context.hh" +#include "grob-properties.hh" #include "international.hh" #include "main.hh" #include "open-type-font.hh" @@ -88,7 +89,7 @@ Score_engraver::initialize () pscore_->unprotect (); context ()->set_property ("output", pscore_->self_scm ()); - SCM props = updated_grob_properties (context (), ly_symbol2scm ("System")); + SCM props = Grob_property_info (context (), ly_symbol2scm ("System")).updated (); pscore_->typeset_system (new System (props)); @@ -155,13 +156,13 @@ Score_engraver::one_time_step (SCM) precomputed_recurse_over_translators (context (), STOP_TRANSLATION_TIMESTEP, UP); typeset_all (); } -#include + void Score_engraver::announce_grob (Grob_info info) { Engraver_group::announce_grob (info); if (info.start_end () == START) - {if (info.grob ()->name () == "StemStub") VALGRIND_PRINTF_BACKTRACE ("foo"); + { pscore_->root_system ()->typeset_grob (info.grob ()); elems_.push_back (info.grob ()); }