lilypond-0.0.70pre

diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh
index c93c1ad205d278ede6df56cf27606983c34658ee..450281825d15bd88985371a2e034ee34f5975a71 100644 (file)
--- a/lily/include/note-head.hh
+++ b/lily/include/note-head.hh
@@ -32,6 +32,7 @@ public:
     int staff_size_i_;
     int dots_i_;
     int balltype_i_;
+    int dot_delta_y_i_;
     int x_dir_i_;
     
     /* *************** */
@@ -42,6 +43,7 @@ public:
       position of top line (5 linestaff: 8)
       */
     Note_head(int staff_size);
+    void set_dots();
     static int compare(Note_head * const &a, Note_head *const &b) ;
 protected:
     virtual    void do_print()const;

diff --git a/lily/lookup.cc b/lily/lookup.cc
index dae5ad37b5117dd7cb23d99932f80a4851277bf5..a4dd9caeb1e9621ac79c9a4f936179ccdd48a2d7 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -72,6 +72,23 @@ Lookup::internote_f() const
     return ball(4).dim.y.length()/2;
 }
 
+Real
+Lookup::interbeam_f() const
+{
+    /* 
+      [todo]
+         * runtime
+
+      "french" style: interbeam = intenote;
+      "german" style: interbeam = 2/3 * interline
+
+      as lily's style is currently german, we'll hardcode german style
+     */
+     // it seems that "interline" means _between_ lines
+//   return  ball(4).dim.y.length() * 2 / 3; 
+     return  ball(4).dim.y.length() * 2 / 3 + 0.4;  //ugh
+}
+
 Symbol
 Lookup::ball(int j) const
 {
@@ -83,9 +100,9 @@ Lookup::ball(int j) const
 }
 
 Symbol
-Lookup::rest(int j) const
+Lookup::rest(int j, bool o) const
 {
-    return (*symtables_)("rests")->lookup(String(j));
+    return (*symtables_)("rests")->lookup(String(j) + (o ? "o" : "") );
 }
 
 Symbol

diff --git a/lily/symtable.cc b/lily/symtable.cc
index b77811100575a6f5dd6294c38bdbfedca1f5f711..3ba4394cc261ad7a2be4df4275c569ab47143b42 100644 (file)
--- a/lily/symtable.cc
+++ b/lily/symtable.cc
@@ -40,8 +40,7 @@ Symtable::lookup(String s) const
        return (*this)[s];
     else {
        warning( "Symtable `" + id_str+ "\': unknown symbol `" +s+"'\n");
-       Symbol sy;                      // unreachable
-       sy.tex = "";
+       Symbol sy;      
        return sy;
     }
 }