Make format for key changes consistent; minor formatting corrections for affected...

diff --git a/Documentation/changes.tely b/Documentation/changes.tely
index 683cdb54fc88e62d6c63f9121911e46d31420160..419dad0e81ca638476c8d33abbe33f3b35e46fa5 100644 (file)
--- 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 e9278d3e52c72fb69f0e383f92d83879d2a30dff..548742e14fc513836159b7c963263b155df1e4e2 100644 (file)
--- 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 80cdd1794c53b33d6a1ad37d172be4faaa668b33..c7a5142f10b0eee617c8fd5c80109100b0a5ca86 100644 (file)
--- 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 d2c9171fd8ec6ff780b1ed1c9bd82b70cb1abbb4..66be5908a99c326129cd73416e96141e3398c5aa 100644 (file)
--- 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 44200865653bde0e17f47ce48edb3bd070452bd7..bab45b8d9342c7fc27a3c79acab3901f45a9ae11 100644 (file)
--- 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
-    <c dis fis>
+  \key g \major
+  \clef treble
+  cis dis f
+  \clef bass
+  <c dis fis>
 }
 

diff --git a/input/regression/clip-systems.ly b/input/regression/clip-systems.ly
index 24cb829c422563eef542147a7b3fba76ff1dc64b..5757b9c8a7e4f678abe4323692979dbb518ab72d 100644 (file)
--- 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 9032eb8c2eaf587782548a6a70e06f2f9d16725c..cd24450032282024fe78ff152f1bee6ad0937741 100644 (file)
--- 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 28425c62e103001765012e9e6d6d5abad9848228..fdb11dddc19e1912a392991b62ef669cdff29a8d 100644 (file)
--- 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 28c1c8f32571d06199fe7106cb719eac16cc540f..484d24762b5938bc2b2d7440a032ccc8c361b883 100644 (file)
--- 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
 }
-