lilypond-0.0.65

diff --git a/lily/bar-reg.cc b/lily/bar-reg.cc
index 4dd6199ce148aa4613d313f5436f535d6beabae5..c66a33bdb4cab77d877adfe4b79dd76083b76d2c 100644 (file)
--- a/lily/bar-reg.cc
+++ b/lily/bar-reg.cc
@@ -1,7 +1,7 @@
 /*
   bar-reg.cc -- implement Bar_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -9,7 +9,6 @@
 #include "bar-reg.hh"
 #include "bar.hh"
 #include "command-request.hh"
-//#include "score-column.hh"
 #include "time-description.hh"
 
 Bar_register::Bar_register()

diff --git a/lily/bar.cc b/lily/bar.cc
index 96071ad385b8a7001f9bf75db1ff2b2e72767040..8a6891b330bab5ac50a075e6dc59e588e47d60e8 100644 (file)
--- a/lily/bar.cc
+++ b/lily/bar.cc
@@ -1,7 +1,7 @@
 /*
   bar.cc -- implement Bar
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/calcideal.cc b/lily/calcideal.cc
index af654d15bd1bfa055d125ca5717181ee9ff51b06..11c1aa2d2cb0b42ed9999c5338614f9f9329f13b 100644 (file)
--- a/lily/calcideal.cc
+++ b/lily/calcideal.cc
@@ -1,7 +1,7 @@
 /*
   calcideal.cc -- implement Score::calc_idealspacing()
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 48e63b7f3b57025e3075f7ae5f27fed53c3ff49a..055b282b2ef59806f90a8280abbd44ad2cc8afaf 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -1,7 +1,7 @@
 /*
   clef-item.cc -- implement Clef_item
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -48,7 +48,7 @@ Clef_item::brew_molecule_p()const
        t += "_change";
     Symbol s = paper()->lookup_l()->clef(t);
     Molecule*output = new Molecule(Atom(s));
-    output->translate(Offset(0, paper()->internote() * y_off));
+    output->translate(Offset(0, paper()->internote_f() * y_off));
     return output;
 }
 

diff --git a/lily/collision-reg.cc b/lily/collision-reg.cc
index 6b9da7706229b435cdf7db2027be110b6c91f469..73582d5d9072f36d44a704d61f985d47d15a7e6c 100644 (file)
--- a/lily/collision-reg.cc
+++ b/lily/collision-reg.cc
@@ -1,7 +1,7 @@
 /*
   collision-reg.cc -- implement Collision_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/command-request.cc b/lily/command-request.cc
index e4334f1d69a3d03f84740df617544768806d9640..83cb258ffb32dc92972b3edee47ea348fc4afcb3 100644 (file)
--- a/lily/command-request.cc
+++ b/lily/command-request.cc
@@ -1,7 +1,7 @@
 /*
   commandrequest.cc -- implement Nonmusical reqs
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/dynamic-reg.cc b/lily/dynamic-reg.cc
index 20ffe5cfe32ad63f5701572613680722f3c5ed88..94b887432a47a6f8c60e0e90c4f578cd136cc2b8 100644 (file)
--- a/lily/dynamic-reg.cc
+++ b/lily/dynamic-reg.cc
@@ -1,7 +1,7 @@
 /*
   dynamic-reg.cc -- implement Dynamic_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/global-regs.cc b/lily/global-regs.cc
index 3451ca5270a231fc51d18c95cb5ee251d2fb1528..f05f98c6aa4a6fba2f2bc6131f0691ef96a4b537 100644 (file)
--- a/lily/global-regs.cc
+++ b/lily/global-regs.cc
@@ -1,7 +1,7 @@
 /*
   global-regs.cc -- implement 
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/grouping.cc b/lily/grouping.cc
index b44a9d90e4f66d2d9da2287ec141310ec1e393e5..9d466b912f6bb4f5ccaf8e4d8132f742d201a18b 100644 (file)
--- a/lily/grouping.cc
+++ b/lily/grouping.cc
@@ -1,7 +1,7 @@
 /*
   grouping.cc -- implement Rhythmic_grouping
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/identifier.cc b/lily/identifier.cc
index 72224f92f91c7cfb342767476f22dce220bf9f6b..9829e40a42101ec67d3ab8fd1bdd10ab62631311 100644 (file)
--- a/lily/identifier.cc
+++ b/lily/identifier.cc
@@ -1,7 +1,7 @@
 /*
   identifier.cc -- implement identifier and derived classes
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/bar-reg.hh b/lily/include/bar-reg.hh
index c73e5d1f4f88bc5fa7cda9cb6c0a124443e61763..5879cb948bbbf5f17e297ec0d57bf3cb514c09b6 100644 (file)
--- a/lily/include/bar-reg.hh
+++ b/lily/include/bar-reg.hh
@@ -1,7 +1,7 @@
 /*
   bar-reg.hh -- declare Bar_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index 733cd26237feb443701e62e4c9068dae7b04ad25..ea23bd07bccfdf5bbc74f537c699f901113e4d3b 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,5 +1,5 @@
 /*
-  bar.hh -- part of LilyPond
+  bar.hh -- part of GNU LilyPond
 
   (c) 1996,97 Han-Wen Nienhuys
 */

diff --git a/lily/include/bow.hh b/lily/include/bow.hh
index 903bbdb6358a33fdbc87289a46bae0e8ceaaa984..76330c079c44121a0e5005438d63c1a6c8c6bbc5 100644 (file)
--- a/lily/include/bow.hh
+++ b/lily/include/bow.hh
@@ -1,7 +1,7 @@
 /*
   bow.hh -- declare Bow
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -12,7 +12,8 @@
 #include "directional-spanner.hh"
 
 /**
-  base class for anything that looks like a slur.
+  Base class for anything that looks like a slur.
+  Anybody with a better name?
   */
 class Bow : public Directional_spanner {
 protected:

diff --git a/lily/include/clef-reg.hh b/lily/include/clef-reg.hh
index a9f3426a1225526bb17965e0148601414fceae60..28cbd4643ceab37383926995dceaf0728d265dd6 100644 (file)
--- a/lily/include/clef-reg.hh
+++ b/lily/include/clef-reg.hh
@@ -1,5 +1,5 @@
 /*
-  clef.hh -- part of LilyPond
+  clef.hh -- part of GNU LilyPond
 
   (c) 1996,97 Han-Wen Nienhuys
 */

diff --git a/lily/include/collision-reg.hh b/lily/include/collision-reg.hh
index 0dd8a66fcac515d942ec256cdb12b9327b304b7e..b0b3b6dc8a86a3b6d28f1c5920ec0fd77dc2992f 100644 (file)
--- a/lily/include/collision-reg.hh
+++ b/lily/include/collision-reg.hh
@@ -1,7 +1,7 @@
 /*
   collision-reg.hh -- declare Collision_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/command-request.hh b/lily/include/command-request.hh
index 9cf88dcafc3efd980f3bec14ff495564d3f3a610..d1b99f9a6cdc94b45c72fe91581a58d7f503ff1d 100644 (file)
--- a/lily/include/command-request.hh
+++ b/lily/include/command-request.hh
@@ -1,7 +1,7 @@
 /*
   command-request.hh -- declare Non musical requests
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/dynamic-reg.hh b/lily/include/dynamic-reg.hh
index cf23d007c3985ea11a6b4abd5b77e785d89570b9..17f769053cd21063638f89d8adeb3940360f2c91 100644 (file)
--- a/lily/include/dynamic-reg.hh
+++ b/lily/include/dynamic-reg.hh
@@ -1,7 +1,7 @@
 /*
   dynamic-reg.hh -- declare Dynamic_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/grouping.hh b/lily/include/grouping.hh
index e4395b1f7aed25416826cabd6078d4c28d1e6d6e..428978249e19b391d52b322d45950218570cbba6 100644 (file)
--- a/lily/include/grouping.hh
+++ b/lily/include/grouping.hh
@@ -1,5 +1,5 @@
 /*
-  grouping.hh -- part of LilyPond
+  grouping.hh -- part of GNU LilyPond
 
   (c) 1996,97 Han-Wen Nienhuys
 */

diff --git a/lily/include/item.hh b/lily/include/item.hh
index f61a2f27650789168a2ea2724acd63ee5fe96d8d..3c030d122c68275e56df7bc134a00283c9c324c3 100644 (file)
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -1,7 +1,7 @@
 /*
   item.hh -- declare Item
 
-  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,7 @@
 #include "glob.hh"
 #include "boxes.hh"
 #include "string.hh"
-#include "staff-elem.hh"
+#include "score-elem.hh"
 
 /**
  a horizontally fixed size element of the score
@@ -28,21 +28,16 @@ public:
     /// indirection to the column it is in
     PCol * pcol_l_;
 
-    /* *************** */
     virtual Item *item() { return this; }
     Item();
-    void do_print()const;
     Real hpos_f() const;
     NAME_MEMBERS(Item);
-    /**
-      
-      @return the line where this is in; 
-
-      PRE
-      Breaking calc has  to be finished
-     */
-    Line_of_score * line_l() const;
+    virtual Line_of_score * line_l() const;
+protected:
+    virtual void do_print()const;
+
 };
 
 
+
 #endif

diff --git a/lily/include/key-item.hh b/lily/include/key-item.hh
index e56af8e682063f6760478f80499a45da9cd91a63..1e2207beab86ed24fe3ded572eaae9ba01413ab4 100644 (file)
--- a/lily/include/key-item.hh
+++ b/lily/include/key-item.hh
@@ -1,5 +1,5 @@
 /*
-  key-item.hh -- part of LilyPond
+  key-item.hh -- part of GNU LilyPond
 
   (c) 1996,97 Han-Wen Nienhuys
 */

diff --git a/lily/include/key-reg.hh b/lily/include/key-reg.hh
index c674ca55a28c1fd9e09d07b4a526bcdef2762cda..b6e21224d927ca25a0f3d0e0b0c3165b56d79a43 100644 (file)
--- a/lily/include/key-reg.hh
+++ b/lily/include/key-reg.hh
@@ -1,7 +1,7 @@
 /*
   key-reg.hh -- declare Key_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh
index 88ab9ffbe0de7ef61c3096286668ce8a6d1c501c..a38935b398fdc260f207a35550cf2e4c42d0e317 100644 (file)
--- a/lily/include/keyword.hh
+++ b/lily/include/keyword.hh
@@ -1,5 +1,5 @@
 /*
-  keyword.hh -- part of LilyPond
+  keyword.hh -- part of GNU LilyPond
 
   (c) 1996,97 Han-Wen Nienhuys
 */

diff --git a/lily/include/leastsquares.hh b/lily/include/leastsquares.hh
index 35b1e1d34b912f0c71bcd52fac37e670ea88bcf4..2e5c970fe5399626f79cea20862a1a7061ca6fee 100644 (file)
--- a/lily/include/leastsquares.hh
+++ b/lily/include/leastsquares.hh
@@ -1,5 +1,5 @@
 /*
-  leastsquare.hh -- part of LilyPond
+  leastsquare.hh -- part of GNU LilyPond
 
   (c) 1996,97 Han-Wen Nienhuys
 */

diff --git a/lily/include/linespace.hh b/lily/include/linespace.hh
index bd8685383aa6aac5361200cb8f194f9c01734951..97e4caf70ce25940ff437571b5468ed1f78c861c 100644 (file)
--- a/lily/include/linespace.hh
+++ b/lily/include/linespace.hh
@@ -1,7 +1,7 @@
 /*
   linespace.hh -- declare Colinfo, Spacing_problem
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 42a2e03819bd986da0bf5325a9460a34faaf5a8c..0a0921efce7b6eef39a24345ae059512b01c1146 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -1,6 +1,11 @@
 /*
-  lilypond, (c) 1996,97 Han-Wen Nienhuys
+  lookup.hh -- declare Lookup
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
+
 #ifndef LOOKUPSYMS_HH
 #define LOOKUPSYMS_HH
 
@@ -15,7 +20,7 @@ struct Lookup {
     /* *************** */
     void add(String, Symtable*);
     void print()const;
-    Real internote()const;
+    Real internote_f()const;
 
     Symbol linestaff(int n, Real w)const;
     Symbol fill(Box b)const;

diff --git a/lily/include/meter-reg.hh b/lily/include/meter-reg.hh
index 6ebe18c2823ca04b89a2a607b9e4d5e8740b6c70..300c72da9fe617d2ac40a4c8037f1277636bc39c 100644 (file)
--- a/lily/include/meter-reg.hh
+++ b/lily/include/meter-reg.hh
@@ -1,7 +1,7 @@
 /*
   meter-reg.hh -- declare  Meter_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/midi-output.hh b/lily/include/midi-output.hh
index 86ffab2a05d27acc92eb392915a0fc838300856a..575842ebbdbeaf10af487c98cac9e6b2ab38865e 100644 (file)
--- a/lily/include/midi-output.hh
+++ b/lily/include/midi-output.hh
@@ -1,7 +1,7 @@
 /*
   midioutput.hh -- declare Midi_output
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh
index 244438483852035d57397a9bb574deaff8c246c5..c18cb9c4e9761761c110996548c6de57b68f82d5 100644 (file)
--- a/lily/include/midi-stream.hh
+++ b/lily/include/midi-stream.hh
@@ -1,5 +1,5 @@
 //
-//  midistream.hh -- part of LilyPond
+//  midistream.hh -- part of GNU LilyPond
 //
 //  copyright 1997 Jan Nieuwenhuizen <jan@digicash.com>
 

diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh
index 721b2ff51cfee1a26cd69459f11d9f8dde7c3cec..ae4a9359395c680cff56e74a6209ce0a55677f0d 100644 (file)
--- a/lily/include/musical-request.hh
+++ b/lily/include/musical-request.hh
@@ -1,7 +1,7 @@
 /*
   musical-request.hh -- declare Musical requests
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/note-column-reg.hh b/lily/include/note-column-reg.hh
index d33dddf96209c49c0ba1803e514f5d074dc79011..7925621e65a3117aa41da5eef21c6599e3729506 100644 (file)
--- a/lily/include/note-column-reg.hh
+++ b/lily/include/note-column-reg.hh
@@ -1,7 +1,7 @@
 /*
   note-column-reg.hh -- declare Note_column_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/notename-table.hh b/lily/include/notename-table.hh
index 4e357a2593b6ab9e61ba43b8f0616bd6c92becf1..082dda366b42a0721d14ccfcef81aaa4bca3675c 100644 (file)
--- a/lily/include/notename-table.hh
+++ b/lily/include/notename-table.hh
@@ -1,7 +1,7 @@
 /*
   notename-table.hh -- declare 
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/notename.hh b/lily/include/notename.hh
index 7aa8397af82c2157e377875525e249f2b14e2ce8..e0125e1a0bcea1e5db97ca67a4414a09040ce943 100644 (file)
--- a/lily/include/notename.hh
+++ b/lily/include/notename.hh
@@ -1,5 +1,5 @@
 /*
-  notename.hh -- part of LilyPond
+  notename.hh -- part of GNU LilyPond
 
   (c) 1996,97 Han-Wen Nienhuys
 */

diff --git a/lily/include/offset.hh b/lily/include/offset.hh
index e0b62bba7616716e14cf7e21191773387cbb5021..bd5b2695323f497ff318baebd0e5c4befeac1bc4 100644 (file)
--- a/lily/include/offset.hh
+++ b/lily/include/offset.hh
@@ -1,5 +1,5 @@
 /*
-  offset.hh -- part of LilyPond
+  offset.hh -- part of GNU LilyPond
 
   (c) 1996,97 Han-Wen Nienhuys
 */

diff --git a/lily/include/qlp.hh b/lily/include/qlp.hh
index ccfba72bb83c76abf9901a5c20c447b894d89983..3c026581eb4dbc0bae19e9233b639810b1b99777 100644 (file)
--- a/lily/include/qlp.hh
+++ b/lily/include/qlp.hh
@@ -1,7 +1,7 @@
 /*
   qlp.hh -- declare Ineq_constrained_qp, Mixed_qp
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/qlpsolve.hh b/lily/include/qlpsolve.hh
index 3423951452a98c570f4aca54a13034be4187e302..c7a54b1eca33d76715c9435fdff8b327811edf89 100644 (file)
--- a/lily/include/qlpsolve.hh
+++ b/lily/include/qlpsolve.hh
@@ -1,7 +1,7 @@
 /*
   qlpsolve.hh -- declare  Active_constraints, Inactive_iter
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/register.hh b/lily/include/register.hh
index dee7c512c80bb3835dae91edf41f59efb16fc29f..641d0331125ac4fe56a5b2b0466f138fade583c4 100644 (file)
--- a/lily/include/register.hh
+++ b/lily/include/register.hh
@@ -1,7 +1,7 @@
 /*
   register.hh -- declare Request_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -13,7 +13,7 @@
 #include "lily-proto.hh"
 #include "varray.hh"
 #include "request.hh"
-#include "staff-elem-info.hh"
+#include "score-elem-info.hh"
 #include "staff-info.hh"
 
 /**

diff --git a/lily/include/request-column.hh b/lily/include/request-column.hh
index 19876c9e37ff4de27daff83ef726bd50c750b614..82377cf3dffa96dce020e5f77337ed56680a8e06 100644 (file)
--- a/lily/include/request-column.hh
+++ b/lily/include/request-column.hh
@@ -1,7 +1,7 @@
 /*
   request-column.hh -- declare Request_column
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/request.hh b/lily/include/request.hh
index c3e0deb846e8a5b6c1bf3030bc6dc078bd369535..f045b36204aa810c2d3524ee4a62dd00848ab7d9 100644 (file)
--- a/lily/include/request.hh
+++ b/lily/include/request.hh
@@ -1,19 +1,19 @@
 /*
   request.hh -- declare Request baseclasses.
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
 #ifndef REQUEST_HH
 #define REQUEST_HH
-// LilyPond's second egg of columbus!
+// GNU LilyPond's second egg of columbus!
 
 #include "glob.hh"
 #include "string.hh"
 #include "moment.hh"
-#include "class-name.hh"
+#include "virtual-methods.hh"
 #include "input.hh"
 
 /**
@@ -65,7 +65,7 @@ protected:
 #define REQUESTMETHODS(T,accessor)     \
 virtual T * accessor() { return this;}\
 NAME_MEMBERS(T);\
-virtual Request *clone() const { return  new T(*this); } \
+VIRTUAL_COPY_CONS(T, Request)\
 virtual void do_print() const
 
 #endif

diff --git a/lily/include/rest-collision-reg.hh b/lily/include/rest-collision-reg.hh
index a572ee6449ceeb181d8d566d44d2ca8e7dd0eaf8..39b0b2d10e5595c1c9f030241466ad0de58164f6 100644 (file)
--- a/lily/include/rest-collision-reg.hh
+++ b/lily/include/rest-collision-reg.hh
@@ -1,7 +1,7 @@
 /*
   rest-collision-reg.hh -- declare Rest_collision_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/score-elem-info.hh b/lily/include/score-elem-info.hh
new file mode 100644 (file)
index 0000000..b4d4fb7
--- /dev/null
+++ b/lily/include/score-elem-info.hh
@@ -0,0 +1,34 @@
+/*
+  score-elem-info.hh -- declare Score_elem_info
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+
+#ifndef STAFFELEMINFO_HH
+#define STAFFELEMINFO_HH
+
+#include "scalar.hh"
+#include "lily-proto.hh"
+#include "varray.hh"
+
+/// data container.
+struct Score_elem_info {
+    Score_elem * elem_l_;
+    Request*req_l_;
+    Voice const * voice_l_;
+    Array<Request_register*> origin_reg_l_arr_;
+
+    /* *** */
+    Score_elem_info(Score_elem*, Request*);
+    Score_elem_info();
+};
+
+
+struct Feature {
+    Scalar type_; 
+    Scalar value_;
+};
+#endif // STAFFELEMINFO_HH

diff --git a/lily/include/script-def.hh b/lily/include/script-def.hh
index 9af312bfa4361ae8bf772ac27f8e5b10547f6809..d45e459d84fe1b3bd619a927ec23bec4ebeaaac1 100644 (file)
--- a/lily/include/script-def.hh
+++ b/lily/include/script-def.hh
@@ -1,5 +1,5 @@
 /*
-  script-def.hh -- part of LilyPond
+  script-def.hh -- part of GNU LilyPond
 
   (c) 1996,97 Han-Wen Nienhuys
 */

diff --git a/lily/include/script-reg.hh b/lily/include/script-reg.hh
index f7fc05d9eb6e17797abc105c980369d47d43d062..d5a860f378e45139b281c545babfd8e7f3a9ebdf 100644 (file)
--- a/lily/include/script-reg.hh
+++ b/lily/include/script-reg.hh
@@ -1,5 +1,5 @@
 /*
-  script-reg.hh -- part of LilyPond
+  script-reg.hh -- part of GNU LilyPond
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/script.hh b/lily/include/script.hh
index 5ad74821cc37fb02d4b75dccec844c5f9c5b16ff..e55d252ff1a1b0e62c0f6363ad3262a76db76543 100644 (file)
--- a/lily/include/script.hh
+++ b/lily/include/script.hh
@@ -1,5 +1,5 @@
 /*
-  script.hh -- part of LilyPond
+  script.hh -- part of GNU LilyPond
 
   (c) 1996,97 Han-Wen Nienhuys
 */

diff --git a/lily/include/staff-info.hh b/lily/include/staff-info.hh
index 2fc4fd79265696b7a0351d4d0bb2594b0bdc787b..a3aa533d2b77ced6d4630d4e4880cee0a08ab382 100644 (file)
--- a/lily/include/staff-info.hh
+++ b/lily/include/staff-info.hh
@@ -1,7 +1,7 @@
 /*
   staff-info.hh -- declare Staff_info
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/staff-regs.hh b/lily/include/staff-regs.hh
index 69f1f5356e7c76d97ab754e509c9cf58b2e6bce0..34138fadf215aa0c79f7b77fc3f0f3155ebb7110 100644 (file)
--- a/lily/include/staff-regs.hh
+++ b/lily/include/staff-regs.hh
@@ -1,7 +1,7 @@
 /*
   staff-regs.hh -- declare Staff_registers
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/staff-sym-reg.hh b/lily/include/staff-sym-reg.hh
index 7ca370dd616e404c68945951330d23508e85f690..b4c6f6617382ac6ecc846b82b737c8eb7b7f40b7 100644 (file)
--- a/lily/include/staff-sym-reg.hh
+++ b/lily/include/staff-sym-reg.hh
@@ -1,7 +1,7 @@
 /*
   staff-sym-reg.hh -- declare 
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/stem-beam-reg.hh b/lily/include/stem-beam-reg.hh
index f63f1ad6de8f141cfc0352bf06e447d0345e969d..77729ed1ac4dd368fad0e7d9dcc57a3e3ff93bc0 100644 (file)
--- a/lily/include/stem-beam-reg.hh
+++ b/lily/include/stem-beam-reg.hh
@@ -1,5 +1,5 @@
 /*
-  stem-beam-reg.hh -- part of LilyPond
+  stem-beam-reg.hh -- part of GNU LilyPond
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/swallow-reg.hh b/lily/include/swallow-reg.hh
index 9785fa29accd662dbfc16b7f0fdd75f7e2a857b9..2f110866eff2c912d706dd11a25ae1ea666ae8ea 100644 (file)
--- a/lily/include/swallow-reg.hh
+++ b/lily/include/swallow-reg.hh
@@ -1,7 +1,7 @@
 /*
   swallow-reg.hh -- declare Swallow_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh
index 13d47e45faf54c21e686e84839d6dee621369f41..041db0f26e2bd751dbdf61e2119b77670f5955d2 100644 (file)
--- a/lily/include/text-item.hh
+++ b/lily/include/text-item.hh
@@ -1,5 +1,5 @@
 /*
-  text-item.hh -- part of LilyPond
+  text-item.hh -- part of GNU LilyPond
 
   (c) 1996,97 Han-Wen Nienhuys
 */

diff --git a/lily/include/text-reg.hh b/lily/include/text-reg.hh
index 4b251aef97ee665dcf63f7bd73d0e93c2fe0fc5b..3bab1d56393eb3fd575b3e2eaa14d9d81c46d939 100644 (file)
--- a/lily/include/text-reg.hh
+++ b/lily/include/text-reg.hh
@@ -1,5 +1,5 @@
 /*
-  text-reg.hh -- part of LilyPond
+  text-reg.hh -- part of GNU LilyPond
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/tie-reg.hh b/lily/include/tie-reg.hh
index b0cd22762587df15ba97197fd6da760f9cabdb2a..9ad241ada1fe28a614ac73ceb890cb3af073996f 100644 (file)
--- a/lily/include/tie-reg.hh
+++ b/lily/include/tie-reg.hh
@@ -1,7 +1,7 @@
 /*
   tie-reg.hh -- declare Tie_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/time-description.hh b/lily/include/time-description.hh
index c4edb172bf02764670c537ea253f665811141bd6..a7ace609f1452b3032813405fcbff6683d70e794 100644 (file)
--- a/lily/include/time-description.hh
+++ b/lily/include/time-description.hh
@@ -1,5 +1,5 @@
 /*
-  moment.hh -- part of LilyPond
+  moment.hh -- part of GNU LilyPond
 
   (c) 1996,97 Han-Wen Nienhuys
 */

diff --git a/lily/include/voice-group-regs.hh b/lily/include/voice-group-regs.hh
index 8a0837308d11c3cde7b4a5023c73e9916672ddfe..243965a1919996b30d57bf9cbb57b859543fd728 100644 (file)
--- a/lily/include/voice-group-regs.hh
+++ b/lily/include/voice-group-regs.hh
@@ -1,7 +1,7 @@
 /*
   voice-group-regs.hh -- declare Voice_group_registers
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/include/voice-regs.hh b/lily/include/voice-regs.hh
index 4586f40ab2d3b5741107044dc8c07eab0884b170..c6e75b7505273194ca09125a3b1caaf1cecc4867 100644 (file)
--- a/lily/include/voice-regs.hh
+++ b/lily/include/voice-regs.hh
@@ -1,7 +1,7 @@
 /*
   voice-regs.hh -- declare Voice_registers
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/input-register.cc b/lily/input-register.cc
index 711b89bd6d57c8800d14d92259eb374c084fac28..4d0d24902a602f2c5c7ac692bf5fbc3b3a7bd002 100644 (file)
--- a/lily/input-register.cc
+++ b/lily/input-register.cc
@@ -1,7 +1,7 @@
 /*
   input-register.cc -- implement Input_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/input-score.cc b/lily/input-score.cc
index 7c0c92abd9ef5605acd1092ee5b87176bd1f1b7f..5ba571aefcf9b2030ac006cc487310c68926a56f 100644 (file)
--- a/lily/input-score.cc
+++ b/lily/input-score.cc
@@ -1,7 +1,7 @@
 /*
   input-score.cc -- implement Input_score
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/key-reg.cc b/lily/key-reg.cc
index fe2371e349af5be657bfad9267004c3ab8eb5a3e..459ddf4d42766758b0a4442991ce237fc54847db 100644 (file)
--- a/lily/key-reg.cc
+++ b/lily/key-reg.cc
@@ -1,7 +1,7 @@
 /*
   key-reg.cc -- implement Key_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 

diff --git a/lily/key.cc b/lily/key.cc
index 608df47e23a267da5602480d904ed93dd714c51e..827b01c2c3afcc044903d4407a88dbdba673a9af 100644 (file)
--- a/lily/key.cc
+++ b/lily/key.cc
@@ -1,7 +1,7 @@
 /*
   key.cc -- implement Key, Octave_key
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 

diff --git a/lily/lexerinit.cc b/lily/lexerinit.cc
index c118bbe22973d0d89c7fc5f29239be1361cc9ec9..698bc8bf7b762b28c0adb2576905295d4a5883ed 100644 (file)
--- a/lily/lexerinit.cc
+++ b/lily/lexerinit.cc
@@ -1,7 +1,7 @@
 /*
   lexerinit.cc -- implement some stuff
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/lyric-register.cc b/lily/lyric-register.cc
index 32712708da01afa702c106b765ebaa87b84e8cf6..e6f4a29256aed5615ba6b98ed71b8eb0738a0d71 100644 (file)
--- a/lily/lyric-register.cc
+++ b/lily/lyric-register.cc
@@ -1,7 +1,7 @@
 /*
   lyric-register.cc -- implement Lyric_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/meter-reg.cc b/lily/meter-reg.cc
index 338ea7e10f471a6dfeb0ee447f20c7309ab74bde..4c34c187348e76641f72f06911055412e7fee2df 100644 (file)
--- a/lily/meter-reg.cc
+++ b/lily/meter-reg.cc
@@ -1,7 +1,7 @@
 /*
   meter-reg.cc -- implement Meter_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index 163105ab3c3906952420337cf2add5198a948056..2f703f01f8f3478bb9bc08f98de562544fd29f20 100644 (file)
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -1,7 +1,7 @@
 //
 // midi-def.cc -- implement midi output
 //
-// source file of the LilyPond music typesetter
+// source file of the GNU LilyPond music typesetter
 //
 // (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
 

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index af7ec3cc199729adff3581b0aa9dc3acaf25b0ae..5a391323df810fac69f26c0a8aa41cecf0a61e6c 100644 (file)
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -1,7 +1,7 @@
 //
 // midiitem.cc
 //
-// source file of the LilyPond music typesetter
+// source file of the GNU LilyPond music typesetter
 //
 // (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
 

diff --git a/lily/midi-output.cc b/lily/midi-output.cc
index 7703f65a6c5c2cf0d6a9d0d918a9f56394ac3be4..1f34358a9d459d1506ed4304eb7a706adf8930eb 100644 (file)
--- a/lily/midi-output.cc
+++ b/lily/midi-output.cc
@@ -1,7 +1,7 @@
 /*
   midioutput.cc -- implement Midi_output
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>, Jan Nieuwenhuizen <jan@digicash.com> 
 */

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index e6a2e35b3c83a3eec383e71a73a00dea5d8750e4..51069c4cc6edc480b9983f81d258475ee2d7ab00 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -1,7 +1,7 @@
 //
 // midistream.cc
 //
-// source file of the LilyPond music typesetter
+// source file of the GNU LilyPond music typesetter
 //
 // (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
 

diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc
index f00daa9b5eb6c0937939bb8f56a9b0c5d57276d2..f8b3de1738690b7e107c76924ba72c116ab62dbd 100644 (file)
--- a/lily/midi-walker.cc
+++ b/lily/midi-walker.cc
@@ -1,7 +1,7 @@
 /*
   midi-walker.cc -- implement Midi_walker
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>, Jan Nieuwenhuizen <jan@digicash.com>
   

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index 9f65d8a88f88d0159ee450bb86bad6e46e12c121..f442db5f9b8cbb833668a5068dac1345cefb405d 100644 (file)
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -1,7 +1,7 @@
 /*
   request.cc -- implement all musical requests.
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 8e14e791d25c70780cc38537b7caea5ee496965f..4a44823344aa6ed4804ae6aea0b37f6c2950d60a 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -1,7 +1,7 @@
 /*
   my-lily-lexer.cc -- implement My_lily_lexer
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index 5389803e63dff272b66fdfa09607361334fb9656..c742946294bb4078ad02b25b2d6a61fa1e1b976f 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -1,7 +1,7 @@
 /*
   my-lily-parser.cc -- implement My_lily_parser
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/notename-table.cc b/lily/notename-table.cc
index b8753929a9fa91e60b11e2319cef466105356749..46838b96f8b9a6d391d9579cc17a6cb3801b15a7 100644 (file)
--- a/lily/notename-table.cc
+++ b/lily/notename-table.cc
@@ -1,7 +1,7 @@
 /*
   notename-table.cc -- implement Notename_table
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 256f3b88050e6a52262b34e49f7145ca7ca05adb..eaabea2fbe71b8f3f274bcbfd0beb8e581e8abc3 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -1,7 +1,7 @@
 /*
   paper-def.cc -- implement Paper_def
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -65,15 +65,15 @@ Paper_def::set(Lookup*l)
 }
 
 Real
-Paper_def::interline() const
+Paper_def::interline_f() const
 {
     return lookup_p_->ball(4).dim.y.length();
 }
 
 Real
-Paper_def::internote() const
+Paper_def::internote_f() const
 {
-    return lookup_p_->internote();
+    return lookup_p_->internote_f();
 }
 Real
 Paper_def::note_width()const

diff --git a/lily/pulk-voice.cc b/lily/pulk-voice.cc
index 58cdd538964131f50a8c96750649b24cd07067dc..e54c429f422c8568d33c342b44b3d918e93e447d 100644 (file)
--- a/lily/pulk-voice.cc
+++ b/lily/pulk-voice.cc
@@ -1,7 +1,7 @@
 /*
   pulk-voices.cc -- implement Pulk_voice
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/pulk-voices.cc b/lily/pulk-voices.cc
index b4127af90cbb3001d9160e683a709af35a891d46..6a480fab6a339e848ab62c987b46792ea6fcc07c 100644 (file)
--- a/lily/pulk-voices.cc
+++ b/lily/pulk-voices.cc
@@ -1,7 +1,7 @@
 /*
   pulk-voices.cc -- implement Pulk_voices
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/qlpsolve.cc b/lily/qlpsolve.cc
index dc8fbcab7e6ef27168fc9df534858764a60d2de8..5c4d91b6e67f61ceb7839e90555ae65ddd4f86a1 100644 (file)
--- a/lily/qlpsolve.cc
+++ b/lily/qlpsolve.cc
@@ -1,7 +1,7 @@
 /*
   qlpsolve.cc -- implement Active_constraints, Inactive_iter
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 

diff --git a/lily/register-group.cc b/lily/register-group.cc
index e80afd48e11d155a9fe9365fb96d83436b5ffa1f..f16aeb9e61c3d71551a334e0ed74e3341b98a005 100644 (file)
--- a/lily/register-group.cc
+++ b/lily/register-group.cc
@@ -1,7 +1,7 @@
 /*
   registergroup.cc -- implement Register_group_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/request-column.cc b/lily/request-column.cc
index 2913dae13b8166cbde2f2c9f7f87fb32053d2625..24ec7dececb6d7a3986369101bd7a7bac9c55a4d 100644 (file)
--- a/lily/request-column.cc
+++ b/lily/request-column.cc
@@ -1,7 +1,7 @@
 /*
   request-column.cc -- implement Request_column
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/rest-collision-reg.cc b/lily/rest-collision-reg.cc
index a9ca851cd44cfc3ec77a9f0730e778b3313bc549..8fba3f418b99cf5dd85a6c4c452dab69ec4355ea 100644 (file)
--- a/lily/rest-collision-reg.cc
+++ b/lily/rest-collision-reg.cc
@@ -1,7 +1,7 @@
 /*
   rest-collision-reg.cc -- implement Rest_collision_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/score-column.cc b/lily/score-column.cc
index 3a699e5dc507b7307a663f8182b3db58be5041ef..d01d78e5c15585602629cdda0c5b6e316899b5d0 100644 (file)
--- a/lily/score-column.cc
+++ b/lily/score-column.cc
@@ -1,7 +1,7 @@
 /*
   score-column.cc -- implement Score_column
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/score-elem-info.cc b/lily/score-elem-info.cc
new file mode 100644 (file)
index 0000000..9f15b84
--- /dev/null
+++ b/lily/score-elem-info.cc
@@ -0,0 +1,28 @@
+/*
+  score-elem-info.cc -- implement Score_elem_info
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+#include "score-elem-info.hh"
+#include "request.hh"
+
+Score_elem_info::Score_elem_info(Score_elem*s_l, Request*r_l)
+{
+    elem_l_ = s_l;
+    voice_l_ =  (r_l)?r_l->voice_l():0;
+    req_l_ = r_l;
+}
+
+Score_elem_info::Score_elem_info()
+{
+    elem_l_ = 0;
+    voice_l_ = 0;
+
+    req_l_ = 0;
+}
+
+
+

diff --git a/lily/score-walker.cc b/lily/score-walker.cc
index 34fc0161e5382a4ba389473344dbd6f1cc2815ba..78041613f02908c924ae3804598bab46cb8389c9 100644 (file)
--- a/lily/score-walker.cc
+++ b/lily/score-walker.cc
@@ -1,7 +1,7 @@
 /*
   score-walker.cc -- implement Score_walker
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/script.cc b/lily/script.cc
index b350c8e7c91a0ac39946c8901ebc5c9f4de5c471..9ade2eddef3aec40666fda512842fe41928822f7 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,7 +1,7 @@
 /*
   script.cc -- implement Script
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -24,7 +24,6 @@ Script::set_stem(Stem*st_l)
 
 
 Script::Script(Script_req* rq)
-    :Staff_side(this)
 {    
     specs_l_ = rq->scriptdef_p_;
     inside_staff_b_ = specs_l_->inside_staff_b_;
@@ -88,7 +87,7 @@ Script::do_post_processing()
 Molecule*
 Script::brew_molecule_p() const
 {
-    Real dy = paper()->internote();
+    Real dy = paper()->internote_f();
     
     Molecule*out = new Molecule(Atom(symbol()));
     out->translate(Offset(0,dy * pos_i_));

diff --git a/lily/staff-info.cc b/lily/staff-info.cc
index e86900bb07ca566ddd7569e0e78fdf16133b925e..5e4ce77c05ecc4af4020d31c0716bcea2b3a3005 100644 (file)
--- a/lily/staff-info.cc
+++ b/lily/staff-info.cc
@@ -1,7 +1,7 @@
 /*
   staff-info.cc -- implement Staff_info
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 #include "proto.hh"

diff --git a/lily/staff-regs.cc b/lily/staff-regs.cc
index 7a0abadd9622061b3bda04d532febb162ebd1e85..19129a02cab7f252cf6aed61fd890baf435dd7e6 100644 (file)
--- a/lily/staff-regs.cc
+++ b/lily/staff-regs.cc
@@ -1,7 +1,7 @@
 /*
   staff-regs.cc -- implement Staff_registers
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/staff-sym-reg.cc b/lily/staff-sym-reg.cc
index e8863369acf351934c68b8a381e29365d74bc45d..f0683f0d44ae6959c3526b45ec4ae269b3b642bc 100644 (file)
--- a/lily/staff-sym-reg.cc
+++ b/lily/staff-sym-reg.cc
@@ -1,7 +1,7 @@
 /*
   staff-sym-reg.cc -- implement Staff_sym_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/staff-sym.cc b/lily/staff-sym.cc
index 9eb4d6d2ac5d9306875f25d96fda9cd49e41790a..ea17b178f62c49da223f8ea9171747f99bde65a5 100644 (file)
--- a/lily/staff-sym.cc
+++ b/lily/staff-sym.cc
@@ -1,7 +1,7 @@
 /*
   staffsym.cc -- implement Staff_symbol
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -32,13 +32,6 @@ Staff_symbol::brew_molecule_p() const
     return new Molecule(a);
 }
 
-Spanner*
-Staff_symbol::do_break_at(PCol*p1, PCol*p2)const
-{
-    Staff_symbol *span_p=new Staff_symbol(*this);
-    return span_p;
-}
-
 void
 Staff_symbol::set_extent(PCol*p1, PCol*p2)
 {
@@ -50,7 +43,7 @@ Staff_symbol::set_extent(PCol*p1, PCol*p2)
 Real
 Staff_symbol::inter_note_f()const
 {
-    return paper()->internote();
+    return paper()->internote_f();
 }
 
 int

diff --git a/lily/staff-walker.cc b/lily/staff-walker.cc
index ca6cbf500f03d03805849707e1d31905fcfc967e..b83c527168a9ed0b511204fb5d71e4274ca18b2f 100644 (file)
--- a/lily/staff-walker.cc
+++ b/lily/staff-walker.cc
@@ -1,7 +1,7 @@
 /*
   staff-walker.cc -- implement Staff_walker
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/swallow-reg.cc b/lily/swallow-reg.cc
index 24a20ef7d0cade288da6cb41c7d4a82fbd241474..a84d9054d73398a34ea5cac8294c463ed37767d7 100644 (file)
--- a/lily/swallow-reg.cc
+++ b/lily/swallow-reg.cc
@@ -1,7 +1,7 @@
 /*
   swallow-reg.cc -- implement Swallow_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/template2.cc b/lily/template2.cc
index f29c5b9f56bb9c32eae7137b3da33c974c5e038e..d9d3f99cdafa6ef085d4c301409e37a0029c5cbc 100644 (file)
--- a/lily/template2.cc
+++ b/lily/template2.cc
@@ -1,7 +1,7 @@
 /*
   template2.cc -- instantiate some list templates. 
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/template4.cc b/lily/template4.cc
index 8be96a30f44962498a6b61d17d0fab90ec82e5c9..484729579becf4cc01a027a9c388b855893b6fb8 100644 (file)
--- a/lily/template4.cc
+++ b/lily/template4.cc
@@ -1,7 +1,7 @@
 /*
   template4.cc -- instantiate Link_list baseclass.
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/template7.cc b/lily/template7.cc
index 793280a02429941e707418e75c2cefd3bdae5fd1..ef2969b78483979d2420866586af562e84429235 100644 (file)
--- a/lily/template7.cc
+++ b/lily/template7.cc
@@ -1,7 +1,7 @@
 #/*
   template7.cc -- instantiate Request_column
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 6d3b67d003e0623bb331d72cd8f8923b75146f3c..cc6f7f9b1313a28a447444df9db12179488cd0e4 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -1,7 +1,7 @@
 /*
   text-item.cc -- implement Text_item
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -15,7 +15,6 @@
 #include "lookup.hh"
 
 Text_item::Text_item(Text_def *tdef_l, int d)
-    : Staff_side(this)
 {
     dir_i_ = d;
     fat_b_ = false;
@@ -67,7 +66,7 @@ Text_item::brew_molecule_p() const
 
     if(dir_i_<0 )              // should do something better anyway.
        mol_p->translate(Offset(0, -mol_p->extent().y.left ));
-    mol_p->translate(Offset(0, pos_i_ * paper()->internote()));
+    mol_p->translate(Offset(0, pos_i_ * paper()->internote_f()));
     
     return mol_p;
 }

diff --git a/lily/time-description.cc b/lily/time-description.cc
index c56a0375d06fcf17ad202aac530f27bd4fe2406a..cd10942a382c0c5c06a23f24624090afbfbaa946 100644 (file)
--- a/lily/time-description.cc
+++ b/lily/time-description.cc
@@ -1,7 +1,7 @@
 /*
   time-description.cc -- implement Time_description
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/voice-element.cc b/lily/voice-element.cc
index f4067bc44b1d3264f6bc3648e4ef7442bbbc45c1..cb806831a464855b514a17a35f5d103e413547f9 100644 (file)
--- a/lily/voice-element.cc
+++ b/lily/voice-element.cc
@@ -1,7 +1,7 @@
 /*
   voice-elt.cc -- implement Voice_element
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/voice-group-regs.cc b/lily/voice-group-regs.cc
index 8bc24916814ac0d1a359cb82f8561a9675e7f3f5..72f3c9426c60122d5d2e028321d6393f6e107165 100644 (file)
--- a/lily/voice-group-regs.cc
+++ b/lily/voice-group-regs.cc
@@ -1,7 +1,7 @@
 /*
   voicegroup.cc -- implement Voice_group_registers
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/voice-regs.cc b/lily/voice-regs.cc
index 77fd724552f491807755ba6da44941c995be24f2..43daf7081503f2690998baa5ce62318c935f9f71 100644 (file)
--- a/lily/voice-regs.cc
+++ b/lily/voice-regs.cc
@@ -1,7 +1,7 @@
 /*
   voice-regs.cc -- implement Voice_registers
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/voice.cc b/lily/voice.cc
index 9b10dfcd2533b2c5dbfe723df4e666e75b5bb387..536715d0cb216adcd0c7fd09362ab5a4a31bbfaa 100644 (file)
--- a/lily/voice.cc
+++ b/lily/voice.cc
@@ -1,7 +1,7 @@
 /*
   voice.cc -- implement Voice
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/lily/warn.cc b/lily/warn.cc
index 3e6b98f9f12d917d2dec6a1de41fe52be160a743..c35e6e60158720cf1284f02447023a99f8c0ba69 100644 (file)
--- a/lily/warn.cc
+++ b/lily/warn.cc
@@ -1,7 +1,7 @@
 /*
   warn.cc -- implement warning and error messages. Needs cleanup.
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */