Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index 8c77ceb45694d8cb66079d5bae2d8afea8623a3d..87db230110abe864de513ea2742c408a577b63f2 100644 (file)
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -12,7 +12,7 @@
 #include "international.hh"
 #include "note-head.hh"
 #include "rest.hh"
-#include "score-engraver.hh"
+#include "score-context.hh"
 #include "spanner.hh"
 #include "warn.hh"
 
@@ -27,7 +27,7 @@
  *
  * A concrete ligature engraver must subclass this class and provide
  * functions create_ligature_spanner () and typeset_ligature
- * (Spanner *, Array<Grob_info>).  Subclasses of this class basically
+ * (Spanner *, vector<Grob_info>).  Subclasses of this class basically
  * fall into two categories.
  *
  * The first category consists of engravers that engrave ligatures in
@@ -117,7 +117,7 @@ Ligature_engraver::process_music ()
   if (ligature_)
     {
       // TODO: maybe forbid breaks only if not transcribing
-      get_score_engraver ()->forbid_breaks ();
+      context ()->get_score_context ()->set_property ("forbidBreak", SCM_BOOL_T);
     }
 
   if (events_drul_[START])
@@ -193,7 +193,7 @@ Ligature_engraver::acknowledge_note_head (Grob_info info)
 {
   if (ligature_)
     {
-      primitives_.push (info);
+      primitives_.push_back (info);
       if (info.grob () && (brew_ligature_primitive_proc != SCM_EOL))
        {
          info.grob ()->set_property ("stencil", brew_ligature_primitive_proc);