From 6dcbb6c7c5373924f5e414461c93495764756715 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:42:15 +0000 Subject: [PATCH] lilypond-0.0.59 --- Documentation/faq.pod | 18 +++++------ input/cadenza.ly | 35 ++++++++++++---------- input/collisions.ly | 24 +++++++++++---- input/coriolan-alto.ly | 24 +++++++++------ input/header.ly | 22 +++++++------- input/kortjakje.ly | 31 +++++++++++-------- input/slurs.ly | 38 +++++++++++++++++++++++ input/standchen.ly | 68 ++++++++++++++++++++++-------------------- input/twinkle.ly | 25 +++++++++++----- 9 files changed, 182 insertions(+), 103 deletions(-) create mode 100644 input/slurs.ly diff --git a/Documentation/faq.pod b/Documentation/faq.pod index e2e9b63818..4aeef3751f 100644 --- a/Documentation/faq.pod +++ b/Documentation/faq.pod @@ -35,13 +35,13 @@ Q: I can type to make a few chords, but why do I have to type - < { a() e } { c () g } > + < { a~ e } { c ~ g } > instead of - <)e )g> + -to generate slurs between the chords? +to generate ties between the chords? A: When you type @@ -51,14 +51,14 @@ this is shorthand for < { a } { c } > < { e } { g } > -Slurs have to be confined to `voices', and the a and the e are in +Ties have to be confined to `voices', and the a and the e are in different {} blocks, so they are in different voices. You should view the desired construct as a "generalised chord" (two voices stacked vertically). It might help you visualise this by using the following formatting: - < { a () e } - { c () g } + < { a ~ e } + { c ~ g } > Q: and where do the beams come into this picture? @@ -66,9 +66,9 @@ Q: and where do the beams come into this picture? A: Beams are voicegroup-wide, and may be entered in any part of the voicegroup: - < { [a () e] } { c () g } > - < { [a () e } { c () g] } > - < { [a () e] } { [c () g] } > + < { [a ~ e] } { c ~ g } > + < { [a ~ e } { c ~ g] } > + < { [a ~ e] } { [c ~ g] } > These all give the same result. diff --git a/input/cadenza.ly b/input/cadenza.ly index 98e1f4ad48..158ee16b14 100644 --- a/input/cadenza.ly +++ b/input/cadenza.ly @@ -1,13 +1,16 @@ -% title: -% description:Cadenza to Mozart Horn concerto 3 -% composer(s):unknown -% entered-by:HWN -% copyright: public domain -% -% Tested Features: cadenza mode +%{MudelaHeader + title: + description:Cadenza to Mozart Horn concerto 3 + composer(s):unknown + entered-by:HWN + copyright: public domain + Tested Features: cadenza mode -\version "0.0.56"; +EndMudelaHeader +%} + +\version "0.0.57"; cad = \melodic { @@ -18,33 +21,33 @@ cad = \melodic { c'4.\mf g8 - [e'^"accel" ()d' c' b] - [b()c'] g-\fermata + [e'^"accel" ~ d' c' b] + [b~ c'] g-\fermata \bar \empty; c [c_"rubato" e g c'] \octave c''; - e4. e [g ()f_"rit" e d] + e4. e [g ~ f_"rit" e d] \duration 16; - dis4()e4 + dis4~ e4 \bar \empty ; r8 [c d] [e f g gis] \duration 4; - a-> 'f()'e g - f-> 'd()'cis e + a-> 'f~ 'e g + f-> 'd~ 'cis e \duration 8; d4^\fermata \bar \empty ; r8 'a ['b cis] \duration 16; [d cis d e] - f4()[f e d c] + f4~ [f e d c] 'b4 \octave c'; [d'8 c'8 a8]2/3 g2 \bar \empty ; [g c e g] [c' e g c']\octave c''; - [e 'g c e] g4^\fermata %()% BUG! + [e 'g c e] g4^\fermata %~ % BUG! \bar \empty ; [g8.(_"a tempo" e g8. )e] a4. g8 [f8 e8 d8 c8] diff --git a/input/collisions.ly b/input/collisions.ly index a202789ca4..bee5e6de6f 100644 --- a/input/collisions.ly +++ b/input/collisions.ly @@ -1,12 +1,24 @@ -% test the Collision resolution -\version "0.0.56"; +%{MudelaHeader + + filename: collisions.ly + title: + description: + composer(s): HWN + entered-by: HWN + copyright: public domain + + Tested Features:%test the Collision resolution +EndMudelaHeader +%} +\version "0.0.57"; + two_voice_steminvert = \melodic { < \multivoice { \octave c'; \stem 1; - c d e f() g2 g a } + c d e f~ g2 g a } { \stem -1; - g f e g ()g2 g2 } + g f e g ~ g2 g2 } > } @@ -14,9 +26,9 @@ two_voice_steminvert = \melodic { two_voice = \melodic { < \multivoice { \octave c'; \stem -1; - c d e f g2() g a } + c d e f g2~ g a } { \stem 1; - g f e g ()g2 g2 } + g f e g ~ g2 g2 } > } diff --git a/input/coriolan-alto.ly b/input/coriolan-alto.ly index 1fb5e8b0e3..4afddd6614 100644 --- a/input/coriolan-alto.ly +++ b/input/coriolan-alto.ly @@ -1,16 +1,22 @@ -% Ludwig van Beethoven (1770-1792) -% -% Opus 62 -% Ouverture zu Collins Trauerspiel "Coriolan" -% -% a 5 bar fragment of the alto part -% -% Copyright (c) 1997 Jan Nieuwenhuizen +%{MudelaHeader + + filename: coriolan-alto.ly + title:Ouverture zu Collins Trauerspiel "Coriolan" Opus 62 + description: a 5 bar fragment of the alto part + composer(s): Ludwig van Beethoven (1770-1792) + entered-by: JCN + copyright: public domain + + Tested Features: +EndMudelaHeader +%} + % % when lily can handle this, i-ll type the other 304 bars % (maybe even sooner :-) % -\version "0.0.56"; + +\version "0.0.57"; alto = \melodic{ diff --git a/input/header.ly b/input/header.ly index aa80f614bd..af02e8ab9d 100644 --- a/input/header.ly +++ b/input/header.ly @@ -1,11 +1,13 @@ -%%MudelaHeader -% title: -% description: -% composer(s): -% entered-by: -% copyright: -% -% Tested Features: -%%End +%{MudelaHeader -\version "0.0.56"; + filename: + title: + description: + composers: + entered-by: + copyright: + + Tested Features: +EndMudelaHeader +%} +\version "0.0.57"; diff --git a/input/kortjakje.ly b/input/kortjakje.ly index 6765c8f7f0..e9588b6620 100644 --- a/input/kortjakje.ly +++ b/input/kortjakje.ly @@ -1,13 +1,20 @@ -% "Ah, vous dirais-je, maman" (Mozart, KV 265) -% -% bare bones version. (written down from memory :-) -% for lyrics, see twinkle.ly +%{MudelaHeader + + filename: kortjakje.ly + title: Ah, vous dirais-je, maman (variations) + description: bare bones version. (written down from memory :-) + composers:Mozart, KV 265 + entered-by: HWN + copyright: none + + Tested Features: example file with comments +EndMudelaHeader +%} +\version "0.0.57"; + % the % is a comment. -% -% copyright: None -% -\version "0.0.56"; + % declare melody (which will be in *one* staff ) for the lead voice melodie = \melodic { @@ -29,8 +36,8 @@ melodie = \melodic { (| % start a slur % NOTE: the slurstart should be directly after the note ) % end a slur. - g r8 g8 (| ) a r8 a8 (| ) g r4 - f r8 f8 (| ) e4 r8 e8 ( |) d4 r8 d8 (| ) c4 r4 + g r8 g8 ~ a r8 a8 ~ g r4 + f r8 f8 ~ e4 r8 e8 ~ | d4 r8 d8 ~ c4 r4 } % more of this. @@ -46,8 +53,8 @@ begeleiding = \melodic{ \octave 'c ; e 'g d 'g c 'g 'b 'g e 'g d 'g c 'g 'b 'g %%%% var 1 - r8 e8() c r8 e8() c r8 f8()c r8 e8()c - r8 d8()'b r8 c8()'a r8 'a8()'f r8 'e8()'c + r8 e8~ c r8 e8~ c r8 f8~ c r8 e8~ c + r8 d8~ 'b r8 c8~ 'a r8 'a8~ 'f r8 'e8~ 'c } \score{ diff --git a/input/slurs.ly b/input/slurs.ly new file mode 100644 index 0000000000..95de0c7639 --- /dev/null +++ b/input/slurs.ly @@ -0,0 +1,38 @@ +%{MudelaHeader + + filename: slurs.ly + title: + description: + composer(s): HWN + entered-by: HWN + copyright: GPL + + Tested Features: test slurs and ties +EndMudelaHeader +%} + +\version "0.0.57"; + +\score{\staff{ + melodicregs + \melodic{\octave c'; + \duration 4; + c ~ c ~ g ~ c ~ + d ~ e ~ f ~ g ~ + a ~ b ~ 'c ~ c + + < c e ( > <)d f> + \octave c''; + < c e ( > <)d f> + \octave c'; + < c e ( > <)d' f'> + < { c ~ d } + { e ~ f } + > + + + + } + + } +} diff --git a/input/standchen.ly b/input/standchen.ly index 91b21fb94b..78ca3975d1 100644 --- a/input/standchen.ly +++ b/input/standchen.ly @@ -1,15 +1,17 @@ -% standchen.ly -% -% St\"andchen (Serenade) "Leise flehen meine Lieder" D.957 No.4 -% Franz Schubert (1797-1828) -% Text by Ludwig Rellstab (1799-1860) -% -% Copyright (c) 1995,1996,1997 Jan Nieuwenhuizen -% -% The purpose of this file is to demonstrate features of LilyPond. -% (there is an accompanying LaTeX file, standchen.tex) -% -\version "0.0.56"; +%{ +standchen.ly + + St\"andchen (Serenade) "Leise flehen meine Lieder" D.957 No.4 + Franz Schubert (1797-1828) + Text by Ludwig Rellstab (1799-1860) + + Copyright (c) 1995,1996,1997 Jan Nieuwenhuizen + + The purpose of this file is to demonstrate features of LilyPond. + (there is an accompanying LaTeX file, standchen.tex) + +%} +\version "0.0.57"; commands = \melodic{ \skip 2.*4; @@ -40,30 +42,30 @@ melodie = \melodic{ %%4 r < [ 'a cis > e < 'a cis > e < 'a cis ] > | %%5 - [ a()bes a ]2/3 d'4. a | + [ a~ bes a ]2/3 d'4. a | %%6 - [ g()a g ]2/3 d'4 g r | + [ g~ a g ]2/3 d'4 g r | %%7 - a4.^> g [ g()f e ]2/3 | + a4.^> g [ g~ f e ]2/3 | %%8 f2 r4 | %%9 - < { a'4.( )g' [ g'( f' )e' ]2/3 } + < { a'4.~ g' [ g'( f' )e' ]2/3 } { cis'4. e'_"dolce" \plet 2/3; e' \plet 1/1; } > | %%10 < f'2. d'2. > | %%11 - [ a (\pp )bes a ]2/3 f'4. a | + [ a ~ bes a ]2/3 f'4. a | %%12 - [ g( ) a g ]2/3 e'4. d' | + [ g~ a g ]2/3 e'4. d' | %%13 - c'4. bes [ bes( ) a g ]2/3 | + c'4. bes [ bes~ a g ]2/3 | %%14 a2 r - < { d'( | )c'4. g [ bes a g ]2/3 } - { f \p ( | )e4._"dolce" bes + < { d'~ c'4. g [ bes a g ]2/3 } + { f \p ~ e4._"dolce" bes \plet 2/3; g \plet 1/1; } > | @@ -77,12 +79,12 @@ melodie = \melodic{ [ d'8. a16 ] f4. d | %%19 %#% c'\grace\stemup - [ bes (\pp ) a bes ]2/3 d'4. bes | + [ bes ~ a bes ]2/3 d'4. bes | %%20 a2. | %%21 %#% a\grace - [ g( )fis g ]2/3 bes4.^> g | + [ g~ fis g ]2/3 bes4.^> g | %%22 f!2. | %%23 @@ -90,16 +92,16 @@ melodie = \melodic{ %%24 [ d'8. a16 ] fis4. d | %%25 - [ b \mf( ) ais b ]2/3 d'4. b | + [ b \mf~ ais b ]2/3 d'4. b | %%26 < a2. fis2. > | %%27 - [ e' \f( )dis' e' ]2/3 g'4. cis' | + [ e' \f~ dis' e' ]2/3 g'4. cis' | %%28 < d'2. fis2. > | %#%\volta1 %%29 - < { bes2( [ d'8.( ))g16 ] } + < { bes2( [ d'8.~ )g16 ] } { g2 \mf [ bes8. bes16 ] } > | %%30 < { a4. [ a-. a-. a-. ] } @@ -110,7 +112,7 @@ melodie = \melodic{ %%32 < a2 fis2 \pp > < a4 fis4 > | %%33 - < { b2( [ d'8.( ) )g16 ] } + < { b2( [ d'8.~ g16 ] } { g2 [ b8. b16 ] } > | %%34 < { a4. [ a-. a-. a-. ] } @@ -124,14 +126,14 @@ melodie = \melodic{ %%37 [ a8. a16 ] [ cis'8. cis'16 ] [ e'8. e'16 ] | %%38 - d'4( )cis'4 r4 | + d'4~ cis'4 r4 | %%39 %#% > a4. [ cis' e'8. >! d'16 ] | a4. \> [ cis' e'8. \! d'16 ] | %%40 cis'2 r4 | %%41 - < fis'4. \> cis'4. \f > e' [ e'( )d' \! cis' ]2/3 | + < fis'4. \> cis'4. \f > e' [ e'~ d' \! cis' ]2/3 | %%42 [ b8. cis'16 ] d'4^> b r | %%43 @@ -140,16 +142,16 @@ melodie = \melodic{ %%44 [ b8. \> cis'16 ] d'4^> b \! r | %%45 - [ b \p ( )ais b ]2/3 d'4. b | + [ b \p ~ ais b ]2/3 d'4. b | %%46 | %%47 - [ e' \f( )dis' e' ]2/3 g'4.^> cis' | + [ e' \f~ dis' e' ]2/3 g'4.^> cis' | %%48 \textstyle "italic"; < - { fis2.( \group "+1"; \stem -1; )f2. } - { d'2. ( \stem 1; )d'4 r4_"decresc." d'4 } + { fis2.~ \group "+1"; \stem -1; f2. } + { d'2. ~ \stem 1; d'4 r4_"decresc." d'4 } > \textstyle "roman"; | %%50 diff --git a/input/twinkle.ly b/input/twinkle.ly index 26795ef17a..df4cf9a0cd 100644 --- a/input/twinkle.ly +++ b/input/twinkle.ly @@ -1,11 +1,20 @@ -% "Ah, vous dirais-je, maman" -% "Altijd is Kortjakje ziek" -% "Twinkle twinkle little star" -% -% Copyright: none -\version "0.0.56"; - -\version "0.0.55"; +%{MudelaHeader + + filename: twinkle.ly + title: twinkle twinkle little star + description: + "Ah, vous dirais-je, maman" + "Altijd is Kortjakje ziek" + "Twinkle twinkle little star" + + composers: ? + entered-by: HWN & JCN + copyright: public domain + + Tested Features: lyrics +EndMudelaHeader +%} +\version "0.0.57"; melody = \melodic{ \clef\violin; -- 2.39.5