From: fred Date: Sun, 24 Mar 2002 19:43:51 +0000 (+0000) Subject: lilypond-0.0.65 X-Git-Tag: release/1.5.59~4699 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=afb0548e27cf1042a548b2d39320ea981f49706f;p=lilypond.git lilypond-0.0.65 --- diff --git a/lily/bar-reg.cc b/lily/bar-reg.cc index 4dd6199ce1..c66a33bdb4 100644 --- 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 */ @@ -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 96071ad385..8a6891b330 100644 --- 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 */ diff --git a/lily/calcideal.cc b/lily/calcideal.cc index af654d15bd..11c1aa2d2c 100644 --- 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 */ diff --git a/lily/clef-item.cc b/lily/clef-item.cc index 48e63b7f3b..055b282b2e 100644 --- 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 */ @@ -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 6b9da77062..73582d5d90 100644 --- 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 */ diff --git a/lily/command-request.cc b/lily/command-request.cc index e4334f1d69..83cb258ffb 100644 --- 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 */ diff --git a/lily/dynamic-reg.cc b/lily/dynamic-reg.cc index 20ffe5cfe3..94b887432a 100644 --- 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 */ diff --git a/lily/global-regs.cc b/lily/global-regs.cc index 3451ca5270..f05f98c6aa 100644 --- 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 */ diff --git a/lily/grouping.cc b/lily/grouping.cc index b44a9d90e4..9d466b912f 100644 --- 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 */ diff --git a/lily/identifier.cc b/lily/identifier.cc index 72224f92f9..9829e40a42 100644 --- 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 */ diff --git a/lily/include/bar-reg.hh b/lily/include/bar-reg.hh index c73e5d1f4f..5879cb948b 100644 --- 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 */ diff --git a/lily/include/bar.hh b/lily/include/bar.hh index 733cd26237..ea23bd07bc 100644 --- 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 903bbdb635..76330c079c 100644 --- 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 */ @@ -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 a9f3426a12..28cbd4643c 100644 --- 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 0dd8a66fca..b0b3b6dc8a 100644 --- 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 */ diff --git a/lily/include/command-request.hh b/lily/include/command-request.hh index 9cf88dcafc..d1b99f9a6c 100644 --- 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 */ diff --git a/lily/include/dynamic-reg.hh b/lily/include/dynamic-reg.hh index cf23d007c3..17f769053c 100644 --- 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 */ diff --git a/lily/include/grouping.hh b/lily/include/grouping.hh index e4395b1f7a..428978249e 100644 --- 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 f61a2f2765..3c030d122c 100644 --- 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 */ @@ -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 e56af8e682..1e2207beab 100644 --- 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 c674ca55a2..b6e21224d9 100644 --- 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 */ diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh index 88ab9ffbe0..a38935b398 100644 --- 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 35b1e1d34b..2e5c970fe5 100644 --- 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 bd8685383a..97e4caf70c 100644 --- 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 */ diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh index 42a2e03819..0a0921efce 100644 --- 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 */ + #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 6ebe18c282..300c72da9f 100644 --- 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 */ diff --git a/lily/include/midi-output.hh b/lily/include/midi-output.hh index 86ffab2a05..575842ebbd 100644 --- 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 */ diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh index 2444384838..c18cb9c4e9 100644 --- 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 diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh index 721b2ff51c..ae4a935939 100644 --- 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 */ diff --git a/lily/include/note-column-reg.hh b/lily/include/note-column-reg.hh index d33dddf962..7925621e65 100644 --- 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 */ diff --git a/lily/include/notename-table.hh b/lily/include/notename-table.hh index 4e357a2593..082dda366b 100644 --- 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 */ diff --git a/lily/include/notename.hh b/lily/include/notename.hh index 7aa8397af8..e0125e1a0b 100644 --- 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 e0b62bba76..bd5b269532 100644 --- 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 ccfba72bb8..3c026581eb 100644 --- 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 */ diff --git a/lily/include/qlpsolve.hh b/lily/include/qlpsolve.hh index 3423951452..c7a54b1eca 100644 --- 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 */ diff --git a/lily/include/register.hh b/lily/include/register.hh index dee7c512c8..641d033112 100644 --- 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 */ @@ -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 19876c9e37..82377cf3df 100644 --- 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 */ diff --git a/lily/include/request.hh b/lily/include/request.hh index c3e0deb846..f045b36204 100644 --- 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 */ #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 a572ee6449..39b0b2d10e 100644 --- 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 */ diff --git a/lily/include/score-elem-info.hh b/lily/include/score-elem-info.hh new file mode 100644 index 0000000000..b4d4fb748a --- /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 +*/ + + +#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 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 9af312bfa4..d45e459d84 100644 --- 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 f7fc05d9eb..d5a860f378 100644 --- 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 */ diff --git a/lily/include/script.hh b/lily/include/script.hh index 5ad74821cc..e55d252ff1 100644 --- 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 2fc4fd7926..a3aa533d2b 100644 --- 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 */ diff --git a/lily/include/staff-regs.hh b/lily/include/staff-regs.hh index 69f1f5356e..34138fadf2 100644 --- 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 */ diff --git a/lily/include/staff-sym-reg.hh b/lily/include/staff-sym-reg.hh index 7ca370dd61..b4c6f66173 100644 --- 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 */ diff --git a/lily/include/stem-beam-reg.hh b/lily/include/stem-beam-reg.hh index f63f1ad6de..77729ed1ac 100644 --- 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 */ diff --git a/lily/include/swallow-reg.hh b/lily/include/swallow-reg.hh index 9785fa29ac..2f110866ef 100644 --- 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 */ diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh index 13d47e45fa..041db0f26e 100644 --- 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 4b251aef97..3bab1d5639 100644 --- 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 */ diff --git a/lily/include/tie-reg.hh b/lily/include/tie-reg.hh index b0cd227625..9ad241ada1 100644 --- 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 */ diff --git a/lily/include/time-description.hh b/lily/include/time-description.hh index c4edb172bf..a7ace609f1 100644 --- 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 8a0837308d..243965a191 100644 --- 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 */ diff --git a/lily/include/voice-regs.hh b/lily/include/voice-regs.hh index 4586f40ab2..c6e75b7505 100644 --- 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 */ diff --git a/lily/input-register.cc b/lily/input-register.cc index 711b89bd6d..4d0d24902a 100644 --- 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 */ diff --git a/lily/input-score.cc b/lily/input-score.cc index 7c0c92abd9..5ba571aefc 100644 --- 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 */ diff --git a/lily/key-reg.cc b/lily/key-reg.cc index fe2371e349..459ddf4d42 100644 --- 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 diff --git a/lily/key.cc b/lily/key.cc index 608df47e23..827b01c2c3 100644 --- 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 diff --git a/lily/lexerinit.cc b/lily/lexerinit.cc index c118bbe229..698bc8bf7b 100644 --- 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 */ diff --git a/lily/lyric-register.cc b/lily/lyric-register.cc index 32712708da..e6f4a29256 100644 --- 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 */ diff --git a/lily/meter-reg.cc b/lily/meter-reg.cc index 338ea7e10f..4c34c18734 100644 --- 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 */ diff --git a/lily/midi-def.cc b/lily/midi-def.cc index 163105ab3c..2f703f01f8 100644 --- 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 diff --git a/lily/midi-item.cc b/lily/midi-item.cc index af7ec3cc19..5a391323df 100644 --- 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 diff --git a/lily/midi-output.cc b/lily/midi-output.cc index 7703f65a6c..1f34358a9d 100644 --- 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 , Jan Nieuwenhuizen */ diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc index e6a2e35b3c..51069c4cc6 100644 --- 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 diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc index f00daa9b5e..f8b3de1738 100644 --- 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 , Jan Nieuwenhuizen diff --git a/lily/musical-request.cc b/lily/musical-request.cc index 9f65d8a88f..f442db5f9b 100644 --- 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 */ diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 8e14e791d2..4a44823344 100644 --- 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 */ diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index 5389803e63..c742946294 100644 --- 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 */ diff --git a/lily/notename-table.cc b/lily/notename-table.cc index b8753929a9..46838b96f8 100644 --- 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 */ diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 256f3b8805..eaabea2fbe 100644 --- 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 */ @@ -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 58cdd53896..e54c429f42 100644 --- 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 */ diff --git a/lily/pulk-voices.cc b/lily/pulk-voices.cc index b4127af90c..6a480fab6a 100644 --- 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 */ diff --git a/lily/qlpsolve.cc b/lily/qlpsolve.cc index dc8fbcab7e..5c4d91b6e6 100644 --- 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 diff --git a/lily/register-group.cc b/lily/register-group.cc index e80afd48e1..f16aeb9e61 100644 --- 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 */ diff --git a/lily/request-column.cc b/lily/request-column.cc index 2913dae13b..24ec7decec 100644 --- 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 */ diff --git a/lily/rest-collision-reg.cc b/lily/rest-collision-reg.cc index a9ca851cd4..8fba3f418b 100644 --- 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 */ diff --git a/lily/score-column.cc b/lily/score-column.cc index 3a699e5dc5..d01d78e5c1 100644 --- 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 */ diff --git a/lily/score-elem-info.cc b/lily/score-elem-info.cc new file mode 100644 index 0000000000..9f15b846df --- /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 +*/ + +#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 34fc0161e5..78041613f0 100644 --- 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 */ diff --git a/lily/script.cc b/lily/script.cc index b350c8e7c9..9ade2eddef 100644 --- 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 */ @@ -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 e86900bb07..5e4ce77c05 100644 --- 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 */ #include "proto.hh" diff --git a/lily/staff-regs.cc b/lily/staff-regs.cc index 7a0abadd96..19129a02ca 100644 --- 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 */ diff --git a/lily/staff-sym-reg.cc b/lily/staff-sym-reg.cc index e8863369ac..f0683f0d44 100644 --- 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 */ diff --git a/lily/staff-sym.cc b/lily/staff-sym.cc index 9eb4d6d2ac..ea17b178f6 100644 --- 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 */ @@ -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 ca6cbf500f..b83c527168 100644 --- 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 */ diff --git a/lily/swallow-reg.cc b/lily/swallow-reg.cc index 24a20ef7d0..a84d9054d7 100644 --- 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 */ diff --git a/lily/template2.cc b/lily/template2.cc index f29c5b9f56..d9d3f99cda 100644 --- 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 */ diff --git a/lily/template4.cc b/lily/template4.cc index 8be96a30f4..484729579b 100644 --- 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 */ diff --git a/lily/template7.cc b/lily/template7.cc index 793280a024..ef2969b784 100644 --- 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 */ diff --git a/lily/text-item.cc b/lily/text-item.cc index 6d3b67d003..cc6f7f9b13 100644 --- 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 */ @@ -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 c56a0375d0..cd10942a38 100644 --- 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 */ diff --git a/lily/voice-element.cc b/lily/voice-element.cc index f4067bc44b..cb806831a4 100644 --- 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 */ diff --git a/lily/voice-group-regs.cc b/lily/voice-group-regs.cc index 8bc2491681..72f3c9426c 100644 --- 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 */ diff --git a/lily/voice-regs.cc b/lily/voice-regs.cc index 77fd724552..43daf70815 100644 --- 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 */ diff --git a/lily/voice.cc b/lily/voice.cc index 9b10dfcd25..536715d0cb 100644 --- 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 */ diff --git a/lily/warn.cc b/lily/warn.cc index 3e6b98f9f1..c35e6e6015 100644 --- 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 */