From 9a899d219c23b57780914debfca1624fdb2a469f Mon Sep 17 00:00:00 2001 From: Mark Polesky Date: Sat, 16 Oct 2010 17:53:11 -0700 Subject: [PATCH] vertical spacing: Revise/rename affected regtests. --- ...ing.ly => page-breaking-markup-padding.ly} | 4 ++-- ...g2.ly => page-breaking-markup-padding2.ly} | 4 ++-- ...g3.ly => page-breaking-markup-padding3.ly} | 4 ++-- .../page-spacing-loose-lines-between.ly | 7 ++++--- ...page-spacing-loose-lines-header-padding.ly | 2 +- .../page-spacing-top-markup-spacing.ly | 20 +++++++++++++++++++ .../page-spacing-top-system-spacing.ly | 2 +- .../page-spacing-top-title-spacing.ly | 19 ------------------ input/regression/stem-length-estimation.ly | 5 ++--- input/regression/system-overstrike.ly | 5 +++-- 10 files changed, 37 insertions(+), 35 deletions(-) rename input/regression/{page-breaking-title-padding.ly => page-breaking-markup-padding.ly} (63%) rename input/regression/{page-breaking-title-padding2.ly => page-breaking-markup-padding2.ly} (60%) rename input/regression/{page-breaking-title-padding3.ly => page-breaking-markup-padding3.ly} (66%) create mode 100644 input/regression/page-spacing-top-markup-spacing.ly delete mode 100644 input/regression/page-spacing-top-title-spacing.ly diff --git a/input/regression/page-breaking-title-padding.ly b/input/regression/page-breaking-markup-padding.ly similarity index 63% rename from input/regression/page-breaking-title-padding.ly rename to input/regression/page-breaking-markup-padding.ly index df9179f536..5603ecee9b 100644 --- a/input/regression/page-breaking-title-padding.ly +++ b/input/regression/page-breaking-markup-padding.ly @@ -4,8 +4,8 @@ \book { \header { - texidoc = "Padding between titles is honoured by the page breaker. -This should take up two pages." + texidoc = "Padding between markups is honored by the page +breaker. This should take up two pages." } \paper { diff --git a/input/regression/page-breaking-title-padding2.ly b/input/regression/page-breaking-markup-padding2.ly similarity index 60% rename from input/regression/page-breaking-title-padding2.ly rename to input/regression/page-breaking-markup-padding2.ly index ab7afb2c4f..c0350fbbd3 100644 --- a/input/regression/page-breaking-title-padding2.ly +++ b/input/regression/page-breaking-markup-padding2.ly @@ -4,8 +4,8 @@ \book { \header { - texidoc = "Padding after titles is honoured by the page breaker. -This should take up two pages." + texidoc = "Padding between a markup and a system is honored by +the page breaker. This should take up two pages." } \paper { diff --git a/input/regression/page-breaking-title-padding3.ly b/input/regression/page-breaking-markup-padding3.ly similarity index 66% rename from input/regression/page-breaking-title-padding3.ly rename to input/regression/page-breaking-markup-padding3.ly index a79f9e6ccc..ee987989a8 100644 --- a/input/regression/page-breaking-title-padding3.ly +++ b/input/regression/page-breaking-markup-padding3.ly @@ -4,8 +4,8 @@ \book { \header { - texidoc = "Padding before titles is honoured by the page breaker. -This should take up two pages." + texidoc = "Padding between a score and a markup is honored by +the page breaker. This should take up two pages." } \paper { diff --git a/input/regression/page-spacing-loose-lines-between.ly b/input/regression/page-spacing-loose-lines-between.ly index 3161a8bc85..acc55b9cab 100644 --- a/input/regression/page-spacing-loose-lines-between.ly +++ b/input/regression/page-spacing-loose-lines-between.ly @@ -1,9 +1,10 @@ \version "2.13.36" \header { - texidoc = "Loose lines between two systems don't confuse the layout engine. -In particular, they don't interfere with @var{system-system-spacing}, -which measures distances between spaceable staves." + texidoc = "Loose lines between two systems don't confuse the +layout engine. In particular, they don't interfere with +@code{system-system-spacing}, which controls the flexible spacing +between the two closest staves of consecutive systems." } \paper { diff --git a/input/regression/page-spacing-loose-lines-header-padding.ly b/input/regression/page-spacing-loose-lines-header-padding.ly index 2bd8730af8..7b7285c298 100644 --- a/input/regression/page-spacing-loose-lines-header-padding.ly +++ b/input/regression/page-spacing-loose-lines-header-padding.ly @@ -29,4 +29,4 @@ line, whether or not it is spaceable." \new Lyrics \lyricmode { foo } >> } -} \ No newline at end of file +} diff --git a/input/regression/page-spacing-top-markup-spacing.ly b/input/regression/page-spacing-top-markup-spacing.ly new file mode 100644 index 0000000000..63fffba04e --- /dev/null +++ b/input/regression/page-spacing-top-markup-spacing.ly @@ -0,0 +1,20 @@ +\version "2.13.36" + +#(set-default-paper-size "a6") + +\book { + + \header { + texidoc = "@code{top-markup-spacing} controls the spacing from +the top of the printable area (i.e. the bottom of the top margin) +to a title or markup, when it is the first item on a page." + title = "Title" + } + + \paper { + top-markup-spacing = #'((minimum-distance . 30)) + ragged-bottom = ##t + } + + { c'1 \pageBreak c'1 } +} diff --git a/input/regression/page-spacing-top-system-spacing.ly b/input/regression/page-spacing-top-system-spacing.ly index f489f7c09a..b93f29223b 100644 --- a/input/regression/page-spacing-top-system-spacing.ly +++ b/input/regression/page-spacing-top-system-spacing.ly @@ -16,4 +16,4 @@ non-title staff on every page." } { c'1 \pageBreak c'1 } -} \ No newline at end of file +} diff --git a/input/regression/page-spacing-top-title-spacing.ly b/input/regression/page-spacing-top-title-spacing.ly deleted file mode 100644 index 89502a7c8d..0000000000 --- a/input/regression/page-spacing-top-title-spacing.ly +++ /dev/null @@ -1,19 +0,0 @@ -\version "2.13.36" - -#(set-default-paper-size "a6") - -\book { - - \header { - texidoc = "@var{top-markup-spacing} controls the spacing -from the top margin to a title (or markup), provided that it is -the first system on a page." - title = "Title" } - - \paper { - top-markup-spacing = #'((minimum-distance . 30)) - ragged-bottom = ##t - } - - { c'1 \pageBreak c'1 } -} \ No newline at end of file diff --git a/input/regression/stem-length-estimation.ly b/input/regression/stem-length-estimation.ly index d6cc841931..11d1bdd7b7 100644 --- a/input/regression/stem-length-estimation.ly +++ b/input/regression/stem-length-estimation.ly @@ -6,12 +6,11 @@ This example should fit snugly on one page. " } -\paper { +\paper { #(set-paper-size "a6") tagline = ##f system-system-spacing #'padding = #1.20 -} - +} \new Voice { \voiceTwo diff --git a/input/regression/system-overstrike.ly b/input/regression/system-overstrike.ly index 1ef53125b0..1a304b3156 100644 --- a/input/regression/system-overstrike.ly +++ b/input/regression/system-overstrike.ly @@ -1,4 +1,5 @@ \version "2.13.36" + \header { texidoc = "By setting the padding between systems to a negative value, it is possible to eliminate the anti-collision constraints. @@ -7,8 +8,8 @@ value, it is possible to eliminate the anti-collision constraints. \book { \paper { - ragged-bottom =##t - system-system-spacing = #'((space . 1) (padding . -10)) + ragged-bottom = ##t + system-system-spacing = #'((space . 1) (padding . -10)) } { -- 2.39.2