From 41a69fdf186fa00f69fbe1c1f2870423dbd14f56 Mon Sep 17 00:00:00 2001 From: Phil Holmes Date: Tue, 2 Jul 2013 11:13:04 +0100 Subject: [PATCH] Make format for key changes consistent; minor formatting corrections for affected regtests --- Documentation/changes.tely | 6 +++--- Documentation/included/engraver-example.ily | 4 ++-- Documentation/notation/input.itely | 2 +- Documentation/notation/pitches.itely | 8 ++++---- input/regression/accidental-clef-change.ly | 10 +++++----- input/regression/clip-systems.ly | 6 +++--- input/regression/grace-sync.ly | 13 +++++++------ input/regression/key-signature-space.ly | 4 ++-- input/regression/tuplet-full-length.ly | 6 +++--- 9 files changed, 30 insertions(+), 29 deletions(-) diff --git a/Documentation/changes.tely b/Documentation/changes.tely index 683cdb54fc..419dad0e81 100644 --- a/Documentation/changes.tely +++ b/Documentation/changes.tely @@ -317,10 +317,10 @@ than their traditional positions, or in multiple octaves. @lilypond[quote,relative=0] \override Staff.KeySignature #'flat-positions = #'((-5 . 5)) \override Staff.KeyCancellation #'flat-positions = #'((-5 . 5)) -\clef bass \key es\major es g bes d -\clef treble \bar "||" \key es\major es g bes d +\clef bass \key es \major es g bes d +\clef treble \bar "||" \key es \major es g bes d \override Staff.KeySignature #'sharp-positions = #'(2) -\bar "||" \key d\major b fis b2 +\bar "||" \key d \major b fis b2 @end lilypond @end itemize diff --git a/Documentation/included/engraver-example.ily b/Documentation/included/engraver-example.ily index e9278d3e52..548742e14f 100644 --- a/Documentation/included/engraver-example.ily +++ b/Documentation/included/engraver-example.ily @@ -1,7 +1,7 @@ %% texidoc = "Include file for engraver example." \version "2.16.0" topVoice = \relative c' { - \key d\major + \key d \major es8([ g] a[ fis]) b4 b16[-. b-. b-. cis-.] @@ -9,7 +9,7 @@ topVoice = \relative c' { } botVoice = \relative c' { - \key d\major + \key d \major c8[( f] b[ a)] es4 es16[-. es-. es-. fis-.] diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely index 80cdd1794c..c7a5142f10 100644 --- a/Documentation/notation/input.itely +++ b/Documentation/notation/input.itely @@ -1470,7 +1470,7 @@ context. \footnote #'(-0.5 . 1) "Bar line" Staff.BarLine q q \footnote #'(0.5 . -1) "Key change" Staff.KeySignature - \key c\minor + \key c \minor q } } diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely index d2c9171fd8..66be5908a9 100644 --- a/Documentation/notation/pitches.itely +++ b/Documentation/notation/pitches.itely @@ -1330,11 +1330,11 @@ position. @lilypond[verbatim, quote,relative=0] \override Staff.KeySignature.flat-positions = #'((-5 . 5)) \override Staff.KeyCancellation.flat-positions = #'((-5 . 5)) -\clef bass \key es\major es g bes d -\clef treble \bar "||" \key es\major es g bes d +\clef bass \key es \major es g bes d +\clef treble \bar "||" \key es \major es g bes d \override Staff.KeySignature.sharp-positions = #'(2) -\bar "||" \key b\major b fis b2 +\bar "||" \key b \major b fis b2 @end lilypond @snippets @@ -1486,7 +1486,7 @@ to a B-flat clarinet. @lilypond[verbatim,quote] flute = \relative c'' { - \key f\major + \key f \major \cueDuring #"clarinet" #DOWN { R1 _\markup\tiny "clarinet" c4 f e d diff --git a/input/regression/accidental-clef-change.ly b/input/regression/accidental-clef-change.ly index 4420086565..bab45b8d93 100644 --- a/input/regression/accidental-clef-change.ly +++ b/input/regression/accidental-clef-change.ly @@ -9,10 +9,10 @@ \version "2.16.0" \new Staff \relative c' { - \key g\major - \clef treble - cis dis f - \clef bass - + \key g \major + \clef treble + cis dis f + \clef bass + } diff --git a/input/regression/clip-systems.ly b/input/regression/clip-systems.ly index 24cb829c42..5757b9c8a7 100644 --- a/input/regression/clip-systems.ly +++ b/input/regression/clip-systems.ly @@ -31,13 +31,13 @@ origScore = \score{ d \grace c16 e1 - \key d\major - + \key d \major + f \break \clef bass g, fis - } + } } \book { diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly index 9032eb8c2e..cd24450032 100644 --- a/input/regression/grace-sync.ly +++ b/input/regression/grace-sync.ly @@ -7,15 +7,16 @@ \relative c'' << - \context Staff { + \context Staff { c2 - \grace c8 - c4 c4 } + \grace c8 + c4 c4 + } \new Staff { c2 \clef bass - \grace { dis8[ ( d8] \key es\major } - - c4) c4 } + \grace { dis8[ ( d8] \key es \major } + c4) c4 + } \new Staff { c2 c4 c4 \bar "|." } >> diff --git a/input/regression/key-signature-space.ly b/input/regression/key-signature-space.ly index 28425c62e1..fdb11dddc1 100644 --- a/input/regression/key-signature-space.ly +++ b/input/regression/key-signature-space.ly @@ -7,9 +7,9 @@ << \new Staff { \voiceOne - \key f\minor + \key f \minor f'4 f' f' f' - \key b\major + \key b \major e''8 e'' e''4 e''2 } \new Staff { diff --git a/input/regression/tuplet-full-length.ly b/input/regression/tuplet-full-length.ly index 28c1c8f325..484d24762b 100644 --- a/input/regression/tuplet-full-length.ly +++ b/input/regression/tuplet-full-length.ly @@ -8,7 +8,8 @@ start of the next non-tuplet note. " \version "2.17.11" \paper { ragged-right = ##t -indent = 0.0 } + indent = 0.0 +} \relative c'' \new Voice \with { \remove Forbid_line_break_engraver @@ -24,6 +25,5 @@ indent = 0.0 } c4 \tuplet 3/2 { c8[ c c] } - \bar "|." \key c\minor + \bar "|." \key c \minor } - -- 2.39.5