From 60b91fb2164a1c7c805af1e440ff4061853e262b Mon Sep 17 00:00:00 2001 From: Carl Sorensen Date: Tue, 25 Jan 2011 12:16:22 -0700 Subject: [PATCH] Change lyrics-old-spacing-settings from DOS mode to unix mode --- .../snippets/lyrics-old-spacing-settings.ly | 186 +++++++++--------- .../new/lyrics-old-spacing-settings.ly | 186 +++++++++--------- 2 files changed, 186 insertions(+), 186 deletions(-) diff --git a/Documentation/snippets/lyrics-old-spacing-settings.ly b/Documentation/snippets/lyrics-old-spacing-settings.ly index 03b83e3864..4cb66f6e50 100644 --- 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" - -\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)) - } - } -} - +\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 23167688c7..42cc85dc8a 100644 --- 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" - -\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)) - } - } -} - +\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)) + } + } +} + -- 2.39.2