From d0c00ec977cd6973d057e2e791f165b800a546c5 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Thu, 18 Jan 2007 19:39:45 +0200 Subject: [PATCH] make web fixes --- lily/system.cc | 4 ---- scm/layout-page-dump.scm | 7 ------- scm/layout-page-layout.scm | 9 +++++++++ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/lily/system.cc b/lily/system.cc index d71fa20b48..85670f2927 100644 --- 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 acb8cb177a..8237106f06 100644 --- 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 c5721b325a..5b030d868c 100644 --- 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) -- 2.39.2