From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 6 Sep 2004 18:20:11 +0000 (+0000)
Subject: (get_line): don't take piano-pedal & dynamic line
X-Git-Tag: release/2.3.15~20
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cc0fdf2435e25de4bf782713160b2f030ff7432b;p=lilypond.git

(get_line): don't take piano-pedal & dynamic line
spanners into account for staff-extents.
---

diff --git a/ChangeLog b/ChangeLog
index 59dbb8e25f..73f13a9e5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-09-06  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* lily/system.cc (get_line): don't take piano-pedal & dynamic line
+	spanners into account for staff-extents.
+
 	* lily/ottava-bracket.cc (print): take common refpoint of dots
 	into account as well.
 
diff --git a/lily/system.cc b/lily/system.cc
index 75c7a95551..a9161074de 100644
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -348,7 +348,13 @@ System::get_line ()
 	if (i == 0
 	    && Axis_group_interface::has_interface (g)
 	    && !Align_interface::has_interface (g)
-	    && dynamic_cast<Spanner*> (g))
+	    && dynamic_cast<Spanner*> (g)
+	    /*
+	      UGH.
+	     */
+	    && !g->internal_has_interface (ly_symbol2scm ("dynamic-interface"))
+	    && !g->internal_has_interface (ly_symbol2scm ("piano-pedal-interface"))
+	    )
 	  {
 	    staff_refpoints.add_point (g->relative_coordinate (this, Y_AXIS));
 	  }
diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index c083f476d9..5c2834b478 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 #f ;; debug.
+     (if #t ;; debug.
 	 (begin
 	   (display (list "\n# systems: " no-systems
 			  "\nreal-ext" real-extents "\nstaff-ext" staff-extents