Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc
index a70eeaf113a3556d10e5cf241cdaaf34a7a76411..a36f1b17239386c35421129dff891a4f6bfbb111 100644 (file)
--- a/lily/mensural-ligature.cc
+++ b/lily/mensural-ligature.cc
@@ -3,19 +3,19 @@
 
   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>
 */
 
-#include <math.h>
-
 #include "mensural-ligature.hh"
-#include "item.hh"
+
 #include "font-interface.hh"
+#include "international.hh"
+#include "item.hh"
 #include "lookup.hh"
-#include "staff-symbol-referencer.hh"
 #include "note-head.hh"
 #include "output-def.hh"
+#include "staff-symbol-referencer.hh"
 #include "warn.hh"
 
 /*
@@ -106,9 +106,7 @@ internal_brew_primitive (Grob *me)
   Real width = 0.0;
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   if (primitive & MLP_ANY)
-    {
-      thickness = robust_scm2double (me->get_property ("thickness"), .14);
-    }
+    thickness = robust_scm2double (me->get_property ("thickness"), .14);
 
   if (primitive & MLP_FLEXA)
     {
@@ -118,9 +116,7 @@ internal_brew_primitive (Grob *me)
        = robust_scm2double (me->get_property ("flexa-width"), 2.0 * staff_space);
     }
   if (primitive & MLP_SINGLE_HEAD)
-    {
-      width = robust_scm2double (me->get_property ("head-width"), staff_space);
-    }
+    width = robust_scm2double (me->get_property ("head-width"), staff_space);
 
   switch (primitive & MLP_ANY)
     {
@@ -148,7 +144,7 @@ internal_brew_primitive (Grob *me)
     }
 
   Real blotdiameter
-    = (me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")));
+    = (me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")));
 
   if (primitive & MLP_STEM)
     {
@@ -193,12 +189,10 @@ internal_brew_primitive (Grob *me)
          out.add_stencil (join);
        }
       else
-       {
-         programming_error (_f ("Mensural_ligature: (join_right == 0)"));
-       }
+       programming_error (_f ("Mensural_ligature: (join_right == 0)"));
     }
 
-#if 0 // what happend with the ledger lines?
+#if 0 /* what happend with the ledger lines? */
   int pos = Staff_symbol_referencer::get_rounded_position (me);
   if (primitive & MLP_FLEXA)
     {
@@ -228,4 +222,4 @@ Mensural_ligature::print (SCM)
 ADD_INTERFACE (Mensural_ligature, "mensural-ligature-interface",
               "A mensural ligature",
               "delta-pitch flexa-width head-width join-right-amount " // "add-join "
-              "ligature-primitive-callback primitive thickness");
+              "primitive thickness");