lilypond-1.3.62

diff --git a/lily/include/system-start-delimiter.hh b/lily/include/system-start-delimiter.hh
index 61d23efdb19080b625eaacee26b06a84e4ec1f30..659b166514e3723c1fc2c45aaff646e1b32d7c49 100644 (file)
--- a/lily/include/system-start-delimiter.hh
+++ b/lily/include/system-start-delimiter.hh
@@ -19,11 +19,12 @@ class System_start_delimiter : public Spanner
 {
 public:
   System_start_delimiter (SCM);
-  static SCM scheme_molecule (SCM);
+  static SCM brew_molecule (SCM);
   
   VIRTUAL_COPY_CONS (Score_element);
-protected:
-  virtual void after_line_breaking();
+
+  virtual SCM member_after_line_breaking ();
+  static SCM after_line_breaking (SCM);
   
   Molecule staff_bracket (Real) const;
   Molecule staff_brace (Real) const;

diff --git a/lily/include/tie.hh b/lily/include/tie.hh
index e45a456b997d07bbee7c588fc11a2148dfb42c30..bf6f386fc4f86293723845660f7197faca006c10 100644 (file)
--- a/lily/include/tie.hh
+++ b/lily/include/tie.hh
@@ -25,13 +25,13 @@ public:
 
   Note_head* head (Direction) const;
   Real position_f () const;
-   static SCM scheme_molecule (SCM);
+   static SCM brew_molecule (SCM);
   
 
   virtual Direction get_default_dir() const;
 
-protected:
-  Molecule do_brew_molecule () const;
+
+  SCM member_brew_molecule () const;
   virtual Array<Offset> get_encompass_offset_arr () const;
   Bezier get_curve () const;
 
@@ -42,7 +42,8 @@ protected:
   Drul_array<Real> dx_f_drul_;
 
   virtual void do_add_processing ();
-  virtual void after_line_breaking ();
+  SCM member_after_line_breaking ();
+  static SCM after_line_breaking (SCM);
 
   virtual Array<Rod> get_rods () const;
 

diff --git a/lily/include/time-signature.hh b/lily/include/time-signature.hh
index ea338b29a45511c3f38547b5faa7a3320799ec20..80a08ac7a61bba9c8b36caf7e1b1dd90b53c9019 100644 (file)
--- a/lily/include/time-signature.hh
+++ b/lily/include/time-signature.hh
@@ -23,11 +23,11 @@ class Time_signature: public Item
   Molecule special_time_signature (String,int,int) const;
   Molecule time_signature (int, int)const;
   
-protected:
-  Molecule do_brew_molecule() const;
 public:
+  SCM member_brew_molecule() const;
+
   Time_signature (SCM);
- static SCM scheme_molecule (SCM);
+ static SCM brew_molecule (SCM);
   
 
   /*

diff --git a/lily/include/tuplet-spanner.hh b/lily/include/tuplet-spanner.hh
index ca725e5d401d0b1ac45a58ea6cbc3f871c5f8cae..42019434b7ca9fa573f543db5b46a75bf595e8cd 100644 (file)
--- a/lily/include/tuplet-spanner.hh
+++ b/lily/include/tuplet-spanner.hh
@@ -7,7 +7,6 @@
 #ifndef Tuplet_spanner_HH
 #define Tuplet_spanner_HH
 
-#include "pointer.hh"
 #include "spanner.hh"
 
 /** supportable plet: triplets, eentweetjes, ottava, etc.
@@ -21,19 +20,21 @@ class Tuplet_spanner : public Spanner
 {
 public:
   Tuplet_spanner (SCM);
-  static SCM scheme_molecule (SCM);
+  static SCM brew_molecule (SCM);
   
 
   void add_column (Note_column*);
   void add_beam (Beam*);
-protected:
+
   void calc_dy (Real *) const;
   void calc_position_and_height (Real*,Real *dy)const;
   
-  Molecule do_brew_molecule () const;
+  SCM member_after_line_breaking ();
+  static SCM after_line_breaking (SCM);
+  SCM member_brew_molecule () const;
   VIRTUAL_COPY_CONS(Score_element);
+
   virtual void do_add_processing ();
-  virtual void after_line_breaking ();
   virtual Direction get_default_dir () const;
 };
 

diff --git a/lily/include/volta-spanner.hh b/lily/include/volta-spanner.hh
index 40c2195a44f803a364cc9f0878435542828ffd7d..ede918a767e5ed8c8044eba767c7a4e6b2a09a77 100644 (file)
--- a/lily/include/volta-spanner.hh
+++ b/lily/include/volta-spanner.hh
@@ -8,7 +8,6 @@
 #define VOLTA_SPANNER_HH
 
 
-#include "pointer.hh"
 #include "spanner.hh"
 
 /** Volta bracket with number */
@@ -17,16 +16,16 @@ class Volta_spanner : public Spanner
 {
 public:
   Volta_spanner (SCM);
-  static SCM scheme_molecule (SCM);
+  static SCM brew_molecule (SCM);
   void add_column (Note_column*);
   void add_bar (Bar*);
  
-protected:
-  Molecule do_brew_molecule () const;
+  SCM member_brew_molecule () const;
   VIRTUAL_COPY_CONS (Score_element);
 
   virtual void do_add_processing ();
-  virtual void after_line_breaking ();
+  SCM member_after_line_breaking ();
+  static SCM after_line_breaking (SCM);
 };
 
 #endif // VOLTA_SPANNER_HH