From: fred <fred>
Date: Tue, 26 Mar 2002 21:25:56 +0000 (+0000)
Subject: lilypond-1.0.9
X-Git-Tag: release/1.5.59~2887
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=081992fe48279ee75fc8d6a8bc552e67e733839e;p=lilypond.git

lilypond-1.0.9
---

diff --git a/input/test/abbrev.ly b/input/test/abbrev.ly
index 2cb2d7b141..134ff73cf0 100644
--- a/input/test/abbrev.ly
+++ b/input/test/abbrev.ly
@@ -1,6 +1,7 @@
 
+\version "1.0.3";
 \score{
-	\melodic \transpose c'''{
+	\notes \transpose c'''{
 		\stemup
 %		\stemdown
 		% default abbreviations
diff --git a/input/test/bar-scripts.ly b/input/test/bar-scripts.ly
index 55b4f4ea74..1a1550b37c 100644
--- a/input/test/bar-scripts.ly
+++ b/input/test/bar-scripts.ly
@@ -1,13 +1,15 @@
 
 
 
-onestaff = \type Staff = foo\melodic  {
+\version "1.0.3";
+
+onestaff = \type Staff = foo\notes  {
 	\property Staff.instr = instr
 	\property Staff.instrument = instrument \mark "B";
 	 c1 \mark "A"; \break c2  c2 \break
 }
 
-grstaff = \melodic \type GrandStaff <
+grstaff = \notes \type GrandStaff <
 	\type Staff = bar {
 
 	\property Staff.instr = instr
diff --git a/input/test/beam-pos.ly b/input/test/beam-pos.ly
index 6d32b96ef3..7d9e968cdf 100644
--- a/input/test/beam-pos.ly
+++ b/input/test/beam-pos.ly
@@ -1,5 +1,7 @@
+\version "1.0.3";
+
 \score{
-	\melodic\transpose c''{
+	\notes\transpose c''{
 		\property Score.beamquantisation = 3 % TEST
 
 		[c8 c] [c c] [c c] [c c]
diff --git a/input/test/beams.ly b/input/test/beams.ly
index 40815dfad3..7e94c04216 100644
--- a/input/test/beams.ly
+++ b/input/test/beams.ly
@@ -6,13 +6,13 @@ copyright =	 "PD";
 
 TestedFeatures =	 "beams and beamflags";
 }
-\version "1.0.2";
+\version "1.0.3";
 
 \score{
 	<
 %		\property Score.beamquantisation = \none
 		\type GrandStaff < 
-		\melodic\transpose c' { 
+		\notes\transpose c' { 
 
 			\time 8/4;
 			\stemup [c8 c'' a' f']
@@ -38,7 +38,7 @@ TestedFeatures =	 "beams and beamflags";
 		}
 	>
 	<	
-		\melodic { 
+		\notes { 
 \transpose c' {
 			\time 8/4;
 			\stemdown [a'8 a, c e]
diff --git a/input/test/broken.ly b/input/test/broken.ly
index 0ad9fdbb2b..27f1d708ae 100644
--- a/input/test/broken.ly
+++ b/input/test/broken.ly
@@ -5,9 +5,9 @@ TestedFeatures =	 "This file tests Feta embedded slurs"
 	 "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-shortlong = \melodic{
+shortlong = \notes{
 	c4()c( c c  |
 	c c c c |
 	c c c c |
@@ -15,7 +15,7 @@ shortlong = \melodic{
 	c c c )c |
 }
 
-broken = \melodic\transpose c''{
+broken = \notes\transpose c''{
 
       c c c c()
       c c c c(
@@ -30,7 +30,7 @@ broken = \melodic\transpose c''{
 }
 
 \score{
-	\melodic{ 
+	\notes{ 
 %		\shortlong
 		\broken
 	}
diff --git a/input/test/clefs.ly b/input/test/clefs.ly
index a49133116b..98ba6334ef 100644
--- a/input/test/clefs.ly
+++ b/input/test/clefs.ly
@@ -1,5 +1,7 @@
+\version "1.0.3";
+
 \score {
-       \melodic{ 
+       \notes{ 
          \clef "violin"; c'1^"{violin}" \bar "||";
          \clef "french";c'1^"{french}" \bar "||";
          \clef "soprano";c'1^"{soprano}" \bar "||";
diff --git a/input/test/collisions.ly b/input/test/collisions.ly
index 8e0e87b599..e503cbf7a9 100644
--- a/input/test/collisions.ly
+++ b/input/test/collisions.ly
@@ -5,11 +5,11 @@ enteredby =	 "HWN,JCN";
 copyright =	 "public domain";
 Tested =	 "test the Collision resolution ";
 }
-\version "1.0.2";
+\version "1.0.3";
 
 
 
-two_voice = \melodic 
+two_voice = \notes 
 	\type Staff < 
 	  { \stemdown
 		c4 d e f g2~  g4 a [c8 d e f] c2| }
@@ -18,7 +18,7 @@ two_voice = \melodic
 
 	>
 
-two_voice_steminvert = \melodic 
+two_voice_steminvert = \notes 
 	\type Staff <  
 	  { 
  \stemup
@@ -29,7 +29,7 @@ two_voice_steminvert = \melodic
 
 	>
 
-three_voice = \melodic 
+three_voice = \notes 
 	\type Staff <
 	{ \stemup 
 		g4 f e f g a g2 }
@@ -40,7 +40,7 @@ three_voice = \melodic
 	>
 
 
-rests = \melodic  
+rests = \notes  
 	\type Staff <
 	{ \stemup
 		| r8 r r r  r r r r 
@@ -52,7 +52,7 @@ rests = \melodic
 	}
 	>
 
-restsII = \melodic {
+restsII = \notes {
 	\type Staff < 
 		{ \stemup  g' f' e' d' c' b a g f e d c }
 		{ \stemdown r  r  r  r  r  r r r r r r r }
@@ -76,7 +76,7 @@ restsII = \melodic {
 }
 
 \score{
-	\melodic \transpose c' {  \two_voice  
+	\notes \transpose c' {  \two_voice  
 	\two_voice_steminvert 
 	\three_voice  
 	\rests 
diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly
index 3a2dcd96cf..db8efbea8a 100644
--- a/input/test/defaultbars.ly
+++ b/input/test/defaultbars.ly
@@ -1,6 +1,8 @@
+\version "1.0.3";
+
 
 \score {
-	\melodic {
+	\notes {
 		\property Staff.barAlways = "1"
 		\property Staff.defaultBarType = ":|:"
 		c4 c4 c4 c4 }
diff --git a/input/test/denneboom.ly b/input/test/denneboom.ly
index 81a9f726a0..43b3f393be 100644
--- a/input/test/denneboom.ly
+++ b/input/test/denneboom.ly
@@ -7,7 +7,7 @@ TestedFeatures = "This file tests silly line shapes";
 
 \include "paper20.ly"
 
-\version "1.0.2";
+\version "1.0.3";
 
 oden = \lyric{ 
 	O8 |
@@ -33,7 +33,7 @@ ugloeit = \lyric{
 	licht8. ge-16 spreid.4 _8
 }
 
-oboom = \melodic\transpose c''{
+oboom = \notes\transpose c''{
 	g,8 |
 	c8. c16 c4. d8 | 
 	e8. e16 e4. e8 | 
@@ -41,7 +41,7 @@ oboom = \melodic\transpose c''{
 	d8. c16 c4 r8
 }
 
-bos = \melodic\transpose c''{
+bos = \notes\transpose c''{
 	g8 | 
 	g e a4. g8 | 
 	g8. f16 f4 r8 f8 |
@@ -49,13 +49,13 @@ bos = \melodic\transpose c''{
 	f8. e16 e4 r8
 }
 
-global = \melodic{ 
+global = \notes{ 
 	\time 3/4;
     	\partial 8;
 	\skip 4*48;
 	\bar "|.";
 }
-melody = \melodic{
+melody = \notes{
 	\oboom
 	\oboom
 	\bos
@@ -67,7 +67,7 @@ $melody_staff = \type Staff = melody <
 	\melody
 >
 
-$verse_one = \melodic{
+$verse_one = \notes{
 	\oden
 	\oden
 	\ikheb
@@ -79,7 +79,7 @@ $verse_one_staff = \type Lyrics = one <
 	\$verse_one
 >
 
-$verse_two = \melodic{
+$verse_two = \notes{
 	\oden
 	\oden
 	\ugloeit
diff --git a/input/test/dotted-slur.ly b/input/test/dotted-slur.ly
index 067f019be2..e29a2aa09b 100644
--- a/input/test/dotted-slur.ly
+++ b/input/test/dotted-slur.ly
@@ -1,5 +1,7 @@
+\version "1.0.3";
+
 \score{
-	\melodic{
+	\notes{
 		c( d e )c |
 		\slurdotted;
 		c( d e )c |
diff --git a/input/test/find-quarts.ly b/input/test/find-quarts.ly
index 7952b0f1bc..63d8647b21 100644
--- a/input/test/find-quarts.ly
+++ b/input/test/find-quarts.ly
@@ -1,5 +1,7 @@
+\version "1.0.3";
+
 \score{
-	\melodic \relative c {
+	\notes \relative c {
 	      c d c f c g c b, c g, c f, c c'' c
 % run with find-quarts should suggest:
 %	      c d c f c g' c, b c g c f, c' c'' c,,
diff --git a/input/test/font-body.ly b/input/test/font-body.ly
index 1d7c1dbf88..dde06fd8e0 100644
--- a/input/test/font-body.ly
+++ b/input/test/font-body.ly
@@ -1,6 +1,6 @@
-\version "1.0.2";
+\version "1.0.3";
 
-FontBody=	\melodic\transpose c''{ 
+FontBody=	\notes\transpose c''{ 
 		\bar "|:";
 		\time 4/4;
 		\type Staff  < { \stemup e'\longa a\breve | }
diff --git a/input/test/font.ly b/input/test/font.ly
index 61f689b328..6bc11d45b9 100644
--- a/input/test/font.ly
+++ b/input/test/font.ly
@@ -7,7 +7,7 @@ description = "This file tests the Feta music font";
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "font-body.ly"
 \score{
diff --git a/input/test/font16.ly b/input/test/font16.ly
index d0b6efe5bd..c8ddcec331 100644
--- a/input/test/font16.ly
+++ b/input/test/font16.ly
@@ -7,7 +7,7 @@ description = "This file tests the Feta music font";
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 \include "font-body.ly"
 
 \score{
diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly
index a1c477eb01..144656f5e4 100644
--- a/input/test/gourlay.ly
+++ b/input/test/gourlay.ly
@@ -4,7 +4,7 @@ copyright =	 "PD";
 TestedFeatures =	 "This file tests some nasty Gourlay spacings";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 %{
 
@@ -13,7 +13,7 @@ This is taken from [Gourlay]'s paper on breaking lines
 %}
 
 \score{
-       \melodic \type Staff  \transpose c''<
+       \notes \type Staff  \transpose c''<
                { \stemup; d2 d     | d d | d4 d2. | \break;  c1 }
                \transpose c, { \stemdown; g4 g g g | \[2/3 g2 g2 g2 \] | g4. g8 g2 | c1 }
                >
diff --git a/input/test/grace.ly b/input/test/grace.ly
index deec5f44f3..8424587c52 100644
--- a/input/test/grace.ly
+++ b/input/test/grace.ly
@@ -1,18 +1,20 @@
 
+\version "1.0.3";
+
 \include "table13.ly";
 \include "table16.ly";
 
 \score{
 	<
-	\type Staff = a \melodic\relative c <
+	\type Staff = a \notes\relative c <
 %		{\grace b''8 \graceat a4 \ecarg g fis2 | a2 a }
 		{\tiny b''8*1/16 \normalsize a4*31/32 g fis2 | a2 a }
 	>
-	\type Staff = b \melodic\relative c <
+	\type Staff = b \notes\relative c <
 %		{\grace g''16 b16 \graceat a4 \ecarg g fis2 | }
 		{\tiny g''16*1/16 b16*1/16 \normalsize a4*31/32 g fis2 | a1 }
 	>
-	\type Staff = c \melodic\relative c <
+	\type Staff = c \notes\relative c <
 %		{\grace [2/48 g''16 b g]/1 \graceat a4 \ecarg g fis2 | a1 }
 		{\tiny [2/48 g''16 b g]/1 \normalsize a4*31/32 g fis2 | a1 }
 	>
diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly
index 7913177956..573aea14ba 100644
--- a/input/test/hara-kiri.ly
+++ b/input/test/hara-kiri.ly
@@ -1,5 +1,6 @@
+\version "1.0.3";
 
-toeter_i = \melodic\relative c {
+toeter_i = \notes\relative c {
 	\property Staff.instrument = "Toeters"
 	\property Staff.instr = "Ttr."
 	c'''4 c c c \break
@@ -12,7 +13,7 @@ toeter_i = \melodic\relative c {
 	g g g g
 }
 
-toeter_ii = \melodic \relative c {
+toeter_ii = \notes \relative c {
 	c''4 c c c \break
 	d d d d \break
 	R1 \break
@@ -30,7 +31,7 @@ toeters = \type StaffGroup = xtoeters <
 	>
 >
  
-zager = \type Staff = zager \melodic \relative c {
+zager = \type Staff = zager \notes \relative c {
 	\clef bass;
 	\property Staff.instrument = "Zager"
 	\property Staff.instr = "Zag."
@@ -46,7 +47,7 @@ zager = \type Staff = zager \melodic \relative c {
 	f e d c
 }
 
-zoger = \type Staff = zoger \melodic \relative c {
+zoger = \type Staff = zoger \notes \relative c {
 	\clef bass;
 	\property Staff.instrument = "Zoger"
 	\property Staff.instr = "Zog."
diff --git a/input/test/keys.ly b/input/test/keys.ly
index 9c5bd3623b..f1cab0f0d6 100644
--- a/input/test/keys.ly
+++ b/input/test/keys.ly
@@ -1,8 +1,10 @@
+\version "1.0.3";
+
 %{
 test key itemv breaking
 %}
 \score {
-  \melodic
+  \notes
   {
     \key bes; c1 \key c;  c1
     \break
diff --git a/input/test/knee.ly b/input/test/knee.ly
index 2a6edb5386..dec8562e64 100644
--- a/input/test/knee.ly
+++ b/input/test/knee.ly
@@ -1,6 +1,6 @@
-\version "1.0.2";
+\version "1.0.3";
 \score{
-	\melodic\relative c'{
+	\notes\relative c'{
 		[c16 \stemdown c'' \stemboth c,, d]
 		\stemdown [d'' a \stemboth c,, g,]
 		\stemup [g c' \stemboth a'' d']
diff --git a/input/test/mark.ly b/input/test/mark.ly
index 29fdba15fa..e694fe6c3c 100644
--- a/input/test/mark.ly
+++ b/input/test/mark.ly
@@ -1,15 +1,17 @@
-global = \melodic {
+\version "1.0.3";
+
+global = \notes {
   s1 | \mark "A";
   s1*2 | \mark "'12";
 }
 
-one = \melodic\relative c{
+one = \notes\relative c{
   c'' c c c
   c c c c
   c c c c
 }
 
-two = \melodic\relative c{
+two = \notes\relative c{
   b' b b b
   b b b b
   b b b b
diff --git a/input/test/multi-rest.ly b/input/test/multi-rest.ly
index aa41f4496c..6a801c03a3 100644
--- a/input/test/multi-rest.ly
+++ b/input/test/multi-rest.ly
@@ -1,4 +1,6 @@
-voice_one = \melodic\transpose c'	{  \stemup
+\version "1.0.3";
+
+voice_one = \notes\transpose c'	{  \stemup
 	R1 * 2 | f'4-. r r2 | R1 * 3 |
 	f'4-. r r2 | R1 * 3 |
 	es'4-. r r2 | r1 |
@@ -8,7 +10,7 @@ voice_one = \melodic\transpose c'	{  \stemup
 	r2 r4 g4-. |
 	}
 
-voice_two = \melodic
+voice_two = \notes
 	{ \transpose c, { \stemdown
 	R1 * 2 | f'4-. r r2 | R1 * 3 |
 	f'4-. r r2 | R1 * 3 |
@@ -20,7 +22,7 @@ voice_two = \melodic
 
 	}}
 
-\score {  \melodic
+\score {  \notes
 	\type Staff <
 		\$voice_two
 		\$voice_one
diff --git a/input/test/ossia.ly b/input/test/ossia.ly
index 62cb305290..9aa99298e2 100644
--- a/input/test/ossia.ly
+++ b/input/test/ossia.ly
@@ -1,3 +1,6 @@
+\version "1.0.3";
+
 \score {
-\melodic { c1 c1 < {\clef "treble"; c1 c1 } \type Staff=stb{ c1 c1}>}
+
+\notes { c1 c1 < {\clef "treble"; c1 c1 } \type Staff=stb{ c1 c1}>}
 }
diff --git a/input/test/score-bar-scripts.ly b/input/test/score-bar-scripts.ly
index a27deda9f8..5d72b15d06 100644
--- a/input/test/score-bar-scripts.ly
+++ b/input/test/score-bar-scripts.ly
@@ -1,11 +1,13 @@
 
 
 
-onestaff =	\type Staff = foo\melodic  {
+\version "1.0.3";
+
+onestaff =	\type Staff = foo\notes  {
 		\property Staff.instr = instr
 		\property Staff.instrument = instrument \mark "B"; c1 \mark "A"; \break c2  c2 \break }
 
-grstaff =	\melodic \type GrandStaff <
+grstaff =	\notes \type GrandStaff <
 	\type Staff = bar	{
 
 	\property Staff.instr = instr
diff --git a/input/test/sleur.ly b/input/test/sleur.ly
index 6ddcf2a130..28ce6fc9ce 100644
--- a/input/test/sleur.ly
+++ b/input/test/sleur.ly
@@ -5,9 +5,9 @@ TestedFeatures =	 "This file tests Feta embedded slurs"
 	 "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-shortlong = \melodic{
+shortlong = \notes{
 	c4()c( c c  |
 	c c c c |
 	c c c c |
@@ -15,19 +15,19 @@ shortlong = \melodic{
 	c c c )c |
 }
 
-dirs = \melodic\transpose c' {
+dirs = \notes\transpose c' {
 
 	c'1() g' () c () g () c |
 }
 
-complex = \melodic{
+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\transpose c'{
+over = \notes\transpose c'{
 
 
 	e( g' g' )e
@@ -51,7 +51,7 @@ over = \melodic\transpose c'{
 	e( c'' f )e
 }
 
-under = \melodic\transpose c'{
+under = \notes\transpose c'{
 
 	\stemdown 
 	f'( \stemboth d d \stemdown )f'
@@ -76,7 +76,7 @@ under = \melodic\transpose c'{
 	f'( e, f )f'
 }
 
-eccentric = \melodic\transpose c'{
+eccentric = \notes\transpose c'{
 
 	\stemup
 	\[4/7 f( a' f f f f )f \] |
@@ -86,7 +86,7 @@ eccentric = \melodic\transpose c'{
 	\[4/7 e'( e' e' e' e' c )e' \] |
 }
 
-tiltup = \melodic\transpose c'{
+tiltup = \notes\transpose c'{
 	e( c'' c'' )e'
 	\stemup
 	e( c'' c'' )e'
@@ -100,7 +100,7 @@ tiltup = \melodic\transpose c'{
 	f'( a, a, )f''
 }
 
-tiltdown = \melodic\transpose c'{
+tiltdown = \notes\transpose c'{
 	e'( c'' c'' )e
 	\stemup
 	e'( c'' c'' )e
@@ -114,7 +114,7 @@ tiltdown = \melodic\transpose c'{
 	f''( a, a, )f'
 }
 
-broken = \melodic\transpose c''{
+broken = \notes\transpose c''{
       c c c c()
       c c c c(
       c )c c c(
@@ -127,7 +127,7 @@ broken = \melodic\transpose c''{
       f,( c c )f,
 }
 
-blend =	\melodic\transpose c'{
+blend =	\notes\transpose c'{
 	e( c'' c'' )e
 	\stemup
 	f'( c'' c'' )f'
@@ -148,7 +148,7 @@ blend =	\melodic\transpose c'{
 }
 
 
-bug = \melodic\transpose c'{
+bug = \notes\transpose c'{
 
 	a()g( f )e
 	b'()a'( g' )f'
@@ -157,7 +157,7 @@ bug = \melodic\transpose c'{
 	c' () b () c' c'
 }
 
-clipping = \melodic\transpose c'{
+clipping = \notes\transpose c'{
 	\stemboth
 	c( c''' c''')c
 	c( c''' c )c''
@@ -169,7 +169,7 @@ clipping = \melodic\transpose c'{
 }
 
 \score{
-	\melodic{ 
+	\notes{ 
 		% use blend for fast check
 		\blend
 % {
diff --git a/input/test/slur-bug.ly b/input/test/slur-bug.ly
index 583415ceef..ba60200dc5 100644
--- a/input/test/slur-bug.ly
+++ b/input/test/slur-bug.ly
@@ -1,7 +1,9 @@
+\version "1.0.3";
+
 % bug
 % excentric slur can't handle this ...
 \score{
-	\melodic{
+	\notes{
 		\stemdown 
 		\[4/5c8( c f,, c c\]1/1 c c c )c |
 	}
diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly
index 5b8f29263e..32eb795327 100644
--- a/input/test/slur-damping.ly
+++ b/input/test/slur-damping.ly
@@ -1,8 +1,8 @@
 % test damping
-\version "1.0.2";
+\version "1.0.3";
 
 \score{
-	\melodic\relative c'{
+	\notes\relative c'{
 
 		c'()b' ~ b, c
 		c c c c
diff --git a/input/test/slur-swap.ly b/input/test/slur-swap.ly
index 6c09f424d3..782e9b9c13 100644
--- a/input/test/slur-swap.ly
+++ b/input/test/slur-swap.ly
@@ -1,6 +1,8 @@
+\version "1.0.3";
+
 % urg, the direction of the slur gets swapped!
 \score{
-	\melodic\relative c{
+	\notes\relative c{
 	\slurup
 	\stemup
 		[e'8( c' a b]
diff --git a/input/test/slurs.ly b/input/test/slurs.ly
index ffb11d6995..78407e6cb1 100644
--- a/input/test/slurs.ly
+++ b/input/test/slurs.ly
@@ -1,8 +1,8 @@
 
-\version "1.0.2";
+\version "1.0.3";
 
 \score{
-	\melodic\transpose c'{
+	\notes\transpose c'{
 
 		c,4 ~ c, c'' ~ c'' ~ g ~ c ~
 		d ~ e ~ f ~ g ~
diff --git a/input/test/spacing.ly b/input/test/spacing.ly
index db64053342..908476bc94 100644
--- a/input/test/spacing.ly
+++ b/input/test/spacing.ly
@@ -6,9 +6,9 @@ copyright =	 "public domain";
 TestedFeatures =	 "This file tests various spacings";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-multipart = \melodic{ 
+multipart = \notes{ 
     \type StaffGroup < 
                 { 
                    c4
@@ -48,7 +48,7 @@ multipart = \melodic{
             >
 	}
 
-singlepart = \melodic{ 
+singlepart = \notes{ 
 	c4 d e f
 	c4 d e [f8 f]
 	c4 d e f8 [f16 f]
@@ -59,7 +59,7 @@ singlepart = \melodic{
     }
     
     \score{
-    \melodic { 
+    \notes { 
 %    	\singlepart 
 	\multipart 
     }
diff --git a/input/test/stem.ly b/input/test/stem.ly
index cf4f28d3c1..1db1f9d49f 100644
--- a/input/test/stem.ly
+++ b/input/test/stem.ly
@@ -8,9 +8,9 @@ of beams";
 	
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-beamintervals = \melodic{
+beamintervals = \notes{
 		\time 7/4;
 		\stemup
 \transpose c'{
@@ -27,7 +27,7 @@ beamintervals = \melodic{
 	}}
 
 \score{
-	\melodic\transpose c'{ 
+	\notes\transpose c'{ 
 		\stemup
 		\time 17/4;
 		g,4 a, b, c d e f g a b c' d' e' f' g' a' b' |
diff --git a/input/test/test-lyrics.ly b/input/test/test-lyrics.ly
index bc65c2442e..529dbf581b 100644
--- a/input/test/test-lyrics.ly
+++ b/input/test/test-lyrics.ly
@@ -1,3 +1,5 @@
+\version "1.0.3";
+
 $somewhat_long = \lyric{
 	\textstyle "roman" ;
 	AaaaaaA2
@@ -40,7 +42,7 @@ $quite_long_lyrics_staff = \type Lyrics = quite <
 	\$quite_long
 >
 
-melody = \melodic
+melody = \notes
 \transpose c'{
 	c4 e4 g4 e4  c4 e4 g4 e4  c4 e4 g4 e4  c4 e4 g4 e4
 	c4 e4 g4 e4  c4 e4 g4 e4  c4 e4 g4 e4  c4 e4 g4 e4
diff --git a/input/test/tie-bug.ly b/input/test/tie-bug.ly
index 0cdf237204..0e9d54e8b1 100644
--- a/input/test/tie-bug.ly
+++ b/input/test/tie-bug.ly
@@ -1,7 +1,9 @@
+\version "1.0.3";
+
 
 %  middle tie is wrong
 \score{
-	\melodic\relative c'{
+	\notes\relative c'{
 	{		<c4 e g~ > <d f a>
 	}
 }}
diff --git a/input/test/tie.ly b/input/test/tie.ly
index 4a708b9eb9..042721976f 100644
--- a/input/test/tie.ly
+++ b/input/test/tie.ly
@@ -1,4 +1,6 @@
-tie = \melodic\transpose c''{
+\version "1.0.3";
+
+tie = \notes\transpose c''{
 
 	e4 ~ e e e ~ |
 	e ~ a a a ~ |
diff --git a/input/test/title.ly b/input/test/title.ly
index 318a68efa4..601c81a24f 100644
--- a/input/test/title.ly
+++ b/input/test/title.ly
@@ -10,10 +10,10 @@ source = 	"urtext";
 instrument=	"Instrument";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \score{
-	\melodic
+	\notes
 	  \relative c'{
 		c' d e f f e d c \break
 		c d e f f e d c
@@ -27,7 +27,7 @@ instrument=	"Instrument";
 
 
 \score{
-	\melodic
+	\notes
 	\relative c' {
 	    f' e d c c d e f \break
 	    f e d c c d e f
diff --git a/input/test/transposition.ly b/input/test/transposition.ly
index f5e258305c..21e9b35e2f 100644
--- a/input/test/transposition.ly
+++ b/input/test/transposition.ly
@@ -22,9 +22,9 @@ copyright =	 "public domain";
 }
 
 
-\version "1.0.2";
+\version "1.0.3";
 
-vOne = \melodic \relative c''{
+vOne = \notes \relative c''{
         \clef"violin";
         \key d;
         \time 2/4 ;
@@ -35,9 +35,9 @@ vOne = \melodic \relative c''{
         c4 c |
 }
 
-vTwo = \melodic \relative c''\transpose d' { \vOne }
+vTwo = \notes \relative c''\transpose d' { \vOne }
 
-vThree = \melodic \relative c''{
+vThree = \notes \relative c''{
         \clef"violin";
         \keysignature fis cis;
         \time 2/4 ;
@@ -48,7 +48,7 @@ vThree = \melodic \relative c''{
         cis4 ais4 |
 }
 
-vFour = \melodic \relative c''\transpose d' \vThree
+vFour = \notes \relative c''\transpose d' \vThree
 
 \score {
   \type StaffGroup <
diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly
index bb479e3cc0..6831dda8f7 100644
--- a/input/test/vertical-align.ly
+++ b/input/test/vertical-align.ly
@@ -1,6 +1,8 @@
 
+\version "1.0.3";
+
 \score {
-\melodic <
+\notes <
 	\type GrandStaff < {
 	   \property GrandStaff . maxVerticalAlign = "60."
 	   \property GrandStaff . minVerticalAlign = "35."