From d6f5e54330bbb04e47533b2a1c0cc2967b69a756 Mon Sep 17 00:00:00 2001
From: Graham Percival <graham@percival-music.ca>
Date: Mon, 12 Feb 2007 00:41:08 -0800
Subject: [PATCH] LSR update.

---
 input/lsr/chords/chord-name-exceptions.ly     |  21 ++--
 input/lsr/chords/chord-name-major7.ly         |   6 +-
 input/lsr/connecting/laissez-vibrer-ties.ly   |   8 +-
 input/lsr/contemporary/clusters.ly            |   4 +-
 input/lsr/parts/rehearsal-mark-numbers.ly     |  12 +-
 input/lsr/parts/tag-filter.ly                 |   6 +-
 input/lsr/repeats/volta-multi-staff.ly        |   9 +-
 input/lsr/spacing/Page-layout-twopass.ly      |   2 +-
 input/lsr/spacing/Proportional-spacing.ly     |   8 +-
 .../lsr/spacing/alignment-vertical-spacing.ly |  19 ++--
 input/lsr/spacing/page-layout-twopass.ly      |   2 +-
 input/lsr/spacing/page-spacing.ly             | 107 +++++++++---------
 input/lsr/spacing/proportional-spacing.ly     |   8 +-
 input/lsr/staff/staff-line-positions.ly       |   2 +-
 input/lsr/text/font-family-override.ly        |  20 ++--
 input/lsr/vocal/ambitus.ly                    |  24 ++--
 input/lsr/vocal/lyric-combine.ly              |   8 +-
 17 files changed, 147 insertions(+), 119 deletions(-)

diff --git a/input/lsr/chords/chord-name-exceptions.ly b/input/lsr/chords/chord-name-exceptions.ly
index b8f25b8779..7713f3b0b5 100644
--- a/input/lsr/chords/chord-name-exceptions.ly
+++ b/input/lsr/chords/chord-name-exceptions.ly
@@ -5,21 +5,24 @@ The property @{chordNameExceptions@} can used to store a list of special notatio
 " }
 
 % 7sus4 denoted with ^7 wahh
-chExceptionMusic =  {
-    <c f g bes>1-\markup { \super "7" "wahh" }}
+chExceptionMusic = {
+  <c f g bes>1-\markup { \super "7" "wahh" }
+}
 
-				% add to existing exceptions.
+% add to existing exceptions.
 chExceptions = #(append
-		 (sequential-music-to-chord-exceptions chExceptionMusic #t)
-		 ignatzekExceptions)
+  (sequential-music-to-chord-exceptions chExceptionMusic #t)
+  ignatzekExceptions)
 
 theMusic = \chordmode {
-    c:7sus4 c:dim7/+f
-    \set chordNameExceptions = #chExceptions
-    c:7sus4 c:dim7/+f
+  c:7sus4 c:dim7/+f
+  \set chordNameExceptions = #chExceptions
+  c:7sus4 c:dim7/+f
 }
 
-\layout { ragged-right = ##t }
+\layout {
+  ragged-right = ##t 
+}
 
 << \context ChordNames \theMusic
    \context Voice \theMusic
diff --git a/input/lsr/chords/chord-name-major7.ly b/input/lsr/chords/chord-name-major7.ly
index 4c8785a638..992e25c1af 100644
--- a/input/lsr/chords/chord-name-major7.ly
+++ b/input/lsr/chords/chord-name-major7.ly
@@ -5,7 +5,7 @@ The layout of the major 7 can be tuned with @{majorSevenSymbol@}
 " }
 
 \chords {
-    c:7+
-    \set majorSevenSymbol = \markup { "j7" }
-    c:7+
+  c:7+
+  \set majorSevenSymbol = \markup { "j7" }
+  c:7+
 }
diff --git a/input/lsr/connecting/laissez-vibrer-ties.ly b/input/lsr/connecting/laissez-vibrer-ties.ly
index a589c6e8fe..908ad5774b 100644
--- a/input/lsr/connecting/laissez-vibrer-ties.ly
+++ b/input/lsr/connecting/laissez-vibrer-ties.ly
@@ -17,10 +17,10 @@ l.v. ties should avoid dots and staff lines, similar to normal ties.  They have
 
   <c d e f>4\laissezVibrer r
   \override LaissezVibrerTieColumn #'tie-configuration
-  = #'((-7 . -1)
-       (-5 . -1)
-       (-3 . 1)
-       (-1 . 1))
+    = #'((-7 . -1)
+         (-5 . -1)
+         (-3 . 1)
+         (-1 . 1))
   <c d e f>4\laissezVibrer r
 }
 
diff --git a/input/lsr/contemporary/clusters.ly b/input/lsr/contemporary/clusters.ly
index ea45a8c059..12336f55f0 100644
--- a/input/lsr/contemporary/clusters.ly
+++ b/input/lsr/contemporary/clusters.ly
@@ -4,7 +4,9 @@
 Clusters are a device to denote that a complete range of notes is to be played.
 " }
 
-\layout { ragged-right = ##t }
+\layout {
+  ragged-right = ##t 
+}
 
 fragment = \relative c' {
   c4 f4 <e d'>4
diff --git a/input/lsr/parts/rehearsal-mark-numbers.ly b/input/lsr/parts/rehearsal-mark-numbers.ly
index 74d2cfeede..f0cb45e370 100644
--- a/input/lsr/parts/rehearsal-mark-numbers.ly
+++ b/input/lsr/parts/rehearsal-mark-numbers.ly
@@ -5,7 +5,9 @@ Marks can be printed as numbers.
 By setting @{markFormatter@} we may choose a different style of mark printing. Also, marks can be specified manually, with a markup argument.
 " }
 
-\paper { ragged-right = ##t } 
+\paper {
+  ragged-right = ##t 
+}
 
 \relative c''{
   \set Score.markFormatter = #format-mark-numbers 
@@ -13,11 +15,11 @@ By setting @{markFormatter@} we may choose a different style of mark printing. A
   c1 | \mark \default
   c1 | \mark \default
   \set Score.markFormatter
-  = #(lambda (mark  context)
-      (make-box-markup (format-mark-numbers mark context)))
+    = #(lambda (mark  context)
+        (make-box-markup (format-mark-numbers mark context)))
   c1 | \mark \default
   \set Score.markFormatter
-  = #(lambda (mark  context)
-      (make-circle-markup (format-mark-numbers mark context)))
+    = #(lambda (mark  context)
+        (make-circle-markup (format-mark-numbers mark context)))
   c1 | \mark \default
 }
diff --git a/input/lsr/parts/tag-filter.ly b/input/lsr/parts/tag-filter.ly
index 28491f5ccd..0478d2df58 100644
--- a/input/lsr/parts/tag-filter.ly
+++ b/input/lsr/parts/tag-filter.ly
@@ -4,11 +4,12 @@
 The @{\tag@} command marks music expressions with a name. These tagged expressions can be filtered out later. This mechanism can be used to make different versions of the same music. In this example, the top stave displays the music expression with all tags included. The bottom two staves are filtered: the part has cue notes and fingerings, but the score has not.
 " }
 
-\layout { ragged-right= ##t }
+\layout {
+  ragged-right= ##t 
+}
 
 common =
 \relative c''  {
-
   c1
   \relative c' <<
     \tag #'part <<
@@ -23,7 +24,6 @@ common =
 }
 
 
-
 \simultaneous { 
   \new Staff {
     \set Staff.instrumentName = #"both"
diff --git a/input/lsr/repeats/volta-multi-staff.ly b/input/lsr/repeats/volta-multi-staff.ly
index 979de2a1f7..76207fe51d 100644
--- a/input/lsr/repeats/volta-multi-staff.ly
+++ b/input/lsr/repeats/volta-multi-staff.ly
@@ -4,8 +4,13 @@
 By setting @{voltaOnThisStaff@}, repeats can be put also over other staves than the topmost one in a score.
 " }
 
-\layout { ragged-right = ##t }
-vmus =  { \repeat volta 2 c1 \alternative { d e } } 
+\layout {
+  ragged-right = ##t 
+}
+
+vmus =  {
+  \repeat volta 2 c1 \alternative { d e } 
+} 
 
 \relative c'' <<
   \new StaffGroup <<
diff --git a/input/lsr/spacing/Page-layout-twopass.ly b/input/lsr/spacing/Page-layout-twopass.ly
index 2812a66c19..7e85403a5e 100644
--- a/input/lsr/spacing/Page-layout-twopass.ly
+++ b/input/lsr/spacing/Page-layout-twopass.ly
@@ -9,6 +9,7 @@ Page breaking details can be stored for later reference.
 \paper  {
   #(define write-page-layout #t)
 }
+
 bla = \new Staff {
   c1 c1
   \break
@@ -31,4 +32,3 @@ tweakFileName = #(format "~a-page-layout.ly" (ly:parser-output-name parser))
 #(newline)
 
 #(ly:progress "Contents of: '~a'" (ly:gulp-file tweakFileName))
-
diff --git a/input/lsr/spacing/Proportional-spacing.ly b/input/lsr/spacing/Proportional-spacing.ly
index 6497b235ff..20efc39671 100644
--- a/input/lsr/spacing/Proportional-spacing.ly
+++ b/input/lsr/spacing/Proportional-spacing.ly
@@ -4,12 +4,14 @@
 Proportional notation can be created by setting @{proportionalNotationDuration@}. Notes will be spaced proportional to the distance for the given duration.
 " }
 
-\paper { ragged-right = ##t }
+\paper {
+  ragged-right = ##t 
+}
 
 \relative c''
 <<
   \set Score.proportionalNotationDuration = #(ly:make-moment 1 16)
-  \new Staff { c8[ c c c c c]  c4 c2 r2 }
-  \new Staff { c2  \times 2/3 { c8 c c } c4 c1 }
+  \new Staff { c8[ c c c c c] c4 c2 r2 }
+  \new Staff { c2 \times 2/3 { c8 c c } c4 c1 }
 >>
 
diff --git a/input/lsr/spacing/alignment-vertical-spacing.ly b/input/lsr/spacing/alignment-vertical-spacing.ly
index 2a25a2d31a..13811cc207 100644
--- a/input/lsr/spacing/alignment-vertical-spacing.ly
+++ b/input/lsr/spacing/alignment-vertical-spacing.ly
@@ -14,9 +14,12 @@ For technical reasons, @{overrideProperty@} has to be used for setting propertie
 \new StaffGroup <<
   \new Staff {
     c1\break 
-    c\break c\break
+    c\break 
+    c\break
+  }
+  \new Staff { 
+    c1 c c 
   }
-  \new Staff { c1 c c }
   \new PianoStaff <<
     \new Voice  {
       \set PianoStaff.instrumentName = #"piano"
@@ -24,15 +27,15 @@ For technical reasons, @{overrideProperty@} has to be used for setting propertie
       c1_"normal"
       
       \overrideProperty
-      #"Score.NonMusicalPaperColumn"
-      #'line-break-system-details
-      #'((fixed-alignment-extra-space . 15))
+        #"Score.NonMusicalPaperColumn"
+        #'line-break-system-details
+        #'((fixed-alignment-extra-space . 15))
       c_"fixed-aligment-extra-space"
 
       \overrideProperty
-      #"Score.NonMusicalPaperColumn"
-      #'line-break-system-details
-      #'((alignment-extra-space . 15))
+        #"Score.NonMusicalPaperColumn"
+        #'line-break-system-details
+        #'((alignment-extra-space . 15))
       c_"aligment-extra-space"
     }
     { c1 c c }
diff --git a/input/lsr/spacing/page-layout-twopass.ly b/input/lsr/spacing/page-layout-twopass.ly
index 2812a66c19..7e85403a5e 100644
--- a/input/lsr/spacing/page-layout-twopass.ly
+++ b/input/lsr/spacing/page-layout-twopass.ly
@@ -9,6 +9,7 @@ Page breaking details can be stored for later reference.
 \paper  {
   #(define write-page-layout #t)
 }
+
 bla = \new Staff {
   c1 c1
   \break
@@ -31,4 +32,3 @@ tweakFileName = #(format "~a-page-layout.ly" (ly:parser-output-name parser))
 #(newline)
 
 #(ly:progress "Contents of: '~a'" (ly:gulp-file tweakFileName))
-
diff --git a/input/lsr/spacing/page-spacing.ly b/input/lsr/spacing/page-spacing.ly
index 5a9a655b94..916c895dc9 100644
--- a/input/lsr/spacing/page-spacing.ly
+++ b/input/lsr/spacing/page-spacing.ly
@@ -10,64 +10,67 @@ By setting @{annotate-spacing@}, we can see the effect of each property.
 
 #(set-global-staff-size 11)
 
-\book {
-  \score {
-    \relative c'' \new PianoStaff <<
-      \new Voice  {
-	c1_"followed by default spacing"\break
-	c\break
+ \book {
+   \score {
+     \relative c'' \new PianoStaff <<
+      \new Voice {
+        c1_"followed by default spacing"
+        \break
+        c
+        \break
 
-	\overrideProperty
-	#"Score.NonMusicalPaperColumn"
-	#'line-break-system-details
-	#'((Y-extent . (-30 . 10)))
-	c_"Big bounding box (property Y-extent)"\break
+        \overrideProperty
+          #"Score.NonMusicalPaperColumn"
+          #'line-break-system-details
+          #'((Y-extent . (-30 . 10)))
+        c_"Big bounding box (property Y-extent)"
+        \break
 
-	\overrideProperty
-	#"Score.NonMusicalPaperColumn"
-	#'line-break-system-details
-	#'((refpoint-Y-extent . (-37 . -10)))
-	c_\markup {
-	  \column {
-	    "Refpoints further apart (property refpoint-Y-extent)."
-	    "Stretchable space runs between refpoints"
-	  }
-	}
-	
-	\break
-	
-	\overrideProperty
-	#"Score.NonMusicalPaperColumn"
-	#'line-break-system-details
-	#'((next-padding . 10))
+        \overrideProperty
+          #"Score.NonMusicalPaperColumn"
+          #'line-break-system-details
+          #'((refpoint-Y-extent . (-37 . -10)))
+        c_\markup {
+          \column {
+            "Refpoints further apart (property refpoint-Y-extent)."
+            "Stretchable space runs between refpoints" } }
+        \break
 
-	c_"Followed by padding, ie unstretchable space. (property next-padding)" \break
-	\overrideProperty
-	#"Score.NonMusicalPaperColumn"
-	#'line-break-system-details
-	#'((next-space . 20))
-	c_"Followed by stretchable space (property next-space)"\break
-	c\break
-	\overrideProperty
-	#"Score.NonMusicalPaperColumn" #'line-break-system-details
-	#'((bottom-space . 25.0)) 
-	c_"25 staff space to the bottom of the page. (property bottom-space)"\break
+        \overrideProperty
+          #"Score.NonMusicalPaperColumn"
+          #'line-break-system-details
+          #'((next-padding . 10))
+        c_"Followed by padding, ie unstretchable space (property next-padding)."
+        \break
 
+        \overrideProperty
+         #"Score.NonMusicalPaperColumn"
+          #'line-break-system-details
+          #'((next-space . 20))
+        c_"Followed by stretchable space (property next-space)"
+        \break
+        c
+        \break
 
+        \overrideProperty
+          #"Score.NonMusicalPaperColumn"
+          #'line-break-system-details
+          #'((bottom-space . 25.0))
+        c_"25 staff space to the bottom of the page (property bottom-space)."
+        \break
       }
-      { c1 c c c c c c c }
-    >>
-  }
-  \paper {
-    ragged-last-bottom = ##f
-    annotate-spacing = ##t
-    between-system-space = 1.0
-    #(set! text-font-defaults
-      (acons
-       'font-size 6
-       text-font-defaults)
-      
-    )
+       { c1 c c c c c c c }
+     >>
+   }
+
+   \paper {
+     ragged-last-bottom = ##f
+     annotate-spacing = ##t
+     between-system-space = 1.0
+     #(set! text-font-defaults
+        (acons
+         'font-size 6
+         text-font-defaults))
   }
 }
 
diff --git a/input/lsr/spacing/proportional-spacing.ly b/input/lsr/spacing/proportional-spacing.ly
index 6497b235ff..20efc39671 100644
--- a/input/lsr/spacing/proportional-spacing.ly
+++ b/input/lsr/spacing/proportional-spacing.ly
@@ -4,12 +4,14 @@
 Proportional notation can be created by setting @{proportionalNotationDuration@}. Notes will be spaced proportional to the distance for the given duration.
 " }
 
-\paper { ragged-right = ##t }
+\paper {
+  ragged-right = ##t 
+}
 
 \relative c''
 <<
   \set Score.proportionalNotationDuration = #(ly:make-moment 1 16)
-  \new Staff { c8[ c c c c c]  c4 c2 r2 }
-  \new Staff { c2  \times 2/3 { c8 c c } c4 c1 }
+  \new Staff { c8[ c c c c c] c4 c2 r2 }
+  \new Staff { c2 \times 2/3 { c8 c c } c4 c1 }
 >>
 
diff --git a/input/lsr/staff/staff-line-positions.ly b/input/lsr/staff/staff-line-positions.ly
index d6be6e7f4c..ed56b7115d 100644
--- a/input/lsr/staff/staff-line-positions.ly
+++ b/input/lsr/staff/staff-line-positions.ly
@@ -4,7 +4,7 @@
 The vertical positions of staff lines may be specified individually, by setting the @{line-positions@} property of the StaffSymbol.
 " }
 
-\new Staff \relative c'  {
+\new Staff \relative c' {
   \override Staff.StaffSymbol #'line-positions = #'(-7 -2 0 3 9)
   g c f b e a
 }
diff --git a/input/lsr/text/font-family-override.ly b/input/lsr/text/font-family-override.ly
index 606d53e70c..17b403a3e1 100644
--- a/input/lsr/text/font-family-override.ly
+++ b/input/lsr/text/font-family-override.ly
@@ -4,26 +4,28 @@
 The default font families for text can be overridden with @{make-pango-font-tree@}
 " }
 
-\paper  {
+\paper {
   % change for other default global staff size. 
   myStaffSize = #20
   %{
-  run
-      lilypond -dshow-available-fonts blabla
-  to show all fonts available in the process log.  
-    %}
+     run
+         lilypond -dshow-available-fonts blabla
+     to show all fonts available in the process log.  
+  %}
 
-    #(define fonts
+  #(define fonts
     (make-pango-font-tree "Times New Roman"
                           "Nimbus Sans"
                           "Luxi Mono"
-;;     "Helvetica"
-;;     "Courier"
+;;                        "Helvetica"
+;;                        "Courier"
      (/ myStaffSize 20)))
 }
 
 \relative {
-  c'^\markup { roman: foo \bold bla \italic bar \italic \bold baz }
+  c'^\markup {
+    roman: foo \bold bla \italic bar \italic \bold baz 
+  }
   c'_\markup {
     \override #'(font-family . sans)
     {
diff --git a/input/lsr/vocal/ambitus.ly b/input/lsr/vocal/ambitus.ly
index 2af5354380..1e79eb6a31 100644
--- a/input/lsr/vocal/ambitus.ly
+++ b/input/lsr/vocal/ambitus.ly
@@ -7,20 +7,22 @@ Accidentals only show up if they're not part of key signature.  @{AmbitusNoteHea
 " }
 
 \layout {
-    ragged-right = ##t
-    \context {
-	\Voice
-	\consists Ambitus_engraver
-    }
+  ragged-right = ##t
+  \context {
+    \Voice
+    \consists Ambitus_engraver
+  }
 }
 
 \relative
 <<
-    \new Staff {  \time  2/4 c4 f' }
-    \new Staff \relative {
-	\time  2/4
-	\key d \major
-	cis as'
-    }
+  \new Staff {
+    \time  2/4 c4 f' 
+  }
+  \new Staff \relative {
+    \time  2/4
+    \key d \major
+    cis as'
+  }
 >>
 
diff --git a/input/lsr/vocal/lyric-combine.ly b/input/lsr/vocal/lyric-combine.ly
index bcdff19567..2fbc564bf2 100644
--- a/input/lsr/vocal/lyric-combine.ly
+++ b/input/lsr/vocal/lyric-combine.ly
@@ -9,8 +9,10 @@ With the @{\lyricsto@} mechanism, individual lyric lines can be associated with
     \autoBeamOff
     c2( d4) e8[ c b c] f4
   }
-  \lyricsto "bla"  \new Lyrics  { bla ab blob blob }
-  \lyricsto "bla"  \new Lyrics  {
+  \lyricsto "bla"  \new Lyrics { 
+    bla ab blob blob 
+  }
+  \lyricsto "bla"  \new Lyrics {
     bla 
 
     \set ignoreMelismata = ##t
@@ -24,7 +26,7 @@ With the @{\lyricsto@} mechanism, individual lyric lines can be associated with
     blob
   }
   
-  \lyricsto "bla"  \new Lyrics  {
+  \lyricsto "bla"  \new Lyrics {
     nes ted lyrics voice with more words than no tes
   }
 >>
-- 
2.39.5