lilypond-1.0.7

diff --git a/Documentation/tex/tutorial.yo b/Documentation/tex/tutorial.yo
index 9878ae355045ccbabcb76a1b3dd2225578257eb9..d8fe5152166f6a94747fc5452d3d52e528bdf905 100644 (file)
--- a/Documentation/tex/tutorial.yo
+++ b/Documentation/tex/tutorial.yo
@@ -715,8 +715,8 @@ signatures, which can be useful for unconventional keys or modes.  The
 key signature is given in the form of a list of notes.  The notes will
 be printed in the key signature in the order that they appear on the list.
 For example, the key
-of C-minor can be specified as `code(\accidentals bes es as)'.  The
-command `code(\accidentals fis es bis)' provides a more exotic
+of C-minor can be specified as `code(\keysignature bes es as)'.  The
+command `code(\keysignature fis es bis)' provides a more exotic
 example.
 
 

diff --git a/Documentation/topdocs/INSTALL.yo b/Documentation/topdocs/INSTALL.yo
index 60c78c73ecfe0d3df6c2d0c2a15c2360324b3830..c1cee4ed6b850711d349377f1f51a13165ab1ee5 100644 (file)
--- a/Documentation/topdocs/INSTALL.yo
+++ b/Documentation/topdocs/INSTALL.yo
@@ -74,8 +74,12 @@ it()Texinfo. (version 3.12 or newer)
 
 it()GNU find
 Check out lurl(ftp://ftp.gnu.org)
-or any mirror of this site
+or any mirror of this site.
 
+it()The geometry package for LaTeX is needed to use ly2dvi.  
+    Available at 
+lurl(ftp://ftp.ctan.org/tex-archive/macros/latex/contrib/supported/geometry)
+or at mirror site lurl(ftp://ftp.dante.de)
 
 it() A fast computer (a full page of music typically takes 1 minute on my
     486/133, using the bf(--enable-checking) compile. It's lot slower than

diff --git a/mutopia/standchen.ly b/mutopia/standchen.ly
index ff67a5f0d94d64521520304cd0aaf19bae33db03..1a6f8f5b8c6b972dd05557a272a3a1c65b6fd40f 100644 (file)
--- a/mutopia/standchen.ly
+++ b/mutopia/standchen.ly
@@ -3,6 +3,7 @@ filename =       "standchen.ly";
 title    = "St\\\"andchen";
 subtitle = "(Serenade)\\\\``Leise flehen meine Lieder''";
 opus =  "D. 957 No. 4";
+date = "August 1828";
 composer =      "Franz Schubert (1797-1828)";
 poet=   "Text by Ludwig Rellstab (1799-1860)";
 enteredby =     "JCN";
@@ -12,6 +13,7 @@ copyright =    "public domain";
 %{
  Tested Features@ multivoice accents lyrics chords piano music
 multiple \paper{}s in one \score 
+Note: Original key F.
 %}
 
 \version "1.0.1";
@@ -20,6 +22,7 @@ $vocal_verse1 = \melodic\relative c{
        % ugh: treble/bass
 %      \clef treble;
 %      \clef violin;
+       \property Voice.dynamicdir=1
        [/3 g''8( )as] g \]/1 c4. g8 |
        [/3 f8( )g] f \]/1 c'4 f,8 r |
        g4.-> f8 [/3 f( )es] d \]/1 |
@@ -37,10 +40,13 @@ $vocal_verse1 = \melodic\relative c{
        g8. b16 es4. d8 |
        c8. g16 es4. c8 |
        % [/3 as\grace( bes ] )
+%      \tiny  [as'16*1/16 bes16*1/16 ] 
+%      \normalsize \[/3 [as8 g8] as8 \]31/32 c4. as8 |
        [/3 as'8( )g] as \] c4. as8 |
        g2. |
        %[/3 f\grace( g] )
        [/3 f8( )e] f \] as4. f8 |
+       %\tiny \[/3 [f`16*1/16 g16*1/16] \normalsize
        es!2. |
        g8. b16 es4. d8 |
        c8. g16 e4. c8 |
@@ -53,8 +59,9 @@ $vocal_verse1 = \melodic\relative c{
 }
 
 $vocal_through = \melodic\relative c{
-       g''8. g16 b8. b16 d8. d,16 |
-       c'4 b r |
+       \property Voice.dynamicdir=1
+       g''8. g16 b8. b16 d8. d16 |
+       c4 b r |
        g4. b8 d8. c16 |
        b2 r4 |
        e4. d8 [/3 d( )c] b \] |
@@ -71,7 +78,7 @@ $vocal_through = \melodic\relative c{
        c4 r c |
        as2. |
        g |
-       es2 r4 |
+       e2 r4 |
 }
 
 $lyric_verse1 = \lyric{
@@ -85,7 +92,7 @@ $lyric_verse1 = \lyric{
 % 11
        \[/3 In4 den8 \] stil-4. len8 |
        \[/3 Hain4 her-8 \] nie-4. der8 |
-       Lieb4. chen8 \[/3 komm4 zu8 \] |
+       Lieb-4. chen,8 \[/3 komm4 zu8 \] |
        mir!2 _4 |
        _4 _ _ |
        _ _ _ |
@@ -97,7 +104,7 @@ $lyric_verse1 = \lyric{
        \[/3 In4 des8 \] Mon-4. des8 |
        Licht;2. |
 % 23 
-       Des8. Ver-16 r\"a-4. ters8 |
+       Des8. Ver-16 r\"a-4. thers8 |
        feind-8. lich16 Lau-4. schen8 |
        \[/3 F\"urch-4 te8 \] Hol-4. de8 |
        nicht2. |
@@ -109,14 +116,14 @@ $lyric_verse2 = \lyric{
 % 5
        \[/3 H\"orst4 die8 \] Nach-4. ti-8 
        \[/3 gal-4 len8 \] schla-4 gen?8 _8
-       Ach!4. sie8 \[/3 fleh-4 en8 \] 
-       dich2 _4
+       ach!4. sie8 \[/3 fleh-4 en8 \] 
+       dich,2 _4
        _4 _ _ 
        _4_ _
 
 % 11
        \[/3 Mit4 der8 \] T\"o-4. ne8
-       \[/3 s\"u\ss-4 en8 \] Kla-4. gen8
+       \[/3 s\"u-4 "\ss{}en"8 \] Kla-4. gen8
        Fleh-4. en8 \[/3 sie4 f\"ur8 \]
        mich.2 _4
        _4_ _ 
@@ -126,16 +133,16 @@ $lyric_verse2 = \lyric{
        Sie-8. ver-16 stehn4. des8
        Bus-8. ens16 Seh-4. nen8
        \[/3 Ken-4 nen8 \] Lieb-4. es-8 
-       schmerz2.
+       schmerz,2.
        \[/3 Ken-4 nen8 \] Lieb-4. es-8 
-       schmerz2.
+       schmerz.2.
 
 % 23
        R\"uh-8. ren16 mit4. den8 
        Sil-8. ber-16 t\"o-4. nen8
-       \[/3 Jed-4 es8 \] wei-4. che8 
-       Herz.2.
-       \[/3 Jed-4 es8 \] wei-4. che8 
+       \[/3 jed-4 es8 \] wei-4. che8 
+       Herz,2.
+       \[/3 jed-4 es8 \] wei-4. che8 
        Herz.2.
 }
 
@@ -163,7 +170,7 @@ $treble_intro = \melodic\relative c{
        \clef violin;
        % ugh: id like to type this!
        %r8\pp [<g'-. c-.> <c-. es-.> <g-. c-.> <c-. es-.> <g-. c-.>] |
-       r8\pp <[g'-. c-.> <c-. es-.> <g-. c-.> <c-. es-.> <g-. c-.]> |
+       r8^"\bf m\\\"assig"\pp <[g'-. c-.> <c-. es-.> <g-. c-.> <c-. es-.> <g-. c-.]> |
        r8 <[as-. c-.> <c-. es-.> <as-. c-.> <c-. es-.> <as-. c-.]> |
        r8 <[as-. c-.> <c-. d-.> <as-. c-.> <c-. d-.> <as-. c-.]> |
        r8 <[g-. b-.> <b-. d-.> <g-. b-.> <b-. d-.> <g-. b-.]> |
@@ -177,15 +184,15 @@ $treble_verse1 = \melodic\relative c{
        r8 <[f c'> <c' d> <f, c'> <c' d> <f, c']> |
        r8 <[f g b> <g b d> <f g b> <g b d> <f g b]> |
        r8 <[es g c> <g c es> <es g c> <g c es> <es g c]> |
-       <g''4.( b,> <)f8 d> <[/3 f d> <es c> <d b]1/1> |
+       <g''4.( b,> <)f8 d> <[/3 f( d> <es c> <)d b]1/1> |
        %10
        <c2. es> |
        r8 <[g, c> <c es> <g c> <c es> <g c]> |
        r8 <[f c'> <c' d> <f, c'> <c' d> <f, c']> |
-       r8 <[f as bes> <as bes d> <f g bes> <g bes d> <f g bes]> |
+       r8 <[f as bes> <as bes d> <f g bes> <as bes d> <f g bes]> |
        r8 <[es g bes> <g bes es> <es g bes> <g bes es]> 
-       <{ es''( | )bes4. as8}{ c( | )d,4.( )f8 } > 
-       < [/3 f as> <es g> <d f]1/1> |
+       <{ es'~ | d4. ~ f8}{ c'~ | bes4. ~ as8 } > 
+       < [/3 f( as> <es g> <)d f]1/1> |
        %16
        <es2. g> |
        r8 <[f, g> <g b> <f g> <g b> <f g]> |
@@ -194,67 +201,67 @@ $treble_verse1 = \melodic\relative c{
        %20
        r8 <[es g bes> <g bes es> <es g bes> <g bes es> <es g bes]> |
        % [/3 as\grace( bes )
-       [/3 as'8(( g )as]1/1 c4.-> ) as8 |
+       [/3 as'8( g as]1/1 c4.-> ) as8 |
        g2. |
        r8 <[f, g> <g b> <f g> <g b> <f g]> |
        r8 <[e g> <g c> <e g> <g c> <e g]> |
        r8 <[f a c> <a c f> <f a c> <a c f> <f a c]> |
        r8 <[e g c> <g c e> <e g c> <g c e> <e g c]> |
-       <{[/3 f8\f( e f]1/1 a4. )f8 } {\[/3 f' e f \]/1 a4. f8 } > |
-       <e2 e'> r4 |
+       <{[/3 f'8\f( e f]1/1 a4.-> )f8 } {\[/3 f' e f \]/1 a4. f8 } > |
 }
 
-$treble_eentje = \melodic\relative c{
-       <f'2\mf as!(> <[as8.->( c> <)f16 )as]> |
+$treble_eentje = \melodic\relative c'{
+       <e2 e'> <e4 g>|
+       <f2\mf as!(> <[as8.->( c> <)f16 )as]> |
        <e4. g> <[e8-. g-.(> <e-. g-.> <e-. )g-.]> |
        <f4. g> <[b,8-. g'-.(> <d-. g-.> <f-. )g-.]> |
-       <e2 g\pp> <e4 g> |
-       <f2\mf a(> <[a8.( c> <)f16 )a]> |
+       <e2 g> <e4\pp g> |
+       <f2 a(> <[a8. c> <f16 )a]> |
        <e4. g> <[e8-. g-.(> <e-. g-.> <e-. )g-.]> |
        <f4. g> <[b,8-. g'-.(> <d-. g-.> <f-. )g-.]> |
        %60
        <e2. g> |
 }
 
-$treble_through = \melodic\relative c{
+$treble_through = \melodic\relative c'{
+       <e2. e'> |
        %61
        R2. |
-       % lily: 221: warning: Junking request: Span_dynamic_req: the \>
-       <[g'8.\< g'> <g16 g'> <b8. b'> <\! b16\> b'16> <d8. d'> <d16 d']> |
-       % lily: 222: warning: Cant find cresc to end.
+       <[g,8.\< g'> <g16 g'> <b8. b'> <\! b16\> b'16> <d8. d'> <d16 d']> |
        < { c4( )b } { c'4( )b } > \!r |
 % ugh
 %      <g4. g> <b8 b> <[d8.-> d->> c16] |
-       <g4. g'> <b8 b'> [d'8.-> c16] |
+       <g4. g'> <b8 b'> <[ d'8.-> d,-> > c16] |
 % ugh ugh: connecting chords
        %65
-       < { d,2.\f( )a'2} { e2. ~ e2 } { b'2. c,2 }> r4 |
-       < 
+       < { d,2.\f a'2} { e2. ~ e2 } { b'2. c,2 }> r4 |
+       \type Staff < 
                {
                        \voiceone 
-                       [a8. b16] c4->( )a8 r |
-                       [a8. b16] c4->( )a8 r |
+                       [a8. b16] c4-> ~ a8 r |
+                       [a8. b16] c4-> ~ a8 r |
                }
                { 
                        \voicetwo 
-                       <d,4\f f> <d2 f> |
-                       <c!4\f es> <c2 es> |
+                       <d,4 f> <d2 f> |
+                       <c!4 es> <c2 es> |
                }
        >
        % 4 bars copied from end verse1
-       r8 <[f,\p a c> <a c f> <f a c> <a c f> <f a c]> |
+       r8 <[f, a c> <a c f> <f a c> <a c f> <f a c]> |
        %70
        r8 <[e g c> <g c e> <e g c> <g c e> <e g c]> |
-       <{[/3 f8\f( e f]1/1 a4. )f8 } {\[/3 f' e f \]/1 a4. f8 } > |
-       <e'2 e'> r4 |
-       <es2 es'> r4 |
-       <d2 d'> r4 |
+       <{[/3 f'8\f( e f]1/1 a4.-> )f8 } {\[/3 f' e f \]/1 a4. f8 } > |
+       <e2 e'> r4 |
+       <es!2 es'! > r4 |
+       \property Voice . textstyle =  "italic"
+       <d2_"decresc." d'> r4 |
        %75
        <b2 b'> r4 |
        <c2 c'> <e4\pp g> |
 
        % four copied from begin eentje
-       <f2\mf as!(> <[as8.->( c> <)f16 )as]> |
+       <f2 as!(> <[as8.-> c> <f16 )as]> |
        <e4. g> <[e8-. g-.(> <e-. g-.> <e-. )g-.]> |
        <f4. g> <[b,8-. g'-.(> <d-. g-.> <f-. )g-.]> |
        %80
@@ -266,6 +273,8 @@ $treble_through = \melodic\relative c{
 
 $bass_intro = \melodic\relative c{
        \clef bass;
+       \property Voice.dynamicdir=1
+%1
        <c,2 c'> r4 |
        <as2 as'> r4 |
        <f2 f'> r4 |
@@ -274,18 +283,22 @@ $bass_intro = \melodic\relative c{
 
 $bass_verse1 = \melodic\relative c{
 %      \clef bass;
+       \property Voice.dynamicdir=1
+%5
        <c,2 c'> r4 |
        <as2 as'> r4 |
        <g2 g'> r4 |
        <c2 c'> r4 |
        <g8 g'> <[g'' d'> <d' f> <g, d'> <d' f> <g, d']> |
+%10
        <c,,8 c'> <[g'' c> <c es> <g c> <c es> <g c]> |
        <c,,2 c'> r4 |
        <as2 as'> r4 |
        <bes2 bes'> r4 |
        <es,2 es'> r4 |
-       bes'8 <[bes' f'> <f' bes> <bes, f'> <f' bes> <bes, f']> |
-       es,,8 <[bes'' es> <es g> <bes es> <es g> <bes es]> |
+%15
+       bes'8 <[bes' f'> <f' as> <bes, f'> <f' as> <bes, f']> |
+       es,8 <[bes' es> <es g> <bes es> <es g> <bes es]> |
        <g,2 g'> r4 |
        <c2 c'> r4 |
        <as2 as'> r4 |
@@ -301,6 +314,7 @@ $bass_verse1 = \melodic\relative c{
 }
 
 $bass_eentje = \melodic\relative c{
+       \property Voice.dynamicdir=1
        <c,8 c'> <[c' f as!> <f as c> <c f as> <f as c> <c f as]> |
        c,8 <[c' e g> <e g c> <c e g> <e g c> <c e g]> |
        <g,8 g'> <[d'' g> <g b> <d g> <g b> <d g]> |
@@ -312,23 +326,24 @@ $bass_eentje = \melodic\relative c{
 }
 
 $bass_through = \melodic\relative c{
+       \property Voice.dynamicdir=1
        %61
-       <g,8 g'> <[g' b d> <b d f> <g b d> <as!-> b-> d->> <b d, f]> |
-       <g,8 g'> <[g' d'> <d' f> <g, d'> <as-> b'-> d,->> <b d f]> |
+       <g,8^"cresc." g'> <[g' b d> <b d f> <g b d> <as!-> b-> d->> <b d f]> |
+       <g,8 g'> <[g' d'> <d' f> <g, d'> <as-> b-> d->> <b d f]> |
        % copied
-       <g,8 g'> <[g' d'> <d' f> <g, d'> <as-> b'-> d,->> <b d f]> |
+       <g,8 g'> <[g' d'> <d' f> <g, d'> <as-> b-> d->> <b d f]> |
        <g,8 g'> <[g' d' e> <d' f> <g, d'> <gis-> b-> d->> <b d f]> |
        %65
-       <gis,8 gis'> <[d'' e> <e b'> <d e> <e b'> <d e]> |
+       <gis,8 gis'> <[d''\> e> <e b'> <d e> <e b'> <d\! e]> |
        <a,8 a'> <[c' e> <e a> <c e> <e a> <c e]> |
        <a,8 a'> <[a' d f> <d f a> <a d f> <d f a> <a d f]> |
        <a,8 a'> <[a' c e> <c e a> <a c e> <c e a> <a c e]> |
        % 4 bars copied from end verse1
-       <f,2 f'> r4 |
+       <f,2\p f'> r4 |
        %70
        <c'2 c'> r4 |
        <g8 g'> <[d'' g> <g b> <d g> <g b> <d g]> |
-       c,8 <[c' e g> <e g c> <c e g> <e g c> <c e g]> |
+       c,8\> <[c' e g> < \! e g c> <c e g> <e g c> <c e g]> |
 
        <c,8 c'> <[c' es! g> <es g c> <c es g> <es g c> <c es g]> |
        <f,,8 f'> <[d'' f> <f as!> <d f> <f as> <d f]> |
@@ -337,11 +352,10 @@ $bass_through = \melodic\relative c{
        c,8 <[c' e> <e g> <c e> <e g> <c e]> |
        c,8 <[c' f> <f as> <c f> <f as> <c f]> |
        c,8 <[c' e> <e g> <c e> <e g> <c e]> |
-       g,8 <[g' d'> <d' f> <g, d'> <d' f> <g, d']> |
-       % copied from two bars back
+       <g,8 g'> <[g' d'> <d' f> <g, d'> <d' f> <g, d']> |
        %80
        c,8 <[c' e> <e g> <c e> <e g> <c e]> |
-       c,8 <[c' e> <e g> <c e> <e g> <c e]> |
+       c,8 <[c' g> <e c> <c g> <e c> <c g]> |
        <c,2._\fermata g' c> |
 }
                
@@ -379,6 +393,7 @@ $lyric_staff = \type Lyrics = lyric<
 >
                
 vocals = \melodic{
+       \property Voice.dynamicdir=UP
        \skip 4 * 12; 
        \$vocal_verse1 
        \skip 4 * 24; 
@@ -426,7 +441,8 @@ $grand_staff = \type GrandStaff<
 \score{
        % Transpose as you like for your voice
        % Range untransposed is c' to f'' (for tenors and sopranos)
-       % \transpose a gives a' to d''
+       % To get original, \transpose d'
+       % \transpose a gives a' to d'' (for basses, who sing an octave down)
        <
                { \melodic \transpose a { \$vocal_staff } }
                \$lyric_staff
@@ -437,6 +453,3 @@ $grand_staff = \type GrandStaff<
                \tempo 4 = 54;
        }
 }
-
-
-