make web fixes

diff --git a/lily/system.cc b/lily/system.cc
index d71fa20b48be8a5ff3503c22be895adf264ab5f5..85670f2927b087b7044bdc0e03750f2c799f92a0 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -405,9 +405,6 @@ System::get_paper_system ()
   pl->set_property ("page-break-penalty", right_bound->get_property ("page-break-penalty"));
   pl->set_property ("page-turn-penalty", right_bound->get_property ("page-turn-penalty"));
 
-  /* remove me if make web succeeds */
-  assert (!scm_is_pair (pl->get_property ("refpoint-Y-extent")));
-
   Interval staff_refpoints;
   extract_grob_set (this, "spaceable-staves", staves);
   for (vsize i = 0; i < staves.size (); i++)
@@ -540,5 +537,4 @@ ADD_INTERFACE (System,
               "spaceable-staves "
               "skyline-distance "
               "skyline-horizontal-padding "
-              "staff-refpoint-extent "
               )

diff --git a/scm/layout-page-dump.scm b/scm/layout-page-dump.scm
index acb8cb177ac760e5947a66f228ddce9431f34610..8237106f063ff967f447d05ae27cde2dd41a307b 100644 (file)
--- a/scm/layout-page-dump.scm
+++ b/scm/layout-page-dump.scm
@@ -16,13 +16,6 @@
            ;; utilisties for writing other page dump functions
            record-tweaks dump-all-tweaks))
 
-(define (stretchable-line? line)
-  "Say whether a system can be stretched."
-  (not (or (ly:prob-property? line 'is-title)
-          (let ((system-extent (paper-system-staff-extents line)))
-            (= (interval-start system-extent)
-               (interval-end   system-extent))))))
-
 (define (record-tweaks what property-pairs tweaks)
   (let ((key (ly:output-def-lookup (ly:grob-layout what)
                                   'tweak-key

diff --git a/scm/layout-page-layout.scm b/scm/layout-page-layout.scm
index c5721b325a98711b2d89c4ff7195705ea89e50fd..5b030d868c388ef4ec799bc8d47c3962636a2d78 100644 (file)
--- a/scm/layout-page-layout.scm
+++ b/scm/layout-page-layout.scm
@@ -15,6 +15,7 @@
   #:use-module (lily)
   #:export (post-process-pages optimal-page-breaks make-page-from-systems
            page-breaking-wrapper
+           stretchable-line? ; delete me
            ;; utilities for writing custom page breaking functions
             line-height line-next-space line-next-padding
            line-minimum-distance line-ideal-distance
@@ -23,6 +24,14 @@
             line-minimum-position-on-page
            page-maximum-space-to-fill page-maximum-space-left space-systems))
 
+; this is for 2-pass spacing. Delete me.
+(define (stretchable-line? line)
+  "Say whether a system can be stretched."
+  (not (or (ly:prob-property? line 'is-title)
+          (let ((system-extent (paper-system-staff-extents line)))
+            (= (interval-start system-extent)
+               (interval-end   system-extent))))))
+
 (define (stretch-and-draw-page paper-book systems page-number ragged last)
   (define (stretchable? sys)
     (and (ly:grob? sys)