From a339688e5b6ae5ceceb4d67fd76261cfaf27d61a Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:14:15 +0000 Subject: [PATCH] lilypond-1.0.8 --- input/test/defaultbars.ly | 7 +++++++ lily/bar-engraver.cc | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 input/test/defaultbars.ly diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly new file mode 100644 index 0000000000..3a2dcd96cf --- /dev/null +++ b/input/test/defaultbars.ly @@ -0,0 +1,7 @@ + +\score { + \melodic { + \property Staff.barAlways = "1" + \property Staff.defaultBarType = ":|:" + c4 c4 c4 c4 } +} diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index 7ed4bad871..78721871b1 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -42,6 +42,11 @@ Bar_engraver::create_bar () { bar_p_ = new Bar; bar_p_->break_priority_i_ = 0; + String default_type = get_property ("defaultBarType"); + if (default_type.length_i ()) + { + bar_p_->type_str_ = default_type; + } announce_element (Score_element_info (bar_p_, bar_req_l_)); } } @@ -77,9 +82,12 @@ Bar_engraver::do_process_requests() else { Time_description const *time = get_staff_info().time_C_; - if (time && !time->whole_in_measure_) + String always = get_property ("barAlways"); + if ((time && !time->whole_in_measure_) || always.length_i ()) create_bar (); } + + if (!bar_p_) { -- 2.39.5