X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fmutopia%2FF.Schubert%2Fstandchen.ly;h=c39c0a4ab8bf7a77208e9be6928875cf2e3cb414;hb=5c14a087ca6cbd665fd631452b7b1283ba0387c3;hp=f91fb2d6e8a47a10ac4a26517aab907da994d1cb;hpb=ecaf73bb03e974018c17e3051b3ac3a805dd1653;p=lilypond.git

diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly
index f91fb2d6e8..c39c0a4ab8 100644
--- a/input/mutopia/F.Schubert/standchen.ly
+++ b/input/mutopia/F.Schubert/standchen.ly
@@ -1,11 +1,9 @@
 #(ly:set-option 'old-relative)
 
-% #(ly:set-point-and-click 'line-column)
-
 instrument = "Piano"
 
 \header {
-  title = "Ständchen"
+  title = "Ständchen"
   subtitle = "(Serenade)"
   subsubtitle = "Leise flehen meine Lieder"
   opus = "D. 957 No. 4"
@@ -32,7 +30,7 @@ instrument = "Piano"
   maintainer = "Jan Nieuwenhuizen"
   maintainerEmail = "janneke@gnu.org"
   lastupdated =	 "2001/Apr/27"
-  mutopiapublicdomain = "\\parbox[b]{\\hsize}{\\thefooter\\quad\\small
+  mutopiapublicdomain = "\\parbox[b]{\\paper-width}{\\thefooter\\quad\\small
     \\\\This music is part of the Mutopia project,
     \\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset
     and placed in the public domain by " + \maintainer +
@@ -42,14 +40,11 @@ instrument = "Piano"
  footer = "Mutopia-2001/04/27-xx"
 } 
 
-\version "2.1.28"
-
-dynamicUp = \override DynamicLineSpanner  #'direction = #1
-dynamicRevert = \revert DynamicLineSpanner #'direction
+\version "2.11.61"
 
 #(set-global-staff-size 16)
 
-vocalVerse = \notes\relative c''{
+vocalVerse = \relative c''{
 	\dynamicUp
 	\times 2/3 {  g8[(  as)] g } c4. g8 |
 	\times 2/3 {  f8[(  g)] f } c'4 f,8 r |
@@ -90,7 +85,7 @@ vocalVerse = \notes\relative c''{
 	c!2. |
 }
 
-vocalThrough = \notes\relative c{
+vocalThrough = \relative c{
 	\dynamicUp
 	g''8. g16 b8. b16 d8. d16 |
 	c4 b r |
@@ -115,54 +110,54 @@ vocalThrough = \notes\relative c{
 	e2 r4 |
 }
 
-lyricVerseOne = \lyrics {
+lyricVerseOne = \lyricmode {
 	Lei -- se fle -- hen mei -- ne Lie -- der
 	durch die Nacht zu dir;
 	in den stil -- len Hain her nie -- der,
 	Lieb -- chen, komm zu mir! 
 	
-	Flüs -- ternd schlan -- ke Wip -- fel rau -- schen
+	Flüs -- ternd schlan -- ke Wip -- fel rau -- schen
 	in des Mon -- des Licht,
 	in des Mon -- des Licht;
 
-	des Ver -- rä -- ters feind -- lich Lau -- schen
-	fürch -- te, Hol -- de, nicht,
-	fürch -- te, Hol -- de, nicht.
+	des Ver -- rä -- ters feind -- lich Lau -- schen
+	fürch -- te, Hol -- de, nicht,
+	fürch -- te, Hol -- de, nicht.
 }
 	
-lyricVerseTwo = \lyrics{
-	Hörst die Nach -- ti -- gal -- len schla -- gen?
+lyricVerseTwo = \lyricmode{
+	Hörst die Nach -- ti -- gal -- len schla -- gen?
 	ach! sie fle -- hen dich, 
-	mit der Tö -- ne sü -- "\ss en" Kla -- gen
-	fle -- hen sie für mich. 
+	mit der Tö -- ne sü -- "\ss en" Kla -- gen
+	fle -- hen sie für mich. 
 	
 	Sie -- ver -- "steh'n" des Bu -- sens Seh -- nen,
 	ken -- nen Lieb -- es -- schmerz,
 	ken -- nen Lieb -- es -- schmerz,
 
-	rüh -- ren mit den Sil -- ber -- tö -- nen
+	rüh -- ren mit den Sil -- ber -- tö -- nen
 	jed -- es wei -- che Herz,
 	jed -- es wei -- che Herz.
 }
 
-lyricThrough = \lyrics{
+lyricThrough = \lyricmode{
 	La\ss auch dir die Brust be -- we -- gen 
-	Lieb -- chen, hö -- re mich! 
+	Lieb -- chen, hö -- re mich! 
 	be -- bend harr' ich dir ent -- ge -- gen! 
 	
-	komm, be -- glük -- ke mich!
-	komm, be -- glük -- ke mich, __ 
-	be -- glük -- ke mich!
+	komm, be -- glük -- ke mich!
+	komm, be -- glük -- ke mich, __ 
+	be -- glük -- ke mich!
 }
 
-trebleIntro = \notes\relative c{
-	r8^"\bf Mäßig"\pp <g' c>-. <c es>-. <g c>-. <c es>-. <g c>-. |
+trebleIntro = \relative c{
+	r8^"\bf Mäßig"\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>-. |
 }
 
-trebleVerseOne = \notes\relative c{
+trebleVerseOne = \relative c{
 	%5
 	r8 <g' c> <c es> <g c> <c es> <g c> |
 	r8 <f c'> <c' d> <f, c'> <c' d> <f, c'> |
@@ -193,14 +188,12 @@ trebleVerseOne = \notes\relative c{
 	r8\pp <es as c> <as c es> <es as c> <as c es> <es as c> |
 	%20
 	r8 <es g bes> <g bes es> <es g bes> <g bes es> <es g bes> |
-	\override Slur   #'attachment = #'(stem . stem)
 	\grace {
   \override Stem   #'stroke-style = #"grace"
     as'32[( bes ] 
   \revert Stem #'stroke-style }
 
 	\times 2/3 {  as8[)( g as] } c4.->  as8) |
-	\revert Slur #'attachment
 	g2. |
 	r8 <f, g> <g b> <f g> <g b> <f g> |
 	r8 <e g> <g c> <e g> <g c> <e g> |
@@ -210,8 +203,8 @@ trebleVerseOne = \notes\relative c{
 	<a a'>4.-> <f f'>8)  |
 }
 
-trebleEentje = \notes \relative c' \context Voice {
-	\stemBoth
+trebleEentje =  \relative c' \context Voice {
+	\stemNeutral
 	<e e'>2 r4 |
 	<f as!>2\(\mf <as c>8.(-> <f as>16)\) |
 	% urg: slurs with staccati are ugly
@@ -225,8 +218,8 @@ trebleEentje = \notes \relative c' \context Voice {
 	<e g>2 r4 |
 }
 
-trebleThrough = \notes \relative c'{
-	\stemBoth
+trebleThrough =  \relative c'{
+	\stemNeutral
 	<e e'>2. |
 	%61
 	R2. |
@@ -278,7 +271,7 @@ trebleThrough = \notes \relative c'{
 	<g e' g>2.\fermata |
 }
 
-bassIntro = \notes\relative c{
+bassIntro = \relative c{
 	\dynamicUp
 %1
 	<c, c'>2 r4 |
@@ -287,7 +280,7 @@ bassIntro = \notes\relative c{
 	<g g'>2 r4 |
 }
 
-bassVerseOne = \notes\relative c{
+bassVerseOne = \relative c{
 %	\clef bass
 	\dynamicUp
 %5
@@ -319,7 +312,7 @@ bassVerseOne = \notes\relative c{
 	c,8 <c' e g>[ <e g c> <c e g> <e g c> <c e g>] |
 }
 
-bassEentje = \notes\relative c{
+bassEentje = \relative c{
 	\dynamicUp
 	<c, c'>8 <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>] |
@@ -331,7 +324,7 @@ bassEentje = \notes\relative c{
 	c,8 <e' g>[ <g c> <e g> <g c> <e g>] |
 }
 
-bassThrough = \notes\relative c{
+bassThrough = \relative c{
 	\dynamicUp
 	%61
 	<g, g'>8^"cresc." <g' b d>[ <b d f> <g b d> <as! b d >-> <b d f>] |
@@ -365,7 +358,7 @@ bassThrough = \notes\relative c{
 	<c, g' c>2._\fermata |
 }
 		
-global = \notes{
+global = {
 	\time 3/4 
 	\key es \major
 	\skip 1 * 3/4 * 4
@@ -388,7 +381,7 @@ allLyrics = {
 	    \lyricThrough 
 } }
 
-vocals = \context Voice = leise \notes {
+vocals = \new Voice =  "leise"  {
 	\clef treble
  	% certainly no auto-beaming for vocals
  	\autoBeamOff
@@ -403,19 +396,21 @@ vocals = \context Voice = leise \notes {
 	R1 * 3/4 * 6
 }
 
-trebleStaff = \context Staff = treble<< 
+trebleStaff = \new Staff =  "treble"<< 
         \set Staff.midiInstrument = "acoustic grand"
 	\global
-	{\clef treble
-	\override autoBeamSettings  #'(begin * * * *) = #(ly:make-moment 0 1)
-	\trebleIntro 
-	\trebleVerseOne 
-	\trebleEentje
-	\trebleVerseOne 
-	\trebleThrough }
+	{
+	  \clef treble
+
+	  \trebleIntro 
+	  \trebleVerseOne 
+	  \trebleEentje
+	  \trebleVerseOne 
+	  \trebleThrough
+	}
 >>
 
-bassStaff = \context Staff = bass<<
+bassStaff = \new Staff =  "bass"<<
         \set Staff.midiInstrument = "acoustic grand"
 	\global
 	\clef bass
@@ -441,20 +436,26 @@ bassStaff = \context Staff = bass<<
 	    \bassStaff
 	>>
     >>
-    \paper {
+    \layout {
 				% Use
 				%   textheight = 280.\mm
-				%   linewidth = 190.\mm
+				%   line-width = 190.\mm
 				% to get this on 3 pages of a4.
 	
 				% Mandatory Mutopia settings yield 4 pages :(
 	textheight = 270.0\mm
-	linewidth = 180.0\mm
+	line-width = 180.0\mm
 
-	\translator { \RemoveEmptyStaffContext }
+	\context { \RemoveEmptyStaffContext }
     }
-    \midi{
-	\tempo 4 = 54
+    
+  \midi {
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 54 4)
+      }
     }
+
+
 }