From: Graham Percival Date: Fri, 10 Feb 2006 18:41:37 +0000 (+0000) Subject: {\new|\context} Lyrics \lyricsto. X-Git-Tag: release/2.7.34~14 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e0d9c686b107b0d07a67f40b54a09009867620bf;p=lilypond.git {\new|\context} Lyrics \lyricsto. --- diff --git a/ChangeLog b/ChangeLog index 14b019d1fd..093249f287 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ * Documentation/user/invoking.itely: add example to File structure. + * Documentation/user/ instrument-notation.itely, cheatsheet.itely, + examples.itely, putting.itely: {\new|\context} Lyrics \lyricsto. + 2006-02-10 Han-Wen Nienhuys * ly/paper-defaults.ly: typo. diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely index ff10d223d0..f080f81e41 100644 --- a/Documentation/user/cheatsheet.itely +++ b/Documentation/user/cheatsheet.itely @@ -242,7 +242,7 @@ twinkle @lilypond[fragment,relative=2] << { g'4 g } - \lyricsto "" \new Lyrics { twin -- kle } + \new Lyrics \lyricsto "" { twin -- kle } >> @end lilypond diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely index b38536280b..2a53385e69 100644 --- a/Documentation/user/examples.itely +++ b/Documentation/user/examples.itely @@ -68,11 +68,11 @@ text = \lyricmode { \score{ << - \context Voice = one { + \context Voice = "one" { \autoBeamOff \melody } - \lyricsto "one" \new Lyrics \text + \new Lyrics \lyricsto "one" \text >> \layout { } \midi { \tempo 4=60 } @@ -140,11 +140,11 @@ harmonies = \chordmode { \set chordChanges = ##t \harmonies } - \context Voice = one { + \context Voice = "one" { \autoBeamOff \melody } - \lyricsto "one" \new Lyrics \text + \new Lyrics \lyricsto "one" \text >> \layout { } \midi { \tempo 4=60 } @@ -223,11 +223,11 @@ lower = \relative c { \score { << - \context Voice = mel { + \context Voice = "mel" { \autoBeamOff \melody } - \lyricsto mel \new Lyrics \text + \new Lyrics \lyricsto mel \text \context PianoStaff << \context Staff = upper \upper @@ -271,8 +271,8 @@ text = \lyricmode { \score { \context GrandStaff << - \context Staff = upper { \context Voice = singer \upper } - \lyricsto "singer" \new Lyrics \text + \context Staff = upper { \context Voice = "singer" \upper } + \new Lyrics \lyricsto "singer" \text \context Staff = lower { \clef bass \lower diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely index 4941a4d822..d2ed8037fe 100644 --- a/Documentation/user/instrument-notation.itely +++ b/Documentation/user/instrument-notation.itely @@ -768,8 +768,8 @@ it's fleece was white as snow. } \score{ << - \context Voice = one { \melody } - \lyricsto "one" \new Lyrics \text + \context Voice = "one" { \melody } + \new Lyrics \lyricsto "one" \text >> \layout { } } @@ -809,8 +809,8 @@ fancy things, in which case you should investigate is the same as @example -\context Voice = blah @{ music @} -\lyricsto "blah" \new lyrics @{ LYRICS @} +\context Voice = "blah" @{ music @} +\new Lyrics \lyricsto "blah" @{ LYRICS @} @end example @refbugs @@ -943,7 +943,7 @@ automatically. In this case, it is no longer necessary to enter the correct duration for each syllable. This is achieved by combining the melody and the lyrics with the @code{\lyricsto} expression @example -\lyricsto @var{name} \new Lyrics @dots{} +\new Lyrics \lyricsto @var{name} @dots{} @end example This aligns the lyrics to the @@ -965,7 +965,7 @@ hierarchy of staves and lyrics first, e.g., @end example and then combine the appropriate melodies and lyric lines @example -\lyricsto "soprano" \context Lyrics = sopranoLyrics +\context Lyrics = sopranoLyrics \lyricsto "soprano" @emph{the lyrics} @end example @@ -997,7 +997,7 @@ last one, e.g., \melismaEnd e2 } - \lyricsto "lala" \new Lyrics { + \new Lyrics \lyricsto "lala" { la di __ daah } >> @@ -1344,12 +1344,12 @@ section. c2 e | g e | c1 | \context Voice = verse \repeat volta 2 {c4 d e f | g1 | } a2 b | c1} - \lyricsto melody \context Lyrics = mainlyrics \lyricmode { + \context Lyrics = mainlyrics \lyricsto melody \lyricmode { do mi sol mi do la si do } - \lyricsto verse \context Lyrics = mainlyrics \lyricmode { + \context Lyrics = mainlyrics \lyricsto verse \lyricmode { do re mi fa sol } - \lyricsto verse \context Lyrics = repeatlyrics \lyricmode { + \context Lyrics = repeatlyrics \lyricsto verse \lyricmode { dodo rere mimi fafa solsol } >> } @@ -3931,7 +3931,7 @@ the following excerpt demonstrates \[ a \flexa \deminutum g\melismaEnd \] f \divisioMinima } } - \lyricsto "cantus" \new Lyrics { + \new Lyrics \lyricsto "cantus" { San- ctus, San- ctus, San- ctus } >> @@ -3964,7 +3964,7 @@ entering the chant, as the following excerpt demonstrates fis\longa^\signumcongruentiae } } - \lyricsto "discantus" \new Lyrics { + \new Lyrics \lyricsto "discantus" { San -- ctus, San -- ctus, San -- ctus } >> diff --git a/Documentation/user/putting.itely b/Documentation/user/putting.itely index c0fa477a43..e6440dfc76 100644 --- a/Documentation/user/putting.itely +++ b/Documentation/user/putting.itely @@ -114,11 +114,11 @@ text = \lyricmode @{ \score@{ << - \context Voice = one @{ + \context Voice = "one" @{ \autoBeamOff \melody @} - \lyricsto "one" \new Lyrics \text + \new Lyrics \lyricsto "one" \text >> \layout @{ @} \midi @{ \tempo 4=60 @} @@ -187,11 +187,11 @@ celloMusic = \relative c @{ \score@{ << - \context Voice = one @{ + \context Voice = "one" @{ \autoBeamOff \sopranoMusic @} - \lyricsto "one" \new Lyrics \sopranoLyrics + \new Lyrics \lyricsto "one" \sopranoLyrics >> \layout @{ @} \midi @{ \tempo 4=60 @} @@ -214,16 +214,16 @@ more than one thing (in this case staff) happening at once. The @example \score@{ -<< << - \context Voice = one @{ - \autoBeamOff - \sopranoMusic - @} - \lyricsto "one" \new Lyrics \sopranoLyrics + << + \context Voice = "one" @{ + \autoBeamOff + \sopranoMusic + @} + \new Lyrics \lyricsto "one" \sopranoLyrics + >> + \new Staff \celloMusic >> - \new Staff \celloMusic ->> \layout @{ @} \midi @{ \tempo 4=60 @} @} @@ -257,14 +257,14 @@ celloMusic = \relative c { \score{ << - << - \context Voice = one { - \autoBeamOff - \sopranoMusic - } - \lyricsto "one" \new Lyrics \sopranoLyrics - >> - \new Staff \celloMusic + << + \context Voice = "one" { + \autoBeamOff + \sopranoMusic + } + \new Lyrics \lyricsto "one" \sopranoLyrics + >> + \new Staff \celloMusic >> \layout { } \midi { \tempo 4=60 }