From a3eb3547289c061b9d03da2f30d264373a4ed42e Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:42:21 +0000 Subject: [PATCH] lilypond-0.0.60 --- lily/bar.cc | 10 ++++++++-- lily/include/register-group.hh | 1 + lily/include/register.hh | 11 +++++++++-- lily/include/tie-reg.hh | 4 ++++ lily/paper-def.cc | 2 +- lily/register-group.cc | 11 +++++++++++ lily/staff-regs.cc | 2 +- make/lilypond.lsm | 4 ++-- make/lilypond.spec | 4 ++-- 9 files changed, 39 insertions(+), 10 deletions(-) diff --git a/lily/bar.cc b/lily/bar.cc index f0afa9b402..96071ad385 100644 --- a/lily/bar.cc +++ b/lily/bar.cc @@ -1,3 +1,11 @@ +/* + bar.cc -- implement Bar + + source file of the LilyPond music typesetter + + (c) 1997 Han-Wen Nienhuys +*/ + #include "bar.hh" #include "string.hh" #include "molecule.hh" @@ -5,8 +13,6 @@ #include "lookup.hh" #include "debug.hh" - - Bar::Bar( String t) { type = t; diff --git a/lily/include/register-group.hh b/lily/include/register-group.hh index fc93216de0..fcfc4ba5c6 100644 --- a/lily/include/register-group.hh +++ b/lily/include/register-group.hh @@ -41,6 +41,7 @@ public: virtual Request_register * get_register_p(Request_register*reg_l); virtual void set_feature(Feature i); virtual bool acceptable_request_b(Request*)const; + virtual void sync_features() ; virtual void pre_move_processing(); virtual void post_move_processing(); virtual void acknowledge_element(Staff_elem_info info); diff --git a/lily/include/register.hh b/lily/include/register.hh index b86af3d918..5ba28600ad 100644 --- a/lily/include/register.hh +++ b/lily/include/register.hh @@ -86,16 +86,23 @@ protected: 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(); - - + + virtual void do_print()const; public: /** Every Request_register (except for the 'top' which is directly diff --git a/lily/include/tie-reg.hh b/lily/include/tie-reg.hh index 34387c964d..082de4e70c 100644 --- a/lily/include/tie-reg.hh +++ b/lily/include/tie-reg.hh @@ -17,15 +17,19 @@ class Tie_register : public Request_register { Tie * tie_p_; Moment end_mom_; Tie_req * req_l_; + int dir_i_; Tie_req *end_req_l_; + protected: virtual ~Tie_register(); virtual void acknowledge_element(Staff_elem_info); virtual bool try_request(Request*); virtual bool acceptable_request_b(Request*); + virtual void sync_features(); virtual void process_requests(); virtual void post_move_processing(); virtual void pre_move_processing(); + virtual void set_feature(Feature); public: Tie_register(); NAME_MEMBERS(Tie_register); diff --git a/lily/paper-def.cc b/lily/paper-def.cc index b2602dd355..256f3b8805 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -40,7 +40,7 @@ Paper_def::Paper_def(Lookup *l) linewidth = 15 *CM_TO_PT; // in cm for now whole_width = 8 * note_width(); geometric_ = sqrt(2); - outfile = "lelie.out"; + outfile = "lelie.tex"; } Paper_def::~Paper_def() diff --git a/lily/register-group.cc b/lily/register-group.cc index 2180a1bf15..6e516df21b 100644 --- a/lily/register-group.cc +++ b/lily/register-group.cc @@ -32,6 +32,17 @@ Register_group_register::set_feature(Feature d) } } +void +Register_group_register::sync_features() +{ + iter_top(reg_list_, i); + while (i.ok()) { + + Request_register *reg_l = i++; + reg_l->sync_features(); + } +} + void Register_group_register::pre_move_processing() { diff --git a/lily/staff-regs.cc b/lily/staff-regs.cc index 9f5cc9cd81..b6dc1165b7 100644 --- a/lily/staff-regs.cc +++ b/lily/staff-regs.cc @@ -62,7 +62,7 @@ Staff_registers::change_group(Group_change_req * greq_l, } Voice_group_registers * new_group_l = get_group(new_str); new_group_l->add(regs_p); - + regs_p->sync_features(); mtor << "processed change_group " << get_staff_info().when()<<"\n"; print(); } diff --git a/make/lilypond.lsm b/make/lilypond.lsm index 7c675336f2..789c602b6d 100644 --- a/make/lilypond.lsm +++ b/make/lilypond.lsm @@ -2,7 +2,7 @@ Begin3 Title: LilyPond -Version: 0.0.59 +Version: 0.0.60 Entered-date: 05/05/97 Description: LilyPond is a program which converts a music-script (mudela) into TeX output, or MIDI to produce multi-staff scores. Features include multiple @@ -13,7 +13,7 @@ Author: hanwen@stack.nl (Han-Wen Nienhuys) jan@digicash.com (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: pcnov095.win.tue.nl /pub/lilypond/ - 300k lilypond-0.0.59.tar.gz + 300k lilypond-0.0.60.tar.gz Alternate-site: Original-site: Platform: unix/win32, GNU C++ diff --git a/make/lilypond.spec b/make/lilypond.spec index 4fa3667bc0..fb892b56f9 100644 --- a/make/lilypond.spec +++ b/make/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 0.0.59 +Version: 0.0.60 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: pcnov095.win.tue.nl:/pub/lilypond/lilypond-0.0.59.tar.gz +Source0: pcnov095.win.tue.nl:/pub/lilypond/lilypond-0.0.60.tar.gz Summary: A preprocessor to make TeX typeset music. URL: http://www.stack.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys -- 2.39.5