* Documentation/user/changing-defaults.itely (Page layout):

document them.

* scm/page-layout.scm (ly:optimal-page-breaks): use new parameters
to get sane spaces for titles.

* ly/book-paper-defaults.ly: new parameters aftertitlespace,
beforetitlespace, betweentitlespace.

* scm/page-layout.scm (ly:optimal-page-breaks): add
betweensystempadding also to fixed distance for the spring.

This fixes: morgenlied.ly and input/regression/beam-concave.ly

diff --git a/ChangeLog b/ChangeLog
index 7899fe030e74ca3e57441b3602b347b242f4098a..13237435cc726a4c11aefb138ef6a767d0a7faf2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2004-09-12  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * Documentation/user/changing-defaults.itely (Page layout):
+       document them.
+
+       * scm/page-layout.scm (ly:optimal-page-breaks): use new parameters
+       to get sane spaces for titles.
+
+       * ly/book-paper-defaults.ly: new parameters aftertitlespace,
+       beforetitlespace, betweentitlespace.
+
+       * input/regression/beam-quant-standard.ly (primeSixteenths): add
+       16th notes.
+
        * lily/beam.cc (set_minimum_dy): new function. Round non-zero
        small slope up to smallest quant. This prevents small slopes from
        getting rounded to zero.

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 7701e4ccc78c9d20c5b75475294b7fcf539f31d4..ad56c107f93cc7f96901229aa8c4ad8ae1cfc02e 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -1,4 +1,3 @@
-\version "2.3.16"
 @c -*-texinfo-*-
 @node Changing defaults
 @chapter Changing defaults
@@ -2251,6 +2250,15 @@ topmost of the next system.
 Increasing this will put systems whose bounding boxes almost touch
 farther apart.
 
+@item aftertitlespace
+Amount of space between title and the first system
+@item beforetitlespace 
+Amount of space between last system of the previous piece and  the
+title of the next
+@item betweentitlespace
+Amount of space between consecutive titles (eg. the title   of the
+book and the title of piece).
+
 @end table
 
 @example

diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely
index ad15ea38d84f1ced09ee449253cf70a6fccb677c..6b92acf663fea3130e64eeeab89f59db5f8a2e40 100644 (file)
--- a/Documentation/user/cheatsheet.itely
+++ b/Documentation/user/cheatsheet.itely
@@ -1,4 +1,3 @@
-\version "2.3.16"
 @c -*-texinfo-*-
 
 

diff --git a/Documentation/user/converters.itely b/Documentation/user/converters.itely
index 0faf096503d03cf570835c4999107d5017fa5f2b..b84ef3f496d5355efb4d675c21cab5c7fc5594ee 100644 (file)
--- a/Documentation/user/converters.itely
+++ b/Documentation/user/converters.itely
@@ -1,4 +1,3 @@
-\version "2.3.16"
 @c -*-texinfo-*-
 
 @node Converting from other formats

diff --git a/Documentation/user/dedication.itely b/Documentation/user/dedication.itely
index 654105cbf3402f230b04094b6237ebdf592df83b..cc5b1fc081a51db2fe56175e974663628c1ac38c 100644 (file)
--- a/Documentation/user/dedication.itely
+++ b/Documentation/user/dedication.itely
@@ -1,4 +1,3 @@
-\version "2.3.16"
 
 @quotation
 We want to dedicate this program to all the friends that we

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 8a639e6f5d4c1247dc58d52850df982dffccf43f..b9570303f2e963d5146d71ed817b6bf133f7eec9 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -1,4 +1,3 @@
-\version "2.3.16"
 @c -*-texinfo-*-
 @c This file is part of lilypond.tely
 

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index 20e79b2caa671c7fddbcf27bebc66483dd99974b..9602841c59167438ae8f54893b4beb9cbd5d491c 100644 (file)
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -1,4 +1,3 @@
-\version "2.3.16"
 @c -*-texinfo-*-
 
 @ignore

diff --git a/Documentation/user/literature.itely b/Documentation/user/literature.itely
index eddcd4c50ed70463bd8cebebd084967ce2211207..b561b48b9b4a0e3b11eaaece48b47770cab0ac3d 100644 (file)
--- a/Documentation/user/literature.itely
+++ b/Documentation/user/literature.itely
@@ -1,4 +1,3 @@
-\version "2.3.16"
 @node Literature list
 @appendix Literature list
 

diff --git a/Documentation/user/notation-appendices.itely b/Documentation/user/notation-appendices.itely
index 83d9fc28abef537e9d9cd56bd0db2faa946c744c..11ceaa4bdb28abbc13e04761dc146d0c8153bf3d 100644 (file)
--- a/Documentation/user/notation-appendices.itely
+++ b/Documentation/user/notation-appendices.itely
@@ -1,4 +1,3 @@
-\version "2.3.16"
 @c Note: -*-texinfo-*-
 @c This file is part of lilypond.tely
 

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index f1bd11692aeb5aa50c31e5eed390921961539710..8b6156757b7a196fd49d76f792eb63f9056218e6 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -1,4 +1,3 @@
-\version "2.3.16"
 @c Note: -*-texinfo-*-
 @c This file is part of lilypond.tely
 

diff --git a/Documentation/user/point-and-click.itely b/Documentation/user/point-and-click.itely
index badbe8f0761f82a3820062d14704097c374830dd..f099513e4b200f4f2179e2f32ca0845746eebea5 100644 (file)
--- a/Documentation/user/point-and-click.itely
+++ b/Documentation/user/point-and-click.itely
@@ -1,4 +1,3 @@
-\version "2.3.16"
 @node Point and click
 @appendix Point and click
 @cindex point and click

diff --git a/Documentation/user/preface.itely b/Documentation/user/preface.itely
index 2308ca8a0c93745bf2c40608ab67bf5a5d9870dc..f6c85473570fc42dba034579f86ce2abb09faa5a 100644 (file)
--- a/Documentation/user/preface.itely
+++ b/Documentation/user/preface.itely
@@ -1,4 +1,3 @@
-\version "2.3.16"
 @comment @c -*-texinfo-*-
 
 @node Preface

diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely
index a8e2f84e112e1150457f67c24039e71676ffc89c..057d52db6640bb1cf20a2ffd6c48abe1a73c4792 100644 (file)
--- a/Documentation/user/programming-interface.itely
+++ b/Documentation/user/programming-interface.itely
@@ -1,4 +1,3 @@
-\version "2.3.16"
 @c -*-texinfo-*-
 @node Interfaces for programmers
 @chapter Interfaces for programmers

diff --git a/Documentation/user/scheme-tutorial.itely b/Documentation/user/scheme-tutorial.itely
index ab7bd716452e3a4278b0798b01f868c6fb96a4fa..bc3c2b325015e0e9446c31d59f4a401d5468fd03 100644 (file)
--- a/Documentation/user/scheme-tutorial.itely
+++ b/Documentation/user/scheme-tutorial.itely
@@ -1,4 +1,3 @@
-\version "2.3.16"
 
 
 @node Scheme tutorial

diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
index 7f6798d5e24bb1ed2096dbc3333b8c47a8399ef6..13624007984ccb39cf4f6937150c617955831fc5 100644 (file)
--- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
+++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
@@ -176,8 +176,9 @@ baerPaper = \paper {
 \bookpaper {
   raggedbottom = ##t
   betweensystemspace = 25\mm 
-  betweensystempadding = 0\mm 
+  betweensystempadding = 0\mm
 }
+
 \score{
   \sarabandeCelloStaff
   \paper{

diff --git a/ly/book-paper-defaults.ly b/ly/book-paper-defaults.ly
index 5808ecaae86118574e45aa76f7c107d148e53e08..ffad72304f5dcf10c72b989d2d594621ff022be6 100644 (file)
--- a/ly/book-paper-defaults.ly
+++ b/ly/book-paper-defaults.ly
@@ -48,6 +48,10 @@
     %
     betweensystempadding = #(* 4 mm)
 
+    aftertitlespace = 5 \mm
+    beforetitlespace = 10 \mm
+    betweentitlespace = 2 \mm
+
 
     raggedbottom = ##f
     raggedlastbottom= ##f

diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index 3912db064bf4762de8c27510d5ed0f22b45b3a2a..5e0d45841d94db0f1934c489a3aabb743e7a64a5 100644 (file)
--- a/scm/page-layout.scm
+++ b/scm/page-layout.scm
@@ -242,6 +242,12 @@ is what have collected so far, and has ascending page numbers."
     (let*
        ((inter-system-space
          (ly:output-def-lookup bookpaper 'betweensystemspace))
+        (system-vector (list->vector
+          (append lines
+                  (if (= (length lines) 1)
+                      '(#f)
+                       '()))
+          ))
 
         (staff-extents
          (list->vector
@@ -282,7 +288,21 @@ is what have collected so far, and has ascending page numbers."
                 (fixed (max 0  (- (+ (cdr next-system-ext)
                                      fixed-dist)
                                   (car this-system-ext))))
-                (ideal (+ inter-system-space fixed))
+                (title1? (and (vector-ref system-vector idx)
+                              (ly:paper-system-title? (vector-ref system-vector idx))))
+                (title2? (and
+                           (vector-ref system-vector (1+ idx))
+                           (ly:paper-system-title? (vector-ref system-vector (1+ idx)))))
+                (ideal (+
+                        (cond
+                         ((and title2? title1?)
+                          (ly:output-def-lookup bookpaper 'betweentitlespace)))
+                         (title1?
+                          (ly:output-def-lookup bookpaper 'aftertitlespace))
+                         (title2?
+                          (ly:output-def-lookup bookpaper 'beforetitlespace))
+                         (else inter-system-space))
+                        fixed))
                 (hooke (/ 1 (- ideal fixed)))
                 )
              (list ideal hooke))
@@ -315,7 +335,7 @@ is what have collected so far, and has ascending page numbers."
               (cdr  result)))
         )
 
-     (if #t ;; debug.
+     (if #f ;; debug.
         (begin
           (display (list "\n# systems: " no-systems
                          "\nreal-ext" real-extents "\nstaff-ext" staff-extents