From 73be1487b9ecacbe2578b0296e2ee983edef5a0a Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 13 Mar 2005 16:59:31 +0000 Subject: [PATCH] Fix and update. --- ChangeLog | 4 ++ input/regression/page-breaks.ly | 85 +++++++++++++++++---------------- 2 files changed, 48 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46a7cc5b98..e878b05924 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-03-13 Jan Nieuwenhuizen + + * input/regression/page-breaks.ly: Fix and update. + 2005-03-10 Jan Nieuwenhuizen * stepmake/stepmake/texinfo-vars.make: DESTDIR fixes (Matthias diff --git a/input/regression/page-breaks.ly b/input/regression/page-breaks.ly index 823e5a0057..289ebb3c6a 100644 --- a/input/regression/page-breaks.ly +++ b/input/regression/page-breaks.ly @@ -1,54 +1,57 @@ -#(ly:set-point-and-click 'line-column) \version "2.4.0" \header { -texidoc = "Stress optimal page breaking. This should look + texidoc = "Stress optimal page breaking. This should look nice on 4 a6 pages. " - - copyright = "Copyright by /me" - - title = "Title" - subtitle = "(and (the) subtitle)" - subsubtitle = "Sub sub title" - poet = "Poet" - composer = "Composer" - texttranslator = "Text Translator" - opus = "opus 0" - meter = "Meter (huh?)" - arranger = "Arranger" - instrument = "Instrument" - piece = "Piece" + + copyright = "Copyright by /me" + + title = "Title" + subtitle = "(and (the) subtitle)" + subsubtitle = "Sub sub title" + poet = "Poet" + composer = "Composer" + texttranslator = "Text Translator" + meter = "Meter (huh?)" + arranger = "Arranger" + instrument = "Instrument" + piece = "Piece" + opus = "opus 0" } -#(set-default-paper-size "a6" 'portrait) +#(define (header layout scopes page-number last?) + (stack-stencils Y DOWN 0 + (list + (let ((props (page-properties layout))) + (interpret-markup layout props + (make-line-markup (list (markup #:box #:fill-line ("" "")))))) + (plain-header layout scopes page-number last?)))) + +#(define (footer layout scopes page-number last?) + (stack-stencils Y DOWN 0 + (list + (plain-footer layout scopes page-number last?) + (let ((props (page-properties layout))) + (interpret-markup layout props + (make-line-markup (list (markup #:box #:fill-line ("" ""))))))))) + +\paper { + raggedlastbottom = ##f + #(define make-header header) + #(define make-footer footer) +} +#(set-default-paper-size "a6" 'portrait) -pattern = { a b c d \break } \book { - \score { - \context Staff \relative c' { - %% 16: ideally cramped - %% 17: very bad without density - % \repeat unfold 17 { a b c d \break } - - \pattern - \pattern - % \noPageBreak - \pattern - - % the following changes the location of the break. - % - % \pageBreak - - \pattern - \pattern - \pattern - \pattern - \repeat unfold 10 \pattern - } - + \score { + \new Staff \relative c' { + %% 19: ideally cramped + %%\repeat unfold 19 { a b c d \break } + %% 15: test even distribution + \repeat unfold 15 { a b c d \break } } - + } } -- 2.39.5