* lily/pfb.cc (LY_DEFINE): ly:ttf->pfa, new function.

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

diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc
index 04e468c2afce4ad21581e435be5e333b021ae766..33d42b17d2db704659fecd65482a3a2f120d049f 100644 (file)
--- a/lily/mensural-ligature-engraver.cc
+++ b/lily/mensural-ligature-engraver.cc
@@ -3,16 +3,15 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2002--2004 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
  */
 
-#include "mensural-ligature.hh"
 #include "coherent-ligature-engraver.hh"
+
+#include "mensural-ligature.hh"
 #include "event.hh"
 #include "warn.hh"
-#include "item.hh"
 #include "spanner.hh"
-#include "rod.hh"
 #include "paper-column.hh"
 #include "note-column.hh"
 #include "rhythmic-head.hh"
@@ -348,7 +347,7 @@ Mensural_ligature_engraver::propagate_properties (Spanner *ligature,
 
   Real head_width =
     Font_interface::get_default_font (ligature)->
-    find_by_name ("noteheads--1mensural").extent (X_AXIS).length ();
+    find_by_name ("noteheads.s-1mensural").extent (X_AXIS).length ();
     Real flexa_width = robust_scm2double (ligature->get_property ("flexa-width"), 2);
   flexa_width *= Staff_symbol_referencer::staff_space (ligature);
 
@@ -445,7 +444,7 @@ Mensural_ligature_engraver::build_ligature (Spanner *ligature,
   join_primitives (primitives);
 }
 
-ENTER_DESCRIPTION (Mensural_ligature_engraver,
+ADD_TRANSLATOR (Mensural_ligature_engraver,
 /* descr */       "Handles Mensural_ligature_events by glueing special ligature heads together.",
 /* creats*/       "MensuralLigature",
 /* accepts */     "ligature-event",