X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftest%2Fsleur.ly;h=d23fe761cb1a261eb32d23fdb4dfdc7096cc9c1b;hb=refs%2Ftags%2Frelease%2F1.1.10;hp=d0bdc34543c85e1c211a0b0b251e8359e9bb8794;hpb=6bc0a8a090e82c4bce57df8e980b48cc78cb422b;p=lilypond.git

diff --git a/input/test/sleur.ly b/input/test/sleur.ly
index d0bdc34543..d23fe761cb 100644
--- a/input/test/sleur.ly
+++ b/input/test/sleur.ly
@@ -1,13 +1,13 @@
 \header{
 enteredby =	 "jcn";
 copyright =	 "PD";
-TestedFeatures =	 "This file tests Feta embedded slurs"
+TestedFeatures =	 "This file tests Feta embedded slurs" +
 	 "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "0.1.15";
+\version "1.0.10";
 
-shortlong = \melodic{
+shortlong = \notes{
 	c4()c( c c  |
 	c c c c |
 	c c c c |
@@ -15,20 +15,20 @@ shortlong = \melodic{
 	c c c )c |
 }
 
-dirs = \melodic {
-	\octave c';
+dirs = \notes\transpose c' {
+
 	c'1() g' () c () g () c |
 }
 
-complex = \melodic{
-	\octave c';
-	c,16( e,( g,( b,( d( f( a( c'())))))))c4 c4 |
-	\octave c''';
-	c,16( a( f( d( b,( g,( e,( c,())))))))c4 c4 |
+complex = \notes{
+\transpose c'{
+	c,16( e,( g,( b,( d( f( a( c'())))))))c4 c4 |}
+\transpose c'''{
+	c,16( a( f( d( b,( g,( e,( c,())))))))c4 c4 |}
 }
 
-over = \melodic{
-	\octave c'; 
+over = \notes\transpose c'{
+
 
 	e( g' g' )e
 	e( a' a' )e
@@ -51,8 +51,8 @@ over = \melodic{
 	e( c'' f )e
 }
 
-under = \melodic{
-	\octave c'; 
+under = \notes\transpose c'{
+
 	\stemdown 
 	f'( \stemboth d d \stemdown )f'
 	f'( \stemboth c c \stemdown )f'
@@ -76,18 +76,17 @@ under = \melodic{
 	f'( e, f )f'
 }
 
-eccentric = \melodic{
-	\octave c';
+eccentric = \notes\transpose c'{
+
 	\stemup
-	\[4/7 f( a' f f f f )f \] |
-	\[4/7 f( f f f f a' )f \] |
+	\times 4/7 { f( a' f f f f )f } |
+	\times 4/7 { f( f f f f a' )f } |
 	\stemdown
-	\[4/7 e'( c e' e' e' e' )e' \] |
-	\[4/7 e'( e' e' e' e' c )e' \] |
+	\times 4/7 { e'( c e' e' e' e' )e' } |
+	\times 4/7 { e'( e' e' e' e' c )e' } |
 }
 
-tiltup = \melodic{
-	\octave c'; 
+tiltup = \notes\transpose c'{
 	e( c'' c'' )e'
 	\stemup
 	e( c'' c'' )e'
@@ -101,8 +100,7 @@ tiltup = \melodic{
 	f'( a, a, )f''
 }
 
-tiltdown = \melodic{
-	\octave c'; 
+tiltdown = \notes\transpose c'{
 	e'( c'' c'' )e
 	\stemup
 	e'( c'' c'' )e
@@ -116,8 +114,7 @@ tiltdown = \melodic{
 	f''( a, a, )f'
 }
 
-broken = \melodic{
-      \octave c'';
+broken = \notes\transpose c''{
       c c c c()
       c c c c(
       c )c c c(
@@ -125,13 +122,12 @@ broken = \melodic{
       )a' a' a' a'()
       a' a' a' a'()
       c( c c )c 
-      c( c c )'f 
+      c( c c )f, 
       f,( c c )c 
-      f,( c c )'f
+      f,( c c )f,
 }
 
-blend =	\melodic{
-	\octave c';
+blend =	\notes\transpose c'{
 	e( c'' c'' )e
 	\stemup
 	f'( c'' c'' )f'
@@ -152,8 +148,8 @@ blend =	\melodic{
 }
 
 
-bug = \melodic{
-	\octave c';
+bug = \notes\transpose c'{
+
 	a()g( f )e
 	b'()a'( g' )f'
 	g( f' e' )d'
@@ -161,20 +157,20 @@ bug = \melodic{
 	c' () b () c' c'
 }
 
-clipping = \melodic{
-	\octave c';
+clipping = \notes\transpose c'{
 	\stemboth
 	c( c''' c''')c
 	c( c''' c )c''
 	c''( c c''' )c
 	\stemdown
 	c( \stemup c,,, c,,, \stemdown )c
-	c( \stemup c,,, c \stemdown )''c
+	c( \stemup c,,, c \stemdown )c,,
 	c,,( \stemup c c,,, \stemdown )c
 }
 
 \score{
-	\melodic{ 
+	\notes{ 
+%		\property Voice.pletvisibility = 0;
 		% use blend for fast check
 		\blend
 % {