lilypond-0.0.67

diff --git a/flower/include/matrix-storage.hh b/flower/include/matrix-storage.hh
index 933cdbbb6ed4043ac4b5a75769b8d6577a0ef035..d7e9310acfbaedd7900caa8dc893e180bf7b45ec 100644 (file)
--- a/flower/include/matrix-storage.hh
+++ b/flower/include/matrix-storage.hh
@@ -153,7 +153,7 @@ public:
     /**
       RTTI.
      */
-    NAME_MEMBERS(Matrix_storage);
+    NAME_MEMBERS();
 };
 
 

diff --git a/lily/head-reg.cc b/lily/head-reg.cc
index b704f1803e4825c02fc69222075c67c76e16c2c4..8a144ad142e6d9d97d7351f4ed9a5eb7a59ae324 100644 (file)
--- a/lily/head-reg.cc
+++ b/lily/head-reg.cc
@@ -19,8 +19,8 @@ Note_head_register::Note_head_register()
 bool
 Note_head_register::try_request(Request *req_l) 
 {
-    if (req_l->note() || req_l->rest())
-       note_req_l_=req_l->rhythmic();
+    if (req_l->musical() && (req_l->musical()->note() || req_l->musical()->rest()))
+       note_req_l_=req_l->musical()->rhythmic();
     else
        return false;
 

diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc
index f8b3de1738690b7e107c76924ba72c116ab62dbd..b6d25ea43aa64056c9ae3480f05c0e914a1e57b9 100644 (file)
--- a/lily/midi-walker.cc
+++ b/lily/midi-walker.cc
@@ -106,7 +106,10 @@ Midi_walker::process_requests()
     }
 
     for ( int i = 0; i < ptr()->musicalreq_l_arr_.size(); i++ )  {
-       Rhythmic_req *n = ptr()->musicalreq_l_arr_[i]->rhythmic();
+       Musical_req *m = ptr()->musicalreq_l_arr_[i]->musical();
+       if (!m)
+           return;
+       Rhythmic_req *n = m->rhythmic();
        if ( !n)
            continue;
        Note_req * note_l = n->note();

diff --git a/lily/molecule.cc b/lily/molecule.cc
index ff047f2c771f89a4bbce7469a21b76f3cfc2105a..c39082ab929cf7d8ddbf4c15ffc0fe594f7bcba7 100644 (file)
--- a/lily/molecule.cc
+++ b/lily/molecule.cc
@@ -1,4 +1,11 @@
-#include "varray.hh"
+/*
+  molecule.cc -- implement Molecule
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
 #include "interval.hh"
 #include "dimen.hh"
 #include "string.hh"
@@ -7,41 +14,6 @@
 #include "debug.hh"
 #include "tex.hh"
 
-void
-Atom::print() const
-{
-    mtor << "texstring: " <<sym.tex<<"\n";    
-}
-
-Box
-Atom::extent() const
-{
-    Box b( sym.dim);
-    b.translate(off);
-    return b;
-}
-
-Atom::Atom(Symbol s)
-{
-    sym=s;
-}
-
-
-String
-Atom::TeX_string() const
-{
-    /* infinity checks. */
-    assert( abs(off.x) < 100 CM);
-    assert( abs(off.y) < 100 CM);
-    
-    // whugh.. Hard coded...
-    String s("\\placebox{%}{%}{%}");
-    Array<String> a;
-    a.push(print_dimen(off.y));
-    a.push(print_dimen(off.x));
-    a.push(sym.tex);
-    return substitute_args(s, a);
-}
 
 /* *************** */
 
@@ -148,3 +120,9 @@ Molecule::print() const
     for (iter_top(ats,c); c.ok(); c++)
        c->print();
 }
+
+void
+Molecule::add(Atom const &a)
+{
+    ats.bottom().add(new Atom(a)); 
+}