(get_line): don't take piano-pedal & dynamic line

spanners into account for staff-extents.

diff --git a/ChangeLog b/ChangeLog
index 59dbb8e25f6168bf269c14b0278ae3fe0da77da2..73f13a9e5a1e45a9905e7efda15e05f6f693e5f0 100644 (file)
--- 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 75c7a9555100f276ea2939b4fba9d9ba93f70465..a9161074de2dd015097be988b708bfe6c282304a 100644 (file)
--- 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 c083f476d9ac9d0ad0e54f0b7f04265b5e937f2b..5c2834b478216ed7e60c03d47c3e52576936a25e 100644 (file)
--- 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