lilypond-0.1.11

diff --git a/flower/choleski.cc b/flower/choleski.cc
index 4a98301af3ec39e63d61ebee2590e5a2dce6b22a..5932f10f973818de7fe60fc122c54a3664b5760d 100644 (file)
--- a/flower/choleski.cc
+++ b/flower/choleski.cc
@@ -13,7 +13,7 @@ const Real EPS = 1e-7;                // so sue me. Hard coded
 //#define PARANOID
 
 void
-Choleski_decomposition::full_matrix_solve (Vector &out, Vector const &rhs)const
+Choleski_decomposition::full_matrix_solve (Vector &out, Vector const &rhs) const
 {
   int n= rhs.dim();
   assert (n == L.dim());
@@ -45,7 +45,7 @@ Choleski_decomposition::full_matrix_solve (Vector &out, Vector const &rhs)const
 }
 
 void
-Choleski_decomposition::band_matrix_solve (Vector &out, Vector const &rhs)const
+Choleski_decomposition::band_matrix_solve (Vector &out, Vector const &rhs) const
 {
   int n= rhs.dim();
   int b = L.band_i();
@@ -79,7 +79,7 @@ Choleski_decomposition::band_matrix_solve (Vector &out, Vector const &rhs)const
 }
 
 void
-Choleski_decomposition::solve (Vector &x, Vector const &rhs)const
+Choleski_decomposition::solve (Vector &x, Vector const &rhs) const
 {
   if (L.band_b()) 
     {
@@ -90,7 +90,7 @@ Choleski_decomposition::solve (Vector &x, Vector const &rhs)const
 }
 
 Vector
-Choleski_decomposition::solve (Vector rhs)const
+Choleski_decomposition::solve (Vector rhs) const
 {
   Vector r;
   solve (r, rhs);

diff --git a/flower/diagonal-storage.cc b/flower/diagonal-storage.cc
index 17699384cd14152cbef24d2401c2359c780b1a00..695819171acbdb4beec61bb270a1a65e5e2bcb83 100644 (file)
--- a/flower/diagonal-storage.cc
+++ b/flower/diagonal-storage.cc
@@ -19,7 +19,7 @@
 #include "full-storage.icc"
 
 int
-Diagonal_storage::dim()const
+Diagonal_storage::dim() const
 {
   return band_.rows();
 }
@@ -41,7 +41,7 @@ Diagonal_storage::cols() const
 }
 
 int
-Diagonal_storage::band_size_i()const
+Diagonal_storage::band_size_i() const
 {
   return (band_.cols()-1)/2;
 }
@@ -104,13 +104,13 @@ Diagonal_storage::~Diagonal_storage()
 
 
 bool
-Diagonal_storage::band_elt_b (int i,int j)const
+Diagonal_storage::band_elt_b (int i,int j) const
 {
   return abs (i-j) <= band_size_i();
 }
 
 void
-Diagonal_storage::assert_valid (int i,int j)const
+Diagonal_storage::assert_valid (int i,int j) const
 {
   assert (band_elt_b (i,j));
   assert (i >=0 && j >=0 && i < dim() && j < dim ());
@@ -133,13 +133,13 @@ Diagonal_storage::resize_dim (int d)
 
 
 bool
-Diagonal_storage::mult_ok (int i,int)const
+Diagonal_storage::mult_ok (int i,int) const
 {
   return i < dim();
 }
 
 void
-Diagonal_storage::mult_next (int &i, int &j)const
+Diagonal_storage::mult_next (int &i, int &j) const
 {
   j++;
   if ( j < i - band_size_i()) 
@@ -152,13 +152,13 @@ Diagonal_storage::mult_next (int &i, int &j)const
 }
 
 bool
-Diagonal_storage::trans_ok (int ,int j)const
+Diagonal_storage::trans_ok (int ,int j) const
 {
   return j < dim();
 }
 
 void
-Diagonal_storage::trans_next (int &i, int& j)const
+Diagonal_storage::trans_next (int &i, int& j) const
 {
   i++;
   if ( i < j - band_size_i())
@@ -174,7 +174,7 @@ Diagonal_storage::trans_next (int &i, int& j)const
 static Real nul_entry=0.0;
 
 Real 
-Diagonal_storage::elem (int i, int j)const
+Diagonal_storage::elem (int i, int j) const
 {
   if (abs ( i-j) > band_size_i())
        return 0;
@@ -202,7 +202,7 @@ Diagonal_storage::elem (int i, int j)
 
 bool
 Diagonal_storage::try_right_multiply (Matrix_storage*dest,
-                                    const Matrix_storage*right)const
+                                    const Matrix_storage*right) const
 {
   if ( right->name() != Diagonal_storage::static_name ()) 
        return false;

diff --git a/flower/directed-graph.cc b/flower/directed-graph.cc
index 46511b4c319bfe0c4d41eb2a9b60eac6a508cee3..9a07629dab71644c7d6d78372f1b8ffd5372acf3 100644 (file)
--- a/flower/directed-graph.cc
+++ b/flower/directed-graph.cc
@@ -22,7 +22,7 @@ Directed_graph_node::get_in_edge_arr() const
 }
 
 Link_array<Directed_graph_node> const &
-Directed_graph_node::get_out_edge_arr()const
+Directed_graph_node::get_out_edge_arr() const
 {
   return edge_out_l_arr_;
 }
@@ -56,7 +56,7 @@ Directed_graph_node::OK() const
 }
 
 bool
-Directed_graph_node::contains_b (const Directed_graph_node *d)const
+Directed_graph_node::contains_b (const Directed_graph_node *d) const
 {
   return edge_out_l_arr_.find_l ((Directed_graph_node*)d);
 }
@@ -95,7 +95,7 @@ Directed_graph_node::remove_edge_out (Directed_graph_node *d_l)
   PARANOID_OK();
 }
 bool
-Directed_graph_node::linked_b()const
+Directed_graph_node::linked_b() const
 {
   return edge_out_l_arr_.size() || edge_in_l_arr_.size ();
 }

diff --git a/flower/full-storage.cc b/flower/full-storage.cc
index ee59ea23ed968cc9f6b553eea7731fdce5bd1254..71aa74c10c6f0aa1cb7b582fb20c8d296dbe3ed4 100644 (file)
--- a/flower/full-storage.cc
+++ b/flower/full-storage.cc
@@ -129,7 +129,7 @@ Full_storage::insert_row (int k)
 }
 
 bool
-Full_storage::try_right_multiply (Matrix_storage * dest, Matrix_storage const * right)const
+Full_storage::try_right_multiply (Matrix_storage * dest, Matrix_storage const * right) const
 {
   if (dest->name() != Full_storage::static_name () ||
        right->name() != Full_storage::static_name ())

diff --git a/flower/include/assoc-iter.hh b/flower/include/assoc-iter.hh
index 9157ad0ab74e25152e497f73a79e66532a9ede51..f1ba2f89b25de5bd47cf0456341b180f3eb9efe9 100644 (file)
--- a/flower/include/assoc-iter.hh
+++ b/flower/include/assoc-iter.hh
@@ -28,7 +28,7 @@ struct Assoc_iter {
     bool ok() const {
        return i < assoc_.arr.size();
     }
-    void OK()const {
+    void OK() const {
        assert (!ok() || !assoc_.arr[i].free);
     }
     void operator++(int) { i++; i = next (i); }

diff --git a/flower/include/choleski.hh b/flower/include/choleski.hh
index dd21237550c8a2a96f463c43171043bad8e864c2..a1c3a8c47e172b718d0bb9053e9a6cdf8ac1e9ad 100644 (file)
--- a/flower/include/choleski.hh
+++ b/flower/include/choleski.hh
@@ -30,7 +30,7 @@ struct Choleski_decomposition {
     solve Px = rhs
     */
     Vector solve (Vector rhs) const;
-    void solve (Vector &dest, Vector const &rhs)const;
+    void solve (Vector &dest, Vector const &rhs) const;
     Vector operator * (Vector rhs) const { return solve (rhs); }
   /**
     return the inverse of the matrix P.
@@ -41,8 +41,8 @@ struct Choleski_decomposition {
     */
     Matrix original() const;
 private:
-    void full_matrix_solve (Vector &,Vector const&)const;
-    void band_matrix_solve (Vector &, Vector const&)const;
+    void full_matrix_solve (Vector &,Vector const&) const;
+    void band_matrix_solve (Vector &, Vector const&) const;
     void full_matrix_decompose (Matrix const & P);
     void band_matrix_decompose (Matrix const &P);
         

diff --git a/flower/include/cursor.hh b/flower/include/cursor.hh
index 2e205ba33063c85b2a0cfd7b224594a1ce83b764..4abefd3dea5f5eac5654846f8f2a8636cc6b48ba 100644 (file)
--- a/flower/include/cursor.hh
+++ b/flower/include/cursor.hh
@@ -53,13 +53,13 @@ class Cursor
     Cursor<T> operator --( int); 
 
     /// point to link?
-    bool ok()const;
+    bool ok() const;
 
     /// ++ items left?
-    bool forward()const;               
+    bool forward() const;              
 
     /// -- items left?
-    bool backward()const;
+    bool backward() const;
 
     /**  put (copy) after me in List. 
       analogously to editor. ok() interpreted as at end

diff --git a/flower/include/cursor.icc b/flower/include/cursor.icc
index 4fce0b19537a0976bd4e129142a2425c8cffcbd2..b1004b600aa5028f79e6efd4f2e5f63f8f17ac9e 100644 (file)
--- a/flower/include/cursor.icc
+++ b/flower/include/cursor.icc
@@ -90,21 +90,21 @@ Cursor<T>::pointer()
 
 template<class T>
 inline bool
-Cursor<T>::backward()const
+Cursor<T>::backward() const
 {
   return ( pointer_ != 0);
 }
 
 template<class T>
 inline bool
-Cursor<T>::forward()const
+Cursor<T>::forward() const
 {
   return ( pointer_ != 0);
 }
 
 template<class T>
 inline bool
-Cursor<T>::ok()const
+Cursor<T>::ok() const
 {
   return ( pointer_ != 0);
 }

diff --git a/flower/include/diagonal-storage.hh b/flower/include/diagonal-storage.hh
index 9ac2be679d93e93ceb2e7e253841d329ced02027..f000cf23878fa6c6d65d313fa22cd198bfd9d8c0 100644 (file)
--- a/flower/include/diagonal-storage.hh
+++ b/flower/include/diagonal-storage.hh
@@ -26,10 +26,10 @@ class Diagonal_storage : public Matrix_storage {
 
 public:
      void set_band_size (int b);
-   int band_size_i()const;
+   int band_size_i() const;
     
     void assert_valid (int i, int j) const;
-    bool band_elt_b (int,int)const;
+    bool band_elt_b (int,int) const;
     void resize_dim (int);
     
     virtual void resize_rows (int d) { resize_dim (d); }
@@ -54,12 +54,12 @@ public:
     virtual void delete_column (int k);
     
     ~Diagonal_storage();
-    virtual bool mult_ok (int i, int j)const;
+    virtual bool mult_ok (int i, int j) const;
     virtual void mult_next (int &i, int &j) const ;
     virtual bool trans_ok (int i, int j) const;
     virtual void trans_next (int &i, int &j) const;
     DECLARE_VIRTUAL_COPY_CONS(Diagonal_storage, Matrix_storage);
     DECLARE_MY_RUNTIME_TYPEINFO;
-    virtual bool try_right_multiply (Matrix_storage * dest, Matrix_storage const *)const;
+    virtual bool try_right_multiply (Matrix_storage * dest, Matrix_storage const *) const;
 };
 #endif // DIAGONAL_STORAGE_HH

diff --git a/flower/include/directed-graph.hh b/flower/include/directed-graph.hh
index caa065abecea23346e7cd3ccb326b47594eeb5c4..f82222158580c06e72301ac727b85d4e9aacbf85 100644 (file)
--- a/flower/include/directed-graph.hh
+++ b/flower/include/directed-graph.hh
@@ -35,7 +35,7 @@ public:
     bool contains_b (Directed_graph_node const*) const;
 
     Directed_graph_node (Directed_graph_node const &);
-    void OK()const;
+    void OK() const;
     Directed_graph_node();
 
     ~Directed_graph_node();

diff --git a/flower/include/full-storage.hh b/flower/include/full-storage.hh
index 0d17df412ff1cfba180b81cd37b35ea551e5b2a8..50eb0e0109979b9c0e6678d4e2ae991ec53d69b1 100644 (file)
--- a/flower/include/full-storage.hh
+++ b/flower/include/full-storage.hh
@@ -41,8 +41,8 @@ public:
     virtual void resize (int i, int j);
     virtual void resize (int i);
     virtual Real& elem (int i,int j);
-    virtual Real elem (int i, int j)const ;
-    int dim()const;
+    virtual Real elem (int i, int j) const ;
+    int dim() const;
     Full_storage (Matrix_storage*);
     Full_storage();
     Full_storage (int i, int j);
@@ -56,13 +56,13 @@ public:
     virtual void delete_column (int k);
     
     ~Full_storage();
-    virtual bool mult_ok (int i, int j)const;
+    virtual bool mult_ok (int i, int j) const;
     virtual void mult_next (int &i, int &j) const ;
     virtual bool trans_ok (int i, int j) const;
     virtual void trans_next (int &i, int &j) const;
     DECLARE_VIRTUAL_COPY_CONS(Full_storage,Matrix_storage);
     DECLARE_MY_RUNTIME_TYPEINFO;
-    virtual bool try_right_multiply (Matrix_storage * dest, Matrix_storage const *)const;
+    virtual bool try_right_multiply (Matrix_storage * dest, Matrix_storage const *) const;
 };
 
 #endif // FULL_STORAGE_HH

diff --git a/flower/include/full-storage.icc b/flower/include/full-storage.icc
index 0e45f15b247468b6365a54c46a1c4ef475722e5d..c919bf1ac904abe1b75f2b40f6bb43c6ac135136 100644 (file)
--- a/flower/include/full-storage.icc
+++ b/flower/include/full-storage.icc
@@ -18,7 +18,7 @@ Full_storage::init()
   height_i_=width_i_=max_height_i_=max_width_i_=0;
 }
 INLINE bool
-Full_storage::valid (int i, int j)const
+Full_storage::valid (int i, int j) const
 {
   return (i>=0 && i < height_i_)
        && (j < width_i_ && j >=0);
@@ -62,7 +62,7 @@ Full_storage::cols() const
   return width_i_;
 }
 INLINE int
-Full_storage::dim()const
+Full_storage::dim() const
 {
   assert (rows()==cols ());
   return rows();

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index 19d50611146e3c628888a6a92191d1cc5d3fff47..865a7915749049af429f0b535ef1e1e9bb4e35f7 100644 (file)
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -46,8 +46,8 @@ struct Interval_t {
        return ((Interval_t<T> *)this)->idx (j);
     }
     T &max() { return right;}
-    T max()const { return right;}
-    T min()const{ return left; }
+    T max() const { return right;}
+    T min() const{ return left; }
     T &min(){ return left; }
     /**
       PRE

diff --git a/flower/include/lgetopt.hh b/flower/include/lgetopt.hh
index b8a2e19049a1b02f5118b2e2b076000c43c9d26a..9341d1dcaf528dddc64c8702f28c44a9b221f5a0 100644 (file)
--- a/flower/include/lgetopt.hh
+++ b/flower/include/lgetopt.hh
@@ -14,7 +14,7 @@ struct Long_option_init {
     char const * longname;
     char        shortname;
 
-    void printon (ostream &errorout)const ;
+    void printon (ostream &errorout) const ;
 };
 
 
@@ -68,7 +68,7 @@ public:
     void next();
     const Long_option_init *parselong();
     const Long_option_init *parseshort();
-    void OK()const;
+    void OK() const;
     bool ok() const;
 
     /// report an error and abort

diff --git a/flower/include/list.icc b/flower/include/list.icc
index 80d12f56ba2323ea6e2bb5a4556a603b045c296b..f77a2018361d3f407aa3a4877c4d9bf16bba494d 100644 (file)
--- a/flower/include/list.icc
+++ b/flower/include/list.icc
@@ -40,7 +40,7 @@ List<T>::size() const
 
 template<class T>
 inline Cursor<T>
-List<T>::top()const
+List<T>::top() const
 {
   return Cursor<T>( *this, top_);
 }
@@ -48,7 +48,7 @@ List<T>::top()const
 
 template<class T>
 inline Cursor<T>
-List<T>::bottom()const
+List<T>::bottom() const
 {
   return Cursor<T>( *this, bottom_);
 }

diff --git a/flower/include/matrix-storage.hh b/flower/include/matrix-storage.hh
index 662cdddc895bf1068e5be133cd741e9187f0e560..5027b6f5558afa94d13ef9dfc00511d6017790cd 100644 (file)
--- a/flower/include/matrix-storage.hh
+++ b/flower/include/matrix-storage.hh
@@ -109,7 +109,7 @@ public:
     virtual void delete_row (int k)=0;
         virtual void delete_column (int k)=0;
     virtual ~Matrix_storage() { }
-    virtual Matrix_storage *clone()const=0;
+    virtual Matrix_storage *clone() const=0;
 
 
     
@@ -153,7 +153,7 @@ public:
     static void set_band (Matrix_storage*&, int band);
     static void set_full (Matrix_storage*&);
     virtual bool try_right_multiply (Matrix_storage *dest, 
-                                   const Matrix_storage *fact)const ;
+                                   const Matrix_storage *fact) const ;
     /**
       RTTI.
      */

diff --git a/flower/include/matrix.hh b/flower/include/matrix.hh
index c2545a072dd6aa99353a0166a4365b72ef3ed967..c87613c454bf35ce0be69d194b9febf77b358569 100644 (file)
--- a/flower/include/matrix.hh
+++ b/flower/include/matrix.hh
@@ -48,9 +48,9 @@ public:
       0 <= band_i() <= dim
       */
     int band_i() const;
-    bool band_b()const;
-    void set_full()const;
-    void try_set_band()const;
+    bool band_b() const;
+    void set_full() const;
+    void try_set_band() const;
     ~Matrix() { delete dat; }
 
     /// set entries to r 

diff --git a/flower/include/parray.hh b/flower/include/parray.hh
index 054288b809a81d5a6bf70dc33ed509eef5ffda61..e1e597202030e8c61c118b6479fb7e0658bc05a1 100644 (file)
--- a/flower/include/parray.hh
+++ b/flower/include/parray.hh
@@ -67,7 +67,7 @@ public:
                return i;
        return -1;
     }
-    T *find_l (T const *t)const
+    T *find_l (T const *t) const
     {
        int i = find_i (t);
        if (i >= 0)

diff --git a/flower/include/path.hh b/flower/include/path.hh
index 81a8cb1038902a0d18ec8a495a866fe16d43b181..1f3a5eb97ad80b0885c5a82a672f8dea1e848466 100644 (file)
--- a/flower/include/path.hh
+++ b/flower/include/path.hh
@@ -27,7 +27,7 @@ class File_path : private Array<String>
 {
 public:
     /// locate a file in the search path
-    String find (String nm)const;
+    String find (String nm) const;
 
     /// add to end of path.
     Array<String>::push;

diff --git a/flower/include/pointer.tcc b/flower/include/pointer.tcc
index 5eed1f4ef68af155ac11401ccfd59dec4e78d5ea..4ce1302189594ef71b71a3d3d0b09db7d8de9e42 100644 (file)
--- a/flower/include/pointer.tcc
+++ b/flower/include/pointer.tcc
@@ -13,7 +13,7 @@
 template<class T>
 inline
 T *
-P<T>::copy_p()const
+P<T>::copy_p() const
 {
   return t_p? new T(*t_p) : 0;
 }

diff --git a/flower/include/string-data.hh b/flower/include/string-data.hh
index d4440b1c26277249658caaa544cbafd9ccfad168..4dfe5544b95371f5e6dbd599044219bf2192d16a 100644 (file)
--- a/flower/include/string-data.hh
+++ b/flower/include/string-data.hh
@@ -78,7 +78,7 @@ friend class String_handle;
       #String_data# knowing it.  */
     Byte &operator [](int j);
     Byte operator [](int j) const;
-    bool is_binary_bo()const;
+    bool is_binary_bo() const;
 };
 
 

diff --git a/flower/include/string-data.icc b/flower/include/string-data.icc
index 6a88eef8c94cf3014b138703c77a993b8aa91a8d..c2225782d7b9fa5217115425b4af4634f926862b 100644 (file)
--- a/flower/include/string-data.icc
+++ b/flower/include/string-data.icc
@@ -186,7 +186,7 @@ String_data::trunc (int j)
 }
 
 INLINE bool
-String_data::is_binary_bo()const
+String_data::is_binary_bo() const
 {
 //    return !memchr (data_byte_p_, length_i_, 0);
   return ( (int)strlen ((char const*)data_byte_p_) != length_i_ );

diff --git a/flower/include/string-handle.hh b/flower/include/string-handle.hh
index c6e73ada103bb000eacfe76e6f1847daf7c80a70..ccd149b9cf7e6ec84d1d8e6f89e94194580e9058 100644 (file)
--- a/flower/include/string-handle.hh
+++ b/flower/include/string-handle.hh
@@ -42,7 +42,7 @@ public:
     char const* ch_C() const;
     Byte* byte_l();
     char* ch_l();    
-    bool is_binary_bo()const;
+    bool is_binary_bo() const;
     void operator =(String_handle const &src);
     void operator += (char const *s);
     Byte operator[](int j) const;

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index e56496605d199bf526f0b037d53e9f87a920ac49..278ed57190d2aef1dd23cc030cc96d6304e3ca79 100644 (file)
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -17,7 +17,7 @@
 #define DECLARE_MY_RUNTIME_TYPEINFO    \
 static char const *static_name();\
 static bool static_is_type_b (const char*s);\
-virtual bool is_type_b (const char *s)const { return static_is_type_b (s); } \
+virtual bool is_type_b (const char *s) const { return static_is_type_b (s); } \
 virtual char const *name() const{ return static_name (); } \
 int a_stupid_nonexistent_function_to_allow_the_semicolon_come_out()
 

diff --git a/flower/lgetopt.cc b/flower/lgetopt.cc
index a73334fe008ee59f767388a5af82631677efe06d..f0a49ab3602c4bd5af1a52a3199b857ae2bcf581 100644 (file)
--- a/flower/lgetopt.cc
+++ b/flower/lgetopt.cc
@@ -74,7 +74,7 @@ Getopt_long::parselong()
 
 
 void
-Long_option_init::printon (ostream &errorout)const
+Long_option_init::printon (ostream &errorout) const
 {
   if (shortname)       
        errorout <<"-" << shortname;
@@ -219,7 +219,7 @@ Getopt_long::Getopt_long (int c, char  **v, Long_option_init *lo)
 }
 
 bool
-Getopt_long::ok()const
+Getopt_long::ok() const
 {
   return  array_index_i_ < argument_count_i_;
 }

diff --git a/flower/matrix-storage.cc b/flower/matrix-storage.cc
index 698f673b25e9fe33a403d486d9b79a3d41938a92..7556a2cdd5c3b3a0acf899169b8c43155faf36bf 100644 (file)
--- a/flower/matrix-storage.cc
+++ b/flower/matrix-storage.cc
@@ -92,7 +92,7 @@ Matrix_storage::get_full (int n, int m)
 
  bool
 Matrix_storage::try_right_multiply (Matrix_storage *, 
-                                  const Matrix_storage *)const
+                                  const Matrix_storage *) const
 {
   return false;
 }

diff --git a/flower/matrix.cc b/flower/matrix.cc
index 3f9b28f835b5b165c274d5c26328f863dc7a1c3f..0641d8032f649582810780340fb2cf344b9dda47 100644 (file)
--- a/flower/matrix.cc
+++ b/flower/matrix.cc
@@ -11,7 +11,7 @@
 #include "diagonal-storage.hh"
 
 bool
-Matrix::band_b()const
+Matrix::band_b() const
 {
   return dat->is_type_b (Diagonal_storage::static_name());
 }
@@ -26,7 +26,7 @@ Matrix::set_full() const
 }
 
 void
-Matrix::try_set_band()const
+Matrix::try_set_band() const
 {
   if (band_b())
        return;
@@ -107,7 +107,7 @@ Matrix::operator=(Matrix const &m)
 }
 
 int
-Matrix::band_i()const
+Matrix::band_i() const
 {
   if ( band_b()) 
     {

diff --git a/flower/path.cc b/flower/path.cc
index e880b200ae163c2c83da2ddbc7b8a8245f93a9e4..bdfaf80b633a4deebc824d65e1be3c8ee1fc7a0d 100644 (file)
--- a/flower/path.cc
+++ b/flower/path.cc
@@ -54,7 +54,7 @@ split_path (String path,
   in any other added path, in this order.
   */
 String
-File_path::find (String nm)const
+File_path::find (String nm) const
 
 {
   fdebug << "looking for " << nm << ": ";

diff --git a/lib/include/duration.hh b/lib/include/duration.hh
index 0ae66d572ecf67db37d55fb720f30c2ceafe0f25..293c9681fdc672a16cefee892cc79c2c0edc97ac 100644 (file)
--- a/lib/include/duration.hh
+++ b/lib/include/duration.hh
@@ -31,7 +31,7 @@ struct Duration {
   Duration();
   /// is the "plet factor" of this note != 1 ?
   bool plet_b();
-  String str()const;
+  String str() const;
   void set_plet(int,int );
   void set_plet(Duration );
   static bool duration_type_b(int t);

diff --git a/lib/include/file-storage.hh b/lib/include/file-storage.hh
index 850046236c1bd99c14640ea50be6e938b9fc2304..23da07e19f37d46038de8c81b53ff91f218f5080 100644 (file)
--- a/lib/include/file-storage.hh
+++ b/lib/include/file-storage.hh
@@ -18,8 +18,8 @@
 class File_storage
 {
 public:
-    virtual char const* ch_C()const=0;
-    virtual int length_i()const=0;
+    virtual char const* ch_C() const=0;
+    virtual int length_i() const=0;
     virtual ~File_storage(){}
 };
 
@@ -31,8 +31,8 @@ class Mapped_file_storage:public File_storage
 public:
     Mapped_file_storage(String);    
 protected:
-    virtual char const* ch_C()const;
-    virtual int length_i()const;
+    virtual char const* ch_C() const;
+    virtual int length_i() const;
     virtual ~Mapped_file_storage();
 private:
     void open(String name);
@@ -53,8 +53,8 @@ class Simple_file_storage  : public File_storage
     char * data_p_;
     int len_i_;
 protected:    
-    virtual char const*ch_C()const;
-    virtual int length_i()const;
+    virtual char const*ch_C() const;
+    virtual int length_i() const;
     virtual ~Simple_file_storage();
 public:
     Simple_file_storage(String);

diff --git a/lib/include/includable-lexer.hh b/lib/include/includable-lexer.hh
index a84f736c4858ee7e11ec634da51c243c639475d8..fb1a96d0bc6684391ca8327051a34c86a3461119 100644 (file)
--- a/lib/include/includable-lexer.hh
+++ b/lib/include/includable-lexer.hh
@@ -31,7 +31,7 @@ protected:
     Array<int> char_count_stack_;
 public:
 
-    Source_file* source_file_l()const;
+    Source_file* source_file_l() const;
     void new_input(String s,Sources*);
     Includable_lexer();
     ~Includable_lexer();

diff --git a/lib/include/input.hh b/lib/include/input.hh
index e68940257c9cda1151063a8a49ac7c719703a161..2fdb97615a069204a31506a3d3a2a9647aa65c0f 100644 (file)
--- a/lib/include/input.hh
+++ b/lib/include/input.hh
@@ -20,12 +20,12 @@ class Input {
     Source_file * source_file_l_;
 public:
     
-    void warning(String)const; // should use member func?
-    void error(String)const;
-    void message(String)const;
+    void warning(String) const; // should use member func?
+    void error(String) const;
+    void message(String) const;
     void set_spot(Input const &);
     
-    String location_str()const;
+    String location_str() const;
     Input(Source_file*, char const*);
     Input();
     Input( Input const& );

diff --git a/lib/include/plet.hh b/lib/include/plet.hh
index 1f1033f87bf38eef452fd7e7c52fccfafb62cf49..2326416716a4611e160d71bae2c18cedd7100982 100644 (file)
--- a/lib/include/plet.hh
+++ b/lib/include/plet.hh
@@ -18,8 +18,8 @@
  */
 struct Plet {
   Plet();
-  Moment mom()const;
-  bool unit_b()const;
+  Moment mom() const;
+  bool unit_b() const;
   int iso_i_;  // 2/3; 2 is not duration, maar of count!
   int type_i_; 
 };

diff --git a/lib/include/source-file.hh b/lib/include/source-file.hh
index 39cd533e410cdc6b7a011c78ca259ae8f464f51d..5991a2e8040f5ce167412c1ca131747d25071bd7 100644 (file)
--- a/lib/include/source-file.hh
+++ b/lib/include/source-file.hh
@@ -21,14 +21,14 @@ public:
     Source_file( String filename_str_r );
     virtual ~Source_file();
 
-    char const* ch_C()const;
-    virtual String error_str( char const* pos_ch_c_l )const;
+    char const* ch_C() const;
+    virtual String error_str( char const* pos_ch_c_l ) const;
     istream * istream_l();
-    bool in_b( char const* pos_ch_c_l )const;
-    int length_i()const;
-    virtual int line_i( char const* pos_ch_c_l )const;
-    String name_str()const;
-    String file_line_no_str( char const* ch_c_l )const;
+    bool in_b( char const* pos_ch_c_l ) const;
+    int length_i() const;
+    virtual int line_i( char const* pos_ch_c_l ) const;
+    String name_str() const;
+    String file_line_no_str( char const* ch_c_l ) const;
 
 private:
     String name_str_;

diff --git a/lily/include/boxes.hh b/lily/include/boxes.hh
index 36db4b88ba2b707e9583cdd6567885a4eb0ad2c4..45490033bd4bd303a96d35220fcafb6b7709bc3c 100644 (file)
--- a/lily/include/boxes.hh
+++ b/lily/include/boxes.hh
@@ -16,8 +16,8 @@ struct Box {
     
     Interval &x() {return interval_a_[X_AXIS]; }
     Interval &y(){ return interval_a_[Y_AXIS]; }
-    Interval x()const{ return interval_a_[X_AXIS]; }
-    Interval y()const{return interval_a_[Y_AXIS]; }
+    Interval x() const{ return interval_a_[X_AXIS]; }
+    Interval y() const{return interval_a_[Y_AXIS]; }
     Interval operator[](Axis a) {
        return interval_a_[a];
     }

diff --git a/lily/include/break-caching.hh b/lily/include/break-caching.hh
index 73b07d21ee722aca821281c5c021387cbddd21b0..676be223df3cb88737d640b8ccb313d297e0779f 100644 (file)
--- a/lily/include/break-caching.hh
+++ b/lily/include/break-caching.hh
@@ -16,7 +16,7 @@
 struct Break_caching : Break_algorithm
 {
     void do_set_pscore();
-    Array<Col_hpositions> do_solve()const;
+    Array<Col_hpositions> do_solve() const;
 };
 
     

diff --git a/lily/include/break.hh b/lily/include/break.hh
index 000ef3ec92d1c5aa091d047bfeeb826b325b4df0..b77414482e8a4ee6abd8619728ea4ea87e52b259 100644 (file)
--- a/lily/include/break.hh
+++ b/lily/include/break.hh
@@ -24,7 +24,7 @@ struct Col_stats
 
     Col_stats(); 
     void add (Line_of_cols const&l);
-    String str()const;
+    String str() const;
 };
 
 /** Class representation of an algorithm which decides where to put
@@ -43,7 +43,7 @@ protected:
     Line_of_cols find_breaks() const;
 
     Line_of_cols all_cols() const;
-    Array<int> find_break_indices()const;
+    Array<int> find_break_indices() const;
     
 
     /// helper: solve for the columns in #curline#.
@@ -53,13 +53,13 @@ protected:
     void approximate_solve_line (Col_hpositions*) const;
 
     /// does curline fit on the paper?    
-    bool feasible (Line_of_cols)const;
+    bool feasible (Line_of_cols) const;
     
 
-    Line_spacer* generate_spacing_problem (Line_of_cols)const;
+    Line_spacer* generate_spacing_problem (Line_of_cols) const;
 
-    virtual Array<Col_hpositions> do_solve()const=0;
-    void print_stats()const;
+    virtual Array<Col_hpositions> do_solve() const=0;
+    void print_stats() const;
 
     virtual void do_set_pscore();
 public:
@@ -72,9 +72,9 @@ public:
     void set_pscore (Paper_score*);
 
     /// check if the spacing/breaking problem is well-stated
-    void problem_OK()const;
-    void OK()const;
-    Array<Col_hpositions> solve()const;
+    void problem_OK() const;
+    void OK() const;
+    Array<Col_hpositions> solve() const;
 };
 
 #endif // BREAK_HH

diff --git a/lily/include/clef-item.hh b/lily/include/clef-item.hh
index ad8a674242d04a252a9313b56b3b449d4f9e8db7..33190aceeb214d5312fdbae3b30ce29d201b0838 100644 (file)
--- a/lily/include/clef-item.hh
+++ b/lily/include/clef-item.hh
@@ -14,7 +14,7 @@
 class Clef_item : public Item {
 protected:
     virtual void do_pre_processing();
-    Molecule* brew_molecule_p()const;
+    Molecule* brew_molecule_p() const;
 public:
     
     String type_;

diff --git a/lily/include/col-info.hh b/lily/include/col-info.hh
index 36a2f73f721fa3d06a8b8ede55fec088ee228eb8..505c11f991b2463dd9047852086eed7f72d5451e 100644 (file)
--- a/lily/include/col-info.hh
+++ b/lily/include/col-info.hh
@@ -16,7 +16,7 @@
 
 /// helper struct for #Spacing_problem#
 struct Colinfo {
-    PCol *pcol_l_;
+    Paper_column *pcol_l_;
     P<Real> fixpos_p_;
     Interval width;
     int rank_i_;
@@ -24,11 +24,11 @@ struct Colinfo {
     bool ugh_b_;               
     /* *************** */
     Colinfo();
-    Colinfo (PCol *,Real const *);
+    Colinfo (Paper_column *,Real const *);
 
     void print() const;
     bool fixed() const { return fixpos_p_.get_C();}
-    Real fixed_position()const { return *fixpos_p_; }
+    Real fixed_position() const { return *fixpos_p_; }
     Real minright() const { return width.right; }
     Real minleft() const { return -width.left; }
 };

diff --git a/lily/include/colhpos.hh b/lily/include/colhpos.hh
index 3f198f2ca11330e1088bbe5399820d58e8ffdfd6..56f70c8506672a2bc45bb966337fb1c6cc8d5bc5 100644 (file)
--- a/lily/include/colhpos.hh
+++ b/lily/include/colhpos.hh
@@ -10,7 +10,7 @@
 #include "varray.hh"
 #include "lily-proto.hh"
 
-typedef Array<PCol*>  Line_of_cols;
+typedef Array<Paper_column*>  Line_of_cols;
 
 struct Col_hpositions {
     Line_spacer * spacer_l_;
@@ -22,7 +22,7 @@ struct Col_hpositions {
     bool satisfies_constraints_b_;
 
     /* ************** */
-    void OK()const;
+    void OK() const;
     ~Col_hpositions();
     void solve_line();
     void approximate_solve_line();
@@ -30,7 +30,7 @@ struct Col_hpositions {
       constraints.  should always work */
     void stupid_solution();
     Col_hpositions();
-    void add (PCol*c);
+    void add (Paper_column*c);
     void print() const;
 };
 

diff --git a/lily/include/command-request.hh b/lily/include/command-request.hh
index f5adca4428b9194c647087aa2caf2b61aed9d80f..848d4d9e43c58149a3e069070c51c518700a9ca4 100644 (file)
--- a/lily/include/command-request.hh
+++ b/lily/include/command-request.hh
@@ -64,7 +64,7 @@ public:
 
     Tempo_req();
     REQUESTMETHODS(Tempo_req, tempo);
-    bool do_equal_b (Request *)const;
+    bool do_equal_b (Request *) const;
 };
 
 class Partial_measure_req  : public Timing_req  {
@@ -73,7 +73,7 @@ public:
 
     Partial_measure_req (Moment);
     REQUESTMETHODS(Partial_measure_req, partial);
-    bool do_equal_b (Request*)const;
+    bool do_equal_b (Request*) const;
 };
 
 /**
@@ -85,7 +85,7 @@ public:
 
     Meter_change_req();
     void set (int,int);
-    bool do_equal_b (Request*)const;
+    bool do_equal_b (Request*) const;
     REQUESTMETHODS(Meter_change_req, meterchange);
 };
 
@@ -94,7 +94,7 @@ class Cadenza_req  : public Timing_req  {
 public:
     /// turn on?
     bool on_b_;
-    bool do_equal_b (Request*)const;
+    bool do_equal_b (Request*) const;
     Cadenza_req (bool);
     REQUESTMETHODS(Cadenza_req,cadenza);
 };
@@ -102,7 +102,7 @@ public:
 /// check if we're at start of a  measure.
 class Barcheck_req  : public Timing_req  {
 public:
-    bool do_equal_b (Request *)const;
+    bool do_equal_b (Request *) const;
     REQUESTMETHODS(Barcheck_req,barcheck);
 };
 
@@ -110,7 +110,7 @@ class Measure_grouping_req : public Timing_req  {
 public:
     Array<int> beat_i_arr_;
     Array<Moment> elt_length_arr_;
-    bool do_equal_b (Request *)const;
+    bool do_equal_b (Request *) const;
     REQUESTMETHODS(Measure_grouping_req, measuregrouping);
 };
 
@@ -120,7 +120,7 @@ class Bar_req  : public Command_req  {
 public:
     String type_str_;
     Bar_req (String);
-    bool do_equal_b (Request*)const;
+    bool do_equal_b (Request*) const;
 
     REQUESTMETHODS(Bar_req,bar);
 };

diff --git a/lily/include/elem-group.hh b/lily/include/elem-group.hh
index 61ad7519f309e65f4c57d1418f46ee14d10e0b20..d65c17312370202fe5e307fc02715ec1ed9e001f 100644 (file)
--- a/lily/include/elem-group.hh
+++ b/lily/include/elem-group.hh
@@ -22,7 +22,7 @@
 class Horizontal_group_element : public virtual Axis_group_element {
 protected:
     virtual void remove_all();
-    virtual Interval do_width()const;
+    virtual Interval do_width() const;
 
 public:
     DECLARE_MY_RUNTIME_TYPEINFO;
@@ -35,7 +35,7 @@ public:
  */
 class Vertical_group_element : public virtual Axis_group_element {
 protected:
-    virtual Interval do_height()const;
+    virtual Interval do_height() const;
     virtual void remove_all();
 
 public:

diff --git a/lily/include/engraver-group.hh b/lily/include/engraver-group.hh
index 03e26c9610ab20ef96f6a57d75a4ede38c94671b..cdfee08c3858bfa6b49e58f1178abf35f9b5e317 100644 (file)
--- a/lily/include/engraver-group.hh
+++ b/lily/include/engraver-group.hh
@@ -30,10 +30,10 @@ protected:
     
     Array<Score_elem_info> announce_info_arr_;
     
-    virtual void do_print()const;
-    virtual bool removable_b()const;
+    virtual void do_print() const;
+    virtual bool removable_b() const;
 public:
-    Engraver*get_simple_engraver (char const*typeinfo)const;
+    Engraver*get_simple_engraver (char const*typeinfo) const;
     virtual void print() const ;
 
     Input_translator * itrans_l_;
@@ -68,13 +68,13 @@ public:
     virtual bool try_request (Request*);
     virtual void do_process_requests();
 
-    virtual Staff_info get_staff_info()const;
+    virtual Staff_info get_staff_info() const;
     
     virtual Engraver_group_engraver * find_engraver_l (String name,String id);
     virtual void do_announces();    
     virtual void announce_element (Score_elem_info);
     virtual void add (Engraver* grav_p);
-    virtual bool contains_b (Engraver*)const;
+    virtual bool contains_b (Engraver*) const;
 
     virtual Translator* find_get_translator_l (String name, String id);
     virtual Translator * get_default_interpreter();

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index a7507044370ec7cdbe5c33521371d00c61806432..335ab13034131178db0e6e1301d70a1bef4e6c28 100644 (file)
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -94,15 +94,15 @@ protected:
 
     virtual void sync_features() {}
    
-    virtual bool contains_b (Engraver*grav_l)const;
+    virtual bool contains_b (Engraver*grav_l) const;
     /**
       Get information on the staff. Default: ask daddy.
       */
-    virtual Staff_info get_staff_info()const;
+    virtual Staff_info get_staff_info() const;
     virtual void fill_staff_info (Staff_info&);
 
 
-    virtual void do_print()const;  
+    virtual void do_print() const;  
     /*    
          @see{try_request}
          Default: always return false

diff --git a/lily/include/gourlay-breaking.hh b/lily/include/gourlay-breaking.hh
index 99fa0c93407a91ef6d94363d48ef20753acb4b2c..d8c3472a14898ff3c74dbab8deaa14cf489a9bfc 100644 (file)
--- a/lily/include/gourlay-breaking.hh
+++ b/lily/include/gourlay-breaking.hh
@@ -22,7 +22,7 @@ struct Gourlay_breaking : public Break_algorithm
     /// maximum number of measures in a line
     int max_measures_i_;
     void do_set_pscore();
-    Array<Col_hpositions> do_solve()const;
+    Array<Col_hpositions> do_solve() const;
     Gourlay_breaking();
 };
 #endif // GOURLAY_BREAKING_HH

diff --git a/lily/include/grouping.hh b/lily/include/grouping.hh
index 13fcbd790a09eefd323940fca2e664ab17d24b15..d88ed2876b5f0b8e9c4d3f7407b37818e6733d3e 100644 (file)
--- a/lily/include/grouping.hh
+++ b/lily/include/grouping.hh
@@ -21,7 +21,7 @@ struct Rhythmic_grouping {
     /* *************** */
 
     Array<MInterval> intervals();
-    MInterval interval()const;
+    MInterval interval() const;
     Moment length() const;
     void intersect (MInterval);
     

diff --git a/lily/include/header.hh b/lily/include/header.hh
index c5fcae96a8006284ad39e920ab3bfd29054a5614..d5919b0de5e8cfbb4711d98bd130bf783a5c53f8 100644 (file)
--- a/lily/include/header.hh
+++ b/lily/include/header.hh
@@ -16,7 +16,7 @@
 
 struct Header : Assoc<String, String>
 {
-  String TeX_string()const;
+  String TeX_string() const;
 };
 
 #endif // HEADER_HH

diff --git a/lily/include/horizontal-align-item.hh b/lily/include/horizontal-align-item.hh
index c1d6313657eb56478599daf8c4a129ddecfcfb1a..07c1934eda1a11b4ad8c044d6f1c3e4fd2d40552 100644 (file)
--- a/lily/include/horizontal-align-item.hh
+++ b/lily/include/horizontal-align-item.hh
@@ -35,15 +35,14 @@ public:
     DECLARE_MY_RUNTIME_TYPEINFO;
     SCORE_ELEM_CLONE(Horizontal_align_item);
     void add (Item*, int p);
-    void OK()const;
     Horizontal_align_item();
 protected:
     
     virtual void do_substitute_dependency (Score_elem * , Score_elem *);
     /// do calculations before determining horizontal spacing
     virtual void do_pre_processing();
-    virtual void do_print()const;
-    virtual Interval do_width()const;
-    bool contains_b (Item*)const;
+    virtual void do_print() const;
+    virtual Interval do_width() const;
+    bool contains_b (Item*) const;
 };
 #endif // HORIZONTAL_ALIGN_ITEM_HH

diff --git a/lily/include/idealspacing.hh b/lily/include/idealspacing.hh
index 83fb5ba89dd063a91d52948be7f7a2408af646e8..068ec5836cf6defd292de401a7484e82b9a1b563 100644 (file)
--- a/lily/include/idealspacing.hh
+++ b/lily/include/idealspacing.hh
@@ -21,7 +21,7 @@ struct Idealspacing {
     int left_i_;
     int right_i_;
     
-    void print()const;
+    void print() const;
     void OK() const ;
     Idealspacing();
 };

diff --git a/lily/include/identifier.hh b/lily/include/identifier.hh
index dd4b8f75f82b5577381f95454ccce8643217fdd0..935f962e39df71e631c85714755f154c34295025 100644 (file)
--- a/lily/include/identifier.hh
+++ b/lily/include/identifier.hh
@@ -28,7 +28,7 @@ struct Identifier : public Input {
     Identifier (int code) ;
     virtual ~Identifier() ;
 
-    void print()const;
+    void print() const;
     DECLARE_MY_RUNTIME_TYPEINFO;
     void error (String);
     IDACCESSOR(Input_translator, input_translator)
@@ -45,7 +45,7 @@ struct Identifier : public Input {
     IDACCESSOR(Duration, duration)
 
 protected:
-    virtual void do_print()const=0;
+    virtual void do_print() const=0;
 private:
     Identifier (Identifier const&);
 };
@@ -57,7 +57,7 @@ struct Idclass : Identifier {\
        Idclass (Class*st, int code);\
        virtual Class* accessor ();\
        ~Idclass();\
-       virtual void do_print()const; \
+       virtual void do_print() const; \
 }\
 
 

diff --git a/lily/include/ineq-constrained-qp.hh b/lily/include/ineq-constrained-qp.hh
index 7e28fd7a82f2d29f70c858df106671b2cbd6c905..a7bd31693de716636b382b45f2a5007e63196faf 100644 (file)
--- a/lily/include/ineq-constrained-qp.hh
+++ b/lily/include/ineq-constrained-qp.hh
@@ -31,7 +31,7 @@ public:
       */
     void assert_solution (Vector sol) const;
     /// solve the problem using a projected gradient method
-    Vector constraint_solve (Vector)const;
+    Vector constraint_solve (Vector) const;
     /**
       Solve it. First try it the easy way.
      */
@@ -65,7 +65,7 @@ public:
     Real eval (Vector v);
 
     void eliminate_var (int idx, Real value);
-    void OK()const;
+    void OK() const;
     void print() const;
 
 };

diff --git a/lily/include/key-item.hh b/lily/include/key-item.hh
index 84d1ac709fe6a2562ccc44bf53fd7c5c6499d3aa..3f4b7f30e067d962b82add51a2f885c102ad938b 100644 (file)
--- a/lily/include/key-item.hh
+++ b/lily/include/key-item.hh
@@ -28,7 +28,7 @@ struct Key_item : Item {
     void set_c_position (int);
 protected:
     virtual void do_pre_processing();
-    Molecule* brew_molecule_p()const;
+    Molecule* brew_molecule_p() const;
 };
 
 #endif // KEYITEM_HH

diff --git a/lily/include/key.hh b/lily/include/key.hh
index 10c5779455d6573dff75f297bd8ca802ad200556..4a68fa8148733814511429fc0385986bc9ef2ca8 100644 (file)
--- a/lily/include/key.hh
+++ b/lily/include/key.hh
@@ -18,7 +18,7 @@ public:
  
     Octave_key();
     void set (int i, int acc);
-    int acc (int i)const { return accidental_i_arr_[i]; }
+    int acc (int i) const { return accidental_i_arr_[i]; }
 };
 
 /// administration of accidentals

diff --git a/lily/include/line-spacer.hh b/lily/include/line-spacer.hh
index f6f6cfe5c767bd476b73aa39483b6ac7728ce2a5..053e59a902495388883914d4a62beff5119c5c0b 100644 (file)
--- a/lily/include/line-spacer.hh
+++ b/lily/include/line-spacer.hh
@@ -26,7 +26,7 @@ class Line_spacer
     
 public:
     Paper_def * paper_l_;
-    Paper_def *paper_l()const;
+    Paper_def *paper_l() const;
     Line_spacer();
     
     /** solve the spacing problem
@@ -41,7 +41,7 @@ public:
     
     /** add a col to the problem. columns have to be added left to
       right. The column contains info on it's minimum width.  */
-    virtual void add_column (PCol  *, bool fixed=false, Real fixpos=0.0)=0;
+    virtual void add_column (Paper_column  *, bool fixed=false, Real fixpos=0.0)=0;
 
     /**
       can the posed problem be solved?

diff --git a/lily/include/linespace.hh b/lily/include/linespace.hh
index 415a5376bef8297dbc927f6bde82cfc24d5284ba..12058cfc8e3f9c47a5e87f93875626521dfee0c8 100644 (file)
--- a/lily/include/linespace.hh
+++ b/lily/include/linespace.hh
@@ -48,7 +48,7 @@ class Spacing_problem {
     /// mark column #i# as being loose.
     void loosen_column (int i);
     /// the index of #c# in #cols#
-    int col_id (PCol const *c) const;
+    int col_id (Paper_column const *c) const;
 
     /// generate an (nonoptimal) solution
     Vector find_initial_solution() const;
@@ -57,7 +57,7 @@ class Spacing_problem {
     bool check_feasible() const;
 
     /// does #this# contain the column #w#? 
-    bool contains (PCol const *w);
+    bool contains (Paper_column const *w);
 
     /// make the energy function
     void make_matrices (Matrix &quad, Vector &lin,Real&) const;
@@ -76,7 +76,7 @@ class Spacing_problem {
     not in this problem, the spacing is ignored.
     */
     void add_ideal (Idealspacing const *i);
-    void print_ideal (Idealspacing const *)const; 
+    void print_ideal (Idealspacing const *) const; 
     Vector try_initial_solution() const;
     void calcideal();
 
@@ -86,10 +86,10 @@ public:
     static Line_spacer *constructor() {
        return new Line_spacer;
     }
-    Array<PCol*> error_pcol_l_arr() const;
+    Array<Paper_column*> error_pcol_l_arr() const;
 
     virtual   Array<Real> solve() const;
-    virtual  void add_column (PCol  *, bool fixed=false, Real fixpos=0.0);
+    virtual  void add_column (Paper_column  *, bool fixed=false, Real fixpos=0.0);
  
 
     virtual Vector default_solution() contains { 

diff --git a/lily/include/local-key-item.hh b/lily/include/local-key-item.hh
index 467f331201dfb3ea82a62cbb0c0d53436a2f961c..4d0ed37e2d8aa16eb90a471d8831625f1632a0fa 100644 (file)
--- a/lily/include/local-key-item.hh
+++ b/lily/include/local-key-item.hh
@@ -43,7 +43,7 @@ public:
 protected:
     virtual void do_pre_processing();    
     virtual void do_substitute_dependency (Score_elem*,Score_elem*);
-    virtual Molecule* brew_molecule_p()const;
+    virtual Molecule* brew_molecule_p() const;
 };
 #endif // LOCALKEYITEM_HH
 

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 46155bded379665843b126cbff469388075495a2..ce55ce46575e2f5b75874edb5671a789091bd961 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -20,42 +20,42 @@ struct Lookup {
     String texsetting;
     /* *************** */
     void add (String, Symtable*);
-    void print()const;
+    void print() const;
 
-    Symbol linestaff (int n, Real w)const;
-    Symbol fill (Box b)const;
-    Symbol beam_element (int,int,Real=0)const;
+    Symbol linestaff (int n, Real w) const;
+    Symbol fill (Box b) const;
+    Symbol beam_element (int,int,Real=0) const;
 
     /// round slope to closest TeXslope
-    Symbol beam (Real&,Real)const;
+    Symbol beam (Real&,Real) const;
 
     /**
       pos == 3 : 3 lines above staff (extending below note)
 
       pos == -3: below staff
       */
-    Symbol streepjes (int pos)const;
+    Symbol streepjes (int pos) const;
 
     Symbol vbrace (Real &dy) const;
-    Symbol meter (Array<Scalar>)const;
-    Symbol stem (Real y1_pos, Real y2_pos)const;
-    Symbol rule_symbol (Real height, Real width)const;
-    Symbol accidental (int)const;
-    Symbol ball (int)const;
-    Symbol flag (int)const;
-    Symbol rest (int, bool outside)const;
-    Symbol clef (String)const;
-    Symbol bar (String, Real height)const;
+    Symbol meter (Array<Scalar>) const;
+    Symbol stem (Real y1_pos, Real y2_pos) const;
+    Symbol rule_symbol (Real height, Real width) const;
+    Symbol accidental (int) const;
+    Symbol ball (int) const;
+    Symbol flag (int) const;
+    Symbol rest (int, bool outside) const;
+    Symbol clef (String) const;
+    Symbol bar (String, Real height) const;
     
-    Symbol dots (int)const;
-    Symbol slur (int dy, Real &dx, int dir)const;
-    Symbol half_slur (int dy, Real &dx, int dir, int xpart)const;
-    Symbol half_slur_middlepart (Real &dx, int dir)const;
-    Symbol big_slur (int dy, Real &dx, int dir)const;
-    Symbol text (String style, String text, int align = 1)const;
-    Symbol script (String idx)const;
-    Symbol hairpin (Real & width, bool decresc)const;
-    Symbol dynamic (String)const;
+    Symbol dots (int) const;
+    Symbol slur (int dy, Real &dx, int dir) const;
+    Symbol half_slur (int dy, Real &dx, int dir, int xpart) const;
+    Symbol half_slur_middlepart (Real &dx, int dir) const;
+    Symbol big_slur (int dy, Real &dx, int dir) const;
+    Symbol text (String style, String text, int align = 1) const;
+    Symbol script (String idx) const;
+    Symbol hairpin (Real & width, bool decresc) const;
+    Symbol dynamic (String) const;
     Lookup();
     Lookup (Lookup const &);
     ~Lookup();

diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh
index 2ce9625999c963c0890d1f6e03ec1aadb5dfcebd..f084c19ecb00409deff1bd3a9f00193aea763053 100644 (file)
--- a/lily/include/music-list.hh
+++ b/lily/include/music-list.hh
@@ -45,7 +45,7 @@ public:
     DECLARE_MY_RUNTIME_TYPEINFO;
     VIRTUAL_COPY_CONS(Chord,Music);
     virtual void translate (Moment dt);
-    virtual MInterval time_int()const;
+    virtual MInterval time_int() const;
 };
 
 /**
@@ -71,7 +71,7 @@ public:
     DECLARE_MY_RUNTIME_TYPEINFO;
     VIRTUAL_COPY_CONS(Voice, Music);
     virtual void translate (Moment dt);
-    virtual MInterval time_int()const;
+    virtual MInterval time_int() const;
 };
 
 /** A simple piece of music, which wishes to change the spot of its

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 5aec401462e5f8e8ef7f008d1a3edec941a579eb..a267fc04eb08e0341c3c67b45b1d949397924d6c 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -42,7 +42,7 @@ public:
     /// what name (or look for this name)
     String id_str_;    
 
-    virtual MInterval time_int()const;
+    virtual MInterval time_int() const;
     virtual ~Music(){}
     void print() const;
     virtual void transpose (Melodic_req const *);

diff --git a/lily/include/my-lily-parser.hh b/lily/include/my-lily-parser.hh
index 766906c282e804c63052ed9a493222402c2ace8a..7930c9c7a27a8a7d6ba9476ab24cf74f3ccc86ba 100644 (file)
--- a/lily/include/my-lily-parser.hh
+++ b/lily/include/my-lily-parser.hh
@@ -21,7 +21,7 @@
 #include "input.hh"
 
 class My_lily_parser {
-  char const* here_ch_C()const;
+  char const* here_ch_C() const;
   Array<Input> define_spot_array_;
   String init_str_;
 
@@ -53,7 +53,7 @@ public:
  
   Moment plet_mom();
   void add_notename (String, Melodic_req* req_p);
-  Input here_input()const;
+  Input here_input() const;
   void remember_spot();
   Input pop_spot();
     

diff --git a/lily/include/performer-group-performer.hh b/lily/include/performer-group-performer.hh
index 5c640cc6365a5133fee89cce747325a0b1ae0b59..e06dd3b017864370a9a91c253a62df7621fc0a18 100644 (file)
--- a/lily/include/performer-group-performer.hh
+++ b/lily/include/performer-group-performer.hh
@@ -43,7 +43,7 @@ protected:
 
     bool is_bottom_performer_b() const;
     virtual Performer_group_performer* find_performer_l (String name, String id);
-    virtual void do_print()const;
+    virtual void do_print() const;
 
 private:
     Pointer_list<Performer*> perf_p_list_;

diff --git a/lily/include/qlpsolve.hh b/lily/include/qlpsolve.hh
index 3ef601188a110a3ab0140288448b6123ada5a0cf..9098a0223888245c8fa0b0397f8fe966b573dd33 100644 (file)
--- a/lily/include/qlpsolve.hh
+++ b/lily/include/qlpsolve.hh
@@ -35,7 +35,7 @@ class Active_constraints {
     Ineq_constrained_qp const *opt;
 
 public:
-    String status()const;
+    String status() const;
     
     Vector vec (int k) const { return opt->cons[k]; }
     Real rhs (int k) const { return opt->consrhs[k]; }

diff --git a/lily/include/script.hh b/lily/include/script.hh
index c15eae63302a084a5df6a7274a9b48ce21ca06ab..35a945af5a8665ed0154619881e91d69f9afe34a 100644 (file)
--- a/lily/include/script.hh
+++ b/lily/include/script.hh
@@ -18,10 +18,10 @@ class Script : public Item, public Staff_side {
     Stem *stem_l_;
 
 protected:
-    Molecule *brew_molecule_p()const;
+    Molecule *brew_molecule_p() const;
     virtual void do_substitute_dependency (Score_elem*,Score_elem*);
     virtual void do_print() const;
-    virtual Interval symbol_height()const;
+    virtual Interval symbol_height() const;
     virtual void do_pre_processing();
     virtual Interval do_width() const;
     SCORE_ELEM_CLONE(Script);

diff --git a/lily/include/span-bar-grav.hh b/lily/include/span-bar-grav.hh
index eda25e6ffa9b34fac773043c9036ac95f29484c4..8cb16c13023aa3ccf595f9ca8041f2e5d9087d8f 100644 (file)
--- a/lily/include/span-bar-grav.hh
+++ b/lily/include/span-bar-grav.hh
@@ -31,7 +31,7 @@ protected:
     
     virtual void acknowledge_element (Score_elem_info);
     virtual void do_pre_move_processing();
-    virtual Span_bar* get_span_bar_p()const;
+    virtual Span_bar* get_span_bar_p() const;
 };
 
 #endif // SPAN_BAR_GRAV_HH

diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index 644d9de0b4a6fbcaba3cb75e841d993b57959d75..d49974c902acc1c37b5faf74c3cee67ae0e54d28 100644 (file)
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -24,11 +24,11 @@ public:
     void set (Vertical_align_element *);
 
 protected:
-    virtual Interval do_width()const;
+    virtual Interval do_width() const;
     virtual void do_pre_processing();
     
     virtual void do_substitute_dependency (Score_elem*,Score_elem*);
-    virtual Molecule * brew_molecule_p()const;
+    virtual Molecule * brew_molecule_p() const;
     virtual Symbol get_bar_sym (Real dy) const;
 };
 

diff --git a/lily/include/span-score-bar-grav.hh b/lily/include/span-score-bar-grav.hh
index 836424c0c21d7adaf089c7353b393cff0af090f5..7881c183e788e2c4dacba61e512d113922a45185 100644 (file)
--- a/lily/include/span-score-bar-grav.hh
+++ b/lily/include/span-score-bar-grav.hh
@@ -23,7 +23,7 @@ class Span_score_bar_engraver : public Span_bar_engraver
 {
 public:
     DECLARE_MY_RUNTIME_TYPEINFO;
-    virtual Span_bar* get_span_bar_p()const;
+    virtual Span_bar* get_span_bar_p() const;
 };
 
 /**

diff --git a/lily/include/span-score-bar.hh b/lily/include/span-score-bar.hh
index ace2c84dc9848d45883d06e9219fd7d7567e61c0..5b25faa3ca0bf4df4dc1e35342d7be9daceb0102 100644 (file)
--- a/lily/include/span-score-bar.hh
+++ b/lily/include/span-score-bar.hh
@@ -31,7 +31,7 @@ public:
     DECLARE_MY_RUNTIME_TYPEINFO;
     SCORE_ELEM_CLONE(Piano_brace);
 protected:
-    virtual Interval do_width()const;
+    virtual Interval do_width() const;
     virtual Symbol get_bar_sym (Real) const;
 };
 

diff --git a/lily/include/spring-spacer.hh b/lily/include/spring-spacer.hh
index e8dc25db3be5c260e83b0782093eb0f85652ca3b..22c4d9634e3ac232f7bcc6a8acd62bbe2abf8c2f 100644 (file)
--- a/lily/include/spring-spacer.hh
+++ b/lily/include/spring-spacer.hh
@@ -51,7 +51,7 @@ class Spring_spacer : public Line_spacer {
   /// mark column #i# as being loose.
   void loosen_column (int i);
   /// the index of #c# in #cols#
-  int col_id (PCol const *c) const;
+  int col_id (Paper_column const *c) const;
 
   /// generate an (nonoptimal) solution
   Vector find_initial_solution() const;
@@ -60,7 +60,7 @@ class Spring_spacer : public Line_spacer {
   bool check_feasible() const;
 
   /// does #this# contain the column #w#? 
-  bool contains (PCol const *w);
+  bool contains (Paper_column const *w);
 
   /// make the energy function
   void make_matrices (Matrix &quad, Vector &lin,Real&) const;
@@ -82,17 +82,17 @@ class Spring_spacer : public Line_spacer {
   void add_ideal (Idealspacing const *i);
   Vector try_initial_solution() const;
   void calc_idealspacing();
-  void set_fixed_cols (Mixed_qp&)const;
+  void set_fixed_cols (Mixed_qp&) const;
 
   Score_column* scol_l (int);
   void connect (int i,int j, Real,Real);
-  Line_of_cols error_pcol_l_arr()const;
+  Line_of_cols error_pcol_l_arr() const;
 public:
   static Line_spacer *constructor();
 
   virtual void solve (Col_hpositions*) const;
   virtual void lower_bound_solution (Col_hpositions*) const;
-  virtual void add_column (PCol  *, bool fixed=false, Real fixpos=0.0);
+  virtual void add_column (Paper_column  *, bool fixed=false, Real fixpos=0.0);
  
 
   virtual Vector default_solution() const;

diff --git a/lily/include/symbol.hh b/lily/include/symbol.hh
index f099fc657baa3ab2878f228e725b9fe2b14f921a..09f7e14e4a930f2a7f23f0c78d914e7c28ab2e80 100644 (file)
--- a/lily/include/symbol.hh
+++ b/lily/include/symbol.hh
@@ -19,7 +19,7 @@ struct Symbol {
 
     Symbol (String, Box);
     Symbol();
-    String str()const;         // for printing.
+    String str() const;                // for printing.
 };
 
 

diff --git a/lily/include/symtable.hh b/lily/include/symtable.hh
index 43a21aa50126fc214d0d9b125037f9498babca41..c0768988b9fa1b835e831418a30e74e30b588c8b 100644 (file)
--- a/lily/include/symtable.hh
+++ b/lily/include/symtable.hh
@@ -10,8 +10,8 @@
 struct  Symtable : public Assoc<String, Symbol> {
     String id_str;
     
-    Symbol lookup (String)const;
-    void print()const;
+    Symbol lookup (String) const;
+    void print() const;
 };
 
 
@@ -22,7 +22,7 @@ struct Symtables : private Assoc<String, Symtable*> {
     Symtables();
     Symtables (Symtables const&);
     void add (String, Symtable*);
-    void print()const;
+    void print() const;
 };
 
 

diff --git a/lily/include/text-spanner.hh b/lily/include/text-spanner.hh
index 3bed16878765acc811c9ce3feda54dc0a66e83fb..c5c9cae052809a4a38cb95d6af34686c62429dd4 100644 (file)
--- a/lily/include/text-spanner.hh
+++ b/lily/include/text-spanner.hh
@@ -30,7 +30,7 @@ protected:
     virtual void do_pre_processing();
     virtual void do_post_processing();
     virtual Interval height() const ;
-    virtual Molecule* brew_molecule_p()const;
+    virtual Molecule* brew_molecule_p() const;
     virtual void do_print() const;
 };
 #endif // TEXTSPANNER_HH

diff --git a/lily/include/time-description.hh b/lily/include/time-description.hh
index cbc25ded74e413c8b5528b4acb36cd8e503d8244..cafd9a066435a49e93365d1deccb81d2180241fb 100644 (file)
--- a/lily/include/time-description.hh
+++ b/lily/include/time-description.hh
@@ -39,12 +39,12 @@ struct Time_description {
     Time_description();
     void add (Moment dt);
     bool allow_meter_change_b();
-    String str()const;
+    String str() const;
     void print() const;
     void setpartial (Moment p);
-    String try_set_partial_str (Moment)const;
-    Moment barleft()const;
-    Moment next_bar_moment()const;
+    String try_set_partial_str (Moment) const;
+    Moment barleft() const;
+    Moment next_bar_moment() const;
     void set_meter (int,int);
     static int compare (const Time_description&, const Time_description&);
 };

diff --git a/lily/include/vertical-align-elem.hh b/lily/include/vertical-align-elem.hh
index 3683b304ba94d6c8f57c3ebae49100e9cd7cc47b..bb6b7ed48f937217b1eefa836eb5537b9895d6af 100644 (file)
--- a/lily/include/vertical-align-elem.hh
+++ b/lily/include/vertical-align-elem.hh
@@ -19,7 +19,7 @@ class Vertical_align_element : virtual public Score_elem {
     Link_array<Score_elem> elem_l_arr_;
 public:
     void add (Score_elem*);
-    bool contains_b (Score_elem const*)const;
+    bool contains_b (Score_elem const*) const;
     Vertical_align_element();
     DECLARE_MY_RUNTIME_TYPEINFO;
 protected:

diff --git a/lily/include/word-wrap.hh b/lily/include/word-wrap.hh
index 6f16af30c8883ae53b417701a9adf5995b6c4b05..a7d69ff0838d7e1d59478045f91340c3a01dae13 100644 (file)
--- a/lily/include/word-wrap.hh
+++ b/lily/include/word-wrap.hh
@@ -14,7 +14,7 @@
 
 /// wordwrap type algorithm: move to next line if current is optimal.
 struct Word_wrap : Break_algorithm {
-    virtual Array<Col_hpositions> do_solve()const;
+    virtual Array<Col_hpositions> do_solve() const;
     Word_wrap();
 };