Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc
index cc961e6ce0ee0bee0ea87ee74aec6263f26d2ba2..5adc44122c27406832319d8d226d9f055da5a666 100644 (file)
--- a/lily/mensural-ligature-engraver.cc
+++ b/lily/mensural-ligature-engraver.cc
@@ -3,22 +3,23 @@
 
   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 "coherent-ligature-engraver.hh"
+#include "font-interface.hh"
+#include "international.hh"
 #include "mensural-ligature.hh"
 #include "music.hh"
-#include "warn.hh"
-#include "spanner.hh"
-#include "paper-column.hh"
 #include "note-column.hh"
-#include "rhythmic-head.hh"
 #include "note-head.hh"
-#include "staff-symbol-referencer.hh"
 #include "output-def.hh"
-#include "font-interface.hh"
+#include "paper-column.hh"
+#include "rhythmic-head.hh"
+#include "spanner.hh"
+#include "staff-symbol-referencer.hh"
+#include "warn.hh"
 
 /*
  * TODO: accidentals are aligned with the first note;
@@ -45,19 +46,21 @@ class Mensural_ligature_engraver : public Coherent_ligature_engraver
 
 protected:
   virtual Spanner *create_ligature_spanner ();
-  virtual void build_ligature (Spanner *ligature, Array<Grob_info> primitives);
+  virtual void build_ligature (Spanner *ligature, vector<Grob_info> primitives);
 
 public:
   TRANSLATOR_DECLARATIONS (Mensural_ligature_engraver);
 
 private:
-  void transform_heads (Array<Grob_info> primitives);
-  void propagate_properties (Spanner *ligature, Array<Grob_info> primitives);
-  void fold_up_primitives (Array<Grob_info> primitives);
+  void transform_heads (vector<Grob_info> primitives);
+  void propagate_properties (Spanner *ligature, vector<Grob_info> primitives);
+  void fold_up_primitives (vector<Grob_info> primitives);
 };
 
 Mensural_ligature_engraver::Mensural_ligature_engraver ()
 {
+  brew_ligature_primitive_proc = 
+    Mensural_ligature::brew_ligature_primitive_proc;
 }
 
 Spanner *
@@ -67,7 +70,7 @@ Mensural_ligature_engraver::create_ligature_spanner ()
 }
 
 void
-Mensural_ligature_engraver::transform_heads (Array<Grob_info> primitives)
+Mensural_ligature_engraver::transform_heads (vector<Grob_info> primitives)
 {
   if (primitives.size () < 2)
     {
@@ -84,7 +87,7 @@ Mensural_ligature_engraver::transform_heads (Array<Grob_info> primitives)
   bool prev_semibrevis = false;
   Item *prev_primitive = NULL;
 
-  for (int i = 0, s = primitives.size (); i < s; i++)
+  for (vsize i = 0, s = primitives.size (); i < s; i++)
     {
       Grob_info info = primitives[i];
       Item *primitive = dynamic_cast<Item *> (info.grob ());
@@ -293,12 +296,12 @@ Mensural_ligature_engraver::transform_heads (Array<Grob_info> primitives)
  */
 void
 Mensural_ligature_engraver::propagate_properties (Spanner *ligature,
-                                                 Array<Grob_info> primitives)
+                                                 vector<Grob_info> primitives)
 {
   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 ("line-thickness"));
 
   Real head_width
     = Font_interface::get_default_font (ligature)->
@@ -313,7 +316,7 @@ Mensural_ligature_engraver::propagate_properties (Spanner *ligature,
 
   Real half_flexa_width = 0.5 * (flexa_width + thickness);
 
-  for (int i = 0; i < primitives.size (); i++)
+  for (vsize i = 0; i < primitives.size (); i++)
     {
       Item *primitive = dynamic_cast<Item *> (primitives[i].grob ());
       int output = scm_to_int (primitive->get_property ("primitive"));
@@ -349,24 +352,20 @@ Mensural_ligature_engraver::propagate_properties (Spanner *ligature,
 }
 
 void
-Mensural_ligature_engraver::fold_up_primitives (Array<Grob_info> primitives)
+Mensural_ligature_engraver::fold_up_primitives (vector<Grob_info> primitives)
 {
   Item *first = 0;
   Real distance = 0;
-  for (int i = 0; i < primitives.size (); i++)
+  for (vsize i = 0; i < primitives.size (); i++)
     {
       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"))
@@ -376,7 +375,7 @@ Mensural_ligature_engraver::fold_up_primitives (Array<Grob_info> primitives)
 
 void
 Mensural_ligature_engraver::build_ligature (Spanner *ligature,
-                                           Array<Grob_info> primitives)
+                                           vector<Grob_info> primitives)
 {
   transform_heads (primitives);
   propagate_properties (ligature, primitives);
@@ -388,8 +387,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 */ "");