From e2db11e0f6c409057fb6de64055ca3d799e52795 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 23:22:07 +0000
Subject: [PATCH] lilypond-1.3.53

---
 CHANGES                            | 37 +++++++++++++++++++++++++++---
 Documentation/regression-test.tely |  6 +++++
 VERSION                            |  2 +-
 input/bugs/repeat-line-break.ly    | 10 ++++++++
 input/test/repeat-line-break.ly    | 10 ++++++++
 lily/volta-spanner.cc              | 10 +++++---
 6 files changed, 68 insertions(+), 7 deletions(-)
 create mode 100644 input/bugs/repeat-line-break.ly
 create mode 100644 input/test/repeat-line-break.ly

diff --git a/CHANGES b/CHANGES
index e18d51f048..5e4b8ca693 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,37 @@
-* Bugfix in smob handling.  Delete the C-part of freed smobs. Be
-honest about amount of allocation and deletion, so GUILE doesn't
-overestimate the amount of memory.
+1.3.53
+======
+* Small cleanups in Molecule interface 
+
+* Spacing related elements perform suicide after calculating
+distances.  This saves a some memory, approximately 2 to 5 % ?
+
+* Small cleanups in line breaking: Paper_column stores springs and
+rods in only one place now.  All fields relating to energy have been
+removed
+
+* Don't generate all output Scheme in memory, but evaluate to output
+file immediately.  This will reduce memory usage a little.
+
+* Use STL's map  for Dictionary template
+
+* Substitute pointers on element properties of the root Line_of_score
+as well.
+
+* Added toplevel doc target, to support building doc with --srcdir
+
+* Removed cygwin build stuff; updated versions at:
+
+     http://appel.dyndns.org/lilypond/gnu-windows/cross
+
+* Fixed lily.scm to handle incipits (thanks, Mats)
+
+
+1.3.52
+======
+
+* Made bugfix in smob handling: delete the C-part of freed smobs and
+be honest about amount of allocation and deletion, so that GUILE
+doesn't overestimate the amount of memory available.
 
 * Faq update: nicer blank note paper, courtesy Mats Bengtsson.
 
diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely
index d2b24987f6..0b12f68e14 100644
--- a/Documentation/regression-test.tely
+++ b/Documentation/regression-test.tely
@@ -222,6 +222,12 @@ Folded.  This doesn't make sense without alternatives, but it works.
 
 @mudelafile{repeat-fold.ly}
 
+Across linebreaks, first and second bracket should be equal
+
+@mudelafile{repeat-line-break.ly}
+
+
+
 @section Lyrics
 
 Lyrics can be set to a melody automatically.  Excess lyrics will be
diff --git a/VERSION b/VERSION
index ea5b0890e4..9913331784 100644
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
-PATCH_LEVEL=52
+PATCH_LEVEL=53
 MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
diff --git a/input/bugs/repeat-line-break.ly b/input/bugs/repeat-line-break.ly
new file mode 100644
index 0000000000..06ff02cd31
--- /dev/null
+++ b/input/bugs/repeat-line-break.ly
@@ -0,0 +1,10 @@
+
+\score  {
+\notes
+\context Staff\relative c''  {
+	\repeat "volta" 2 { c1 \break } \alternative { d e }
+	c1
+	\repeat "volta" 2 { c1 } \alternative { { d \break}  e }
+
+}
+}
diff --git a/input/test/repeat-line-break.ly b/input/test/repeat-line-break.ly
new file mode 100644
index 0000000000..06ff02cd31
--- /dev/null
+++ b/input/test/repeat-line-break.ly
@@ -0,0 +1,10 @@
+
+\score  {
+\notes
+\context Staff\relative c''  {
+	\repeat "volta" 2 { c1 \break } \alternative { d e }
+	c1
+	\repeat "volta" 2 { c1 } \alternative { { d \break}  e }
+
+}
+}
diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc
index f3cc65b459..ad7f9aa301 100644
--- a/lily/volta-spanner.cc
+++ b/lily/volta-spanner.cc
@@ -36,7 +36,9 @@ Volta_spanner::Volta_spanner ()
 
   --
 
-  Should look for system_start_delim to find left edge of staff.
+  * Should look for system_start_delim to find left edge of staff.
+  
+  
 */
 Molecule 
 Volta_spanner::do_brew_molecule () const
@@ -66,7 +68,9 @@ Volta_spanner::do_brew_molecule () const
   Real staff_space = paper_l ()->get_var ("interline");
   Real half_space = staff_space / 2;
 
-  Real w = spanner_length () - get_broken_left_end_align () - half_space;
+  Real w = spanner_length ()
+  - get_broken_left_end_align ()
+    - half_space;
   Real h = paper_l()->get_var ("volta_spanner_height");
   Real t = paper_l ()->get_var ("volta_thick");
 
@@ -77,7 +81,7 @@ Volta_spanner::do_brew_molecule () const
 		     gh_int2scm (no_vertical_start),
 		     gh_int2scm (no_vertical_end),
 		     SCM_UNDEFINED));
-  //Box b (Interval (0, w), Interval (- h/2, h/2));
+
   Box b (Interval (0, w), Interval (0, h));
   Molecule volta (b, at);
   mol.add_molecule (volta);
-- 
2.39.5