From fb90bcfab9e7d98b572dcac3f8b80d82282b3ae4 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 12 Sep 2004 12:39:32 +0000 Subject: [PATCH] * 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 --- ChangeLog | 12 ++++++++++ Documentation/user/changing-defaults.itely | 10 +++++++- Documentation/user/cheatsheet.itely | 1 - Documentation/user/converters.itely | 1 - Documentation/user/dedication.itely | 1 - Documentation/user/introduction.itely | 1 - Documentation/user/lilypond-book.itely | 1 - Documentation/user/literature.itely | 1 - Documentation/user/notation-appendices.itely | 1 - Documentation/user/notation.itely | 1 - Documentation/user/point-and-click.itely | 1 - Documentation/user/preface.itely | 1 - .../user/programming-interface.itely | 1 - Documentation/user/scheme-tutorial.itely | 1 - .../J.S.Bach/baerenreiter-sarabande.ly | 3 ++- ly/book-paper-defaults.ly | 4 ++++ scm/page-layout.scm | 24 +++++++++++++++++-- 17 files changed, 49 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7899fe030e..13237435cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2004-09-12 Han-Wen Nienhuys + * 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 7701e4ccc7..ad56c107f9 100644 --- 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 ad15ea38d8..6b92acf663 100644 --- 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 0faf096503..b84ef3f496 100644 --- 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 654105cbf3..cc5b1fc081 100644 --- 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 8a639e6f5d..b9570303f2 100644 --- 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 20e79b2caa..9602841c59 100644 --- 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 eddcd4c50e..b561b48b9b 100644 --- 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 83d9fc28ab..11ceaa4bdb 100644 --- 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 f1bd11692a..8b6156757b 100644 --- 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 badbe8f076..f099513e4b 100644 --- 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 2308ca8a0c..f6c8547357 100644 --- 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 a8e2f84e11..057d52db66 100644 --- 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 ab7bd71645..bc3c2b3250 100644 --- 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 7f6798d5e2..1362400798 100644 --- 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 5808ecaae8..ffad72304f 100644 --- 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 3912db064b..5e0d45841d 100644 --- 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 -- 2.39.5