From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 6 Sep 2004 20:34:13 +0000 (+0000)
Subject: * scm/define-grobs.scm (all-grob-descriptions): unset
X-Git-Tag: release/2.3.15~18
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fffb3f4ca81f3e188e81c85e633b8e3ecfaca381;p=lilypond.git

* scm/define-grobs.scm (all-grob-descriptions): unset
threshold. This fixes morgenlied.

* scm/page-layout.scm (ly:optimal-page-breaks): whoops. Thinko in
rod calculation.
---

diff --git a/ChangeLog b/ChangeLog
index 73f13a9e5a..d56829a1cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-09-06  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* scm/define-grobs.scm (all-grob-descriptions): unset
+	threshold. This fixes morgenlied. 
+
+	* scm/page-layout.scm (ly:optimal-page-breaks): whoops. Thinko in
+	rod calculation.
+
 	* lily/system.cc (get_line): don't take piano-pedal & dynamic line
 	spanners into account for staff-extents.
 
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index c976dbcf46..f1c93fe2a3 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1331,7 +1331,7 @@
 	(Y-extent-callback . ,Axis_group_interface::group_extent_callback)
 	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
 	(stacking-dir . -1)
-	(threshold .  (12 . 1000))
+;	(threshold .  (6 . 1000))
 	(meta . ((interfaces . (align-interface axis-group-interface spanner-interface))))
 	))
 
diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index 63fbb35557..7422ca2682 100644
--- a/scm/page-layout.scm
+++ b/scm/page-layout.scm
@@ -311,7 +311,7 @@ is what have collected so far, and has ascending page numbers."
 	       (cdr  result)))
 	 )
 
-     (if #t ;; debug.
+     (if #f ;; debug.
 	 (begin
 	   (display (list "\n# systems: " no-systems
 			  "\nreal-ext" real-extents "\nstaff-ext" staff-extents