* scripts/abc2ly.py (dump_slyrics): add ord().

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

diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc
index 518948ebe340f83e20034b2429ee0dfa4110622c..5598ec4207bd0efb832012c0f549d505225b8b74 100644 (file)
--- a/lily/mensural-ligature-engraver.cc
+++ b/lily/mensural-ligature-engraver.cc
@@ -6,13 +6,12 @@
   (c) 2002--2004 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"
@@ -344,7 +343,7 @@ Mensural_ligature_engraver::propagate_properties (Spanner *ligature,
                                                  Array<Grob_info> primitives)
 {
   Real thickness = robust_scm2double (ligature->get_property ("thickness"), 1.4);
-  thickness *= ligature->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+  thickness *= ligature->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
 
   Real head_width =
     Font_interface::get_default_font (ligature)->
@@ -407,8 +406,8 @@ Mensural_ligature_engraver::fold_up_primitives (Array<Grob_info> primitives)
        }
 
       distance +=
-       ly_scm2double (current->get_property ("head-width")) -
-       ly_scm2double (current->get_property ("thickness"));
+       scm_to_double (current->get_property ("head-width")) -
+       scm_to_double (current->get_property ("thickness"));
     }
 }