lilypond-0.0.65

diff --git a/lily/clef-reg.cc b/lily/clef-reg.cc
index 63e4a505fc45beb7230857e3ff7de307fa3e5fb0..9f1d5fa9c7bed8c2311eda5691119a10ec1031d2 100644 (file)
--- a/lily/clef-reg.cc
+++ b/lily/clef-reg.cc
@@ -1,7 +1,7 @@
 /*
   clef.cc -- implement  Clef_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>,
   Mats Bengtsson <matsb@s3.kth.se>

diff --git a/lily/crescendo.cc b/lily/crescendo.cc
index f520106c19f0e7cc571f7d635ed368740c470f5d..98317f85e2fa3b1f7540ad28c1f1a2370cc94a2e 100644 (file)
--- a/lily/crescendo.cc
+++ b/lily/crescendo.cc
@@ -1,10 +1,11 @@
 /*
   crescendo.cc -- implement Crescendo
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
+
 #include "dimen.hh"
 #include "crescendo.hh"
 #include "lookup.hh"
@@ -12,18 +13,12 @@
 #include "debug.hh"
 
 Crescendo::Crescendo()
-    : Staff_side(this)
 {
     grow_dir_i_ =0;
     dir_i_ = -1 ;
     left_dyn_b_ = right_dyn_b_ =false;
 }
 
-Spanner*
-Crescendo::do_break_at(PCol*, PCol*)const
-{
-    return new Crescendo(*this);
-}
 
 
 Molecule*
@@ -44,7 +39,7 @@ Crescendo::brew_molecule_p() const
     }
     
     if (w_dim < 0) {
-       error("Crescendo too small");
+       warning("Crescendo too small");
        w_dim = 0;
     }
     Real lookup_wid = w_dim * 0.9; // make it slightly smaller.
@@ -53,7 +48,7 @@ Crescendo::brew_molecule_p() const
     m_p->add(Atom(s));
     int pos = get_position_i(s.dim.y);
     m_p->translate(Offset(x_off_dim + 0.05 * w_dim, 
-                         pos * paper()->internote()));
+                         pos * paper()->internote_f()));
     return m_p;
 }
 

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 12684d539d037dc8af5d518b65894d44303ef551..bc6af68d60112c5fc50df91e5750bd66e9398680 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -1,7 +1,7 @@
 /*
   lookup.cc -- implement simple Lookup methods.
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 
@@ -19,6 +19,7 @@
 #include "tex.hh"
 #include "scalar.hh"
 
+
 Lookup::Lookup()
 {
     texsetting = "\\unknowntexsetting";
@@ -66,7 +67,7 @@ Lookup::text(String style, String text, int dir) const
 
 
 Real
-Lookup::internote() const
+Lookup::internote_f() const
 {
     return ball(4).dim.y.length()/2;
 }
@@ -129,8 +130,10 @@ Lookup::clef(String s) const
 Symbol
 Lookup::dots(int j) const
 {
-    if (j>3)
-       error("max 3 dots");    // todo
+    if (j>3) {
+       j = 3;
+       warning("max 3 dots");  // todo
+    }
     return (*symtables_)("dots")->lookup(j);
 }
 
@@ -185,7 +188,7 @@ Lookup::linestaff(int lines, Real wid) const
 {
     Symbol s;
     s.dim.x = Interval(0,wid);
-    Real dy = (lines >0) ? (lines-1)*internote()*2 : 0;
+    Real dy = (lines >0) ? (lines-1)*internote_f()*2 : 0;
     s.dim.y = Interval(0,dy);
 
     Array<String> a;

diff --git a/lily/symtable.cc b/lily/symtable.cc
index 9dc82c0631c32160a43d9c73ccb0e0b5257db186..b77811100575a6f5dd6294c38bdbfedca1f5f711 100644 (file)
--- a/lily/symtable.cc
+++ b/lily/symtable.cc
@@ -1,7 +1,7 @@
 /*
   symtable.cc -- implement Symbol_table
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -39,10 +39,11 @@ Symtable::lookup(String s) const
     if (elt_b(s))
        return (*this)[s];
     else {
-       error( "Symtable `" + id_str+ "\': unknown symbol `" +s+"'\n");
+       warning( "Symtable `" + id_str+ "\': unknown symbol `" +s+"'\n");
+       Symbol sy;                      // unreachable
+       sy.tex = "";
+       return sy;
     }
-    Symbol sy;                 // unreachable
-    return sy;
 }
 
 Symtable*