Change lyrics-old-spacing-settings from DOS mode to unix mode

diff --git a/Documentation/snippets/lyrics-old-spacing-settings.ly b/Documentation/snippets/lyrics-old-spacing-settings.ly
index 03b83e3864b6158060f4d66b2dbe11992ce92639..4cb66f6e507cae585463c96f6766ba447bfea2f3 100644 (file)
--- a/Documentation/snippets/lyrics-old-spacing-settings.ly
+++ b/Documentation/snippets/lyrics-old-spacing-settings.ly
@@ -2,96 +2,96 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.47
-\version "2.13.47"\r
-\r
-\header {\r
-  lsrtags = "vocal-music"\r
-  texidoc = "\r
-The vertical spacing engine changed for version 2.14.  This can\r
-cause lyrics to be spaced differently.  It is possible to set\r
-properties for @code{Lyric} and @code{Staff} contexts to get the\r
-spacing engine to behave as it did in version 2.12.\r
-"\r
-}\r
-\r
-global = {\r
-  \key d \major\r
-  \time 3/4\r
-}\r
-\r
-sopMusic = \relative c' {\r
-  % VERSE ONE\r
-  fis4 fis fis | \break\r
-  fis4. e8 e4\r
-}\r
-\r
-altoMusic = \relative c' {\r
-  % VERSE ONE\r
-  d4 d d |\r
-  d4. b8 b4 |\r
-}\r
-\r
-tenorMusic = \relative c' {\r
-  a4 a a |\r
-  b4. g8 g4 |\r
-}\r
-\r
-bassMusic = \relative c {\r
-  d4 d d |\r
-  g,4. g8 g4 |\r
-}\r
-\r
-words = \lyricmode {\r
-  Great is Thy faith- ful- ness,\r
-}\r
-\r
-\score {\r
-  \new ChoirStaff <<\r
-    \new Lyrics = sopranos\r
-    \new Staff = women <<\r
-      \new Voice = "sopranos" {\r
-        \voiceOne\r
-        \global \sopMusic\r
-      }\r
-      \new Voice = "altos" {\r
-        \voiceTwo\r
-        \global \altoMusic\r
-      }\r
-    >>\r
-    \new Lyrics = "altos"\r
-    \new Lyrics = "tenors"\r
-    \new Staff = men <<\r
-      \clef bass\r
-      \new Voice = "tenors" {\r
-        \voiceOne\r
-        \global \tenorMusic\r
-      }\r
-      \new Voice = "basses" {\r
-        \voiceTwo  \global \bassMusic\r
-      }\r
-    >>\r
-    \new Lyrics = basses\r
-    \context Lyrics = sopranos \lyricsto sopranos \words\r
-    \context Lyrics = altos \lyricsto altos \words\r
-    \context Lyrics = tenors \lyricsto tenors \words\r
-    \context Lyrics = basses \lyricsto basses \words\r
-  >>\r
-  \layout {\r
-    \context {\r
-      \Lyrics\r
-      \override VerticalAxisGroup #'staff-affinity = ##f\r
-      \override VerticalAxisGroup #'staff-staff-spacing =\r
-        #'((basic-distance . 0)\r
-          (minimum-distance . 2)\r
-          (padding . 2))\r
-    }\r
-    \context {\r
-      \Staff\r
-      \override VerticalAxisGroup #'staff-staff-spacing =\r
-        #'((basic-distance . 0)\r
-          (minimum-distance . 2)\r
-          (padding . 2))\r
-    }\r
-  }\r
-}\r
-\r
+\version "2.13.47"
+
+\header {
+  lsrtags = "vocal-music"
+  texidoc = "
+The vertical spacing engine changed for version 2.14.  This can
+cause lyrics to be spaced differently.  It is possible to set
+properties for @code{Lyric} and @code{Staff} contexts to get the
+spacing engine to behave as it did in version 2.12.
+"
+}
+
+global = {
+  \key d \major
+  \time 3/4
+}
+
+sopMusic = \relative c' {
+  % VERSE ONE
+  fis4 fis fis | \break
+  fis4. e8 e4
+}
+
+altoMusic = \relative c' {
+  % VERSE ONE
+  d4 d d |
+  d4. b8 b4 |
+}
+
+tenorMusic = \relative c' {
+  a4 a a |
+  b4. g8 g4 |
+}
+
+bassMusic = \relative c {
+  d4 d d |
+  g,4. g8 g4 |
+}
+
+words = \lyricmode {
+  Great is Thy faith- ful- ness,
+}
+
+\score {
+  \new ChoirStaff <<
+    \new Lyrics = sopranos
+    \new Staff = women <<
+      \new Voice = "sopranos" {
+        \voiceOne
+        \global \sopMusic
+      }
+      \new Voice = "altos" {
+        \voiceTwo
+        \global \altoMusic
+      }
+    >>
+    \new Lyrics = "altos"
+    \new Lyrics = "tenors"
+    \new Staff = men <<
+      \clef bass
+      \new Voice = "tenors" {
+        \voiceOne
+        \global \tenorMusic
+      }
+      \new Voice = "basses" {
+        \voiceTwo  \global \bassMusic
+      }
+    >>
+    \new Lyrics = basses
+    \context Lyrics = sopranos \lyricsto sopranos \words
+    \context Lyrics = altos \lyricsto altos \words
+    \context Lyrics = tenors \lyricsto tenors \words
+    \context Lyrics = basses \lyricsto basses \words
+  >>
+  \layout {
+    \context {
+      \Lyrics
+      \override VerticalAxisGroup #'staff-affinity = ##f
+      \override VerticalAxisGroup #'staff-staff-spacing =
+        #'((basic-distance . 0)
+          (minimum-distance . 2)
+          (padding . 2))
+    }
+    \context {
+      \Staff
+      \override VerticalAxisGroup #'staff-staff-spacing =
+        #'((basic-distance . 0)
+          (minimum-distance . 2)
+          (padding . 2))
+    }
+  }
+}
+

diff --git a/Documentation/snippets/new/lyrics-old-spacing-settings.ly b/Documentation/snippets/new/lyrics-old-spacing-settings.ly
index 23167688c7bacfe4a961cad06b328fb0bbb651fc..42cc85dc8a7bb3ba7c6231e78341f26dbbd19850 100644 (file)
--- a/Documentation/snippets/new/lyrics-old-spacing-settings.ly
+++ b/Documentation/snippets/new/lyrics-old-spacing-settings.ly
@@ -1,93 +1,93 @@
-\version "2.13.47"\r
-\r
-\header {\r
-  lsrtags = "vocal-music"\r
-  texidoc = "\r
-The vertical spacing engine changed for version 2.14.  This can\r
-cause lyrics to be spaced differently.  It is possible to set\r
-properties for @code{Lyric} and @code{Staff} contexts to get the\r
-spacing engine to behave as it did in version 2.12.\r
-"\r
-}\r
-\r
-global = {\r
-  \key d \major\r
-  \time 3/4\r
-}\r
-\r
-sopMusic = \relative c' {\r
-  % VERSE ONE\r
-  fis4 fis fis | \break\r
-  fis4. e8 e4\r
-}\r
-\r
-altoMusic = \relative c' {\r
-  % VERSE ONE\r
-  d4 d d |\r
-  d4. b8 b4 |\r
-}\r
-\r
-tenorMusic = \relative c' {\r
-  a4 a a |\r
-  b4. g8 g4 |\r
-}\r
-\r
-bassMusic = \relative c {\r
-  d4 d d |\r
-  g,4. g8 g4 |\r
-}\r
-\r
-words = \lyricmode {\r
-  Great is Thy faith- ful- ness,\r
-}\r
-\r
-\score {\r
-  \new ChoirStaff <<\r
-    \new Lyrics = sopranos\r
-    \new Staff = women <<\r
-      \new Voice = "sopranos" {\r
-        \voiceOne\r
-        \global \sopMusic\r
-      }\r
-      \new Voice = "altos" {\r
-        \voiceTwo\r
-        \global \altoMusic\r
-      }\r
-    >>\r
-    \new Lyrics = "altos"\r
-    \new Lyrics = "tenors"\r
-    \new Staff = men <<\r
-      \clef bass\r
-      \new Voice = "tenors" {\r
-        \voiceOne\r
-        \global \tenorMusic\r
-      }\r
-      \new Voice = "basses" {\r
-        \voiceTwo  \global \bassMusic\r
-      }\r
-    >>\r
-    \new Lyrics = basses\r
-    \context Lyrics = sopranos \lyricsto sopranos \words\r
-    \context Lyrics = altos \lyricsto altos \words\r
-    \context Lyrics = tenors \lyricsto tenors \words\r
-    \context Lyrics = basses \lyricsto basses \words\r
-  >>\r
-  \layout {\r
-    \context {\r
-      \Lyrics\r
-      \override VerticalAxisGroup #'staff-affinity = ##f\r
-      \override VerticalAxisGroup #'staff-staff-spacing =\r
-        #'((basic-distance . 0)\r
-          (minimum-distance . 2)\r
-          (padding . 2))\r
-    }\r
-    \context {\r
-      \Staff\r
-      \override VerticalAxisGroup #'staff-staff-spacing =\r
-        #'((basic-distance . 0)\r
-          (minimum-distance . 2)\r
-          (padding . 2))\r
-    }\r
-  }\r
-}\r
-\r
+\version "2.13.47"
+
+\header {
+  lsrtags = "vocal-music"
+  texidoc = "
+The vertical spacing engine changed for version 2.14.  This can
+cause lyrics to be spaced differently.  It is possible to set
+properties for @code{Lyric} and @code{Staff} contexts to get the
+spacing engine to behave as it did in version 2.12.
+"
+}
+
+global = {
+  \key d \major
+  \time 3/4
+}
+
+sopMusic = \relative c' {
+  % VERSE ONE
+  fis4 fis fis | \break
+  fis4. e8 e4
+}
+
+altoMusic = \relative c' {
+  % VERSE ONE
+  d4 d d |
+  d4. b8 b4 |
+}
+
+tenorMusic = \relative c' {
+  a4 a a |
+  b4. g8 g4 |
+}
+
+bassMusic = \relative c {
+  d4 d d |
+  g,4. g8 g4 |
+}
+
+words = \lyricmode {
+  Great is Thy faith- ful- ness,
+}
+
+\score {
+  \new ChoirStaff <<
+    \new Lyrics = sopranos
+    \new Staff = women <<
+      \new Voice = "sopranos" {
+        \voiceOne
+        \global \sopMusic
+      }
+      \new Voice = "altos" {
+        \voiceTwo
+        \global \altoMusic
+      }
+    >>
+    \new Lyrics = "altos"
+    \new Lyrics = "tenors"
+    \new Staff = men <<
+      \clef bass
+      \new Voice = "tenors" {
+        \voiceOne
+        \global \tenorMusic
+      }
+      \new Voice = "basses" {
+        \voiceTwo  \global \bassMusic
+      }
+    >>
+    \new Lyrics = basses
+    \context Lyrics = sopranos \lyricsto sopranos \words
+    \context Lyrics = altos \lyricsto altos \words
+    \context Lyrics = tenors \lyricsto tenors \words
+    \context Lyrics = basses \lyricsto basses \words
+  >>
+  \layout {
+    \context {
+      \Lyrics
+      \override VerticalAxisGroup #'staff-affinity = ##f
+      \override VerticalAxisGroup #'staff-staff-spacing =
+        #'((basic-distance . 0)
+          (minimum-distance . 2)
+          (padding . 2))
+    }
+    \context {
+      \Staff
+      \override VerticalAxisGroup #'staff-staff-spacing =
+        #'((basic-distance . 0)
+          (minimum-distance . 2)
+          (padding . 2))
+    }
+  }
+}
+