From: fred <fred>
Date: Sun, 24 Mar 2002 19:39:42 +0000 (+0000)
Subject: lilypond-0.0.52
X-Git-Tag: release/1.5.59~4934
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=95d34b47442bdc0680fc496ffe751a290206ee94;p=lilypond.git

lilypond-0.0.52
---

diff --git a/input/collisions.ly b/input/collisions.ly
new file mode 100644
index 0000000000..6cc9992383
--- /dev/null
+++ b/input/collisions.ly
@@ -0,0 +1,54 @@
+% test the Collision resolution 
+
+two_voice_steminvert = \melodic { 
+	< \multivoice 
+	  {	\octave c'; \stem 1;
+		c d e f() g2 g a }
+	  { \stem -1;
+		g f e g ()g2 g2 } 
+
+	>
+}	
+
+two_voice = \melodic { 
+	< \multivoice 
+	  {	\octave c'; \stem -1;
+		c d e f g2() g a }
+	  { \stem 1;
+		g f e g ()g2 g2 } 
+
+	>
+}	
+
+three_voice = \melodic {
+	< \multivoice
+	{ \stem 1; 
+		g f e f g a g2 }
+	{ \hshift 1; \stem 1; 
+		e2  e2  e2  e2 }
+	{ \stem -1;
+		c d e d c d es }
+	>
+}
+
+rests = \melodic  {
+	< \multivoice
+	{ \stem 1;\duration "last";
+		r8 r r r  r r r r 
+		[c' b a g] [f e d c]
+	} 
+	{ \stem -1;
+		[c8 d e f] [g a b c']
+		r r r r r r r r r 
+	}
+	>
+}
+\score{
+	\staff{ melodicregs 
+		\melodic {  \$two_voice ++  \$two_voice_steminvert 
+			++ \$three_voice ++ \rests
+		}
+	}
+	\paper {}
+%	\midi { \tempo 4:80 }
+}
diff --git a/input/scsii-menuetto.ly b/input/scsii-menuetto.ly
index 12183e79e7..353c436c1f 100644
--- a/input/scsii-menuetto.ly
+++ b/input/scsii-menuetto.ly
@@ -11,7 +11,7 @@
 % The purpose of this file is to demonstrate features of LilyPond.
 % (there is an accompanying LaTeX file, scsii-menuetto.tex)
 %
-\version "0.0.50";
+\version "0.0.52";
 %% Stuff from MPP version
 % \lefttitle{Menuetto}
 % \tempo{Moderato}
@@ -58,7 +58,7 @@ ii_menuetto = \melodic{
 	< [ e' g > d' cis'_"2" e' a( )g ] |
 %%11
 	< \multivoice  
-		{\stem 1; a4(\stem 1;) d'4 cis'4-. }
+		{\stem 1; a4() d'4 cis'4-. }
 		{ \stem -1; f2 e4 } > |
 %%12
 	< [ g'^"4" d > f' e' f' d'^"3"( ) c' ] |
@@ -66,7 +66,7 @@ ii_menuetto = \melodic{
 	\clef "alto";
 	< \multivoice
 		 { \stem 1; bes2 c'4 }
-		 { \stem -1; g4(\stem -1;) f4 e4 }% ugh
+		 { \stem -1; g4() f4 e4 }% ugh
 	> |
 %%14
 	< [ a f > g a f ] < d'4-\upbow e4 'bes4 > |