patch::: 1.3.18.jcn1

1.3.18.jcn1
===========

* gcc-2.95 compile fixes

diff --git a/CHANGES b/CHANGES
index 44adce0ac934efb5d949fa2cac1b5a59b258f34a..5936819e7c69f40d7300a72d779a0e0eebc04dce 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1.3.18.jcn1
+===========
+
+* gcc-2.95 compile fixes
+
 1.3.17.jcn2
 ===========
 

diff --git a/VERSION b/VERSION
index 50e55c927022406657847f1f5c9984406f6d5b60..9df66aa37d37b203d16855cae31ac0b91a0c3866 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=18
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc
index b1e83ef1bd7ad5f1d1fc583901572ed3056bb229..2a594526b8924cbfa08355c70399bc6c06b92e38 100644 (file)
--- a/flower/getopt-long.cc
+++ b/flower/getopt-long.cc
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <iostream.h>
 #include <assert.h>
+#include <string.h>
 #include "config.h"
 #include "getopt-long.hh"
 #include "international.hh"

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index 03605d4135b171bf1eb82d4c95142931b82ac86f..f150734f2bc3bc8a27db96096de79c0c8abee7f7 100644 (file)
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -10,7 +10,8 @@
 #ifndef VIRTUAL_METHODS_HH
 #define VIRTUAL_METHODS_HH
 
-#include "stdlib.h"            // size_t
+#include <typeinfo>
+#include <stdlib.h>            // size_t
 
 #define classname(class_ptr)   demangle_classname(typeid(*(class_ptr)))
 

diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index 3959dbbc946366391f69499d31f519dd8fd9039f..d6d0fb5fa9e11a6dd37e00f33a84ceb7e3315948 100644 (file)
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <limits.h>
+#include <string.h>
 #include "libc-extension.hh"
 #include "string.hh"
 #include "string-convert.hh"

diff --git a/lily/align-note-column-engraver.cc b/lily/align-note-column-engraver.cc
index f83c2747ac15d7600afeb5b6b1b08774424b9bba..d39720a3186689c690a6863089929f99b10df2ca 100644 (file)
--- a/lily/align-note-column-engraver.cc
+++ b/lily/align-note-column-engraver.cc
@@ -33,6 +33,8 @@ public:
   Align_note_column_engraver ();
 };
 
+ADD_THIS_TRANSLATOR (Align_note_column_engraver);
+
 Align_note_column_engraver::Align_note_column_engraver()
 {
   align_item_p_ =0;
@@ -112,5 +114,3 @@ Align_note_column_engraver::do_post_move_processing ()
   accidental_l_ =0;
 }
 
-ADD_THIS_TRANSLATOR(Align_note_column_engraver);
-

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 74761145cd158cfb594690d364364be549fdae25..b6674fc38460ac0031694d5f32accc112a7a67c6 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -6,6 +6,7 @@
   (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
+
 #include "beaming.hh"
 #include "auto-beam-engraver.hh"
 #include "musical-request.hh"

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 9ae9db643886ebd331494387bfef89d138756714..0881d72f64cddca5c11ad05a0232a44f7c5ca90f 100644 (file)
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -10,6 +10,8 @@
 #include "axis-group-spanner.hh"
 #include "paper-column.hh"
 
+ADD_THIS_TRANSLATOR (Axis_group_engraver);
+
 Axis_group_engraver::Axis_group_engraver ()
 {
   staffline_p_ = 0;
@@ -63,4 +65,3 @@ Axis_group_engraver::process_acknowledged ()
   elts_.clear ();
 }
 
-ADD_THIS_TRANSLATOR(Axis_group_engraver);

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 45636011c048182d9a6a30caeb9e3c49f678c9be..1dc6c18fafef76859e9896a9eb1fbe75235ad6b8 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -17,6 +17,8 @@
 #include "engraver-group-engraver.hh"
 #include "warn.hh"
 
+ADD_THIS_TRANSLATOR (Bar_engraver);
+
 Bar_engraver::Bar_engraver()
 {
   bar_p_ =0;
@@ -143,7 +145,3 @@ Bar_engraver::do_pre_move_processing()
     }
 }
 
-ADD_THIS_TRANSLATOR(Bar_engraver);
-
-
-

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 8e39362e90cd46cbc0e0c5282c759fdef59a62cb..0616ae2142f88ec8a3f192cca918fb76a90a4e0b 100644 (file)
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -6,13 +6,14 @@
   (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #include "bar-number-engraver.hh"
 #include "timing-translator.hh"
 #include "timing-engraver.hh"
 #include "engraver-group-engraver.hh"
 #include "text-item.hh"
 
+ADD_THIS_TRANSLATOR (Bar_number_engraver);
+
 Bar_number_engraver::Bar_number_engraver()
 {
   axis_ = Y_AXIS;
@@ -41,5 +42,3 @@ Bar_number_engraver::do_process_requests ()
                                 
     }
 }
-
-ADD_THIS_TRANSLATOR(Bar_number_engraver);

diff --git a/lily/base-span-bar-engraver.cc b/lily/base-span-bar-engraver.cc
index e267368cd08b9f1652788f586dbb5d9bbd37b2b9..880d458988ad0d9afae739db64bf13e52151f0d0 100644 (file)
--- a/lily/base-span-bar-engraver.cc
+++ b/lily/base-span-bar-engraver.cc
@@ -12,6 +12,8 @@
 #include "base-span-bar-engraver.hh"
 #include "axis-align-spanner.hh"
 
+ADD_THIS_TRANSLATOR (Base_span_bar_engraver);
+
 Base_span_bar_engraver::Base_span_bar_engraver()
 {
   spanbar_p_ =0;
@@ -87,6 +89,3 @@ Base_span_bar_engraver::do_pre_move_processing()
 }
 
 
-
-ADD_THIS_TRANSLATOR(Base_span_bar_engraver);
-

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index cb5132932c2d9dd6e6413d5d4d880f49f902b650..7a770f681295baf64f8115114162a30dd41aac53 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -6,6 +6,7 @@
   (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
+
 #include "timing-engraver.hh"
 #include "engraver-group-engraver.hh"
 #include "beam-engraver.hh"
@@ -17,6 +18,8 @@
 #include "beaming.hh"
 #include "score-engraver.hh"
 
+ADD_THIS_TRANSLATOR (Beam_engraver);
+
 Beam_engraver::Beam_engraver ()
 {
   beam_p_ = 0;
@@ -191,7 +194,3 @@ Beam_engraver::acknowledge_element (Score_element_info info)
     }
 }
 
-
-
-ADD_THIS_TRANSLATOR(Beam_engraver);
-

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 44d94270a6028544137528c2e1774f5fe6ca33e6..ed16e886b9aa9b95a9a2e4acea24fb0b96598427 100644 (file)
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -5,7 +5,8 @@
   
   (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
- */
+*/
+
 #include "engraver.hh"
 #include "protected-scm.hh"
 #include "break-align-item.hh"
@@ -25,9 +26,7 @@ public:
   Break_align_engraver ();
 };
 
-
-
-ADD_THIS_TRANSLATOR(Break_align_engraver);
+ADD_THIS_TRANSLATOR (Break_align_engraver);
 
 void
 Break_align_engraver::add_column (SCM smob)

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index 669a606353d7f6237a51ceaf19af567e2670f885..0ad42c9abcb79dc8fb9fb348fc57e4c46500a206 100644 (file)
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -22,6 +22,8 @@ TODO:
 #include "note-head.hh"
 #include "local-key-item.hh"
 
+ADD_THIS_TRANSLATOR (Breathing_sign_engraver);
+
 
 Breathing_sign_engraver::Breathing_sign_engraver()
 {
@@ -66,5 +68,3 @@ Breathing_sign_engraver::do_post_move_processing()
 {
     breathing_sign_req_l_ = 0;
 }
-
-ADD_THIS_TRANSLATOR(Breathing_sign_engraver);

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 152d95163e1f0ba6c7c08b149752f95370662309..dd1f55e3504d3688dcdd7a895c903c7b75828a41 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -47,6 +47,8 @@ public:
 };
 
 
+ADD_THIS_TRANSLATOR (Clef_engraver);
+
 Clef_engraver::Clef_engraver()
 {
   clef_glyph_ = SCM_EOL;
@@ -212,8 +214,3 @@ Clef_engraver::do_post_move_processing()
   clef_req_l_ = 0;
 }
 
-
-
-
-ADD_THIS_TRANSLATOR(Clef_engraver);
-

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 20bc947c56e0b18e1855fbcbdde689359ca36359..ecca483478ffefd3450aadda7c1cbfb1e1667ce1 100644 (file)
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -11,6 +11,8 @@
 #include "collision.hh"
 #include "dimension-cache.hh"
 
+ADD_THIS_TRANSLATOR (Collision_engraver);
+
 void
 Collision_engraver::process_acknowledged ()
 {
@@ -54,7 +56,3 @@ Collision_engraver::Collision_engraver()
 {
   col_p_ =0;
 }
-
-
-
-ADD_THIS_TRANSLATOR(Collision_engraver);

diff --git a/lily/crescendo.cc b/lily/crescendo.cc
index ecd51f5d5b393e0a69733dfc069b597385a35ad1..3fc7f4b44c73a8907b8f522c01393b535c840f94 100644 (file)
--- a/lily/crescendo.cc
+++ b/lily/crescendo.cc
@@ -33,7 +33,8 @@ Crescendo::do_brew_molecule_p () const
 
   if (!isdir_b (dir) || !gh_pair_p (dyns))
     {
-      set_elt_property ("transparent", SCM_BOOL_T);
+      Crescendo* urg= (Crescendo*)this;
+      urg->set_elt_property ("transparent", SCM_BOOL_T);
       return new Molecule;
     }
   

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index ccf70320b4df75720b767ea4d1ee7fb42e3011de..6ff73f1a4a245aab772f093c7026588a5cde27dd 100644 (file)
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -11,6 +11,8 @@
 #include "rhythmic-head.hh"
 #include "dot-column.hh"
 
+ADD_THIS_TRANSLATOR (Dot_column_engraver);
+
 Dot_column_engraver::Dot_column_engraver ()
 {
   dotcol_p_ =0;
@@ -46,6 +48,3 @@ Dot_column_engraver::acknowledge_element (Score_element_info info)
   dotcol_p_->add_head (h);
 }
 
-
-ADD_THIS_TRANSLATOR(Dot_column_engraver);
-

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index fe27ade94b64565db4b2e980b8bb54ac47f55900..b02b5aeff7576bf4acdfe185b1a8bfb1b7827c87 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -5,6 +5,7 @@
 
   (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+
 #include "debug.hh"
 #include "crescendo.hh"
 #include "musical-request.hh"
@@ -44,7 +45,7 @@ protected:
   virtual void do_post_move_processing();
 };
 
-
+ADD_THIS_TRANSLATOR (Dynamic_engraver);
 
 Dynamic_engraver::Dynamic_engraver()
 {
@@ -211,10 +212,6 @@ Dynamic_engraver::do_pre_move_processing()
   typeset_all ();
 }
 
-
-
-ADD_THIS_TRANSLATOR(Dynamic_engraver);
-
 void
 Dynamic_engraver::do_removal_processing ()
 {

diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group-engraver.cc
index 85038b48d2fea90d26950ad840ed5af5adf70ef5..04afcf061314765525a4fd3dae6a04427c7902aa 100644 (file)
--- a/lily/engraver-group-engraver.cc
+++ b/lily/engraver-group-engraver.cc
@@ -13,8 +13,7 @@
 #include "paper-score.hh"
 #include "score-element.hh"
 
-
-ADD_THIS_TRANSLATOR(Engraver_group_engraver);
+ADD_THIS_TRANSLATOR (Engraver_group_engraver);
 
 void
 Engraver_group_engraver::announce_element (Score_element_info info)

diff --git a/lily/grace-engraver-group.cc b/lily/grace-engraver-group.cc
index cb99415a2bcf3ba4219f1651b09400aff90238ab..cb9642af840d40718af896089aa1fbef5c9aea27 100644 (file)
--- a/lily/grace-engraver-group.cc
+++ b/lily/grace-engraver-group.cc
@@ -6,12 +6,14 @@
   (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
+
 #include "grace-engraver-group.hh"
 #include "lily-guile.hh"
-
 #include "score-element.hh"
 #include "musical-request.hh"
 
+ADD_THIS_TRANSLATOR (Grace_engraver_group);
+
 void
 Grace_engraver_group::start ()
 {
@@ -91,8 +93,6 @@ Grace_engraver_group::each (Const_method_pointer method) const
  if (calling_self_b_)
     Engraver_group_engraver::each (method);
 }
-ADD_THIS_TRANSLATOR(Grace_engraver_group);
-
 
 /*
   don't let the commands trickle up.

diff --git a/lily/grace-performer-group.cc b/lily/grace-performer-group.cc
index 45c47ca37f38aaf007657235e1263d967ddfe0e0..2266c7b2aaa132436b01cc88e478c6e0f093e0f4 100644 (file)
--- a/lily/grace-performer-group.cc
+++ b/lily/grace-performer-group.cc
@@ -6,9 +6,9 @@
   (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
+
 #include "grace-performer-group.hh"
 #include "lily-guile.hh"
-
 #include "audio-element.hh"
 
 ADD_THIS_TRANSLATOR (Grace_performer_group);

diff --git a/lily/grace-position-engraver.cc b/lily/grace-position-engraver.cc
index 1b9fe9534fcab36da5bafc0d16f62f6d35bddba3..3efe92741581beae4ae3ac03af53b4e6a2c99582 100644 (file)
--- a/lily/grace-position-engraver.cc
+++ b/lily/grace-position-engraver.cc
@@ -29,6 +29,7 @@ public:
   Grace_position_engraver();
 };
 
+ADD_THIS_TRANSLATOR (Grace_position_engraver);
 
 Grace_position_engraver::Grace_position_engraver ()
 {
@@ -106,5 +107,3 @@ Grace_position_engraver::do_post_move_processing ()
   align_l_ =0;
 }
 
-ADD_THIS_TRANSLATOR(Grace_position_engraver);
-

diff --git a/lily/hara-kiri-engraver.cc b/lily/hara-kiri-engraver.cc
index 0761b36ce3c412c7312437894e7c1390fea5e1c7..d5fecea4fa30d9e75f3b6c72111f0f7e852f1ffc 100644 (file)
--- a/lily/hara-kiri-engraver.cc
+++ b/lily/hara-kiri-engraver.cc
@@ -6,10 +6,13 @@
   (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
+
 #include "hara-kiri-vertical-group-spanner.hh"
 #include "hara-kiri-engraver.hh"
 #include "rhythmic-head.hh"
 
+ADD_THIS_TRANSLATOR (Hara_kiri_engraver);
+
 Axis_group_spanner*
 Hara_kiri_engraver::get_spanner_p () const
 {
@@ -27,4 +30,3 @@ Hara_kiri_engraver::acknowledge_element (Score_element_info i)
     }
   
 }
-ADD_THIS_TRANSLATOR(Hara_kiri_engraver);

diff --git a/lily/hara-kiri-line-group-engraver.cc b/lily/hara-kiri-line-group-engraver.cc
index 2d9fe8a91603d09771f724ac64a80ca2024852da..c2c21d12ce2070d8abd4707f39ec2f5a046359fb 100644 (file)
--- a/lily/hara-kiri-line-group-engraver.cc
+++ b/lily/hara-kiri-line-group-engraver.cc
@@ -10,7 +10,6 @@
 #include "hara-kiri-vertical-group-spanner.hh"
 #include "hara-kiri-line-group-engraver.hh"
 
-
 ADD_THIS_TRANSLATOR (Hara_kiri_line_group_engraver);
 
 void

diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh
index c7d99235b463e62ab77866b726bfa08b9d30d29e..d38f6743c2b6baec4d40e2954aa70d63c667a6aa 100644 (file)
--- a/lily/include/lily-proto.hh
+++ b/lily/include/lily-proto.hh
@@ -16,6 +16,7 @@ struct Absolute_dynamic_req;
 struct Adobe_font_char_metric;
 struct Adobe_font_metric;
 struct Align_element;
+struct Align_note_column_engraver;
 struct All_font_metrics;
 struct Articulation_req;
 struct Atom;
@@ -55,6 +56,7 @@ struct Blank_req;
 struct Bow;
 struct Box;
 struct Bracket_req;
+struct Break_align_engraver;
 struct Break_align_item;
 struct Break_req;
 struct CHyphen_req;
@@ -86,6 +88,7 @@ struct Dot_column;
 struct Dots;
 struct Durational_req;
 struct Dynamic;
+struct Dynamic_engraver;
 struct Dynamic_req;
 struct Element_group;
 struct Element_group_item;
@@ -98,6 +101,8 @@ struct Font_metric;
 struct General_script_def;
 struct Global_translator;
 struct Grace_align_item;
+struct Grace_position_engraver;
+struct Grace_position_performer;
 struct Hara_kiri_group_spanner;
 struct Hara_kiri_line_group_engraver;
 struct Head_column;
@@ -126,6 +131,7 @@ struct Lyric_item;
 struct Lyric_req;
 struct Mark_req;
 struct Measure_grouping_req;
+struct Melisma_engraver;
 struct Melodic_req;
 struct Midi_def;
 struct Midi_duration;
@@ -166,6 +172,7 @@ struct Note_column;
 struct Note_column_engraver;
 struct Note_head;
 struct Note_head_engraver;
+struct Note_name_engraver;
 struct Note_performer;
 struct Note_req;
 struct Notename_table;
@@ -182,6 +189,7 @@ struct Performer;
 struct Performer;
 struct Performer_group_performer;
 struct Piano_brace;
+struct Property_engraver;
 struct Property_iterator;
 struct Rational;
 struct Re_rhythmed_music;
@@ -208,6 +216,7 @@ struct Score_element;
 struct Score_element_info;
 struct Score_performer;
 struct Script;
+struct Script_column_engraver;
 struct Script_req;
 struct Separating_group_spanner;
 struct Sequential_music;
@@ -220,6 +229,7 @@ struct Slur;
 struct Slur_engraver;
 struct Spacing_spanner;
 struct Span_bar;
+struct Span_bar_engraver;
 struct Span_req;
 struct Span_score_bar;
 struct Spanner;
@@ -230,6 +240,7 @@ struct Staff_performer;
 struct Staff_side;
 struct Staff_side_item;
 struct Staff_symbol;
+struct Staff_symbol_engraver;
 struct Stem;
 struct Stem_beam_engraver;
 struct Stem_req;
@@ -239,6 +250,7 @@ struct Super_element;
 struct Symtable;
 struct Symtables;
 struct Tempo_req;
+struct Tex_engraver;
 struct Tex_font_char_metric;
 struct Tex_font_metric;
 struct Tex_font_metric_reader;

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index 767b652dd2ff4461e291f580e76d0e8ff8eef264..861668111d577abef19fa3e4e8678d0c01218956 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -6,6 +6,7 @@
   (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   */
 // clean me up 
+
 #include "key-engraver.hh"
 #include "key-item.hh"
 #include "command-request.hh"
@@ -16,6 +17,8 @@
 #include "timing-translator.hh"
 #include "staff-symbol-referencer.hh"
 
+ADD_THIS_TRANSLATOR (Key_engraver);
+
 Key_engraver::Key_engraver ()
 {
   item_p_ = 0;
@@ -201,5 +204,3 @@ Key_engraver::do_post_move_processing ()
   old_accidental_idx_arr_.clear ();
 }
 
-ADD_THIS_TRANSLATOR (Key_engraver);
-

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index d80177c26d403480f41edb84c01b3cb56fc04976..7e09fefbc69eb287504c45da951f441cded57dbc 100644 (file)
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -10,9 +10,6 @@
 #include "command-request.hh"
 #include "audio-item.hh"
 
-
-
-
 ADD_THIS_TRANSLATOR (Key_performer);
 
 Key_performer::Key_performer ()

diff --git a/lily/line-group-group-engraver.cc b/lily/line-group-group-engraver.cc
index 43aaeb602117b1732626a8f3a6ead4ec78b61b1b..01696bbd567d9115a511d3c68d32966f0c9a6459 100644 (file)
--- a/lily/line-group-group-engraver.cc
+++ b/lily/line-group-group-engraver.cc
@@ -14,6 +14,8 @@
 #include "line-group-group-engraver.hh"
 #include "paper-column.hh"
 
+ADD_THIS_TRANSLATOR (Line_group_engraver_group);
+
 Line_group_engraver_group::Line_group_engraver_group()
 {
   staffline_p_ =0;
@@ -55,8 +57,3 @@ Line_group_engraver_group::create_line_spanner ()
   staffline_p_->set_axes (Y_AXIS,Y_AXIS);
 }
 
-
-
-
-ADD_THIS_TRANSLATOR(Line_group_engraver_group);
-

diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc
index 72170cc9db8ebdac5b2dcb95fb1b1b8aa16ad2d8..3357c8a174d45371d07dfbb019a87b63cb4d6ab4 100644 (file)
--- a/lily/local-key-engraver.cc
+++ b/lily/local-key-engraver.cc
@@ -19,6 +19,8 @@
 #include "grace-align-item.hh"
 #include "staff-symbol-referencer.hh"
 
+ADD_THIS_TRANSLATOR (Local_key_engraver);
+
 Local_key_engraver::Local_key_engraver()
 {
   key_grav_l_ = 0;
@@ -194,7 +196,3 @@ Local_key_engraver::do_process_requests()
     }
 }
 
-
-
-ADD_THIS_TRANSLATOR(Local_key_engraver);
-

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 5e6f01f36b8a0aaa9e10be915405908a35eca911..103c7176b72b178782b63d73d740d90c4701aa7f 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -15,7 +15,6 @@
 
 ADD_THIS_TRANSLATOR (Lyric_engraver);
 
-
 Lyric_engraver::Lyric_engraver()
 {
   text_p_ =0;

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 52dbfbe921215c00a554ca73a476dc7ae01c917a..dda6ef8d049fa39082df0a2b7801051147754332 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -5,12 +5,12 @@
 
  (c) 1998--1999 Jan Nieuwenhuizen <janneke@gnu.org>
 */
+
 #include "command-request.hh"
 #include "mark-engraver.hh"
 #include "engraver-group-engraver.hh"
 #include "text-item.hh"
 
-
 ADD_THIS_TRANSLATOR (Mark_engraver);
 
 Mark_engraver::Mark_engraver ()

diff --git a/lily/melisma-engraver.cc b/lily/melisma-engraver.cc
index 3a89ad968fbc62b65cd4b0ae4789155e3a404229..9d34b559d5171a29b070afe6a07a584cf1f522a4 100644 (file)
--- a/lily/melisma-engraver.cc
+++ b/lily/melisma-engraver.cc
@@ -20,7 +20,7 @@ public:
   bool do_try_music (Music *);
 };
 
-ADD_THIS_TRANSLATOR(Melisma_engraver);
+ADD_THIS_TRANSLATOR (Melisma_engraver);
 
 bool
 Melisma_engraver::do_try_music (Music *m ) 

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index 08d97fe22fcce936885721749978aff8a425843f..852028ec8c455ba6dc8e5ccfcb15993be2f43ef8 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -15,7 +15,6 @@
 #include "bar.hh"
 #include "staff-symbol-referencer.hh"
 
-
 ADD_THIS_TRANSLATOR (Multi_measure_rest_engraver);
 
 Multi_measure_rest_engraver::Multi_measure_rest_engraver ()

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 9de2bb6af7819d21ab708ec25c541a744c0c259c..81f56ca62abc281f9ddf814082754b8babc66cdb 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -5,6 +5,7 @@
 
   (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+
 #include "debug.hh"
 #include "music-list.hh"
 #include "music-iterator.hh"

diff --git a/lily/music.cc b/lily/music.cc
index 10462173df834fe380b5fb81afffe9c42630d501..817b38a8027a0f1a195e734d7bda6b718d229949 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -6,7 +6,6 @@
   (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #include "music.hh"
 #include "music-list.hh"
 #include "debug.hh"

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 0eadf768e4a375797f4f23c37b5f17352a305225..718418fd34c42e607fbb4ce2054a42ef717ddd9c 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -12,6 +12,8 @@
 #include "dot-column.hh"
 #include "staff-symbol-referencer.hh"
 
+ADD_THIS_TRANSLATOR (Note_heads_engraver);
+
 Note_heads_engraver::Note_heads_engraver()
 {
 }
@@ -118,8 +120,3 @@ Note_heads_engraver::do_pre_move_processing()
   note_req_l_arr_.clear ();
 }
 
-
-
-
-ADD_THIS_TRANSLATOR(Note_heads_engraver);
-

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index a87cea19ff94e366aba658f3f023a221f8c3cbf6..8ddcc9a98464e4536220848583d8f52d4f67ae5c 100644 (file)
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -22,6 +22,8 @@ public:
   virtual void do_pre_move_processing ();
 };
 
+ADD_THIS_TRANSLATOR (Note_name_engraver);
+
 bool
 Note_name_engraver::do_try_music (Music *m)
 {
@@ -63,5 +65,3 @@ Note_name_engraver::do_pre_move_processing ()
   texts_.clear() ;
   req_l_arr_.clear ();
 }
-
-ADD_THIS_TRANSLATOR(Note_name_engraver);

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 25a49c2f8591ff34d540461ab0485fc6d6716d4b..67a88a216fcca58dfce3acf33b002dce1bd4744f 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -13,7 +13,6 @@
 #include "global-translator.hh"
 #include "debug.hh"
 
-
 ADD_THIS_TRANSLATOR (Note_performer);
 
 Note_performer::Note_performer ()

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index 7496881ad0732a1c33f420cd88bc0260379a59e3..6e4f5562b9afd343ca13d24977d6be25790ebfa9 100644 (file)
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -8,12 +8,9 @@
  */
 
 #include "performer-group-performer.hh"
-
 #include "debug.hh"
 
-
-ADD_THIS_TRANSLATOR(Performer_group_performer);
-
+ADD_THIS_TRANSLATOR (Performer_group_performer);
 
 void
 Performer_group_performer::announce_element (Audio_element_info info)

diff --git a/lily/pitch-squash-engraver.cc b/lily/pitch-squash-engraver.cc
index 7ed7a8c085855afa7732bbcceac8cf8994ec3d35..a3ce1a071958efa4edfc89d6689474ed9860cd86 100644 (file)
--- a/lily/pitch-squash-engraver.cc
+++ b/lily/pitch-squash-engraver.cc
@@ -6,11 +6,13 @@
   (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
-#include "staff-symbol-referencer.hh"
 
+#include "staff-symbol-referencer.hh"
 #include "pitch-squash-engraver.hh"
 #include "note-head.hh"
 
+ADD_THIS_TRANSLATOR (Pitch_squash_engraver);
+
 void
 Pitch_squash_engraver::acknowledge_element (Score_element_info i)
 {
@@ -20,6 +22,4 @@ Pitch_squash_engraver::acknowledge_element (Score_element_info i)
     }
 }
 
-ADD_THIS_TRANSLATOR (Pitch_squash_engraver);
-
 

diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc
index d2eb399759599ea8d4fdd132366f846302c57626..3c4fb3f9fe53aa8e9b3778eb3fdc7af24edbdc74 100644 (file)
--- a/lily/property-engraver.cc
+++ b/lily/property-engraver.cc
@@ -25,6 +25,8 @@ protected:
   VIRTUAL_COPY_CONS(Translator);
 };
 
+ADD_THIS_TRANSLATOR (Property_engraver);
+
 void
 Property_engraver::do_creation_processing ()
 {
@@ -71,5 +73,3 @@ Property_engraver::apply_properties (SCM p, Score_element *e)
        e->set_elt_property (ly_symbol2string (elt_prop_name), val);
     }
 }
-
-ADD_THIS_TRANSLATOR(Property_engraver);

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index 756bb50bee558650b1fb9ad17f65b17bc0430f1a..e6acb025b29795bcb93ad05e31e11bde23852d0f 100644 (file)
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -12,11 +12,9 @@
 #include "collision.hh"
 #include "note-column.hh"
 
+ADD_THIS_TRANSLATOR (Rest_collision_engraver);
 
-
-ADD_THIS_TRANSLATOR(Rest_collision_engraver);
-
-Rest_collision_engraver::Rest_collision_engraver()
+Rest_collision_engraver::Rest_collision_engraver ()
 {
   rest_collision_p_ =0;
 }

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 90e63d79c685bec9059813d852db0c9e937433f0..cd124711b1c7dd4a9e802e263d2677558b3b3c7d 100644 (file)
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -5,11 +5,15 @@
 
   (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+
 #include "staff-symbol-referencer.hh"
 #include "rest-engraver.hh"
 #include "musical-request.hh"
 #include "dots.hh"
 #include "rest.hh"
+
+ADD_THIS_TRANSLATOR (Rest_engraver);
+
 /*
   Should merge with Note_head_engraver
  */
@@ -80,6 +84,3 @@ Rest_engraver::do_try_music (Music *req)
     }  
   return false;
 }
-
-
-ADD_THIS_TRANSLATOR(Rest_engraver);

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index 0be292f7013d4068c59b9d29c5d6c22ced199d1b..574bee667561cd3e8102d14d3cdba371cb4603c6 100644 (file)
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -15,6 +15,8 @@
 #include "dot-column.hh"
 #include "musical-request.hh"
 
+ADD_THIS_TRANSLATOR (Rhythmic_column_engraver);
+
 Rhythmic_column_engraver::Rhythmic_column_engraver()
 {
   stem_l_ =0;
@@ -120,5 +122,3 @@ Rhythmic_column_engraver::do_post_move_processing()
   stem_l_ =0;
 }
 
-ADD_THIS_TRANSLATOR(Rhythmic_column_engraver);
-

diff --git a/lily/score-element.cc b/lily/score-element.cc
index 8e180bc4017b93067a7ea40a484b6dd556470089..5fe4be4c8734072b71d74e778da21d001b0858a0 100644 (file)
--- a/lily/score-element.cc
+++ b/lily/score-element.cc
@@ -6,9 +6,7 @@
   (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #include <string.h>
-
 #include "group-interface.hh"
 #include "misc.hh"
 #include "paper-score.hh"

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index 3b5f9465498eee6db295b4ce05e275a911263631..6208952db812a69c61ca6ba316d4cdfec503a69d 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -5,6 +5,7 @@
 
   (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+
 #include "debug.hh"
 #include "dimension-cache.hh"
 #include "line-of-score.hh"
@@ -16,7 +17,9 @@
 #include "command-request.hh"
 #include "paper-def.hh"
 
-Score_engraver::Score_engraver()
+ADD_THIS_TRANSLATOR (Score_engraver);
+
+Score_engraver::Score_engraver ()
 {
   scoreline_l_ =0;
   command_column_l_ =0;
@@ -255,8 +258,6 @@ Score_engraver::forbid_breaks ()
   command_column_l_->remove_elt_property ("breakable");
 }
 
-ADD_THIS_TRANSLATOR(Score_engraver);
-
 void
 Score_engraver::do_add_processing ()
 {

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index b69dcbe5b78f21702c7e29680b0ac115901aff3f..73c631b6c242a06c09ec0ff8a0bc5ea483ae8ffa 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -19,10 +19,8 @@
 #include "source.hh"
 #include "audio-staff.hh"
 
-
 ADD_THIS_TRANSLATOR (Score_performer);
 
-
 Score_performer::Score_performer ()
 {
   performance_p_ = 0;

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 793ef46e977ec1c7248ebf393b423e4b554df4f9..df81722ee68a66bf5a2233e347fcef786b8017a3 100644 (file)
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -31,6 +31,8 @@ protected:
 };
 
 
+ADD_THIS_TRANSLATOR (Script_column_engraver);
+
 Script_column_engraver::Script_column_engraver()
 {
   scol_p_ =0;
@@ -85,4 +87,3 @@ Script_column_engraver::process_acknowledged ()
       script_l_arr_.clear ();
     }
 }
-ADD_THIS_TRANSLATOR(Script_column_engraver);

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index af4be4f176af0e0441c9084eb5fc3554ccf27be1..6e9ca566b601cc0e43d47d40ceea552a19206db7 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -13,9 +13,11 @@
 #include "rhythmic-head.hh"
 #include "dimension-cache.hh"
 
-Script_engraver::Script_engraver()
+ADD_THIS_TRANSLATOR (Script_engraver);
+
+Script_engraver::Script_engraver ()
 {
-  do_post_move_processing();
+  do_post_move_processing ();
 }
 
 bool
@@ -143,6 +145,4 @@ Script_engraver::do_post_move_processing()
   script_req_l_arr_.clear();
 }
 
-ADD_THIS_TRANSLATOR(Script_engraver);
-
 

diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc
index b2ae354ab9752613a3ca22b6d025cb1fc587a7db..53293ceddedcba74cfdd71632faf310f3fca8d13 100644 (file)
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -13,6 +13,8 @@
 #include "paper-column.hh"
 #include "paper-def.hh"
 
+ADD_THIS_TRANSLATOR (Separating_line_group_engraver);
+
 Separating_line_group_engraver::Separating_line_group_engraver ()
 {
   sep_span_p_ = 0;
@@ -75,7 +77,3 @@ Separating_line_group_engraver::do_pre_move_processing ()
     }
 }
 
-
-
-ADD_THIS_TRANSLATOR( Separating_line_group_engraver);
-

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 4bf349656d8354ddcec864ca74faea104fbefc6e..55970b93ffd82bc7b087a245e0afc3a048967cb5 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -12,6 +12,8 @@
 #include "note-column.hh"
 #include "translator-group.hh"
 
+ADD_THIS_TRANSLATOR (Slur_engraver);
+
 bool
 Slur_engraver::do_try_music (Music *req_l)
 {
@@ -122,5 +124,3 @@ Slur_engraver::do_post_move_processing()
     }
 }
 
-
-ADD_THIS_TRANSLATOR(Slur_engraver);

diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index 0082a25ae490db0979d21d1fdeb81c9cfdfbb736..70ff60553e4e6f3c770bd8fb11b88c0fd9c4edaa 100644 (file)
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -12,6 +12,8 @@
 #include "spacing-engraver.hh"
 #include "spacing-spanner.hh"
 
+ADD_THIS_TRANSLATOR (Spacing_engraver);
+
 inline int
 compare (Rhythmic_tuple const &a, Rhythmic_tuple const &b)
 {
@@ -111,6 +113,4 @@ Spacing_engraver::do_post_move_processing ()
     stopped_durations_.push (playing_durations_.get ());
 }
 
-ADD_THIS_TRANSLATOR(Spacing_engraver);
-
 

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index 135d978c15864841a09858bdaa4441a38485d1fa..b77fb1bf1e15b66e476ef8496e11ce1af72ac1a4 100644 (file)
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -1,5 +1,12 @@
-#include "base-span-bar-engraver.hh"
+/*
+  span-bar-engraver.cc -- implement Span_bar_engraver
+
+  source file of the GNU LilyPond music typesetter
 
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
+#include "base-span-bar-engraver.hh"
 
 class Span_bar_engraver : public Base_span_bar_engraver
 {
@@ -8,10 +15,9 @@ public:
   VIRTUAL_COPY_CONS (Translator);
 };
 
+ADD_THIS_TRANSLATOR (Span_bar_engraver);
 
 Span_bar_engraver::Span_bar_engraver ()
 {
   use_priority_b_ = false;
 }
-
-ADD_THIS_TRANSLATOR(Span_bar_engraver);

diff --git a/lily/span-score-bar-engraver.cc b/lily/span-score-bar-engraver.cc
index c25121169326e3e682d7d94b6fc41d3d4468d0ab..f2409d339185560fc7d085d852f4e091f0022e34 100644 (file)
--- a/lily/span-score-bar-engraver.cc
+++ b/lily/span-score-bar-engraver.cc
@@ -12,6 +12,10 @@
 #include "paper-def.hh"
 #include "dimension-cache.hh"
 
+ADD_THIS_TRANSLATOR (Piano_bar_engraver);
+ADD_THIS_TRANSLATOR (Staff_group_bar_engraver);
+ADD_THIS_TRANSLATOR (Span_score_bar_engraver);
+
 Span_bar*
 Span_score_bar_engraver::get_span_bar_p () const
 {
@@ -59,8 +63,4 @@ Staff_group_bar_engraver::acknowledge_element (Score_element_info i)
     }
 }
 
-ADD_THIS_TRANSLATOR (Piano_bar_engraver);
-ADD_THIS_TRANSLATOR (Staff_group_bar_engraver);
-ADD_THIS_TRANSLATOR (Span_score_bar_engraver);
-
 

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index f00bb39f52b58dea23dbc5b0c0a1f07d934e189d..92b8c06e0c091fb9bf8d48c4ace0d0eca8d1caf7 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -13,7 +13,6 @@
 #include "audio-item.hh"
 #include "audio-staff.hh"
 
-
 ADD_THIS_TRANSLATOR (Staff_performer);
 
 Staff_performer::Staff_performer ()

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index 6c8787c29928be8a29c4fa43c8984673b38094f2..ae325bd35a0db254e6030283dfd61ac1ba89d390 100644 (file)
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -32,6 +32,7 @@ protected:
        
 };
 
+ADD_THIS_TRANSLATOR (Staff_symbol_engraver);
 
 Staff_symbol_engraver::~Staff_symbol_engraver()
 {
@@ -74,6 +75,3 @@ Staff_symbol_engraver::acknowledge_element (Score_element_info s)
     }
 }
 
-
-ADD_THIS_TRANSLATOR(Staff_symbol_engraver);
-

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index c5e84f734df68bb797a908a11ac92662baf16f52..f20d105a980812c66dde4dd750c4b84b8a8254d9 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -16,6 +16,8 @@
 #include "staff-info.hh"
 #include "translator-group.hh"
 
+ADD_THIS_TRANSLATOR (Stem_engraver);
+
 Stem_engraver::Stem_engraver()
 {
   abbrev_req_l_ = 0;
@@ -138,6 +140,3 @@ Stem_engraver::do_try_music (Music* r)
   return false;
 }
 
-
-ADD_THIS_TRANSLATOR(Stem_engraver);
-

diff --git a/lily/swallow-engraver.cc b/lily/swallow-engraver.cc
index 2a6a8c9e3107482f10a9de3d088e3bea797c838b..053a8f9560aea4722ac5953f4aebaf797062723b 100644 (file)
--- a/lily/swallow-engraver.cc
+++ b/lily/swallow-engraver.cc
@@ -5,12 +5,10 @@
 
   (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include "swallow-engraver.hh"
-
 
+#include "swallow-engraver.hh"
 
-ADD_THIS_TRANSLATOR(Swallow_engraver);
-
+ADD_THIS_TRANSLATOR (Swallow_engraver);
 
 bool
 Swallow_engraver::do_try_music (Music*) 

diff --git a/lily/swallow-perf.cc b/lily/swallow-perf.cc
index 99c9ec54b98bbaca689b0ff63c0a4a18c9cd93a6..a7be52b0c624e9fff7fb05095a6ce41d8923800a 100644 (file)
--- a/lily/swallow-perf.cc
+++ b/lily/swallow-perf.cc
@@ -8,6 +8,4 @@
 
 #include "swallow-perf.hh"
 
-
-
-ADD_THIS_TRANSLATOR(Swallow_performer);
+ADD_THIS_TRANSLATOR (Swallow_performer);

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index de0a4bb94166e6a6e36ca32af6f02cb1b7d1756d..3c18529ed74477ad328db1edfb42ebbd10b6bfd5 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -6,8 +6,8 @@
   (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
-#include "dimension-cache.hh"
 
+#include "dimension-cache.hh"
 #include "engraver.hh"
 #include "side-position-interface.hh"
 #include "text-item.hh"
@@ -34,6 +34,7 @@ protected:
   virtual void acknowledge_element (Score_element_info);
 };
 
+ADD_THIS_TRANSLATOR (Text_engraver);
 
 bool
 Text_engraver::do_try_music (Music *m)
@@ -129,5 +130,3 @@ Text_engraver::do_post_move_processing ()
   reqs_.clear ();
 }
 
-ADD_THIS_TRANSLATOR(Text_engraver);
-

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 0948237b0e152886cb2bc16c6ed77e7d9d7215c5..351dc4442a979ff24ecc070817f18f3a92afae79 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -1,5 +1,5 @@
 /*   
-  ctie-engraver.cc --  implement Tie_engraver
+  tie-engraver.cc --  implement Tie_engraver
   
   source file of the GNU LilyPond music typesetter
   
@@ -14,6 +14,8 @@
 #include "tie.hh"
 #include "translator-group.hh"
 
+ADD_THIS_TRANSLATOR (Tie_engraver);
+
 Tie_engraver::Tie_engraver()
 {
   req_l_ = 0;
@@ -180,9 +182,6 @@ Tie_engraver::do_post_move_processing ()
     past_notes_pq_.delmin ();
 }
 
-ADD_THIS_TRANSLATOR(Tie_engraver);
-
-
 CHead_melodic_tuple::CHead_melodic_tuple ()
 {
   head_l_ =0;

diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index a05b54cce6464150adc57d94326c56d2df95e950..f8610e76a96b76c50299dce5342f9ea267bdfcb8 100644 (file)
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -12,7 +12,6 @@
 #include "audio-item.hh"
 #include "musical-request.hh"
 
-
 ADD_THIS_TRANSLATOR (Tie_performer);
 
 Tie_performer::Tie_performer()

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index bba35fe2b1d9421f1f3ea7cd4ab034eb03a210e7..7a659d6a3da12c98e4a4f1d1ffea162e811370c0 100644 (file)
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -12,6 +12,8 @@
 #include "timing-engraver.hh"
 #include "engraver-group-engraver.hh"
 
+ADD_THIS_TRANSLATOR (Time_signature_engraver);
+ 
 Time_signature_engraver::Time_signature_engraver()
 { 
   time_signature_p_ =0;
@@ -60,6 +62,3 @@ Time_signature_engraver::do_pre_move_processing()
 }
 
 
-ADD_THIS_TRANSLATOR(Time_signature_engraver);
- 
-

diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc
index e576f036c9c5fbe742a0e167dbf76e34bd8e270d..4c02481c38055e5b073b015b099ef1a8fc7f15f2 100644 (file)
--- a/lily/timing-engraver.cc
+++ b/lily/timing-engraver.cc
@@ -12,13 +12,10 @@
 #include "score-element-info.hh"
 #include "multi-measure-rest.hh"
 
-
-
-ADD_THIS_TRANSLATOR(Timing_engraver);
-
+ADD_THIS_TRANSLATOR (Timing_engraver);
 
 void
-Timing_engraver::do_post_move_processing( )
+Timing_engraver::do_post_move_processing ()
 {
   bar_req_l_ = 0;
   Timing_translator::do_post_move_processing ();

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index 3879f6963481b9da1206c1466b0d3abaa05c679a..da9c0a5515c32ed5df16c59344dab64be93ca7d2 100644 (file)
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -14,6 +14,8 @@
 #include "global-translator.hh"
 #include "multi-measure-rest.hh"
 
+ADD_THIS_TRANSLATOR (Timing_translator);
+
 bool
 Timing_translator::do_try_music (Music*r)
 {
@@ -107,9 +109,6 @@ Timing_translator::do_pre_move_processing()
     }
 }
 
-
-ADD_THIS_TRANSLATOR(Timing_translator);
-
 void
 Timing_translator::do_creation_processing()
 {

diff --git a/lily/translator.cc b/lily/translator.cc
index 515a85af9bbba3ea26dabcee6468d4fd5d9474f6..d4a5cb9d2096eda6e51a4720d20c78ff43913d6d 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -6,11 +6,9 @@
   (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #include "translator.hh"
 #include "debug.hh"
 #include "translator-group.hh"
-
 #include "moment.hh"
 
 char const*

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index e6fe96b12cdb5f17a93b0a3f828f1e534c713a01..9441b7144a9b580c59d4a04a928538ca72c96f3a 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -15,6 +15,8 @@
 #include "beam.hh"
 #include "music-list.hh"
 
+ADD_THIS_TRANSLATOR (Tuplet_engraver);
+
 bool
 Tuplet_engraver::do_try_music (Music *r)
 {
@@ -105,6 +107,3 @@ Tuplet_engraver::do_removal_processing ()
     }  
 }
 
-ADD_THIS_TRANSLATOR(Tuplet_engraver);
-
-

diff --git a/lily/type-swallow-translator.cc b/lily/type-swallow-translator.cc
index 8c33c86f56043c12c00aac684bd787dd703cfd6e..93ba98973078eb80f34fd4acda1b2f775c9d0468 100644 (file)
--- a/lily/type-swallow-translator.cc
+++ b/lily/type-swallow-translator.cc
@@ -9,6 +9,7 @@
 #include "type-swallow-translator.hh"
 #include "musical-request.hh"
 
+DECLARE_REQUEST_SWALLOWER (Skip_req);
 
 bool
 Type_swallow_translator::do_try_music (Music*r)
@@ -17,7 +18,3 @@ Type_swallow_translator::do_try_music (Music*r)
       return true;
   return false;
 }
-
-
-
-DECLARE_REQUEST_SWALLOWER(Skip_req);

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 7f047f908eec98142898d4abe7575f7f96befe75..7cc8cadd04006c9211fd34a0d2da4071e4808c00 100644 (file)
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -5,6 +5,7 @@
 
   (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+
 #include "translator-group.hh"
 #include "axis-group-engraver.hh"
 #include "paper-column.hh"
@@ -13,6 +14,8 @@
 #include "axis-group-spanner.hh"
 #include "span-bar.hh"
 
+ADD_THIS_TRANSLATOR (Vertical_align_engraver);
+
 Vertical_align_engraver::Vertical_align_engraver()
 {
   valign_p_ =0;
@@ -79,6 +82,3 @@ Vertical_align_engraver::acknowledge_element (Score_element_info i)
     }  
 }
 
-
-
-ADD_THIS_TRANSLATOR(Vertical_align_engraver);