Generated by hanwen@cs.uu.nl using package-diff 0.62,
From = lilypond-1.0.8, To = lilypond-1.0.9

usage 

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.0.9.diff

Patches do not contain automatically generated files 
or (urg) empty directories, 
i.e., you should rerun autoconf, configure 
and possibly make outdirs.

--state
1.0.8.uu1
1.0.8
1.0.8.jcn1
1.0.8.uu1
1.0.9
++state
diff -urN ../lilypond-1.0.8/Documentation/GNUmakefile ./Documentation/GNUmakefile
--- ../lilypond-1.0.8/Documentation/GNUmakefile	Thu May 14 10:38:21 1998
+++ ./Documentation/GNUmakefile	Thu Sep 17 13:35:59 1998
@@ -16,5 +16,5 @@
 
 default: do-doc
 
-texinfo: $(outdir)/$(package).info
+info: $(outdir)/$(package).info
 
diff -urN ../lilypond-1.0.8/Documentation/faq.yo ./Documentation/faq.yo
--- ../lilypond-1.0.8/Documentation/faq.yo	Thu May 14 10:38:21 1998
+++ ./Documentation/faq.yo	Thu Sep 17 14:51:15 1998
@@ -183,6 +183,12 @@
 (yet).  Look at file(standchen.ly) for an example.
 
 
+question(Do you support Gregorian chant notation?)
+
+No.  There is no reason why LilyPond can't be extended to do so, but
+we haven't done it yet (and there are currently no plans to do it).
+
+
 sect(How do I ....)
 
 question(How do I change the TeX layout?)
diff -urN ../lilypond-1.0.8/Documentation/pictures/GNUmakefile ./Documentation/pictures/GNUmakefile
--- ../lilypond-1.0.8/Documentation/pictures/GNUmakefile	Thu May 14 10:38:21 1998
+++ ./Documentation/pictures/GNUmakefile	Thu Sep 17 13:35:59 1998
@@ -3,14 +3,17 @@
 STEPMAKE_TEMPLATES=documentation
 XPM_FILES=$(wildcard *.xpm)
 OUTGIF_FILES = $(addprefix $(outdir)/,$(XPM_FILES:.xpm=.gif))
+OUTPNG_FILES = $(addprefix $(outdir)/,$(XPM_FILES:.xpm=.png))
 
 EXTRA_DIST_FILES= $(XPM_FILES)
 
 include $(depth)/make/stepmake.make
 
 gifs: $(OUTGIF_FILES)
+pngs: $(OUTPNG_FILES)
 
-local-WWW: $(OUTGIF_FILES)
+# local-WWW: $(OUTGIF_FILES)
+local-WWW: $(OUTPNG_FILES)
 
 icon: $(outdir)/lelie_icon.gif
 	cp $< $(depth)/$(outdir)/$(package)-icon.gif
diff -urN ../lilypond-1.0.8/Documentation/programs.yo ./Documentation/programs.yo
--- ../lilypond-1.0.8/Documentation/programs.yo	Thu May 14 10:38:21 1998
+++ ./Documentation/programs.yo	Thu Sep 17 13:35:11 1998
@@ -8,7 +8,7 @@
 
 COMMENT(prepare for texinfoing manpages)
 redef(manpage)(5)()
-redef(manpagename)(2)(nodeprefix()nodetext(ARG2)chapter(ARG1)nodeprefix(ARG1))
+redef(manpagename)(2)(nodeprefix()nodetext(ARG2)chapter(ARG1)nodeprefix(ARG1 ))
 redef(manpageauthor)(0)(sect(Authors))
 redef(manpagesection)(1)(sect(ARG1))
 
diff -urN ../lilypond-1.0.8/Documentation/tex/GNUmakefile ./Documentation/tex/GNUmakefile
--- ../lilypond-1.0.8/Documentation/tex/GNUmakefile	Mon Sep 14 16:25:53 1998
+++ ./Documentation/tex/GNUmakefile	Wed Sep 16 00:40:44 1998
@@ -6,6 +6,8 @@
 datafiles = $(addprefix $(outdir)/,$(DATA_FILES:.data=.html))
 DOC_FILES = $(wildcard *.doc)
 DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi) $(YO_FILES:.yo=.dvi))
+OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES))
+
 OUTDOC_FILES = $(addprefix $(outdir)/, $(DOC_FILES))
 EL_FILES = $(wildcard *.el)
 BIB_FILES= $(wildcard *.bib)
@@ -15,11 +17,13 @@
 
 STEPMAKE_TEMPLATES=documentation
 LOCALSTEPMAKE_TEMPLATES=lilypond mudela
+export BIBINPUTS="$(topdir)/Documentation/tex//"#huh?
 
 
 include $(depth)/make/stepmake.make 
 
-dvi: $(DVI_FILES)
+dvi: $(OUT_BIB_FILES) $(DVI_FILES)
+
 
 ps: $(PS_FILES)
 
diff -urN ../lilypond-1.0.8/Documentation/tex/glossary.yo ./Documentation/tex/glossary.yo
--- ../lilypond-1.0.8/Documentation/tex/glossary.yo	Mon Sep 14 18:17:09 1998
+++ ./Documentation/tex/glossary.yo	Wed Sep 16 00:39:06 1998
@@ -17,12 +17,16 @@
 htmlbodyopt(bgcolor)(white)
 htmlcommand(<font color=black>)
 
-latexpackage()(a4wide) COMMENT(UGH)
 latexlayoutcmds(
-%\usepackage[latin1]{inputenc}
-\input mudela-book
+\setlength{\topmargin}{-0.25in}
+\setlength{\textheight}{9in}
+\setlength{\textwidth}{5.875in} 
+\setlength{\oddsidemargin}{0.25in}   
+\setlength{\evensidemargin}{0.25in}
 )
 
+latexpackage()(a4wide) COMMENT(UGH)
+
 whenlatex(notableofcontents())
 whentexinfo(notableofcontents())
 
@@ -76,19 +80,4 @@
 whenhtml(
     includeverbatim(DOEXPAND(outdir)/glossary-table.html)
 )
-
-whenlatex(latexcommand(
-    \bibliographystyle{plain}
-    \bibliography{engraving}
-))
-
-
-COMMENT(The bib stuff is somewhere else on the WWW site)
-COMMENT(
-setchapterstring{}
-
-whenhtml{
-    nchapter{Bibliography}
-    includeverbatim{out-www/engraving.html}
-})
 
diff -urN ../lilypond-1.0.8/Documentation/tex/refman.yo ./Documentation/tex/refman.yo
--- ../lilypond-1.0.8/Documentation/tex/refman.yo	Thu May 14 10:38:21 1998
+++ ./Documentation/tex/refman.yo	Thu Sep 17 16:55:17 1998
@@ -1,9 +1,8 @@
 COMMENT(-*-text-*-)
 
-DEFINEMACRO(var)(1)(whenlatex(latexcommand({\normalfont\scshape )ARG1+latexcommand(}))\
+redef(var)(1)(whenlatex(latexcommand({\normalfont\scshape )ARG1+latexcommand(}))\
     whenhtml(sc(ARG1)))
-
-
+def(mycode)(1)(tt(ARG1))
 
 COMMENT( This document contains Mudela fragments.  You need at least
 Yodl-1.30.18 to convert this to tex or html.
@@ -125,14 +124,14 @@
 To assign an identifier you use:
 verb(string = ...)
 To use an identifier, you must preceed it with a backslash: code(\).
-verb(oboe = \melodic { ... }
-\score{ \melodic { \oboe }})
+verb(oboe = \notes { ... }
+\score{ \notes { \oboe }})
 The left-hand part of the assignment is really a string, so 
-verb("Foo bar 4 2 " = \melodic { ... })
+verb("Foo bar 4 2 " = \notes { ... })
 is also a valid assignment (but you would have trouble referencing it)
 If you reuse identifiers, then the previous contents will be thrown
 away after the right hand is evaluated, e.g.
-verb(bla = \melodic { \bla })
+verb(bla = \notes { \bla })
 is legal.
 
 COMMENT(It's not clear to me what things are allowed on the RHS of 
@@ -149,7 +148,7 @@
 clef        key            notenames  script        type        
 cm          keysignature   octave     shape         transpose   
 consists    mark           output     skip          version     
-contains    melodic        partial    staff     
+contains    notes        partial    staff     
 duration    musicalpitch   paper      spandynamic)
 
 COMMENT( I don't know  the proper  way to make this kind of table in
@@ -186,7 +185,7 @@
 the information on how to use an identifier, so it should be deleted.
 
 But I'm uncertain about the meaning of \TYPE in the above section.
-Different from \type?  Does it refer to \melodic, \lyric?  In general,
+Different from \type?  Does it refer to \notes, \lyric?  In general,
 the use of the word "type" seems to be a source of confusion.
 )
 
@@ -211,7 +210,7 @@
 is treated as a string. 
 
 dit(Note mode) Note mode is introduced by the keyword
-code(\melodic).  In Note mode, words can only contain alphabetic
+code(\notes).  In Note mode, words can only contain alphabetic
 characters.  If code(word) is encountered, Lilypond first checks for a
 notename of code(word).  If no notename is found, then code(word) is
 treated as a string.  If you mistype a notename, the parser will most
@@ -424,7 +423,7 @@
 duration entry are bound together using an underscore: 
 code(He_could4 not4).  Here is a full example:
 mudela(verbatim)(\score{ 
-  <  \melodic \transpose c'' {c d e c | c d e c | e f g'2 | 
+  <  \notes \transpose c'' {c d e c | c d e c | e f g'2 | 
                               e'4 f g'2 \bar "|."; }
      \type Lyrics \lyric { 
               DOEXPAND(Fr\)`e-4 re Ja- que DOEXPAND(Fr\)`e- re Ja- que
@@ -504,7 +503,7 @@
 
 mudela(verbatim)(
 \score{
-        \melodic {
+        \notes {
                 c' d' e' c' |
                 c' d' e' c' |
                 e' f' g'2 |
@@ -596,7 +595,7 @@
 section ref(sec:running-lilypond) we told you that the music you
 enter should be encapsulated in something like:
 verb(\score<
-        \melodic\relative c{
+        \notes\relative c{
                 d
         }
         \paper{ }
@@ -616,7 +615,7 @@
 LilyPond will embed your file(foo.fly) nop(in)footnote(Or something very 
 similar.  If you want to know exactly, see file(init/init.fly)):
 verb(\score<
-        \melodic\relative c{
+        \notes\relative c{
                 <<foo.ly>>
         }
         \paper{ }
@@ -646,11 +645,11 @@
 
 description(
 
-dit(code(\absdynamic))
+dit(mycode(\absdynamic))
 
-dit(code(\accepts))
+dit(mycode(\accepts))
 
-dit(code(\bar) var(bartype)) Prints a special bar symbol, or at
+dit(mycode(\bar) var(bartype)) Prints a special bar symbol, or at
 measure boundaries, replaces the regular bar symbol with a special
 symbol.  The argument var(bartype) is a string which specifies the
 kind of bar to print.  Options are code(":|"), code("|:"),
@@ -660,69 +659,69 @@
 thick double bar.  If var(bartype) is set to "empty" then nothing is
 printed, but a line break is allowed at that spot.
 
-dit(code(\cadenza) var(togglevalue)) Toggles the automatic generation
+dit(mycode(\cadenza) var(togglevalue)) Toggles the automatic generation
 of bar lines.  If var(togglevalue) is 0 then bar line generation is
 turne off.   If var(togglevalue) is  1  then a bar is  immediately
 printed and bar generation is turned  on.
 
-dit(code(\clear))
+dit(mycode(\clear))
 
-dit(code(\clef)  var(clefname)) Sets the current clef.   The argument
+dit(mycode(\clef)  var(clefname)) Sets the current clef.   The argument
 is the name of the clef.  Possibilities are code(bass), code(alto),
 and code(treble).  Treble clef is the default.
 
-dit(code(\cm)) Specify a width in centimeters. 
+dit(mycode(\cm)) Specify a width in centimeters. 
 
-dit(code(\consists))
+dit(mycode(\consists))
 
-dit(code(\contains))
+dit(mycode(\contains))
 
-dit(code(\duration) { var(length) var(dotcount) }) Specify note
+dit(mycode(\duration) { var(length) var(dotcount) }) Specify note
 duration.  The parameter var(length) is the negative logarithm (base
 2) of duration: 1 is a half note, 2 is a quarter note, 3 is an eighth
 note, etc.  The number of dots  after  the  note is given by
 var(dotcount). 
 
-dit(code(\font))
+dit(mycode(\font))
 
-dit(code(\grouping) var(durationlist))  Sets  the  metric structure of
+dit(mycode(\grouping) var(durationlist))  Sets  the  metric structure of
 the measure.  
 COMMENT(elaboration is needed here.)
 
-dit(code(\in)) Specify a width in inches.  
+dit(mycode(\in)) Specify a width in inches.  
 
-dit(code(\include) var(file)) Include the specified file.
+dit(mycode(\include) var(file)) Include the specified file.
 
-dit(code(\lyric) { var(list) } ) Parse var(list) in lyrics mode.
+dit(mycode(\lyric) { var(list) } ) Parse var(list) in lyrics mode.
 
-dit(code(\key) var(pitch)) Change key signature to  that of var(pitch)-major.
+dit(mycode(\key) var(pitch)) Change key signature to  that of var(pitch)-major.
 
-dit(code(\keysignature) var(notelist))
+dit(mycode(\keysignature) var(notelist))
 Specify an arbitrary key signature.  The notes from var(notelist) will
 be printed in the key signature in the order that they appear on the list.
 
-dit(code(\mark))
+dit(mycode(\mark))
 
-dit(code(\melodic) var(music)) Enter note mode and process the
+dit(mycode(\notes) var(music)) Enter note mode and process the
 specified music. 
 
-dit(code(\musicalpitch) { var(octave) var(note) var(shift) }) Specify
+dit(mycode(\musicalpitch) { var(octave) var(note) var(shift) }) Specify
 note pitch.  The octave is specified by an integer, zero for the
 octave containing middle C.  The note is a number from 0 to 7, with 0
 corresponding to C and 7 corresponding to B.  The shift is zero for a
 natural, negative to add flats, or positive to add sharps.
 
-dit(code(\time) var(numerator)code(/)var(denominator)) Change the time
+dit(mycode(\time) var(numerator)mycode(/)var(denominator)) Change the time
 signature.  The default time signature  is 4/4.  
 
-dit(code(\midi)) Produce musical output.  See code(\tempo) for setting
+dit(mycode(\midi)) Produce musical output.  See code(\tempo) for setting
 the tempo.
 
-dit(code(\mm)) Specify a width in millimeters. 
+dit(mycode(\mm)) Specify a width in millimeters. 
 
-dit(code(\multi))
+dit(mycode(\multi))
 
-dit(code(\header) { var(key1) = var(val1); var(key2) = var(val2); ... })
+dit(mycode(\header) { var(key1) = var(val1); var(key2) = var(val2); ... })
 Specifies information about the music.  A header should appear at the
 top of the file describing the file's contents.  If a file has
 multiple code(\score) blocks, then a header should appear in
@@ -730,31 +729,31 @@
 use this information for generating titles.   Some possible key values
 are: title, opus, description, composer, enteredby, and copyright.
 
-dit(code(\notenames) { var(list) }) Define new note names.  
+dit(mycode(\notenames) { var(list) }) Define new note names.  
 The argument var(list) is a list of  definitions of  the form
 var(name) = var(pitch),  where var(pitch) is specified with the
 code(\musicalpitch) command.  
 
-dit(code(\octave))
-dit(code(\nop(output)))
+dit(mycode(\octave))
+dit(mycode(\nop(output)))
 
-dit(code(\partial) var(duration)) Specify that the first measure of
+dit(mycode(\partial) var(duration)) Specify that the first measure of
 the music lasts only for the specified duration.
 
-dit(code(\paper) code({) [ code(linewidth = )var(width)code(;) ] code(})) 
+dit(mycode(\paper) mycode({) [ mycode(linewidth = )var(width)mycode(;) ] mycode(})) 
 Appears in a score block to indicate that the music should be printed.
 The line width can be set to -1.  in order to prevent justification of
 small fragments of music, or the width can be specified explicitly
 using code(\cm), code(\in), code(\mm), or code(\pt) to specify the
 units.
 
-dit(code(\penalty))
+dit(mycode(\penalty))
 
-dit(code(\property))
+dit(mycode(\property))
 
-dit(code(\pt)) Specify a width in points. 
+dit(mycode(\pt)) Specify a width in points. 
 
-dit(code(\relative) var(pitch) var(music)) Processes the specified
+dit(mycode(\relative) var(pitch) var(music)) Processes the specified
 var(music) in relative pitch
 mode.  In this mode, the octave of a pitch note is chosen so that the
 note is closest to the preceeding note.  
@@ -763,36 +762,34 @@
 first note of a chord is used as the base for the pitches in the next
 chord.  
 
-dit(code(\score)) Start a music definition.
+dit(mycode(\score)) Start a music definition.
 
-dit(code(\script))
+dit(mycode(\script))
 
-dit(code(\shape))
+dit(mycode(\shape))
 
-dit(code(\skip))
+dit(mycode(\skip))
 
-dit(code(\staff))
+dit(mycode(\staff))
 
-dit(code(\spandynamic))
-dit(code(\symboltables))
-dit(code(\table))
+dit(mycode(\spandynamic))
+dit(mycode(\symboltables))
+dit(mycode(\table))
 
-dit(code(\tempo) var(duration) = var(perminute)) Used when creating
+dit(mycode(\tempo) var(duration) = var(perminute)) Used when creating
 MIDI output to specify the tempo.  For example, 
 `code(\midi { \temp0 4 = 76})' requests output with 76 quarter notes
 per minute.  
 
-dit(code(\translator))
-dit(code(\type))
+dit(mycode(\translator))
+dit(mycode(\type))
 
-dit(code(\transpose) var(pitch) var(music)) Transposes the specified
+dit(mycode(\transpose) var(pitch) var(music)) Transposes the specified
 music.  Middle C is tranposed to var(pitch). 
 
-dit(code(\version) var(string)) Specify the version of Lilypond that
+dit(mycode(\version) var(string)) Specify the version of Lilypond that
 a file was written for.  The argument is the version number,
 for example code("1.0.4").
 
 )
-
-
 
diff -urN ../lilypond-1.0.8/Documentation/tex/tutorial.yo ./Documentation/tex/tutorial.yo
--- ../lilypond-1.0.8/Documentation/tex/tutorial.yo	Thu May 14 10:38:21 1998
+++ ./Documentation/tex/tutorial.yo	Thu Sep 17 17:10:27 1998
@@ -1,9 +1,9 @@
 COMMENT(-*-text-*-)
 
-DEFINEMACRO(var)(1)(whenlatex(latexcommand({\normalfont\scshape )ARG1+latexcommand(}))\
+redef(var)(1)(whenlatex(latexcommand({\normalfont\scshape )ARG1+latexcommand(}))\
     whenhtml(sc(ARG1)))
 
-
+def(mycode)(1)(tt(ARG1))
 
 COMMENT( This document contains Mudela fragments.  You need at least
 Yodl-1.30.18 to convert this to tex or html.
@@ -60,7 +60,7 @@
 latexcommand(\def\interexample{})
 latexcommand(\def\preexample{\par})
 latexcommand(\def\postexample{\par\medskip})
-latexcommand(\def\file#1{{code(#1)}})
+latexcommand(\def\file#1{{mycode(#1)}})
 
 whenhtml(
 nsubsect(Disclaimer)
@@ -145,12 +145,13 @@
 
 This data is what we consider the musical em(definition).  Mudela
 has a special entry mode where you can conveniently abbreviate this to
-`code(d''4.)'.  There are some features that also make the quotes and
-numbers in `code(d''4.)'  superfluous in some cases.
+`mycode(d''4.)'.  There are some features that also make the quotes and
+numbers in `mycode(d''4.)'  superfluous in some cases.
 
-For those who are curious, the numbers in `code(\musicalpitch { 1 2 0
-})' example mean octave, notename, and accidental respectively.  The
-numbers in `code(\duration { 2 1 })' are the (negative) logarithm of the
+For those who are curious, the numbers in
+`mycode(\musicalpitch { 1 2 0 })'
+example mean octave, notename, and accidental respectively.  The
+numbers in `mycode(\duration { 2 1 })' are the (negative) logarithm of the
 duration (2 is a quarter note, 3 is an eighth note, etc.) and the number
 of augmention dots respectively.
 
@@ -158,9 +159,9 @@
 
 The basic building block of music is the note.  You can have LilyPond
 print a note by specifying its pitch and duration.  The pitch of the
-central C is written as code(c').  This is in line with musicological
+central C is written as mycode(c').  This is in line with musicological
 notation; there this pitch is transcribed as nop(c)sups(1) or c'.  A
-quarter-note duration is written as code(4).  So, to print a quarter
+quarter-note duration is written as mycode(4).  So, to print a quarter
 note whose pitch is central C, you enter the following:
 mudela(fragment,verbatim,center)( c'4 )
 
@@ -178,18 +179,18 @@
 
 subsect(Basic pitches)
 
-The pitch code(c') actually consists of two parts: one part for the
+The pitch mycode(c') actually consists of two parts: one part for the
 note name, and one for the octave.  The letter specifies which note
-name to use: note names simply are the letters code(a) to code(g).
+name to use: note names simply are the letters mycode(a) to mycode(g).
 The number of apostrophes specifies the octave to use: the central C
-is denoted by code(c').footnote(By convention, the A above central C
+is denoted by mycode(c').footnote(By convention, the A above central C
 at concert pitch is the tone that is used to tune instruments.  Its
 frequency is about 440 Hz.)  The C which is an eighth higher (the C in
-the ``two-line octave'') is denoted by code(c''): every octave adds a
-quote.  A note name without quotes designates the pitch below code(c')
+the ``two-line octave'') is denoted by mycode(c''): every octave adds a
+quote.  A note name without quotes designates the pitch below mycode(c')
 (the C in the ``small octave''). If you want to go down even further,
 commas should be added, e.g., the C in the ``contra octave'' is
-expressed as code(c,,).footnote(The comma is meant to represent a
+expressed as mycode(c,,).footnote(The comma is meant to represent a
 sunken apostrophe.)
 
 
@@ -203,7 +204,7 @@
   c'4 d'4 e'4 f'4 g'4 a'4 b'4 c''4
 )
 
-A rest can be entered as a note with the special name code(r), e.g.,
+A rest can be entered as a note with the special name mycode(r), e.g.,
 mudela(fragment,verbatim,center)(r4)
 
 This already gives us enough material to make simple songs. In
@@ -256,18 +257,18 @@
 Variations on this convention are used in a number of germanic
 languages, notably Dutch, German, Swedish, and Norwegian.  To be
 precise, LilyPond actually defaults to Dutch notenames, with
-code(aes), code(aeses), code(ees) and code(eeses) added for
+mycode(aes), mycode(aeses), mycode(ees) and mycode(eeses) added for
 consistency.
 
 Throughout this document we will continue to use the Dutch names.  To make
 (Dutch) pronunciation easier, the a-flat and e-flat are contracted to
-code(as) and code(es).  Similarly, the a double flat and e double flat are
-contracted to code(ases) and code(eses).
+mycode(as) and mycode(es).  Similarly, the a double flat and e double flat are
+contracted to mycode(ases) and mycode(eses).
 
 If you are not comfortable with these names, you can make your own.
 Note names for different languages are included with the example
 initialisation files, amongst others English (C sharp is abbreviated
-to code(cs)), Italian, Swedish and Norwegian.  If you want to use
+to mycode(cs)), Italian, Swedish and Norwegian.  If you want to use
 these names, you should look at bind(Section)ref(subsect:include) for
 information on how to use include files.
 
@@ -278,9 +279,9 @@
 We didn't want to bore you too much with repetitive details, so we
 left out some red tape that's needed for a  of Mudela in a form that is accepted
 by LilyPond.  To
-be precise, we wrote code(X Y Z), when we really meant
+be precise, we wrote mycode(X Y Z), when we really meant
 verb(\score {
-   \melodic { X Y Z }
+   \notes { X Y Z }
    \paper {}
 })
 We will continue to leave out the red tape this, until the time is right to explain what 
@@ -290,7 +291,7 @@
 Because LilyPond uses a language, it  is a so called em(batch)
 program.
 This means, that you use a
-text editor (such as code(emacs) or code(vi)) to create an input
+text editor (such as mycode(emacs) or mycode(vi)) to create an input
 file.  When you are done editing your input file, you save it, and you
 run LilyPond on the file.  If LilyPond finds any errors in your input file
 then nop(she)footnote(We're sure that if computer programs could have
@@ -312,11 +313,11 @@
 enumerate(
 it()
 Fire up your favourite editor (if you don't
-know any editors, try code(joe silly.ly)),
+know any editors, try mycode(joe silly.ly)),
 and key in the example from bind(Figure)ref(fig:twinkle1), with red tape:
 verb(
 \score {
-        \melodic {
+        \notes {
           c''4 c''4 g''4 g''4
           a''4 a''4 g''2
         }
@@ -328,7 +329,7 @@
 files is file(.ly).)
 
 it()
-Run LilyPond on your newly created file: enter code(lilypond twinkle).
+Run LilyPond on your newly created file: enter mycode(lilypond twinkle).
 LilyPond will then print all kinds of mumbo jumbo that can safely be
 ignored.  You might see something like this:
 verb(
@@ -363,7 +364,7 @@
 
 it()
   To do something useful with the output you have to run TeX() on it
-  first.  Run the command code(tex twinkle).  The output should resemble this:
+  first.  Run the command mycode(tex twinkle).  The output should resemble this:
 verb(
 This is TeX, Version 3.14159 (C version 6.1)
 (twinkle.tex
@@ -387,7 +388,7 @@
 What is in your window should approximately look like this:
 mudela()(
 \score {
-        \melodic {
+        \notes {
           c''4 c''4 g''4 g''4
           a''4 a''4 g''2
         }
@@ -397,7 +398,7 @@
 
 it()
 If you want to print file(twinkle.dvi), you should invoke the command
-code(dvips twinkle).  Running this command should generate a
+mycode(dvips twinkle).  Running this command should generate a
 PostScript file called file(twinkle.ps).  This file can be printed on
 any PostScript compatible printer.  You should not use any other
 tools: the output from LilyPond contains fragments of PostScript which
@@ -442,9 +443,9 @@
 In Mudela you can form a chord of several notes by enclosing them in
 pointed parentheses, bind(i.e.)bind(langle())bind(and)rangle().  ASCII
 doesn't really have these delimiters, so Mudela uses the larger-than
-(code(>)) and smaller-than (code(<)) signs instead.  For example, a
+(mycode(>)) and smaller-than (mycode(<)) signs instead.  For example, a
 D-major nop(chord)footnote(Recall what was said in the previous
-section about flats and sharps: the word code(fis) means an f sharp.)
+section about flats and sharps: the word mycode(fis) means an f sharp.)
 can be described by the following fragment:
 mudela(fragment,verbatim,center)(
   <d'8  fis'8 a'8 d''8>
@@ -507,7 +508,7 @@
   c''4   % shouldn't this be a different pitch?
 )
 
-Block comments are enclosed in code(%{) and code(%}).
+Block comments are enclosed in mycode(%{) and mycode(%}).
 
 verb(
   c''4
@@ -539,7 +540,7 @@
 following example:
 
 mudela()(
-\score{ \melodic {
+\score{ \notes {
 	\property Voice.textstyle = typewriter
         c''4-._"c''4-." s4
         c''4--_"c''4--"  s4
@@ -561,7 +562,7 @@
 Mudela.  We hope that this will be fixed in a future version of the
 language.  In the meantime you can abuse this: the super- and
 subscripts can be forced into up or down position respectively by entering an
-a caret (code(^)) or an underscore, code(_) instead of the dash:
+a caret (mycode(^)) or an underscore, mycode(_) instead of the dash:
 mudela(fragment,verbatim,center)(
   c'4-^ c'4^^ c'''4-^ c'''4_^
 )
@@ -627,8 +628,8 @@
 of the notes. It is merely a device that helps you understand the
 rhythms notated. Unfortunately, LilyPond is not smart enough to insert
 beams into your music on her own. You will have to instruct her by
-marking the starting and stopping point of the beam with `code([)' and
-`code(])' respectively, e.g.
+marking the starting and stopping point of the beam with `mycode([)' and
+`mycode(])' respectively, e.g.
 
 mudela(fragment,verbatim,center)(
   [g'8 g'8]
@@ -637,7 +638,7 @@
 LilyPond has code that guesses what the pattern should look like, so
 that you don't have to specify the beaming for complicated
 patterns.footnote(Unfortunately the algorithm used is not foolproof yet:
-  code([c8. c32 c32]) will produce incorrect results.)
+  mycode([c8. c32 c32]) will produce incorrect results.)
 
 Again, it is your responsibility to make sure that you end every beam
 that you start.
@@ -653,7 +654,7 @@
 conjunction with chords.  Internally, the extra information that is
 represented by the tilde has to be attached to a note (or to a rest,
 for that matter).  For this reason, you can't put the tilde between
-two chords (as in code( <c' g'> ~ <c' g'>)).  The tilde sign must be
+two chords (as in mycode( <c' g'> ~ <c' g'>)).  The tilde sign must be
 directly after a note of the chords.  It does not matter which
 one. The following example demonstrates this:
 mudela(fragment,verbatim,center)(
@@ -683,17 +684,17 @@
 em(keyword)s are words that have a special meaning to the parser of
 Mudela.  Because the parser must be able to distinguish the keywords
 from note names, they have to be preceded by a so-called escape
-character, the backslash, `code(\)'.  To separate the arguments from
+character, the backslash, `mycode(\)'.  To separate the arguments from
 any notes that might follow the arguments, you have to end your
 command with a semicolon.  An added benefit of this construction is
 that the commands stand out between your notes, because of the
 backslashes.
 
-So the general form actually is `code(\keyword argument argument ... ;)'
+So the general form actually is `mycode(\keyword argument argument ... ;)'
 Let us review these commands:
 
 description(
-dit(code(\clef) var(clefname)) This command sets the current clef for notation,
+dit(mymycode(\clef) var(clefname)) This command sets the current clef for notation,
   i.e., a clef symbol is printed and the notes following this command
   are shifted vertically.  The argument is a string, the name of the
   new clef. The default clef is the treble clef.
@@ -702,25 +703,25 @@
     \clef "treble"; c'4
     \clef "alto"; c'4    
   )
-dit(code(\key) var(pitch)) This command changes the current key signature.  The
+dit(mymycode(\key) var(pitch)) This command changes the current key signature.  The
   key signature is printed at the start of every line.  The argument
   is the name of the corresponding major key.  The key of C-minor can 
-  thus be specified as `code(\key es)'.
+  thus be specified as `mycode(\key es)'.
   
-dit(code(\keysignature) var(pitchlist))
+dit(mymycode(\keysignature) var(pitchlist))
 
 This command changes the current key signature.  Unlike the
-`code(\key)' command, this command can produce arbitrary key
+`mycode(\key)' command, this command can produce arbitrary key
 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(\keysignature bes es as)'.  The
-command `code(\keysignature fis es bis)' provides a more exotic
+of C-minor can be specified as `mycode(\keysignature bes es as)'.  The
+command `mycode(\keysignature fis es bis)' provides a more exotic
 example.
 
 
-dit(code(\time) var(numerator)code(/)var(denominator))
+dit(mymycode(\time) var(numerator)mycode(/)var(denominator))
   This command changes the current time signature.  LilyPond uses the
   time signature to
   calculate where to place the bars that start a measure.  These bars
@@ -736,17 +737,17 @@
   )
 
 
-dit(code(\cadenza) var(togglevalue)) When typesetting music without a
+dit(mymycode(\cadenza) var(togglevalue)) When typesetting music without a
 regular meter (such as an ad libitum cadenza), no bar lines should be
 printed.  In LilyPond you can achieve this by issuing the command
-`code(\cadenza 1)': it turns off the automatically
+`mycode(\cadenza 1)': it turns off the automatically
 generated bar lines.
 
-You switch them on again with `code(\cadenza 0)', and then a bar line
+You switch them on again with `mycode(\cadenza 0)', and then a bar line
 is printed.  LilyPond will act as if you are again at the start of a
 measure.
 
-dit(code(\bar) var(bartype))
+dit(mymycode(\bar) var(bartype))
   This command lets you print special bar
   lines and repeat symbols.  You can also use it to allow line breaks
   when entering cadenzas.  The argument var(bartype) is a string that
@@ -756,22 +757,22 @@
     \bar "|:"; c'4 \bar ":|:";    c'4  \bar ":|";  c'4 \bar "||";
     c'4 \bar "empty"; c'4 \bar "|.";
 )
-  The command `code(\bar "empty")' does not create any visible bar
+  The command `mycode(\bar "empty")' does not create any visible bar
   line, but it does tells LilyPond to allow a linebreak
-  at that position.  The `code(\bar)' command prints the specified
-  symbol immediately.  If you give a `code(\bar)' command at the end
+  at that position.  The `mycode(\bar)' command prints the specified
+  symbol immediately.  If you give a `mycode(\bar)' command at the end
   of a measure then
   the specified symbol replaces the automatic bar line; otherwise
   the specified symbol appears in the middle of the measure.   The
-    code(\bar) command does not affect metric structure.
+    mycode(\bar) command does not affect metric structure.
 
 
   
-dit(code(\partial) var(duration)) some music starts with a measure that
-isn't fully filled, a so-called upstep.  The code(\partial) command
+dit(mymycode(\partial) var(duration)) some music starts with a measure that
+isn't fully filled, a so-called upstep.  The mycode(\partial) command
 allows you to make
 upsteps. The argument is a duration similar to the duration of a note.
-The `code(\partial)' command cannot be used to generate partial
+The `mycode(\partial)' command cannot be used to generate partial
 measures in the middle of the music.  
 Example:
   mudela(fragment,verbatim)(
@@ -780,7 +781,7 @@
     [d'8 dis'] e' c''4 e'8 c''4 
   )
 
-  dit(code(\grouping) var(durationslist)) sets the metric structure of the measure.
+  dit(mymycode(\grouping) var(durationslist)) sets the metric structure of the measure.
     Its effect can best be shown by an example:
     mudela(fragment,verbatim)(
         \time 5/16;
@@ -793,7 +794,7 @@
     )
 
 In practice, you won't be needing this command very often: the
-grouping is switched automatically when you issue a code(\time)
+grouping is switched automatically when you issue a mycode(\time)
 command.  It is set to a combination of groups
 of 2 and 3 beats, with as many groups of
 3 as possible (in other words: 4/4 is divided in two times two beats
@@ -841,7 +842,7 @@
 together.
 
 If a piece of music is to be interpreted as a staff, then this can be
-expressed with the code(\type) construct.  The following input says
+expressed with the mycode(\type) construct.  The following input says
 ``the quarter note with pitch e should be put on a staff.''
 
 verb(
@@ -865,13 +866,13 @@
 This looks reasonable, but the effect of this input is not what you
 might expect (try it!).  When interpreting this chord LilyPond will
 start with the first entry.  She'll look for a (nameless) staff.  Such a
-staff is not found, so it is created.  On this staff the code(e) note
-is put.  When the second code(\type) entry is read, LilyPond will
+staff is not found, so it is created.  On this staff the mycode(e) note
+is put.  When the second mycode(\type) entry is read, LilyPond will
 start looking for a nameless staff.   The  staff that contains  the
-code(e) is found, and the code(g) is put there as well.
+mycode(e) is found, and the mycode(g) is put there as well.
 
-The correct solution is to label both code(\type) constructs with
-different names, for example code(trebleStaff) and code(bassStaff).
+The correct solution is to label both mycode(\type) constructs with
+different names, for example mycode(trebleStaff) and mycode(bassStaff).
 This makes LilyPond distinguish between them, and create two staffs:
 
 mudela(verbatim,fragment)(
@@ -885,7 +886,7 @@
 the clef of the second staff.  The bass clef will be taken care of in
 the next section. If you want a brace, then you have to tell LilyPond
 that the chord you just formed is to be interpreted as a so-called
-grand staff.  This is also done with the code(\type) command.
+grand staff.  This is also done with the mycode(\type) command.
 mudela(verbatim,fragment)(
   \type GrandStaff <
      \type Staff = treblestaff  e'4 
@@ -930,7 +931,7 @@
 
 If we want to put whole voices onto a staff, then we have to
 substitute sequential music for the single notes in the example from
-the previous section.  A code(\clef) command in the second piece of
+the previous section.  A mycode(\clef) command in the second piece of
 sequential
 music  will also set the clef in
 the bass staff.
@@ -979,7 +980,7 @@
 these components.  If these components aren't printed, it is still
 possible to print music:
 mudela()(\score{
-\melodic \relative c' {  \time 2/4; g'4 c,4 a'4 f4 e c d2 }
+\notes \relative c' {  \time 2/4; g'4 c,4 a'4 f4 e c d2 }
 \paper { 
   linewidth = -1.;
   Staff = \translator {
@@ -1003,7 +1004,7 @@
 
 mudela()(
 \score {
-  \melodic \relative c' {  \time 2/4; g'4 c,4 a'4 f4 e c d2 }
+  \notes \relative c' {  \time 2/4; g'4 c,4 a'4 f4 e c d2 }
   \paper{
   linewidth = -1.;
     Staff = \translator {
@@ -1021,7 +1022,7 @@
 the location within the measure of the notes:
 mudela()(
 \score {
-  \melodic \relative c' {  \time 2/4; g'4 c,4 a'4 f4 e c d2 }
+  \notes \relative c' {  \time 2/4; g'4 c,4 a'4 f4 e c d2 }
   \paper{
   linewidth = -1.;
     Staff = \translator {
@@ -1039,7 +1040,7 @@
 symbol:
 
 mudela()(\score{
-  \melodic\relative c' { \time 2/4; g'4 c,4
+  \notes\relative c' { \time 2/4; g'4 c,4
 a'4 f4 e c d2 } \paper {
   linewidth = -1.;
   Staff = \translator {
@@ -1060,7 +1061,7 @@
 know what the pitches of the notes above are.  So this is still not
 enough.  But suppose you see the following notation:
 mudela()(\score {
-  \melodic \relative c' {\clef alto;  \time 2/4; g'4 c,4 a'4 f4 e c d2 }
+  \notes \relative c' {\clef alto;  \time 2/4; g'4 c,4 a'4 f4 e c d2 }
 \paper {
   linewidth = -1.;
   Staff = \translator {
@@ -1099,56 +1100,56 @@
 The example focused mainly on on staffs, but a staff is not the only
 type of notation context.  Notation contexts may be nested: you can
 print polyphonic music by putting multiple `Voice' contexts in one
-`Staff' context.  The arguments of the code(\type) command (Staff,
+`Staff' context.  The arguments of the mycode(\type) command (Staff,
 GrandStaff) were in fact all names of different contexts.
 The notions of ``current clef'' and ``current position within the
 measure'' are all properties of notation contexts.  Commands like
-code(\clef) and code(\cadenza) change these properties.  
+mycode(\clef) and mycode(\cadenza) change these properties.  
 
 
 The following is a list of the contexts that are supported by
 LilyPond:
 description(
 
-dit(Voice) The code(Voice) context is a context that corresponds to a
+dit(Voice) The mycode(Voice) context is a context that corresponds to a
   voice on a staff.  This context handles the conversion of noteheads,
   dynamic signs, stems, beams, super- and subscripts, slurs, ties and rests
 
-dit(Staff) The code(Staff) context handles clefs, bar lines, keys,
-  accidentals.  A code(Staff) context can contain multiple code(Voice)
+dit(Staff) The mycode(Staff) context handles clefs, bar lines, keys,
+  accidentals.  A mycode(Staff) context can contain multiple mycode(Voice)
   contexts.
 
-dit(RhythmicStaff) The code(RhythmicStaff) context is like the staff,
+dit(RhythmicStaff) The mycode(RhythmicStaff) context is like the staff,
   but much simpler: the notes are printed on one line, and pitches are
-  ignored.  code(RhythmicStaff) can contain code(Voice) contexts.
+  ignored.  mycode(RhythmicStaff) can contain mycode(Voice) contexts.
 
-dit(GrandStaff) A code(GrandStaff) context contains code(Staff)
+dit(GrandStaff) A mycode(GrandStaff) context contains mycode(Staff)
   contexts, and it adds a brace to the output at the
   nop(left.)footnote(This is a major deficiency in the current
   implementation.    Currently stems,
   slurs and beams cannot be printed across two staffs.
 In reality, a grand staff is  a hybrid of one big staff and two stacked staffs.)
   
-  A code(GrandStaff) context can contain multiple
-  code(Staff)s. Typically, it will contain two code(Staff)s, one
+  A mycode(GrandStaff) context can contain multiple
+  mycode(Staff)s. Typically, it will contain two mycode(Staff)s, one
   treble staff, and one bass staff. The bar lines of the contained
   staffs are connected vertically.
 
-dit(StaffGroup) A code(StaffGroup) context contains code(Staff) or
-  code(Lyrics) contexts, and prints a bracket at the left.  The bar
+dit(StaffGroup) A mycode(StaffGroup) context contains mycode(Staff) or
+  mycode(Lyrics) contexts, and prints a bracket at the left.  The bar
   lines in the participating staffs are connected.
 
-dit(Lyrics) As its name suggests, The code(Lyrics) context deals with
+dit(Lyrics) As its name suggests, The mycode(Lyrics) context deals with
   typesetting lyrics.  This topic will be covered in
   bind(Section)ref(tutorial:lyrics).
   
-dit(Score) The code(Score) context is the toplevel context: no context can
-  contain a code(Score) context.  The code(Score) context handles the
+dit(Score) The mycode(Score) context is the toplevel context: no context can
+  contain a mycode(Score) context.  The mycode(Score) context handles the
   administration of time signatures.  It also makes sure that items
   such as clefs, time signatures, and key-signatures are aligned across staffs.
   
-  The code(Score) can contain code(Staff), code(StaffGroup), code(Lyrics), code(GrandStaff) and
-  code(RhythmicStaff) contexts.
+  The mycode(Score) can contain mycode(Staff), mycode(StaffGroup), mycode(Lyrics), mycode(GrandStaff) and
+  mycode(RhythmicStaff) contexts.
 
 COMMENT(do ChoireStaff)
 )
@@ -1174,8 +1175,8 @@
 properties that influence the conversion from music to notation.  A
 simple example of such a property is the clef: the type of clef partially
 determines the vertical position of note heads in a staff.  Some of
-these properties can be modified by commands such as code(\clef) and
-code(\time).   But there is more:  notation contexts  also have
+these properties can be modified by commands such as mycode(\clef) and
+mycode(\time).   But there is more:  notation contexts  also have
 properties are settable in a generic fashion.  We will demonstrate
 this feature by printing multiple voices on a staff.
 
@@ -1218,11 +1219,11 @@
 graphical object.  But the fact that all of the stems in a voice point
 in the same direction is not directly graphical.  Since this is a
 property shared by all the stems in the voice, it is logical to
-consider this property to be a property of the context code(Voice).
-And this is how it's done in LilyPond: the context code(Voice) has an
+consider this property to be a property of the context mycode(Voice).
+And this is how it's done in LilyPond: the context mycode(Voice) has an
 attribute whose value is the direction to use
 for stems.  You can change it to `up'
-by issuing the following phrase:footnote(The name code(ydirection) is
+by issuing the following phrase:footnote(The name mycode(ydirection) is
 no mistake.  The property also controls the up/down directions of
 super-/subscripts, slurs, ties, etc.)
 
@@ -1231,9 +1232,9 @@
 )
 
 This command should be read as ``change the property called
-code(ydirection) within the current code(Voice) context to the value
-code(-1).''  For the property code(ydirection) the value code(1) means
-`up', and code(-1) means `down'.   The proper way to code the
+mycode(ydirection) within the current mycode(Voice) context to the value
+mycode(-1).''  For the property mycode(ydirection) the value mycode(1) means
+`up', and mycode(-1) means `down'.   The proper way to code the
 polyphonic example is given in bind(Figure)ref(tutorial:multi-voice-fig).
 
 latexcommand(\begin{figure}[h])
@@ -1253,7 +1254,7 @@
 
 Other properties can also be set, and they can be within different
 contexts.  In general, you can set a property by specifying
-code(\property) var(contexttype)code(.)var(propertyname) code(=)
+mycode(\property) var(contexttype)mycode(.)var(propertyname) mycode(=)
 var(value).  Both var(ContextType), var(PropertyName) and var(Value)
 should be strings.
 
@@ -1269,8 +1270,8 @@
 Traditionally, some chords are shifted horizontally to print if this many
 voices have to be printed.
 LilyPond can also do this, and the property that controls the
-horizontal shifting is called code(hshift).  The notes in a
-code(Voice) context that has code(hshift) set to a true value (i.e.,
+horizontal shifting is called mycode(hshift).  The notes in a
+mycode(Voice) context that has mycode(hshift) set to a true value (i.e.,
 non-zero or non-empty), will be shifted horizontally in the case of a
 collision.  The following example demonstrates the effect.
 
@@ -1303,13 +1304,13 @@
 durations.  Previously we only entered note names, so for entering
 lyrics we have to instruct LilyPond that what we enter are not note
 names but words---or rather: strings.  This instruction is the keyword
-code(\lyric).  After entering this keyword you can enter a musical
-construct---sequential music, simultaneous music, code(\type)
+mycode(\lyric).  After entering this keyword you can enter a musical
+construct---sequential music, simultaneous music, mycode(\type)
 entries, etc.--- but with syllables in stead of pitches.  For example:
 verb( \lyric { 'got8 me on my knees4, Le-8 lie! })
 
-The effect of code(\lyric) can be compared with the effect of the
-doublequote character, code("), for it also changes the lexical
+The effect of mycode(\lyric) can be compared with the effect of the
+doublequote character, mycode("), for it also changes the lexical
 meaning of spaces and characters.  This mode is another example of a
 handy input feature of the language.
 
@@ -1317,9 +1318,9 @@
 out that lyrics need different treatment than notes.  As a result, the
 default conversion will try to put the text you entered as note heads
 onto a staff, and this will fail.  This default must be overriden with
-a code(\type) keyword.  Printing syllables of text in a line is done
-by a context called code(Lyrics).  You can select this context with
-the code(\type) keyword.  Here is a simple example:
+a mycode(\type) keyword.  Printing syllables of text in a line is done
+by a context called mycode(Lyrics).  You can select this context with
+the mycode(\type) keyword.  Here is a simple example:
 
 mudela(fragment,verbatim)(
 	\type Lyrics \lyric { 'got8 me on my knees,4 Le-8 lie! })
@@ -1336,8 +1337,8 @@
 The strings that makes up each syllable in the lyrics block are passed
 along to TeX() verbatim, so if you are proficient with TeX() you can
 do various nifty things.  Just keep in mind that a syllable either
-starts with a letter (a character in the range `code(a)' to `code(z)'
-or `code(A)' to `code(Z)'), or it is a string enclosed quotes. It ends
+starts with a letter (a character in the range `mycode(a)' to `mycode(z)'
+or `mycode(A)' to `mycode(Z)'), or it is a string enclosed quotes. It ends
 with either a number for the duration, or a space.  A last feature
 that should be mentioned is the space-lyric: if you want to enter
 a single ``syllable'' that consists of multiple words, i.e., words
@@ -1373,13 +1374,13 @@
 you in the introduction.  Mudela has a hierarchical structure for we
 have seen that sequential and simultaneous music can be nested.
 Mudela also has other `blocks' that can be nested.  The general syntax
-for a block is code(\keyword { ... }).
+for a block is mycode(\keyword { ... }).
 
 When you run LilyPond, what happens is that you define music, and
 specify one (or more) conversions to apply to that music, for example
 a conversion to notation.  This is done by putting the definition of
 the music and the definition of the conversion together in a
-code(\score) block, e.g.,
+mycode(\score) block, e.g.,
 verb(
 \score {
         % ... music ...
@@ -1390,26 +1391,26 @@
 of the previous examples.  The precise context reads thus:
 verb(
 \score {
-        \melodic { ... }
+        \notes { ... }
         \paper {}
 })
 On the ellipsis, you entered what shown as the example input.
 You can see that in the
-above example, the code(\melodic { ... }) forms the music, the
-code(\paper {}) is a conversion to paper (notation, that is).  The
-code(\paper) definition is copied from a default definition
+above example, the mycode(\notes { ... }) forms the music, the
+mycode(\paper {}) is a conversion to paper (notation, that is).  The
+mycode(\paper) definition is copied from a default definition
 (which is in the initialisation file file(paper16.ly)).
 The paper part also contains
 the definition of the contexts.
 
-The keyword code(\melodic) is analogous to the code(\lyric) keyword.  It
+The keyword mycode(\notes) is analogous to the mycode(\lyric) keyword.  It
 will switch the tokenizer into a mode that interprets plain words as
 note names.  If it can't recognize the words as a note name, it will
 assume that they are strings.  That is the reason why you can write
-code(\clef bass) in stead of code(\clef "bass"); most of the strings
-in code(\melodic) mode can be written without quotes.
+mycode(\clef bass) in stead of mycode(\clef "bass"); most of the strings
+in mycode(\notes) mode can be written without quotes.
 
-The braces that you see after the code(\melodic) keyword are the
+The braces that you see after the mycode(\notes) keyword are the
 braces that are around sequential music.  Because of these braces, the
 sequences of notes in our simple examples were sequential (and not
 simultaneous).  As a result the notes were printed from left to right,
@@ -1421,15 +1422,15 @@
 Now that we are comfortable with the toplevel entries in a mudela
 file, we can investigate some more of the recreations on toplevel, in
 particular em(identifiers).  Generally you can define an identifier by
-entering code(identifierName = ... )
+entering mycode(identifierName = ... )
 where there can be a variety of things on the ellipsis.
 
 Here is a (partial) list of what you can abbreviate with identifiers
 at top-level.
 itemize(
-it()The code(\score) block
-it()The code(\paper) block
-it()The code(\midi) block (to be explained in
+it()The mycode(\score) block
+it()The mycode(\paper) block
+it()The mycode(\midi) block (to be explained in
   bind(Section)ref(tutorial:sound))
 it()Music (sequential music, simultaneous music etc.)
 it()Durations
@@ -1440,12 +1441,12 @@
 )
 
 When you refer
-to the abbreviated entity, you must precede code(identifierName)
-with a backslash, i.e., code(\identifierName).  For example:
+to the abbreviated entity, you must precede mycode(identifierName)
+with a backslash, i.e., mycode(\identifierName).  For example:
 mudela(verbatim)(
-  czerny = \melodic { [c16 g e g] }
+  czerny = \notes { [c16 g e g] }
   \score {
-    \melodic \type GrandStaff <
+    \notes \type GrandStaff <
       { c''2 g''2 }
       { \clef bass; \czerny \czerny \czerny \czerny}
     >
@@ -1459,8 +1460,8 @@
 
 
 Another interesting feature of this example are the assignments within
-the paper block.  Some blocks, such as code(\paper), have a scope of
-their own.  In the case of the code(\paper) block, these variables
+the paper block.  Some blocks, such as mycode(\paper), have a scope of
+their own.  In the case of the mycode(\paper) block, these variables
 influence the characteristics of the output.  As is shown, you can
 tune quantities like the stemlength, and enter simple expressions.
 The purpose of the negative linewidth is to prevent the music from
@@ -1470,19 +1471,19 @@
 sensible defaults, there usually is no need to tune these values.
 
 Recall the properties of a context, that could be set with
-code(\property).  It is a very general mechanism to tune the output of
+mycode(\property).  It is a very general mechanism to tune the output of
 the music, that is neatly separated from the real music.
 Unfortunately, it is not convenient to type or read, and the precise
 effect of a setting property isn't always apparent from its
 definition.  To remedy this, we can use an identifier to capture the
-meaning of a code(\property).
+meaning of a mycode(\property).
 
 mudela(verbatim)(
 stemup = \property Voice.ydirection = "1"
 stemdown = \property Voice.ydirection = "-1"
 shift = \property Voice.hshift = "1"
 \score {
-  \type "Staff" \melodic <
+  \type "Staff" \notes <
     \type "Voice" =  "one"  {
       \stemup
       r4 as'4 () as'4 g'4 }
@@ -1499,7 +1500,7 @@
 }
 )
 
-Several abbreviations like code(\stemup) are defined in the
+Several abbreviations like mycode(\stemup) are defined in the
 standard initialisation file file(property.ly).  Setting or changing
 context properties can have a similar effect as the commands that were
 discussed in bind(Section)ref(sec:commands).  Don't be fooled by the
@@ -1508,9 +1509,9 @@
 and they have to be terminated by semicolons.
 
 You can also use identifiers to break up the heavy nesting that can occur
-in the code(\score) block.  Another useful application is
+in the mycode(\score) block.  Another useful application is
 parametrisation of the music: if you use identifiers in the
-code(\score) block, you can make variations of the music by simply
+mycode(\score) block, you can make variations of the music by simply
 redefining those identifiers.  One particular application of this is
 part extraction: by using identifiers and redefining them, one can
 print extracted parts and a full orchestral score from the same
@@ -1534,7 +1535,7 @@
 this the only thing that can be tuned at this
 time.  This is a limitation: the tempo of music can vary throughout
 the music.) for the performance.  The syntax for the tempo is
-code(\tempo )var(duration) = var(beatsperminute);), for example:
+mycode(\tempo )var(duration) = var(beatsperminute);), for example:
 verb(
 \score {
    ...music...
@@ -1565,7 +1566,7 @@
 context should look like:
 itemize(
 it()It should be part of the ``notation output definition,'' i.e., the
-  code(\paper) block
+  mycode(\paper) block
 it()
   It should contain a specification of what other contexts may be contained
   in the context we're defining.
@@ -1595,29 +1596,29 @@
 
   This is encoded by the 
 
-The code(\translator) keyword opens the block for translation (or
-context) definition.  The code(\type) keyword explains to Lily that
+The mycode(\translator) keyword opens the block for translation (or
+context) definition.  The mycode(\type) keyword explains to Lily that
 the context should be formed by taking an (empty) instance of
-code(Engraver_group_engraver).  The code(Engraver_group_engraver) is a
-C++ class from the source code to Lily.  The code(\accepts) entries
+mycode(Engraver_group_engraver).  The mycode(Engraver_group_engraver) is a
+C++ class from the source code to Lily.  The mycode(\accepts) entries
 explain what kind of contexts this context could contain.  If we were
 to define a context for a staff, the definition would typically
-contain code(\accepts "Voice";).
+contain mycode(\accepts "Voice";).
 
-The code(\consists) entries specify which notation constructs should
+The mycode(\consists) entries specify which notation constructs should
 be handled. This needs a little explanation: LilyPond contains the
 code for quite a large number of basic building blocks for notation
 generation, and each building block handles only one notation
 construct.  The name of such a building block is `engraver'.  You can
 specify which notation construct a context should handle by specifying
-which engravers should be part of the context.  The code(\consists
-"Foobar") entry really means ``add an instance of code(Foobar) to the
+which engravers should be part of the context.  The mycode(\consists
+"Foobar") entry really means ``add an instance of mycode(Foobar) to the
 translation group.''
 
 
 For example if this context should print time signatures, the definition
-should include `code(\consists "Time_signature_engraver";)'.  Again
-code(Time_signature_engraver) is a class from the source code of LilyPond.
+should include `mycode(\consists "Time_signature_engraver";)'.  Again
+mycode(Time_signature_engraver) is a class from the source code of LilyPond.
 
 
 
@@ -1629,14 +1630,14 @@
 (time signature, rhythmic grouping) is synchronised across each staff.  In
 LilyPond this is expressed by having only one registration for timing
 information for all staffs.  To be precise, there is only one
-code(Timing_engraver), and it is located in the top level context, the
-code(Score) context.
+mycode(Timing_engraver), and it is located in the top level context, the
+mycode(Score) context.
 
-All staffs use the information in the global code(Timing_engraver)
+All staffs use the information in the global mycode(Timing_engraver)
 for generating bar lines and time signatures.  In polymetric music, this timing
 information can be different for every staff, so we should redefine
-the code(Staff) context to include and the code(Score) context to exclude the
-code(Timing_engraver).  
+the mycode(Staff) context to include and the mycode(Score) context to exclude the
+mycode(Timing_engraver).  
 
 mudela(verbatim)(
 polymetricpaper = \paper {
@@ -1667,7 +1668,7 @@
   }
 }
 \score {
-  \melodic <
+  \notes <
     \type Staff = one { \time 2/4; c'4 c'4 c'4 c'4 c'4 c'4 }
     \type Staff = two { \time 3/4; c'4 c'4 c'4 c'4 c'4 c'4 }
   >
@@ -1677,7 +1678,7 @@
 }
 )
 
-As you can see, we used the identifier code(polymetricpaper) to break
+As you can see, we used the identifier mycode(polymetricpaper) to break
 up the large score block.  More of these context definitions appear in
 the standard initialisation file file(engraver.ly).
 
@@ -1692,8 +1693,8 @@
 
 By naming other contexts that you create, you can reference other contexts
 than the current context from within the music.  For example, from within the music that you
-enter for staff code(One), one could enter a small piece of music,
-and send it to staff code(Two), e.g.,
+enter for staff mycode(One), one could enter a small piece of music,
+and send it to staff mycode(Two), e.g.,
 mudela(fragment,verbatim)(
   <
     \type Staff = one { c''4 \type Staff = two { c4 c4 } c''4 }
@@ -1719,15 +1720,15 @@
 demonstrate this.  The example makes heavy use of space rests: a space
 rest takes up time, like a rest does, but it doesn't print anything.
 It can be used as a placeholder, to attach articulation marks to.  It
-is entered as a note with the name code(s).
+is entered as a note with the name mycode(s).
 
 mudela(verbatim)(
-  bach =  \melodic { [c16 g e' d'] [e' g e' g] }
+  bach =  \notes { [c16 g e' d'] [e' g e' g] }
   
-  staffStuff = \melodic { \clef bass; \time 4/4; s1 \bar "|."; }
+  staffStuff = \notes { \clef bass; \time 4/4; s1 \bar "|."; }
   
-  slursOne = \melodic { s16( s s s s16 s s )s }
-  slursTwo = \melodic { s16-. s s() s s16() s  s ()s }
+  slursOne = \notes { s16( s s s s16 s s )s }
+  slursTwo = \notes { s16-. s s() s s16() s  s ()s }
 
   \score{
     { < \type Voice = celloVoice { \bach \bach }
@@ -1745,8 +1746,8 @@
 )
 
  The slurs that you define should be put on the music that is defined
-by the code(\bach) identifier.  By labeling a code(Voice) context, and
-directing both the articulation and the notes to that same code(Voice)
+by the mycode(\bach) identifier.  By labeling a mycode(Voice) context, and
+directing both the articulation and the notes to that same mycode(Voice)
 context, the articulation is put over the right notes.
 
 
@@ -1757,16 +1758,16 @@
 sketched earlier. )
 One of the things that you can do with music is
 em(transposing) it.  If you want to transpose a piece of music, then
-you should prefix the keyword code(\transpose) along with the pitch
+you should prefix the keyword mycode(\transpose) along with the pitch
 (relative to the central C) for the transposition.footnote(the
-code(\type Staff) is to make sure that no separate staffs are created
-for the code(\scale) and code(\transpose cis' \scale) part.)
+mycode(\type Staff) is to make sure that no separate staffs are created
+for the mycode(\scale) and mycode(\transpose cis' \scale) part.)
 
 
 mudela(verbatim)(
-scale = \melodic \relative c' { [c8 d e f] }
+scale = \notes \relative c' { [c8 d e f] }
 \score {
-  \melodic {
+  \notes {
     \type Staff { \scale \transpose cis'  \scale }
     }
   \paper { linewidth = -1.0; }
@@ -1776,25 +1777,25 @@
 sect(Staff switching)
 
 We have seen that contexts can be nested.  This means that they form a
-tree.  It is possible to edit this tree: for example, a code(Voice)
-context can be taken out of a code(Staff) context, and put into
+tree.  It is possible to edit this tree: for example, a mycode(Voice)
+context can be taken out of a mycode(Staff) context, and put into
 another.  This has the effect of the voice switching staffs (something
 that often happens in keyboard music).  The syntax for this operation
-with these particular contexts is code(\translator Staff = newStaffName).
+with these particular contexts is mycode(\translator Staff = newStaffName).
 
 The effect is analogous to the first example in section
-ref(tutorial:urtext), but with the code(\translator) construction it
+ref(tutorial:urtext), but with the mycode(\translator) construction it
 is possible to split the real music and the commands that determine in
 which staff the music is printed.  For example:
 
 mudela(verbatim)(
 
 % real music
-aVoice = \type Voice = voiceA \melodic { c''4 c4 c4 c''4 }
-bVoice = \type Voice = voiceB \melodic { g,4 g,4 g,4 g,4  }    
+aVoice = \type Voice = voiceA \notes { c''4 c4 c4 c''4 }
+bVoice = \type Voice = voiceB \notes { g,4 g,4 g,4 g,4  }    
 
 % staff switching stuff
-switch = \type Voice = voiceA \melodic { s4 \translator Staff = staffB s4
+switch = \type Voice = voiceA \notes { s4 \translator Staff = staffB s4
     		   s4 \translator Staff = staffA s4 }
 
 \score {
@@ -1821,8 +1822,8 @@
 )
 
 To support this notion, Mudela allows you to modify the duration of a
-note by multiplication or division.  A code(c'4) note that would be in  a
-triplet is written as code(c'4*2/3).  If you sequence a few of these
+note by multiplication or division.  A mycode(c'4) note that would be in  a
+triplet is written as mycode(c'4*2/3).  If you sequence a few of these
 notes, you get a triplet.footnote(We added a normal staff in the example to
 show the difference.)
 mudela(fragment,verbatim)(
@@ -1831,10 +1832,10 @@
 
 LilyPond knows that these notes are no normal eighth notes, but the
 reader doesn't yet.  To help the reader a beam or a bracket with a `3'
-should be printed.  The special beam command `code([2/3)' and the
-matching close beam `code(]1/1)' will take care of that, and
-they also abbreviate the code(*2/3) part.  If you want brackets in
-stead of beams, you can use `code(\[2/3])' and `code(\]1/1)'.
+should be printed.  The special beam command `mycode([2/3)' and the
+matching close beam `mycode(]1/1)' will take care of that, and
+they also abbreviate the mycode(*2/3) part.  If you want brackets in
+stead of beams, you can use `mycode(\[2/3])' and `mycode(\]1/1)'.
 mudela(fragment,verbatim)(
 < \type Staff = staffA {
     [2/3 c'8 c'8 c'8 ]1/1
@@ -1854,8 +1855,8 @@
     [c''8 c''8 c''8 c''8 c''8 c''8 c''8] } >
 )
 
-For your convenience, code([2/3) can be further abbreviated to code([/3), and
-you can abbreviate code(]1/1) on the closing beam marker to code(]/1).
+For your convenience, mycode([2/3) can be further abbreviated to mycode([/3), and
+you can abbreviate mycode(]1/1) on the closing beam marker to mycode(]/1).
 
 mudela(fragment,verbatim)(
 < \type Staff = staffA {
@@ -1865,10 +1866,10 @@
 )
 
 
-bf(Important) the construct with code([/3) and
-code([/1) is a hack that sets a mode in the parser.  This means that
-verb(id = \melodic { c8 c8 c8 }
-notATriplet =\melodic { [2/3 \id ]1/1 })
+bf(Important) the construct with mycode([/3) and
+mycode([/1) is a hack that sets a mode in the parser.  This means that
+verb(id = \notes { c8 c8 c8 }
+notATriplet =\notes { [2/3 \id ]1/1 })
 does not produce a triplet.  It will hopefully
 soon be replaced by a construction that mixes more elegantly with the
 grammar for Music.
@@ -1882,7 +1883,7 @@
 conventional music are small.  Therefore, it makes sense to leave out
 the quotes when the interval is small.  We have built a mode that does
 exactly this.  It is called the relative mode for octaves.  You can
-switch it on by entering code(\relative).  Then LilyPond will
+switch it on by entering mycode(\relative).  Then LilyPond will
 interpret every note as if they mean the note with the same name
 closest to the previous.  You have to specify the first pitch because
 the first note of a list obviously has no predecessor.  So, you can
@@ -1904,7 +1905,7 @@
   }
 )
 
-LilyPond converts any music with code(\relative) prepended to absolute
+LilyPond converts any music with mycode(\relative) prepended to absolute
 music immediately when it is read. Internally it is stored it in
 absolute pitches.  Since the tutorial mainly deals with how to specify
 musical information, and not how to enter it conveniently, the
@@ -1930,14 +1931,14 @@
 Briefly introduced before, identifiers are your biggest help in structurising
 a large piece of music.  As an example, we'll consider a string quartet.  
 In short, it will look like this: verb(
-    global = \melodic{ }
-    violinoOne = \melodic \relative c { .. }
-    violinoTwo = \melodic \relative c { .. }
-    viola = \melodic \relative c { .. }
-    violoncello = \melodic \relative c { .. }
+    global = \notes{ }
+    violinoOne = \notes \relative c { .. }
+    violinoTwo = \notes \relative c { .. }
+    viola = \notes \relative c { .. }
+    violoncello = \notes \relative c { .. }
 )
 
-The code(\global) part contains everything that is global, i.e., the
+The mycode(\global) part contains everything that is global, i.e., the
 same, for each instrument.  This may include time signature, key, repeat
 signs, different bar types, time signature- and key changes, rehearsal
 marks, etc.
@@ -1959,7 +1960,7 @@
 subsect(Including Mudela files)
 ref(subsect:include)
 
-You can include other Mudela files  with the command code(\include):
+You can include other Mudela files  with the command mycode(\include):
 verb(
 \include "paper13.ly"
 \score {
@@ -1982,7 +1983,7 @@
 text: that is a job best left to TeX().  But you can pass messages to
 TeX() from the input file.   You can  write TeX() macros to handle
 these messages.
-To do this, you add a code(\header) block
+To do this, you add a mycode(\header) block
 to your input file.  The format is quite simple,
 
 verb(
@@ -1994,15 +1995,15 @@
 })
 
 When  the results of the music typesetting are output, the contents of
-code(\header) are also up into the TeX() file.  Tools like
-code(ly2dvi) can use this information to generate pretty titling for
-your input file. Consult the manual page of code(ly2dvi) for more
+mycode(\header) are also up into the TeX() file.  Tools like
+mycode(ly2dvi) can use this information to generate pretty titling for
+your input file. Consult the manual page of mycode(ly2dvi) for more
 details.
 
 
-The code(\header) block should be at toplevel in mudela, and
+The mycode(\header) block should be at toplevel in mudela, and
 preferably at the top of the file.  If you have an input file  with
-multiple code(\score) blocks, you should add a header to every score,
+multiple mycode(\score) blocks, you should add a header to every score,
 describing the different sub parts of the music piece, eg.
 
 
@@ -2022,7 +2023,7 @@
     }
 )
 
-If you want you can also put the code(\header) block at the top of the
+If you want you can also put the mycode(\header) block at the top of the
 input file; it will then be put into every output file automatically.
 This will make it clear what the file contains as soon as you open it.
 
diff -urN ../lilypond-1.0.8/Documentation/topinfo.yo ./Documentation/topinfo.yo
--- ../lilypond-1.0.8/Documentation/topinfo.yo	Thu May 14 10:38:21 1998
+++ ./Documentation/topinfo.yo	Thu Sep 17 13:35:11 1998
@@ -1,32 +1,44 @@
-COMMENT(
-URG
-don't try to make html from this
-)
+COMMENT( URG don't try to make html from this)
+
 whentexinfo(
-nodetext(Your Rights.)
+
+nodetext(Your Rights.)  COMMENT(set different text)
 chapter(Copying)
 LilyPond is Free Software.  See file(COPYING) for details.
 
 
 COMMENT(prepare for texinfoing manpages)
 redef(manpage)(5)()
-redef(manpagename)(2)(nodeprefix()nodetext(ARG2)chapter(ARG1)nodeprefix(ARG1))
+redef(manpagename)(2)(nodetext(ARG2)chapter(ARG1))
 redef(manpageauthor)(0)(sect(Authors))
 redef(manpagesection)(1)(sect(ARG1))
 
+COMMENT(prepare for texinfoing articles)
+redef(article)(3)(chapter(ARG1))
+redef(latexlayoutcmds)(1)()
+redef(htmlbodyopt)(2)()
+
 COMMENT(redef(includefile)(1)(INCLUDEFILE(man/ARG1)))
 includefile(programs.yo)
 
-COMMENT(prepare for texinfoing articles)
-redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(ARG1))
-redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(Tutorial))
+redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(Tutorial ))
+COMMENT(yodl2texinfo should be able to cope now, although ugly...)
+redef(article)(3)(chapter(ARG1))
 
 redef(includefile)(1)(INCLUDEFILE(tex/ARG1))
 includefile(tutorial.yo)
 
-COMMENT(prepare for texinfoing articles)
-redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(ARG1))
-redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(Mutopia))
+redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(Refman ))
+COMMENT(yodl2texinfo should be able to cope now, although ugly...)
+redef(article)(3)(chapter(ARG1))
+
+redef(includefile)(1)(INCLUDEFILE(tex/ARG1))
+includefile(refman.yo)
+
+redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(Mutopia ))
+COMMENT(yodl2texinfo should be able to cope now, although ugly...)
+redef(article)(3)(chapter(ARG1))
+
 redef(includefile)(1)(INCLUDEFILE(ARG1))
 includefile(mutopia.yo)
 
diff -urN ../lilypond-1.0.8/NEWS ./NEWS
--- ../lilypond-1.0.8/NEWS	Mon Sep 14 17:52:16 1998
+++ ./NEWS	Thu Sep 17 18:03:26 1998
@@ -1,3 +1,37 @@
+
+(need to fix pictures. I know)
+
+pl 9
+	
+pl 8.uu1
+	- junked \staff, \multi
+	- bf Music_list::Music_list (Music_list const&)
+	- AC_SUBST(PATHSEP,DIRSEP)
+	- generate Documentation/tex/out/*.bib (AM)
+	- a4 fixes (AM)
+	- bf: metafont-*.make
+	- parser.yy: intlist mods. (mudela 1.0.2)
+	- \melodic -> \notes (mudela 1.0.3)
+	- typo: calcalute_dependencies ()
+
+pl 8.jcn3
+	- gif -> png
+	    * ps-to-pngs.sh
+	    * stepmake
+	    * website
+	    * yodl-1.31.4 (to be released)
+	- target 'texinfo' -> 'info'
+
+pl 8.jcn2
+	- more doco in texinfo (with yodl pl3)
+	- bf's: package-diff
+
+pl 8.jcn1
+ 	- removed tutorial from texinfo, yodl2texinfo is still rather broken
+ 	- bf: setlocale NUMERIC to 'C'
+ 	- removed ugly space from print-dimen
+
+*******
 pl 8
 	- make website fixes.
 
diff -urN ../lilypond-1.0.8/TODO ./TODO
--- ../lilypond-1.0.8/TODO	Mon Sep 14 11:10:34 1998
+++ ./TODO	Thu Sep 17 14:01:32 1998
@@ -7,7 +7,7 @@
 Most of the items are marked in the code as well, with full explanation. 
 grep for TODO and ugh/ugr/urg
 
-	* egcs-1.1a support
+	* egcs-1.1 support
 
 	* fix LOCALE settings, and \def\foo{2,000pt} output
 
@@ -28,6 +28,10 @@
 
 	* abbrev -> tremolo
 
+	* junking \skip req in lyrics
+
+	* \shape 1st dim skipped? 
+
 	* Language:
 	- general plet mechanism.
 
@@ -40,12 +44,13 @@
 	- \type -> \context ?
 	- \translator -> ?
 	- fix \partial 
-	- \melodic -> \notes
 	- \bla {} vs \bla ; 
 	- mix engraver hacking with music ?
 	- \once\property  KEY = VAL
 	- \addtranslator, \removetranslator
 	- junk ^ and _ for scripts
+	- junk _ for lyrics.
+	- abstract grammar.
 
 	* install TeX stuff into tex/generic directory.
 
diff -urN ../lilypond-1.0.8/VERSION ./VERSION
--- ../lilypond-1.0.8/VERSION	Mon Sep 14 17:51:33 1998
+++ ./VERSION	Thu Sep 17 18:03:26 1998
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
-PATCH_LEVEL=8
+PATCH_LEVEL=9
 MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
diff -urN ../lilypond-1.0.8/aclocal.m4 ./aclocal.m4
--- ../lilypond-1.0.8/aclocal.m4	Mon Sep 14 18:00:15 1998
+++ ./aclocal.m4	Thu Sep 17 13:46:23 1998
@@ -7,6 +7,7 @@
     # -O is necessary to get inlining
     OPTIMIZE=""
     CXXFLAGS=${CXXFLAGS:-""}
+    CFLAGS=${CFLAGS:-""}
     checking_b=yes
     optimise_b=no
     profile_b=no
@@ -264,8 +265,10 @@
     AC_SUBST(LN)
     AC_SUBST(LN_S)
     AC_SUBST(INSTALL)
-   AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}')
-     AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}')
+    AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}')
+    AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}')
+    AC_SUBST(PATHSEP)
+    AC_SUBST(DIRSEP)
   
    
     AC_STEPMAKE_DATADIR
diff -urN ../lilypond-1.0.8/buildscripts/mutopia-index.py ./buildscripts/mutopia-index.py
--- ../lilypond-1.0.8/buildscripts/mutopia-index.py	Thu May 14 10:38:21 1998
+++ ./buildscripts/mutopia-index.py	Thu Sep 17 13:57:29 1998
@@ -115,7 +115,7 @@
 	    
 	list_item(ex + ex_ext + '.txt', 'The input')
 	for pageno in range(1,100):
-	    f  = ex + '-page%d.gif' % pageno
+	    f  = ex + '-page%d.png' % pageno
 	    if not file_exist_b (f):
 		break
 	    list_item(f, 'The output (picture, page %d)' % pageno)
diff -urN ../lilypond-1.0.8/buildscripts/ps-to-gifs.sh ./buildscripts/ps-to-gifs.sh
--- ../lilypond-1.0.8/buildscripts/ps-to-gifs.sh	Thu May 14 10:38:21 1998
+++ ./buildscripts/ps-to-gifs.sh	Thu Sep 17 13:35:59 1998
@@ -1,14 +1,16 @@
 #!/bin/sh
-# ps-to-gifs, convert PS to multiple gifs
-  
+# ps-to-gifs, convert PS to multiple gifs or other bitmaps
+
 usage()
 {
     cat <<EOF
+Convert PS to multiple gifs or other bitmaps
 Usage: ps-to-gifs.sh [OPTION]... [FILE]
 Options:
   -h, --help         this help
   -c, --crop         crop output
   -o, --output=NAME  set output base
+  -p, --png          convert to png
   -t, --transparent  change white to transparent
 EOF
 }
@@ -18,6 +20,8 @@
     exit 2;
 fi
 CROP=cat
+GIF=gif
+PNMTOGIF=ppmtogif
 
 while [ $# -gt 0 ]; do
 opt=$1
@@ -37,6 +41,10 @@
         ;;
     --o*=*) OUTFILE=`echo $opt | sed -e s/"^.*="//`
         ;;
+    -p|--p*)
+	GIF=png
+	PNMTOGIF=pnmtopng
+	;;
     -*)
         echo "ps-to-gifs: unknown option: \`$opt'"
 	exit 1
@@ -54,24 +62,24 @@
 if [ "x$OUTFILE" = "x" ]; then
 	BASE=`dirname $FILE`/`basename $FILE .ps`
 else
-	BASE=`dirname $OUTFILE`/`basename $OUTFILE .gif`
+	BASE=`dirname $OUTFILE`/`basename $OUTFILE .$GIF`
 fi
 
 # urg, pipe breaks
-rm -f $BASE{.ppm,.gif} $BASE-page*{.ppm,.gif}
+rm -f $BASE{.ppm,.$GIF} $BASE-page*{.ppm,.$GIF}
 
 # generate the pixmap at twice the size, then rescale (for antialiasing)
 cat $FILE | gs -sDEVICE=ppmraw -sOutputFile="$BASE-page%d.ppm" -r200 -dNOPAUSE - -c quit $FILE
 # quant is soo slow
-# cat $PPMFILE | ppmquant 2 | pnmscale 0.3333 | pnmcrop | ppmtogif $color > $OUTFILE
+# cat $PPMFILE | ppmquant 2 | pnmscale 0.3333 | pnmcrop | $PNMTOGIF $color > $OUTFILE
 PPMS=`ls $BASE*ppm`
 for i in $PPMS; do
-    o=`dirname $i`/`basename $i .ppm`.gif
-    cat $i | pnmscale 0.5 | $CROP | ppmtogif $color > $o
+    o=`dirname $i`/`basename $i .ppm`.$GIF
+    cat $i | pnmscale 0.5 | $CROP | $PNMTOGIF $color > $o
     rm $i
 done
 
 if [ "x$OUTFILE" != "x" ]; then
-	mv $BASE-page1.gif $BASE.gif
+	mv $BASE-page1.$GIF $BASE.$GIF
 fi
 
diff -urN ../lilypond-1.0.8/buildscripts/ps-to-pngs.sh ./buildscripts/ps-to-pngs.sh
--- ../lilypond-1.0.8/buildscripts/ps-to-pngs.sh	Thu Jan  1 00:00:00 1970
+++ ./buildscripts/ps-to-pngs.sh	Thu Sep 17 13:35:59 1998
@@ -0,0 +1,4 @@
+#!/bin/sh
+# ps-to-pngs, convert PS to multiple pngs
+  
+ps-to-gifs --png $*
diff -urN ../lilypond-1.0.8/config.make.in ./config.make.in
--- ../lilypond-1.0.8/config.make.in	Mon Sep 14 17:51:33 1998
+++ ./config.make.in	Thu Sep 17 13:35:59 1998
@@ -48,6 +48,7 @@
 LN = @LN@
 LN_S = @LN_S@
 MSGFMT = @MSGFMT@
+PATHSEP = @PATHSEP@
 PERL = @PERL@
 PYTHON = @PYTHON@
 TAR= @TAR@
@@ -60,5 +61,4 @@
 YODL2TEXINFO= @YODL2TEXINFO@
 YODL2TXT= @YODL2TXT@
 ZIP = @ZIP@
-PATHSEP = @PATHSEP@
 
diff -urN ../lilypond-1.0.8/init/book-fragment.ly ./init/book-fragment.ly
--- ../lilypond-1.0.8/init/book-fragment.ly	Thu May 14 10:38:21 1998
+++ ./init/book-fragment.ly	Thu Sep 17 14:28:49 1998
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
 	
-\version "1.0.1";
+\version "1.0.3";
 
 
 \include "declarations.ly"
@@ -8,7 +8,7 @@
 \include "paper16.ly"
 
 \score { 
-  \melodic {
+  \notes {
     \maininput
   }
   \paper { \paper_sixteen
diff -urN ../lilypond-1.0.8/init/book-init.ly ./init/book-init.ly
--- ../lilypond-1.0.8/init/book-init.ly	Thu May 14 10:38:21 1998
+++ ./init/book-init.ly	Thu Sep 17 14:28:49 1998
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
 	
-\version "1.0.1";
+\version "1.0.3";
 
 
 \include "declarations.ly";
diff -urN ../lilypond-1.0.8/init/center-fragment.ly ./init/center-fragment.ly
--- ../lilypond-1.0.8/init/center-fragment.ly	Thu May 14 10:38:21 1998
+++ ./init/center-fragment.ly	Thu Sep 17 14:28:49 1998
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
 	
-\version "1.0.1";
+\version "1.0.3";
 
 
 \include "declarations.ly"
@@ -13,8 +13,8 @@
 }
 
 \score { 
-%  \melodic\relative c {
-  \melodic {
+%  \notes\relative c {
+  \notes {
     \maininput
   }
   \paper { 
diff -urN ../lilypond-1.0.8/init/center.ly ./init/center.ly
--- ../lilypond-1.0.8/init/center.ly	Thu May 14 10:38:21 1998
+++ ./init/center.ly	Thu Sep 17 14:28:49 1998
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
 	
-\version "1.0.1";
+\version "1.0.3";
 
 
 \include "declarations.ly"
diff -urN ../lilypond-1.0.8/init/fragment.ly ./init/fragment.ly
--- ../lilypond-1.0.8/init/fragment.ly	Thu May 14 10:38:21 1998
+++ ./init/fragment.ly	Thu Sep 17 14:28:49 1998
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
 	
-\version "1.0.1";
+\version "1.0.3";
 
 
 \include "declarations.ly"
@@ -13,8 +13,8 @@
 }
 
 \score { 
-%  \melodic\relative c {
-  \melodic {
+%  \notes\relative c {
+  \notes {
     \maininput
   }
   \paper { 
diff -urN ../lilypond-1.0.8/init/init.fly ./init/init.fly
--- ../lilypond-1.0.8/init/init.fly	Thu May 14 10:38:21 1998
+++ ./init/init.fly	Thu Sep 17 14:28:49 1998
@@ -1,12 +1,12 @@
 % Toplevel initialisation file. 
 	
-\version "1.0.1";
+\version "1.0.3";
 
 
 \include "declarations.ly"
 
 \score { 
-  \melodic\relative c {
+  \notes\relative c {
     \maininput
   }
   \paper { }  
diff -urN ../lilypond-1.0.8/init/init.ly ./init/init.ly
--- ../lilypond-1.0.8/init/init.ly	Thu May 14 10:38:21 1998
+++ ./init/init.ly	Thu Sep 17 14:28:49 1998
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
 	
-\version "1.0.1";
+\version "1.0.3";
 
 
 \include "declarations.ly";
diff -urN ../lilypond-1.0.8/init/paper16.ly ./init/paper16.ly
--- ../lilypond-1.0.8/init/paper16.ly	Thu May 14 10:38:21 1998
+++ ./init/paper16.ly	Thu Sep 17 14:28:49 1998
@@ -6,7 +6,7 @@
 
 
 
-\version "1.0.1";
+\version "1.0.3";
 
 paper_sixteen = \paper {
 	staffheight = 16.0\pt;
diff -urN ../lilypond-1.0.8/init/paper20.ly ./init/paper20.ly
--- ../lilypond-1.0.8/init/paper20.ly	Thu May 14 10:38:21 1998
+++ ./init/paper20.ly	Thu Sep 17 14:28:49 1998
@@ -5,7 +5,7 @@
  \include "table13.ly";
  \include "table16.ly";
 
-\version "1.0.1";
+\version "1.0.3";
 
 paper_twenty = \paper {
 	staffheight = 20.0\pt;
diff -urN ../lilypond-1.0.8/input/keys.ly ./input/keys.ly
--- ../lilypond-1.0.8/input/keys.ly	Mon Sep 14 11:10:34 1998
+++ ./input/keys.ly	Thu Sep 17 14:28:43 1998
@@ -1,7 +1,7 @@
-\version "1.0.2";
+\version "1.0.3";
 
 
-blah = \melodic {
+blah = \notes {
 
 \transpose c'' {
 	\time 4/4;
diff -urN ../lilypond-1.0.8/input/kortjakje.ly ./input/kortjakje.ly
--- ../lilypond-1.0.8/input/kortjakje.ly	Mon Sep 14 11:10:34 1998
+++ ./input/kortjakje.ly	Thu Sep 17 14:28:43 1998
@@ -10,14 +10,14 @@
 Tested Features: example file with comments
 
 %}
-\version "1.0.2";
+\version "1.0.3";
 
 
 % the % is a comment.
 
 
 % declare melody (which will be in *one* staff ) for the lead voice
-melodie = \melodic \relative c' {
+melodie = \notes \relative c' {
 	 			% switch Lilypond in note-mode
 	\clef"violin";
 	\time 2/4 ;
@@ -39,7 +39,7 @@
 }
 
 				% more of this.
-begeleiding = \melodic \relative c { 
+begeleiding = \notes \relative c { 
 	\clef "bass";
 	\time 2/4 ;
 
diff -urN ../lilypond-1.0.8/input/pedal.ly ./input/pedal.ly
--- ../lilypond-1.0.8/input/pedal.ly	Mon Sep 14 11:10:34 1998
+++ ./input/pedal.ly	Thu Sep 17 14:28:43 1998
@@ -24,10 +24,10 @@
 % \lbheel \lbheel \lfheel \lftoe
 % \rbheel \rbtoe \rfheel \rftoe
 
-\version "1.0.2";
+\version "1.0.3";
 
 \score{
-		\melodic {
+		\notes {
 			\time 4/4;
 			\key D;
 			\clef bass;
diff -urN ../lilypond-1.0.8/input/praeludium-fuga-E.ly ./input/praeludium-fuga-E.ly
--- ../lilypond-1.0.8/input/praeludium-fuga-E.ly	Mon Sep 14 11:10:34 1998
+++ ./input/praeludium-fuga-E.ly	Thu Sep 17 14:28:43 1998
@@ -23,16 +23,16 @@
    * organ staff...
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 
 
-praeludium_commands = \melodic {
+praeludium_commands = \notes {
   \time 4/4;
    \key e;
 }
 
-praeludium_right = \melodic\transpose c'' {
+praeludium_right = \notes\transpose c'' {
   \$praeludium_commands
   \clef violin;
 
@@ -64,7 +64,7 @@
   % 16
 }
 
-praeludium_left = \melodic {
+praeludium_left = \notes {
   \$praeludium_commands
   \clef bass;
 
@@ -85,7 +85,7 @@
   % 16
 }
 
-praeludium_pedal = \melodic {
+praeludium_pedal = \notes {
   \$praeludium_commands  
   \clef bass;
 
@@ -97,12 +97,12 @@
 }
 
 
-fuga2_commands = \melodic{
+fuga2_commands = \notes{
   \time 3/4;
   \key e;              % E-major
 }
 
-fuga2_right = \melodic\transpose c'' {
+fuga2_right = \notes\transpose c'' {
   \$fuga2_commands
   \clef violin;
 
@@ -140,7 +140,7 @@
   % 19
 }
 
-fuga2_left = \melodic {
+fuga2_left = \notes {
   \$fuga2_commands  
   \clef bass;
 
@@ -156,7 +156,7 @@
   % 19
 }
 
-fuga2_pedal = \melodic {
+fuga2_pedal = \notes {
   \$fuga2_commands  
   \clef bass;
 
@@ -168,7 +168,7 @@
   % 19
 }
 
-breakmusic = \melodic { 
+breakmusic = \notes { 
   %\time 4/4;
   r1
 }
diff -urN ../lilypond-1.0.8/input/rhythm.ly ./input/rhythm.ly
--- ../lilypond-1.0.8/input/rhythm.ly	Mon Sep 14 11:10:34 1998
+++ ./input/rhythm.ly	Thu Sep 17 14:28:43 1998
@@ -7,9 +7,9 @@
 
 
 
-\version "1.0.2";
+\version "1.0.3";
 
-ritme = \melodic\transpose c'' {
+ritme = \notes\transpose c'' {
 	\partial 8;
 
 	\time  4/4;
@@ -37,13 +37,13 @@
 	
 
 another = 
-	\melodic{ \time 4/4; 
+	\notes{ \time 4/4; 
 		c1.  c1. c4 c4 c4 c4  \time  4/4; c1 c1 c1
 	 }
 
 
 yanother = 
-	\melodic{ \time 4/4; 
+	\notes{ \time 4/4; 
 		c1 c1 c1 c4 c4 c4 c4  c1 c1 c1
 	 }
 
diff -urN ../lilypond-1.0.8/input/scales.ly ./input/scales.ly
--- ../lilypond-1.0.8/input/scales.ly	Mon Sep 14 11:10:34 1998
+++ ./input/scales.ly	Thu Sep 17 14:28:43 1998
@@ -12,8 +12,8 @@
 % scales with accents.
 %
 
-\version "1.0.2";
-blah = 	\melodic {
+\version "1.0.3";
+blah = 	\notes {
 		\time 6/8;	
 \transpose c {
 		\clef "bass";
@@ -84,7 +84,7 @@
 
 
 \score{
-	\melodic {\blah}
+	\notes {\blah}
 	\paper{
 	 castingalgorithm = \Wordwrap;
 	}
diff -urN ../lilypond-1.0.8/input/scripts.ly ./input/scripts.ly
--- ../lilypond-1.0.8/input/scripts.ly	Mon Sep 14 11:10:34 1998
+++ ./input/scripts.ly	Thu Sep 17 14:28:43 1998
@@ -1,8 +1,8 @@
 	
-\version "1.0.2";
+\version "1.0.3";
 
 
-blah = 	\melodic{ \transpose c'' {
+blah = 	\notes{ \transpose c'' {
 
 	c,4 ->-.-\fermata-"text"
 	c ->-.-\fermata-"text"
diff -urN ../lilypond-1.0.8/input/test/a.ly ./input/test/a.ly
--- ../lilypond-1.0.8/input/test/a.ly	Mon Sep 14 11:10:34 1998
+++ ./input/test/a.ly	Thu Jan  1 00:00:00 1970
@@ -1,54 +0,0 @@
-\header{
-enteredby =	 "jcn";
-copyright =	 "PD";
-TestedFeatures =	 "This file tests Feta embedded slurs"
-	 "(Feta definitively is not an abbreviation of Font-En-TjA)";
-}
-
-\version "1.0.2";
-
-shortlong = \melodic\transpose c'{
-	c4()c( c c  |
-	c c c c |
-	c c c c |
-	\break
-	c c c )c |
-}
-
-sl = \melodic\transpose c''{
-
-%	e4()e( a e  |
-	e4 e( a e  |
-	e e e e |
-	e e e a |
-	\break
-	e e g )e |
-}
-
-broken = \melodic\transpose  c'' {
-      c c c c()
-      c c c c(
-      c )c c c(
-      c c )c c(
-      )a' a' a' a'()
-      a' a' a' a'()
-      c( c c )c 
-      c( c c )f, 
-      f,( c c )c 
-      f,( c c )f,
-}
-
-\score{
-	\melodic{ 
-		\shortlong
-		\sl
-		\broken
-	}
-	\paper{ 
-	      indent = 0.0\pt;
-		%for broken!
-%		linewidth= 30.\mm;
-		castingalgorithm = \Wordwrap;
-	}
-}
-
diff -urN ../lilypond-1.0.8/input/test/abbrev.ly ./input/test/abbrev.ly
--- ../lilypond-1.0.8/input/test/abbrev.ly	Thu May 14 10:38:21 1998
+++ ./input/test/abbrev.ly	Thu Sep 17 15:12:29 1998
@@ -1,6 +1,7 @@
 
+\version "1.0.3";
 \score{
-	\melodic \transpose c'''{
+	\notes \transpose c'''{
 		\stemup
 %		\stemdown
 		% default abbreviations
diff -urN ../lilypond-1.0.8/input/test/bar-scripts.ly ./input/test/bar-scripts.ly
--- ../lilypond-1.0.8/input/test/bar-scripts.ly	Thu May 14 10:38:21 1998
+++ ./input/test/bar-scripts.ly	Thu Sep 17 15:12:29 1998
@@ -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 -urN ../lilypond-1.0.8/input/test/beam-pos.ly ./input/test/beam-pos.ly
--- ../lilypond-1.0.8/input/test/beam-pos.ly	Thu May 14 10:38:21 1998
+++ ./input/test/beam-pos.ly	Thu Sep 17 15:12:29 1998
@@ -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 -urN ../lilypond-1.0.8/input/test/beams.ly ./input/test/beams.ly
--- ../lilypond-1.0.8/input/test/beams.ly	Mon Sep 14 11:10:34 1998
+++ ./input/test/beams.ly	Thu Sep 17 15:12:29 1998
@@ -6,13 +6,13 @@
 
 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 @@
 		}
 	>
 	<	
-		\melodic { 
+		\notes { 
 \transpose c' {
 			\time 8/4;
 			\stemdown [a'8 a, c e]
diff -urN ../lilypond-1.0.8/input/test/broken.ly ./input/test/broken.ly
--- ../lilypond-1.0.8/input/test/broken.ly	Mon Sep 14 11:10:34 1998
+++ ./input/test/broken.ly	Thu Sep 17 15:12:29 1998
@@ -5,9 +5,9 @@
 	 "(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 @@
 	c c c )c |
 }
 
-broken = \melodic\transpose c''{
+broken = \notes\transpose c''{
 
       c c c c()
       c c c c(
@@ -30,7 +30,7 @@
 }
 
 \score{
-	\melodic{ 
+	\notes{ 
 %		\shortlong
 		\broken
 	}
diff -urN ../lilypond-1.0.8/input/test/clefs.ly ./input/test/clefs.ly
--- ../lilypond-1.0.8/input/test/clefs.ly	Thu May 14 10:38:21 1998
+++ ./input/test/clefs.ly	Thu Sep 17 15:12:29 1998
@@ -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 -urN ../lilypond-1.0.8/input/test/collisions.ly ./input/test/collisions.ly
--- ../lilypond-1.0.8/input/test/collisions.ly	Mon Sep 14 11:10:34 1998
+++ ./input/test/collisions.ly	Thu Sep 17 15:12:29 1998
@@ -5,11 +5,11 @@
 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_steminvert = \melodic 
+two_voice_steminvert = \notes 
 	\type Staff <  
 	  { 
  \stemup
@@ -29,7 +29,7 @@
 
 	>
 
-three_voice = \melodic 
+three_voice = \notes 
 	\type Staff <
 	{ \stemup 
 		g4 f e f g a g2 }
@@ -40,7 +40,7 @@
 	>
 
 
-rests = \melodic  
+rests = \notes  
 	\type Staff <
 	{ \stemup
 		| r8 r r r  r r r r 
@@ -52,7 +52,7 @@
 	}
 	>
 
-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 @@
 }
 
 \score{
-	\melodic \transpose c' {  \two_voice  
+	\notes \transpose c' {  \two_voice  
 	\two_voice_steminvert 
 	\three_voice  
 	\rests 
diff -urN ../lilypond-1.0.8/input/test/defaultbars.ly ./input/test/defaultbars.ly
--- ../lilypond-1.0.8/input/test/defaultbars.ly	Mon Sep 14 15:33:48 1998
+++ ./input/test/defaultbars.ly	Thu Sep 17 15:12:30 1998
@@ -1,6 +1,8 @@
+\version "1.0.3";
+
 
 \score {
-	\melodic {
+	\notes {
 		\property Staff.barAlways = "1"
 		\property Staff.defaultBarType = ":|:"
 		c4 c4 c4 c4 }
diff -urN ../lilypond-1.0.8/input/test/denneboom.ly ./input/test/denneboom.ly
--- ../lilypond-1.0.8/input/test/denneboom.ly	Mon Sep 14 11:10:34 1998
+++ ./input/test/denneboom.ly	Thu Sep 17 15:12:29 1998
@@ -7,7 +7,7 @@
 
 \include "paper20.ly"
 
-\version "1.0.2";
+\version "1.0.3";
 
 oden = \lyric{ 
 	O8 |
@@ -33,7 +33,7 @@
 	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 @@
 	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 @@
 	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
 >
 
-$verse_one = \melodic{
+$verse_one = \notes{
 	\oden
 	\oden
 	\ikheb
@@ -79,7 +79,7 @@
 	\$verse_one
 >
 
-$verse_two = \melodic{
+$verse_two = \notes{
 	\oden
 	\oden
 	\ugloeit
diff -urN ../lilypond-1.0.8/input/test/dotted-slur.ly ./input/test/dotted-slur.ly
--- ../lilypond-1.0.8/input/test/dotted-slur.ly	Thu May 14 10:38:21 1998
+++ ./input/test/dotted-slur.ly	Thu Sep 17 15:12:29 1998
@@ -1,5 +1,7 @@
+\version "1.0.3";
+
 \score{
-	\melodic{
+	\notes{
 		c( d e )c |
 		\slurdotted;
 		c( d e )c |
diff -urN ../lilypond-1.0.8/input/test/find-quarts.ly ./input/test/find-quarts.ly
--- ../lilypond-1.0.8/input/test/find-quarts.ly	Thu May 14 10:38:21 1998
+++ ./input/test/find-quarts.ly	Thu Sep 17 15:12:29 1998
@@ -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 -urN ../lilypond-1.0.8/input/test/font-body.ly ./input/test/font-body.ly
--- ../lilypond-1.0.8/input/test/font-body.ly	Mon Sep 14 11:10:34 1998
+++ ./input/test/font-body.ly	Thu Sep 17 15:12:29 1998
@@ -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 -urN ../lilypond-1.0.8/input/test/font.ly ./input/test/font.ly
--- ../lilypond-1.0.8/input/test/font.ly	Mon Sep 14 11:10:34 1998
+++ ./input/test/font.ly	Thu Sep 17 15:12:29 1998
@@ -7,7 +7,7 @@
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "font-body.ly"
 \score{
diff -urN ../lilypond-1.0.8/input/test/font16.ly ./input/test/font16.ly
--- ../lilypond-1.0.8/input/test/font16.ly	Mon Sep 14 11:10:34 1998
+++ ./input/test/font16.ly	Thu Sep 17 15:12:30 1998
@@ -7,7 +7,7 @@
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 \include "font-body.ly"
 
 \score{
diff -urN ../lilypond-1.0.8/input/test/gourlay.ly ./input/test/gourlay.ly
--- ../lilypond-1.0.8/input/test/gourlay.ly	Mon Sep 14 11:10:34 1998
+++ ./input/test/gourlay.ly	Thu Sep 17 15:12:30 1998
@@ -4,7 +4,7 @@
 TestedFeatures =	 "This file tests some nasty Gourlay spacings";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 %{
 
@@ -13,7 +13,7 @@
 %}
 
 \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 -urN ../lilypond-1.0.8/input/test/grace.ly ./input/test/grace.ly
--- ../lilypond-1.0.8/input/test/grace.ly	Thu May 14 10:38:21 1998
+++ ./input/test/grace.ly	Thu Sep 17 15:12:30 1998
@@ -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 -urN ../lilypond-1.0.8/input/test/hara-kiri.ly ./input/test/hara-kiri.ly
--- ../lilypond-1.0.8/input/test/hara-kiri.ly	Thu May 14 10:38:21 1998
+++ ./input/test/hara-kiri.ly	Thu Sep 17 15:12:30 1998
@@ -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 @@
 	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 @@
 	>
 >
  
-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 @@
 	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 -urN ../lilypond-1.0.8/input/test/keys.ly ./input/test/keys.ly
--- ../lilypond-1.0.8/input/test/keys.ly	Thu May 14 10:38:21 1998
+++ ./input/test/keys.ly	Thu Sep 17 15:12:30 1998
@@ -1,8 +1,10 @@
+\version "1.0.3";
+
 %{
 test key itemv breaking
 %}
 \score {
-  \melodic
+  \notes
   {
     \key bes; c1 \key c;  c1
     \break
diff -urN ../lilypond-1.0.8/input/test/knee.ly ./input/test/knee.ly
--- ../lilypond-1.0.8/input/test/knee.ly	Mon Sep 14 11:10:35 1998
+++ ./input/test/knee.ly	Thu Sep 17 15:12:30 1998
@@ -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 -urN ../lilypond-1.0.8/input/test/mark.ly ./input/test/mark.ly
--- ../lilypond-1.0.8/input/test/mark.ly	Thu May 14 10:38:21 1998
+++ ./input/test/mark.ly	Thu Sep 17 15:12:30 1998
@@ -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 -urN ../lilypond-1.0.8/input/test/multi-rest.ly ./input/test/multi-rest.ly
--- ../lilypond-1.0.8/input/test/multi-rest.ly	Thu May 14 10:38:21 1998
+++ ./input/test/multi-rest.ly	Thu Sep 17 15:12:30 1998
@@ -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 @@
 	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 @@
 
 	}}
 
-\score {  \melodic
+\score {  \notes
 	\type Staff <
 		\$voice_two
 		\$voice_one
diff -urN ../lilypond-1.0.8/input/test/ossia.ly ./input/test/ossia.ly
--- ../lilypond-1.0.8/input/test/ossia.ly	Thu May 14 10:38:21 1998
+++ ./input/test/ossia.ly	Thu Sep 17 15:12:30 1998
@@ -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 -urN ../lilypond-1.0.8/input/test/score-bar-scripts.ly ./input/test/score-bar-scripts.ly
--- ../lilypond-1.0.8/input/test/score-bar-scripts.ly	Thu May 14 10:38:21 1998
+++ ./input/test/score-bar-scripts.ly	Thu Sep 17 15:12:30 1998
@@ -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 -urN ../lilypond-1.0.8/input/test/sleur.ly ./input/test/sleur.ly
--- ../lilypond-1.0.8/input/test/sleur.ly	Mon Sep 14 11:10:35 1998
+++ ./input/test/sleur.ly	Thu Sep 17 15:12:30 1998
@@ -5,9 +5,9 @@
 	 "(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 @@
 	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 @@
 	e( c'' f )e
 }
 
-under = \melodic\transpose c'{
+under = \notes\transpose c'{
 
 	\stemdown 
 	f'( \stemboth d d \stemdown )f'
@@ -76,7 +76,7 @@
 	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 @@
 	\[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 @@
 	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 @@
 	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 @@
       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 @@
 }
 
 
-bug = \melodic\transpose c'{
+bug = \notes\transpose c'{
 
 	a()g( f )e
 	b'()a'( g' )f'
@@ -157,7 +157,7 @@
 	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 @@
 }
 
 \score{
-	\melodic{ 
+	\notes{ 
 		% use blend for fast check
 		\blend
 % {
diff -urN ../lilypond-1.0.8/input/test/slur-bug.ly ./input/test/slur-bug.ly
--- ../lilypond-1.0.8/input/test/slur-bug.ly	Thu May 14 10:38:21 1998
+++ ./input/test/slur-bug.ly	Thu Sep 17 15:12:30 1998
@@ -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 -urN ../lilypond-1.0.8/input/test/slur-damping.ly ./input/test/slur-damping.ly
--- ../lilypond-1.0.8/input/test/slur-damping.ly	Mon Sep 14 11:10:35 1998
+++ ./input/test/slur-damping.ly	Thu Sep 17 15:12:30 1998
@@ -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 -urN ../lilypond-1.0.8/input/test/slur-swap.ly ./input/test/slur-swap.ly
--- ../lilypond-1.0.8/input/test/slur-swap.ly	Thu May 14 10:38:21 1998
+++ ./input/test/slur-swap.ly	Thu Sep 17 15:12:30 1998
@@ -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 -urN ../lilypond-1.0.8/input/test/slurs.ly ./input/test/slurs.ly
--- ../lilypond-1.0.8/input/test/slurs.ly	Mon Sep 14 11:10:35 1998
+++ ./input/test/slurs.ly	Thu Sep 17 15:12:30 1998
@@ -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 -urN ../lilypond-1.0.8/input/test/spacing.ly ./input/test/spacing.ly
--- ../lilypond-1.0.8/input/test/spacing.ly	Mon Sep 14 11:10:35 1998
+++ ./input/test/spacing.ly	Thu Sep 17 15:12:30 1998
@@ -6,9 +6,9 @@
 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 @@
             >
 	}
 
-singlepart = \melodic{ 
+singlepart = \notes{ 
 	c4 d e f
 	c4 d e [f8 f]
 	c4 d e f8 [f16 f]
@@ -59,7 +59,7 @@
     }
     
     \score{
-    \melodic { 
+    \notes { 
 %    	\singlepart 
 	\multipart 
     }
diff -urN ../lilypond-1.0.8/input/test/stem.ly ./input/test/stem.ly
--- ../lilypond-1.0.8/input/test/stem.ly	Mon Sep 14 11:10:35 1998
+++ ./input/test/stem.ly	Thu Sep 17 15:12:30 1998
@@ -8,9 +8,9 @@
 	
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-beamintervals = \melodic{
+beamintervals = \notes{
 		\time 7/4;
 		\stemup
 \transpose c'{
@@ -27,7 +27,7 @@
 	}}
 
 \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 -urN ../lilypond-1.0.8/input/test/test-lyrics.ly ./input/test/test-lyrics.ly
--- ../lilypond-1.0.8/input/test/test-lyrics.ly	Thu May 14 10:38:21 1998
+++ ./input/test/test-lyrics.ly	Thu Sep 17 15:12:30 1998
@@ -1,3 +1,5 @@
+\version "1.0.3";
+
 $somewhat_long = \lyric{
 	\textstyle "roman" ;
 	AaaaaaA2
@@ -40,7 +42,7 @@
 	\$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 -urN ../lilypond-1.0.8/input/test/tie-bug.ly ./input/test/tie-bug.ly
--- ../lilypond-1.0.8/input/test/tie-bug.ly	Thu May 14 10:38:21 1998
+++ ./input/test/tie-bug.ly	Thu Sep 17 15:12:30 1998
@@ -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 -urN ../lilypond-1.0.8/input/test/tie.ly ./input/test/tie.ly
--- ../lilypond-1.0.8/input/test/tie.ly	Thu May 14 10:38:21 1998
+++ ./input/test/tie.ly	Thu Sep 17 15:12:30 1998
@@ -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 -urN ../lilypond-1.0.8/input/test/title.ly ./input/test/title.ly
--- ../lilypond-1.0.8/input/test/title.ly	Mon Sep 14 11:10:35 1998
+++ ./input/test/title.ly	Thu Sep 17 15:12:30 1998
@@ -10,10 +10,10 @@
 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 @@
 
 
 \score{
-	\melodic
+	\notes
 	\relative c' {
 	    f' e d c c d e f \break
 	    f e d c c d e f
diff -urN ../lilypond-1.0.8/input/test/transposition.ly ./input/test/transposition.ly
--- ../lilypond-1.0.8/input/test/transposition.ly	Mon Sep 14 11:10:35 1998
+++ ./input/test/transposition.ly	Thu Sep 17 15:12:30 1998
@@ -22,9 +22,9 @@
 }
 
 
-\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 @@
         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 @@
         cis4 ais4 |
 }
 
-vFour = \melodic \relative c''\transpose d' \vThree
+vFour = \notes \relative c''\transpose d' \vThree
 
 \score {
   \type StaffGroup <
diff -urN ../lilypond-1.0.8/input/test/vertical-align.ly ./input/test/vertical-align.ly
--- ../lilypond-1.0.8/input/test/vertical-align.ly	Thu May 14 10:38:21 1998
+++ ./input/test/vertical-align.ly	Thu Sep 17 15:12:30 1998
@@ -1,6 +1,8 @@
 
+\version "1.0.3";
+
 \score {
-\melodic <
+\notes <
 	\type GrandStaff < {
 	   \property GrandStaff . maxVerticalAlign = "60."
 	   \property GrandStaff . minVerticalAlign = "35."
diff -urN ../lilypond-1.0.8/input/tril.ly ./input/tril.ly
--- ../lilypond-1.0.8/input/tril.ly	Mon Sep 14 11:10:35 1998
+++ ./input/tril.ly	Thu Sep 17 14:28:43 1998
@@ -5,10 +5,10 @@
 	 "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \score{
-	\melodic{ 
+	\notes{ 
 		c-\prall c-\mordent c-\prallprall c-\prallmordent
 		c-\upprall c-\downprall
 	}
diff -urN ../lilypond-1.0.8/input/twinkle-pop.ly ./input/twinkle-pop.ly
--- ../lilypond-1.0.8/input/twinkle-pop.ly	Mon Sep 14 11:10:35 1998
+++ ./input/twinkle-pop.ly	Thu Sep 17 14:28:43 1998
@@ -12,9 +12,9 @@
 Tested Features		lyrics and chords
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
-melodie = \melodic\relative c {
+melodie = \notes\relative c {
         \clef"violin";
         \time 2/4 ;
 
@@ -39,7 +39,7 @@
 }
 
 \score {
-        <  \melodic \type Staff \melodie
+        <  \notes \type Staff \melodie
            \lyric   \type Lyrics \text
         >
         \paper {  }
diff -urN ../lilypond-1.0.8/input/twinkle.ly ./input/twinkle.ly
--- ../lilypond-1.0.8/input/twinkle.ly	Mon Sep 14 11:10:35 1998
+++ ./input/twinkle.ly	Thu Sep 17 14:28:43 1998
@@ -20,9 +20,9 @@
 Tested Features: lyrics, interleaving lyrics and staffs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
-melody = \melodic \relative c'' {
+melody = \notes \relative c'' {
 	\clef violin;
 	\property Staff.instrument = "alto sax"
 	
@@ -36,7 +36,7 @@
 	f f | e e | d d8.( e16 | )c2 |
 }
 
-accompany = \melodic \relative c {
+accompany = \notes \relative c {
 	\clef "bass";
 	c4 c' | e c | f c | e c | 
 	d b | c a | f g | c,2 | 
@@ -48,7 +48,7 @@
 	d b | c a | f g | c,2 
 }
 
-global = \melodic {
+global = \notes {
 	\time 2/4;
 	\skip 2*24;
 	\bar ":|";
diff -urN ../lilypond-1.0.8/lily/VERSION ./lily/VERSION
--- ../lilypond-1.0.8/lily/VERSION	Mon Sep 14 17:51:33 1998
+++ ./lily/VERSION	Thu Sep 17 18:03:40 1998
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
-PATCH_LEVEL=8
+PATCH_LEVEL=9
 MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
diff -urN ../lilypond-1.0.8/lily/dimen.cc ./lily/dimen.cc
--- ../lilypond-1.0.8/lily/dimen.cc	Thu May 14 10:38:21 1998
+++ ./lily/dimen.cc	Tue Sep 15 18:22:42 1998
@@ -40,7 +40,7 @@
       warning (_ ("NaN"));
       s = "0.0";
     }
-  s += "pt ";
+  s += "pt";
   return s;
 }
 
diff -urN ../lilypond-1.0.8/lily/include/score-element.hh ./lily/include/score-element.hh
--- ../lilypond-1.0.8/lily/include/score-element.hh	Thu May 14 10:38:21 1998
+++ ./lily/include/score-element.hh	Thu Sep 17 14:14:05 1998
@@ -72,7 +72,7 @@
   int size_i_;
   
   // ugh: no protection. Denk na, Vrij Veilig
-  void calcalute_dependencies (int final, int busy, Score_element_method_pointer funcptr);
+  void calculate_dependencies (int final, int busy, Score_element_method_pointer funcptr);
 
 protected:
   /**
diff -urN ../lilypond-1.0.8/lily/lookup.cc ./lily/lookup.cc
--- ../lilypond-1.0.8/lily/lookup.cc	Thu May 14 10:38:21 1998
+++ ./lily/lookup.cc	Tue Sep 15 18:22:42 1998
@@ -337,13 +337,13 @@
   if (y < min_y)
     {
       warning (_ ("piano brace") 
-	+ " " + _ ("too small") +  "(" + print_dimen (y) + ")");
+	+ " " + _ ("too small") +  " (" + print_dimen (y) + ")");
       y = min_y;
     }
   if (y > max_y)
     {
       warning (_ ("piano brace")
-       + " " + _ ("too big") + "(" + print_dimen (y)+ ")");
+       + " " + _ ("too big") + " (" + print_dimen (y) + ")");
       y = max_y;
     }
 
@@ -388,13 +388,13 @@
   if (y < min_y)
     {
       warning (_ ("bracket")
-	+ " " + _ ("too small") +  "(" + print_dimen (y) + ")");
+	+ " " + _ ("too small") +  " (" + print_dimen (y) + ")");
       y = min_y;
     }
   if (y > max_y)
     {
       warning (_ ("bracket")
-       + " " + _ ("too big") + "(" + print_dimen (y)+ ")");
+       + " " + _ ("too big") + " (" + print_dimen (y) + ")");
       y = max_y;
     }
 
diff -urN ../lilypond-1.0.8/lily/main.cc ./lily/main.cc
--- ../lilypond-1.0.8/lily/main.cc	Thu May 14 10:38:21 1998
+++ ./lily/main.cc	Tue Sep 15 18:22:42 1998
@@ -189,8 +189,8 @@
     prefix_directory = env_lily;
 
 #if HAVE_GETTEXT
-  setlocale (LC_ALL, "");
-//  setlocale (LC_MESSAGES, "");
+  setlocale (LC_ALL, ""); /* enable locales */
+  setlocale (LC_NUMERIC, "C"); /* musn't have comma's in TeX output... */
   String lily_locale_dir;
   String name (PACKAGE);
   name.to_lower ();
diff -urN ../lilypond-1.0.8/lily/music-list.cc ./lily/music-list.cc
--- ../lilypond-1.0.8/lily/music-list.cc	Mon Sep 14 11:10:35 1998
+++ ./lily/music-list.cc	Thu Sep 17 13:35:11 1998
@@ -102,7 +102,7 @@
 
 
 Music_list::Music_list (Music_list const &s)
-  : Pointer_list<Music*> (s)
+  : Pointer_list<Music*> ()
 {
   for (PCursor<Music*> i(s.top()); i.ok (); i++)
     add_music (i->clone());
@@ -146,5 +146,6 @@
 
 
 Music_list::Music_list ()
+  : Pointer_list<Music*> ()
 {
 }
diff -urN ../lilypond-1.0.8/lily/my-lily-lexer.cc ./lily/my-lily-lexer.cc
--- ../lilypond-1.0.8/lily/my-lily-lexer.cc	Thu May 14 10:38:21 1998
+++ ./lily/my-lily-lexer.cc	Thu Sep 17 14:35:09 1998
@@ -35,19 +35,18 @@
   {"duration", DURATION},
   {"font", FONT},
   {"grouping", GROUPING},
+  {"header", HEADER},
   {"in", IN_T},
   {"lyric", LYRIC},
   {"key", KEY},
   {"keysignature", KEYSIGNATURE},
   {"mark", MARK},
-  {"melodic" , MELODIC},
   {"musicalpitch", MUSICAL_PITCH},
   {"time", TIME_T},
   {"midi", MIDI},
   {"mm", MM_T},
-  {"multi", MULTI},
-  {"header", HEADER},
   {"notenames", NOTENAMES},
+  {"notes" , NOTES},
   {"octave", OCTAVE},
   {"output", OUTPUT},
   {"partial", PARTIAL},
@@ -60,7 +59,6 @@
   {"script", SCRIPT},
   {"shape", SHAPE},
   {"skip", SKIP},
-  {"staff", STAFF},
   {"table", TABLE},
   {"spandynamic", SPANDYNAMIC},
   {"symboltables", SYMBOLTABLES},
diff -urN ../lilypond-1.0.8/lily/parser.yy ./lily/parser.yy
--- ../lilypond-1.0.8/lily/parser.yy	Mon Sep 14 11:10:35 1998
+++ ./lily/parser.yy	Thu Sep 17 16:27:58 1998
@@ -44,8 +44,8 @@
 
 
 // mmm
-Mudela_version oldest_version ("1.0.1");
-Mudela_version version ("1.0.2");
+Mudela_version oldest_version ("1.0.3");
+Mudela_version version ("1.0.3");
 
 
 // needed for bison.simple's malloc() and free()
@@ -74,6 +74,8 @@
 #define THIS ((My_lily_parser *) my_lily_parser_l)
 
 #define yyerror THIS->parser_error
+#define ARRAY_SIZE(a,s)   if (a.size () != s) THIS->parser_error (_f("expecting %d arguments", s))
+
 
 %}
 
@@ -163,11 +165,11 @@
 %token MARK
 %token MUSIC
 %token MUSICAL_PITCH
-%token MELODIC
+%token NOTES
 %token MIDI
 %token TIME_T
 %token MM_T
-%token MULTI
+
 %token NOTENAMES
 %token OCTAVE
 %token OUTPUT
@@ -181,7 +183,7 @@
 %token SHAPE
 %token SKIP
 %token SPANDYNAMIC
-%token STAFF
+
 %token START_T
 %token SYMBOLTABLES
 %token TABLE
@@ -236,7 +238,7 @@
 %type <duration> steno_duration notemode_duration
 %type <duration> entered_notemode_duration explicit_duration
 %type <interval>	dinterval
-%type <intvec>	intastint_list
+%type <intvec>	intastint_list int_list
 %type <lookup>	symtables symtables_body
 
 %type <pitch>   explicit_musical_pitch steno_musical_pitch musical_pitch absolute_musical_pitch
@@ -614,6 +616,9 @@
 midi_body: /* empty */ 		{
 		$$ = THIS->default_midi_p ();
 	}
+	| MIDI_IDENTIFIER	{
+		$$ = $1-> access_Midi_def ();		
+	}
 	| midi_body STRING '=' translator_spec	{
 		$$-> assign_translator (*$2, $4);
 		delete $2;
@@ -678,7 +683,7 @@
 	| Sequential_music		{ $$ = $1; }
 	| transposed_music	{ $$ = $1; }
 	| MUSIC_IDENTIFIER { $$ = $1->access_Music (); }
-	| MELODIC
+	| NOTES
 		{ THIS->lexer_p_->push_note_state (); }
 	Music
 		{ $$ = $3;
@@ -917,13 +922,17 @@
 	;
 
 explicit_musical_pitch:
-	MUSICAL_PITCH '{' int int int '}'	{/* ugh */
+	MUSICAL_PITCH '{' int_list '}'	{/* ugh */
+		Array<int> &a = *$3;
+		ARRAY_SIZE(a,3);
 		$$ = new Musical_pitch;
-		$$->octave_i_ = $3;
-		$$->notename_i_ = $4;
-		$$->accidental_i_ = $5;
+		$$->octave_i_ = a[0];
+		$$->notename_i_ = a[1];
+		$$->accidental_i_ = a[2];
+		delete &a;
 	}
 	;
+
 musical_pitch:
 	steno_musical_pitch
 	| explicit_musical_pitch
@@ -943,10 +952,15 @@
 
 
 explicit_duration:
-	DURATION '{' int unsigned '}'	{
+	DURATION '{' int_list '}'	{
 		$$ = new Duration;
-		$$-> durlog_i_ = $3;
-		$$-> dots_i_ = $4;
+		Array<int> &a = *$3;
+		ARRAY_SIZE(a,2);
+			
+		$$-> durlog_i_ = a[0];
+		$$-> dots_i_ = a[1];
+
+		delete &a;		
 	}
 	;
 
@@ -1275,6 +1289,16 @@
 	| pitch_list musical_pitch	{
 		$$->push (*$2);
 		delete $2;
+	}
+	;
+
+
+int_list:
+	/**/			{
+		$$ = new Array<int>
+	}
+	| int_list int 		{
+		$$->push ($2);		
 	}
 	;
 
diff -urN ../lilypond-1.0.8/lily/score-element.cc ./lily/score-element.cc
--- ../lilypond-1.0.8/lily/score-element.cc	Thu May 14 10:38:21 1998
+++ ./lily/score-element.cc	Thu Sep 17 14:15:22 1998
@@ -150,7 +150,7 @@
 
 
 void
-Score_element::calcalute_dependencies (int final, int busy,
+Score_element::calculate_dependencies (int final, int busy,
 				    Score_element_method_pointer funcptr)
 {
   if (status_i_ >= final)
@@ -160,11 +160,11 @@
   status_i_= busy;
 
   for (int i=0; i < dependency_size(); i++)
-    dependency (i)->calcalute_dependencies (final, busy, funcptr);
+    dependency (i)->calculate_dependencies (final, busy, funcptr);
 
   Link_array<Score_element> extra (get_extra_dependencies());
   for (int i=0; i < extra.size(); i++)
-    extra[i]->calcalute_dependencies (final, busy, funcptr);
+    extra[i]->calculate_dependencies (final, busy, funcptr);
   
   invalidate_cache (X_AXIS);
   invalidate_cache (Y_AXIS);
diff -urN ../lilypond-1.0.8/lily/super-element.cc ./lily/super-element.cc
--- ../lilypond-1.0.8/lily/super-element.cc	Thu May 14 10:38:21 1998
+++ ./lily/super-element.cc	Thu Sep 17 14:14:35 1998
@@ -43,13 +43,13 @@
 void
 Super_element::pre_processing ()
 {
-  calcalute_dependencies (PRECALCING, PRECALCED, &Score_element::do_pre_processing);
+  calculate_dependencies (PRECALCING, PRECALCED, &Score_element::do_pre_processing);
 }
 
 void
 Super_element::space_processing ()
 {
-  calcalute_dependencies (SPACING, SPACED, &Score_element::do_space_processing);
+  calculate_dependencies (SPACING, SPACED, &Score_element::do_space_processing);
 }
 
 /* for break processing, use only one status, because copies have to
@@ -59,25 +59,25 @@
 void
 Super_element::breakable_col_processing ()
 {
-  calcalute_dependencies (PREBROKEN, PREBROKEN, &Score_element::do_breakable_col_processing);
+  calculate_dependencies (PREBROKEN, PREBROKEN, &Score_element::do_breakable_col_processing);
 }
 
 void
 Super_element::break_processing ()
 {
-  calcalute_dependencies (BROKEN, BROKEN, &Score_element::do_break_processing);
+  calculate_dependencies (BROKEN, BROKEN, &Score_element::do_break_processing);
 }
 void
 Super_element::post_processing ()
 {
-  calcalute_dependencies (POSTCALCING, POSTCALCED, &Score_element::do_post_processing);
+  calculate_dependencies (POSTCALCING, POSTCALCED, &Score_element::do_post_processing);
 }
 
 void
 Super_element::output_all () 
 {
   pscore_l_->outputter_l_->start_line ();
-  calcalute_dependencies (BREWING, BREWED, &Score_element::do_brew_molecule);
+  calculate_dependencies (BREWING, BREWED, &Score_element::do_brew_molecule);
   pscore_l_->outputter_l_->stop_line ();
 }
 
@@ -86,6 +86,6 @@
 void
 Super_element::unlink_all ()
 {
-  calcalute_dependencies (UNLINKING, UNLINKED, &Score_element::junk_links);
+  calculate_dependencies (UNLINKING, UNLINKED, &Score_element::junk_links);
 }
 
diff -urN ../lilypond-1.0.8/make/STATE-VECTOR ./make/STATE-VECTOR
--- ../lilypond-1.0.8/make/STATE-VECTOR	Mon Sep 14 17:51:34 1998
+++ ./make/STATE-VECTOR	Thu Sep 17 18:03:33 1998
@@ -77,3 +77,6 @@
 1.0.7.uu1
 1.0.8.uu1
 1.0.8
+1.0.8.jcn1
+1.0.8.uu1
+1.0.9
diff -urN ../lilypond-1.0.8/make/lilypond-vars.make ./make/lilypond-vars.make
--- ../lilypond-1.0.8/make/lilypond-vars.make	Mon Sep 14 11:10:35 1998
+++ ./make/lilypond-vars.make	Wed Sep 16 00:42:47 1998
@@ -1,5 +1,6 @@
+
 export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH)
 export MFINPUTS:=$(topdir)/mf/$(PATHSEP)$(MFINPUTS)$(PATHSEP)$(PATHSEP)
 export TEXINPUTS:=$(topdir)/tex/$(PATHSEP)$(TEXINPUTS)$(PATHSEP)$(PATHSEP)
-export LILYINCLUDE=$(topdir)/init$(PATHSEP)$(topdir)/mf/out
+export LILYINCLUDE:=$(topdir)/init$(PATHSEP)$(topdir)/mf/out$(PATHSEP)$(LILYINCLUDE)
 
diff -urN ../lilypond-1.0.8/make/lilypond.spec.in ./make/lilypond.spec.in
--- ../lilypond-1.0.8/make/lilypond.spec.in	Thu May 14 10:38:21 1998
+++ ./make/lilypond.spec.in	Thu Sep 17 13:35:59 1998
@@ -19,7 +19,7 @@
 %build
 ./configure --disable-checking --disable-debugging --enable-printing --prefix=/usr --enable-optimise --enable-shared --enable-tex-dir='${prefix}/lib/texmf/texmf/tex/generic' --enable-mf-dir='${prefix}/lib/texmf/texmf/fonts/source/'
 make all
-make -C Documentation texinfo || true
+make -C Documentation info || true
 make htmldoc
 
 %install
diff -urN ../lilypond-1.0.8/make/mutopia-rules.make ./make/mutopia-rules.make
--- ../lilypond-1.0.8/make/mutopia-rules.make	Thu May 14 10:38:21 1998
+++ ./make/mutopia-rules.make	Thu Sep 17 13:35:59 1998
@@ -5,6 +5,11 @@
 	-mv $(name-stem)-page*.gif $(outdir)/
 	touch $@
 
+$(outdir)/%.png: $(outdir)/%.ps
+	sh $(buildscripts)/ps-to-pngs.sh $<
+	-mv $(name-stem)-page*.png $(outdir)/
+	touch $@
+
 $(outdir)/%.ly.txt: %.ly
 	ln -f $< $@
 
diff -urN ../lilypond-1.0.8/make/mutopia-targets.make ./make/mutopia-targets.make
--- ../lilypond-1.0.8/make/mutopia-targets.make	Mon Sep 14 11:10:35 1998
+++ ./make/mutopia-targets.make	Thu Sep 17 13:35:59 1998
@@ -3,7 +3,7 @@
 all: $(OUT_FILES)
 
 
-local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(gif_examples)
+local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(png_examples)
 	(cd $(outdir); $(PYTHON) ../$(buildscripts)/mutopia-index.py --package=$(topdir) --prefix=../ --suffix=/$(outdir) $(html_subdirs) $(all_examples))
 	$(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/$(outdir)/index.html $(outdir)/index.html
 	echo $^ > $(depth)/wwwlist
diff -urN ../lilypond-1.0.8/make/mutopia-vars.make ./make/mutopia-vars.make
--- ../lilypond-1.0.8/make/mutopia-vars.make	Thu May 14 10:38:21 1998
+++ ./make/mutopia-vars.make	Thu Sep 17 13:35:59 1998
@@ -17,6 +17,7 @@
 
 ps_examples=$(addprefix $(outdir)/, $(addsuffix .ps.gz, $(all_examples)))
 gif_examples=$(addprefix $(outdir)/, $(addsuffix .gif, $(all_examples)))
+png_examples=$(addprefix $(outdir)/, $(addsuffix .png, $(all_examples)))
 
 html_subdirs=$(addprefix --subdirs ,$(SUBDIRS))
 
diff -urN ../lilypond-1.0.8/make/substitute.make ./make/substitute.make
--- ../lilypond-1.0.8/make/substitute.make	Thu May 14 10:38:21 1998
+++ ./make/substitute.make	Thu Sep 17 13:35:59 1998
@@ -11,6 +11,7 @@
   DIR_DATADIR\
   PACKAGE\
   package\
+  PATHSEP\
   PERL\
   PYTHON\
   SHELL\
diff -urN ../lilypond-1.0.8/mi2mu/main.cc ./mi2mu/main.cc
--- ../lilypond-1.0.8/mi2mu/main.cc	Thu May 14 10:38:21 1998
+++ ./mi2mu/main.cc	Tue Sep 15 18:22:43 1998
@@ -130,8 +130,8 @@
 {
 
 #if HAVE_GETTEXT
-  setlocale (LC_ALL, "");
-//  setlocale (LC_MESSAGES, "");
+  setlocale (LC_ALL, ""); /* enable locales */
+  setlocale (LC_NUMERIC, "C"); /* musn't have comma's in output */
   String name (PACKAGE);
   name.to_lower ();
   bindtextdomain (name.ch_C (), DIR_LOCALEDIR);
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/bassi-part.ly ./mutopia/Coriolan/bassi-part.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/bassi-part.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/bassi-part.ly	Thu Sep 17 14:31:26 1998
@@ -7,7 +7,7 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "violoncello.ly"
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/clarinetti-part.ly ./mutopia/Coriolan/clarinetti-part.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/clarinetti-part.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/clarinetti-part.ly	Thu Sep 17 14:31:26 1998
@@ -7,7 +7,7 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "clarinetti.ly"
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/clarinetti.ly ./mutopia/Coriolan/clarinetti.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/clarinetti.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/clarinetti.ly	Thu Sep 17 14:31:26 1998
@@ -9,7 +9,7 @@
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "clarinetto-1.ly"
 \include "clarinetto-2.ly"
@@ -21,7 +21,7 @@
 	% urg: can't; only My_midi_lexer:<non-static> () parses pitch?
 	%\property Staff.transposing = "bes"
 	\property Staff.transposing = -3
-	\melodic \type Voice=one < 
+	\notes \type Voice=one < 
 		\time 4/4;
 		\key F;
 		\$clarinetto1
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/clarinetto-1.ly ./mutopia/Coriolan/clarinetto-1.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/clarinetto-1.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/clarinetto-1.ly	Thu Sep 17 14:31:26 1998
@@ -9,9 +9,9 @@
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-clarinetto1 = \melodic \relative c {
+clarinetto1 = \notes \relative c {
 	R1 *2 | d''4-.\ff r r2 | R1 *3 | e4-. r r2 | R1 *3 |
 	f4-. r r2 | r1 | f4-. r r2 | e4-. r r2 | R1 *4 |
 	bes'2\p_"\ \ \ cresc." ( a | 
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/clarinetto-2.ly ./mutopia/Coriolan/clarinetto-2.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/clarinetto-2.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/clarinetto-2.ly	Thu Sep 17 14:31:26 1998
@@ -9,9 +9,9 @@
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-clarinetto2 = \melodic \relative c { 
+clarinetto2 = \notes \relative c { 
 	R1*2 bes''4-.\ff r r2 | R1*3 | cis4-. r r2 | R1 *3 | 
 	d4-. r r2 | r1 | d4-. r r2 | cis4-. r r2 | R1 *5 |
 	%20
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/contrabasso-part.ly ./mutopia/Coriolan/contrabasso-part.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/contrabasso-part.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/contrabasso-part.ly	Thu Sep 17 14:31:26 1998
@@ -7,7 +7,7 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "contrabasso.ly"
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/contrabasso.ly ./mutopia/Coriolan/contrabasso.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/contrabasso.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/contrabasso.ly	Thu Sep 17 14:31:26 1998
@@ -7,9 +7,9 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-contrabasso = \melodic \relative c {
+contrabasso = \notes \relative c {
 %	\translator Staff=violoncello
 	\skip 1*21;
 %	\translator Staff=contrabasso
@@ -144,7 +144,7 @@
 	\property Staff.instrument = "Contrabasso"
 	\property Staff.instr = "Cb."
 	\clef "bass";
-	\melodic \type Voice=one< 
+	\notes \type Voice=one< 
 		\global
 		\$contrabasso
 	>
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/coriolan.ly ./mutopia/Coriolan/coriolan.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/coriolan.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/coriolan.ly	Thu Sep 17 14:31:26 1998
@@ -7,7 +7,7 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 
@@ -39,7 +39,7 @@
 
 $timpani_g = \type StaffGroup = timpani_group <
 	\$timpani_staff
-	\type Staff = urgtimpany \melodic{ \skip 1*34; }
+	\type Staff = urgtimpany \notes{ \skip 1*34; }
 >
 
 $violini = \type GrandStaff = violini_group <
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/corni-part.ly ./mutopia/Coriolan/corni-part.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/corni-part.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/corni-part.ly	Thu Sep 17 14:31:26 1998
@@ -7,7 +7,7 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "corni.ly"
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/corni.ly ./mutopia/Coriolan/corni.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/corni.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/corni.ly	Thu Sep 17 14:31:26 1998
@@ -9,7 +9,7 @@
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "corno-1.ly"
 \include "corno-2.ly"
@@ -21,7 +21,7 @@
 	% urg: can't; only My_midi_lexer:<non-static> () parses pitch?
 	%\property Staff.transposing = "es"
 	\property Staff.transposing = 3
-	\melodic \type Voice=corni < 
+	\notes \type Voice=corni < 
 		\time 4/4;
 		\$corno1
 		\$corno2
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/corno-1.ly ./mutopia/Coriolan/corno-1.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/corno-1.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/corno-1.ly	Thu Sep 17 14:31:26 1998
@@ -7,9 +7,9 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-corno1 = \melodic \relative c {
+corno1 = \notes \relative c {
 	R1 *2 | f''4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 |
 	c4-. r r2 | r1 | e4-. r r2 | e4-. r r2 | R1 *5 |
 	%20
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/corno-2.ly ./mutopia/Coriolan/corno-2.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/corno-2.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/corno-2.ly	Thu Sep 17 14:31:26 1998
@@ -7,9 +7,9 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-corno2 = \melodic \relative c {
+corno2 = \notes \relative c {
 	R1 *2 | d''4-.\ff r r2 | R1 *3 | d4-. r r2 | R1 *3 |
 	c4-. r r2 | r1 | e,4-. r r2 | e4-. r r2 | R1 *5 |
 	%20
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/fagotti-part.ly ./mutopia/Coriolan/fagotti-part.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/fagotti-part.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/fagotti-part.ly	Thu Sep 17 14:31:26 1998
@@ -9,7 +9,7 @@
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "fagotti.ly"
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/fagotti.ly ./mutopia/Coriolan/fagotti.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/fagotti.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/fagotti.ly	Thu Sep 17 14:31:26 1998
@@ -9,7 +9,7 @@
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "fagotto-1.ly"
 \include "fagotto-2.ly"
@@ -19,7 +19,7 @@
 	\property Staff.instrument = "2 Fagotti"
 	\property Staff.instr = "Fg."
 	\clef "bass";
-	\melodic \type Voice=fagotti < 
+	\notes \type Voice=fagotti < 
 		\global
 		\$fagotto1
 		\$fagotto2
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/fagotto-1.ly ./mutopia/Coriolan/fagotto-1.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/fagotto-1.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/fagotto-1.ly	Thu Sep 17 14:31:26 1998
@@ -9,9 +9,9 @@
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-fagotto1 = \melodic \relative c {
+fagotto1 = \notes \relative c {
 	R1 *2 | as'4-.\ff r r2 | R1 *3 | as4-. r r2 | R1 *3 |
 	a4-. r r2 | r1 | c4-. r r2 | b4-. r r2 | R1 *5 |
 	%20
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/fagotto-2.ly ./mutopia/Coriolan/fagotto-2.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/fagotto-2.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/fagotto-2.ly	Thu Sep 17 14:31:26 1998
@@ -7,9 +7,9 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-fagotto2 = \melodic \relative c {
+fagotto2 = \notes \relative c {
 	R1 *2 | f4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 |
 	fis4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | R1 *5 |
 	%20
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/flauti-part.ly ./mutopia/Coriolan/flauti-part.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/flauti-part.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/flauti-part.ly	Thu Sep 17 14:31:26 1998
@@ -9,7 +9,7 @@
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "flauti.ly"
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/flauti.ly ./mutopia/Coriolan/flauti.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/flauti.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/flauti.ly	Thu Sep 17 14:31:26 1998
@@ -9,7 +9,7 @@
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "flauto-1.ly"
 \include "flauto-2.ly"
@@ -18,7 +18,7 @@
 	\property Staff.midi_instrument = "flute"
 	\property Staff.instrument = "2 Flauti"
 	\property Staff.instr = "Fl."
-	\melodic \type Voice=flauti < 
+	\notes \type Voice=flauti < 
 		\global
 		\$flauto1
 		\$flauto2
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/flauto-1.ly ./mutopia/Coriolan/flauto-1.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/flauto-1.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/flauto-1.ly	Thu Sep 17 14:31:26 1998
@@ -7,9 +7,9 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-flauto1 = \melodic \relative c {
+flauto1 = \notes \relative c {
 	R1 *2 | c'''4-.\ff r r2 | R1 *3 | d4-. r r2 | R1 *3 |
 	es4-. r r2 | r1 | g4-. r r2 | b,4-. r r2 | R1 *4 |
 	r2 es\p_"\ \ \ cresc." ( | 
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/flauto-2.ly ./mutopia/Coriolan/flauto-2.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/flauto-2.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/flauto-2.ly	Thu Sep 17 14:31:26 1998
@@ -7,9 +7,9 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-flauto2 = \melodic \relative c {
+flauto2 = \notes \relative c {
 	R1 *2 | as'''4-.\ff r r2 | R1 *3 | b4-. r r2 | R1 *3 | 
 	c4-. r r2 | r1 | es4-. r r2 | d,4-. r r2 | R1 *4 |
 	r2 r2 | 
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/global.ly ./mutopia/Coriolan/global.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/global.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/global.ly	Thu Sep 17 14:31:26 1998
@@ -9,9 +9,9 @@
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-global = \melodic {
+global = \notes {
 	\time 4/4;
 	\key es;
 	\skip 1*314;
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/oboe-1.ly ./mutopia/Coriolan/oboe-1.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/oboe-1.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/oboe-1.ly	Thu Sep 17 14:31:26 1998
@@ -7,9 +7,9 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-oboe1 = \melodic \relative c'' {
+oboe1 = \notes \relative c'' {
 	R1 *2 | as'4-.\ff r r2 | R1 *3 | as4-. r r2 | R1 *3 |
 	a4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | R1 *4 |
 	as2\p_"\ \ \ cresc." ( g |
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/oboe-2.ly ./mutopia/Coriolan/oboe-2.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/oboe-2.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/oboe-2.ly	Thu Sep 17 14:31:26 1998
@@ -9,9 +9,9 @@
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-oboe2 = \melodic \relative c{
+oboe2 = \notes \relative c{
 	R1 *2| f''4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 |
 	es4-. r r2 | r1 | es4-. r r2 | b4-. r r2 | R1 *5 | 
 	%20
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/oboi-part.ly ./mutopia/Coriolan/oboi-part.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/oboi-part.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/oboi-part.ly	Thu Sep 17 14:31:26 1998
@@ -9,7 +9,7 @@
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "oboi.ly"
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/oboi.ly ./mutopia/Coriolan/oboi.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/oboi.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/oboi.ly	Thu Sep 17 14:31:26 1998
@@ -9,7 +9,7 @@
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "oboe-1.ly"
 \include "oboe-2.ly"
@@ -18,7 +18,7 @@
 	\property Staff.midi_instrument = "oboe"
 	\property Staff.instrument = "2 Oboi"
 	\property Staff.instr = "Ob."
-	\melodic \type Voice=oboi < 
+	\notes \type Voice=oboi < 
 		\global
 		\$oboe1
 		\$oboe2
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/timpani.ly ./mutopia/Coriolan/timpani.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/timpani.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/timpani.ly	Thu Sep 17 14:31:26 1998
@@ -9,9 +9,9 @@
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-timpani = \melodic \relative c {
+timpani = \notes \relative c {
 	R1 *2 | c4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 |
 	c4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | R1 *5 |
 	%20
@@ -25,7 +25,7 @@
 	\property Staff.instrument = "2 Timpani (C-G)"
 	\property Staff.instr = "Timp."
 	\clef "bass";
-	\melodic< 
+	\notes< 
 %		\global
 		\time 4/4;
 		\$timpani
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/trombe-part.ly ./mutopia/Coriolan/trombe-part.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/trombe-part.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/trombe-part.ly	Thu Sep 17 14:31:26 1998
@@ -9,7 +9,7 @@
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "trombe.ly"
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/trombe.ly ./mutopia/Coriolan/trombe.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/trombe.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/trombe.ly	Thu Sep 17 14:31:26 1998
@@ -9,7 +9,7 @@
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "trombo-1.ly"
 \include "trombo-2.ly"
@@ -18,7 +18,7 @@
 	\property Staff.midi_instrument = "trumpet"
 	\property Staff.instrument = "2 Trombe (C)"
 	\property Staff.instr = "Tbe."
-	\melodic \type Voice=trombe < 
+	\notes \type Voice=trombe < 
 %		\global
 		\time 4/4;
 		\$trombo1
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/trombo-1.ly ./mutopia/Coriolan/trombo-1.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/trombo-1.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/trombo-1.ly	Thu Sep 17 14:31:26 1998
@@ -7,9 +7,9 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-trombo1 = \melodic \relative c {
+trombo1 = \notes \relative c {
 	R1 *2 | c''4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 |
 	c4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | R1 *5 |
 	%20
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/trombo-2.ly ./mutopia/Coriolan/trombo-2.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/trombo-2.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/trombo-2.ly	Thu Sep 17 14:31:26 1998
@@ -7,9 +7,9 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-trombo2 = \melodic \relative c {
+trombo2 = \notes \relative c {
 	R1 *2 | c'4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 |
 	c4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | R1 *5 |
 	%20
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/viola-1.ly ./mutopia/Coriolan/viola-1.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/viola-1.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/viola-1.ly	Thu Sep 17 14:31:26 1998
@@ -7,9 +7,9 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-viola1 = \melodic \relative c {
+viola1 = \notes \relative c {
 	\type Voice=one
 	c'1\ff ~ | c | f,4-. r r2 | r1 |
 	% copied 3 bars from three back...
@@ -296,7 +296,7 @@
 	\property Staff.instrument = "Viola"
 	\property Staff.instr = "Vla."
 	\clef "alto";
-	\melodic \type Voice=one < 
+	\notes \type Voice=one < 
 		\global
 		\$viola1
 	>
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/viola-2.ly ./mutopia/Coriolan/viola-2.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/viola-2.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/viola-2.ly	Thu Sep 17 14:31:26 1998
@@ -7,9 +7,9 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-viola2 = \melodic \relative c {
+viola2 = \notes \relative c {
 	% starts on (actualy, most part is on) same staff as viola1
 	%urg, parse error
 %urg	\translator Staff=viola1
@@ -36,7 +36,7 @@
 	\property Staff.instrument = "Viola II"
 	\property Staff.instr = "Vla. II"
 	\clef "alto";
-	\melodic \type Voice=one< 
+	\notes \type Voice=one< 
 		\global
 		\$viola2
 	>
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/viola-part.ly ./mutopia/Coriolan/viola-part.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/viola-part.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/viola-part.ly	Thu Sep 17 14:31:26 1998
@@ -7,7 +7,7 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "viola-1.ly"
@@ -18,7 +18,7 @@
 	\property Staff.instrument = "Viola"
 	\property Staff.instr = "Vla."
 	\clef "alto";
-	\melodic \type Voice=one < 
+	\notes \type Voice=one < 
 		\global 
 		\$viola1
 		\$viola2
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/violino-1-part.ly ./mutopia/Coriolan/violino-1-part.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/violino-1-part.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/violino-1-part.ly	Thu Sep 17 14:31:26 1998
@@ -7,7 +7,7 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "violino-1.ly"
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/violino-1.ly ./mutopia/Coriolan/violino-1.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/violino-1.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/violino-1.ly	Thu Sep 17 14:31:26 1998
@@ -7,9 +7,9 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-violino1 = \melodic \relative c {
+violino1 = \notes \relative c {
 	c'1\ff ~ | c | <f4-. c'-. as'-.> r r2 | R1 |
 	c1 ~ | c | <d4-. d'-. d'-.> r r2 | R1 |
 	c1 ~ | c | <es'4-. es'-.> r r2 | R1 |
@@ -276,7 +276,7 @@
 	\property Staff.midi_instrument = "violin"
 	\property Staff.instrument = "Violino I"
 	\property Staff.instr = "Vl. I"
-	\melodic< 
+	\notes< 
 		\global
 		\$violino1
 	>
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/violino-2-part.ly ./mutopia/Coriolan/violino-2-part.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/violino-2-part.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/violino-2-part.ly	Thu Sep 17 14:31:26 1998
@@ -7,7 +7,7 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "violino-2.ly"
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/violino-2.ly ./mutopia/Coriolan/violino-2.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/violino-2.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/violino-2.ly	Thu Sep 17 14:31:26 1998
@@ -7,9 +7,9 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-violino2 = \melodic \relative c {
+violino2 = \notes \relative c {
 	c'1\ff ~ | c | <f4-. c'-. as'-.> r r2 | R1 |
 	c1 ~ | c | <d4-. b'-. as'-.> r r2 | R1 |
 	c1 ~ | c | <fis4-. es'-. c'-.> r r2 | R1 |
@@ -296,7 +296,7 @@
 	\property Staff.midi_instrument = "violin"
 	\property Staff.instrument = "Violino II"
 	\property Staff.instr = "Vl. II"
-	\melodic< 
+	\notes< 
 		\global
 		\$violino2
 	>
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/violoncello-part.ly ./mutopia/Coriolan/violoncello-part.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/violoncello-part.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/violoncello-part.ly	Thu Sep 17 14:31:26 1998
@@ -7,7 +7,7 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "global.ly"
 \include "violoncello.ly"
diff -urN ../lilypond-1.0.8/mutopia/Coriolan/violoncello.ly ./mutopia/Coriolan/violoncello.ly
--- ../lilypond-1.0.8/mutopia/Coriolan/violoncello.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/Coriolan/violoncello.ly	Thu Sep 17 14:31:26 1998
@@ -9,9 +9,9 @@
 
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-violoncello = \melodic \relative c {
+violoncello = \notes \relative c {
 	c1\ff ~ | c | f,4-. r r2 | r1 | c'1\ff ~ | c | f,4-. r r2 |
 	\property Staff.instr = "Vc. \& Cb."
 	r1 |
@@ -304,7 +304,7 @@
 	\property Staff.instrument = "Violoncello"
 	\property Staff.instr = "Vc."
 	\clef "bass";
-	\melodic \type Voice=one< 
+	\notes \type Voice=one< 
 		\global
 		\$violoncello
 	>
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly ./mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly	Thu Sep 17 14:31:26 1998
@@ -4,9 +4,9 @@
 	piece = "Allemande";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-global = \melodic{
+global = \notes{
 	\time 4/4;
 	\partial 8*3;
 	\key es;
@@ -19,7 +19,7 @@
 	\bar ":|";
 }
 
-hoyreEn = \melodic\relative c'''{
+hoyreEn = \notes\relative c'''{
 %	\partial 4.; 
 	[as16 g f] |
 	[g16 d es b][c f es d][es b c g][as d c b] |
@@ -79,7 +79,7 @@
 	>	s8
 }
 
-venstreEn = \melodic\relative c{
+venstreEn = \notes\relative c{
 	\clef bass; 
 %	\partial 4.; 
 	r16 r8 |
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly ./mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly	Thu Sep 17 14:31:26 1998
@@ -10,9 +10,9 @@
   copyright =   "Public Domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-global = \melodic {
+global = \notes {
 	\time 4/4;
 	\key es;
 	\skip 1*7;
@@ -23,7 +23,7 @@
 	\bar "|.";
 }
   
-hoyreOpp = \melodic\relative c''  {
+hoyreOpp = \notes\relative c''  {
 	\stemup
 	es4^"Grave adagio" r16 [es d. es32] f4 r16 [f16 f. g32] |
 	[as8. as16] [as16 g32 f g16. d32] es4 r16 [g g. as32] |
@@ -44,7 +44,7 @@
 	> g2
 }
 
-hoyreNed = \melodic\relative c'' {
+hoyreNed = \notes\relative c'' {
 	\clef violin;
 	\stemdown
 	<c4 g> r16 [c b. c32] d4 r16 [d d. es32] |
@@ -57,7 +57,7 @@
 	g4 <c8 a> r <d2 b>
 }
 
-venstreOpp = \melodic\relative c' {
+venstreOpp = \notes\relative c' {
 	\clef bass;
 	\stemup
 	<c4 g es> r <b as f d> r |
@@ -75,7 +75,7 @@
 	r <a es c> <g2 d>
 }
 
-venstreNed = \melodic\relative c{
+venstreNed = \notes\relative c{
 	\stemdown
 	c4 r c r | r c c r | c r r c | c r r16 [c c. bes32] bes4 |
 	r16 [bes bes. as32] as4_"tr" g r16 [d' d. es32] |
@@ -86,7 +86,7 @@
 	r g g2	
 }
 
-andanteEn = \melodic\relative c''{
+andanteEn = \notes\relative c''{
 	[g16^"andante" c32 d es8~] [es16 d32 c es d c b] [c16 g as f] [g c g f] |
 	[es16 c'32 d es d c16] [g' c, as' c,] [b c d b] g16 r16 r8 |
 %10
@@ -141,7 +141,7 @@
    >
 }
 
-andanteTo = \melodic\relative c{
+andanteTo = \notes\relative c{
 %8
 	[c8 c'] [f, g] [es c] [es g] |
 	[c as] [es f] [g g,]
@@ -179,7 +179,7 @@
 	>
 }
 
-allegroEn = \melodic\relative c''{
+allegroEn = \notes\relative c''{
 %30
 	[g8^"allegro" g16 a] [b8 c d es] |
 	[f16 es d es] [f8 g as d,] |
@@ -253,7 +253,7 @@
 		{ \stemdown r8 r16 <a16 es> <g2 d> | <g es> }
 	>
 }
-allegroTo = \melodic\relative c'{
+allegroTo = \notes\relative c'{
 	\clef bass;
 %30
 	\type Staff <
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly ./mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly	Thu Sep 17 14:31:26 1998
@@ -14,9 +14,9 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
-one = \melodic\relative c {
+one = \notes\relative c {
 	\property Voice . textstyle =  "italic"
 	r16\p_"legato"\< [g''-1( c-3 )e-5] r [g,-1( c )e]
 	r [g,( c )d] r [b-1( d-2 \!)g-5] |
@@ -68,7 +68,7 @@
 	\bar "|.";
 }
 
-two = \melodic\relative c{
+two = \notes\relative c{
 	\property Voice . textstyle =  "roman"
 	c4-5 e-3 g-\mordent^"(\\textsharp)" g,4 |
 	d'-\mordent-5 f-3 a-\mordent^"(\\textsharp)" a,4 |
@@ -90,7 +90,7 @@
 	\bar "|.";
 }
 
-global  = \melodic{
+global  = \notes{
 	\time 4/4;
 }
 
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly ./mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly	Thu Sep 17 14:31:26 1998
@@ -14,8 +14,8 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.2";
-one = \melodic\relative c{
+\version "1.0.3";
+one = \notes\relative c{
 	\property Voice . textstyle =  "italic"
 	r8\mf [c'-1( e-2 g-4] [e-2 c-1 bes'-5 g-3] |
 	[)a-4\< c,-1( f-2 a-4] [f c c'-5 a-3] |
@@ -73,7 +73,7 @@
 	\bar "|.";
 }
 
-two = \melodic\relative c{
+two = \notes\relative c{
 	\type Staff <
 		{ \voiceone c1 ~ | c ~ | c }
 		{ \voicetwo c,1 ~ | c ~ | c }
@@ -97,7 +97,7 @@
 	\bar "|.";
 }
 
-global = \melodic{
+global = \notes{
 	\time 4/4;
 }
 
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4 ./mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4	Thu May 14 10:38:21 1998
+++ ./mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4	Thu Sep 17 14:30:54 1998
@@ -21,10 +21,10 @@
 copyright =	 "public domain";
 }
 
-\version "1.0.0";
+\version "1.0.3";
 
 
-one = \melodic  \transpose c`` {
+one = \notes  \transpose c`` {
 	\textstyle "italic";
 %#	s(^c@ ^es@ ^g@ ^\p(\<@ ^\!@ ^)\!@ ^\>@)
 	t(c,es,g,^\p(\<@,\!,^)\!@,\>)
@@ -86,7 +86,7 @@
 	\bar "|.";
 }
 
-two = \melodic{
+two = \notes{
 	\clef bass;
 	% c4 r [g8-.(\ped )es-.\*] |
 	c4 r [g8-.( )es-.] |
@@ -148,7 +148,7 @@
 	\bar "|.";
 }
 
-global  = \melodic{
+global  = \notes{
 	\meter 3/4;
 	\key es;
 }
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly ./mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly	Thu Sep 17 14:31:26 1998
@@ -12,9 +12,9 @@
 enteredby =	 "jcn";
 copyright =	 "public domain";
 }
-\version "1.0.2";
+\version "1.0.3";
 
-one = \melodic\relative c{
+one = \notes\relative c{
 	\property Voice . textstyle =  "italic"
 	r16\p_"legato" 
 	\property Voice . textstyle =  "finger"
@@ -63,7 +63,7 @@
 	\bar "|.";
 }
 
-two = \melodic\relative c{
+two = \notes\relative c{
 	\property Voice . textstyle =  "finger"
 	fis4-1( e8-2 a4 a4 gis8-2 | 
 	) a8
@@ -118,7 +118,7 @@
 	\bar "|.";
 }
 
-three = \melodic\relative c{
+three = \notes\relative c{
 %	\stemdown 
 	d4-3 c-4 b e-3 |
 	a16 [a,-5\mf( cis-3 a-5] [d-2 e-1 fis-2 d-4]
@@ -154,7 +154,7 @@
 	[d a-2~] [a16 a-2 b cis-2] d2 |
 }
 
-four = \melodic\relative c{
+four = \notes\relative c{
 	\skip 1*9;
 %	\stemup 
 %	\property Voice.hshift = 1 
@@ -174,7 +174,7 @@
 	d2 d2
 }
 
-global  = \melodic{
+global  = \notes{
 	\time 4/4;
 	\key D;
 }
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly ./mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly	Mon Sep 14 11:10:35 1998
+++ ./mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly	Thu Sep 17 14:31:26 1998
@@ -12,10 +12,10 @@
 enteredby =	 "jcn";
 copyright =	 "public domain";
 }
-\version "1.0.2";
+\version "1.0.3";
 
 
-one = \melodic\relative c{
+one = \notes\relative c{
 	\property Voice . textstyle =  "italic"
 	[d'8-1\p a'-5-"legato" f-3 d-1 a'-5 f-3] |
 	[d-1 a'-5 f-3 d-1 a'-5 f-3] |
@@ -108,7 +108,7 @@
 }
 
 
-two = \melodic\relative c{
+two = \notes\relative c{
 	\clef "bass";
 %	[d32( cis )d8.] r4 r |
 	d4-\mordent r r |
@@ -185,7 +185,7 @@
 	\bar "|.";
 }
 
-global = \melodic{
+global = \notes{
 	\time 3/4;
 	\key F;
 }
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly ./mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly	Thu Sep 17 14:31:26 1998
@@ -12,10 +12,10 @@
 enteredby =	 "jcn";
 copyright =	 "public domain";
 }
-\version "1.0.2";
+\version "1.0.3";
 
 
-one = \melodic\relative c{
+one = \notes\relative c{
 	\skip 1; |
 	\stemup
 	r4 d''2-5( cis4-4 |
@@ -35,7 +35,7 @@
 	\bar "|.";
 }
 
-two = \melodic\relative c{
+two = \notes\relative c{
 	r16\p [d''-5( c-4 bes-3] [a-2 bes-3 f-1 g-2] 
 	[a8.-\mordent bes16-1] [g8.-\prall f16-1] |
 	\stemdown
@@ -54,7 +54,7 @@
 	fis1-2
 }
 
-three = \melodic\relative c{
+three = \notes\relative c{
 	\stemup
 	f2-1( e-2 |
 	\stemboth
@@ -76,7 +76,7 @@
 	\bar "|.";
 }
 
-four = \melodic\relative c{
+four = \notes\relative c{
 	\stemdown 
 	d2-3 cis-4 |
 	\skip 1*3; |
@@ -95,7 +95,7 @@
 	d,1-5
 }
 
-global = \melodic{
+global = \notes{
 	\time 4/4;
 	\key F;
 }
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly	Thu Sep 17 14:31:26 1998
@@ -15,11 +15,11 @@
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "allemande-urtext.ly";
 
-allemande_cello_global = \melodic{
+allemande_cello_global = \notes{
 	\time 4/4;
 	\key f;
 	\partial 16;
@@ -32,7 +32,7 @@
 	\bar ":|";
 }
 
-allemande_cello_scripts = \melodic{
+allemande_cello_scripts = \notes{
 }
 
 allemande_cello_staff = \type Staff <
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly	Thu May 14 10:38:21 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly	Thu Sep 17 16:12:56 1998
@@ -11,7 +11,7 @@
 d = { \slurdotted }
 comma = "\\sethuge\\ \\ ,";
 
-allemande_a = \melodic \relative c {
+allemande_a = \notes \relative c {
 	\voiceone a'16 | 
 	[a8 bes16()a] \onevoice
 	[g()f e()d][d()cis d()e][a,8 \d bes16()g] |
@@ -67,7 +67,7 @@
 	\stemup [d,16 \stemboth d''(c!)a][bes!(g)e cis'][d a f d] d,8.
 }
 
-allemande_b = \melodic \relative c {
+allemande_b = \notes \relative c {
 	\voicetwo
 	s16 |
 	% <d'8 g' f'> s8 s2. |
@@ -93,7 +93,7 @@
 	bes8. 
 }
 
-allemande = \type Staff \melodic<
+allemande = \type Staff \notes<
 	\$allemande_a
 	\$allemande_b
 >
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly	Thu Sep 17 14:31:26 1998
@@ -15,11 +15,11 @@
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "allemande-urtext.ly";
 
-allemande_viola_global = \melodic{
+allemande_viola_global = \notes{
 	\time 4/4;
 	\key f;
 	\partial 16;
@@ -32,11 +32,11 @@
 	\bar ":|";
 }
 
-allemande_viola_scripts = \melodic{
+allemande_viola_scripts = \notes{
 }
 
 allemande_viola_staff = \type Staff <
-	\melodic \transpose c'' \$allemande
+	\notes \transpose c'' \$allemande
 	\$allemande_viola_global
 	\$allemande_viola_scripts
 >
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly	Thu Sep 17 14:31:26 1998
@@ -15,11 +15,11 @@
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "courante-urtext.ly";
 
-courante_cello_global = \melodic{
+courante_cello_global = \notes{
 	\time 3/4;
 	\key f;
 	\partial 16;
@@ -32,7 +32,7 @@
 	\bar ":|";
 }
 
-courante_cello_scripts = \melodic{
+courante_cello_scripts = \notes{
 }
 
 courante_cello_staff = \type Staff <
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly	Thu May 14 10:38:21 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly	Thu Sep 17 16:12:56 1998
@@ -10,7 +10,7 @@
 n = { \slurnormal }
 d = { \slurdotted }
 
-courante_a = \melodic \relative c {
+courante_a = \notes \relative c {
 	d'16 |
 	[d a f a] [d, f g a]\d[bes()a bes()g] |
 	\voiceone <g4 a> s4 \onevoice \d[g16()f g()e] |
@@ -59,7 +59,7 @@
 	d,8.
 }
 
-courante_b = \melodic \relative c {
+courante_b = \notes \relative c {
 	\voicetwo
 	\stemdown
 	s16 |
@@ -78,7 +78,7 @@
 	bes4 s s
 }
 
-courante =  \type Staff \melodic<
+courante =  \type Staff \notes<
  \$courante_a
  \$courante_b
 >
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly	Thu Sep 17 14:31:26 1998
@@ -15,11 +15,11 @@
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "courante-urtext.ly";
 
-courante_viola_global = \melodic{
+courante_viola_global = \notes{
 	\time 3/4;
 	\key f;
 	\partial 16;
@@ -32,11 +32,11 @@
 	\bar ":|";
 }
 
-courante_viola_scripts = \melodic{
+courante_viola_scripts = \notes{
 }
 
 courante_viola_staff = \type Staff <
-	\melodic \transpose c' \$courante
+	\notes \transpose c' \$courante
 	\$courante_viola_global
 	\$courante_viola_scripts
 >
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly	Thu Sep 17 14:31:26 1998
@@ -15,11 +15,11 @@
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "gigue-urtext.ly";
 
-gigue_cello_global = \melodic{
+gigue_cello_global = \notes{
 	\time 3/8;
 	\key f;
 	\clef bass;
@@ -32,7 +32,7 @@
 	\bar ":|";
 }
 
-gigue_cello_scripts = \melodic{
+gigue_cello_scripts = \notes{
 }
 
 gigue_cello_staff = \type Staff <
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly	Thu May 14 10:38:21 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly	Thu Sep 17 16:12:56 1998
@@ -17,9 +17,9 @@
 % 
 
 % urg, Thread is gone, try Voice
-% gigue_notes = \type Thread = gigue \melodic \relative c {
+% gigue_notes = \type Thread = gigue \notes \relative c {
 
-gigue_notes = \type Voice = gigue \melodic \relative c {
+gigue_notes = \type Voice = gigue \notes \relative c {
 	a'8 |
 	d,4 bes'8 | cis,4 g'8 | f16 e f g a8 |
 	d,4 d'8 | e,16(f)g8 bes | c,16(d)e8 c' | a16 g a bes c a |
@@ -74,7 +74,7 @@
 	d4
 }
 
-gigue_b = \melodic \relative c {
+gigue_b = \notes \relative c {
 	\voicetwo 
 	s8
 	s4.*14
@@ -98,11 +98,11 @@
 	<g4 e'>
 }
 
-gb = \melodic { [s16 s s s s s] }
+gb = \notes { [s16 s s s s s] }
 
 % urg, Thread is gone, try Voice
-% gigue_beams = \type Thread = gigue \melodic{
-gigue_beams = \type Voice = gigue \melodic{
+% gigue_beams = \type Thread = gigue \notes{
+gigue_beams = \type Voice = gigue \notes{
 	s8 |
 	s4. s4. \gb 
 	s4. \gb \gb \gb 
@@ -133,12 +133,12 @@
 	\gb \gb \gb 
 }
 
-gigue_a = \type Voice \melodic<
+gigue_a = \type Voice \notes<
 	\$gigue_notes
 	\$gigue_beams
 >
 
-gigue = \melodic<
+gigue = \notes<
 	\$gigue_a
 	\$gigue_b
 >
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly	Thu Sep 17 14:31:26 1998
@@ -15,11 +15,11 @@
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "gigue-urtext.ly";
 
-gigue_cello_global = \melodic{
+gigue_cello_global = \notes{
 	\time 3/8;
 	\key f;
 	\clef bass;
@@ -32,11 +32,11 @@
 	\bar ":|";
 }
 
-gigue_cello_scripts = \melodic{
+gigue_cello_scripts = \notes{
 }
 
 gigue_cello_staff = \type Staff <
-	\melodic \transpose c' \$gigue
+	\notes \transpose c' \$gigue
 	\$gigue_cello_global
 	\$gigue_cello_scripts
 >
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly	Thu Sep 17 14:31:26 1998
@@ -16,11 +16,11 @@
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "menuetto-urtext.ly";
 
-menuetto_i_cello_global = \melodic{
+menuetto_i_cello_global = \notes{
 	\time 3/4;
 	\key f;
 	\clef bass;
@@ -33,7 +33,7 @@
 	\bar ":|";
 }
 
-menuetto_i_cello_scripts = \melodic{
+menuetto_i_cello_scripts = \notes{
 	s2.
 	s8^"~"^1_2_4 s8 s4 s^4
 	s4^0_1 s_4 s
@@ -66,7 +66,7 @@
 	\header{ piece = "Menuetto I"; }
 }
 
-menuetto_ii_cello_global = \melodic{
+menuetto_ii_cello_global = \notes{
 	\time 3/4;
 	\key D;
 	\clef bass;
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly	Thu May 14 10:38:21 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly	Thu Sep 17 16:12:56 1998
@@ -7,7 +7,7 @@
 But merging melodic and scripts doen't work too well yet (see viola_scripts).
 %}
 
-menuetto_i_a = \melodic \relative c {
+menuetto_i_a = \notes \relative c {
 	<d2\f f a> bes'4  |
 	[bes8 a bes g] a4 |
 	<d,4 bes> g [f8 e] |
@@ -40,7 +40,7 @@
 	<d2. a d,> |
 }
 
-menuetto_i_b = \melodic \relative c {
+menuetto_i_b = \notes \relative c {
 	\slurdotted
 	\skip 2.*1; |
 	<e8 c> \skip 8*5; |
@@ -66,7 +66,7 @@
 }
 
 % UGH, fix this like in sarabande
-menuetto_i_a_voice_urg = \melodic{
+menuetto_i_a_voice_urg = \notes{
 	\skip 2.*1; \voiceone
 	\skip 2.*1; \onevoice
 	\skip 2.*1; \voiceone
@@ -89,28 +89,28 @@
 %	\bar "|.";
 }
 
-menuetto_i_a_voice_urg_urg = \melodic<
+menuetto_i_a_voice_urg_urg = \notes<
 	\$menuetto_i_a_voice_urg
 	\$menuetto_i_a
 >
 
-menuetto_i_b_voice_urg = \melodic{
+menuetto_i_b_voice_urg = \notes{
 	\voicetwo
 	% urg urg, huh?
 	\skip 2.*8; \voicetwo
 }
 
-menuetto_i_b_voice_urg_urg = \melodic<
+menuetto_i_b_voice_urg_urg = \notes<
 	\$menuetto_i_b_voice_urg
 	\$menuetto_i_b
 >
 
-menuetto_i = \type Staff \melodic<
+menuetto_i = \type Staff \notes<
 	{ \$menuetto_i_a_voice_urg_urg }
 	{ \$menuetto_i_b_voice_urg_urg }
 >
 
-menuetto_ii = \melodic \relative c {
+menuetto_ii = \notes \relative c {
 	\slurdotted
 	fis4^\trill [d8( e fis )g] |
 	a4 fis, a' |
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly	Thu Sep 17 14:31:26 1998
@@ -17,11 +17,11 @@
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "menuetto-urtext.ly";
 
-menuetto_i_viola_global = \melodic{
+menuetto_i_viola_global = \notes{
 	\time 3/4;
 	\key f;
 	\clef alto;
@@ -37,7 +37,7 @@
 	\bar ":|";
 }
 
-menuetto_i_viola_scripts = \melodic{
+menuetto_i_viola_scripts = \notes{
 	s2.
 	s8^"~"^1_2_4 s8*5
 	s2.*5
@@ -53,7 +53,7 @@
 }
 
 menuetto_i_viola_staff = \type Staff <
-	\melodic \transpose c' \$menuetto_i
+	\notes \transpose c' \$menuetto_i
 	\$menuetto_i_viola_global
 %	\$menuetto_i_viola_scripts
 >
@@ -65,7 +65,7 @@
 	\header{ piece = "Menuetto I"; }
 }
 
-menuetto_ii_viola_global = \melodic{
+menuetto_ii_viola_global = \notes{
 	\time 3/4;
 	\key D;
 	\clef alto;
@@ -79,7 +79,7 @@
 }
 
 menuetto_ii_viola_staff = \type Staff <
-	\melodic \transpose c' \$menuetto_ii
+	\notes \transpose c' \$menuetto_ii
 	\$menuetto_ii_viola_global
 %	\$menuetto_ii_viola_scripts
 >
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly	Thu Sep 17 14:31:26 1998
@@ -15,11 +15,11 @@
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "prelude-urtext.ly";
 
-prelude_cello_global = \melodic{
+prelude_cello_global = \notes{
 	\time 3/4;
 	\key f;
 	\clef bass;
@@ -27,7 +27,7 @@
 	\bar "|.";
 }
 
-prelude_cello_scripts = \melodic{
+prelude_cello_scripts = \notes{
 }
 
 prelude_cello_staff = \type Staff <
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly	Thu May 14 10:38:21 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly	Thu Sep 17 16:12:57 1998
@@ -8,8 +8,8 @@
 %}
 
 % urg, Thread is gone, try Voice
-% prelude_notes = \type Thread = prelude \melodic \relative c {
-prelude_notes = \type Voice = prelude \melodic \relative c {
+% prelude_notes = \type Thread = prelude \notes \relative c {
+prelude_notes = \type Voice = prelude \notes \relative c {
 	d8 f a4 ~ a16 f e d |
 	cis e g a bes4 ~ bes16 a g f |
 	e g bes cis e8. bes16 a16 g f e |
@@ -89,7 +89,7 @@
 	\voiceone <cis2. g> | <d f,> | <d e,> | <cis e,> | <d f,>
 }
 
-prelude_b = \melodic \relative c {
+prelude_b = \notes \relative c {
 	\voicetwo 
 	s2.*47
 	%48
@@ -101,15 +101,15 @@
 	a'2. a a a <a d,>
 }
 
-% pat1 = \melodic { [s8 s]s4[s16 s s s] }
-pat1 = \melodic { [s16 s s s]s4[s16 s s s] }
-pat2 = \melodic { [s16 s s s][s8.s16][s s s s] }
-pat3 = \melodic { [s16 s s s][s8 s s s] }
+% pat1 = \notes { [s8 s]s4[s16 s s s] }
+pat1 = \notes { [s16 s s s]s4[s16 s s s] }
+pat2 = \notes { [s16 s s s][s8.s16][s s s s] }
+pat3 = \notes { [s16 s s s][s8 s s s] }
 
 % of course, i just type pat1, and add the \ and the silly $ later
 % urg, Thread is gone, try Voice
-% prelude_beams = \type Thread = prelude \melodic{
-prelude_beams = \type Voice = prelude \melodic{
+% prelude_beams = \type Thread = prelude \notes{
+prelude_beams = \type Voice = prelude \notes{
 	\$pat1
 	\$pat1
 	\$pat2
@@ -183,23 +183,23 @@
 
 %{
 properties, urg!
-fig1 = \melodic{ s16( s s )s }
-fig2 = \melodic{ s16( s ) s s }
-fig3 = \melodic{ s16 s( s )s }
-fig4 = \melodic{ s16( s s s s s s )s }
-fig5 = \melodic{ s8.()s16 }
+fig1 = \notes{ s16( s s )s }
+fig2 = \notes{ s16( s ) s s }
+fig3 = \notes{ s16 s( s )s }
+fig4 = \notes{ s16( s s s s s s )s }
+fig5 = \notes{ s8.()s16 }
 %}
 
-fig1 = \melodic{ \slurnormal s16( s s )s }
-fig2 = \melodic{ \slurnormal s16( s ) s s }
-fig3 = \melodic{ s16 \slurnormal s( s )s }
-fig4 = \melodic{ \slurnormal s16( s s s s s s )s }
-fig5 = \melodic{ \slurnormal s8.()s16 }
+fig1 = \notes{ \slurnormal s16( s s )s }
+fig2 = \notes{ \slurnormal s16( s ) s s }
+fig3 = \notes{ s16 \slurnormal s( s )s }
+fig4 = \notes{ \slurnormal s16( s s s s s s )s }
+fig5 = \notes{ \slurnormal s8.()s16 }
 
 % of course, i just type fig1, and add the \ and the silly $ later
 % urg, Thread is gone, try Voice
-% prelude_slurs = \type Thread = prelude \melodic{
-prelude_slurs = \type Voice = prelude \melodic{
+% prelude_slurs = \type Thread = prelude \notes{
+prelude_slurs = \type Voice = prelude \notes{
 	s4 s4 \$fig3 |
 	\$fig1 s4 \$fig3 |
 	\$fig1 s4 \$fig3 |
@@ -273,16 +273,16 @@
 	s4 \$fig3 s4 |
 }
 
-fig1 = \melodic{ \slurdotted s16( s s )s }
-fig2 = \melodic{ \slurdotted s16( s ) s s }
-fig3 = \melodic{ s16 \slurdotted s( s )s }
-fig4 = \melodic{ \slurdotted s16( s s s s s s )s }
-fig5 = \melodic{ \slurdotted s8.()s16 }
-fig6 = \melodic{ \slurdotted s16()s \slurdotted s()s }
+fig1 = \notes{ \slurdotted s16( s s )s }
+fig2 = \notes{ \slurdotted s16( s ) s s }
+fig3 = \notes{ s16 \slurdotted s( s )s }
+fig4 = \notes{ \slurdotted s16( s s s s s s )s }
+fig5 = \notes{ \slurdotted s8.()s16 }
+fig6 = \notes{ \slurdotted s16()s \slurdotted s()s }
 
 % urg, Thread is gone, try Voice
-% prelude_suggested_slurs = \type Thread = prelude \melodic{
-prelude_suggested_slurs = \type Voice = prelude \melodic{
+% prelude_suggested_slurs = \type Thread = prelude \notes{
+prelude_suggested_slurs = \type Voice = prelude \notes{
 	\slurdotted
 	s2. |
 	s2. |
@@ -351,14 +351,14 @@
 	\$fig3 s2 |
 }
 
-prelude_a = \type Voice \melodic<
+prelude_a = \type Voice \notes<
 	\$prelude_notes
 	\$prelude_beams
 	\$prelude_slurs
 	\$prelude_suggested_slurs
 >
 
-prelude = \melodic<
+prelude = \notes<
 	\$prelude_a
 	\$prelude_b
 >
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly	Thu Sep 17 14:31:26 1998
@@ -15,11 +15,11 @@
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "prelude-urtext.ly";
 
-prelude_viola_global = \melodic{
+prelude_viola_global = \notes{
 	\time 3/4;
 	\key f;
 	\clef alto;
@@ -27,11 +27,11 @@
 	\bar "|.";
 }
 
-prelude_viola_scripts = \melodic{
+prelude_viola_scripts = \notes{
 }
 
 prelude_viola_staff = \type Staff <
-	\melodic \transpose c' \$prelude
+	\notes \transpose c' \$prelude
 	\$prelude_viola_global
 	\$prelude_viola_scripts
 >
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly	Thu Sep 17 14:31:26 1998
@@ -15,11 +15,11 @@
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "sarabande-urtext.ly";
 
-sarabande_cello_global = \melodic{
+sarabande_cello_global = \notes{
 	\time 3/4;
 	\key f;
 	\clef bass;
@@ -29,7 +29,7 @@
 	\bar ":|";
 }
 
-sarabande_cello_scripts = \melodic{
+sarabande_cello_scripts = \notes{
 }
 
 sarabande_cello_staff = \type Staff <
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly	Thu May 14 10:38:21 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly	Thu Sep 17 16:12:57 1998
@@ -13,7 +13,7 @@
 %
 % ugh, the non-shortened beamstems of voice in forced direction
 % look ugly here!
-sarabande_a = \melodic \relative c {
+sarabande_a = \notes \relative c {
 	\voiceone \d[d8.()e16] e4.-\trill([d16 )e] |
 	f4. \onevoice [e8(d)c] |
 	[bes g']\n[f e16(f][g a bes)d,] |
@@ -51,7 +51,7 @@
 	d4 d,,2 |
 }
 
-sarabande_b = \melodic \relative c {
+sarabande_b = \notes \relative c {
 	\voicetwo
 % dispute
 %	d4 a2 |
@@ -87,7 +87,7 @@
 }
 
 
-sarabande = \type Staff \melodic<
+sarabande = \type Staff \notes<
 	\$sarabande_a
 	\$sarabande_b
 >
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly	Thu Sep 17 14:31:26 1998
@@ -15,11 +15,11 @@
  dotted slurs
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "sarabande-urtext.ly";
 
-sarabande_viola_global = \melodic{
+sarabande_viola_global = \notes{
 	\time 3/4;
 	\key f;
 	\clef alto;
@@ -29,11 +29,11 @@
 	\bar ":|";
 }
 
-sarabande_viola_scripts = \melodic{
+sarabande_viola_scripts = \notes{
 }
 
 sarabande_viola_staff = \type Staff <
-	\melodic \transpose c' \$sarabande
+	\notes \transpose c' \$sarabande
 	\$sarabande_viola_global
 	\$sarabande_viola_scripts
 >
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/wtk1-fugue1.ly ./mutopia/J.S.Bach/wtk1-fugue1.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/wtk1-fugue1.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/J.S.Bach/wtk1-fugue1.ly	Thu Sep 17 14:31:26 1998
@@ -11,16 +11,16 @@
 %{
 	
 %}
-\version "1.0.2";
+\version "1.0.3";
 
 
 global = 
-	\melodic {
+	\notes {
 	\time 4/4;                % should be \time C
 	}
 	
 tenor =
-	\melodic \relative c' {
+	\notes \relative c' {
 	\clef "violin";
 
 	\stemdown
@@ -61,7 +61,7 @@
 
 
 soprane =
-	\melodic \relative c' {
+	\notes \relative c' {
 
 	\stemup
 	r1 |
@@ -99,7 +99,7 @@
 	}
 
 alt =
-	\melodic \relative c {
+	\notes \relative c {
 	\clef "bass";
 
 	
@@ -139,7 +139,7 @@
 	}
 
 bass =
-	\melodic \relative c {
+	\notes \relative c {
 	\clef "bass";
 
 
@@ -180,7 +180,7 @@
 
 	
 \score {
-	\melodic \type GrandStaff < 
+	\notes \type GrandStaff < 
 		\type Staff = one <
 			\global 
 			\soprane
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/wtk1-fugue2.ly ./mutopia/J.S.Bach/wtk1-fugue2.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/wtk1-fugue2.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/J.S.Bach/wtk1-fugue2.ly	Thu Sep 17 14:31:26 1998
@@ -13,18 +13,18 @@
  Tested Features: stem direction, multivoice, forced accidentals.
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "nederlands.ly"                 % for correct parsing of note names
 
-global = \melodic {
+global = \notes {
   \time 4/4;
   \keysignature bes es as;
   \skip 1*31;
   \bar "|."; |
 }
   
-dux = \melodic \relative c'' {
+dux = \notes \relative c'' {
   \clef violin;
 
   \stemdown
@@ -72,7 +72,7 @@
 }
 
 
-comes = \melodic \relative c''  {
+comes = \notes \relative c''  {
   \stemup
 
   r1 |
@@ -115,7 +115,7 @@
 }
 
 
-bassdux = \melodic \relative c' {
+bassdux = \notes \relative c' {
   \clef bass;
 
   r1 |
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/wtk1-prelude1.ly ./mutopia/J.S.Bach/wtk1-prelude1.ly
--- ../lilypond-1.0.8/mutopia/J.S.Bach/wtk1-prelude1.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/J.S.Bach/wtk1-prelude1.ly	Thu Sep 17 14:31:26 1998
@@ -8,10 +8,10 @@
 copyright =	 "Public Domain";
 }
 
-\version "1.0.2";
+\version "1.0.3";
 
 global = 
-    \melodic {
+    \notes {
 	 \time 4/4;                % should be \time C
     }
   
@@ -19,7 +19,7 @@
 % should do programmable input.
 
 soprane =
-    \melodic \transpose c'' {
+    \notes \transpose c'' {
         \clef "violin";
 
 	\type Staff <
@@ -78,7 +78,7 @@
     }
 
 bass =
-    \melodic {
+    \notes {
         \clef "bass";
 
 
@@ -161,7 +161,7 @@
 
         
 \score {
-    \melodic \type GrandStaff < 
+    \notes \type GrandStaff < 
                   <
                        \global 
                        \soprane
diff -urN ../lilypond-1.0.8/mutopia/J.S.Bach/wtk1-prelude2.ly.m4 ./mutopia/J.S.Bach/wtk1-prelude2.ly.m4
--- ../lilypond-1.0.8/mutopia/J.S.Bach/wtk1-prelude2.ly.m4	Thu May 14 10:38:21 1998
+++ ./mutopia/J.S.Bach/wtk1-prelude2.ly.m4	Thu Sep 17 16:11:32 1998
@@ -12,7 +12,7 @@
 
 
 
-trebleIntro=\melodic \transpose c'' {
+trebleIntro=\notes \transpose c'' {
 handymeasure(c' es d c)
 handymeasure(as f e c)
 handymeasure(b f es d)
@@ -38,7 +38,7 @@
 handymeasure(as c B d)
 }
 
-bassIntro = \melodic {
+bassIntro = \notes {
 handymeasure(c g f es)
 handymeasure(c as g f)
 handymeasure(c as g f)
@@ -67,7 +67,7 @@
 }
 
 
-middlepiece = \melodic
+middlepiece = \notes
 {
 	\stemdown
 	[G B d] 
diff -urN ../lilypond-1.0.8/mutopia/W.A.Mozart/cadenza.ly ./mutopia/W.A.Mozart/cadenza.ly
--- ../lilypond-1.0.8/mutopia/W.A.Mozart/cadenza.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/W.A.Mozart/cadenza.ly	Thu Sep 17 14:31:26 1998
@@ -13,10 +13,10 @@
 Ugh.. Wish we had grace notes....  It adds another dimension to this
 piece of music.  %}
 
-\version "1.0.2";
+\version "1.0.3";
 
 
-cad = \melodic  \relative c' {
+cad = \notes  \relative c' {
 	\property Score.instrument = "french horn"
 	\type Staff {
 	\cadenza 1;
@@ -58,7 +58,7 @@
 	c4
 	}}
 \score {
-	\melodic { \cad }
+	\notes { \cad }
 	\midi { \tempo 4 = 90; }
 	\paper {
 	}
diff -urN ../lilypond-1.0.8/mutopia/W.A.Mozart/horn-concerto-3.ly ./mutopia/W.A.Mozart/horn-concerto-3.ly
--- ../lilypond-1.0.8/mutopia/W.A.Mozart/horn-concerto-3.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/W.A.Mozart/horn-concerto-3.ly	Thu Sep 17 14:31:26 1998
@@ -9,10 +9,10 @@
 }
 
 
-\version "1.0.2";
+\version "1.0.3";
 
 allegro =
-	\melodic
+	\notes
 	\relative c'
 {
 	\time 4/4;
@@ -147,7 +147,7 @@
 	
 }
 
-romanze = \melodic \relative c' {
+romanze = \notes \relative c' {
 
 	\key F;
 	\time 2/2;
@@ -213,7 +213,7 @@
 	 \bar "|.";
 }
 
-rondotheme = \melodic \relative c' {
+rondotheme = \notes \relative c' {
 	[c'8 c c] [c c c]
 	c4( cis8 )d r g,
 	[d'8 d d] [d d d]
@@ -224,7 +224,7 @@
 	e4.()d8 r r |
 }
 
-lipbreaker = \melodic \relative c'
+lipbreaker = \notes \relative c'
 {
  	r8 [g'-. g-.] [c()e g,-.]
 	[c()e g,-.] [c()e g,-.]
@@ -232,7 +232,7 @@
 	[c c c] [c c c]
 }
 
-rondo = \melodic 	\relative c'
+rondo = \notes 	\relative c'
 {
 	\partial 8;
 	g'8 |
diff -urN ../lilypond-1.0.8/mutopia/gallina.ly ./mutopia/gallina.ly
--- ../lilypond-1.0.8/mutopia/gallina.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/gallina.ly	Thu Sep 17 14:31:26 1998
@@ -45,9 +45,9 @@
 definition below. --MB
 %} 
 
-\version "1.0.2";
+\version "1.0.3";
 
-vi1=\melodic \relative c'' {
+vi1=\notes \relative c'' {
   \time 4/4;
 
   [d8 d d d] d4 [a16 b c a] |
@@ -117,7 +117,7 @@
   \bar "|.";
 }
 
-vi2=\melodic \relative c'' {
+vi2=\notes \relative c'' {
   \time 4/4;
 
   r1 | r | r | 
@@ -183,7 +183,7 @@
 }
 
 
-bc=\melodic\transpose c'{
+bc=\notes\transpose c'{
   \clef "bass";
   \time 4/4;
 
diff -urN ../lilypond-1.0.8/mutopia/los-toros-oboe.ly ./mutopia/los-toros-oboe.ly
--- ../lilypond-1.0.8/mutopia/los-toros-oboe.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/los-toros-oboe.ly	Thu Sep 17 14:31:26 1998
@@ -8,7 +8,7 @@
 copyright =	 "public domain";
 latexheaders=    "headers";
 } 
-\version "1.0.2";
+\version "1.0.3";
 
 %{
 Silly latex file dropped; use ly2dvi
@@ -27,7 +27,7 @@
 
 \include "paper16.ly"
 
-hoboonestart = \melodic
+hoboonestart = \notes
   \relative c'{
 % ugh: cant copy: allegro/primo tempo
 	\property Voice . textstyle =  "large"
@@ -35,7 +35,7 @@
 	\property Voice . textstyle =  "italic"
 }
 
-hobooneintro = \melodic  \relative c'{
+hobooneintro = \notes  \relative c'{
 
 %	\property Voice . textstyle =  "roman"
 %	[es''16-.-"Allegro" es-. es-. es-.] [es8-. d-.] |
@@ -60,7 +60,7 @@
 	[)g8  r d'] r |
 }
 
-hoboonemid = \melodic	\relative c'{
+hoboonemid = \notes	\relative c'{
 
 	[g'16-. g-. g-. g-.] [g8-. f-.] |
 	as2-> |
@@ -151,7 +151,7 @@
 }
 
 
-hoboonesecondstart = \melodic   \relative c'{
+hoboonesecondstart = \notes   \relative c'{
 
 % ugh: cant copy: allegro/primo tempo
 	\property Voice . textstyle =  "large"
@@ -160,7 +160,7 @@
 	
 }
 	
-hoboonelast = \melodic   \relative c'{
+hoboonelast = \notes   \relative c'{
 	% could transpose/copy from measure 19...
 	[d''16-.\p  d-. d-. d-.] [d8-. c-.] |
 	es2-> |
@@ -272,7 +272,7 @@
 	g8-. r r4 |
 }
 
-hoboone = \melodic {
+hoboone = \notes {
 	\hoboonestart
 	\hobooneintro
 	\hoboonemid
@@ -281,7 +281,7 @@
 	\hoboonelast
 }
 
-global = \melodic{
+global = \notes{
 	\key es;
 	\time 2/4;
 	\skip 4*110;
diff -urN ../lilypond-1.0.8/mutopia/standchen-16.ly ./mutopia/standchen-16.ly
--- ../lilypond-1.0.8/mutopia/standchen-16.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/standchen-16.ly	Thu Sep 17 14:31:26 1998
@@ -9,6 +9,6 @@
 copyright =	 "public domain";
 } 
 
-\version "1.0.2";
+\version "1.0.3";
 
 \include "standchen.ly"
diff -urN ../lilypond-1.0.8/mutopia/standchen-20.ly ./mutopia/standchen-20.ly
--- ../lilypond-1.0.8/mutopia/standchen-20.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/standchen-20.ly	Thu Sep 17 14:31:26 1998
@@ -9,7 +9,7 @@
 description = "A schubert song in 20 pt";
 } 
 
-\version "1.0.2";
+\version "1.0.3";
 
 % fool make-website
 % \include "standchen.ly";
diff -urN ../lilypond-1.0.8/mutopia/standchen.ly ./mutopia/standchen.ly
--- ../lilypond-1.0.8/mutopia/standchen.ly	Mon Sep 14 11:10:36 1998
+++ ./mutopia/standchen.ly	Thu Sep 17 14:31:26 1998
@@ -16,9 +16,9 @@
 Note: Original key F.
 %}
 
-\version "1.0.2";
+\version "1.0.3";
 
-$vocal_verse1 = \melodic\relative c{
+$vocal_verse1 = \notes\relative c{
 	% ugh: treble/bass
 %	\clef treble;
 %	\clef violin;
@@ -58,7 +58,7 @@
 	c!2. |
 }
 
-$vocal_through = \melodic\relative c{
+$vocal_through = \notes\relative c{
 	\property Voice.dynamicdir=1
 	g''8. g16 b8. b16 d8. d16 |
 	c4 b r |
@@ -166,7 +166,7 @@
 	mich!2 _4 |
 }
 
-$treble_intro = \melodic\relative c{
+$treble_intro = \notes\relative c{
 	\clef violin;
 	% ugh: id like to type this!
 	%r8\pp [<g'-. c-.> <c-. es-.> <g-. c-.> <c-. es-.> <g-. c-.>] |
@@ -177,7 +177,7 @@
 	\break
 }
 
-$treble_verse1 = \melodic\relative c{
+$treble_verse1 = \notes\relative c{
 %	\clef violin;
 	%5
 	r8 <[g' c> <c es> <g c> <c es> <g c]> |
@@ -210,7 +210,7 @@
 	<{[/3 f'8\f( e f]1/1 a4.-> )f8 } {\[/3 f' e f \]/1 a4. f8 } > |
 }
 
-$treble_eentje = \melodic\relative c'{
+$treble_eentje = \notes\relative c'{
 	<e2 e'> <e4 g>|
 	<f2\mf as!(> <[as8.->( c> <)f16 )as]> |
 	<e4. g> <[e8-. g-.(> <e-. g-.> <e-. )g-.]> |
@@ -223,7 +223,7 @@
 	<e2. g> |
 }
 
-$treble_through = \melodic\relative c'{
+$treble_through = \notes\relative c'{
 	<e2. e'> |
 	%61
 	R2. |
@@ -271,7 +271,7 @@
 	<g2.-\fermata e' g> |
 }
 
-$bass_intro = \melodic\relative c{
+$bass_intro = \notes\relative c{
 	\clef bass;
 	\property Voice.dynamicdir=1
 %1
@@ -281,7 +281,7 @@
 	<g2 g'> r4 |
 }
 
-$bass_verse1 = \melodic\relative c{
+$bass_verse1 = \notes\relative c{
 %	\clef bass;
 	\property Voice.dynamicdir=1
 %5
@@ -313,7 +313,7 @@
 	c,8 <[c' e g> <e g c> <c e g> <e g c> <c e g]> |
 }
 
-$bass_eentje = \melodic\relative c{
+$bass_eentje = \notes\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]> |
@@ -325,7 +325,7 @@
 	c,8 <[e' g> <g c> <e g> <g c> <e g]> |
 }
 
-$bass_through = \melodic\relative c{
+$bass_through = \notes\relative c{
 	\property Voice.dynamicdir=1
 	%61
 	<g,8^"cresc." g'> <[g' b d> <b d f> <g b d> <as!-> b-> d->> <b d f]> |
@@ -359,7 +359,7 @@
 	<c,2._\fermata g' c> |
 }
 		
-global = \melodic{
+global = \notes{
 	\time 3/4; 
 	\key es;
 	\skip 4 * 12;
@@ -392,7 +392,7 @@
 	\$lyrics
 >
 		
-vocals = \melodic{
+vocals = \notes{
 	\property Voice.dynamicdir=UP
 	\skip 4 * 12; 
 	\$vocal_verse1 
@@ -444,9 +444,9 @@
 	% To get original, \transpose d'
 	% \transpose a gives a' to d'' (for basses, who sing an octave down)
 	<
-		{ \melodic \transpose a { \$vocal_staff } }
+		{ \notes \transpose a { \$vocal_staff } }
 		\$lyric_staff
-		{ \melodic \transpose a { \$grand_staff } }
+		{ \notes \transpose a { \$grand_staff } }
 	>
 	\include "score-paper.ly";
 	\midi{
diff -urN ../lilypond-1.0.8/scripts/convert-mudela.py ./scripts/convert-mudela.py
--- ../lilypond-1.0.8/scripts/convert-mudela.py	Mon Sep 14 11:10:36 1998
+++ ./scripts/convert-mudela.py	Thu Sep 17 14:31:19 1998
@@ -17,7 +17,6 @@
 version = '0.2'
 
 
-
 import os
 import sys
 import __main__
@@ -181,6 +180,17 @@
 	
 	conversions.append ((1,0,2), conv, '\header { key = concat + with + operator }\n')
 
+if 1:
+	def conv(lines):
+		newlines =[]
+		for x in lines:
+			x =  regsub.gsub ('\\\\melodic', '\\\\notes',x)
+			newlines.append (x)
+		return newlines
+	
+	conversions.append ((1,0,3), conv, '\melodic -> \notes\n')
+
+
 ############################
 
 def get_conversions (from_version, to_version):
@@ -219,6 +229,7 @@
 	pass
 
 def do_one_file (infile_name):
+	sys.stderr.write ('Processing `%s\' ... '% infile_name)
 	outfile_name = ''
 	if __main__.edit:
 		outfile_name = infile_name + '.NEW'
diff -urN ../lilypond-1.0.8/stepmake/NEWS ./stepmake/NEWS
--- ../lilypond-1.0.8/stepmake/NEWS	Mon Sep 14 17:51:34 1998
+++ ./stepmake/NEWS	Thu Sep 17 13:35:59 1998
@@ -1,3 +1,7 @@
+pl 50
+	- bf's: PATHSEP
+	- png
+
 pl 49
 	- use yodl2ms and striproff for txt conversion
 	- bf: chmod fail
diff -urN ../lilypond-1.0.8/stepmake/VERSION ./stepmake/VERSION
--- ../lilypond-1.0.8/stepmake/VERSION	Mon Sep 14 17:51:34 1998
+++ ./stepmake/VERSION	Thu Sep 17 13:35:59 1998
@@ -1,7 +1,7 @@
 PACKAGE_NAME=StepMake
 MAJOR_VERSION=0
 MINOR_VERSION=1
-PATCH_LEVEL=49
+PATCH_LEVEL=50
 MY_PATCH_LEVEL=
 
 # use the above to send patches, always empty for released version:
diff -urN ../lilypond-1.0.8/stepmake/aclocal.m4 ./stepmake/aclocal.m4
--- ../lilypond-1.0.8/stepmake/aclocal.m4	Mon Sep 14 17:51:34 1998
+++ ./stepmake/aclocal.m4	Thu Sep 17 13:42:16 1998
@@ -5,6 +5,7 @@
     # -O is necessary to get inlining
     OPTIMIZE=""
     CXXFLAGS=${CXXFLAGS:-""}
+    CFLAGS=${CFLAGS:-""}
     checking_b=yes
     optimise_b=no
     profile_b=no
@@ -262,8 +263,10 @@
     AC_SUBST(LN)
     AC_SUBST(LN_S)
     AC_SUBST(INSTALL)
-   AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}')
-     AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}')
+    AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}')
+    AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}')
+    AC_SUBST(PATHSEP)
+    AC_SUBST(DIRSEP)
   
    
     AC_STEPMAKE_DATADIR
diff -urN ../lilypond-1.0.8/stepmake/bin/package-diff.py ./stepmake/bin/package-diff.py
--- ../lilypond-1.0.8/stepmake/bin/package-diff.py	Thu May 14 10:38:22 1998
+++ ./stepmake/bin/package-diff.py	Thu Sep 17 13:35:11 1998
@@ -79,8 +79,8 @@
 
 	# should do 'make distclean ?'
 	os.system ('rm -rf debian/out')
-	os.system ('rm -f Makefile config.cache config.h config.hh config.log config.make config.status')
-	os.system ('rm -f stepmake/Makefile stepmake/config.hh stepmake/config.log stepmake/config.make')
+	os.system ('rm -f GNUmakefile config.cache config.h config.hh config.log config.make config.status configure')
+	os.system ('rm -f stepmake/GNUmakefile stepmake/config.hh stepmake/config.log stepmake/config.status stepmake/config.make')
 
 	# ugh: symlinks
 	os.system ('rm -f stepmake/stepmake/stepmake')
@@ -140,9 +140,10 @@
 	if i == -1:
 		f.write (to_str + '\n')
 	else:
-		i = i + len (version_tuple_to_str (flags.to_version)) + 1
+		i = i + len (version_tuple_to_str (flags.to_version))
 		state_vec = state_vec[:i]
 		f.write (state_vec)
+		f.write ('\n')
 	f.write ('++state\n')
 	f.close ()
 			
diff -urN ../lilypond-1.0.8/stepmake/bin/package-zip.sh ./stepmake/bin/package-zip.sh
--- ../lilypond-1.0.8/stepmake/bin/package-zip.sh	Thu May 14 10:38:22 1998
+++ ./stepmake/bin/package-zip.sh	Thu Sep 17 13:35:59 1998
@@ -44,6 +44,7 @@
 ./configure --host=i386-pc-linux --target=i386-pc-cygwin32 --prefix=/usr --enable-debugging --enable-printing --enable-checking
 
 make
+make -C Documentation info || true
 rm -rf $builddir
 make prefix="$builddir/usr" DOTEXE=.exe install
 make prefix="$builddir/usr" installextradoc
diff -urN ../lilypond-1.0.8/stepmake/bin/package-zip32.sh ./stepmake/bin/package-zip32.sh
--- ../lilypond-1.0.8/stepmake/bin/package-zip32.sh	Thu May 14 10:38:22 1998
+++ ./stepmake/bin/package-zip32.sh	Thu Sep 17 13:35:59 1998
@@ -50,6 +50,9 @@
     exit 1
 fi
 
+# failure allowed
+make -C Documentation info
+
 if ! make install ; then
     echo "make install failed"
     exit 1
diff -urN ../lilypond-1.0.8/stepmake/config.make.in ./stepmake/config.make.in
--- ../lilypond-1.0.8/stepmake/config.make.in	Mon Sep 14 17:51:34 1998
+++ ./stepmake/config.make.in	Thu Sep 17 13:35:59 1998
@@ -48,6 +48,7 @@
 LN = @LN@
 LN_S = @LN_S@
 MSGFMT = @MSGFMT@
+PATHSEP = @PATHSEP@
 PERL = @PERL@
 PYTHON = @PYTHON@
 TAR= @TAR@
diff -urN ../lilypond-1.0.8/stepmake/stepmake/documentation-rules.make ./stepmake/stepmake/documentation-rules.make
--- ../lilypond-1.0.8/stepmake/stepmake/documentation-rules.make	Mon Sep 14 17:51:34 1998
+++ ./stepmake/stepmake/documentation-rules.make	Thu Sep 17 13:35:59 1998
@@ -3,10 +3,13 @@
 # special rules for the documentation section.
 # There are too many to add to the general rules
 
-.SUFFIXES: .1 .data .html .gif .xpm .tex .txt
+.SUFFIXES: .1 .data .html .gif .png .tex .txt .xpm
 
 $(outdir)/%.gif: %.xpm
 	xpmtoppm $< | ppmtogif > $@
+
+$(outdir)/%.png: %.xpm
+	xpmtoppm $< | pnmtopng > $@
 
 # use striproff?
 $(outdir)/%.txt: $(outdir)/%.1
diff -urN ../lilypond-1.0.8/stepmake/stepmake/metafont-rules.make ./stepmake/stepmake/metafont-rules.make
--- ../lilypond-1.0.8/stepmake/stepmake/metafont-rules.make	Thu May 14 10:38:22 1998
+++ ./stepmake/stepmake/metafont-rules.make	Wed Sep 16 00:31:45 1998
@@ -14,4 +14,4 @@
 $(outdir)/%.tfm: %.mf
 	mf '\mode:=ljfour;  input $<;'
 	mv $(@F) $(outdir)
-	rm $(basename $<).*{gf,log}
+	rm $(basename $<).gf $(basename $<).log
diff -urN ../lilypond-1.0.8/stepmake/stepmake/yolily-topdoc-targets.make ./stepmake/stepmake/yolily-topdoc-targets.make
--- ../lilypond-1.0.8/stepmake/stepmake/yolily-topdoc-targets.make	Thu May 14 10:38:22 1998
+++ ./stepmake/stepmake/yolily-topdoc-targets.make	Thu Sep 17 13:35:59 1998
@@ -10,7 +10,7 @@
 	$(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=index.html --news=$(depth)/NEWS $@
 
 local-WWW:
-	-cp $(outdir)/*gif $(outdir)/index.html $(depth)  # don't fail if not making website
+	-cp $(outdir)/*png $(outdir)/index.html $(depth)  # don't fail if not making website
 
 
 copy-to-top: 
diff -urN ../lilypond-1.0.8/stepmake/stepmake/yolily-toplevel-targets.make ./stepmake/stepmake/yolily-toplevel-targets.make
--- ../lilypond-1.0.8/stepmake/stepmake/yolily-toplevel-targets.make	Thu May 14 10:38:22 1998
+++ ./stepmake/stepmake/yolily-toplevel-targets.make	Thu Sep 17 13:35:59 1998
@@ -19,7 +19,7 @@
 	find `find Documentation -type d -name 'out-www'` -not -name '*dvi' -not -name '*ly' -not -name '*tex' -not -name '*.ps' -not -name 'out-www' > wwwlist
 	-ln -f $(patch-dir)/$(distname).diff.gz out-www
 	-ln -f $(depth)/$(distname).diff.gz out-www
-	tar cfz $(outdir)/htmldoc.tar.gz  `cat wwwlist` `ls *.gif out-www/$(distname).diff.gz $(ERRORLOG)`  index.html
+	tar cfz $(outdir)/htmldoc.tar.gz  `cat wwwlist` `ls *.png out-www/$(distname).diff.gz $(ERRORLOG)`  index.html
 
 
 # if you fix this, please fix yodl too!
diff -urN ../lilypond-1.0.8/tex/lilyponddefs.tex ./tex/lilyponddefs.tex
--- ../lilypond-1.0.8/tex/lilyponddefs.tex	Mon Sep 14 18:18:05 1998
+++ ./tex/lilyponddefs.tex	Wed Sep 16 16:00:37 1998
@@ -135,7 +135,6 @@
 
 
 % stacked horizontal lines 
-
 \def\interscoreline{\vskip 16pt}
 \def\setdynamic#1{\dynfont #1}
 \def\setfinger#1{\fingerfont #1}
@@ -229,11 +228,12 @@
 
 %
 % macros suck. \ifundefined{nolilyfooter} gives wierd errors from time
-%        to time. 
+%        to time.
+%
 \ifx\csname nolilyfooter\endcsname\relax
-	\message{footer defined}%
+        \message{footer defined}%
         \csname lilyfooter\texsuffix\endcsname
 \else
-	\message{page empty!}
-	\csname nolilyfooter\texsuffix\endcsname
+        \message{page empty!}
+        \csname nolilyfooter\texsuffix\endcsname
 \fi
