Merge with master

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

diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc
index f40ce004b056b6bbc2df480a3b5bf20d5f9f213d..11d32cd82419d9b084cf304cceef14d447ade1da 100644 (file)
--- a/lily/mensural-ligature-engraver.cc
+++ b/lily/mensural-ligature-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2006 Juergen Reuter <reuter@ipd.uka.de>,
+  (c) 2002--2007 Juergen Reuter <reuter@ipd.uka.de>,
   Pal Benko <benkop@freestart.hu>
 */
 
@@ -31,9 +31,6 @@
  * TODO: prohibit ligatures having notes differing only in accidentals
  * (like \[ a\breve g as \])
  *
- * TODO: dotted heads: avoid next note colliding with the dot, e.g. by
- * putting it *above* (rather than after) the affected ligature head.
- *
  * TODO: do something with multiple voices within a ligature.  See
  * for example:
  * Ockeghem: Missa Ecce ancilla domini, bassus part, end of Christe.
@@ -102,7 +99,7 @@ Mensural_ligature_engraver::transform_heads (vector<Grob_info> primitives)
     {
       Grob_info info = primitives[i];
       Item *primitive = dynamic_cast<Item *> (info.grob ());
-      int duration_log = Note_head::get_balltype (primitive);
+      int duration_log = Rhythmic_head::duration_log (primitive);
 
       Stream_event *nr = info.event_cause ();
 
@@ -366,21 +363,45 @@ void
 Mensural_ligature_engraver::fold_up_primitives (vector<Grob_info> primitives)
 {
   Item *first = 0;
-  Real distance = 0;
+  Real distance = 0.0;
+  Real dot_shift = 0.0;
   for (vsize i = 0; i < primitives.size (); i++)
     {
       Item *current = dynamic_cast<Item *> (primitives[i].grob ());
       if (i == 0)
-       first = current;
-
-      get_set_column (current, first->get_column ());
+       {
+         first = current;
+         dot_shift = 1.5 * Staff_symbol_referencer::staff_space (first);
+       }
 
-      if (i > 0)
-       current->translate_axis (distance, X_AXIS);
+      move_related_items_to_column (current, first->get_column (),
+                                   distance);
 
       distance
        += scm_to_double (current->get_property ("head-width"))
        - scm_to_double (current->get_property ("thickness"));
+
+      if (Rhythmic_head::dot_count (current) > 0)
+       // Move dots above/behind the ligature.
+       {
+         if (i + 1 < primitives.size ())
+           // dot in the midst => move above head
+           {
+             // FIXME: Amount of vertical dot-shift should depend on
+             // pitch.
+             //
+             // FIXME: dot placement is horizontally slightly off.
+             Rhythmic_head::get_dots (current)->translate_axis (dot_shift, Y_AXIS);
+           }
+         else
+           // trailing dot => move behind head
+           {
+             double head_width =
+               scm_to_double (current->get_property ("head-width"));
+             Rhythmic_head::get_dots (current)->
+               translate_axis (head_width, X_AXIS);
+           }
+       }
     }
 }
 
@@ -395,9 +416,9 @@ Mensural_ligature_engraver::build_ligature (Spanner *ligature,
 
 ADD_ACKNOWLEDGER (Mensural_ligature_engraver, rest);
 ADD_ACKNOWLEDGER (Mensural_ligature_engraver, note_head);
+
 ADD_TRANSLATOR (Mensural_ligature_engraver,
                /* doc */ "Handles Mensural_ligature_events by glueing special ligature heads together.",
                /* create */ "MensuralLigature",
-               /* accept */ "ligature-event",
                /* read */ "",
                /* write */ "");