From 4b599e41de673372c7127b68c750ef4aadbfd9f2 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 25 Nov 2005 15:32:45 +0000 Subject: [PATCH] (from_list): read bracket type from hierarchy. --- ChangeLog | 16 +++++++++ Documentation/index.html.in | 3 +- .../nested-system-start-delimiter-engraver.cc | 33 ++++++++++++------- lily/rest.cc | 3 +- lily/self-aligment-interface.cc | 2 -- scm/define-grob-properties.scm | 4 +-- scm/define-grobs.scm | 1 - stepmake/bin/add-html-footer.py | 3 +- 8 files changed, 44 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1957228836..1fbc938829 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,25 @@ +2005-11-25 Han-Wen Nienhuys + + * lily/nested-system-start-delimiter-engraver.cc (from_list): read + bracket type from hierarchy. + +2005-11-24 Han-Wen Nienhuys + + * lily/rest.cc (y_offset_callback): read staff-position. + + * scm/define-grob-properties.scm (all-user-grob-properties): don't + mark after-line-breaking-callback as internal. + + * lily/self-aligment-interface.cc: remove self-[XY]-offset. + 2005-11-25 Werner Lemberg * mf/feta-banier.mf ("d3"): Make `flare' equal to `staff_space'. 2005-11-23 Han-Wen Nienhuys + * stepmake/bin/add-html-footer.py (do_file): add google + * lily/staff-symbol-engraver.cc (process_music): bugfix: stop staff if first_start_ is true. diff --git a/Documentation/index.html.in b/Documentation/index.html.in index 79da449068..c53ec96ab3 100644 --- a/Documentation/index.html.in +++ b/Documentation/index.html.in @@ -19,8 +19,9 @@ td.left-column { padding-right: 1em; } td.right-column { padding-left: 1em; } hr { border:0; height:1; color: #000000; background-color: #000000; } - + +

diff --git a/lily/nested-system-start-delimiter-engraver.cc b/lily/nested-system-start-delimiter-engraver.cc index 32ae994077..4bed89dacd 100644 --- a/lily/nested-system-start-delimiter-engraver.cc +++ b/lily/nested-system-start-delimiter-engraver.cc @@ -26,23 +26,26 @@ public: virtual void add_support (Grob *) { } virtual void set_bound (Direction, Grob *){} virtual void set_nesting_support (Grob*) {} - virtual void create_grobs (Engraver*, SCM, SCM){} + virtual void create_grobs (Engraver*, SCM) {} }; struct Bracket_nesting_group : public Bracket_nesting_node { Spanner *delimiter_; Link_array children_; - + SCM symbol_; + void from_list (SCM ); virtual void add_support (Grob *grob); virtual bool add_staff (Grob *grob); virtual void set_nesting_support (Grob*); virtual void set_bound (Direction, Grob *grob); - virtual void create_grobs (Engraver*, SCM, SCM); + virtual void create_grobs (Engraver*, SCM); ~Bracket_nesting_group (); + Bracket_nesting_group (); }; + struct Bracket_nesting_staff : public Bracket_nesting_node { Grob *staff_; @@ -51,6 +54,13 @@ struct Bracket_nesting_staff : public Bracket_nesting_node virtual bool add_staff (Grob *); }; + +Bracket_nesting_group::Bracket_nesting_group () +{ + symbol_ = SCM_EOL; + delimiter_ = 0; +} + bool Bracket_nesting_staff::add_staff (Grob *g) { @@ -63,16 +73,15 @@ Bracket_nesting_staff::add_staff (Grob *g) } void -Bracket_nesting_group::create_grobs (Engraver *engraver, SCM types, SCM default_type) +Bracket_nesting_group::create_grobs (Engraver *engraver, SCM default_type) { - SCM type = (scm_is_pair (types) ? scm_car (types) : default_type); + SCM type = scm_is_symbol (symbol_) ? symbol_ : default_type; delimiter_ = make_spanner_from_properties (engraver, type, SCM_EOL, ly_symbol2string (type).to_str0 ()); for (int i = 0 ; i < children_.size (); i++) { - children_[i]->create_grobs (engraver, (scm_is_pair (types) ? scm_cdr (types) : SCM_EOL), - default_type); + children_[i]->create_grobs (engraver, default_type); } } @@ -131,6 +140,9 @@ Bracket_nesting_group::from_list (SCM x) { children_.push (new Bracket_nesting_staff (0)); } + + if (scm_is_symbol (entry)) + symbol_ = entry; } } @@ -184,10 +196,9 @@ Nested_system_start_delimiter_engraver::process_music () nesting_ = new Bracket_nesting_group (); SCM hierarchy = get_property ("systemStartDelimiterHierarchy"); SCM delimiter_name = get_property ("systemStartDelimiter"); - SCM delimiter_types = get_property ("systemStartDelimiters"); + nesting_->from_list (hierarchy); - nesting_->create_grobs (this, delimiter_types, - delimiter_name); + nesting_->create_grobs (this, delimiter_name); nesting_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); } } @@ -232,5 +243,5 @@ ADD_TRANSLATOR (Nested_system_start_delimiter_engraver, /* doc */ "Creates a system start delimiter (ie. SystemStart@{Bar, Brace, Bracket@} spanner", /* create */ "SystemStartSquare SystemStartBrace SystemStartBracket SystemStartBar", /* accept */ "", - /* read */ "systemStartDelimiterHierarchy", + /* read */ "systemStartDelimiter systemStartDelimiterHierarchy currentCommandColumn", /* write */ ""); diff --git a/lily/rest.cc b/lily/rest.cc index e2ed124394..2d4f5717dd 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -26,7 +26,8 @@ Rest::y_offset_callback (SCM smob) int line_count = Staff_symbol_referencer::line_count (me); Real ss = Staff_symbol_referencer::staff_space (me); - Real amount = 0.0; + Real amount = robust_scm2double (me->get_property ("staff-position"), 0) + * 0.5 * ss; if (line_count % 2) { if (duration_log == 0 && line_count > 1) diff --git a/lily/self-aligment-interface.cc b/lily/self-aligment-interface.cc index 3eb8d23a69..0ba251a6f3 100644 --- a/lily/self-aligment-interface.cc +++ b/lily/self-aligment-interface.cc @@ -147,7 +147,5 @@ ADD_INTERFACE (Self_alignment_interface, "self-alignment-interface", /* porperties */ "self-alignment-X " - "self-X-offset " - "self-Y-offset " "self-alignment-Y "); diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index 40fb0399e2..65ac907ae2 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -25,9 +25,8 @@ (X-offset ,number? "The horizontal amount that this object is moved relative to its X-parent") (Y-offset ,number? "The vertical amount that this object is moved relative to its X-parent") - (self-X-offset ,number? "") - (self-Y-offset ,number? "") (accidentals ,list? "List of alteration numbers") + (after-line-breaking ,boolean? "Dummy property, used to trigger callback for after-line-breaking") (alteration-alist ,list? "List of @code{(@var{pitch} . @var{accidental})} pairs for key signature.") (add-stem-support ,boolean? "If set, the Stem object is included in this script's support") @@ -474,7 +473,6 @@ sizes (like the dynamic @b{p} and @b{f}) on their baselines.") (axis-group-parent-Y ,ly:grob? "Containing Y axis group") (accidental-grobs ,list? "Alist with (NOTENAME . GROBLIST) entries") (adjacent-hairpins ,ly:grob-array? "List of directly neighboring hairpins") - (after-line-breaking ,boolean? "Dummy property, used to trigger callback for after-line-breaking") (all-elements ,ly:grob-array? "list of all grobs in this line. Its function is to protect objects from being garbage collected.") (arpeggio ,ly:grob? "pointer to arpeggio object.") diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 9f690dd38e..8c5617e661 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -1266,7 +1266,6 @@ (interfaces . (percent-repeat-interface)))))) (Rest . ( - (stencil . ,Rest::print) (X-extent . ,Rest::width) (Y-extent . ,Rest::height) diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py index d16ddcebbe..314499433b 100644 --- a/stepmake/bin/add-html-footer.py +++ b/stepmake/bin/add-html-footer.py @@ -242,8 +242,7 @@ def do_file (f): # don't cause ///////index.html entries in log files. # index = "./index.html" # top = "./" - - + versiontup = string.split(package_version, '.') branch_str = 'stable-branch' if string.atoi ( versiontup[1]) % 2: -- 2.39.2