From 7ed647a5156dd27b5c8705f3a12b12f4558d05ce Mon Sep 17 00:00:00 2001 From: Mats Bengtsson Date: Fri, 22 Sep 2006 07:31:29 +0000 Subject: [PATCH] * ly/titling-init.ly (scoreTitleMarkup): Rename (typo!?) printfirst-page-number -> print-first-page-number * python/convertrules.py: corresponding rule. * Documentation/user/page.itely (Page formatting): Document the default values of all page layout parameters. --- ChangeLog | 10 ++++++ Documentation/user/invoking.itely | 2 +- Documentation/user/page.itely | 52 ++++++++++++++++++------------- ly/titling-init.ly | 2 +- python/convertrules.py | 6 ++++ 5 files changed, 48 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 999a91a5ca..bf5710c049 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-09-22 Mats Bengtsson + + * ly/titling-init.ly (scoreTitleMarkup): Rename (typo!?) + printfirst-page-number -> print-first-page-number + + * python/convertrules.py: corresponding rule. + + * Documentation/user/page.itely (Page formatting): Document the + default values of all page layout parameters. + 2006-09-22 Erik Sandberg * lily/lexer.ll: remove limitation on music function arity. New diff --git a/Documentation/user/invoking.itely b/Documentation/user/invoking.itely index 81ceb0d90e..dc87e00d1d 100644 --- a/Documentation/user/invoking.itely +++ b/Documentation/user/invoking.itely @@ -502,7 +502,7 @@ stanzas. remove-tag isn't changed. - \applyMusic #(remove-tag '. . .) => \keepWithTag #'. . . first-page-number isn't changed. - - first-page-number no => printfirst-page-number = ##f + - first-page-number no => print-first-page-number = ##f Line breaks in header strings aren't converted. - \\\\ as line break in \header strings => \markup \center-align < "First Line" "Second Line" > diff --git a/Documentation/user/page.itely b/Documentation/user/page.itely index d89aad6a74..bb2c104ed4 100644 --- a/Documentation/user/page.itely +++ b/Documentation/user/page.itely @@ -112,63 +112,71 @@ The default layout responds to the following settings in the The value of the page number of the first page. Default is@tie{}1. @funindex printfirst-page-number -@item printfirst-page-number +@item print-first-page-number If set to true, will print the page number in the first page. Default is false. @funindex print-page-number @item print-page-number -If set to true, page numbers will be printed. +If set to false, page numbers will not be printed. Default is true. @funindex paper-width @item paper-width -The width of the page. +The width of the page. The default is taken from the current paper size, +see @ref{Paper size}. @funindex paper-height @item paper-height -The height of the page. +The height of the page. The default is taken from the current paper size, +see @ref{Paper size}. @funindex top-margin @item top-margin -Margin between header and top of the page. +Margin between header and top of the page. Default is@tie{}5mm. @funindex bottom-margin @item bottom-margin -Margin between footer and bottom of the page. +Margin between footer and bottom of the page. Default is@tie{}6mm. @funindex left-margin @item left-margin -Margin between the left side of the page and the beginning of the music. +Margin between the left side of the page and the beginning of the +music. Unset by default, which means that the margins is determined +based on the @code{paper-width} and @code{line-width} to center the +score on the paper. @funindex line-width @item line-width -The length of the systems. +The length of the systems. Default is $code{paper-width} minus @tie{}20mm. @funindex head-separation @item head-separation -Distance between the top-most music system and the page header. +Distance between the top-most music system and the page header. Default +is@tie{}4mm. @funindex foot-separation @item foot-separation -Distance between the bottom-most music system and the page footer. +Distance between the bottom-most music system and the page +footer. Default is@tie{}4mm. @funindex page-top-space Distance from the top of the printable area to the center of the first staff. This only works for staves which are vertically small. Big staves are set with the top of their bounding box aligned to the top of the -printable area. +printable area. Default is@tie{}12mm. @funindex ragged-bottom @item ragged-bottom If set to true, systems will not be spread vertically across the page. This -does not affect the last page. +does not affect the last page. Default is false. This should be set to true for pieces that have only two or three systems per page, for example orchestral scores. @funindex ragged-last-bottom @item ragged-last-bottom -If set to false, systems will be spread vertically to fill the last page. +If set to false, systems will be spread vertically to fill the last +page. Default is true. Pieces that amply fill two pages or more should have this set to true. @@ -176,13 +184,13 @@ true. @funindex system-count @item system-count This variable, if set, specifies into how many lines a score should be -broken. +broken. Unset by default. @funindex between-system-space @item between-system-space This dimensions determines the distance between systems. It is the ideal distance between the center of the bottom staff of one system -and the center of the top staff of the next system. +and the center of the top staff of the next system. Default is@tie{}20mm. Increasing this will provide a more even appearance of the page at the cost of using more vertical space. @@ -191,7 +199,7 @@ cost of using more vertical space. @item between-system-padding This dimension is the minimum amount of white space that will always be present between the bottom-most symbol of one system, and the -top-most of the next system. +top-most of the next system. Default is@tie{}4mm. Increasing this will put systems whose bounding boxes almost touch farther apart. @@ -202,21 +210,21 @@ farther apart. All systems (including titles and system separators) are shifted by this amount to the right. Page markup, such as headers and footers are not affected by this. The purpose of this variable is to make space -for instrument names at the left. +for instrument names at the left. Default is@tie{}0. @funindex after-title-space @item after-title-space -Amount of space between the title and the first system. +Amount of space between the title and the first system. Default is@tie{}5mm. -@funindex after-title-space +@funindex before-title-space @item before-title-space Amount of space between the last system of the previous piece and the -title of the next. +title of the next. Default is@tie{}10mm. @funindex between-title-space @item between-title-space Amount of space between consecutive titles (e.g., the title of the -book and the title of a piece). +book and the title of a piece). Default is@tie{}2mm. @funindex printallheaders @item printallheaders @@ -226,7 +234,7 @@ Setting this to #t will print all headers for each \score in a @funindex systemSeparatorMarkup @item systemSeparatorMarkup This contains a markup object, which will be inserted between -systems. This is often used for orchestral scores. +systems. This is often used for orchestral scores. Unset by default. The markup command @code{\slashSeparator} is provided as a sensible default, for example diff --git a/ly/titling-init.ly b/ly/titling-init.ly index 26bca808c8..b5f5797c4e 100644 --- a/ly/titling-init.ly +++ b/ly/titling-init.ly @@ -100,7 +100,7 @@ scoreTitleMarkup = \markup { \column { #(define (print-page-number-check-first layout props arg) (if (or (not (= (chain-assoc-get 'page:page-number props -1) (ly:output-def-lookup layout 'first-page-number))) - (eq? (ly:output-def-lookup layout 'printfirst-page-number) #t)) + (eq? (ly:output-def-lookup layout 'print-first-page-number) #t)) (print-page-number layout props arg) empty-stencil)) diff --git a/python/convertrules.py b/python/convertrules.py index 4eed7ace8b..40a8300e73 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -2863,3 +2863,9 @@ def conv (str): conversions.append (((2, 9, 16), conv, """deprecate \\tempo in \\midi""")) +def conv (str): + str = re.sub ('printfirst-page-number', 'print-first-page-number', str) + return str + +conversions.append (((2, 9, 19), conv, """printfirst-page-number -> print-first-page-number""")) + -- 2.39.2