From 71b8d269c783f1db63b6377186dc892175241792 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 22:15:10 +0000 Subject: [PATCH] lilypond-1.1.64 --- mutopia/F.Schubert/AnSylvia.ly | 110 ++++++++++++++++----------------- mutopia/Hymns/diademata.ly | 79 +++++++++++++---------- mutopia/Hymns/ode.ly | 54 ++++++++-------- 3 files changed, 128 insertions(+), 115 deletions(-) diff --git a/mutopia/F.Schubert/AnSylvia.ly b/mutopia/F.Schubert/AnSylvia.ly index f2b0d496cc..409e7aefde 100644 --- a/mutopia/F.Schubert/AnSylvia.ly +++ b/mutopia/F.Schubert/AnSylvia.ly @@ -15,10 +15,10 @@ title = "An Sylvia"; \include "paper16.ly"; \include "paper13.ly"; -pianoRH=\notes \relative c'' { +pianoRH=\notes \relative c' { \clef "G"; %1 - <[b,8-.(\pp d-. g-.> <)b-. d-. g-.>] + <[b8-.(\pp d-. g-.> <)b-. d-. g-.>] <[b8-. d-. g-.(> <)b-. d-. g-.>] | %2 @@ -236,7 +236,7 @@ tune=\notes \relative c'' { %18 r1 | %19 - d2. \context Staff < {\voiceone b8 ~ g8} {\voicetwo [b8 g8]} > | + d2. \context Staff < {\voiceone b8( )g8} {\voicetwo [b8 g8]} > | %20 \property Voice.slurdash = 2 fis4( )e \property Voice.slurdash = "" @@ -259,50 +259,50 @@ tune=\notes \relative c'' { r1 \bar "|."; } -fourbars=\lyrics { "_"1*5 } +fourbars=\lyrics { ""1*4 } verseOne=\lyrics { - Who2. is4 | Syl- via, _2 | + Who2. is4 | Syl- via, ""2 | What2. is4 | she,2 That4 | all our swains com- | mend2 her?4 " " | " "1 | Ho-4 - - ly, | - fair,2 _4 and | + fair,2 ""4 and | wise2. is4 | - she;2 _4 The | + she;2 ""4 The | heav'ns4 such grace did | - lend2 her4 _ | _1 | + lend2 her4 "" | ""1 | That2. a-4 | - do- red _2 | + do- red ""2 | She2. might4 | - be,2 _ | + be,2 "" | That2 a- | do- red | - she2. might4 | be.2 _ | + she2. might4 | be.2 "" | } verseTwo=\lyrics { - Is2. she4 | kind,2 _4 as | - she2. is4 |fair?2 _4 For | - beau- ty lives with | kind-2 ness4 _ | _1 | - To2. her4 |eyes2 _4 doth | Love 2. re-4 | - pair,2 _4 To | help him of his | blind-2 ness;4 _ | - _1 | - And2*3/2 be-8 ing | help'd4 - _ _ | in-2. hab-8 its | - there,2 _4 And | - be-2 ing | help'd in- | ha-2 -4 bits4 | there.2 _2 | + Is2. she4 | kind,2 ""4 as | + she2. is4 |fair?2 ""4 For | + beau- ty lives with | kind-2 ness4 "" | ""1 | + To2. her4 |eyes2 ""4 doth | Love 2. re-4 | + pair,2 ""4 To | help him of his | blind-2 ness;4 "" | + ""1 | + And2*3/2 be-8 ing | help'd4 - "" "" | in-2. hab-8 its | + there,2 ""4 And | + be-2 ing | help'd in- | ha-2 -4 bits4 | there.2 ""2 | } verseThree=\lyrics { - Then2. to4 | Syl-4 via _2 | - let2. us4 | sing,2 _4 That | - Syl- via is ex- | cel4 - ing; _ | _1 | - She2. ex-4 | cels2 _4 each | mor - - tal | - thing,2 _4 Up- | on the dull earth | dwell-2 ing4 - _ | _1 | - To2. her4 | gar- lands _2 | let2. us4 | - bring,2 _ | To her | gar- lands | let2. us4 | - bring.2 _ | + Then2. to4 | Syl-4 via ""2 | + let2. us4 | sing,2 ""4 That | + Syl- via is ex- | cel4 - ing; "" | ""1 | + She2. ex-4 | cels2 ""4 each | mor - - tal | + thing,2 ""4 Up- | on the dull earth | dwell-2 ing4 + "" | ""1 | + To2. her4 | gar- lands ""2 | let2. us4 | + bring,2 "" | To her | gar- lands | let2. us4 | + bring.2 "" | } @@ -310,38 +310,38 @@ verseThree=\lyrics { %% German Words -- syllabification may be incorrect (entered by %% someone who knows no German!) origVerseOne=\lyrics { - Was2. ist4 | Sil-4 via, _2 | - sag-2. et4 | an,2 _4 + Was2. ist4 | Sil-4 via, ""2 | + sag-2. et4 | an,2 ""4 Da{\ss}4 | - sie die wie- te | Flur2 preist?4 _ | _1| - Sch\"on2. und4 | zart2 _4 seh'- | ich2. sie4 | - nah'n,2 _4 Auf4 | - Him- melsg- gunst " und" | Spur2 weist,4 _ | _1 - Da{\ss}2. ihr4 | al- les _2 | - un-2. ter4 | tan.2 _ | - Da{\ss}2 ihr | al- les | un-2. ter4 | tan2 _ | + sie die wie- te | Flur2 preist?4 "" | ""1| + Sch\"on2. und4 | zart2 ""4 seh'- | ich2. sie4 | + nah'n,2 ""4 Auf4 | + Him- melsg- gunst " und" | Spur2 weist,4 "" | ""1 + Da{\ss}2. ihr4 | al- les ""2 | + un-2. ter4 | tan.2 "" | + Da{\ss}2 ihr | al- les | un-2. ter4 | tan2 "" | } origVerseTwo=\lyrics { - Ist2. sie4 | sch\"on2 _4 und4 | gut2. da-4 | zu?2 _4 - Reiz4| labt wie mil- de | Kind-2 heit;4 _ | _1 | - Ihr-2. em4 | Aug'-2 _4 eilt | A-2. mor4 | - zu,2 _4 - Dort4 | heilt er sein- e | Blind-2 heit,4 _ | _1 | - Und2. ver-4 | weilt2 _4 in4 | s\"u{\ss}-2. er4 - Ruh'.2 _ | - Und2 ver-2 | weilt in | s\"u{\ss}-2. er4| Ruh'.2 _ | + Ist2. sie4 | sch\"on2 ""4 und4 | gut2. da-4 | zu?2 ""4 + Reiz4| labt wie mil- de | Kind-2 heit;4 "" | ""1 | + Ihr-2. em4 | Aug'-2 ""4 eilt | A-2. mor4 | + zu,2 ""4 + Dort4 | heilt er sein- e | Blind-2 heit,4 "" | ""1 | + Und2. ver-4 | weilt2 ""4 in4 | s\"u{\ss}-2. er4 + Ruh'.2 "" | + Und2 ver-2 | weilt in | s\"u{\ss}-2. er4| Ruh'.2 "" | } origVerseThree=\lyrics { - Dar4 - - um | Sil- via, _2 | t\"on',2. o4 | - Sang,2 _4 - Der4 | hold- en Sil- via | Ehr-2 en;4 _4 | _1 | - Je2. den4 | Reiz2 _4 be- |siegt2. sie4 | lang,2 _4 - Den | Er- de kann ge- | w\"ah-2 ren;4 _ | _1 | - Kr\"an-2. ze4 | ihr2 _4 und4 | Sai-2. ten4 - |klang!2 _ - Kr\"an-2 ze | ihr und | Sai-2. ten-4 |klang!2 _ | + Dar4 - - um | Sil- via, ""2 | t\"on',2. o4 | + Sang,2 ""4 + Der4 | hold- en Sil- via | Ehr-2 en;4 ""4 | ""1 | + Je2. den4 | Reiz2 ""4 be- |siegt2. sie4 | lang,2 ""4 + Den | Er- de kann ge- | w\"ah-2 ren;4 "" | ""1 | + Kr\"an-2. ze4 | ihr2 ""4 und4 | Sai-2. ten4 + |klang!2 "" + Kr\"an-2 ze | ihr und | Sai-2. ten-4 |klang!2 "" | } global=\notes { @@ -374,7 +374,7 @@ GermanWords = \lyrics< Vocals= < \context Staff = vocal < - \notes \transpose c {\clef "F"; \global\tune} + \notes {\clef "G2"; \global\tune} % {\context Lyrics = vocal \EnglishWords} {\context Lyrics = vocal \GermanWords} > diff --git a/mutopia/Hymns/diademata.ly b/mutopia/Hymns/diademata.ly index 5a6a838bc5..b3310914a3 100644 --- a/mutopia/Hymns/diademata.ly +++ b/mutopia/Hymns/diademata.ly @@ -1,78 +1,84 @@ \header { -filename = "diademata.ly"; -enteredby = "Peter Chubb"; -composer = "Sir G. J. Elvey"; -date = "1868"; -title = "Diademata"; -metre = "6 6. 8 6. D"; + filename = "diademata.ly"; + enteredby = "Peter Chubb"; + composer = "Sir G. J. Elvey"; + date = "1868"; + title = "Diademata"; + metre = "6 6. 8 6. D"; } + \version "1.1.52"; sop=\notes \transpose c''{ - ees2 | ees4 ees4 g2 g2 | c'1. \bar "||"; - c'2 | bes2 ees aes g | f1. \bar "||"; - f2 | g bes c' bes | a g4 ~ f bes2 - ees'2 | d' ees' c' c' | bes1. \bar "||"; - bes2 | bes g f ees | c'1. \bar "||"; - c'2 | c' a g f | d'1. \bar "||"; + ees2 ees4 ees4 g2 g2 | c'1. + c'2 | bes2 ees aes g | f1. + f2 | g bes c' bes | a g4( )f bes2 + ees'2 | d' ees' c' c' | bes1. + bes2 | bes g f ees | c'1. + c'2 | c' a g f | d'1. d'2 | ees'2. d'4 c'2 bes | aes f g - bes2 | aes g f f | ees\breve \bar "||"; + bes2 | aes g f f | ees\breve } alt=\notes \transpose c''{ - bes,2 bes,4 bes,4 ees2 ees2 | ees1. \bar "||"; - ees2 | ees ees d ees | d1. \bar "||"; + bes,2 bes,4 bes,4 ees2 ees2 | ees1. + ees2 | ees ees d ees | d1. d2 | ees f ees g | ees c f - ees2 | f g c f | d1. \bar "||"; - d2 | ees ees d ees | ees1. \bar "||"; - e2 | f f ees ees | d1. \bar "||"; + ees2 | f g c f | d1. + d2 | ees ees d ees | ees1. + e2 | f f ees ees | d1. f2 | ees ees ees ees | ees d ees - ees | ees ees ees d | ees\breve \bar "||"; + ees | ees ees ees d | ees\breve } ten=\notes \transpose c' { - g2 g4 g4 g2 g2 | aes1. \bar "||"; - aes2 | bes c' aes bes | bes1. \bar "||"; + g2 g4 g4 g2 g2 | aes1. + aes2 | bes c' aes bes | bes1. bes2 | bes bes g g | c' a bes - a2 | bes bes bes a | bes1. \bar "||"; - bes2 | bes bes aes bes | c'1. \bar "||"; - bes2 | a c' bes c' | bes1. \bar "||"; + a2 | bes bes bes a | bes1. + bes2 | bes bes aes bes | c'1. + bes2 | a c' bes c' | bes1. bes2 | bes bes aes bes | c' bes bes - bes c' bes bes2. aes4 | g\breve \bar "||"; + bes c' bes bes2. aes4 | g\breve } bass=\notes \transpose c' { - ees2 ees4 ees4 c2 c2 | aes,1. \bar "||"; - aes2 | g aes f ees | bes,1. \bar "||"; + ees2 ees4 ees4 c2 c2 | aes,1. + aes2 | g aes f ees | bes,1. bes,2 | ees d c ees | f ees d - c2 bes, ees f f | bes,1. \bar "||"; - aes2 | g ees f g | aes1. \bar "||"; - g2 | f f g a | bes1. \bar "||"; + c2 bes, ees f f | bes,1. + aes2 | g ees f g | aes1. + g2 | f f g a | bes1. aes2 | g g aes g | f bes ees - g,2 | aes, ees bes, bes, | ees\breve \bar "||"; + g,2 | aes, ees bes, bes, | ees\breve } global = \notes{ \time 4/2; - \property Staff.timeSignatureStyle="none" \key ees; + \skip 2*4; \skip 1.; \bar "||"; + \skip 2; \skip 2*4; \skip 1.; \bar "||";\break + \skip 2; \skip 2*12;\skip 1.; \bar "||";\break + \skip 2; \skip 2*4; \skip 1.; \bar "||"; + \skip 2; \skip 2*4; \skip 1.; \bar "||";\break + \skip 2; \skip 2*12;\skip 1.; \bar "||"; } $upper_staff = \context Staff = upper { - \global \clef "treble"; \context Staff < + \global { \voiceone \sop } { \voicetwo \alt } > } $lower_staff = \context Staff = lower { - \global \clef "bass"; \context Staff < + \global { \voiceone \ten } { \voicetwo \bass } > @@ -84,7 +90,12 @@ $lower_staff = \context Staff = lower { \$lower_staff > \paper { + indent = 0.0\mm; linewidth= 140.0\mm; gourlay_maxmeasures = 6.0; + \translator{ + \StaffContext + \remove "Time_signature_engraver"; + } } } diff --git a/mutopia/Hymns/ode.ly b/mutopia/Hymns/ode.ly index aef853723d..24542cdbc6 100644 --- a/mutopia/Hymns/ode.ly +++ b/mutopia/Hymns/ode.ly @@ -1,40 +1,40 @@ \header { -filename = "ode.ly"; -enteredby = "Peter Chubb"; -composer = " Beethoven"; -date = "1800"; -title = "Ode to Joy"; -metre = "8 7 8 7 D"; + filename = "ode.ly"; + enteredby = "Peter Chubb"; + composer = "Beethoven"; + date = "circa. 1800"; + title = "Ode to Joy"; + metre = "8 7 8 7 D"; } \version "1.1.52"; sop=\notes \relative c'' { - b4 b c d | d c b a | g g a b | b4. a8 a2 \bar "||"; - b4 b c d | d c b a | g g a b | a4. g8 g2 \bar "||"; - a4 a b g | a [b8 ~ c] b4 g | a [b8 ~ c] b4 a | g a d,2 \bar "||"; - b'4 b c d | d c b a | g g a b | a4. g8 g2 \bar "||"; + b4 b c d | d c b a | g g a b | b4. a8 a2 | + b4 b c d | d c b a | g g a b | a4. g8 g2 | + a4 a b g | a [b8( )c] b4 g | a [b8( )c] b4 a | g a d,2 | + b'4 b c d | d c b a | g g a b | a4. g8 g2 | } alto=\notes \relative c'' { - g4 g a g | g4. a8 g4 fis | d d fis g| g4. fis8 fis2 \bar "||"; - g4 g a g | g4. a8 g4 fis | d d fis g| g4 fis d2 \bar "||"; - d4 d d d | d d d d | d d fis fis | e cis d2 \bar "||"; - d4 g a a b [g8~a] g4 e | e d fis g |g fis g2 \bar "||"; + g4 g a g | g4. a8 g4 fis | d d fis g| g4. fis8 fis2 | + g4 g a g | g4. a8 g4 fis | d d fis g| g4 fis d2 | + d4 d d d | d d d d | d d fis fis | e cis d2 | + d4 g a a b [g8( )a] g4 e | e d fis g |g fis g2 | } tenor=\notes \relative c'{ - d4 d c b | e4. d8 d4 d | b b d d | d4. d8 d2 \bar "||"; - d4 d c b | e4. d8 d4 d | b b d d | d4 d b2 \bar "||"; - fis4 fis g e | fis [g8 ~ a8] g4 e | fis fis fis b | b a g ~ fis \bar "||"; - g4 d' f, f | g4. d'8 d4 c | g g c c | d d b2 \bar "||"; + d4 d c b | e4. d8 d4 d | b b d d | d4. d8 d2 | + d4 d c b | e4. d8 d4 d | b b d d | d4 d b2 | + fis4 fis g e | fis [g8( )a8] g4 e | fis fis fis b | b a g( )fis | + g4 d' f, f | g4. d'8 d4 c | g g c c | d d b2 | } bass= \notes \relative c' { - g4 g g g | e4. fis8 g4 d | b b a g | d'4. d8 d2 \bar "||"; - g4 g g g | e4. fis8 g4 d | b b a g | d' d g,2 \bar "||"; - d'4 d d d | d d d d | d d dis dis | e a, d2 \bar "||"; - g4 g f f | e4. fis8 g4 c, | c b a g | d' d g,2 \bar "||"; + g4 g g g | e4. fis8 g4 d | b b a g | d'4. d8 d2 | + g4 g g g | e4. fis8 g4 d | b b a g | d' d g,2 | + d'4 d d d | d d d d | d d dis dis | e a, d2 | + g4 g f f | e4. fis8 g4 c, | c b a g | d' d g,2 | } @@ -42,26 +42,28 @@ global=\notes{ \time 4/4; \property Staff.timeSignatureStyle="C" \key G; + \skip 1*4; \bar "||"; + \skip 1*4; \bar "||"; + \skip 1*4; \bar "||"; + \skip 1*4; \bar "|."; } $upper_staff = \context Staff = upper \notes { - \global \clef "G"; \context Staff < + \global {\voiceone \sop} {\voicetwo \alto} > - \bar "|."; } $lower_staff = \context Staff = lower \notes { - \global \clef "F"; \context Staff < + \global {\voiceone \tenor} {\voicetwo \bass } > - \bar "|."; } \score{ -- 2.39.5