Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc
index 0d777f37540a81b3772d6a58629d6368b88181f0..ff1691ef643312fe78fd2ab2519216ff02b36402 100644 (file)
--- a/lily/coherent-ligature-engraver.cc
+++ b/lily/coherent-ligature-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2005 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2003--2006 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "coherent-ligature-engraver.hh"
@@ -35,7 +35,7 @@
  * - collapse superflous space after each ligature (TODO).
  *
  * Concrete subclasses must implement function build_ligature (Spanner
- * *, Array<Grob_info>).  This function is responsible for actually
+ * *, vector<Grob_info>).  This function is responsible for actually
  * building the ligature by transforming the array of noteheads.
  *
  * Currently, there are two subclasses: Gregorian_ligature_engraver
@@ -79,7 +79,7 @@
  * until it really works and I also get Han-Wen's/Jan's permission to
  * add it to the spacing spanner code.
  */
-#if 0 // experimental code to collapse spacing after ligature
+#if 0 /* experimental code to collapse spacing after ligature */
 SCM incr_scm = lc->get_property ("forced-spacing");
 if (incr_scm != SCM_EOL) /* (Paper_column::is_musical (l)) */
   {
@@ -87,9 +87,7 @@ if (incr_scm != SCM_EOL) /* (Paper_column::is_musical (l)) */
     ly_display_scm (lc->self_scm ());
     Real distance;
     if (incr_scm != SCM_EOL)
-      {
-       distance = scm_to_double (incr_scm);
-      }
+      distance = scm_to_double (incr_scm);
     else
       {
        me->warning (_ ("distance undefined, assuming 0.1"));
@@ -105,10 +103,6 @@ if (incr_scm != SCM_EOL) /* (Paper_column::is_musical (l)) */
   }
 #endif
 
-Coherent_ligature_engraver::Coherent_ligature_engraver ()
-{
-}
-
 /*
  * TODO: move this function to class Item?
  */
@@ -122,22 +116,22 @@ Coherent_ligature_engraver::get_set_column (Item *item, Paper_column *column)
       return;
     }
 
-  String name = parent->name ();
-  if (!String::compare (name, "PaperColumn"))
+  string name = parent->name ();
+  if (name != "PaperColumn")
     {
       // Change column not only for targeted item (NoteColumn), but
       // also for all associated grobs (NoteSpacing, SeparationItem).
       Grob *sl = Staff_symbol_referencer::get_staff_symbol (item);
 
       extract_item_set (parent, "elements", elements);
-      
-      for (int i = elements.size (); i--;)
+
+      for (vsize i = elements.size (); i--;)
        {
          Item *sibling = elements[i];
          if ((sibling)
              && (Staff_symbol_referencer::get_staff_symbol (sibling) == sl))
            {
-#if 0 // experimental code to collapse spacing after ligature
+#if 0 /* experimental code to collapse spacing after ligature */
              Grob *sibling_parent = sibling->get_parent (X_AXIS);
              sibling_parent->warning (_f ("Coherent_ligature_engraver: "
                                           "setting `spacing-increment="
@@ -150,9 +144,7 @@ Coherent_ligature_engraver::get_set_column (Item *item, Paper_column *column)
        }
     }
   else
-    {
-      get_set_column (parent, column);
-    }
+    get_set_column (parent, column);
 }
 
 /*
@@ -167,18 +159,18 @@ Coherent_ligature_engraver::get_set_column (Item *item, Paper_column *column)
  * occurs within the broken ligatures any more.
  */
 void
-Coherent_ligature_engraver::collect_accidentals (Spanner *, Array<Grob_info>)
+Coherent_ligature_engraver::collect_accidentals (Spanner *, vector<Grob_info>)
 {
   /* TODO */
 }
 
 void
-compute_delta_pitches (Array<Grob_info> primitives)
+compute_delta_pitches (vector<Grob_info> primitives)
 {
   int prev_pitch = 0;
   int delta_pitch = 0;
   Item *prev_primitive = 0, *primitive = 0;
-  for (int i = 0; i < primitives.size (); i++)
+  for (vsize i = 0; i < primitives.size (); i++)
     {
       primitive = dynamic_cast<Item *> (primitives[i].grob ());
       Music *music_cause = primitives[i].music_cause ();
@@ -196,17 +188,9 @@ compute_delta_pitches (Array<Grob_info> primitives)
   primitive->set_property ("delta-pitch", scm_from_int (0));
 }
 
-void
-Coherent_ligature_engraver::build_ligature (Spanner *, Array<Grob_info>)
-{
-  programming_error ("Coherent_ligature_engraver::build_ligature (): "
-                    "this is an abstract method that should not be called, "
-                    "but overridden by a subclass");
-}
-
 void
 Coherent_ligature_engraver::typeset_ligature (Spanner *ligature,
-                                             Array<Grob_info> primitives)
+                                             vector<Grob_info> primitives)
 {
   // compute some commonly needed context info stored as grob
   // properties
@@ -217,13 +201,5 @@ Coherent_ligature_engraver::typeset_ligature (Spanner *ligature,
   collect_accidentals (ligature, primitives);
 }
 
-#include "translator.icc"
-
-ADD_ACKNOWLEDGER (Coherent_ligature_engraver, note_head);
-ADD_ACKNOWLEDGER (Coherent_ligature_engraver, rest);
-ADD_TRANSLATOR (Coherent_ligature_engraver,
-               /* descr */ "This is an abstract class.  Subclasses such as Gregorian_ligature_engraver handle ligatures by glueing special ligature heads together.",
-               /* creats*/ "",
-               /* accepts */ "ligature-event",
-               /* reads */ "",
-               /* write */ "");
+// no ADD_ACKNOWLEDGER / ADD_ACKNOWLEDGER / ADD_TRANSLATOR macro calls
+// since this class is abstract