patch::: 1.3.41.mb1: Patch and copyright placement?

1.3.41.mb1

* Avoid that xxxXXXVerticalExtent is used for empty HaraKiriStaff
  lines.

---
Generated by (address unknown),
>From = lilypond-1.3.41, To = lilypond-1.3.41.mb1

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.41.mb1.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure

diff --git a/CHANGES b/CHANGES
index 4b8ac2ac1dd0582edc90992934edc9d1b53024d4..a81ff5a0f71e1a5aba525718d5b31cf677e681a7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,14 @@
---- ../lilypond-1.3.41.jcn2/CHANGES    Sat Apr  1 13:09:18 2000
+--- ../lilypond-1.3.41/CHANGES Thu Mar 30 11:05:01 2000
+++ b/CHANGES   Sat Apr  1 20:35:51 2000
+@@ -1,3 +1,8 @@
+1.3.41.mb1
+
+* Avoid that xxxXXXVerticalExtent is used for empty HaraKiriStaff 
+  lines.
+
+ 1.3.40.jcn3
+ ===========
+ --- ../lilypond-1.3.41.jcn2/CHANGES   Sat Apr  1 13:09:18 2000
 ++ b/CHANGES   Sat Apr  1 16:51:17 2000
 @@ -1,3 +1,9 @@
 1.3.41.jcn3

diff --git a/VERSION b/VERSION
index 43db4574f0b816f07bf0f349b6202273bca632e5..54ffdbe9f03bedb616a1829e4ad03910f752c36e 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=41
-MY_PATCH_LEVEL=jcn3
+MY_PATCH_LEVEL=mb1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/score-element.cc b/lily/score-element.cc
index 8da3d235a0d6d87c3128190dc61ad2d122581f2e..447426519bac01c80a2cf9b96914a32ec705330f 100644 (file)
--- a/lily/score-element.cc
+++ b/lily/score-element.cc
@@ -512,7 +512,9 @@ Score_element::extent (Axis a) const
   Dimension_cache const * d = dim_cache_[a];
   Interval ext = d->get_dim ();
 
-  
+  if (empty_b (a)) 
+    return ext;
+
   SCM extra = get_elt_property (a == X_AXIS ? "extra-extent-X"
                                : "extra-extent-Y");