lilypond-0.0.65

diff --git a/lily/include/complex-walker.hh b/lily/include/complex-walker.hh
index 44f445f069175d3114ba90de6090e9dc574f92d9..cc16eef1b310c3735e99fc3e29f110b946d74cfe 100644 (file)
--- a/lily/include/complex-walker.hh
+++ b/lily/include/complex-walker.hh
@@ -7,9 +7,9 @@
 #ifndef COMPLEXWALKER_HH
 #define COMPLEXWALKER_HH
 
-#include "proto.hh"
+#include "lily-proto.hh"
 #include "staff-walker.hh"
-#include "staff-elem-info.hh"
+#include "score-elem-info.hh"
 
 /**
   A staff walker which uses registers to decide what to print
@@ -33,10 +33,9 @@ public:
     virtual void do_post_move();
     virtual void do_pre_move();
 
-    Complex_walker(Complex_staff*);
+    Complex_walker(Staff*);
     ~Complex_walker();
 
-    Complex_staff *staff();
 private:
 };
 

diff --git a/lily/include/staff.hh b/lily/include/staff.hh
index 7811f76c0ecfd79464df5cf7c26f3105fb69df25..f9f24d8150f69bcde487600051a9e9f7d4a411cd 100644 (file)
--- a/lily/include/staff.hh
+++ b/lily/include/staff.hh
@@ -1,7 +1,7 @@
 /*
   staff.hh -- declare Staff
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -10,10 +10,10 @@
 #define STAFF_HH
 
 #include "plist.hh"
-#include "proto.hh"
+#include "lily-proto.hh"
 #include "moment.hh"
 
-/// base class for a collection of voices.
+/// A collection of voices.
 class Staff {
     Staff(const Staff&src);
     
@@ -23,14 +23,14 @@ public:
     Link_list<Voice*> voice_list_;
     /// runtime field
     Link_list<Staff_column*> cols_;
+    Line_of_staff * staff_line_l_;
 
     Score *score_l_;
     PScore *pscore_l_;
-    PStaff *pstaff_l_;
     
     /* *************************************************************** */
 
-    void add(const Link_list<Voice*> &s);
+    void add(Link_list<Voice*> const&s);
 
     void add_voice(Voice *v_p);
     Paper_def*paper()const;
@@ -45,9 +45,9 @@ public:
     void clean_cols() ;
     Staff();
     
-    virtual void set_output(PScore * destination)=0;
-    virtual Staff_walker *get_walker_p()=0;    
-    virtual ~Staff() { }
+    virtual void set_output(PScore * destination);
+    Staff_walker *get_walker_p();
+    virtual ~Staff();
     void add_col(Staff_column*);
 protected:
 

diff --git a/lily/include/tex.hh b/lily/include/tex.hh
index af45ba7d27c68d073f778d7375ef8bf50a04f9cb..386c9b29ddc5e2486da5737f4eac276b8c0e40ef 100644 (file)
--- a/lily/include/tex.hh
+++ b/lily/include/tex.hh
@@ -1,3 +1,13 @@
+/*
+  tex.hh -- declare various functions for TeX output
+
+  source file of the LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+
+
 #ifndef TEX_HH
 #define TEX_HH
 
@@ -5,7 +15,7 @@
 #include "boxes.hh"
 #include "scalar.hh"
 
-/** parameter substitution in TeXstrings.
+/** parameter substitution in TeX_strings.
   this function provides a simple macro mechanism:
 
   if source == "tex%bla%", then
@@ -14,7 +24,7 @@
 String
 substitute_args(String source, Array<String> args);
 
-/// parameter substitution in TeXstrings
+/// parameter substitution in TeX_strings
 String
 substitute_args(String source, Array<Scalar> args);
 

diff --git a/lily/input-staff.cc b/lily/input-staff.cc
index 618d98f012554a60fc0c050c636cdca810c6040f..0b127baacb6a868c2078ff0bc420da2eadaf54c8 100644 (file)
--- a/lily/input-staff.cc
+++ b/lily/input-staff.cc
@@ -1,7 +1,7 @@
 /*
   input-staff.cc -- implement Input_staff
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -11,7 +11,6 @@
 #include "input-music.hh"
 #include "input-staff.hh"
 #include "staff.hh"
-#include "complex-staff.hh"
 #include "my-lily-lexer.hh"
 #include "input-register.hh"
 
@@ -29,7 +28,7 @@ Input_staff::add(Input_music*m)
 Staff*
 Input_staff::parse(Score*score_l)
 {
-    Staff *p=new Complex_staff;
+    Staff *p=new Staff;
    
     p->score_l_ = score_l;
     p->ireg_p_ = (ireg_p_)? new Input_register(*ireg_p_):0;