From 07f53dbc18c8a8903fc8796029faa3ec3c0e707f Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 13 Mar 2005 11:20:07 +0000 Subject: [PATCH] * ly/titling-init.ly (bookTitleMarkup): Refinements. * input/regression/page-breaks.ly (paper): Set not raggedlastbottom, header/footer markings for regression-test. --- ChangeLog | 5 ++ input/les-nereides.ly | 3 +- input/regression/page-breaks.ly | 88 ++++++++++++++++++--------------- ly/titling-init.ly | 59 +++++++++++----------- 4 files changed, 85 insertions(+), 70 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4ae70b3f35..c397bed89d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2005-03-13 Jan Nieuwenhuizen + * ly/titling-init.ly (bookTitleMarkup): Refinements. + + * input/regression/page-breaks.ly (paper): Set not raggedlastbottom, + header/footer markings for regression-test. + * scm/backend-library.scm (output-scopes, header-to-file): Move from framework-tex.scm. diff --git a/input/les-nereides.ly b/input/les-nereides.ly index 27e0b55460..49b2ed474a 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,4 +1,5 @@ \version "2.5.13" + \header { composer = "ARTHUR GRAY" title = "LES NÉRÉIDES" @@ -297,6 +298,6 @@ theScore = \score{ %%% Local variables: %%% coding: utf-8 -%%% LilyPond-indent-level:4 +%%% LilyPond-indent-level:2 %%% End: diff --git a/input/regression/page-breaks.ly b/input/regression/page-breaks.ly index 12f04cad9d..d6108f822e 100644 --- a/input/regression/page-breaks.ly +++ b/input/regression/page-breaks.ly @@ -2,52 +2,60 @@ \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) - +\paper { + raggedlastbottom = ##f -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 } + bookTitleMarkup = \markup \box \bookTitleMarkup + %% oddHeaderMarkup = \markup \box { + oddHeaderMarkup = \markup \on-the-fly #not-first-page \box { + \column { + \override #'(baseline-skip . -1) + %%\fill-line { \teeny "---------------HEAD---------------" } + \line { \oddHeaderMarkup } + } + } + evenHeaderMarkup = \markup \box { + \column { + \override #'(baseline-skip . -1) + %%\fill-line { \teeny "---------------HEAD---------------" } + \line { \evenHeaderMarkup } + } + } + oddFooterMarkup = \markup \box { + \override #'(baseline-skip . -1) + \column { + \line { \oddFooterMarkup } + \fill-line { \teeny "---------------FOOT---------------" } + } + } +} - \pattern - \pattern - % \noPageBreak - \pattern - - % the following changes the location of the break. - % - % \pageBreak - - \pattern - \pattern - \pattern - \pattern - \repeat unfold 10 \pattern - } +#(set-default-paper-size "a6" 'portrait) +\book { + \score { + \new Staff \relative c' { + %% 18: ideally cramped + \repeat unfold 19 { a b c d \break } } - + } } diff --git a/ly/titling-init.ly b/ly/titling-init.ly index 9246a90128..f4f552b140 100644 --- a/ly/titling-init.ly +++ b/ly/titling-init.ly @@ -10,7 +10,7 @@ slashSeparator = \markup { tagline = \markup { \with-url - % todo: lilypond.org/music-engraving + %% todo: lilypond.org/music-engraving #"http://lilypond.org/web/" \line { "Music engraving by LilyPond" @@ -24,26 +24,27 @@ bookTitleMarkup = \markup { \override #'(baseline-skip . 3) \column { \fill-line { \fromproperty #'header:dedication } - \override #'(baseline-skip . 3.5) - \huge \bigger \bold - \column { - \fill-line { - \bigger \fromproperty #'header:title - } - \fill-line { - \bigger \fromproperty #'header:subtitle - } - \fill-line { - \fromproperty #'header:subsubtitle - } + \column { + \override #'(baseline-skip . 3.5) + \huge \bigger \bold + \fill-line { + \bigger \fromproperty #'header:title } - - \fill-line { - \fromproperty #'header:poet - \fromproperty #'header:instrument - \column { - \fromproperty #'header:composer - \fromproperty #'header:arranger + \fill-line { + \large \smaller \bold + \bigger \fromproperty #'header:subtitle + } + \fill-line { + \smaller \bold + \fromproperty #'header:subsubtitle + } + \fill-line { + \fromproperty #'header:poet + { \large \bold \fromproperty #'header:instrument } + \column { + \fromproperty #'header:composer + \fromproperty #'header:arranger + } } } } @@ -58,24 +59,24 @@ scoreTitleMarkup = \markup { #(define (first-page layout props arg) (if (= (chain-assoc-get 'page:page-number props -1) 1) - (interpret-markup layout props arg) - empty-stencil)) + (interpret-markup layout props arg) + empty-stencil)) #(define (last-page layout props arg) (if (chain-assoc-get 'page:last? props #f) - (interpret-markup layout props arg) - empty-stencil)) + (interpret-markup layout props arg) + empty-stencil)) #(define (not-first-page layout props arg) (if (not (= (chain-assoc-get 'page:page-number props -1) 1)) - (interpret-markup layout props arg) - empty-stencil)) + (interpret-markup layout props arg) + empty-stencil)) #(define (not-single-page layout props arg) (if (not (and (= (chain-assoc-get 'page:page-number props -1) 1) - (chain-assoc-get 'page:last? props -1))) - (interpret-markup layout props arg) - empty-stencil)) + (chain-assoc-get 'page:last? props -1))) + (interpret-markup layout props arg) + empty-stencil)) oddHeaderMarkup = \markup \on-the-fly #not-single-page -- 2.39.5