* lily/accidental-engraver.cc: formatting fixes.

* lily/spacing-spanner.cc (prune_loose_columns): right-items is a
grob-array.

* lily/arpeggio.cc (print): suicide arpeggio for single notehead.

* lily/note-column.cc (arpeggio): new function.

* lily/note-spacing.cc (get_spacing): also take arpeggio into
account for spacing.

diff --git a/ChangeLog b/ChangeLog
index 65d123c166f6de19ecc2df873523f6e050aa6225..f753ed56c2baa4a23bc7974a6ac2f8c71072cb49 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-07-27  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/accidental-engraver.cc: formatting fixes.
+
+       * lily/spacing-spanner.cc (prune_loose_columns): right-items is a
+       grob-array.
+
+       * lily/arpeggio.cc (print): suicide arpeggio for single notehead.
+
+       * lily/note-column.cc (arpeggio): new function.
+
+       * lily/note-spacing.cc (get_spacing): also take arpeggio into
+       account for spacing.
+
 2005-07-25  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/main.cc (sane_setenv)[!ARGV0_RELOCATION]: Also define.
@@ -35,7 +49,7 @@
 
        * lily/profile.cc: new file.
 
-       * lily/grob.cc (Grob): look properties up directly.
+       * lily/grob.cc (Grob::Grob): look properties up directly.
 
        * lily/open-type-font.cc (get_indexed_char): cache index -> bbox
        lookups.

diff --git a/VERSION b/VERSION
index 02ad8f735d683baa5258de24506c9940146a23ae..13c3642ed13e4deeec12a1d19562f4a5800d3060 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=7
-PATCH_LEVEL=3
+PATCH_LEVEL=4
 MY_PATCH_LEVEL=
 

diff --git a/input/regression/spacing-stick-out.ly b/input/regression/spacing-stick-out.ly
index 2c4f8e101f35bce46e7526e5f9fab9204c98e57f..222e791ece6a8e065de7763452730e0a1082ed7a 100644 (file)
--- a/input/regression/spacing-stick-out.ly
+++ b/input/regression/spacing-stick-out.ly
@@ -1,7 +1,7 @@
 
 \header {
 
-  texidoc = "Unless @code{allow-outside-line} is set for the relevant
+  texidoc = "If @code{keep-inside-line} is set for the relevant
   PaperColumn, LilyPond will space a line to prevent text sticking out
   of the right margin."
 
@@ -11,6 +11,7 @@
 
 \layout { raggedright = ##t } 
 \relative {
+  \override PaperColumn #'keep-inside-line = ##t 
   c1 c1^"This is a really long text" c
 }
 

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index c11d63c48d2ef95fc4e664b3fbbf487c989cef09..6786e26b3b8ba2cb7532525960524f68055b7d95 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -601,10 +601,10 @@ Accidental_engraver::process_music ()
 }
 
 
-ADD_ACKNOWLEDGER(Accidental_engraver, arpeggio);
-ADD_ACKNOWLEDGER(Accidental_engraver, finger);
-ADD_ACKNOWLEDGER(Accidental_engraver, rhythmic_head);
-ADD_ACKNOWLEDGER(Accidental_engraver, tie);
+ADD_ACKNOWLEDGER (Accidental_engraver, arpeggio);
+ADD_ACKNOWLEDGER (Accidental_engraver, finger);
+ADD_ACKNOWLEDGER (Accidental_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Accidental_engraver, tie);
 
 ADD_TRANSLATOR (Accidental_engraver,
                "Make accidentals.  "

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 05330364b8b25d79430fb4857c2dcfafe69dc543..5438cc0d132e73392667a954d8b7e8837d94cd3e 100644 (file)
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -181,7 +181,7 @@ Ambitus_engraver::finalize ()
 }
 
 
-ADD_ACKNOWLEDGER(Ambitus_engraver, note_head);
+ADD_ACKNOWLEDGER (Ambitus_engraver, note_head);
 ADD_TRANSLATOR (Ambitus_engraver,
                /* descr */ "",
                /* creats*/ "Ambitus AmbitusLine AmbitusNoteHead AmbitusAccidental",

diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index f8a380d6d6adb54f38b640eae0befca6a648e3d8..7a893289cac1bbf2ebbcc818d4bd8e5df9791da9 100644 (file)
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -102,9 +102,9 @@ Arpeggio_engraver::stop_translation_timestep ()
   arpeggio_event_ = 0;
 }
 
-ADD_ACKNOWLEDGER(Arpeggio_engraver, stem)
-ADD_ACKNOWLEDGER(Arpeggio_engraver, rhythmic_head)
-ADD_ACKNOWLEDGER(Arpeggio_engraver, note_column)
+ADD_ACKNOWLEDGER (Arpeggio_engraver, stem)
+ADD_ACKNOWLEDGER (Arpeggio_engraver, rhythmic_head)
+ADD_ACKNOWLEDGER (Arpeggio_engraver, note_column)
 
 ADD_TRANSLATOR (Arpeggio_engraver,
                /* descr */ "Generate an Arpeggio symbol",

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index a578ac5d5069800419b67c914d91057f42c02100..5ca16b50535e547e0c06d9285572823b8a0eb612 100644 (file)
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -55,14 +55,10 @@ Arpeggio::print (SCM smob)
                   - my_y);
     }
 
-  if (heads.is_empty ())
+  if (heads.is_empty () || heads.length () < 0.5)
     {
-      /*
-       Dumb blonde error
-
-       :-)
-      */
       programming_error ("no heads for arpeggio found?");
+      me->suicide ();
       return SCM_EOL;
     }
 
@@ -103,9 +99,7 @@ SCM
 Arpeggio::brew_chord_bracket (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-
   Grob *common = me;
-
   
   extract_grob_set (me, "stems", stems);
   for (int i = 0;  i < stems.size(); i++)

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index aa020c7e16b632b397be0125c0103d05b97833fb..8cff65e02ce0539e16b917516fd08d83c6611066 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -32,10 +32,10 @@ protected:
   virtual bool try_music (Music *);
   virtual void finalize ();
 
-  DECLARE_ACKNOWLEDGER(rest);
-  DECLARE_ACKNOWLEDGER(beam);
-  DECLARE_ACKNOWLEDGER(bar_line);
-  DECLARE_ACKNOWLEDGER(stem);
+  DECLARE_ACKNOWLEDGER (rest);
+  DECLARE_ACKNOWLEDGER (beam);
+  DECLARE_ACKNOWLEDGER (bar_line);
+  DECLARE_ACKNOWLEDGER (stem);
   
   void process_acknowledged ();
 
@@ -422,10 +422,10 @@ Auto_beam_engraver::process_acknowledged ()
   process_acknowledged_count_++;
 }
 
-ADD_ACKNOWLEDGER(Auto_beam_engraver,stem);
-ADD_ACKNOWLEDGER(Auto_beam_engraver,bar_line);
-ADD_ACKNOWLEDGER(Auto_beam_engraver,beam);
-ADD_ACKNOWLEDGER(Auto_beam_engraver,rest);
+ADD_ACKNOWLEDGER (Auto_beam_engraver,stem);
+ADD_ACKNOWLEDGER (Auto_beam_engraver,bar_line);
+ADD_ACKNOWLEDGER (Auto_beam_engraver,beam);
+ADD_ACKNOWLEDGER (Auto_beam_engraver,rest);
 ADD_TRANSLATOR (Auto_beam_engraver,
                /* descr */ "Generate beams based on measure characteristics and observed "
                "Stems.  Uses beatLength, measureLength and measurePosition to decide "

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 42a8ba30bec2946bf5da9727bd5492a13fa84045..e19947002f884fd012abcf807f7f897f2e4e5341 100644 (file)
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -121,7 +121,7 @@ Axis_group_engraver::add_element (Grob *e)
   Axis_group_interface::add_element (staffline_, e);
 }
 
-ADD_ACKNOWLEDGER(Axis_group_engraver, grob);
+ADD_ACKNOWLEDGER (Axis_group_engraver, grob);
 
 ADD_TRANSLATOR (Axis_group_engraver,
                /* descr */ "Group all objects created in this context in a VerticalAxisGroup spanner.",

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index f54bcc97a9d8d68601cbd1a58c11425b046f337f..0dd53a9e3214127558a247e143413f869cc7c6b7 100644 (file)
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -27,7 +27,7 @@ protected:
   Item *text_;
 protected:
   void stop_translation_timestep ();
-  DECLARE_ACKNOWLEDGER(break_aligned);
+  DECLARE_ACKNOWLEDGER (break_aligned);
   void process_music ();
   void create_items ();
   TRANSLATOR_DECLARATIONS (Bar_number_engraver);

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index b6168fb863b1681cc6525a346e7ee9f52d089191..ac1fd9977c0613df8ee392e00372f6ba7b0a38c8 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -24,8 +24,8 @@
 class Beam_engraver : public Engraver
 {
 public:
-  DECLARE_ACKNOWLEDGER(stem);
-  DECLARE_ACKNOWLEDGER(rest);
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (rest);
 protected:
   Music *start_ev_;
 
@@ -272,8 +272,8 @@ Beam_engraver::acknowledge_stem (Grob_info info)
     }
 }
 
-ADD_ACKNOWLEDGER(Beam_engraver, stem);
-ADD_ACKNOWLEDGER(Beam_engraver, rest);
+ADD_ACKNOWLEDGER (Beam_engraver, stem);
+ADD_ACKNOWLEDGER (Beam_engraver, rest);
 
 ADD_TRANSLATOR (Beam_engraver,
                /* descr */ "Handles Beam events by engraving Beams.    If omitted, then notes will be "
@@ -311,8 +311,8 @@ Grace_beam_engraver::valid_end_point ()
   return beam_ && valid_start_point ();
 }
 
-ADD_ACKNOWLEDGER(Grace_beam_engraver, stem);
-ADD_ACKNOWLEDGER(Grace_beam_engraver, rest);
+ADD_ACKNOWLEDGER (Grace_beam_engraver, stem);
+ADD_ACKNOWLEDGER (Grace_beam_engraver, rest);
 ADD_TRANSLATOR (Grace_beam_engraver,
                /* descr */ "Handles Beam events by engraving Beams.  If omitted, then notes will "
                "be printed with flags instead of beams. Only engraves beams when we "

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 12e14293b1e96fd44c7d143509811e3cea5990fc..c43008b3c07516f9ff759e6bc5922400d5d413cb 100644 (file)
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -27,7 +27,7 @@ protected:
   virtual void derived_mark () const;
 public:
   TRANSLATOR_DECLARATIONS (Break_align_engraver);
-  DECLARE_ACKNOWLEDGER(break_aligned);
+  DECLARE_ACKNOWLEDGER (break_aligned);
 
 };
 
@@ -121,7 +121,7 @@ Break_align_engraver::add_to_group (SCM align_name, Item *item)
     }
   Axis_group_interface::add_element (group, item);
 }
-ADD_ACKNOWLEDGER(Break_align_engraver, break_aligned);
+ADD_ACKNOWLEDGER (Break_align_engraver, break_aligned);
 ADD_TRANSLATOR (Break_align_engraver,
                "Align grobs with corresponding @code{break-align-symbols} into "
                "groups, and order the groups according to @code{breakAlignOrder}. "

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index a11536eb647cd3212348c8b0cda7338ea856ea84..0bba903656f47ca2e0a70a50cd2c4fefa8a9f719 100644 (file)
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -61,7 +61,7 @@ protected:
   void stop_translation_timestep ();
   void start_translation_timestep ();
   void process_music ();
-  DECLARE_ACKNOWLEDGER(stem);
+  DECLARE_ACKNOWLEDGER (stem);
 };
 
 Chord_tremolo_engraver::Chord_tremolo_engraver ()
@@ -209,7 +209,7 @@ Chord_tremolo_engraver::stop_translation_timestep ()
 }
 
 
-ADD_ACKNOWLEDGER(Chord_tremolo_engraver,stem);
+ADD_ACKNOWLEDGER (Chord_tremolo_engraver,stem);
 ADD_TRANSLATOR (Chord_tremolo_engraver,
                /* descr */ "Generates beams for  tremolo repeats.",
                /* creats*/ "Beam",

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index eba9b464208dfd0b04e485b72ab7efa4e191337f..629ffee80c182c901cc6c14a50717a4cc2a1d5de 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -29,7 +29,7 @@ public:
 protected:
   void stop_translation_timestep ();
   void process_music ();
-  DECLARE_ACKNOWLEDGER(bar_line);
+  DECLARE_ACKNOWLEDGER (bar_line);
 private:
   Item *clef_;
   Item *octavate_;
@@ -183,7 +183,7 @@ Clef_engraver::stop_translation_timestep ()
     }
 }
 
-ADD_ACKNOWLEDGER(Clef_engraver, bar_line);
+ADD_ACKNOWLEDGER (Clef_engraver, bar_line);
 ADD_TRANSLATOR (Clef_engraver,
                /* descr */ "Determine and set reference point for pitches",
                /* creats*/ "Clef OctavateEight",

diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index 33f91adb2919aa506f2374ea2040d01e95803fa2..2e719337b052d8c3558f613f5e1fc1e5873ebf65 100644 (file)
--- a/lily/cluster-engraver.cc
+++ b/lily/cluster-engraver.cc
@@ -20,7 +20,7 @@ protected:
   TRANSLATOR_DECLARATIONS (Cluster_spanner_engraver);
   virtual bool try_music (Music *);
   void process_music ();
-  DECLARE_ACKNOWLEDGER(note_column);
+  DECLARE_ACKNOWLEDGER (note_column);
   void stop_translation_timestep ();
   virtual void finalize ();
 private:
@@ -127,7 +127,7 @@ Cluster_spanner_engraver::acknowledge_note_column (Grob_info info)
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Cluster_spanner_engraver, note_column);
+ADD_ACKNOWLEDGER (Cluster_spanner_engraver, note_column);
 ADD_TRANSLATOR (Cluster_spanner_engraver,
                /* descr */     "Engraves a cluster using Spanner notation ",
                /* creats*/     "ClusterSpanner ClusterSpannerBeacon",

diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc
index 61588019da9260963f656706f3fa84e0d413eb90..0d777f37540a81b3772d6a58629d6368b88181f0 100644 (file)
--- a/lily/coherent-ligature-engraver.cc
+++ b/lily/coherent-ligature-engraver.cc
@@ -219,8 +219,8 @@ Coherent_ligature_engraver::typeset_ligature (Spanner *ligature,
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Coherent_ligature_engraver, note_head);
-ADD_ACKNOWLEDGER(Coherent_ligature_engraver, rest);
+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*/ "",

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 2a61907af2a7fef3844b297c5ff07dc6e5ef5eb4..b67a8d8d3c6926f6af3326aab0c258fb76b68401 100644 (file)
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -18,7 +18,7 @@ class Collision_engraver : public Engraver
   Link_array<Grob> note_columns_;
 
 protected:
-  DECLARE_ACKNOWLEDGER(note_column);
+  DECLARE_ACKNOWLEDGER (note_column);
   void process_acknowledged ();
   void stop_translation_timestep ();
 public:
@@ -66,7 +66,7 @@ Collision_engraver::Collision_engraver ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Collision_engraver, note_column);
+ADD_ACKNOWLEDGER (Collision_engraver, note_column);
 
 ADD_TRANSLATOR (Collision_engraver,
                /* descr */ "Collect NoteColumns, and as soon as there are two or more, put them in a NoteCollision object.",

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 6b137c921c7b8e956b6680ac6439bd970646b221..3a82af9c7bcba5e4688371b64f82f1bfa21bd3cc 100644 (file)
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -29,8 +29,8 @@ class Custos_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Custos_engraver);
   void start_translation_timestep ();
-  DECLARE_ACKNOWLEDGER(bar);
-  DECLARE_ACKNOWLEDGER(note_head);
+  DECLARE_ACKNOWLEDGER (bar);
+  DECLARE_ACKNOWLEDGER (note_head);
   void process_acknowledged ();
   void stop_translation_timestep ();
   virtual void finalize ();
@@ -136,8 +136,8 @@ Custos_engraver::finalize ()
 }
 
 
-ADD_ACKNOWLEDGER(Custos_engraver,bar);
-ADD_ACKNOWLEDGER(Custos_engraver,note_head);
+ADD_ACKNOWLEDGER (Custos_engraver,bar);
+ADD_ACKNOWLEDGER (Custos_engraver,note_head);
 
 ADD_TRANSLATOR (Custos_engraver,
                /* descr */ "",

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index f66f5a13b332428c9c60730dda29e1b31dea931e..cba7f2f282cbac4fd0af4e643c1a97a791544caa 100644 (file)
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -23,8 +23,8 @@ public:
 
 protected:
 
-  DECLARE_ACKNOWLEDGER(stem);
-  DECLARE_ACKNOWLEDGER(rhythmic_head);
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
   
   void stop_translation_timestep ();
 };
@@ -73,8 +73,8 @@ Dot_column_engraver::acknowledge_stem (Grob_info info)
   stem_ = info.grob ();
 }
 
-ADD_ACKNOWLEDGER(Dot_column_engraver, stem);
-ADD_ACKNOWLEDGER(Dot_column_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Dot_column_engraver, stem);
+ADD_ACKNOWLEDGER (Dot_column_engraver, rhythmic_head);
 ADD_TRANSLATOR (Dot_column_engraver,
                /* descr */ "Engraves dots on dotted notes shifted to the right of the note.\n"
                "If omitted, then dots appear on top of the notes.",

diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index 221fe7b44fd945475f315a9477cff3925f212fd1..8e99a654a7e49f2ad89fbcc623fc4aae613bd010 100644 (file)
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -28,8 +28,8 @@ public:
 protected:
   virtual bool try_music (Music *ev);
   void process_music ();
-  DECLARE_ACKNOWLEDGER(stem);
-  DECLARE_ACKNOWLEDGER(note_column);
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (note_column);
   void stop_translation_timestep ();
 };
 
@@ -164,8 +164,8 @@ Drum_notes_engraver::stop_translation_timestep ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Drum_notes_engraver, stem);
-ADD_ACKNOWLEDGER(Drum_notes_engraver,note_column);
+ADD_ACKNOWLEDGER (Drum_notes_engraver, stem);
+ADD_ACKNOWLEDGER (Drum_notes_engraver,note_column);
 ADD_TRANSLATOR (Drum_notes_engraver,
                /* descr */ "Generate noteheads.",
                /* creats*/ "NoteHead Dots Script",

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 47990741560cb380a9cfe4733fe689c20d664290..6575d8962c8a23fa50c8d2c9ca8575705c0123a2 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -60,8 +60,8 @@ class Dynamic_engraver : public Engraver
   void typeset_all ();
 
   TRANSLATOR_DECLARATIONS (Dynamic_engraver);
-  DECLARE_ACKNOWLEDGER(script);
-  DECLARE_ACKNOWLEDGER(note_column);
+  DECLARE_ACKNOWLEDGER (script);
+  DECLARE_ACKNOWLEDGER (note_column);
 
 
 protected:
@@ -431,8 +431,8 @@ Dynamic_engraver::acknowledge_script (Grob_info info)
 }
 
 
-ADD_ACKNOWLEDGER(Dynamic_engraver,script);
-ADD_ACKNOWLEDGER(Dynamic_engraver,note_column);
+ADD_ACKNOWLEDGER (Dynamic_engraver,script);
+ADD_ACKNOWLEDGER (Dynamic_engraver,note_column);
 
 ADD_TRANSLATOR (Dynamic_engraver,
                /* descr */

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 71741e5a6090c15abf6f65be26b371b8b16aab0e..2ba3a046570926848e5f41354fa266c73b49806f 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -28,7 +28,7 @@ public:
   TRANSLATOR_DECLARATIONS (Extender_engraver);
 
 protected:
-  DECLARE_ACKNOWLEDGER(lyric_syllable);
+  DECLARE_ACKNOWLEDGER (lyric_syllable);
   virtual void finalize ();
   virtual bool try_music (Music *);
   void stop_translation_timestep ();
@@ -145,7 +145,7 @@ Extender_engraver::finalize ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Extender_engraver,lyric_syllable);
+ADD_ACKNOWLEDGER (Extender_engraver,lyric_syllable);
 ADD_TRANSLATOR (Extender_engraver,
                /* descr */ "Create lyric extenders",
                /* creats*/ "LyricExtender",

diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index 2fa125744e7e5ddb6e829bf5d7a01ddfa4bf4660..bb4902b1869985a1b6ebeecdfba908d6fdddd84a 100644 (file)
--- a/lily/fingering-engraver.cc
+++ b/lily/fingering-engraver.cc
@@ -25,8 +25,8 @@ protected:
   virtual bool try_music (Music *m);
   void stop_translation_timestep ();
   void process_music ();
-  DECLARE_ACKNOWLEDGER(rhythmic_head);
-  DECLARE_ACKNOWLEDGER(stem);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+  DECLARE_ACKNOWLEDGER (stem);
 
 private:
   void make_script (Direction, Music *, int);
@@ -139,8 +139,8 @@ Fingering_engraver::Fingering_engraver ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Fingering_engraver,rhythmic_head);
-ADD_ACKNOWLEDGER(Fingering_engraver,stem);
+ADD_ACKNOWLEDGER (Fingering_engraver,rhythmic_head);
+ADD_ACKNOWLEDGER (Fingering_engraver,stem);
 ADD_TRANSLATOR (Fingering_engraver,
                /* descr */ "Create fingering-scripts",
                /* creats*/ "Fingering",

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index d1b4e5580b11d41beb8b533b2e8d0919c1b3076f..023ac9a3a6f97c1132d98f31293c93bb5c1a8edb 100644 (file)
--- a/lily/font-size-engraver.cc
+++ b/lily/font-size-engraver.cc
@@ -14,7 +14,7 @@ class Font_size_engraver : public Engraver
 
   TRANSLATOR_DECLARATIONS (Font_size_engraver);
 protected:
-  DECLARE_ACKNOWLEDGER(font);
+  DECLARE_ACKNOWLEDGER (font);
   virtual void process_music ();
   Real size;
 private:
@@ -51,7 +51,7 @@ Font_size_engraver::acknowledge_font (Grob_info gi)
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Font_size_engraver,font);
+ADD_ACKNOWLEDGER (Font_size_engraver,font);
 ADD_TRANSLATOR (Font_size_engraver,
                /* descr */ "Puts fontSize into font-relative-size grob property.",
                /* creats*/ "",

diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc
index 8479b53ab7e833e2e75400021a823cc7d61148ca..cfc018dc0306a60eaf152cab49da75a6dd30421b 100644 (file)
--- a/lily/glissando-engraver.cc
+++ b/lily/glissando-engraver.cc
@@ -21,7 +21,7 @@ public:
   TRANSLATOR_DECLARATIONS (Glissando_engraver);
 
 protected:
-  DECLARE_ACKNOWLEDGER(rhythmic_head);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
   virtual void finalize ();
   void stop_translation_timestep ();
   virtual bool try_music (Music *);
@@ -105,7 +105,7 @@ Glissando_engraver::finalize ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Glissando_engraver,rhythmic_head);
+ADD_ACKNOWLEDGER (Glissando_engraver,rhythmic_head);
 ADD_TRANSLATOR (Glissando_engraver,
                /* descr */ "Engrave a glissandi",
                /* creats*/ "Glissando",

diff --git a/lily/gregorian-ligature-engraver.cc b/lily/gregorian-ligature-engraver.cc
index 4098070e0685f7cc59a6b389e7aaddfdb66a4557..a38c9ef095c25824e3b5c7ff8306fa0452e52f68 100644 (file)
--- a/lily/gregorian-ligature-engraver.cc
+++ b/lily/gregorian-ligature-engraver.cc
@@ -275,8 +275,8 @@ Gregorian_ligature_engraver::stop_translation_timestep ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Gregorian_ligature_engraver, rest);
-ADD_ACKNOWLEDGER(Gregorian_ligature_engraver, note_head);
+ADD_ACKNOWLEDGER (Gregorian_ligature_engraver, rest);
+ADD_ACKNOWLEDGER (Gregorian_ligature_engraver, note_head);
 ADD_TRANSLATOR (Gregorian_ligature_engraver,
                /* descr */ "This is an abstract class.  Subclasses such as Vaticana_ligature_engraver handle ligatures by glueing special ligature heads together.",
                /* creats*/ "",

diff --git a/lily/grid-line-span-engraver.cc b/lily/grid-line-span-engraver.cc
index b6a96ab8f76f5dd2a32f167833e978411a2f0643..d35a761852af2b427e583a5c978a446673e8f7c2 100644 (file)
--- a/lily/grid-line-span-engraver.cc
+++ b/lily/grid-line-span-engraver.cc
@@ -19,7 +19,7 @@ class Grid_line_span_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Grid_line_span_engraver);
 protected:
-  DECLARE_ACKNOWLEDGER(grid_point);
+  DECLARE_ACKNOWLEDGER (grid_point);
   void stop_translation_timestep ();
 };
 
@@ -59,7 +59,7 @@ Grid_line_span_engraver::stop_translation_timestep ()
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Grid_line_span_engraver, grid_point);
+ADD_ACKNOWLEDGER (Grid_line_span_engraver, grid_point);
 ADD_TRANSLATOR (Grid_line_span_engraver,
                /* descr */ "This engraver makes cross-staff linelines: It catches all normal "
                "line lines, and draws a single span-line across them.",

diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index 28f405021af50e92294af0b765ddded2215fc318..3aebd0eb13b5bf52851b6c2102a5efedf33d6f09 100644 (file)
--- a/lily/grob-pq-engraver.cc
+++ b/lily/grob-pq-engraver.cc
@@ -28,7 +28,7 @@ public:
   TRANSLATOR_DECLARATIONS (Grob_pq_engraver);
 protected:
   virtual void initialize ();
-  DECLARE_ACKNOWLEDGER(grob);
+  DECLARE_ACKNOWLEDGER (grob);
   void start_translation_timestep ();
   void stop_translation_timestep ();
 
@@ -135,7 +135,7 @@ Grob_pq_engraver::start_translation_timestep ()
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Grob_pq_engraver, grob);
+ADD_ACKNOWLEDGER (Grob_pq_engraver, grob);
 ADD_TRANSLATOR (Grob_pq_engraver,
 
                /* descr */ "Administrate when certain grobs (eg. note heads) stop playing",

diff --git a/lily/hara-kiri-engraver.cc b/lily/hara-kiri-engraver.cc
index 7bc84f870a65418bf87b36efc2a9f6f20cd71400..2460e0e7b770ff7d4aaee94d0bf56d65d19a751b 100644 (file)
--- a/lily/hara-kiri-engraver.cc
+++ b/lily/hara-kiri-engraver.cc
@@ -18,7 +18,7 @@ class Hara_kiri_engraver : public Axis_group_engraver
 {
 protected:
   virtual Spanner *get_spanner ();
-  DECLARE_ACKNOWLEDGER(grob);
+  DECLARE_ACKNOWLEDGER (grob);
   virtual void add_element (Grob *e);
   void start_translation_timestep ();
 
@@ -69,7 +69,7 @@ Hara_kiri_engraver::Hara_kiri_engraver ()
 }
 
 
-ADD_ACKNOWLEDGER(Hara_kiri_engraver, grob);
+ADD_ACKNOWLEDGER (Hara_kiri_engraver, grob);
 ADD_TRANSLATOR (Hara_kiri_engraver,
                /* descr */ "Like Axis_group_engraver, but make a hara-kiri spanner, and add "
                "interesting items (ie. note heads, lyric syllables and normal rests) ",

diff --git a/lily/horizontal-bracket-engraver.cc b/lily/horizontal-bracket-engraver.cc
index e63af5f45a2fe24eb2d3c30bf084c61bfe770ea9..4670e4805fc04101fbfb83ae1cdf8293a83329af 100644 (file)
--- a/lily/horizontal-bracket-engraver.cc
+++ b/lily/horizontal-bracket-engraver.cc
@@ -26,11 +26,11 @@ public:
   virtual bool try_music (Music *);
   void stop_translation_timestep ();
   void process_music ();
-  DECLARE_ACKNOWLEDGER(note_column);
+  DECLARE_ACKNOWLEDGER (note_column);
 };
 
 
-ADD_ACKNOWLEDGER(Horizontal_bracket_engraver,note_column);
+ADD_ACKNOWLEDGER (Horizontal_bracket_engraver,note_column);
 ADD_TRANSLATOR (Horizontal_bracket_engraver,
                "Create horizontal brackets over notes for musical analysis purposes.",
                "HorizontalBracket",

diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc
index 151933c28ce009f74bbcbf30a2c32c03f527fcfe..4a8109a4af9e677ece896fefac735431ed0f0fc5 100644 (file)
--- a/lily/hyphen-engraver.cc
+++ b/lily/hyphen-engraver.cc
@@ -24,7 +24,7 @@ public:
   TRANSLATOR_DECLARATIONS (Hyphen_engraver);
 
 protected:
-  DECLARE_ACKNOWLEDGER(lyric_syllable);
+  DECLARE_ACKNOWLEDGER (lyric_syllable);
   virtual void finalize ();
   virtual bool try_music (Music *);
   void stop_translation_timestep ();
@@ -134,7 +134,7 @@ Hyphen_engraver::stop_translation_timestep ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Hyphen_engraver,lyric_syllable);
+ADD_ACKNOWLEDGER (Hyphen_engraver,lyric_syllable);
 ADD_TRANSLATOR (Hyphen_engraver,
                /* descr */ "Create lyric hyphens",
                /* creats*/ "LyricHyphen",

diff --git a/lily/include/axis-group-engraver.hh b/lily/include/axis-group-engraver.hh
index 40353c64e039c28c1d9b8c735ff191fd8ef3c957..22563ac05e9ef078a0e68256a1e6e32a6631f45c 100644 (file)
--- a/lily/include/axis-group-engraver.hh
+++ b/lily/include/axis-group-engraver.hh
@@ -23,7 +23,7 @@ protected:
   Link_array<Grob> elts_;
   void process_music ();
   virtual void finalize ();
-  DECLARE_ACKNOWLEDGER(grob);
+  DECLARE_ACKNOWLEDGER (grob);
   void process_acknowledged ();
   virtual Spanner *get_spanner ();
   virtual void add_element (Grob *);

diff --git a/lily/include/ligature-engraver.hh b/lily/include/ligature-engraver.hh
index f1feab679e1a6c9076c68d5f5a60ed244714f6ed..80c8537af6458c0f881fbdaffe6177fdee482768 100644 (file)
--- a/lily/include/ligature-engraver.hh
+++ b/lily/include/ligature-engraver.hh
@@ -34,8 +34,8 @@ protected:
   virtual void finalize ();
 
 
-  DECLARE_ACKNOWLEDGER(rest);
-  DECLARE_ACKNOWLEDGER(note_head);
+  DECLARE_ACKNOWLEDGER (rest);
+  DECLARE_ACKNOWLEDGER (note_head);
   virtual bool try_music (Music *);
   void process_music ();
   virtual Spanner *create_ligature_spanner (); /* abstract method */

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index a6abdb3324a0f071caa8323b7b84b2e77609eb63..2348e318a512ebf4d09c8681ce3cba5d47b66922 100644 (file)
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -22,6 +22,7 @@ public:
   static int shift_compare (Grob *const &, Grob *const &);
   static Direction dir (Grob *me);
   static Grob *accidentals (Grob *me);
+  static Grob *arpeggio (Grob *me);
   static Slice head_positions_interval (Grob *me);
   static Direction static_dir (Grob *);
   static void translate_rests (Grob *me, int dy);

diff --git a/lily/include/paper-column-engraver.hh b/lily/include/paper-column-engraver.hh
index 8c82d0dadb54742e5ea7838befc403d349753624..651e7c786b8126e2121d4bae6152c54520b273d7 100644 (file)
--- a/lily/include/paper-column-engraver.hh
+++ b/lily/include/paper-column-engraver.hh
@@ -28,9 +28,9 @@ protected:
   virtual void finalize ();
   virtual bool try_music (Music*);
 
-  DECLARE_ACKNOWLEDGER(item);
-  DECLARE_ACKNOWLEDGER(note_spacing);
-  DECLARE_ACKNOWLEDGER(staff_spacing);
+  DECLARE_ACKNOWLEDGER (item);
+  DECLARE_ACKNOWLEDGER (note_spacing);
+  DECLARE_ACKNOWLEDGER (staff_spacing);
 
   System *system_;
   Music *break_event_;

diff --git a/lily/include/staff-symbol-engraver.hh b/lily/include/staff-symbol-engraver.hh
index 97ee8243851b7b135cc038581f755fa9fa1ddf7a..6c0d0730a200f2879b68207d663e295769be2c5a 100644 (file)
--- a/lily/include/staff-symbol-engraver.hh
+++ b/lily/include/staff-symbol-engraver.hh
@@ -33,7 +33,7 @@ protected:
   void stop_translation_timestep ();
   virtual bool try_music (Music *);
   virtual ~Staff_symbol_engraver ();
-  DECLARE_ACKNOWLEDGER(grob);
+  DECLARE_ACKNOWLEDGER (grob);
   virtual void finalize ();
   void process_music ();
 };

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 3f01e8c12f84ad0c4f39f61153c0676e3c3b0bdf..0b1674c089b9c5f5dca20edd90fffb7c87dd5c82 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -30,8 +30,8 @@ protected:
   virtual void create_text ();
   virtual void initialize ();
 
-  DECLARE_ACKNOWLEDGER(bar_line);
-  DECLARE_ACKNOWLEDGER(axis_group);
+  DECLARE_ACKNOWLEDGER (bar_line);
+  DECLARE_ACKNOWLEDGER (axis_group);
   
   void stop_translation_timestep ();
   void process_music ();
@@ -140,8 +140,8 @@ Instrument_name_engraver::process_music ()
 #include "translator.icc"
 
 
-ADD_ACKNOWLEDGER(Instrument_name_engraver, bar_line);
-ADD_ACKNOWLEDGER(Instrument_name_engraver, axis_group);
+ADD_ACKNOWLEDGER (Instrument_name_engraver, bar_line);
+ADD_ACKNOWLEDGER (Instrument_name_engraver, axis_group);
 ADD_TRANSLATOR (Instrument_name_engraver,
                /* descr */ " Prints the name of the instrument (specified by "
                " @code{Staff.instrument} and @code{Staff.instr}) "
@@ -187,8 +187,8 @@ Vocal_name_engraver::create_text ()
     text_->set_property ("text", txt);
 }
 
-ADD_ACKNOWLEDGER(Vocal_name_engraver, bar_line);
-ADD_ACKNOWLEDGER(Vocal_name_engraver, axis_group);
+ADD_ACKNOWLEDGER (Vocal_name_engraver, bar_line);
+ADD_ACKNOWLEDGER (Vocal_name_engraver, axis_group);
 ADD_TRANSLATOR (Vocal_name_engraver,
                /* descr */ " Prints the name of the a lyric voice (specified by "
                " @code{Staff.vocalName} and @code{Staff.vocNam}) "

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index 450b2c50e505fd60f8a45e0ed610fd39ec72974b..13c6ff50d04a0f0851d48d8f0e2775eb8b8f8fae 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -40,8 +40,8 @@ protected:
   void stop_translation_timestep ();
   void process_music ();
 
-  DECLARE_ACKNOWLEDGER(clef);
-  DECLARE_ACKNOWLEDGER(bar_line);
+  DECLARE_ACKNOWLEDGER (clef);
+  DECLARE_ACKNOWLEDGER (bar_line);
   
 };
 
@@ -182,8 +182,8 @@ Key_engraver::initialize ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Key_engraver,clef);
-ADD_ACKNOWLEDGER(Key_engraver,bar_line);
+ADD_ACKNOWLEDGER (Key_engraver,clef);
+ADD_ACKNOWLEDGER (Key_engraver,bar_line);
 ADD_TRANSLATOR (Key_engraver,
                /* descr */ "",
                /* creats*/ "KeySignature",

diff --git a/lily/ledger-line-engraver.cc b/lily/ledger-line-engraver.cc
index 19b00a56bbdd02d4ba59eb3206c67238fe0e946a..ad15e9f4957dadcf475a50d6f84689b0b9b04ba4 100644 (file)
--- a/lily/ledger-line-engraver.cc
+++ b/lily/ledger-line-engraver.cc
@@ -22,8 +22,8 @@ protected:
   virtual void finalize ();
   void process_music ();
  
-  DECLARE_ACKNOWLEDGER(ledgered);
-  DECLARE_ACKNOWLEDGER(staff_symbol);
+  DECLARE_ACKNOWLEDGER (ledgered);
+  DECLARE_ACKNOWLEDGER (staff_symbol);
 
   void start_spanner ();
   void stop_spanner ();
@@ -92,8 +92,8 @@ Ledger_line_engraver::acknowledge_ledgered (Grob_info s)
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Ledger_line_engraver,ledgered);
-ADD_ACKNOWLEDGER(Ledger_line_engraver,staff_symbol);
+ADD_ACKNOWLEDGER (Ledger_line_engraver,ledgered);
+ADD_ACKNOWLEDGER (Ledger_line_engraver,staff_symbol);
 ADD_TRANSLATOR (Ledger_line_engraver,
                "Creates the spanner to draw ledger lines, and notices objects that need ledger lines",
                /* creats*/ "LedgerLineSpanner",

diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc
index 25702af274c554780a8a02efa7103144f972a602..b483f660586b841715d7ae76d18d640d8fd7292b 100644 (file)
--- a/lily/ligature-bracket-engraver.cc
+++ b/lily/ligature-bracket-engraver.cc
@@ -21,8 +21,8 @@ class Ligature_bracket_engraver : public Ligature_engraver
 {
 protected:
   virtual Spanner *create_ligature_spanner ();
-  DECLARE_ACKNOWLEDGER(rest);
-  DECLARE_ACKNOWLEDGER(note_column);
+  DECLARE_ACKNOWLEDGER (rest);
+  DECLARE_ACKNOWLEDGER (note_column);
 public:
   TRANSLATOR_DECLARATIONS (Ligature_bracket_engraver);
 };
@@ -56,8 +56,8 @@ Ligature_bracket_engraver::acknowledge_rest (Grob_info info)
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Ligature_bracket_engraver, rest);
-ADD_ACKNOWLEDGER(Ligature_bracket_engraver, note_column);
+ADD_ACKNOWLEDGER (Ligature_bracket_engraver, rest);
+ADD_ACKNOWLEDGER (Ligature_bracket_engraver, note_column);
 ADD_TRANSLATOR (Ligature_bracket_engraver,
                /* descr */ "Handles Ligature_events by engraving Ligature brackets.",
                /* creats*/ "TupletBracket",

diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index 115eecb66287bbc2f9c5cd30eba191c22e6456c9..d200e65ba3357063ae091546c776f3933545cb02 100644 (file)
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -290,8 +290,8 @@ Ligature_engraver::acknowledge_rest (Grob_info info)
 }
 
 
-ADD_ACKNOWLEDGER(Ligature_engraver, rest);
-ADD_ACKNOWLEDGER(Ligature_engraver, note_head);
+ADD_ACKNOWLEDGER (Ligature_engraver, rest);
+ADD_ACKNOWLEDGER (Ligature_engraver, note_head);
 ADD_TRANSLATOR (Ligature_engraver,
                /* descr */ "Abstract class; a concrete subclass handles Ligature_events by engraving Ligatures in a concrete style.",
                /* creats */ "",

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 6ece619883e79ee50763dfc5f88909023cd76253..97b2649f50c27df524b2c7a37d91970afe9f13ba 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -27,7 +27,7 @@ protected:
   Item *text_;
 protected:
   void stop_translation_timestep ();
-  DECLARE_ACKNOWLEDGER(bar_line);
+  DECLARE_ACKNOWLEDGER (bar_line);
   void create_items (Music *);
   virtual bool try_music (Music *ev);
   void process_music ();
@@ -132,7 +132,7 @@ Mark_engraver::process_music ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Mark_engraver,bar_line);
+ADD_ACKNOWLEDGER (Mark_engraver,bar_line);
 ADD_TRANSLATOR (Mark_engraver,
                /* descr */ "This engraver will create RehearsalMark objects. "
                "It puts them on top of all staves (which is taken from "

diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index e6f1265b8ff53904b6afe4dd65cf68d7f1e24327..fb9a27477bb067d4433ea51b4cbc16efb4616225 100644 (file)
--- a/lily/measure-grouping-engraver.cc
+++ b/lily/measure-grouping-engraver.cc
@@ -24,7 +24,7 @@ protected:
 
   void process_music ();
   virtual void finalize ();
-  DECLARE_ACKNOWLEDGER(note_column);
+  DECLARE_ACKNOWLEDGER (note_column);
 };
 
 void
@@ -107,7 +107,7 @@ Measure_grouping_engraver::Measure_grouping_engraver ()
   grouping_ = 0;
 }
 
-ADD_ACKNOWLEDGER(Measure_grouping_engraver, note_column);
+ADD_ACKNOWLEDGER (Measure_grouping_engraver, note_column);
 ADD_TRANSLATOR (Measure_grouping_engraver,
                /* descr */ "Creates MeasureGrouping to indicate beat subdivision.",
                /* creats*/ "MeasureGrouping",

diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc
index 57408c22d4109ecf9b6e887d070f738d59f6de4f..cc961e6ce0ee0bee0ea87ee74aec6263f26d2ba2 100644 (file)
--- a/lily/mensural-ligature-engraver.cc
+++ b/lily/mensural-ligature-engraver.cc
@@ -385,8 +385,8 @@ Mensural_ligature_engraver::build_ligature (Spanner *ligature,
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Mensural_ligature_engraver, rest);
-ADD_ACKNOWLEDGER(Mensural_ligature_engraver, note_head);
+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",

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 00a28697eab1035a0095815df36366f9b9c42f24..f28bcb46cad5e9804c0228bbd9afb4135b1785b6 100644 (file)
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -52,8 +52,8 @@ public:
   TRANSLATOR_DECLARATIONS (New_fingering_engraver);
 protected:
   void stop_translation_timestep ();
-  DECLARE_ACKNOWLEDGER(rhythmic_head);
-  DECLARE_ACKNOWLEDGER(stem);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+  DECLARE_ACKNOWLEDGER (stem);
   void add_fingering (Grob *, Music *, Music *);
   void add_script (Grob *, Music *, Music *);
   void add_string (Grob *, Music *, Music *);
@@ -361,8 +361,8 @@ New_fingering_engraver::New_fingering_engraver ()
 {
   stem_ = 0;
 }
-ADD_ACKNOWLEDGER(New_fingering_engraver, rhythmic_head);
-ADD_ACKNOWLEDGER(New_fingering_engraver, stem);
+ADD_ACKNOWLEDGER (New_fingering_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (New_fingering_engraver, stem);
 
 ADD_TRANSLATOR (New_fingering_engraver,
                /* descr */ "Create fingering-scripts for notes in a new chord.  "

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 458e60aad40b91cb0f4789f14dceac9303f19027..94e01ff5e9930cae96b35894b6fe7cd401463caa 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -178,7 +178,13 @@ Note_column::accidentals (Grob *me)
   return acc;
 }
 
+
+Grob *
+Note_column::arpeggio (Grob *me)
+{
+  return unsmob_grob (me->get_object ("arpeggio"));
+}
+
 ADD_INTERFACE (Note_column, "note-column-interface",
               "Stem and noteheads combined",
               "arpeggio note-heads rest-collision rest horizontal-shift stem accidentals force-hshift");
-

diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index 51cfd37f1759c5f505ebfd30f16d273b6c6e4dd0..1f6a0ebd45120081b0593acd91026ceccb815f6f 100644 (file)
--- a/lily/note-head-line-engraver.cc
+++ b/lily/note-head-line-engraver.cc
@@ -26,7 +26,7 @@ public:
   TRANSLATOR_DECLARATIONS (Note_head_line_engraver);
 
 protected:
-  DECLARE_ACKNOWLEDGER(rhythmic_head);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
   void process_acknowledged ();
   void stop_translation_timestep ();
 
@@ -97,7 +97,7 @@ Note_head_line_engraver::stop_translation_timestep ()
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Note_head_line_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Note_head_line_engraver, rhythmic_head);
 ADD_TRANSLATOR (Note_head_line_engraver,
                /* descr */ "Engrave a line between two note heads, for example a glissando.  If "
                " followVoice is set, staff switches also generate a line.",

diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc
index 4a089529f118c319792e8e780b5ca5dc6df12fc6..3421ea5cba4bbb765531fed57be5d5893483313a 100644 (file)
--- a/lily/note-spacing.cc
+++ b/lily/note-spacing.cc
@@ -48,6 +48,7 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
            {
              it = it->find_prebroken_piece (col_dir);
            }
+         
          /*
            some kind of mismatch, eg. a note column, that is behind a
            linebreak.
@@ -94,6 +95,12 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
 
                  extents[d].unite (v);
                }
+
+
+             if (Grob *arpeggio = Note_column::arpeggio (it))
+               {
+                 extents[d].unite (arpeggio->extent (it_col, X_AXIS));
+               }
            }
        }
 
@@ -124,9 +131,18 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
        (extents[LEFT][RIGHT] - left_head_wid[RIGHT]) / 2))
 
     /*
-      What is sticking out of the right note:
+      What is sticking out on the left side of the right note:
     */
-    + (extents[RIGHT].is_empty () ? 0.0 : - extents[RIGHT][LEFT] / 2);
+    + (extents[RIGHT].is_empty ()
+       ? 0.0
+       : ((- extents[RIGHT][LEFT] / 2)
+
+         /*
+           Add that which sticks out a lot.
+          */
+         + max (0.0, -extents[RIGHT][LEFT] - (base_space - increment))));
+
+       
 
   /*
     We don't do complicated stuff: (base_space - increment) is the

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index 76c65015976824d35cb17f6975245d5b446893ac..4582335d0ef976b9343d057d6087f7feaf4c71c4 100644 (file)
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -18,7 +18,7 @@ public:
 protected:
   virtual void finalize ();
  
-  DECLARE_ACKNOWLEDGER(note_column);
+  DECLARE_ACKNOWLEDGER (note_column);
   
   void process_music ();
   void stop_translation_timestep ();
@@ -124,7 +124,7 @@ Ottava_spanner_engraver::finalize ()
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Ottava_spanner_engraver, note_column);
+ADD_ACKNOWLEDGER (Ottava_spanner_engraver, note_column);
 ADD_TRANSLATOR (Ottava_spanner_engraver,
                /* descr */ "Create a text spanner when the ottavation property changes..",
                /* creats*/ "OttavaBracket",

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index b2daf370548551c0258877cec62b956b533e7cdb..6e1f44a10233e76ed13dfd67cb829ca67fbaa751 100644 (file)
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -16,7 +16,7 @@ class Output_property_engraver : public Engraver
   TRANSLATOR_DECLARATIONS (Output_property_engraver);
 protected:
   Link_array<Music> props_;
-  DECLARE_ACKNOWLEDGER(grob)
+  DECLARE_ACKNOWLEDGER (grob)
 
   void stop_translation_timestep ();
   virtual bool try_music (Music*);
@@ -78,7 +78,7 @@ Output_property_engraver::Output_property_engraver ()
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Output_property_engraver,grob)
+ADD_ACKNOWLEDGER (Output_property_engraver,grob)
 ADD_TRANSLATOR (Output_property_engraver,
 /* descr */       "Interpret Music of Output_property type, and apply a function "
 " to any Graphic objects that satisfies the predicate.",

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index a7dcf412a052a4ebda4fe5dc0e9a7664ec52d830..f45fb264e1aebe59b42187806a21934ad6c3826f 100644 (file)
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -212,9 +212,9 @@ Paper_column_engraver::start_translation_timestep ()
     make_columns ();
 }
 
-ADD_ACKNOWLEDGER(Paper_column_engraver,item);
-ADD_ACKNOWLEDGER(Paper_column_engraver,note_spacing);
-ADD_ACKNOWLEDGER(Paper_column_engraver,staff_spacing);
+ADD_ACKNOWLEDGER (Paper_column_engraver,item);
+ADD_ACKNOWLEDGER (Paper_column_engraver,note_spacing);
+ADD_ACKNOWLEDGER (Paper_column_engraver,staff_spacing);
 
 
 ADD_TRANSLATOR (Paper_column_engraver,

diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc
index 3196ffa4d09b9c39e9e1048c55eca5202a220c27..44e9a81a6587ed989cf7a8256b3bf026ce0a4528 100644 (file)
--- a/lily/part-combine-engraver.cc
+++ b/lily/part-combine-engraver.cc
@@ -20,8 +20,8 @@ class Part_combine_engraver : public Engraver
   TRANSLATOR_DECLARATIONS (Part_combine_engraver);
 
 protected:
-  DECLARE_ACKNOWLEDGER(note_head);
-  DECLARE_ACKNOWLEDGER(stem);
+  DECLARE_ACKNOWLEDGER (note_head);
+  DECLARE_ACKNOWLEDGER (stem);
   
   void process_music ();
   void stop_translation_timestep ();
@@ -95,8 +95,8 @@ Part_combine_engraver::stop_translation_timestep ()
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Part_combine_engraver, note_head);
-ADD_ACKNOWLEDGER(Part_combine_engraver, stem);
+ADD_ACKNOWLEDGER (Part_combine_engraver, note_head);
+ADD_ACKNOWLEDGER (Part_combine_engraver, stem);
 ADD_TRANSLATOR (Part_combine_engraver,
                /* descr */ "Part combine engraver for orchestral scores:               "
                "Print markings a2, Solo, Solo II, and unisono ",

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index 8357b05655171c10d92258263da3a6e41883b717..322b5601803f032c9db30fb5fe22f758f457de0a 100644 (file)
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -29,13 +29,13 @@ protected:
   virtual bool try_music (Music *);
 
   void acknowledge_extra_object (Grob_info);
-  DECLARE_ACKNOWLEDGER(note_column);
-  DECLARE_ACKNOWLEDGER(accidental);
-  DECLARE_ACKNOWLEDGER(fingering);
-  DECLARE_ACKNOWLEDGER(script);
-  DECLARE_ACKNOWLEDGER(tie);
-  DECLARE_ACKNOWLEDGER(text_script);
-  DECLARE_ACKNOWLEDGER(slur);
+  DECLARE_ACKNOWLEDGER (note_column);
+  DECLARE_ACKNOWLEDGER (accidental);
+  DECLARE_ACKNOWLEDGER (fingering);
+  DECLARE_ACKNOWLEDGER (script);
+  DECLARE_ACKNOWLEDGER (tie);
+  DECLARE_ACKNOWLEDGER (text_script);
+  DECLARE_ACKNOWLEDGER (slur);
   
   void stop_translation_timestep ();
   virtual void finalize ();
@@ -190,13 +190,13 @@ Phrasing_slur_engraver::stop_translation_timestep ()
 #include "translator.icc"
 
 
-ADD_ACKNOWLEDGER(Phrasing_slur_engraver,note_column);
-ADD_ACKNOWLEDGER(Phrasing_slur_engraver,accidental);
-ADD_ACKNOWLEDGER(Phrasing_slur_engraver,fingering)
-ADD_ACKNOWLEDGER(Phrasing_slur_engraver,script);
-ADD_ACKNOWLEDGER(Phrasing_slur_engraver,tie);
-ADD_ACKNOWLEDGER(Phrasing_slur_engraver,text_script);
-ADD_ACKNOWLEDGER(Phrasing_slur_engraver,slur);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver,note_column);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver,accidental);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver,fingering)
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver,script);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver,tie);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver,text_script);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver,slur);
 
 ADD_TRANSLATOR (Phrasing_slur_engraver,
                /* descr */ "Print phrasing slurs. Similar to @ref{Slur_engraver}",

diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index 1df61de8fb13cba934cf659ded971b40c0b78f51..65f124ce43f120a3a3ee9d1890e2fb3f401e1abb 100644 (file)
--- a/lily/piano-pedal-engraver.cc
+++ b/lily/piano-pedal-engraver.cc
@@ -65,7 +65,7 @@ protected:
   virtual void finalize ();
   virtual bool try_music (Music *);
   void stop_translation_timestep ();
-  DECLARE_ACKNOWLEDGER(note_column);
+  DECLARE_ACKNOWLEDGER (note_column);
   void process_music ();
 
 private:
@@ -523,7 +523,7 @@ Piano_pedal_engraver::typeset_all (Pedal_info *p)
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Piano_pedal_engraver,note_column);
+ADD_ACKNOWLEDGER (Piano_pedal_engraver,note_column);
 ADD_TRANSLATOR (Piano_pedal_engraver,
                /* descr */ "Engrave piano pedal symbols and brackets.",
                /* creats*/ "SostenutoPedal SustainPedal UnaCordaPedal SostenutoPedalLineSpanner SustainPedalLineSpanner UnaCordaPedalLineSpanner",

diff --git a/lily/pitch-squash-engraver.cc b/lily/pitch-squash-engraver.cc
index 0d99f154240612f027c03348d87c406a68f41d1c..a6e1941ed1955406c136104422a14c42c154be31 100644 (file)
--- a/lily/pitch-squash-engraver.cc
+++ b/lily/pitch-squash-engraver.cc
@@ -14,7 +14,7 @@ class Pitch_squash_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Pitch_squash_engraver);
-  DECLARE_ACKNOWLEDGER(note_head);
+  DECLARE_ACKNOWLEDGER (note_head);
 };
 
 void
@@ -32,7 +32,7 @@ Pitch_squash_engraver::Pitch_squash_engraver ()
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Pitch_squash_engraver,note_head);
+ADD_ACKNOWLEDGER (Pitch_squash_engraver,note_head);
 ADD_TRANSLATOR (Pitch_squash_engraver,
                /* descr */
                "Set the vertical position of noteheads to "

diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index 6d98ede4d770d21de923b326d48749e14c694906..a8d93cc022f7f7aa4742b5f24413500cf5dc37d8 100644 (file)
--- a/lily/pitched-trill-engraver.cc
+++ b/lily/pitched-trill-engraver.cc
@@ -27,9 +27,9 @@ public:
   
 protected:
  
-  DECLARE_ACKNOWLEDGER( note_head);
-  DECLARE_ACKNOWLEDGER( dots);
-  DECLARE_ACKNOWLEDGER( text_spanner);
+  DECLARE_ACKNOWLEDGER ( note_head);
+  DECLARE_ACKNOWLEDGER ( dots);
+  DECLARE_ACKNOWLEDGER ( text_spanner);
   void process_music ();
   virtual bool try_music (Music*);
   void stop_translation_timestep ();
@@ -151,9 +151,9 @@ Pitched_trill_engraver::try_music (Music *)
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Pitched_trill_engraver, note_head);
-ADD_ACKNOWLEDGER(Pitched_trill_engraver, dots);
-ADD_ACKNOWLEDGER(Pitched_trill_engraver, text_spanner);
+ADD_ACKNOWLEDGER (Pitched_trill_engraver, note_head);
+ADD_ACKNOWLEDGER (Pitched_trill_engraver, dots);
+ADD_ACKNOWLEDGER (Pitched_trill_engraver, text_spanner);
 ADD_TRANSLATOR (Pitched_trill_engraver,
                /* descr */ "Print the bracketed notehead after a notehead with trill.",
                /* creats*/ "TrillPitchHead TrillPitchAccidental TrillPitchGroup",

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index 12ee47995dbe4cf53c86c3c5aab807c64a274da2..edded0d93556e69ce29e3c4e885fd5c63f2db048 100644 (file)
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -17,7 +17,7 @@ class Rest_collision_engraver : public Engraver
   int rest_count_;
   Link_array<Grob> note_columns_;
 protected:
-  DECLARE_ACKNOWLEDGER(note_column);
+  DECLARE_ACKNOWLEDGER (note_column);
   void process_acknowledged ();
   void stop_translation_timestep ();
 public:
@@ -64,7 +64,7 @@ Rest_collision_engraver::stop_translation_timestep ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Rest_collision_engraver, note_column);
+ADD_ACKNOWLEDGER (Rest_collision_engraver, note_column);
 ADD_TRANSLATOR (Rest_collision_engraver,
                /* descr */ "Handles collisions of rests.",
                /* creats*/ "RestCollision",

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index e0c8e7c09a568896fe9056223c4c6b7bac7d2d5e..fe140090efdf9cec82490b71512eef5bba045980 100644 (file)
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -49,12 +49,14 @@ class Rhythmic_column_engraver : public Engraver
   Grob *last_spacing_;
   Grob *spacing_;
 
+  void add_spacing_item (Grob*);
+  
   TRANSLATOR_DECLARATIONS (Rhythmic_column_engraver);
 protected:
 
-DECLARE_ACKNOWLEDGER(dot_column);
-DECLARE_ACKNOWLEDGER(stem);
-DECLARE_ACKNOWLEDGER(rhythmic_head);
+  DECLARE_ACKNOWLEDGER (dot_column);
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
   void process_acknowledged ();
   void stop_translation_timestep ();
 };
@@ -69,6 +71,23 @@ Rhythmic_column_engraver::Rhythmic_column_engraver ()
   dotcol_ = 0;
 }
 
+void
+Rhythmic_column_engraver::add_spacing_item (Grob *g)
+{
+  if (spacing_)
+    {
+      Pointer_group_interface::add_grob (spacing_,
+                                        ly_symbol2scm ("left-items"),
+                                        g);
+
+      if (last_spacing_)
+       {
+         Pointer_group_interface::add_grob (last_spacing_,
+                                            ly_symbol2scm ("right-items"),
+                                            g);
+       }
+    }
+}
 void
 Rhythmic_column_engraver::process_acknowledged ()
 {
@@ -79,14 +98,7 @@ Rhythmic_column_engraver::process_acknowledged ()
          note_column_ = make_item ("NoteColumn", rheads_[0]->self_scm ());
 
          spacing_ = make_item ("NoteSpacing", SCM_EOL);
-         spacing_->set_object ("left-items", scm_cons (note_column_->self_scm (), SCM_EOL));
-
-         if (last_spacing_)
-           {
-             Pointer_group_interface::add_grob (last_spacing_,
-                                                ly_symbol2scm ("right-items"),
-                                                note_column_);
-           }
+         add_spacing_item (note_column_);
        }
 
       for (int i = 0; i < rheads_.size (); i++)
@@ -148,9 +160,9 @@ Rhythmic_column_engraver::stop_translation_timestep ()
 }
 
 
-ADD_ACKNOWLEDGER(Rhythmic_column_engraver,dot_column);
-ADD_ACKNOWLEDGER(Rhythmic_column_engraver,stem);
-ADD_ACKNOWLEDGER(Rhythmic_column_engraver,rhythmic_head);
+ADD_ACKNOWLEDGER (Rhythmic_column_engraver, dot_column);
+ADD_ACKNOWLEDGER (Rhythmic_column_engraver, stem);
+ADD_ACKNOWLEDGER (Rhythmic_column_engraver, rhythmic_head);
 
 ADD_TRANSLATOR (Rhythmic_column_engraver,
                /* descr */ "Generates NoteColumn, an objects that groups stems, noteheads and rests.",

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 4990068ce739c5d59854b5d422167e22469a1b7f..2bb3c88bdac25f330be16c0f18eecb98487c4a72 100644 (file)
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -24,7 +24,7 @@ class Script_column_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Script_column_engraver);
 protected:
-  DECLARE_ACKNOWLEDGER(side_position);
+  DECLARE_ACKNOWLEDGER (side_position);
   void process_acknowledged ();
   void stop_translation_timestep ();
 };
@@ -70,7 +70,7 @@ Script_column_engraver::process_acknowledged ()
       scripts_.clear ();
     }
 }
-ADD_ACKNOWLEDGER(Script_column_engraver, side_position);
+ADD_ACKNOWLEDGER (Script_column_engraver, side_position);
 ADD_TRANSLATOR (Script_column_engraver,
                /* descr */ "",
                /* creats*/ "ScriptColumn",

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index da86b9c1725b05525c7425a6af0a891a56e5350a..05e59f2dd0598eac07c5bac829cbfd212e4783eb 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -42,10 +42,10 @@ protected:
   void stop_translation_timestep ();
   void process_music ();
 
-  DECLARE_ACKNOWLEDGER( slur);
-  DECLARE_ACKNOWLEDGER( rhythmic_head);
-  DECLARE_ACKNOWLEDGER( stem);
-  DECLARE_ACKNOWLEDGER( note_column);
+  DECLARE_ACKNOWLEDGER ( slur);
+  DECLARE_ACKNOWLEDGER ( rhythmic_head);
+  DECLARE_ACKNOWLEDGER ( stem);
+  DECLARE_ACKNOWLEDGER ( note_column);
 
 public:
   TRANSLATOR_DECLARATIONS (Script_engraver);
@@ -251,10 +251,10 @@ Script_engraver::stop_translation_timestep ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Script_engraver, slur);
-ADD_ACKNOWLEDGER(Script_engraver, rhythmic_head);
-ADD_ACKNOWLEDGER(Script_engraver, stem);
-ADD_ACKNOWLEDGER(Script_engraver, note_column);
+ADD_ACKNOWLEDGER (Script_engraver, slur);
+ADD_ACKNOWLEDGER (Script_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Script_engraver, stem);
+ADD_ACKNOWLEDGER (Script_engraver, note_column);
 
 ADD_TRANSLATOR (Script_engraver,
                /* descr */ "Handles note scripted articulations.",

diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc
index 680aa912629ad9ed8059ded11f81d63d137d5f12..641072120456de881fde97e0b4c36b48303a713a 100644 (file)
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -54,7 +54,7 @@ protected:
 
   Spanner *sep_span_;
 
-  DECLARE_ACKNOWLEDGER(item);
+  DECLARE_ACKNOWLEDGER (item);
   void process_music ();
   virtual void finalize ();
   void stop_translation_timestep ();
@@ -223,7 +223,7 @@ Separating_line_group_engraver::stop_translation_timestep ()
   musical_item_ = 0;
 }
 
-ADD_ACKNOWLEDGER(Separating_line_group_engraver, item);
+ADD_ACKNOWLEDGER (Separating_line_group_engraver, item);
 ADD_TRANSLATOR (Separating_line_group_engraver,
                /* descr */ "Generates objects for computing spacing parameters.",
                /* creats*/ "SeparationItem SeparatingGroupSpanner StaffSpacing",

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 7b33cba407f614c336005f1a796609a7073f6aa6..8b556267a06248f6035216467a247575fd7b5cfe 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -30,12 +30,12 @@ class Slur_engraver : public Engraver
 protected:
   virtual bool try_music (Music *);
 
-  DECLARE_ACKNOWLEDGER(note_column);
-  DECLARE_ACKNOWLEDGER(accidental);
-  DECLARE_ACKNOWLEDGER(fingering);
-  DECLARE_ACKNOWLEDGER(script);
-  DECLARE_ACKNOWLEDGER(tie);
-  DECLARE_ACKNOWLEDGER(text_script);
+  DECLARE_ACKNOWLEDGER (note_column);
+  DECLARE_ACKNOWLEDGER (accidental);
+  DECLARE_ACKNOWLEDGER (fingering);
+  DECLARE_ACKNOWLEDGER (script);
+  DECLARE_ACKNOWLEDGER (tie);
+  DECLARE_ACKNOWLEDGER (text_script);
   void acknowledge_extra_object (Grob_info);
   void stop_translation_timestep ();
   virtual void finalize ();
@@ -199,12 +199,12 @@ Slur_engraver::stop_translation_timestep ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Slur_engraver,note_column);
-ADD_ACKNOWLEDGER(Slur_engraver,accidental);
-ADD_ACKNOWLEDGER(Slur_engraver,fingering)
-ADD_ACKNOWLEDGER(Slur_engraver,script);
-ADD_ACKNOWLEDGER(Slur_engraver,tie);
-ADD_ACKNOWLEDGER(Slur_engraver,text_script);
+ADD_ACKNOWLEDGER (Slur_engraver,note_column);
+ADD_ACKNOWLEDGER (Slur_engraver,accidental);
+ADD_ACKNOWLEDGER (Slur_engraver,fingering)
+ADD_ACKNOWLEDGER (Slur_engraver,script);
+ADD_ACKNOWLEDGER (Slur_engraver,tie);
+ADD_ACKNOWLEDGER (Slur_engraver,text_script);
 ADD_TRANSLATOR (Slur_engraver,
                /* descr */ "Build slurs grobs from slur events",
                /* creats*/ "Slur",

diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index b5f25da716674dd03265f1166ee99f08dff8e4b2..8bf477d355c5e8d5d207b744e9dcb125b6a38fe0 100644 (file)
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -46,9 +46,9 @@ class Spacing_engraver : public Engraver
 
   TRANSLATOR_DECLARATIONS (Spacing_engraver);
 protected:
-  DECLARE_ACKNOWLEDGER(staff_spacing);
-  DECLARE_ACKNOWLEDGER(note_spacing);
-  DECLARE_ACKNOWLEDGER(rhythmic_head);
+  DECLARE_ACKNOWLEDGER (staff_spacing);
+  DECLARE_ACKNOWLEDGER (note_spacing);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
   void start_translation_timestep ();
   void stop_translation_timestep ();
   void process_music ();
@@ -183,9 +183,9 @@ Spacing_engraver::start_translation_timestep ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Spacing_engraver,staff_spacing);
-ADD_ACKNOWLEDGER(Spacing_engraver,note_spacing);
-ADD_ACKNOWLEDGER(Spacing_engraver,rhythmic_head);
+ADD_ACKNOWLEDGER (Spacing_engraver, staff_spacing);
+ADD_ACKNOWLEDGER (Spacing_engraver, note_spacing);
+ADD_ACKNOWLEDGER (Spacing_engraver, rhythmic_head);
   
 ADD_TRANSLATOR (Spacing_engraver,
                /* descr */ "make a SpacingSpanner and do bookkeeping of shortest starting and playing notes  ",

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index f67cf4d2fb9b734f206eee8d9113a976c79743ee..b8513cec0a9c633cca9fb23602fa4cb6b2b0f0e4 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -181,10 +181,10 @@ Spacing_spanner::prune_loose_columns (Grob *me, Link_array<Grob> *cols, Rational
            Either object can be non existent, if the score ends
            prematurely.
          */
-         
-         rns = scm_car (unsmob_grob (rns)->get_object ("right-items"));
+
+         extract_grob_set (unsmob_grob (rns), "right-items", right_items);
          c->set_object ("between-cols", scm_cons (lns,
-                                                  rns));
+                                                  right_items[0]->self_scm ()));
 
          /*
            Set distance constraints for loose columns
@@ -290,7 +290,7 @@ Spacing_spanner::set_explicit_neighbor_columns (Link_array<Grob> const &cols)
          if (right_rank <= min_rank)
            {
              if (right_rank < min_rank)
-               right_neighbors = SCM_EOL;
+               rn_arr->clear ();
 
              min_rank = right_rank;
              rn_arr->add (wish);

diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc
index 21a97ede6bcd539fd8b9e62b718cdaf1e3c8a89f..b16896e602704d019b12ff7cda5386d78641c4b5 100644 (file)
--- a/lily/span-arpeggio-engraver.cc
+++ b/lily/span-arpeggio-engraver.cc
@@ -22,7 +22,7 @@ class Span_arpeggio_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Span_arpeggio_engraver);
-  DECLARE_ACKNOWLEDGER(arpeggio);
+  DECLARE_ACKNOWLEDGER (arpeggio);
 
 protected:
   void process_acknowledged ();
@@ -99,7 +99,7 @@ Span_arpeggio_engraver::stop_translation_timestep ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Span_arpeggio_engraver,arpeggio);
+ADD_ACKNOWLEDGER (Span_arpeggio_engraver,arpeggio);
 ADD_TRANSLATOR (Span_arpeggio_engraver,
                /* descr */ "",
                /* creats*/ "Arpeggio",

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index b3517f28ae896b5ca42cff7656412954cc4b1e07..eb5d65e9dde6c65584e6041187dbec89ddcef25d 100644 (file)
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -27,7 +27,7 @@ class Span_bar_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Span_bar_engraver);
 protected:
-  DECLARE_ACKNOWLEDGER(bar_line);
+  DECLARE_ACKNOWLEDGER (bar_line);
   void stop_translation_timestep ();
 };
 
@@ -74,7 +74,7 @@ Span_bar_engraver::stop_translation_timestep ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Span_bar_engraver, bar_line);
+ADD_ACKNOWLEDGER (Span_bar_engraver, bar_line);
 ADD_TRANSLATOR (Span_bar_engraver,
                /* descr */ "This engraver makes cross-staff barlines: It catches all normal "
                "bar lines, and draws a single span-bar across them.",

diff --git a/lily/staff-collecting-engraver.cc b/lily/staff-collecting-engraver.cc
index dcf18385cb9a4dc7f158f0086670faaf04bc2e10..21ea59457b68eb74769a948bd829d662362b35e2 100644 (file)
--- a/lily/staff-collecting-engraver.cc
+++ b/lily/staff-collecting-engraver.cc
@@ -15,7 +15,7 @@ class Staff_collecting_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Staff_collecting_engraver);
-  DECLARE_ACKNOWLEDGER(staff_symbol);
+  DECLARE_ACKNOWLEDGER (staff_symbol);
 };
 
 Staff_collecting_engraver::Staff_collecting_engraver ()
@@ -32,7 +32,7 @@ Staff_collecting_engraver::acknowledge_staff_symbol (Grob_info gi)
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Staff_collecting_engraver,staff_symbol);
+ADD_ACKNOWLEDGER (Staff_collecting_engraver,staff_symbol);
 
 ADD_TRANSLATOR (Staff_collecting_engraver,
                /* descr */ "Maintain the stavesFound variable",

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index adee8fabe5159e863770896aebd0d63832dfd193..6894ad5521abb11c35462ec9bb8b9d305a27958f 100644 (file)
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -111,7 +111,7 @@ Staff_symbol_engraver::acknowledge_grob (Grob_info s)
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Staff_symbol_engraver,grob);
+ADD_ACKNOWLEDGER (Staff_symbol_engraver,grob);
 ADD_TRANSLATOR (Staff_symbol_engraver,
                /* descr */ "Create the constellation of five (default) "
                "staff lines.",

diff --git a/lily/stanza-number-align-engraver.cc b/lily/stanza-number-align-engraver.cc
index 2433da8092dc687a52fbd96bb5817116d958a28c..de35f67147cf41aa1ab61bcc6407dc8e18274f3d 100644 (file)
--- a/lily/stanza-number-align-engraver.cc
+++ b/lily/stanza-number-align-engraver.cc
@@ -24,8 +24,8 @@ protected:
   Link_array<Grob> lyrics_;
   Link_array<Grob> stanza_numbers_;
 
-  DECLARE_ACKNOWLEDGER(lyric_syllable);
-  DECLARE_ACKNOWLEDGER(stanza_number);
+  DECLARE_ACKNOWLEDGER (lyric_syllable);
+  DECLARE_ACKNOWLEDGER (stanza_number);
   void stop_translation_timestep ();
 };
 
@@ -58,8 +58,8 @@ Stanza_number_align_engraver::stop_translation_timestep ()
   lyrics_.clear ();
 }
 
-ADD_ACKNOWLEDGER(Stanza_number_align_engraver,lyric_syllable);
-ADD_ACKNOWLEDGER(Stanza_number_align_engraver,stanza_number);
+ADD_ACKNOWLEDGER (Stanza_number_align_engraver,lyric_syllable);
+ADD_ACKNOWLEDGER (Stanza_number_align_engraver,stanza_number);
 ADD_TRANSLATOR (Stanza_number_align_engraver,
                "This engraver ensures that stanza numbers are neatly aligned. ",
                "",

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index 7a284837ff861982d57f6efe41f2ef0ec2910d08..8dd9c16f6c4c1884717fdcfe0043090e953a5485 100644 (file)
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -23,7 +23,7 @@ public:
   TRANSLATOR_DECLARATIONS (Stanza_number_engraver);
   void process_music ();
   void stop_translation_timestep ();
-  DECLARE_ACKNOWLEDGER(lyric_syllable);
+  DECLARE_ACKNOWLEDGER (lyric_syllable);
 };
 
 /*
@@ -68,7 +68,7 @@ Stanza_number_engraver::stop_translation_timestep ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Stanza_number_engraver,lyric_syllable);
+ADD_ACKNOWLEDGER (Stanza_number_engraver,lyric_syllable);
 ADD_TRANSLATOR (Stanza_number_engraver,
                /* descr */ "",
                /* creats*/ "StanzaNumber",

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 878f0054b54b51f36ad2d4b84ce4b7f7d6254ac2..579aeed7a3f58fb80559536b7194d0b6f0cff21f 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -33,7 +33,7 @@ class Stem_engraver : public Engraver
 protected:
   void make_stem (Grob_info);
 
-  DECLARE_ACKNOWLEDGER(rhythmic_head);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
   void stop_translation_timestep ();
   virtual bool try_music (Music *);
 };
@@ -169,7 +169,7 @@ Stem_engraver::try_music (Music *m)
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Stem_engraver,rhythmic_head);
+ADD_ACKNOWLEDGER (Stem_engraver,rhythmic_head);
 ADD_TRANSLATOR (Stem_engraver,
                /* descr */ "Create stems and single-stem tremolos.  It also works together with "
                "the beam engraver for overriding beaming.",

diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc
index d8feff7ae19a059b6f41b9e59c4f1253f45b8358..9734f522cbda7ad9af4d33e411a7ab94dda97254 100644 (file)
--- a/lily/system-start-delimiter-engraver.cc
+++ b/lily/system-start-delimiter-engraver.cc
@@ -21,8 +21,8 @@ public:
 
 protected:
   Spanner *delim_;
-  DECLARE_ACKNOWLEDGER(system_start_delimiter);
-  DECLARE_ACKNOWLEDGER(staff_symbol);
+  DECLARE_ACKNOWLEDGER (system_start_delimiter);
+  DECLARE_ACKNOWLEDGER (staff_symbol);
 
   void process_music ();
   virtual void finalize ();
@@ -84,8 +84,8 @@ System_start_delimiter_engraver::finalize ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(System_start_delimiter_engraver, system_start_delimiter);
-ADD_ACKNOWLEDGER(System_start_delimiter_engraver, staff_symbol);
+ADD_ACKNOWLEDGER (System_start_delimiter_engraver, system_start_delimiter);
+ADD_ACKNOWLEDGER (System_start_delimiter_engraver, staff_symbol);
 
 ADD_TRANSLATOR (System_start_delimiter_engraver,
                /* descr */ "Creates a system start delimiter (ie. SystemStart@{Bar, Brace, Bracket@} spanner",

diff --git a/lily/tab-staff-symbol-engraver.cc b/lily/tab-staff-symbol-engraver.cc
index a518392d12dd8816baf198218ec29d8ba6351705..64d9820487aa2aaad1310453f3be366d34654699 100644 (file)
--- a/lily/tab-staff-symbol-engraver.cc
+++ b/lily/tab-staff-symbol-engraver.cc
@@ -37,7 +37,7 @@ Tab_staff_symbol_engraver::Tab_staff_symbol_engraver ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Tab_staff_symbol_engraver,grob);
+ADD_ACKNOWLEDGER (Tab_staff_symbol_engraver,grob);
 ADD_TRANSLATOR (Tab_staff_symbol_engraver,
                /* descr */ "Create a staff-symbol, but look at stringTunings for the number of lines."
                "staff lines.",

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 1adef0974242da0179a54125a44243f581a6ce6d..90f12c853791a7cfdb91d411da5b4016bb41dfee 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -27,8 +27,8 @@ protected:
   void stop_translation_timestep ();
   void process_acknowledged ();
 
-  DECLARE_ACKNOWLEDGER(stem);
-  DECLARE_ACKNOWLEDGER(rhythmic_head);
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
 };
 
 bool
@@ -121,8 +121,8 @@ Text_engraver::Text_engraver ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Text_engraver, stem);
-ADD_ACKNOWLEDGER(Text_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Text_engraver, stem);
+ADD_ACKNOWLEDGER (Text_engraver, rhythmic_head);
 ADD_TRANSLATOR (Text_engraver,
                /* descr */ "Create text-scripts",
                /* creats*/ "TextScript",

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index e61342031ac865c8f74a70f4fdc718e0560cb3b3..6383e3b24b8f7fbfe034fa87a7ec3e49a111fe35 100644 (file)
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -16,7 +16,7 @@ public:
   TRANSLATOR_DECLARATIONS (Text_spanner_engraver);
 protected:
   virtual void finalize ();
-  DECLARE_ACKNOWLEDGER(note_column);
+  DECLARE_ACKNOWLEDGER (note_column);
   virtual bool try_music (Music *);
   void stop_translation_timestep ();
   void process_music ();
@@ -140,7 +140,7 @@ Text_spanner_engraver::finalize ()
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Text_spanner_engraver,note_column);
+ADD_ACKNOWLEDGER (Text_spanner_engraver,note_column);
 ADD_TRANSLATOR (Text_spanner_engraver,
                /* descr */ "Create text spanner from a Music.",
                /* creats*/ "TextSpanner",

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 505a661c30bcb31cba0f3769ca89ae82ae254f38..5710202b95469fba2e0e7d031f203e6327cc1eea 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -56,7 +56,7 @@ protected:
   void stop_translation_timestep ();
   virtual void derived_mark () const;
   void start_translation_timestep ();
-  DECLARE_ACKNOWLEDGER(note_head);
+  DECLARE_ACKNOWLEDGER (note_head);
   virtual bool try_music (Music *);
   void process_music ();
   void typeset_tie (Grob *);
@@ -206,7 +206,7 @@ Tie_engraver::typeset_tie (Grob *her)
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Tie_engraver, note_head);
+ADD_ACKNOWLEDGER (Tie_engraver, note_head);
 ADD_TRANSLATOR (Tie_engraver,
                /* descr */ "Generate ties between noteheads of equal pitch.",
                /* creats*/ "Tie TieColumn",

diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index 05849e1f8d09399c2ec01c01aed8f85a384d6c6c..8943aee2eb96379a12d100e7f32b6742b94e97f6 100644 (file)
--- a/lily/trill-spanner-engraver.cc
+++ b/lily/trill-spanner-engraver.cc
@@ -25,7 +25,7 @@ public:
   TRANSLATOR_DECLARATIONS (Trill_spanner_engraver);
 protected:
   virtual void finalize ();
-  DECLARE_ACKNOWLEDGER(note_column);
+  DECLARE_ACKNOWLEDGER (note_column);
   virtual bool try_music (Music *);
   void stop_translation_timestep ();
   void process_music ();
@@ -146,7 +146,7 @@ Trill_spanner_engraver::finalize ()
       span_ = 0;
     }
 }
-ADD_ACKNOWLEDGER(Trill_spanner_engraver,note_column);
+ADD_ACKNOWLEDGER (Trill_spanner_engraver,note_column);
 ADD_TRANSLATOR (Trill_spanner_engraver,
                /* descr */ "Create trill spanner from a Music.",
                /* creats*/ "TrillSpanner",

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 404e724d1730c6970ea07fbbc6d9a5ae7b933e91..05623160f1b064f3bea97123a05f021f9076567a 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -35,7 +35,7 @@ public:
 protected:
   Array<Tuplet_description> tuplets_;
 
-  DECLARE_ACKNOWLEDGER(note_column);
+  DECLARE_ACKNOWLEDGER (note_column);
   virtual bool try_music (Music *r);
   void start_translation_timestep ();
   void process_music ();
@@ -130,7 +130,7 @@ Tuplet_engraver::start_translation_timestep ()
 Tuplet_engraver::Tuplet_engraver ()
 {
 }
-ADD_ACKNOWLEDGER(Tuplet_engraver,note_column);
+ADD_ACKNOWLEDGER (Tuplet_engraver,note_column);
 ADD_TRANSLATOR (Tuplet_engraver,
                /* descr */ "Catch Time_scaled_music and generate appropriate bracket  ",
                /* creats*/ "TupletBracket",

diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc
index 72fdb41f50317e2e0e21fca5cf1307e224bc8a6d..f24aa902089d6e1b82a93a7fcfa012cd04bd5162 100644 (file)
--- a/lily/vaticana-ligature-engraver.cc
+++ b/lily/vaticana-ligature-engraver.cc
@@ -596,8 +596,8 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
 #endif
 }
 
-ADD_ACKNOWLEDGER(Vaticana_ligature_engraver, rest);
-ADD_ACKNOWLEDGER(Vaticana_ligature_engraver, note_head);
+ADD_ACKNOWLEDGER (Vaticana_ligature_engraver, rest);
+ADD_ACKNOWLEDGER (Vaticana_ligature_engraver, note_head);
 ADD_TRANSLATOR (Vaticana_ligature_engraver,
                /* descr */ "Handles ligatures by glueing special ligature heads together.",
                /* creats*/ "VaticanaLigature",

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 3e048c2fcddc86de1ed5677e0f55cee769d82b7e..8877b2e1fca9e53d99200abc77831ca39ffdbe71 100644 (file)
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -26,7 +26,7 @@ class Vertical_align_engraver : public Engraver
   
 public:
   TRANSLATOR_DECLARATIONS (Vertical_align_engraver);
-  DECLARE_ACKNOWLEDGER(axis_group);
+  DECLARE_ACKNOWLEDGER (axis_group);
 
 protected:
   virtual void derived_mark () const;
@@ -35,7 +35,7 @@ protected:
   virtual void initialize ();
 };
 
-ADD_ACKNOWLEDGER(Vertical_align_engraver, axis_group);
+ADD_ACKNOWLEDGER (Vertical_align_engraver, axis_group);
 ADD_TRANSLATOR (Vertical_align_engraver,
                "Catch groups (staffs, lyrics lines, etc.) and stack "
                "them vertically.",

diff --git a/lily/vertically-spaced-context-engraver.cc b/lily/vertically-spaced-context-engraver.cc
index 864f27aa693b55570bdcf56d4e6a6e798566ae21..878acad32ef89230118ff27bb44cc1760c68f685 100644 (file)
--- a/lily/vertically-spaced-context-engraver.cc
+++ b/lily/vertically-spaced-context-engraver.cc
@@ -18,7 +18,7 @@ class Vertically_spaced_contexts_engraver : public Engraver
   TRANSLATOR_DECLARATIONS(Vertically_spaced_contexts_engraver);
 protected:
   virtual void initialize ();
-  DECLARE_ACKNOWLEDGER(vertically_spaceable);
+  DECLARE_ACKNOWLEDGER (vertically_spaceable);
 
 private:
   Grob *system_;
@@ -56,7 +56,8 @@ Vertically_spaced_contexts_engraver::acknowledge_vertically_spaceable (Grob_info
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Vertically_spaced_contexts_engraver, vertically_spaceable);
+
+ADD_ACKNOWLEDGER (Vertically_spaced_contexts_engraver, vertically_spaceable);
 ADD_TRANSLATOR (Vertically_spaced_contexts_engraver,
                /* descr */ "",
                /* creats*/ "",

diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index 613c49d276523c4ac71e3b868f3cd3ac68bfed68..5d8b0107df85e5a4a3093998ef334fcbd0b5ae44 100644 (file)
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -27,9 +27,9 @@ public:
   TRANSLATOR_DECLARATIONS (Volta_engraver);
 protected:
 
-  DECLARE_ACKNOWLEDGER(staff_symbol);
-  DECLARE_ACKNOWLEDGER(note_column);
-  DECLARE_ACKNOWLEDGER(bar_line);
+  DECLARE_ACKNOWLEDGER (staff_symbol);
+  DECLARE_ACKNOWLEDGER (note_column);
+  DECLARE_ACKNOWLEDGER (bar_line);
   
   virtual void finalize ();
 
@@ -234,9 +234,9 @@ Volta_engraver::stop_translation_timestep ()
 /*
   TODO: should attach volta to paper-column if no bar is found.
 */
-ADD_ACKNOWLEDGER(Volta_engraver, staff_symbol);
-ADD_ACKNOWLEDGER(Volta_engraver, note_column);
-ADD_ACKNOWLEDGER(Volta_engraver, bar_line);
+ADD_ACKNOWLEDGER (Volta_engraver, staff_symbol);
+ADD_ACKNOWLEDGER (Volta_engraver, note_column);
+ADD_ACKNOWLEDGER (Volta_engraver, bar_line);
 ADD_TRANSLATOR (Volta_engraver,
                /* descr */ "Make volta brackets.",
                /* creats*/ "VoltaBracket",