From: fred Date: Sun, 24 Mar 2002 19:52:10 +0000 (+0000) Subject: lilypond-0.0.72pre X-Git-Tag: release/1.5.59~4210 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d549f1f8a4a8cb741e38d675fb87c2d41f7b31eb;p=lilypond.git lilypond-0.0.72pre --- diff --git a/init/register.ini b/init/register.ini deleted file mode 100644 index 16b868b206..0000000000 --- a/init/register.ini +++ /dev/null @@ -1,59 +0,0 @@ -% -% setup for Request->Element conversion. Guru-only -% - -\requestregister { - "Score_register" - \alias "Score"; -% \consists "Score_bar_register"; - \consists "Bar_align_register"; - \consists "Clef_align_register"; - \consists "Key_align_register"; - \consists "Meter_align_register"; - \consists "Score_horizontal_align_register"; - - \contains\requestregister { - "Staff_registers" - \alias "Staff"; - \consists "Bar_register"; - \consists "Clef_register"; - \consists "Key_register"; - \consists "Meter_register"; - \consists "Local_key_register"; - \consists "Staff_sym_register"; - \consists "Collision_register"; - \consists "Rest_collision_register"; - \contains \requestregister { - "Voice_group_registers" - \alias "Voice_group"; - \consists "Dynamic_register"; - \consists "Stem_beam_register"; - \consists "Script_register"; - \consists "Note_column_register"; - \consists "Slur_register"; - \contains \requestregister { - "Voice_registers" - \alias "Voice"; - \consists "Note_head_register" ; - \consists "Tie_register"; - } - } - } - - \contains\requestregister { - "Staff_registers" - \alias "Lyric"; - \contains\requestregister{ - "Voice_group_registers" - \alias "Voice_group"; - \contains\requestregister{ - "Voice_registers" - \consists "Lyric_register"; - \consists "Swallow_register"; - } - } - } -} - - - diff --git a/init/table_sixteen.ini b/init/table_sixteen.ini deleted file mode 100644 index f012438622..0000000000 --- a/init/table_sixteen.ini +++ /dev/null @@ -1,163 +0,0 @@ -% -% spacing info for LilyPond. Do not edit this if you're not a guru. -% It has a lot of hard-wired stringconstants -% - - -table_sixteen= -\symboltables { - - \texid "\input lilyponddefs \musixsixteendefs" - - % index TeXstring, xmin xmax ymin ymax - - "scripts" = \table { - "fermata" "\fermata" 0.0\pt 0.0\pt 0.0\pt 6.0\pt - "-fermata" "\ifermata" 0.0\pt 0.0\pt -6.0\pt 0.0\pt - "portato" "\portato" 0.0\pt 4.0\pt 0.0\pt 2.0\pt - "-portato" "\iportato" 0.0\pt 4.0\pt -2.0\pt 0.0\pt - "tenuto" "\tenuto" 0.0\pt 4.0\pt -1.0\pt 1.0\pt - "-tenuto" "\itenuto" 0.0\pt 4.0\pt -1.0\pt 1.0\pt - "sforzato" "\sforzato" -0.8\pt 4.0\pt -1.92\pt 1.92\pt - "marcato" "\marcato" 0.0\pt 4.0\pt 0.0\pt 4.0\pt - "-marcato" "\imarcato" 0.0\pt 4.0\pt -4.0\pt 0.0\pt - "staccato" "\staccato" 0.0\pt 0.0\pt -1.1\pt 1.1\pt - "staccatissimo" "\staccatissimo" 0.0\pt 0.0\pt 0.0\pt 1.0\pt - "-staccatissimo" "\istaccatissimo" 0.0\pt 0.0\pt 0.0\pt 1.0\pt - "upbow" "\upbow" -1.0\pt 6.0\pt 0.0\pt 5.0\pt - "downbow" "\downbow" 0.0\pt 5.0\pt 0.0\pt 7.5\pt - "back" "\backorfront" 0.0\pt 6.0\pt 0.0\pt 3.0\pt - "-front" "\backorfront" 0.0\pt 6.0\pt 0.0\pt 3.0\pt - "heel" "\heel" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "toe" "\toe" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "bheel" "\bheel" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "btoe" "\btoe" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "fheel" "\fheel" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "ftoe" "\ftoe" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "-back" "\backorfront" 0.0\pt 6.0\pt 0.0\pt 3.0\pt - "front" "\backorfront" 0.0\pt 6.0\pt 0.0\pt 3.0\pt - } - - "style" = \table { - "roman" "\settext{%}" 0.0\pt 5.0\pt 0.0\pt 8.0\pt - "italic" "\setitalic{%}" 0.0\pt 0.0\pt 0.0\pt 8.0\pt - "dynamic" "\setdynamic{%}" 0.0\pt 0.0\pt 0.0\pt 8.0\pt - } - "dynamics" = \table { - - "mf" "\dynmf" - "fff" "\dynfff" - "ff" "\dynff" - "f" "\dynf" - "mp" "\dynmp" - "p" "\dynp" - "pp" "\dynpp" - "ppp" "\dynppp" - - } - "align" = \table { - "-1" "\leftalign{%}" - "0" "\centeralign{%}" - "1" "\rightalign{%}" - } - - "clefs" = \table { - "violin" "\violinclef" 0.0\pt 12.8\pt -10.0\pt 18.0\pt - "bass" "\bassclef" 0.0\pt 12.8\pt 0.0\pt 16.0\pt - "alto" "\altoclef" 0.0\pt 12.8\pt 0.0\pt 16.0\pt - "tenor" "\altoclef" 0.0\pt 12.8\pt 0.0\pt 16.0\pt - "violin_change" "\cviolinclef" 0.0\pt 11.2\pt -12.0\pt 12.0\pt - "bass_change" "\cbassclef" 0.0\pt 11.2\pt 0.0\pt 16.0\pt - "alto_change" "\caltoclef" 0.0\pt 11.2\pt 0.0\pt 16.0\pt - "tenor_change" "\caltoclef" 0.0\pt 11.2\pt 0.0\pt 16.0\pt - } - - "balls" = \table { - "1" "\wholeball" 0.0\pt 6.0\pt -2.0\pt 2.0\pt - "2" "\halfball" 0.0\pt 5.0\pt -2.0\pt 2.0\pt - "4" "\quartball" 0.0\pt 5.0\pt -2.0\pt 2.0\pt - } - - "slur" = \table { - "whole" "\slurchar%{%}" - "half" "\hslurchar%{%}" - } - "accidentals" = \table { - "-2" "\flatflat" 0.0\pt 8.16\pt -2.5\pt 7.5\pt - "-1" "\flat" 0.0\pt 4.8\pt -2.5\pt 7.5\pt - "0" "\natural" 0.0\pt 4.8\pt -7.5\pt 7.5\pt - "1" "\sharp" 0.0\pt 3.6\pt -7.5\pt 7.5\pt - "2" "\sharpsharp" 0.0\pt 4.8\pt -2.5\pt 7.5\pt - } - - "streepjes" = \table { - "toplines" "\toplines{%}" -1.0\pt 7.0\pt 0.0\pt 0.0\pt - "botlines" "\botlines{%}" -1.0\pt 7.0\pt 0.0\pt 0.0\pt - } - - "bars" = \table { - "empty" "\emptybar" - "|" "\maatstreep" 0.0\pt 0.64\pt -8.0\pt 8.0\pt - "||" "\doublebar" 0.0\pt 4.0\pt -8.0\pt 8.0\pt - "|." "\finishbar" -4.0\pt 0.0\pt -8.0\pt 8.0\pt - ":|" "\repeatbar" -4.0\pt 0.0\pt -8.0\pt 8.0\pt - "|:" "\startrepeat" 0.0\pt 4.0\pt -8.0\pt 8.0\pt - ":|:" "\repeatbarstartrepeat" 0.0\pt 16.0\pt -8.0\pt 8.0\pt - - } - - "rests" = \table { - "1o" "\outsidewholerest" 0.0\pt 6.0\pt 0.0\pt 2.0\pt - "1" "\wholerest" 0.0\pt 6.0\pt 0.0\pt 2.0\pt - "2" "\halfrest" 0.0\pt 6.0\pt -2.0\pt 0.0\pt - "2o" "\outsidehalfrest" 0.0\pt 6.0\pt -2.0\pt 0.0\pt - "4" "\quartrest" -5.0\pt 2.0\pt -5.0\pt 5.0\pt - "8" "\eighthrest" 0.0\pt 5.0\pt 0.0\pt 8.0\pt - "16" "\sixteenthrest" 0.0\pt 6.0\pt 0.0\pt 12.0\pt - "32" "\thirtysecondrest" 0.0\pt 6.0\pt 0.0\pt 16.0\pt - "64" "\sixtyfourthrest" 0.0\pt 6.0\pt 0.0\pt 16.0\pt - "128" "\hundredtwentyeighthrest" 0.0\pt 6.0\pt 0.0\pt 16.0\pt - } - - "meters" = \table { - "C" "\fourfourmeter" 0.0\pt 10.0\pt -5.0\pt 5.0\pt - "C2" "\allabreve" 0.0\pt 10.0\pt -5.0\pt 5.0\pt - } - - % dims ignored for this table - "param" = \table { - "meter" "\generalmeter{%}{%}" 0.0\pt 10.0\pt -5.0\pt 5.0\pt - "linestaf" "\linestafsym{%}{%}" - "stem" "\stem{%}{%}" - "fill" "\hbox{}" - % ugh. 8pt - "crescendosym" "\crescendosym{%}" 0.0\pt 0.0\pt -3.0\pt 3.0\pt - "decrescendosym" "\decrescendosym{%}" 0.0\pt 0.0\pt -3.0\pt 3.0\pt - } - - "dots" = \table { - "1" "\lsingledot" 0.0\pt 2.0\pt -1.0\pt 1.0\pt - "2" "\ldoubledot" 0.0\pt 5.0\pt -1.0\pt 1.0\pt - "3" "\ltripledot" 0.0\pt 8.0\pt -1.0\pt 1.0\pt - } - - "flags" = \table { - "8" "\eighthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - "16" "\sixteenthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - "32" "\thirtysecondflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - "64" "\sixtyfourthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - "128" "\hundredtwentyeighthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - "-8" "\deighthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - "-16" "\dsixteenthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - "-32" "\dthirtysecondflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - "-64" "\dsixtyfourthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - "-128" "\dhundredtwentyeighthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - } - - "beamslopes" = \table { - "slope" "\beamslope{%}{%}" - "horizontal" "\rulesym{%}{%}" - } - -} -default_table = \symboltables { table_sixteen } diff --git a/lily/acceptor.cc b/lily/acceptor.cc deleted file mode 100644 index 0164b83b24..0000000000 --- a/lily/acceptor.cc +++ /dev/null @@ -1,16 +0,0 @@ -/* - acceptor.cc -- implement Acceptor - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - -#include "acceptor.hh" -Acceptor::Acceptor() -{ - iterator_count_ = 0; -} - -IMPLEMENT_STATIC_NAME(Acceptor); -IMPLEMENT_IS_TYPE_B(Acceptor); diff --git a/lily/bar-reg.cc b/lily/bar-reg.cc deleted file mode 100644 index 46f7bf3b82..0000000000 --- a/lily/bar-reg.cc +++ /dev/null @@ -1,70 +0,0 @@ -/* - bar-reg.cc -- implement Bar_register - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - -#include "bar-reg.hh" -#include "bar.hh" -#include "command-request.hh" -#include "time-description.hh" - -Bar_register::Bar_register() -{ - do_post_move_processing(); -} - -bool -Bar_register::do_try_request(Request*r_l) -{ - Command_req* c_l = r_l->command(); - if (!c_l|| !c_l->bar()) - return false; - Bar_req * b= c_l->bar(); - if (bar_req_l_ && bar_req_l_->compare(*b)) - return false; - - bar_req_l_ = b; - - return true; -} - -void -Bar_register::do_process_requests() -{ - if (bar_req_l_ ) { - bar_p_ = new Bar; - bar_p_->type_str_=bar_req_l_->type_str_; - } else if (!get_staff_info().time_C_->whole_in_measure_) { - bar_p_ = new Bar; - } - - if (bar_p_){ - announce_element(Score_elem_info(bar_p_, bar_req_l_) ); - } -} - - -void -Bar_register::do_pre_move_processing() -{ - if (bar_p_) { - typeset_breakable_item(bar_p_); - bar_p_ =0; - } -} - -void -Bar_register::do_post_move_processing() -{ - bar_req_l_ = 0; - bar_p_ =0; -} - -IMPLEMENT_STATIC_NAME(Bar_register); -IMPLEMENT_IS_TYPE_B1(Bar_register,Request_register); -ADD_THIS_REGISTER(Bar_register); - - diff --git a/lily/clef-reg.cc b/lily/clef-reg.cc deleted file mode 100644 index 3f4c311937..0000000000 --- a/lily/clef-reg.cc +++ /dev/null @@ -1,128 +0,0 @@ -/* - clef.cc -- implement Clef_register - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys , - Mats Bengtsson -*/ - -#include "bar.hh" -#include "clef-reg.hh" -#include "clef-item.hh" -#include "debug.hh" -#include "command-request.hh" -#include "time-description.hh" - -Clef_register::Clef_register() -{ - clef_p_ = 0; - clef_req_l_ =0; - - set_type("violin"); -} - -bool -Clef_register::set_type(String s) -{ - clef_type_str_ = s; - if (clef_type_str_ == "violin") { - c0_position_i_= -2; - } else if (clef_type_str_ == "alto") { - c0_position_i_= 4; - } else if (clef_type_str_ == "tenor") { - c0_position_i_= 6; - } else if (clef_type_str_ == "bass") { - c0_position_i_= 10; - } else - return false; - - return true; -} - -void -Clef_register::fill_staff_info(Staff_info &i) -{ - i.c0_position_i_l_ = &c0_position_i_; -} - -void -Clef_register::read_req(Clef_change_req*c_l) -{ - if (!set_type(c_l->clef_str_)) - c_l->error("unknown clef type "); -} -void -Clef_register::acknowledge_element(Score_elem_info info) -{ - if (info.elem_l_->name() == Bar::static_name() ) { - create_clef(); - if ( !clef_req_l_ ) - clef_p_->default_b_ = true; - } -} - -void -Clef_register::do_creation_processing() -{ - create_clef(); - clef_p_->default_b_ = false; -} - -bool -Clef_register::do_try_request(Request * r_l) -{ - Command_req* creq_l= r_l->command(); - if (!creq_l || !creq_l->clefchange()) - return false; - - clef_req_l_ = creq_l->clefchange(); - - read_req(clef_req_l_); - return true; -} - -void -Clef_register::create_clef() -{ - if (!clef_p_) { - clef_p_ = new Clef_item; - announce_element(Score_elem_info(clef_p_,clef_req_l_)); - } - clef_p_->read(*this); -} - -void -Clef_register::do_process_requests() -{ - if (clef_req_l_) { - create_clef(); - clef_p_->default_b_ = false; - } -} - -void -Clef_register::do_pre_move_processing() -{ - if (!clef_p_) - return; - typeset_breakable_item(clef_p_); - clef_p_ = 0; -} - -void -Clef_register::do_post_move_processing() -{ - clef_req_l_ = 0; -} - -void -Clef_register::do_removal_processing() -{ - delete clef_p_; - clef_p_ =0; -} - -IMPLEMENT_STATIC_NAME(Clef_register); -IMPLEMENT_IS_TYPE_B1(Clef_register,Request_register); -ADD_THIS_REGISTER(Clef_register); diff --git a/lily/collision-reg.cc b/lily/collision-reg.cc deleted file mode 100644 index 8a895d79c8..0000000000 --- a/lily/collision-reg.cc +++ /dev/null @@ -1,40 +0,0 @@ -/* - collision-reg.cc -- implement Collision_register - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - -#include "note-column.hh" -#include "collision-reg.hh" -#include "collision.hh" - -void -Collision_register::acknowledge_element(Score_elem_info i) -{ - if (!(i.elem_l_->name() == Note_column::static_name())) - return; - - if (!col_p_) - col_p_ = new Collision; - - col_p_->add((Note_column*)i.elem_l_->item()); -} - -void -Collision_register::do_pre_move_processing() -{ - if (col_p_) { - typeset_element(col_p_); - col_p_ =0; - } -} -Collision_register::Collision_register() -{ - col_p_ =0; -} - -IMPLEMENT_STATIC_NAME(Collision_register); -IMPLEMENT_IS_TYPE_B1(Collision_register,Request_register); -ADD_THIS_REGISTER(Collision_register); diff --git a/lily/dynamic-reg.cc b/lily/dynamic-reg.cc deleted file mode 100644 index 3e953a6519..0000000000 --- a/lily/dynamic-reg.cc +++ /dev/null @@ -1,142 +0,0 @@ -/* - dynamic-reg.cc -- implement Dynamic_register - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ -#include "debug.hh" -#include "crescendo.hh" -#include "dynamic-reg.hh" -#include "musical-request.hh" -#include "text-item.hh" -#include "lookup.hh" -#include "paper-def.hh" -#include "score-column.hh" -#include "staff-sym.hh" -#include "note-column.hh" - -Dynamic_register::Dynamic_register() -{ - dir_i_ =0; - do_post_move_processing(); - dynamic_p_ =0; - to_end_cresc_p_ = cresc_p_ = 0; - cresc_req_l_ = 0; -} - -void -Dynamic_register::do_post_move_processing() -{ - dynamic_req_l_arr_.set_size(0); -} - -bool -Dynamic_register::do_try_request(Request * r) -{ - Musical_req * m = r->musical(); - if (!m || !m->dynamic()) - return false; - dynamic_req_l_arr_.push(m->dynamic()); - return true; -} -void -Dynamic_register::do_process_requests() -{ - Crescendo* new_cresc_p=0; - for (int i=0; i < dynamic_req_l_arr_.size(); i++) { - Dynamic_req *dreq_l = dynamic_req_l_arr_[i]; - if (dreq_l->absdynamic()) { - Text_def * td_p = new Text_def; - td_p->align_i_ = 0; - String loud =Dynamic_req::loudness_str( - dreq_l->absdynamic()->loudness_); - - td_p->text_str_ = paper()->lookup_l()->dynamic(loud).tex; - td_p->style_str_ = "dynamic"; - - assert (!dynamic_p_) ; // TODO - - dynamic_p_ = new Text_item(td_p); - announce_element(Score_elem_info(dynamic_p_, dreq_l)); - } else if (dreq_l->span_dynamic()) { - - Span_dynamic_req* span_l = dreq_l->span_dynamic(); - if (span_l->spantype == Span_req::STOP) { - if (!cresc_p_) { - span_l->warning("Can't find cresc to end " ); - } else { - assert(!to_end_cresc_p_); - to_end_cresc_p_ =cresc_p_; - cresc_p_ = 0; - } - } else if (span_l->spantype == Span_req::START) { - cresc_req_l_ = span_l; - assert(!new_cresc_p); - new_cresc_p = new Crescendo; - new_cresc_p->grow_dir_i_ = span_l->dynamic_dir_i_; - announce_element(Score_elem_info(new_cresc_p, span_l)); - } - } - } - - if ( new_cresc_p ) { - cresc_p_ = new_cresc_p; - cresc_p_->left_col_l_ = get_staff_info().musical_l()->pcol_l_; - if (dynamic_p_) { - cresc_p_->left_dyn_b_ = true; - } - } -} - -void -Dynamic_register::do_pre_move_processing() -{ - Staff_symbol* s_l = get_staff_info().staff_sym_l_; - if (dynamic_p_) { - dynamic_p_->set_staffsym(s_l); - typeset_element(dynamic_p_); - dynamic_p_ = 0; - } - if ( to_end_cresc_p_) { - if (dynamic_p_) - to_end_cresc_p_->right_dyn_b_=true; - - to_end_cresc_p_->right_col_l_ = get_staff_info().musical_l()->pcol_l_; - to_end_cresc_p_->set_staffsym(s_l); - typeset_element(to_end_cresc_p_); - to_end_cresc_p_ = 0; - } -} - -void -Dynamic_register::set_feature(Feature i) -{ - if (i.type_ == "vdir") - dir_i_ = i.value_; -} - -IMPLEMENT_STATIC_NAME(Dynamic_register); -IMPLEMENT_IS_TYPE_B1(Dynamic_register,Request_register); -ADD_THIS_REGISTER(Dynamic_register); - -Dynamic_register::~Dynamic_register() -{ - delete dynamic_p_; - delete to_end_cresc_p_; - if (cresc_p_) { - cresc_req_l_->warning("unended crescendo"); - } - delete cresc_p_; -} -void -Dynamic_register::acknowledge_element(Score_elem_info i) -{ - if (i.elem_l_->name() == Note_column::static_name()) { - if (dynamic_p_) dynamic_p_->add_support(i.elem_l_); - if (to_end_cresc_p_) - to_end_cresc_p_->add_support(i.elem_l_); - if (cresc_p_) - cresc_p_->add_support(i.elem_l_); - } -} diff --git a/lily/global-acceptor.cc b/lily/global-acceptor.cc deleted file mode 100644 index 057881adc7..0000000000 --- a/lily/global-acceptor.cc +++ /dev/null @@ -1,69 +0,0 @@ -/* - global-acceptor.cc -- implement - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - -#include "music.hh" -#include "global-acceptor.hh" -#include "score.hh" -#include "score-column.hh" - -Global_acceptor::Global_acceptor() -{ - score_l_ = 0; - last_mom_ = 0; -} - -Acceptor* -Global_acceptor::ancestor_l(int) -{ - return this; -} - -void -Global_acceptor::add_moment_to_process(Moment m) -{ - if (m > last_mom_) - return; - - for (int i=0; i < extra_mom_pq_.size(); i++) - if (extra_mom_pq_[i] == m) - return; - extra_mom_pq_.insert(m); -} - -int -Global_acceptor::depth_i()const -{ - return 0; -} - -void -Global_acceptor::set_score(Score *s) -{ - score_l_ = s; - last_mom_ = score_l_->music_p_->time_int().max(); -} - -void -Global_acceptor::modify_next(Moment &w) -{ - while (extra_mom_pq_.size() && - extra_mom_pq_.front() <= w) - - w =extra_mom_pq_.get(); -} - -int -Global_acceptor::moments_left_i()const -{ - return extra_mom_pq_.size(); -} - -void -Global_acceptor::prepare(Moment) -{ -} diff --git a/lily/global-regs.cc b/lily/global-regs.cc deleted file mode 100644 index ca027af462..0000000000 --- a/lily/global-regs.cc +++ /dev/null @@ -1,49 +0,0 @@ -/* - global-regs.cc -- implement - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - -#include "proto.hh" -#include "plist.hh" -#include "input-register.hh" -#include "debug.hh" -#include "register.hh" - -struct Request_register_table_entry { - String name_str_; - Reg_ctor ctor_l_; - Request_register_table_entry(String s, Reg_ctor f) { - name_str_ =s; - ctor_l_ = f; - } - Request_register_table_entry() - { - ctor_l_ =0; - } -}; - -static Array *reg_table=0; - -void -add_request_register(String s, Reg_ctor f) -{ - if (!reg_table) - reg_table = new Array; - - reg_table->push(Request_register_table_entry(s, f)); -} - - -Request_register* -get_register_p(String s) -{ - for (int i=0; i < reg_table->size(); i++) { - if ((*reg_table)[i].name_str_ == s) - return (*(*reg_table)[i].ctor_l_)(); - } - error("Unknown register `" + s +"\'"); - return 0; -} diff --git a/lily/head-reg.cc b/lily/head-reg.cc deleted file mode 100644 index b55f36b4be..0000000000 --- a/lily/head-reg.cc +++ /dev/null @@ -1,69 +0,0 @@ -/* - headreg.cc -- part of GNU LilyPond - - (c) 1997 Han-Wen Nienhuys -*/ - -#include "note-head.hh" -#include "head-reg.hh" -#include "paper-def.hh" -#include "musical-request.hh" - -Note_head_register::Note_head_register() -{ - note_p_ = 0; - do_post_move_processing(); -} - -bool -Note_head_register::do_try_request(Request *req_l) -{ - if (note_req_l_) - return false; - - if (req_l->musical() && (req_l->musical()->note() || req_l->musical()->rest())) - note_req_l_=req_l->musical()->rhythmic(); - else - return false; - - return true; -} - -void -Note_head_register::do_process_requests() -{ - if (!note_req_l_) - return; - - Note_head*n_p = new Note_head(8); // ugh - note_p_ = n_p; - n_p->set_rhythmic(note_req_l_->rhythmic()); - - if (note_req_l_->note()) { - n_p->position_i_ = note_req_l_->note()->height() + - *get_staff_info().c0_position_i_l_; - } else if (note_req_l_->rest()) { - n_p->rest_b_ = true; - } - - Score_elem_info itinf(note_p_,note_req_l_); - announce_element(itinf); -} - -void -Note_head_register::do_pre_move_processing() -{ - if (note_p_) { - typeset_element(note_p_); - note_p_ = 0; - } -} -void -Note_head_register::do_post_move_processing() -{ - note_req_l_ = 0; -} - -IMPLEMENT_STATIC_NAME(Note_head_register); -IMPLEMENT_IS_TYPE_B1(Note_head_register,Request_register); -ADD_THIS_REGISTER(Note_head_register); diff --git a/lily/include/bar-align-reg.hh b/lily/include/bar-align-reg.hh deleted file mode 100644 index 7219cf4bac..0000000000 --- a/lily/include/bar-align-reg.hh +++ /dev/null @@ -1,13 +0,0 @@ -/* - bar-align-reg.hh -- declare - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef BAR_ALIGN_REG_HH -#define BAR_ALIGN_REG_HH - -#endif // BAR_ALIGN_REG_HH diff --git a/lily/include/bar-reg.hh b/lily/include/bar-reg.hh deleted file mode 100644 index 8a6d1606c5..0000000000 --- a/lily/include/bar-reg.hh +++ /dev/null @@ -1,32 +0,0 @@ -/* - bar-reg.hh -- declare Bar_register - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef BARREG_HH -#define BARREG_HH -#include "register.hh" - -/** - generate bars. Either user ("|:"), or default (new measure) - */ -class Bar_register : public Request_register { - Bar_req * bar_req_l_; - Bar * bar_p_; -public: - Bar_register(); - NAME_MEMBERS(); - - -protected: - virtual bool do_try_request(Request *req_l); - virtual void do_process_requests(); - virtual void do_pre_move_processing(); - virtual void do_post_move_processing(); -}; - -#endif // BARREG_HH diff --git a/lily/include/clef-reg.hh b/lily/include/clef-reg.hh deleted file mode 100644 index 91dd8d57e7..0000000000 --- a/lily/include/clef-reg.hh +++ /dev/null @@ -1,41 +0,0 @@ -/* - clef.hh -- part of GNU LilyPond - - (c) 1996,97 Han-Wen Nienhuys -*/ - -#ifndef CLEF_HH -#define CLEF_HH - -#include "scalar.hh" -#include "varray.hh" -#include "register.hh" - -/// where is c-0 in the staff? -class Clef_register : public Request_register { - Clef_item *clef_p_; - Clef_change_req * clef_req_l_; - void create_clef(); - void read_req(Clef_change_req*); - bool set_type(String); -protected: - virtual void do_process_requests(); - virtual void fill_staff_info(Staff_info&); - virtual void do_pre_move_processing(); - virtual void do_removal_processing(); - virtual void do_creation_processing(); - virtual void do_post_move_processing(); - virtual bool do_try_request(Request*); - virtual void acknowledge_element(Score_elem_info); -public: - int c0_position_i_; - String clef_type_str_; - - /* ************** */ - - Clef_register(); - NAME_MEMBERS(); - -}; -#endif // CLEF_HH - diff --git a/lily/include/collision-reg.hh b/lily/include/collision-reg.hh deleted file mode 100644 index d0affb0df4..0000000000 --- a/lily/include/collision-reg.hh +++ /dev/null @@ -1,25 +0,0 @@ -/* - collision-reg.hh -- declare Collision_register - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef COLLISION_REG_HH -#define COLLISION_REG_HH - -#include "register.hh" - -class Collision_register : public Request_register { - Collision* col_p_; - -protected: - virtual void acknowledge_element(Score_elem_info); - virtual void do_pre_move_processing(); -public: - Collision_register(); - NAME_MEMBERS(); -}; -#endif // COLLISION_REG_HH diff --git a/lily/include/dynamic-reg.hh b/lily/include/dynamic-reg.hh deleted file mode 100644 index 4e13d25a6f..0000000000 --- a/lily/include/dynamic-reg.hh +++ /dev/null @@ -1,36 +0,0 @@ -/* - dynamic-reg.hh -- declare Dynamic_register - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef DYNAMIC_REG_HH -#define DYNAMIC_REG_HH - -#include "register.hh" - -class Dynamic_register : public Request_register { - int dir_i_; - Text_item * dynamic_p_; - Crescendo * to_end_cresc_p_; - Crescendo * cresc_p_; - Span_dynamic_req * cresc_req_l_; - Array dynamic_req_l_arr_; - /* ************** */ -public: - Dynamic_register(); - ~Dynamic_register(); - NAME_MEMBERS(); -protected: - virtual void acknowledge_element(Score_elem_info); - virtual bool do_try_request(Request *req_l); - virtual void do_process_requests(); - virtual void do_pre_move_processing(); - virtual void do_post_move_processing(); - virtual void set_feature(Feature); -}; - -#endif // DYNAMIC_REG_HH diff --git a/lily/include/global-acceptor.hh b/lily/include/global-acceptor.hh deleted file mode 100644 index 6d18720298..0000000000 --- a/lily/include/global-acceptor.hh +++ /dev/null @@ -1,38 +0,0 @@ -/* - global-acceptor.hh -- declare Global_acceptor - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef GLOBAL_ACCEPTOR_HH -#define GLOBAL_ACCEPTOR_HH - -#include "acceptor.hh" -#include "pqueue.hh" - -class Global_acceptor : public virtual Acceptor { - PQueue extra_mom_pq_; - Moment last_mom_; -public: - Score *score_l_; - Global_acceptor(); - int moments_left_i()const; - void modify_next(Moment&); - void add_moment_to_process(Moment); - - virtual void set_score(Score*); - virtual void prepare(Moment); - virtual void process() {} - virtual void finish() {} - -protected: - virtual int depth_i() const; - virtual Acceptor *ancestor_l(int); -}; - - - -#endif // GLOBAL_ACCEPTOR_HH diff --git a/lily/include/head-reg.hh b/lily/include/head-reg.hh deleted file mode 100644 index e4e3c1ef16..0000000000 --- a/lily/include/head-reg.hh +++ /dev/null @@ -1,26 +0,0 @@ -/* - headreg.hh -- part of GNU LilyPond - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef HEADREG_HH -#define HEADREG_HH -#include "register.hh" - -struct Note_head_register : Request_register { - Note_head* note_p_; - Rhythmic_req * note_req_l_; - - /* *************** */ - Note_head_register(); - virtual bool do_try_request(Request *req_l) ; - virtual void do_process_requests(); - virtual void do_pre_move_processing(); - virtual void do_post_move_processing(); - NAME_MEMBERS(); -}; - - -#endif // HEADREG_HH diff --git a/lily/include/input-register.hh b/lily/include/input-register.hh deleted file mode 100644 index f1988b0374..0000000000 --- a/lily/include/input-register.hh +++ /dev/null @@ -1,42 +0,0 @@ -/* - input-register.hh -- declare Input_register - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef INPUT_REGISTER_HH -#define INPUT_REGISTER_HH - -#include "plist.hh" -#include "string.hh" -#include "lily-proto.hh" -#include "input.hh" -#include "string.hh" -#include "varray.hh" - -struct Input_register : Input { - Pointer_list contains_ireg_p_list_; - Array consists_str_arr_; - Array alias_str_arr_; - String name_str_; - - void add(Input_register *); - bool is_name_b(String); - bool accept_req_b(); - bool accepts_b(String); - void print() const; - Register_group_register * get_group_register_p(); - Input_register * get_default_ireg_l(); - Input_register * recursive_find(String nm); - Input_register * find_ireg_l(String nm); -}; - - -void add_global_input_register(Input_register* ireg_p); -Input_register*lookup_reg(String); -Request_register*get_register_p(String s); - -#endif // INPUT_REGISTER_HH diff --git a/lily/include/interpretor.hh b/lily/include/interpretor.hh deleted file mode 100644 index b13582f45a..0000000000 --- a/lily/include/interpretor.hh +++ /dev/null @@ -1,32 +0,0 @@ -/* - interpretor.hh -- declare - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef Interpreter_HH -#define Interpreter_HH - -class Interpreter { -public: - /// link to my definition - Input_register * ireg_l_; - void interpret_request(Request *); - NAME_MEMBERS(); - ~Interpreter(); - /** typeset any items/spanners. Default: do nothing - */ - virtual void do_pre_move_processing(){} -}; - -class Paper_interpreter : Interpreter { - -}; - -class Midi_interpreter : Interpreter { -}; - -#endif // Interpreter_HH diff --git a/lily/include/key-reg.hh b/lily/include/key-reg.hh deleted file mode 100644 index ec9b5a2ab9..0000000000 --- a/lily/include/key-reg.hh +++ /dev/null @@ -1,37 +0,0 @@ -/* - key-reg.hh -- declare Key_register - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef KEYREG_HH -#define KEYREG_HH - -#include "register.hh" -#include "key.hh" - -struct Key_register : Request_register { - Key key_; - Key_change_req * keyreq_l_; - Key_item * kit_p_; - Array accidental_idx_arr_; - bool default_key_b_; - bool change_key_b_; - - virtual bool do_try_request(Request *req_l); - virtual void do_process_requests(); - virtual void do_pre_move_processing(); - virtual void do_post_move_processing(); - virtual void acknowledge_element(Score_elem_info); - Key_register(); - NAME_MEMBERS(); -private: - void create_key(); - - void read_req(Key_change_req * r); -}; - -#endif // KEYREG_HH diff --git a/lily/include/local-key-reg.hh b/lily/include/local-key-reg.hh deleted file mode 100644 index 41088f7c60..0000000000 --- a/lily/include/local-key-reg.hh +++ /dev/null @@ -1,30 +0,0 @@ -/* - local-key-reg.hh -- declare Local_key_register - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef LOCALKEYREG_HH -#define LOCALKEYREG_HH - -#include "register.hh" -#include "key.hh" -#include "parray.hh" - -struct Local_key_register : Request_register { - Key local_key_; - Key const *key_C_; - Array mel_l_arr_; - Array support_l_arr_; - Link_array forced_l_arr_; - Link_array tied_l_arr_; - /* *************** */ - virtual void do_process_requests(); - virtual void acknowledge_element(Score_elem_info); - virtual void do_pre_move_processing(); - Local_key_register(); - NAME_MEMBERS(); -}; - -#endif // LOCALKEYREG_HH diff --git a/lily/include/lyric-register.hh b/lily/include/lyric-register.hh deleted file mode 100644 index e8468f0b9f..0000000000 --- a/lily/include/lyric-register.hh +++ /dev/null @@ -1,26 +0,0 @@ -/* - lyric-register.hh -- declare Lyric_register - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef LYRIC_REGISTER_HH -#define LYRIC_REGISTER_HH -#include "register.hh" -#include "varray.hh" - -#include "lily-proto.hh" - -class Lyric_register : public Request_register { - Array lreq_arr_; - virtual bool do_try_request(Request*); - virtual void do_process_requests(); - virtual void do_post_move_processing(); -public: - NAME_MEMBERS(); - Lyric_register(); -}; -#endif // LYRIC_REGISTER_HH diff --git a/lily/include/meter-reg.hh b/lily/include/meter-reg.hh deleted file mode 100644 index 26f9eaf0bf..0000000000 --- a/lily/include/meter-reg.hh +++ /dev/null @@ -1,36 +0,0 @@ -/* - meter-reg.hh -- declare Meter_register - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef METERREG_HH -#define METERREG_HH -#include "register.hh" -#include "time-description.hh" -#include "grouping.hh" - -/** - generate meters. - */ -class Meter_register : public Request_register { -public: - Time_description time_; - Rhythmic_grouping default_grouping_; - - Meter_change_req * meter_req_l_; - Meter * meter_p_; - - virtual void fill_staff_info(Staff_info&); - virtual bool do_try_request(Request *req_l); - virtual void do_process_requests(); - virtual void do_pre_move_processing(); - virtual void do_creation_processing(); - virtual void do_post_move_processing(); - Meter_register(); - NAME_MEMBERS(); -}; -#endif // METERREG_HH diff --git a/lily/include/note-column-reg.hh b/lily/include/note-column-reg.hh deleted file mode 100644 index a15cd9108b..0000000000 --- a/lily/include/note-column-reg.hh +++ /dev/null @@ -1,37 +0,0 @@ -/* - note-column-reg.hh -- declare Note_column_register - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef NOTE_COLUMN_REG_HH -#define NOTE_COLUMN_REG_HH - -#include "register.hh" - -class Note_column_register :public Request_register { - Rest_column * rest_col_l(); - Note_column * note_col_l(); - - Array< Script * > script_l_arr_; - Stem * stem_l_; - Note_column *ncol_p_; - Rest_column *restcol_p_; - bool h_shift_b_; - int dir_i_; - - /* *************** */ - bool acceptable_elem_b(Score_elem const*)const; -protected: - virtual void set_feature(Feature); - virtual void acknowledge_element(Score_elem_info); - virtual void do_pre_move_processing(); - virtual void do_post_move_processing(); -public: - Note_column_register(); - NAME_MEMBERS(); -}; -#endif // NOTE_COLUMN_REG_HH diff --git a/lily/include/register-group.hh b/lily/include/register-group.hh deleted file mode 100644 index 466b47361b..0000000000 --- a/lily/include/register-group.hh +++ /dev/null @@ -1,90 +0,0 @@ -/* - registergroup.hh -- declare Register_group_register - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef REGISTERGROUP_HH -#define REGISTERGROUP_HH - -#include "parray.hh" -#include "plist.hh" -#include "score-elem-info.hh" -#include "register.hh" -#include "acceptor.hh" - - -/** - Group a number of registers. Usually delegates everything to its contents. - Postfix: group - */ -class Register_group_register : public Request_register, public virtual Acceptor { -protected: - - Pointer_list reg_list_; - Link_array group_l_arr_; - Link_array nongroup_l_arr_; - - Array announce_info_arr_; - - virtual void do_print()const; - - virtual bool removable_b()const; - -public: - Input_register * ireg_l_; - void check_removal(); - Register_group_register(); - ~Register_group_register(); - - - - /** - Junk #reg_l#. - Pre: - #reg_l# is in #reg_list_# - */ - virtual void terminate_register(Request_register * reg_l); - - NAME_MEMBERS(); - - /** - Remove #reg_l# from the list, and return it. - */ - virtual Request_register * remove_register_p(Request_register*reg_l); - virtual void set_feature(Feature i); - virtual void sync_features() ; - virtual void do_pre_move_processing(); - virtual void do_post_move_processing(); - - virtual void do_removal_processing(); - virtual bool do_try_request(Request*); - virtual void do_process_requests(); - - virtual Staff_info get_staff_info()const; - - virtual Register_group_register * find_register_l(String name,String id); - virtual void do_announces(); - virtual void announce_element(Score_elem_info); - - - virtual void add(Request_register* reg_p); - - virtual bool contains_b(Request_register*)const; - - virtual Acceptor* find_get_acceptor_l(String name, String id); - virtual Acceptor * get_default_interpreter(); - /** - Go up in the tree. default: choose next parent - */ - Acceptor * ancestor_l(int l=1); - int depth_i() const; - -}; - -#endif // REGISTERGROUP_HH - - diff --git a/lily/include/register.hh b/lily/include/register.hh deleted file mode 100644 index 18a6e41a42..0000000000 --- a/lily/include/register.hh +++ /dev/null @@ -1,155 +0,0 @@ -/* - register.hh -- declare Request_register - - source file of the GNU LilyPond music typesetter - - (c) 1996, 1997 Han-Wen Nienhuys -*/ - - -#ifndef REGISTER_HH -#define REGISTER_HH - -#include "lily-proto.hh" -#include "varray.hh" -#include "request.hh" -#include "score-elem-info.hh" -#include "staff-info.hh" - - - - -/** - a struct which processes requests, and creates the #Score_elem#s. - It may use derived classes. Hungarian postfix: register - */ -class Request_register { - friend class Register_group_register; - /** - You cannot copy a Request_register - */ - Request_register(const Request_register&){} - - enum { - VIRGIN, - CREATION_INITED, - MOVE_INITED, - ACCEPTED_REQS, - PROCESSED_REQS, - ACKED_REQS, - MOVE_DONE - } status; - -protected: - - - /// utility - virtual Paper_def * paper() const; - - - /// make items/spanners with the requests you got - virtual void do_process_requests(){} - - /** typeset any items/spanners. Default: do nothing - */ - virtual void do_pre_move_processing(){} - /** reset any appropriate data. Default: do nothing - */ - virtual void do_post_move_processing(){} - - - virtual void do_creation_processing () {} - virtual void do_removal_processing() {} - - /** - typeset a "command" item. Default: pass on to daddy. - If the column is not breakable, #pre_p# and #post_p# are junked - */ - virtual void typeset_breakable_item(Item * nobreak_p); - /** - Invoke walker method to typeset element. Default: pass on to daddy. - */ - virtual void typeset_element(Score_elem*elem_p); - - /** - take note of item/spanner - put item in spanner. Adjust local key; etc. - - Default: ignore the info - */ - virtual void acknowledge_element(Score_elem_info) {} - /** - Announce element. Default: pass on to daddy. Utility - */ - virtual void announce_element(Score_elem_info); - /** - Set Feature of the register(s). Default: ignore Feature. - */ - virtual void set_feature(Feature){} - /** - ask daddy for a feature - */ - virtual Scalar get_feature(String type_str); - /** - Does this equal or contain a certain register? - */ - - virtual void sync_features() {} - - virtual bool contains_b(Request_register*reg_l)const; - /** - Get information on the staff. Default: ask daddy. - */ - virtual Staff_info get_staff_info()const; - virtual void fill_staff_info(Staff_info&); - - - virtual void do_print()const; - /* - @see{try_request} - Default: always return false - */ - virtual bool do_try_request(Request *req_l); -public: - void pre_move_processing(); - void process_requests(); - /** - try to fit the request in this register - - @return - false: not noted, not taken. - - true: request swallowed. Don't try to put the request elsewhere. - - */ - bool try_request(Request*); - - void post_move_processing(); - - Register_group_register * daddy_reg_l_; - - Request_register(); - virtual ~Request_register(){} - NAME_MEMBERS(); - void print() const; -}; - -/** - A macro to automate administration of registers. - */ -#define ADD_THIS_REGISTER(c) \ -struct c ## init { \ - static Request_register * globalctor (){ \ - return new c; \ - } \ - c ## init () { \ - add_request_register(c::static_name(), globalctor); \ - \ - } \ -} _ ## c ## init; - -typedef Request_register*(*Reg_ctor)(void); -void add_request_register(String s, Reg_ctor f); - -#endif // REGISTER_HH - diff --git a/lily/include/rest-collision-reg.hh b/lily/include/rest-collision-reg.hh deleted file mode 100644 index ecde3d6f96..0000000000 --- a/lily/include/rest-collision-reg.hh +++ /dev/null @@ -1,27 +0,0 @@ -/* - rest-collision-reg.hh -- declare Rest_collision_register - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef REST_COLLISION_REG_HH -#define REST_COLLISION_REG_HH - -#include "varray.hh" -#include "register.hh" - -class Rest_collision_register : public Request_register { - Rest_collision* rest_collision_p_; - Array< Collision *> collision_l_arr_; -protected: - virtual void acknowledge_element(Score_elem_info); - virtual void do_print() const; - virtual void do_pre_move_processing(); -public: - Rest_collision_register(); - NAME_MEMBERS(); -}; -#endif // REST_COLLISION_REG_HH diff --git a/lily/include/score-align-reg.hh b/lily/include/score-align-reg.hh deleted file mode 100644 index 3f7e15ca4f..0000000000 --- a/lily/include/score-align-reg.hh +++ /dev/null @@ -1,28 +0,0 @@ -/* - score-align-reg.hh -- declare Score_align_reg - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef SCORE_ALIGN_REG_HH -#define SCORE_ALIGN_REG_HH - -#include "register.hh" - -class Score_align_register: public Request_register -{ - Horizontal_group_item * align_p_; -public: - - const char* type_ch_C_; - int priority_i_; - Score_align_register(); - NAME_MEMBERS(); -protected: - virtual void acknowledge_element(Score_elem_info); - virtual void do_pre_move_processing(); -}; -#endif // SCORE_ALIGN_REG_HH diff --git a/lily/include/score-halign-reg.hh b/lily/include/score-halign-reg.hh deleted file mode 100644 index 8a0559ff8d..0000000000 --- a/lily/include/score-halign-reg.hh +++ /dev/null @@ -1,23 +0,0 @@ -/* - score-halign-reg.hh -- declare Score_horizontal_align_register - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef SCORE_HALIGN_REG_HH -#define SCORE_HALIGN_REG_HH -#include "register.hh" -class Score_horizontal_align_register : public Request_register { - - Break_align_item * halign_p_; -public: - NAME_MEMBERS(); - Score_horizontal_align_register(); -protected: - virtual void acknowledge_element(Score_elem_info); - virtual void do_pre_move_processing(); -}; -#endif // SCORE_HALIGN_REG_HH diff --git a/lily/include/score-reg.hh b/lily/include/score-reg.hh deleted file mode 100644 index 3c4c668ea6..0000000000 --- a/lily/include/score-reg.hh +++ /dev/null @@ -1,58 +0,0 @@ -/* - score-reg.hh -- declare Score_register - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef SCORE_REG_HH -#define SCORE_REG_HH - -#include "register-group.hh" -#include "global-acceptor.hh" - -class Score_register : public Register_group_register, public Global_acceptor { - Line_of_score * scoreline_l_; - - - Array nobreak_item_p_arr_; - Link_array musical_item_p_arr_; - - Score_column* command_column_l_; - Score_column* musical_column_l_; - - friend class Score; - void set_cols(Score_column*,Score_column*); - void typeset_all(); - -public: - NAME_MEMBERS(); - - Score_register(); - -protected: - /* Global_acceptor interface */ - virtual void set_score(Score * score_l); - virtual void prepare(Moment); - virtual void finish(); - virtual void process(); - virtual int depth_i() const { return Global_acceptor::depth_i();} - virtual Acceptor* ancestor_l(int l) { return Global_acceptor::ancestor_l(l);} - -protected: - /* Register_group_register interface */ - virtual Staff_info get_staff_info()const; - virtual bool do_try_request(Request*); - virtual void do_creation_processing(); - virtual void do_removal_processing(); - virtual void announce_element(Score_elem_info); - virtual void typeset_breakable_item(Item * nobreak_p); - virtual void do_announces(); - virtual void typeset_element(Score_elem*elem_p); - virtual Paper_def * paper() const; - virtual void do_pre_move_processing(); -}; - -#endif // SCORE_REG_HH diff --git a/lily/include/script-reg.hh b/lily/include/script-reg.hh deleted file mode 100644 index 41dccfb6c3..0000000000 --- a/lily/include/script-reg.hh +++ /dev/null @@ -1,32 +0,0 @@ -/* - script-reg.hh -- part of GNU LilyPond - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef SCRIPTREG_HH -#define SCRIPTREG_HH - -#include "register.hh" - - -class Script_register : public Request_register { - Array