lilypond-0.0.49

diff --git a/flower/include/list.hh b/flower/include/list.hh
index 1cfa9f54edf397e88753ce3ab42f62cfffed02d7..a7389ed489a2ad14ca35ec62c54d0322d7157fe7 100644 (file)
--- a/flower/include/list.hh
+++ b/flower/include/list.hh
@@ -86,11 +86,6 @@ class List
 #include "list.icc"
 #include "cursor.hh"
 
-// instantiate a template:  explicit instantiation.
-#define L_instantiate(a)  template class List<a>; template class Cursor<a>; \
-  template class Link<a>
-
-
 #endif // __LIST_HH //
     
    

diff --git a/flower/include/list.tcc b/flower/include/list.tcc
index bd3a16b0c6fa69d86353dfdc333f22fe3f48d4be..e3fa43cdd3346677a03e2a16097832bd86e69857 100644 (file)
--- a/flower/include/list.tcc
+++ b/flower/include/list.tcc
@@ -1,6 +1,11 @@
 #ifndef LIST_CC
 #define LIST_CC
 
+
+// instantiate a template:  explicit instantiation.
+#define L_instantiate(a)  template class List<a>; template class Cursor<a>; \
+  template class Link<a>
+
 #include "list.hh"
 
 template<class T>

diff --git a/flower/include/plist.hh b/flower/include/plist.hh
index 1fc4d941ab0851e6890a32c92cc10b8915247700..80d780e3d61d390fcd761ea6f7058de2e97af96c 100644 (file)
--- a/flower/include/plist.hh
+++ b/flower/include/plist.hh
@@ -62,10 +62,6 @@ template<class T>
 void PL_copy(IPointerList<T*> &dst,IPointerList<T*> const&src);
 
 
-#define PL_instantiate(a)  template class PointerList<a*>; \
-       template class PCursor<a*>;
-#define IPL_instantiate(a) PL_instantiate(a); \
-       template class IPointerList<a*>
 
 #include "plist.icc"
 

diff --git a/flower/include/plist.tcc b/flower/include/plist.tcc
index ac9daedf719f77f89198045d6c8caabf2b54a0aa..d18e01f9025ac64d57d745e83a5633b6fb9358cd 100644 (file)
--- a/flower/include/plist.tcc
+++ b/flower/include/plist.tcc
@@ -1,5 +1,10 @@
 #include "plist.hh"
 
+#define PL_instantiate(a)  template class PointerList<a*>; \
+       template class PCursor<a*>;
+#define IPL_instantiate(a) PL_instantiate(a); \
+       template class IPointerList<a*>
+       
 template<class T>
 IPointerList<T>::~IPointerList()
 {

diff --git a/lily/grouping.cc b/lily/grouping.cc
index 2e59f05bd242b3fdbe8e8c22a907ab4b8539d3e2..b44a9d90e4f66d2d9da2287ec141310ec1e393e5 100644 (file)
--- a/lily/grouping.cc
+++ b/lily/grouping.cc
@@ -227,7 +227,7 @@ Rhythmic_grouping::print()const
 }
 
 bool
-Rhythmic_grouping::child_fit_query(Moment start)
+Rhythmic_grouping::child_fit_b(Moment start)
 {
     if (children.size())
        return ( children.top()->interval().right== start);
@@ -240,7 +240,7 @@ Rhythmic_grouping::add_child(Moment start, Moment len)
 {
     Moment stop = start+len;
 
-    assert(child_fit_query(start));
+    assert(child_fit_b(start));
     children.push(new Rhythmic_grouping(MInterval(start, stop)));
 }
 

diff --git a/lily/include/grouping.hh b/lily/include/grouping.hh
index 06b4421b0a6a22462f3256d086682550db09622e..06061743ac97e37d324ad63f4eb0841f3e15303d 100644 (file)
--- a/lily/include/grouping.hh
+++ b/lily/include/grouping.hh
@@ -34,7 +34,7 @@ struct Rhythmic_grouping {
     ~Rhythmic_grouping();
 
     void add_child(Moment start, Moment len);
-    bool child_fit_query(Moment start);
+    bool child_fit_b(Moment start);
     void split(Rhythmic_grouping r);
     void split(Array<MInterval>);
     void split(int n);

diff --git a/lily/include/notename-table.hh b/lily/include/notename-table.hh
new file mode 100644 (file)
index 0000000..4e357a2
--- /dev/null
+++ b/lily/include/notename-table.hh
@@ -0,0 +1,24 @@
+/*
+  notename-table.hh -- declare 
+
+  source file of the LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+
+#ifndef NOTENAME_TABLE_HH
+#define NOTENAME_TABLE_HH
+
+#include "pointer.hh"
+#include "string.hh"
+#include "lily-proto.hh"
+#include "assoc.hh"
+
+class Notename_table :   Assoc<String, P<Melodic_req> >{
+public:
+    void add(String, Melodic_req*);
+    Melodic_req*get_l(String);
+};
+  
+#endif // NOTENAME_TABLE_HH

diff --git a/lily/stem-beam-reg.cc b/lily/stem-beam-reg.cc
index 80aa4507719754bb67a977aea59e3f5cf4d73387..773f0ac1e0bf363036793fc340766fd781339468 100644 (file)
--- a/lily/stem-beam-reg.cc
+++ b/lily/stem-beam-reg.cc
@@ -40,7 +40,7 @@ Stem_beam_register::try_request(Request*req_l)
     }
     
     if ( req_l->stem() ) {
-       if (current_grouping && !current_grouping->child_fit_query(
+       if (current_grouping && !current_grouping->child_fit_b(
            get_staff_info().time_C_->whole_in_measure_))
            return false;