Fix and update.

diff --git a/ChangeLog b/ChangeLog
index 46a7cc5b98a1eee8d9af9a28012634da1bd80b16..e878b05924f28d9db9070f098e6845fbb2f6a272 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-13  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * input/regression/page-breaks.ly: Fix and update.
+
 2005-03-10  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * stepmake/stepmake/texinfo-vars.make: DESTDIR fixes (Matthias

diff --git a/input/regression/page-breaks.ly b/input/regression/page-breaks.ly
index 823e5a00579611958b8ce9c1692f5a876e8847ee..289ebb3c6a78b0d5418c98e0607545ac9fe33280 100644 (file)
--- 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 }
     }
-    
+  }
 }