Doc: fundamental.itely examples tidy up

Tidy up layout for examples as per CG for Learning Manuals
Various spacing issues (brases, slurs and indents mainly)
Remove unnecessary end of line bar checks
put variables on new lines to add to clarity for new users

diff --git a/Documentation/learning/fundamental.itely b/Documentation/learning/fundamental.itely
index 0ba52a8425d5860b00c61d43d21e16cb315a9b4a..f8217afd8ce6278983b55e5f322eb4170ec0380a 100644 (file)
--- a/Documentation/learning/fundamental.itely
+++ b/Documentation/learning/fundamental.itely
@@ -217,7 +217,7 @@ For details see @ruser{Multiple scores in a book}.
 @cindex variables
 
 Another great shorthand is the ability to define variables (see
-@ref{Organizing pieces with variables}).  All the templates use this
+@ref{Organizing pieces with variables}.  All the templates use this
 
 @example
 melody = \relative c' @{
@@ -626,7 +626,7 @@ the passing note and a slur:
 @lilypond[quote,verbatim,fragment,ragged-right,relative=2]
 \key g \major
 %    Voice "1"                  Voice "2"
-<< { g4 fis8( g) a4 g }    \\ { d4 d d d }  >> |
+<< { g4 fis8( g) a4 g }  \\  { d4 d d d }  >>
 @end lilypond
 
 Notice how the stems of the second voice now point down.
@@ -636,9 +636,9 @@ Here's another simple example:
 @lilypond[quote,verbatim,fragment,ragged-right,relative=2]
 \key d \minor
 %    Voice "1"             Voice "2"
-<< { r4 g g4. a8 }    \\ { d,2 d4 g }       >> |
-<< { bes4 bes c bes } \\ { g4 g g8( a) g4 } >> |
-<< { a2. r4 }         \\ { fis2. s4 }       >> |
+<< { r4 g g4. a8 }    \\ { d,2 d4 g }       >>
+<< { bes4 bes c bes } \\ { g4 g g8( a) g4 } >>
+<< { a2. r4 }         \\ { fis2. s4 }       >>
 @end lilypond
 
 It is not necessary to use a separate @code{<< \\ >>} construct
@@ -681,8 +681,8 @@ stems, ties, dynamics etc., is set appropriately.
   % Main voice
   c16 d e f
   %    Voice "1"     Voice "2"                 Voice "3"
-  << { g4 f e } \\ { r8 e4 d c8 ~ } >> |
-  << { d2 e2 }  \\ { c8 b16 a b8 g ~ g2 } \\ { s4 b4 c2 } >> |
+  << { g4 f e } \\ { r8 e4 d c8~ } >>
+  << { d2 e2 }  \\ { c8 b16 a b8 g~ g2 } \\ { s4 b4 c2 } >>
 }
 @end lilypond
 
@@ -704,7 +704,7 @@ blue triangle voice.
 \new Staff \relative c' {
   % Main voice
   c16 d e f
-  << % Bar 1
+  <<  % Bar 1
     {
       \voiceOneStyle
       g4 f e
@@ -712,10 +712,10 @@ blue triangle voice.
   \\
     {
       \voiceTwoStyle
-      r8 e4 d c8 ~
+      r8 e4 d c8~
     }
   >>
-  << % Bar 2
+  <<  % Bar 2
      % Voice 1 continues
     { d2 e2 }
   \\
@@ -795,12 +795,12 @@ later sections.
 @lilypond[quote,ragged-right]
 \new Staff \relative c'' {
   \key aes \major
-  << % Voice one
+  <<  % Voice one
     { c2 aes4. bes8 }
-  \\ % Voice two
+  \\  % Voice two
     { aes2 f4 fes }
-  \\ % No voice three
-  \\ % Voice four
+  \\  % No voice three
+  \\  % Voice four
     {
       % Ignore these for now - they are explained in Ch 4
       \once \override NoteColumn #'force-hshift = #0
@@ -840,7 +840,7 @@ not understand.
 \new Staff \relative c'' {
   \key aes \major
   <<
-    { % Voice one
+    {  % Voice one
       \voiceOneStyle
       c2 aes4. bes8
     }
@@ -857,8 +857,8 @@ not understand.
       \once \override NoteColumn #'force-hshift = #0.5
       des2
     }
-  >> |
-  <c ees aes c>1 |
+  >>
+  <c ees aes c>1
 }
 @end lilypond
 
@@ -894,15 +894,15 @@ adding another pair of @code{\\}.
 @lilypond[quote,verbatim,fragment,ragged-right]
 \new Staff \relative c'' {
   \key aes \major
-  << % Voice one
+  <<  % Voice one
     { c2 aes4. bes8 }
-  \\ % Voice two
-    { aes2 f4 fes   }
-  \\ % Omit Voice three
-  \\ % Voice four
+  \\  % Voice two
+    { aes2 f4 fes }
+  \\  % Omit Voice three
+  \\  % Voice four
     { <ees c>2 des2 }
-  >> |
-  <c ees aes c>1 |
+  >>
+  <c ees aes c>1
 }
 @end lilypond
 
@@ -999,25 +999,25 @@ markup, ties, slurs, and dynamics:
 @lilypond[quote,ragged-right,verbatim]
 \relative c'{
   % Default behavior or behavior after \oneVoice
-  c d8 ~ d e4 ( f g a ) b-> c
+  c d8~ d e4( f g a) b-> c
 }
 @end lilypond
 
 @lilypond[quote,ragged-right,verbatim]
 \relative c'{
   \voiceOne
-  c d8 ~ d e4 ( f g a ) b-> c
+  c d8~ d e4( f g a) b-> c
   \oneVoice
-  c, d8 ~ d e4 ( f g a ) b-> c
+  c, d8~ d e4( f g a) b-> c
 }
 @end lilypond
 
 @lilypond[quote,ragged-right,verbatim]
 \relative c'{
   \voiceTwo
-  c d8 ~ d e4 ( f g a ) b-> c
+  c d8~ d e4( f g a) b-> c
   \oneVoice
-  c, d8 ~ d e4 ( f g a ) b-> c
+  c, d8~ d e4( f g a) b-> c
 }
 @end lilypond
 
@@ -1041,18 +1041,18 @@ permitting a phrasing slur to be drawn over them.
   % Start simultaneous section of three voices
   <<
     % Continue the main voice in parallel
-    { g4 f e | d2 e2) }
+    { g4 f e | d2 e2) | }
     % Initiate second voice
     \new Voice {
-      % Set stems, etc, down
+      % Set stems, etc., down
       \voiceTwo
-      r8 e4 d c8 ~ | c8 b16 a b8 g ~ g2
+      r8 e4 d c8~ | c8 b16 a b8 g~ g2 |
     }
     % Initiate third voice
     \new Voice {
       % Set stems, etc, up
       \voiceThree
-      s2. | s4 b4 c2
+      s2. | s4 b4 c2 |
     }
   >>
 }
@@ -1072,12 +1072,12 @@ typeset the music:
 \new Staff \relative c' {
   c16^( d e f
   <<
-    { g4 f e | d2 e2) }
+    { g4 f e | d2 e2) | }
     \new Voice {
       \voiceTwo
-      r8 e4 d c8 ~ |
+      r8 e4 d c8~
       <<
-        {c8 b16 a b8 g ~ g2}
+        { c8 b16 a b8 g~ g2 }
         \new Voice {
           \voiceThree
           s4 b4 c2
@@ -1108,7 +1108,7 @@ as here:
   \new Voice {
     % Set stems, etc, down
     \voiceTwo
-    s4 r8 e4 d c8 ~ | c8 b16 a b8 g ~ g2 |
+    s4 r8 e4 d c8~ | c8 b16 a b8 g~ g2 |
   }
   % Initiate third voice
   \new Voice {
@@ -1238,13 +1238,13 @@ rather than music.
 @lilypond[quote,verbatim]
 global = { \time 6/8 \partial 8 \key f \major}
 SopOneMusic = \relative c'' {
-  c8 | c([ bes)] a a([ g)] f | f'4. b, | c4.~ c4 }
+  c8 | c([ bes)] a a([ g)] f | f'4. b, | c4.~ c4 | }
 SopTwoMusic = \relative c' {
-  r8 | r4. r4 c8 | a'([ g)] f f([ e)] d | e([ d)] c bes' }
+  r8 | r4. r4 c8 | a'([ g)] f f([ e)] d | e([ d)] c bes' | }
 SopOneLyrics = \lyricmode {
-  Let | flee -- cy flocks the | hills a -- dorn, __ }
+  Let | flee -- cy flocks the | hills a -- dorn, __ | }
 SopTwoLyrics = \lyricmode {
-  Let | flee -- cy flocks the | hills a -- dorn, }
+  Let | flee -- cy flocks the | hills a -- dorn, | }
 
 \score {
   \new ChoirStaff <<
@@ -1291,18 +1291,18 @@ examples this is often called @q{global}.
 
 @lilypond[quote,verbatim]
 TimeKey = { \time 4/4 \partial 4 \key c \major}
-SopMusic   = \relative c' { c4 | e4. e8 g4  g  | a a g }
-AltoMusic  = \relative c' { c4 | c4. c8 e4  e  | f f e }
-TenorMusic = \relative c  { e4 | g4. g8 c4. b8 | a8 b c d e4 }
-BassMusic  = \relative c  { c4 | c4. c8 c4  c  | f8 g a b c4 }
+SopMusic   = \relative c' { c4 | e4. e8 g4  g  | a a g | }
+AltoMusic  = \relative c' { c4 | c4. c8 e4  e  | f f e | }
+TenorMusic = \relative c  { e4 | g4. g8 c4. b8 | a8 b c d e4 | }
+BassMusic  = \relative c  { c4 | c4. c8 c4  c  | f8 g a b c4 | }
 VerseOne   = \lyricmode {
-  E -- | ter -- nal fa -- ther, | strong to save, }
+  E -- | ter -- nal fa -- ther, | strong to save, | }
 VerseTwo   = \lyricmode {
-  O | Christ, whose voice the | wa -- ters heard, }
+  O | Christ, whose voice the | wa -- ters heard, | }
 VerseThree = \lyricmode {
-  O | Ho -- ly Spi -- rit, | who didst brood }
+  O | Ho -- ly Spi -- rit, | who didst brood | }
 VerseFour  = \lyricmode {
-  O | Tri -- ni -- ty of | love and pow'r }
+  O | Tri -- ni -- ty of | love and pow'r | }
 
 \score {
   \new ChoirStaff <<
@@ -1318,7 +1318,7 @@ VerseFour  = \lyricmode {
     \new Staff <<
       \clef "bass"
       \new Voice = "Tenor" { \voiceOne \TimeKey \TenorMusic }
-      \new Voice = "Bass"  { \voiceTwo \BassMusic  }
+      \new Voice = "Bass"  { \voiceTwo \BassMusic }
     >>
   >>
 }
@@ -1327,10 +1327,9 @@ VerseFour  = \lyricmode {
 @cindex verse and refrain
 
 We end with an example to show how we might code a solo verse which
-continues into a two-part refrain in two staves.  The
-positioning of the sequential and simultaneous sections to achieve
-this within a single score is quite tricky, so follow the
-explanation carefully!
+continues into a two-part refrain in two staves.  The positioning
+of the sequential and simultaneous sections to achieve this within
+a single score is quite tricky, so follow the explanation carefully!
 
 Let's start with a score block containing a @code{ChoirStaff}, as
 we would like the brace to appear at the start of the chorus.
@@ -1347,7 +1346,8 @@ start them at the same time:
 versenotes = \relative c'' {
   \clef "treble"
   \key g \major
-  \time 3/4 g g g b b b
+  \time 3/4
+  g g g b b b
 }
 versewords = \lyricmode {
   One two three four five six
@@ -1399,7 +1399,8 @@ how the parallel section is positioned within the verse Voice:
 versenotes = \relative c'' {
   \clef "treble"
   \key g \major
-  \time 3/4 g g g b b b
+  \time 3/4
+  g g g b b b
 }
 refrainnotesA = \relative c'' {
   \time 2/4
@@ -1461,7 +1462,8 @@ follows:
 versenotes = \relative c'' {
   \clef "treble"
   \key g \major
-  \time 3/4 g g g b b b
+  \time 3/4
+  g g g b b b
 }
 refrainnotesA = \relative c'' {
   \time 2/4
@@ -1665,8 +1667,8 @@ annotated real-music example:
       \clef "treble"
       \new Voice {  % create voice for RH notes
         \relative c'' {  % start of RH notes
-          d4 ees16 c8. |
-          d4 ees16 c8. |
+          d4 ees16 c8.
+          d4 ees16 c8.
         }  % end of RH notes
       }  % end of RH voice
     }  % end of RH staff
@@ -1676,15 +1678,15 @@ annotated real-music example:
       \new Voice {  % create LH voice one
         \voiceOne
         \relative g {  % start of LH voice one notes
-          g8 <bes d> ees, <g c> |
-          g8 <bes d> ees, <g c> |
+          g8 <bes d> ees, <g c>
+          g8 <bes d> ees, <g c>
         }  % end of LH voice one notes
       }  % end of LH voice one
       \new Voice {  % create LH voice two
         \voiceTwo
         \relative g {  % start of LH voice two notes
-          g4 ees |
-          g4 ees |
+          g4 ees
+          g4 ees
         }  % end of LH voice two notes
       }  % end of LH voice two
     >>  % end of LH staff
@@ -1950,11 +1952,11 @@ So this turns off extra naturals in one staff:
 <<
   \new Staff \relative c'' {
     ais4 aes
- }
+  }
   \new Staff \relative c'' {
     \set Staff.extraNatural = ##f
     ais4 aes
- }
+  }
 >>
 @end lilypond
 
@@ -1965,11 +1967,11 @@ and this turns them off in all staves:
 <<
   \new Staff \relative c'' {
     ais4 aes
- }
+  }
   \new Staff \relative c'' {
     \set Score.extraNatural = ##f
     ais4 aes
- }
+  }
 >>
 @end lilypond
 
@@ -2105,8 +2107,8 @@ throughout the @code{\score} or @code{\book} block in which the
     }
   }
   \layout {
-    \context { \Staff
-      extraNatural = ##t
+    \context {
+      \Staff extraNatural = ##t
     }
   }
 }
@@ -2246,22 +2248,31 @@ staff in a four-staff score, we could write
 \score {
   <<
     \new Staff <<
-      \relative c'' { c a b g }
-    >>
+      \relative c'' {
+      c a b g
+    }
+  >>
     \new Staff <<
-      \relative c' { c a b g }
-    >>
+      \relative c' {
+      c a b g
+    }
+  >>
     \new Staff <<
       \clef "G_8"
-      \relative c' { c a b g }
-    >>
+      \relative c' {
+      c a b g
+    }
+  >>
     \new Staff <<
       \clef "bass"
-      \relative c { c a b g }
-    >>
+      \relative c {
+      c a b g
+    }
   >>
+>>
   \layout {
-    \context { \Staff
+    \context {
+      \Staff
       \consists Ambitus_engraver
     }
   }
@@ -2424,14 +2435,15 @@ at once.  The @code{\score} looks like this now:
 @example
 \score @{
   <<
-  <<
-    \new Voice = "one" @{
-      \autoBeamOff
-      \sopranoMusic
-    @}
-    \new Lyrics \lyricsto "one" \sopranoLyrics
-  >>
-  \new Staff \celloMusic
+    <<
+      \new Voice = "one" @{
+        \autoBeamOff
+        \sopranoMusic
+      @}
+      \new Lyrics \lyricsto "one" \sopranoLyrics
+    >>
+    \new Staff
+    \celloMusic
   >>
   \layout @{ @}
   \midi @{ @}
@@ -2470,7 +2482,8 @@ celloMusic = \relative c {
       }
       \new Lyrics \lyricsto "one" \sopranoLyrics
     >>
-    \new Staff \celloMusic
+    \new Staff
+    \celloMusic
   >>
   \layout { }
   \midi { }
@@ -2524,16 +2537,16 @@ bassWords = \sopranoWords
 upper = \relative a' {
   \clef "treble"
   \global
-  r4 <a d fis>2 <a e' a>4 |
-  <d fis d'>4. <d fis d'>8 <a d a'>2 |
-  <g cis g'>4 <a d fis> <a cis e>2 |
+  r4 <a d fis>2 <a e' a>4
+  <d fis d'>4. <d fis d'>8 <a d a'>2
+  <g cis g'>4 <a d fis> <a cis e>2
 }
 lower = \relative c, {
   \clef "bass"
   \global
-  <d d'>4 <d d'>2 <cis cis'>4 |
-  <b b'>4. <b' b'>8 <fis fis'>2 |
-  <e e'>4 <d d'> <a' a'>2 |
+  <d d'>4 <d d'>2 <cis cis'>4
+  <b b'>4. <b' b'>8 <fis fis'>2
+  <e e'>4 <d d'> <a' a'>2
 }
 
 \score {
@@ -2541,26 +2554,41 @@ lower = \relative c, {
     \new ChoirStaff <<
       \new Staff = "sopranos" <<
         \set Staff.instrumentName = #"Soprano"
-        \new Voice = "sopranos" { \global \sopranoMusic }
+        \new Voice = "sopranos" {
+          \global
+          \sopranoMusic
+        }
       >>
-      \new Lyrics \lyricsto "sopranos" { \sopranoWords }
+      \new Lyrics \lyricsto "sopranos" {
+        \sopranoWords
+      }
       \new Staff = "altos" <<
         \set Staff.instrumentName = #"Alto"
-        \new Voice = "altos" { \global \altoMusic }
+        \new Voice = "altos" {
+          \global
+          \altoMusic
+        }
       >>
       \new Lyrics \lyricsto "altos" { \altoWords }
       \new Staff = "tenors" <<
         \set Staff.instrumentName = #"Tenor"
-        \new Voice = "tenors" { \global \tenorMusic }
+        \new Voice = "tenors" {
+          \global
+          \tenorMusic
+        }
       >>
       \new Lyrics \lyricsto "tenors" { \tenorWords }
       \new Staff = "basses" <<
         \set Staff.instrumentName = #"Bass"
-        \new Voice = "basses" { \global \bassMusic }
+        \new Voice = "basses" {
+          \global
+          \bassMusic
+        }
       >>
-      \new Lyrics \lyricsto "basses" { \bassWords }
-    >>  % end ChoirStaff
-
+      \new Lyrics \lyricsto "basses" {
+          \bassWords
+        }
+      >>  % end ChoirStaff
     \new PianoStaff <<
       \set PianoStaff.instrumentName = #"Piano"
       \new Staff = "upper" \upper
@@ -2594,24 +2622,44 @@ Doing this gives for our ChoirStaff:
     \new ChoirStaff <<
       \new Staff = "sopranos" <<
         \set Staff.instrumentName = #"Soprano"
-        \new Voice = "sopranos" @{ \global \sopranoMusic @}
+        \new Voice = "sopranos" @{
+          \global
+          \sopranoMusic
+        @}
       >>
-      \new Lyrics \lyricsto "sopranos" @{ \sopranoWords @}
+      \new Lyrics \lyricsto "sopranos" @{
+        \sopranoWords
+     @}
       \new Staff = "altos" <<
         \set Staff.instrumentName = #"Alto"
-        \new Voice = "altos" @{ \global \altoMusic @}
+        \new Voice = "altos" @{
+          \global
+          \altoMusic
+        @}
       >>
-      \new Lyrics \lyricsto "altos" @{ \altoWords @}
+      \new Lyrics \lyricsto "altos" @{
+      \altoWords
+      @}
       \new Staff = "tenors" <<
         \set Staff.instrumentName = #"Tenor"
-        \new Voice = "tenors" @{ \global \tenorMusic @}
+        \new Voice = "tenors" @{
+          \global
+          \tenorMusic
+        @}
       >>
-      \new Lyrics \lyricsto "tenors" @{ \tenorWords @}
+      \new Lyrics \lyricsto "tenors" @{
+        \tenorWords
+      @}
       \new Staff = "basses" <<
         \set Staff.instrumentName = #"Bass"
-        \new Voice = "basses" @{ \global \bassMusic @}
+        \new Voice = "basses" @{
+          \global
+          \bassMusic
+        @}
       >>
-      \new Lyrics \lyricsto "basses" @{ \bassWords @}
+      \new Lyrics \lyricsto "basses" @{
+        \bassWords
+      @}
     >>  % end ChoirStaff
 @end example
 
@@ -2638,23 +2686,43 @@ stacked one above the other:
 <<  % combine ChoirStaff and PianoStaff one above the other
   \new ChoirStaff <<
     \new Staff = "sopranos" <<
-      \new Voice = "sopranos" @{ \global \sopranoMusic @}
+      \new Voice = "sopranos" @{
+        \global
+        \sopranoMusic
+      @}
     >>
-    \new Lyrics \lyricsto "sopranos" @{ \sopranoWords @}
+    \new Lyrics \lyricsto "sopranos" @{
+      \sopranoWords
+     @}
     \new Staff = "altos" <<
-      \new Voice = "altos" @{ \global \altoMusic @}
+      \new Voice = "altos" @{
+        \global
+        \altoMusic
+      @}
     >>
-    \new Lyrics \lyricsto "altos" @{ \altoWords @}
+    \new Lyrics \lyricsto "altos" @{
+      \altoWords
+    @}
     \new Staff = "tenors" <<
       \clef "G_8"  % tenor clef
-      \new Voice = "tenors" @{ \global \tenorMusic @}
+      \new Voice = "tenors" @{
+        \global
+        \tenorMusic
+      @}
     >>
-    \new Lyrics \lyricsto "tenors" @{ \tenorWords @}
+    \new Lyrics \lyricsto "tenors" @{
+      \tenorWords
+    @}
     \new Staff = "basses" <<
       \clef "bass"
-      \new Voice = "basses" @{ \global \bassMusic @}
+      \new Voice = "basses" @{
+        \global
+        \bassMusic
+      @}
     >>
-    \new Lyrics \lyricsto "basses" @{ \bassWords @}
+    \new Lyrics \lyricsto "basses" @{
+      \bassWords
+    @}
   >>  % end ChoirStaff
 
   \new PianoStaff <<
@@ -2669,10 +2737,13 @@ Combining all these together and adding the music
 for the three bars of the example above gives:
 
 @lilypond[quote,verbatim,ragged-right,addversion]
-global = { \key d \major \time 4/4 }
+global = {
+  \key d \major
+  \time 4/4
+}
 sopranoMusic = \relative c'' {
   \clef "treble"
-  r4 d2 a4 | d4. d8 a2 | cis4 d cis2 |
+  r4 d2 a4 | d4. d8 a2 | cis4 d cis2
 }
 sopranoWords = \lyricmode {
   Wor -- thy is the lamb that was slain
@@ -2695,16 +2766,16 @@ bassWords = \sopranoWords
 upper = \relative a' {
   \clef "treble"
   \global
-  r4 <a d fis>2 <a e' a>4 |
-  <d fis d'>4. <d fis d'>8 <a d a'>2 |
-  <g cis g'>4 <a d fis> <a cis e>2 |
+  r4 <a d fis>2 <a e' a>4
+  <d fis d'>4. <d fis d'>8 <a d a'>2
+  <g cis g'>4 <a d fis> <a cis e>2
 }
 lower = \relative c, {
   \clef "bass"
   \global
-  <d d'>4 <d d'>2 <cis cis'>4 |
-  <b b'>4. <b' b'>8 <fis fis'>2 |
-  <e e'>4 <d d'> <a' a'>2 |
+  <d d'>4 <d d'>2 <cis cis'>4
+  <b b'>4. <b' b'>8 <fis fis'>2
+  <e e'>4 <d d'> <a' a'>2
 }
 
 \score {
@@ -2712,24 +2783,44 @@ lower = \relative c, {
     \new ChoirStaff <<
       \new Staff = "sopranos" <<
         \set Staff.instrumentName = #"Soprano"
-        \new Voice = "sopranos" { \global \sopranoMusic }
+        \new Voice = "sopranos" {
+          \global
+          \sopranoMusic
+        }
       >>
-      \new Lyrics \lyricsto "sopranos" { \sopranoWords }
+      \new Lyrics \lyricsto "sopranos" {
+        \sopranoWords
+      }
       \new Staff = "altos" <<
         \set Staff.instrumentName = #"Alto"
-        \new Voice = "altos" { \global \altoMusic }
+        \new Voice = "altos" {
+          \global
+          \altoMusic
+        }
       >>
-      \new Lyrics \lyricsto "altos" { \altoWords }
+      \new Lyrics \lyricsto "altos" {
+        \altoWords
+      }
       \new Staff = "tenors" <<
         \set Staff.instrumentName = #"Tenor"
-        \new Voice = "tenors" { \global \tenorMusic }
-      >>
-      \new Lyrics \lyricsto "tenors" { \tenorWords }
+        \new Voice = "tenors" {
+        \global
+        \tenorMusic
+      }
+    >>
+      \new Lyrics \lyricsto "tenors" {
+        \tenorWords
+      }
       \new Staff = "basses" <<
         \set Staff.instrumentName = #"Bass"
-        \new Voice = "basses" { \global \bassMusic }
+        \new Voice = "basses" {
+          \global
+          \bassMusic
+        }
       >>
-      \new Lyrics \lyricsto "basses" { \bassWords }
+      \new Lyrics \lyricsto "basses" {
+        \bassWords
+      }
     >>  % end ChoirStaff
 
     \new PianoStaff <<
@@ -2776,11 +2867,14 @@ and key:
   title = "Jesu, meine Freude"
   composer = "J S Bach"
 @}
-TimeKey = @{ \time 4/4 \key c \minor @}
-ManualOneVoiceOneMusic = @{s1@}
-ManualOneVoiceTwoMusic = @{s1@}
-ManualTwoMusic = @{s1@}
-PedalOrganMusic = @{s1@}
+TimeKey = @{
+  \time 4/4
+  \key c \minor
+@}
+ManualOneVoiceOneMusic = @{ s1 @}
+ManualOneVoiceTwoMusic = @{ s1 @}
+ManualTwoMusic = @{ s1 @}
+PedalOrganMusic = @{ s1 @}
 
 \score @{
 @}
@@ -2801,11 +2895,17 @@ part just one.
 @example
   \new PianoStaff <<
     \new Staff = "ManualOne" <<
-      \new Voice @{ \ManualOneVoiceOneMusic @}
-      \new Voice @{ \ManualOneVoiceTwoMusic @}
+      \new Voice @{
+        \ManualOneVoiceOneMusic
+      @}
+      \new Voice @{
+        \ManualOneVoiceTwoMusic
+      @}
     >>  % end ManualOne Staff context
     \new Staff = "ManualTwo" <<
-      \new Voice @{ \ManualTwoMusic @}
+      \new Voice @{
+        \ManualTwoMusic
+      @}
     >>  % end ManualTwo Staff context
   >>  % end PianoStaff context
 @end example
@@ -2824,15 +2924,23 @@ see what errors it generates.
 <<  % PianoStaff and Pedal Staff must be simultaneous
   \new PianoStaff <<
     \new Staff = "ManualOne" <<
-      \new Voice @{ \ManualOneVoiceOneMusic @}
-      \new Voice @{ \ManualOneVoiceTwoMusic @}
+      \new Voice @{
+        \ManualOneVoiceOneMusic
+      @}
+      \new Voice @{
+        \ManualOneVoiceTwoMusic
+      @}
     >>  % end ManualOne Staff context
     \new Staff = "ManualTwo" <<
-      \new Voice @{ \ManualTwoMusic @}
+      \new Voice @{
+        \ManualTwoMusic
+      @}
     >>  % end ManualTwo Staff context
   >>  % end PianoStaff context
   \new Staff = "PedalOrgan" <<
-    \new Voice @{ \PedalOrganMusic @}
+    \new Voice @{
+      \PedalOrganMusic
+    @}
   >>
 >>
 @end example
@@ -2859,19 +2967,29 @@ and key to each staff using our predefined variable, @code{\TimeKey}.
       \new Staff = "ManualOne" <<
         \TimeKey  % set time signature and key
         \clef "treble"
-        \new Voice @{ \voiceOne \ManualOneVoiceOneMusic @}
-        \new Voice @{ \voiceTwo \ManualOneVoiceTwoMusic @}
+        \new Voice @{
+          \voiceOne
+          \ManualOneVoiceOneMusic
+        @}
+        \new Voice @{
+          \voiceTwo
+          \ManualOneVoiceTwoMusic
+        @}
       >>  % end ManualOne Staff context
       \new Staff = "ManualTwo" <<
         \TimeKey
         \clef "bass"
-        \new Voice @{ \ManualTwoMusic @}
+        \new Voice @{
+          \ManualTwoMusic
+        @}
       >>  % end ManualTwo Staff context
     >>  % end PianoStaff context
     \new Staff = "PedalOrgan" <<
       \TimeKey
       \clef "bass"
-      \new Voice @{ \PedalOrganMusic @}
+      \new Voice @{
+        \PedalOrganMusic
+       @}
     >>  % end PedalOrgan Staff
   >>
 @}  % end Score context
@@ -2887,22 +3005,26 @@ is to add the music, and combine all the parts together.
   title = "Jesu, meine Freude"
   composer = "J S Bach"
 }
-TimeKey = { \time 4/4 \key c \minor }
+TimeKey = {
+  \time 4/4
+  \key c \minor
+}
 ManualOneVoiceOneMusic = \relative g' {
-  g4 g f ees | d2 c2 |
+  g4 g f ees
+  d2 c2
 }
 ManualOneVoiceTwoMusic = \relative c' {
-  ees16 d ees8~ ees16 f ees d c8 d~ d c~ |
-  c c4 b8 c8. g16 c b c d |
+  ees16 d ees8~ ees16 f ees d c8 d~ d c~
+  c c4 b8 c8. g16 c b c d
 }
 ManualTwoMusic = \relative c' {
-  c16 b c8~ c16 b c g a8 g~ g16 g aes ees |
-  f ees f d g aes g f ees d e8~ ees16 f ees d |
+  c16 b c8~ c16 b c g a8 g~ g16 g aes ees
+  f ees f d g aes g f ees d e8~ ees16 f ees d
 }
 PedalOrganMusic = \relative c {
-  r8 c16 d ees d ees8~ ees16 a, b g c b c8 |
-  r16 g ees f g f g8 c,2 |
-  }
+  r8 c16 d ees d ees8~ ees16 a, b g c b c8
+  r16 g ees f g f g8 c,2
+}
 
 \score {
   <<  % PianoStaff and Pedal Staff must be simultaneous
@@ -2910,19 +3032,29 @@ PedalOrganMusic = \relative c {
       \new Staff = "ManualOne" <<
         \TimeKey  % set time signature and key
         \clef "treble"
-        \new Voice { \voiceOne \ManualOneVoiceOneMusic }
-        \new Voice { \voiceTwo \ManualOneVoiceTwoMusic }
+        \new Voice {
+          \voiceOne
+          \ManualOneVoiceOneMusic
+        }
+        \new Voice {
+          \voiceTwo
+          \ManualOneVoiceTwoMusic
+        }
       >>  % end ManualOne Staff context
       \new Staff = "ManualTwo" <<
         \TimeKey
         \clef "bass"
-        \new Voice { \ManualTwoMusic }
+        \new Voice {
+          \ManualTwoMusic
+        }
       >>  % end ManualTwo Staff context
     >>  % end PianoStaff context
     \new Staff = "PedalOrgan" <<
       \TimeKey
       \clef "bass"
-      \new Voice { \PedalOrganMusic }
+      \new Voice {
+        \PedalOrganMusic
+      }
     >>  % end PedalOrgan Staff context
   >>
 }  % end Score context
@@ -2951,7 +3083,12 @@ You may even realize that this could be useful in minimalist music:
 @lilypond[quote,verbatim,ragged-right]
 fragmentA = \relative c'' { a4 a8. b16 }
 fragmentB = \relative c'' { a8. gis16 ees4 }
-violin = \new Staff { \fragmentA \fragmentA \fragmentB \fragmentA }
+violin = \new Staff {
+  \fragmentA
+  \fragmentA
+  \fragmentB
+  \fragmentA
+}
 \score {
   {
     \violin
@@ -2964,22 +3101,22 @@ macros, or user-defined commands) for tweaks:
 
 @c TODO Avoid padtext - not needed with skylining
 @lilypond[quote,verbatim,ragged-right]
-dolce = \markup{ \italic \bold dolce }
+dolce = \markup { \italic \bold dolce }
 padText = { \once \override TextScript #'padding = #5.0 }
-fthenp=_\markup{ \dynamic f \italic \small { 2nd } \hspace #0.1 \dynamic p }
+fthenp=_\markup { \dynamic f \italic \small { 2nd } \hspace #0.1 \dynamic p }
 violin = \relative c'' {
   \repeat volta 2 {
-    c4._\dolce b8 a8 g a b |
+    c4._\dolce b8 a8 g a b
     \padText
-    c4.^"hi there!" d8 e' f g d |
-    c,4.\fthenp b8 c4 c-. |
+    c4.^"hi there!" d8 e' f g d
+    c,4.\fthenp b8 c4 c-.
   }
 }
 \score {
   {
     \violin
   }
-\layout{ragged-right=##t}
+\layout { ragged-right=##t }
 }
 @end lilypond
 
@@ -2993,11 +3130,11 @@ the last line.
 @example
 violin = \relative c'' @{
   \repeat volta 2 @{
-    c4._\markup@{ \italic \bold dolce @} b8 a8 g a b |
+    c4._\markup @{ \italic \bold dolce @} b8 a8 g a b
     \once \override TextScript #'padding = #5.0
-    c4.^"hi there!" d8 e' f g d |
-    c,4.\markup@{ \dynamic f \italic \small @{ 2nd @}
-      \hspace #0.1 \dynamic p @} b8 c4 c-. |
+    c4.^"hi there!" d8 e' f g d
+    c,4.\markup @{ \dynamic f \italic \small @{ 2nd @} \hspace #0.1 \dynamic p @}
+    b8 c4 c-.
   @}
 @}
 @end example
@@ -3148,13 +3285,14 @@ leading to
 @lilypond[quote,ragged-right]
 \relative c <<
   \new Staff {
-    \time 2/4 R2*3
+    \time 2/4
+    R2*3
     r4 f8 a cis4 f e d
   }
   \new Staff {
     \clef bass
     r4 d,8 f | gis4 c | b bes |
-    a8 e f4 | g d | gis f
+    a8 e f4 | g d | gis f |
   }
 >>
 @end lilypond