From ae49e0dd10feea60fb5bd76cfb6406b7a0cf3e95 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Tue, 19 Mar 2013 09:37:23 +0100 Subject: [PATCH] Issue 3261: regtest 'incipit.ly' compressed After dimensions in \score markup have been fixed in issue 677, several example of incipits in the LilyPond codebase were overcompensating for the previous bug. This fixes them. --- Documentation/snippets/new/incipit.ly | 4 ++-- input/regression/incipit.ly | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Documentation/snippets/new/incipit.ly b/Documentation/snippets/new/incipit.ly index 92230b5e46..d29dec818c 100644 --- a/Documentation/snippets/new/incipit.ly +++ b/Documentation/snippets/new/incipit.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.10" \header { lsrtags = "staff-notation, ancient-notation, really-cool" @@ -37,7 +37,7 @@ incipit = % escaping lexical closure and evaluating % everything respective to (current-module). #(primitive-eval - '(or (false-if-exception (- indent (* mm incipit-width))) + '(or (false-if-exception (- indent incipit-width)) (* 0.5 indent))) ragged-right = ##f ragged-last = ##f diff --git a/input/regression/incipit.ly b/input/regression/incipit.ly index 166560f811..a5545558e8 100644 --- a/input/regression/incipit.ly +++ b/input/regression/incipit.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.10" \header { texidoc = "Incipits can be printed using an @code{InstrumentName} @@ -37,13 +37,10 @@ grob." 'MensuralStaff) (ly:grob-property grob 'music)))) (score (ly:make-score music)) - (mm (ly:output-def-lookup layout 'mm)) (indent (ly:output-def-lookup layout 'indent)) - (incipit-width (ly:output-def-lookup layout 'incipit-width)) - (scaled-incipit-width (if (number? incipit-width) - (* incipit-width mm) - (* indent 0.5)))) - (ly:output-def-set-variable! layout 'indent (- indent scaled-incipit-width)) + (incipit-width (ly:output-def-lookup layout 'incipit-width + (* indent 0.5)))) + (ly:output-def-set-variable! layout 'indent (- indent incipit-width)) (ly:output-def-set-variable! layout 'line-width indent) (ly:output-def-set-variable! layout 'ragged-right #f) (ly:score-add-output-def! score layout) -- 2.39.5