Merge branch 'translation' into staging

[lilypond.git] / lily / completion-note-heads-engraver.cc

diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc
index 973fb4f28dbb14a1ca3d79c8819ee8670f60cd29..52a7d6c0bd4d0a64db0fb6610a889c313f9c0781 100644 (file)
--- a/lily/completion-note-heads-engraver.cc
+++ b/lily/completion-note-heads-engraver.cc
@@ -59,8 +59,6 @@ class Completion_heads_engraver : public Engraver
   vector<Item *> notes_;
   vector<Item *> prev_notes_;
   // Must remember notes for explicit ties.
-  vector<Item *> tie_note_candidates_;
-  vector<Stream_event *> tie_note_candidate_events_;
   vector<Grob *> ties_;
   vector<Stream_event *> note_events_;
   Spanner *tie_column_;
@@ -124,13 +122,13 @@ Completion_heads_engraver::next_moment (Rational const &note_len)
   if (unit)
     {
       Rational const now_unit = e->main_part_ / unit->main_part_;
-      if (now_unit.den() > 1)
+      if (now_unit.den () > 1)
         {
           /*
             within a unit - go to the end of that
           */
           result = unit->main_part_
-            * (Rational (1) - (now_unit - now_unit.trunc_rat ()));
+                   * (Rational (1) - (now_unit - now_unit.trunc_rat ()));
         }
       else
         {
@@ -271,6 +269,7 @@ Completion_heads_engraver::make_tie (Grob *left, Grob *right)
   Grob *p = make_spanner ("Tie", SCM_EOL);
   Tie::set_head (p, LEFT, left);
   Tie::set_head (p, RIGHT, right);
+  announce_end_grob (p, SCM_EOL);
   ties_.push_back (p);
 }
 
@@ -291,9 +290,6 @@ Completion_heads_engraver::start_translation_timestep ()
   Moment now = now_mom ();
   if (note_end_mom_.main_part_ <= now.main_part_)
     {
-      tie_note_candidate_events_ = note_events_;
-      tie_note_candidates_ = prev_notes_;
-
       note_events_.clear ();
       prev_notes_.clear ();
     }
@@ -318,6 +314,7 @@ ADD_TRANSLATOR (Completion_heads_engraver,
                 "TieColumn ",
 
                 /* read */
+                "completionUnit "
                 "measureLength "
                 "measurePosition "
                 "middleCPosition "