* The grand 2005-2006 replace.

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

diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc
index cc961e6ce0ee0bee0ea87ee74aec6263f26d2ba2..79b6ccdf2b474cd80b8f07d0b144842060526263 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--2005 Juergen Reuter <reuter@ipd.uka.de>,
+  (c) 2002--2006 Juergen Reuter <reuter@ipd.uka.de>,
   Pal Benko <benkop@freestart.hu>
 */
 
@@ -58,6 +58,8 @@ private:
 
 Mensural_ligature_engraver::Mensural_ligature_engraver ()
 {
+  brew_ligature_primitive_proc = 
+    Mensural_ligature::brew_ligature_primitive_proc;
 }
 
 Spanner *
@@ -298,7 +300,7 @@ Mensural_ligature_engraver::propagate_properties (Spanner *ligature,
   Real thickness
     = robust_scm2double (ligature->get_property ("thickness"), 1.4);
   thickness
-    *= ligature->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+    *= ligature->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
 
   Real head_width
     = Font_interface::get_default_font (ligature)->
@@ -357,16 +359,12 @@ Mensural_ligature_engraver::fold_up_primitives (Array<Grob_info> primitives)
     {
       Item *current = dynamic_cast<Item *> (primitives[i].grob ());
       if (i == 0)
-       {
-         first = current;
-       }
+       first = current;
 
       get_set_column (current, first->get_column ());
 
       if (i > 0)
-       {
-         current->translate_axis (distance, X_AXIS);
-       }
+       current->translate_axis (distance, X_AXIS);
 
       distance
        += scm_to_double (current->get_property ("head-width"))
@@ -388,8 +386,8 @@ 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,
-               /* descr */ "Handles Mensural_ligature_events by glueing special ligature heads together.",
-               /* creats*/ "MensuralLigature",
-               /* accepts */ "ligature-event",
-               /* reads */ "",
+               /* doc */ "Handles Mensural_ligature_events by glueing special ligature heads together.",
+               /* create */ "MensuralLigature",
+               /* accept */ "ligature-event",
+               /* read */ "",
                /* write */ "");