From 9a82eab360f87ed4c947f786336e7685a63eab36 Mon Sep 17 00:00:00 2001 From: Mats Bengtsson Date: Fri, 19 Feb 1999 11:55:13 +0100 Subject: [PATCH] patch::: 1.1.31.mb1: Re: Spacing problem pl 31.mb1 - bf: don't attach staff margin text to clef changes within the lines. (Still not perfect: no text when a clef change happens at the line break). - Added property textScriptPadding. - A failing attempt to fix spacing of multi- measure rests pl 31.jcn1 - bf: slur-follow-music --- Generated by (address unknown) using package-diff 0.62, >From = lilypond-1.1.31.jcn1, To = lilypond-1.1.31.mb1 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.31.mb1.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure and possibly make outdirs. --state 1.1.31.jcn1 1.1.31.mb1 ++state --- Documentation/tex/refman.yo | 3 +++ NEWS | 15 ++++++++++++++- VERSION | 2 +- lily/bar-script-engraver.cc | 6 +++++- lily/include/multi-measure-rest.hh | 1 + lily/multi-measure-rest.cc | 11 +++++++++++ lily/text-engraver.cc | 6 ++++++ ly/params.ly | 2 ++ 8 files changed, 43 insertions(+), 3 deletions(-) diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo index 6cad45cc87..998ec95377 100644 --- a/Documentation/tex/refman.yo +++ b/Documentation/tex/refman.yo @@ -1475,6 +1475,9 @@ note. Set to \center to align the center of the text with the note. dit(code(textstyle)) Set the text style for superscripts and subscripts. See above for list of text styles. +dit(code(textScriptPadding)) Determines the extra space added between +super-/subscripted text and the closest staff line or note. + dit(code(fontsize)) Can be used to select smaller font sizes for music. The normal font size is 0, and the two smaller sizes are -1 and -2. diff --git a/NEWS b/NEWS index 667a0ee353..bf61765923 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,17 @@ -pl 31.jcn2 +--- ../lilypond-1.1.31/NEWS Wed Feb 17 10:39:09 1999 +++ b/NEWS Fri Feb 19 03:00:33 1999 +@@ -1,3 +1,11 @@ +pl 31.mb1 + - bf: don't attach staff margin text to clef changes within the + lines. (Still not perfect: no text when a clef change happens + at the line break). + - Added property textScriptPadding. + - A failing attempt to fix spacing of multi- measure rests +pl 31.jcn1 + - bf: slur-follow-music + + pl 30.jcn1 + - sm fixes, intl/ fixespl 31.jcn2 - fix: rat != float pl 31.jcn1 diff --git a/VERSION b/VERSION index 071fe9bc5a..39d4ce84cf 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 PATCH_LEVEL=31 -MY_PATCH_LEVEL=jcn2 +MY_PATCH_LEVEL=mb1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/lily/bar-script-engraver.cc b/lily/bar-script-engraver.cc index 63e6155438..e22ef34cb2 100644 --- a/lily/bar-script-engraver.cc +++ b/lily/bar-script-engraver.cc @@ -57,7 +57,11 @@ Bar_script_engraver::cast_to_interesting_item (Score_element *e) Item * i =0; if (hang_on_clef_b_) { - i = dynamic_cast (e); + Clef_item * c = dynamic_cast (e); + if (c && c->default_b_) + { + i = c; + } } else { diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh index 7a62fcdc05..f26b2aa0b9 100644 --- a/lily/include/multi-measure-rest.hh +++ b/lily/include/multi-measure-rest.hh @@ -29,6 +29,7 @@ protected: virtual void do_post_processing (); virtual void do_print () const; virtual void do_substitute_dependency (Score_element*,Score_element*); + Array get_rods () const; }; #endif /* MULTI_MEASURE_REST_HH */ diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index b181979d06..bc7c6bf00a 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -106,3 +106,14 @@ Multi_measure_rest::add_column (Bar* c) add_dependency (c); } + +Array +Multi_measure_rest::get_rods () const +{ + Array a; + Rod r; + r.item_l_drul_ = spanned_drul_; + r.distance_f_ = paper ()->get_var ("mmrest_x_minimum"); + a.push (r); + return a; +} diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index 088ca5577c..d33a5d8fff 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -87,6 +87,12 @@ Text_engraver::do_process_requests () text->style_str_ = p; text->text_str_ = t->text_str_; + Scalar padding = get_property ("textScriptPadding", 0); + if (padding.length_i() && padding.isnum_b ()) + { + ss->padding_f_ = Real(padding); + } + announce_element (Score_element_info (text, r)); announce_element (Score_element_info (ss, r)); diff --git a/ly/params.ly b/ly/params.ly index 8be7f2a9b2..1e52c2b950 100644 --- a/ly/params.ly +++ b/ly/params.ly @@ -132,6 +132,8 @@ volta_thick = 1.6*\staffline; extender_height = 0.8*\staffline; +% Multi-measure rests +mmrest_x_minimum = 1.0*\staffline; \include "engraver.ly"; -- 2.39.5