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

diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo
index 6cad45cc87ed347f40e31edb0730287d4b364e8f..998ec95377e2960c9037a2b5c063415f159ad948 100644 (file)
--- 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 667a0ee3530810a0047a34f375408f0e1513be78..bf617659232a56895fe8348402711cdc1046b986 100644 (file)
--- 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 071fe9bc5a7dd68bf0890df5303554cc8bc70746..39d4ce84cfe743006b9b2b5ad722abdc1296f4ef 100644 (file)
--- 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 63e6155438b8bda8eb1cec69043ce6b7ebab02da..e22ef34cb25529fc8e30eb60c1d62763f65eba7e 100644 (file)
--- 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<Clef_item*> (e);
+      Clef_item * c = dynamic_cast<Clef_item*> (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 7a62fcdc05affeac73c8d6d4859d5f948efe0238..f26b2aa0b97b43daad1e439d5a0413b352ca073d 100644 (file)
--- 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<Rod> get_rods () const;
 };
 
 #endif /* MULTI_MEASURE_REST_HH */

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index b181979d061ad2fc81b68c205def4007b1248d94..bc7c6bf00a762ed4743d54ac139fd9d22923cfd7 100644 (file)
--- 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<Rod>
+Multi_measure_rest::get_rods () const
+{
+  Array<Rod> 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 088ca5577c62f8b0da4992340d68064ae4427073..d33a5d8fffb941940a663bdb1e2815958b0fa520 100644 (file)
--- 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 8be7f2a9b26ef95ff1be0a64df4cbe30231f9ce2..1e52c2b9507848379167f03ff29886c3d3be2e8c 100644 (file)
--- 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";