From f56e1381aaa6edc69dfc36dcba16777fe83f3631 Mon Sep 17 00:00:00 2001 From: Mats Bengtsson Date: Sun, 3 Jan 1999 21:17:22 +0100 Subject: [PATCH] patch::: 1.1.17.mb1: Re: LilyPond Xmas release pl 17.mb1 - center the number of multi-bar rests - Ugly fix to make \mark work and give better placement of dynamics. --- NEWS | 4 ++++ VERSION | 2 +- lily/dynamic-engraver.cc | 4 ++-- lily/mark-engraver.cc | 6 +++--- lily/multi-measure-rest.cc | 1 + lily/staff-side.cc | 7 +++++-- po/nl.po | 2 +- scm/lily.scm | 3 +++ 8 files changed, 20 insertions(+), 9 deletions(-) diff --git a/NEWS b/NEWS index a5905654bb..aea1b1fcb3 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +pl 17.mb1 + - center the number of multi-bar rests + - Ugly fix to make \mark work and give better placement of dynamics. + pl 16.jcn2 - fix: TEMPO 4., well urg, "TEMPO 4 ." - beginning of violino/violoncello (viola) duet diff --git a/VERSION b/VERSION index b422755b05..03e50b5e80 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 PATCH_LEVEL=17 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=mb1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index e01a2fb6b6..bf4b890c70 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -65,11 +65,11 @@ Dynamic_engraver::do_process_requests() String loud = absd->loudness_str (); td_p->text_str_ = paper ()->lookup_l (0)->dynamic (loud).str_; // ugh td_p->style_str_ = "dynamic"; - td_p->align_dir_ = RIGHT; + td_p->align_dir_ = RIGHT; // Ugh, Doesn't give any effect? Real nw_f = paper ()->note_width () * 0.8; dynamic_p_ = new Text_item (td_p); - dynamic_p_->translate (Offset (nw_f, 0)); + // dynamic_p_->translate (Offset (nw_f, 0)); // Removed, Mats B announce_element (Score_element_info (dynamic_p_, dreq_l)); } diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 55390bfae3..b3f9bf9f0c 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -41,7 +41,7 @@ Mark_engraver::do_process_requests () return; script_p_ = new Script; - script_p_->breakable_b_ = true; + // script_p_->breakable_b_ = true; Text_def *td_p = new Text_def; @@ -51,9 +51,9 @@ Mark_engraver::do_process_requests () td_p->style_str_ = td_p->text_str_.index_any_i ("0123456789") >= 0 ? "mark" : "Large"; - script_p_->dir_ = LEFT; + script_p_->dir_ = UP; script_p_->specs_p_ = td_p->clone (); - script_p_->postbreak_only_b_ = true; + // script_p_->postbreak_only_b_ = false; Scalar padding = get_property ("markScriptPadding"); if (padding.length_i() && padding.isnum_b ()) diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 27b13a42da..b6c8b5d5b3 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -48,6 +48,7 @@ Multi_measure_rest::brew_molecule_p () const Text_def text; text.text_str_ = to_str (measures_i_); text.style_str_ = "number"; + text.align_dir_ = CENTER; Atom s = text.get_atom (paper (), UP); s.translate_axis (3.0 * interline_f, Y_AXIS); mol_p->add_atom (s); diff --git a/lily/staff-side.cc b/lily/staff-side.cc index a3a3a14afd..5133465bee 100644 --- a/lily/staff-side.cc +++ b/lily/staff-side.cc @@ -76,8 +76,11 @@ Staff_side::get_position_f () const // ugh: 5 -> staff_lines if (axis_ == Y_AXIS && abs (coordinate_offset_f_i) < 5) { - if (!(abs (coordinate_offset_f_i) % 2)) - y += (Real)dir_ * inter_f; + /* I don't understand how this is supposed to work, + simple patch below. Mats B + if (!(abs (coordinate_offset_f_i) % 2)) + y += (Real)dir_ * inter_f; */ + y = (Real)dir_ * 6 * inter_f; } // else // y = v[dir_] + 1 * dir_ * inter_f; diff --git a/po/nl.po b/po/nl.po index 23d4cdd5e3..0bc609467d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -316,7 +316,7 @@ msgstr " -D, --debug toon ontluis berichten\n" #: main.cc:94 msgid "" " -d, --dependencies write Makefile dependencies for every input file\n" -msstr "" +msgstr "" " -d, --dependencies schrijf Makefile afhankelijkheden voor elk\n" " invoerbestand\n" diff --git a/scm/lily.scm b/scm/lily.scm index 4aa093e818..2085fe20f9 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -78,6 +78,9 @@ (define (settypewriter s) (text "typewriter" s)) (define (setnumber s) (text "number" s)) (define (setbold s) (text "bold" s)) +(define (setlarge s) (text "large" s)) +(define (setLarge s) (text "Large" s)) +(define (setmark s) (text "mark" s)) (define (setfinger s) (text "finger" s)) (define (setitalic s) (text "italic" s)) (define (setnumber-1 s) (text "numberj" s)) -- 2.39.5