Generated by hanwen@cs.uu.nl,
From = lilypond-1.5.28, To = lilypond-1.5.29

usage 

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

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

diff -purN ../lilypond-1.5.28/ChangeLog ./ChangeLog
--- ../lilypond-1.5.28/ChangeLog	Sat Dec 29 20:32:31 2001
+++ ./ChangeLog	Fri Feb  1 19:18:37 2002
@@ -1,3 +1,70 @@
+2002-02-01  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+	* VERSION: 1.5.29 released
+
+	* all files: change 2001 to 2002 in headers globally
+
+	* mf/parmesan20.mf: split out ancient notation into parmesan ("old
+	cheese") font. WARNING: fonts changed.
+	
+2002-02-01  Juergen Reuter <reuter@ipd.uka.de>
+
+	* mf/*.mf: Fixed some blot_diameter related flaws in some feta symbols
+	
+	* mf/*.mf: Added some more vaticana/solesmes style font symbols
+	
+	* mf/*.mf: Bugfix: renamed subbipunctum -> inclinatum
+
+	* mf/*.mf: Fixed a few typos in various .mf files
+
+2002-01-17 Rune Zedeler <rune@zedeler.dk>
+ 
+ 	* mf/: added macro soft_penstroke
+	
+ 	       softened some glyphs
+ 	       redrawn triangular noteheads
+ 	       redrawn tab-clef
+ 	       added classical quarter rest
+ 	
+ 	* lily/stem.cc: Bugfix: Stem-attachment when staff_space!=1
+ 
+ 	* lily/bar.cc: Bugfix: repeat dots when even number of staff
+ 	lines and staff_space>=2
+ 
+ 	* lily/rest.cc: Use default rests when current style glyphs not
+ 	found - this allows
+ 	\property Staff.Rest \override #'style = #'classical
+
+2002-01-30  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* input/bugs/first-tie.ly: New file.
+
+	* input/bugs/spacing-clash.ly: New file.
+
+2002-01-29  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* po: regenerate.
+
+2002-1-24 Chris Jackson <chris@fluffhouse.org.uk>
+
+	* lilypond-indent.el: New file providing indentation for
+	parenthesised blocks of lilypond code in Emacs
+	
+	* lilypond-font-lock.el: Changes to the syntax table to facilitate
+	indentation and handle block comments properly. Distinguish
+	accents from close-brackets in fontification.
+
+	* lilypond-mode.el: LilyPond-indent-command set appropriately.
+
+2002-01-22  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* Documentation/windows/installing.texi: 
+	* Documentation/windows/compiling.texi: Include from 1.4.10.
+
+	* Documentation/windows/gs-profile.sh: previously lily-gs.sh
+
+	* input/bugs/first-midi-tie.ly: New file.
+
 2001-12-29  Han-Wen  <hanwen@cs.uu.nl>
 	
 	* VERSION: 1.5.28 released
diff -purN ../lilypond-1.5.28/Documentation/topdocs/AUTHORS.texi ./Documentation/topdocs/AUTHORS.texi
--- ../lilypond-1.5.28/Documentation/topdocs/AUTHORS.texi	Thu Oct 11 17:29:20 2001
+++ ./Documentation/topdocs/AUTHORS.texi	Thu Jan 31 14:12:29 2002
@@ -29,7 +29,7 @@ list is alphabetically ordered.
     accidental transposition.
 @item Laura Conrad (lconrad@@world.std.com)
     fixes to abc2ly
-@item @email{Jan.A.Fagertun@@energy.sintef.no, Jan Arne Fagertun},
+@item @email{Jan.A.Fagertun@@trondheim.online.no, Jan Arne Fagertun},
     @TeX{} titling and lytodvi.sh
 @item @email{foka@@debian.org, Anthony Fok}, 
     Debian package: debian/*
@@ -37,6 +37,8 @@ list is alphabetically ordered.
     American chord names, gnu-windows testing
 @item @email{bjoern.jacke@@gmx.de, Bjoern Jacke}
     German glossary stuff.
+@item @email{chris@@fluffhouse.org.uk, Chris Jackson},
+    Emacs mode indentation, directed arpeggios.
 @item @email{nj104@@cus.cam.ac.uk, Neil Jerram}. 
     parts of Documentation/Vocab*
 @item @email{heikki.junes@@hut.fi, Heikki Junes}. 
diff -purN ../lilypond-1.5.28/Documentation/user/refman.itely ./Documentation/user/refman.itely
--- ../lilypond-1.5.28/Documentation/user/refman.itely	Sat Dec 29 20:30:41 2001
+++ ./Documentation/user/refman.itely	Sat Dec 29 23:01:18 2001
@@ -3977,11 +3977,17 @@ A bar check is entered using the bar sym
   \time 3/4 c2 e4 | g2.
 @end example
 
+
+
 @cindex skipTypesetting
 
-Bar checks are not affected by @code{skipTypesetting}, so if you are
-debugging a large score, you are advised to run it with skipTypesetting
-first to correct all overfull and underfull measures.
+Failed bar checks are most often caused by entering incorrect
+durations. Incorrect durations often completely garble up the score,
+especially if it is polyphonic, so you should start correcting the score
+by scanning for failed bar checks and incorrect durations.  To speed up
+this process, you can use @code{skipTypesetting} (See @ref{Skipping
+corrected music})). Bar
+
 
 @c .  {Point and click}
 @node Point and click
diff -purN ../lilypond-1.5.28/Documentation/user/tutorial.itely ./Documentation/user/tutorial.itely
--- ../lilypond-1.5.28/Documentation/user/tutorial.itely	Wed Nov 21 22:46:56 2001
+++ ./Documentation/user/tutorial.itely	Fri Feb  1 19:04:32 2002
@@ -1042,7 +1042,7 @@ note have real pitch @code{g'}.  The @co
 @end example 
 Two more notes, with pitch @code{a} and @code{b}.  Because their
 duration is the same as the @code{g,8}, there is no need to enter the
-duration, but you may enter it anyway, i.e., @code{a4 b4}
+duration, but you may enter it anyway, i.e., @code{a8 b8}
 @separate
 @example 
 
diff -purN ../lilypond-1.5.28/Documentation/windows/compiling.texi ./Documentation/windows/compiling.texi
--- ../lilypond-1.5.28/Documentation/windows/compiling.texi	Wed Dec  5 14:53:28 2001
+++ ./Documentation/windows/compiling.texi	Thu Jan 31 13:17:54 2002
@@ -1,3 +1,11 @@
+\input texinfo @c -*-texinfo-*-
+@setfilename compiling.info
+@settitle Compiling LilyPond on Windows
+
+@html
+<!--- @@WEB-TITLE@@=Windows Compilation --->
+@end html
+
 @section Obtaining LilyPond
 
 You can get the latest version of LilyPond at
@@ -8,11 +16,11 @@ ftp://ftp.lilypond.org/pub/LilyPond/}.
 You need the following packages to compile Lilypond on Windows.
 
 @table @code
-@item The GNU + Cygnus tools, 1.3.2 or newer.
+@item The GNU + Cygnus tools, 1.3.6 or newer.
 Check out the @uref{http://sources.redhat.com/cygwin,Cygwin webpage}.
 You can get the latest version of the GNU + Cygnus tools from cygnus
 @uref{http://sources.redhat.com/cygwin/mirrors.html,mirror site}.
-Install everything, including tetex.
+Install everything, including tetex and texmf.
 @item GUILE 1.4, or newer.
 Check out the @uref{http://www.gnu.org/software/guile.html,GUILE
 webpage}.  You may need the patch @file{guile-1.4-gnu-windows.patch}
@@ -47,55 +55,44 @@ Apply this patch to the @file{cinstall} 
 @file{winsup-src/cinstall}, to get the LilyPond installer.
 
 Compiling @file{setup.exe} has been complicated a bit with the
-introduction of the non-feature bzip2.  Here's how I did it:
+introduction of the bzip2 feature.  Here's how I did it:
 @quotation
 @example
-    mkdir cygwin-20011202 && cd cygwin-20011202
+    mkdir cygwin-20020129 && cd cygwin-20020129
     export CVSROOT=:pserver:anoncvs@@anoncvs.cygnus.com:/cvs/src
     touch $HOME/.cvspass
     cvs login
-    cvs -z3 co -D20011202 winsup
+    cvs -z3 co -D20020129 winsup
     cd src/winsup/cinstall
     patch < $HOME/usr/src/lilypond/Documentation/windows/cygwin-installer.patch
-    autoconf
-    cd ../bz2lib
-    MINGW32=yes CFLAGS='-mno-cygwin' ./configure
-    make
-    cd -
-    MINGW32=yes CFLAGS='-mno-cygwin' ./configure
-    CYGWIN=$HOME/usr/src/cygwin/cygwin-1.3.5
-    cp $CYGWIN/usr/lib/mingw/crt2.o .
+    (cd ../bz2lib; ./configure; make)
+    ./configure
+    CYGWIN=$HOME/usr/src/cygwin/cygwin-1.3.6
     cp $HOME/usr/src/lilypond/Documentation/windows/LilyPond.ico .
     make w32api_lib=$CYGWIN/usr/lib/w32api \
         CXX="g++ -L$CYGWIN/usr/lib/mingw"
-    cp -pv setup.exe $CYGWIN/dist/cygwin-1.3.5/new-setup.exe
-    strip $CYGWIN/dist/cygwin-1.3.5/new-setup.exe
+    cp -pv setup.exe $CYGWIN/dist/cygwin-1.3.6/new-setup.exe
+    strip $CYGWIN/dist/cygwin-1.3.6/new-setup.exe
 @end example
 @end quotation
 @item @var{--prefix=/usr/lilypond-x.y.x}
 The standard binary installation installs LilyPond into its own prefix.
 We think it's silly, but do this is on special request of Windows users.
 @item @file{fix-suffixes.sh}
-Add @file{.exe} to binary executables, add @file{.py} to Python scripts.
-@item @file{python-wrapper.sh}
-All python scripts get a wrapper script to make direct invocation easier.
-@item @file{latex-wrapper.sh}
-TeX and LaTeX get a wrapper script that changes the TEX path variables
-to DOS style, which is needed by non-Cygwin TeX, that's currently used.
+Add @file{.exe} to binary executables.
 @item @file{/etc/postinstall/}
-A number of post installation scripts try to set registry entries and
-symlinks that are needed for the additional windows packages.
+A post installation script that updates a symlink.
 @item @file{/etc/profile.d/}
 A number of login profile scripts set environment vars, every time you
 start the LilyPond/Cygwin shell (or Bash, for that matter).
 @end table
 
-These scripts and tricks are known to work in some cases, but are
-woefully incomplete.  If you find a bug, please send us your fix.
+These scripts and tricks are known to work, but may be incomplete.  If
+you find a bug, please send us your fix.
 
 Windows users have indicated that a DOS style login (as supposed to the
 LilyPond/Cygwin shell), would be useful.  We don't enjoy DOS scripting,
 and think users should try the bash shell, which is better suited for
-typing in commands.  However, if you have written useful DOS login
-scripts, please send us your code.
-
+typing in commands.  It really helps a lot and pays off to read some
+introduction to this Bash shell.  However, if you have written useful
+DOS login scripts, please send us your code.
diff -purN ../lilypond-1.5.28/Documentation/windows/cygwin-installer.patch ./Documentation/windows/cygwin-installer.patch
--- ../lilypond-1.5.28/Documentation/windows/cygwin-installer.patch	Wed Dec  5 14:53:28 2001
+++ ./Documentation/windows/cygwin-installer.patch	Thu Jan 31 13:17:54 2002
@@ -1,75 +1,38 @@
-diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/ChangeLog ./ChangeLog
---- ../cinstall.orig/ChangeLog	Sat Dec  1 00:36:20 2001
-+++ ./ChangeLog	Sun Dec  2 17:21:40 2001
-@@ -1,3 +1,22 @@
-+2001-12-02  Jan Nieuwenhuizen  <janneke@gnu.org>
+diff -purN --exclude=*~ ../cinstall.orig/ChangeLog ./ChangeLog
+--- ../cinstall.orig/ChangeLog	Tue Jan 29 21:50:51 2002
++++ ./ChangeLog	Tue Jan 29 22:29:56 2002
+@@ -1,3 +1,20 @@
++2002-01-29  Jan Nieuwenhuizen  <janneke@gnu.org>
 +
-+	* configure.in (CXXFLAGS): bugfix.
++	* site.cc (OnMessageCmd): Bugfix: don't try to add NULL url.
 +
-+	* mklink2.c: Compile fix.
-+
-+	* Forward ported patch to cvs -D20011202.
++	* Forward port patch to cvs -D20020129.
 +	
-+	* Makefile.in: Fixed realclean target.
++	* mklink2.c: Compile fix.
 +
-+	* desktop.cc: Removed spurious line breaks from etc_profile.
++	* desktop.cc: Remove spurious line breaks from etc_profile.
 +	(make_lily_bat): New function.
-+	(save_icon): Parametrized.
-+	(do_desktop_setup): LilyPond support; disabled Cygwin support.
++	(save_icon): Parametrize.
++	(do_desktop_setup): LilyPond support; disable Cygwin support.
 +
 +	* res.rc: Adapted for LilyPond.
 +
 +	* ini.cc (fprintf): Cygwin -> GNU LilyPond
 +
- 2001-12-01  Robert Collins  <rbtcollins@hotmail.com>
+ 2002-01-29  Christopher Faylor  <cgf@redhat.com>
  
- 	* package_source.cc (packagesource::set_canonical): Filename was out by one.
-@@ -2336,4 +2355,4 @@ Sat Apr  1 20:48:09 2000  Christopher Fa
+ 	* configure: Regenerate.
+@@ -3288,4 +3305,4 @@ Sat Apr  1 20:48:09 2000  Christopher Fa
  	* zlib/Makefile.in: Regenerate from Makefile.am
  
- %%% $Id: ChangeLog,v 2.155 2001/11/30 23:36:20 rbcollins Exp $
--$Revision: 2.155 $
-+$Revision: 2.155.jcn1 $
+ %%% $Id: ChangeLog,v 2.189 2002/01/29 14:43:57 cgf Exp $
+-$Revision: 2.189 $
++$Revision: 2.189.jcn1 $
 Binary files ../cinstall.orig/LilyPond.ico and ./LilyPond.ico differ
-diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/Makefile.in ./Makefile.in
---- ../cinstall.orig/Makefile.in	Fri Nov 30 13:25:00 2001
-+++ ./Makefile.in	Sun Dec  2 17:38:37 2001
-@@ -35,7 +35,7 @@ CC		:= @CC@
- CC_FOR_TARGET	:= $(CC)
- CXX		:= @CXX@
- 
--CFLAGS		:= @CFLAGS@ -Werror -Winline -Wall -Wpointer-arith -Wcast-align\
-+CFLAGS		:= @CFLAGS@ -Winline -Wall -Wpointer-arith -Wcast-align\
- 	-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
- 	-Wmissing-declarations -Wcomments
- CXXFLAGS	:= @CXXFLAGS@ $(CFLAGS) -fno-exceptions -fno-rtti
-@@ -167,7 +167,9 @@ clean:
- 	$(MAKE) -C zlib clean
- 
- realclean: clean
--	rm -f  Makefile config.cache
-+	rm -f Makefile *.d version.c
-+	rm -f config.cache config.log config.status
-+	$(MAKE) -C zlib realclean
- 
- install: all
- 	$(SHELL) $(updir1)/mkinstalldirs $(bindir) $(etcdir)
-diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/configure.in ./configure.in
---- ../cinstall.orig/configure.in	Mon Dec 11 01:07:56 2000
-+++ ./configure.in	Sun Dec  2 17:23:33 2001
-@@ -64,7 +64,7 @@ if test -z "$CXX"; then
-   test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
- fi
- 
--CXXFLAGS='$(CFLAGS)'
-+CXXFLAGS="$CFLAGS"
- ])
- 
- AC_CANONICAL_SYSTEM
-diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/desktop.cc ./desktop.cc
---- ../cinstall.orig/desktop.cc	Thu Nov 29 10:52:32 2001
-+++ ./desktop.cc	Sun Dec  2 17:00:31 2001
-@@ -81,9 +81,7 @@ static const char *etc_profile[] = {
+diff -purN --exclude=*~ ../cinstall.orig/desktop.cc ./desktop.cc
+--- ../cinstall.orig/desktop.cc	Tue Jan 29 10:24:32 2002
++++ ./desktop.cc	Tue Jan 29 10:33:01 2002
+@@ -83,9 +83,7 @@ static const char *etc_profile[] = {
    "done",
    "",
    "export MAKE_MODE=unix",
@@ -79,8 +42,8 @@ diff -purN --exclude=*~ --exclude=config
 +  "export PS1='\\[\\033]0;\\w\\007\\033[32m\\]\\u@\\h \\[\\033[33m\\w\\033[0m\\]$ '",
    "",
    "cd \"$HOME\"",
-   "",
-@@ -204,6 +202,34 @@ make_cygwin_bat ()
+   0
+@@ -204,6 +202,35 @@ make_cygwin_bat ()
  }
  
  static void
@@ -102,20 +65,21 @@ diff -purN --exclude=*~ --exclude=config
 +  fprintf (bat, "chdir %s\n\n",
 +	   backslash (concat (get_root_dir () + 2, "/bin", 0)));
 +
-+  /* fprintf (bat, "bash --rcfile /bin/lilypond-profile\n"); */
-+  fprintf (bat, "bash --login -i\n");
++  if (_access (cygpath ("/usr/bin/rxvt"), 0) == 0)
++    fprintf (bat, "rxtv -e /bin/bash --login -i \n");
++  else
++    /* fprintf (bat, "bash --rcfile /bin/lilypond-profile\n"); */
++    fprintf (bat, "bash --login -i\n");
 +
 +  fclose (bat);
 +
-+  if (_access ("/usr/bin/rxvt", 0) == 0)
-+    batname = backslash (concat (get_root_dir (), "/usr/bin/rxvt", 0));
 +}
 +
 +static void
  make_etc_profile ()
  {
    char *fname = cygpath ("/etc/profile", 0);
-@@ -301,11 +327,11 @@ out:
+@@ -301,11 +328,11 @@ out:
  }
  
  static void
@@ -131,7 +95,7 @@ diff -purN --exclude=*~ --exclude=config
    if (rsrc == NULL)
      {
        fatal ("FindResource failed");
-@@ -325,12 +351,13 @@ save_icon ()
+@@ -325,12 +352,13 @@ save_icon ()
  static void
  do_desktop_setup ()
  {
@@ -146,7 +110,7 @@ diff -purN --exclude=*~ --exclude=config
    if (root_menu)
      {
        start_menu ("Cygwin Bash Shell", batname);
-@@ -339,6 +366,20 @@ do_desktop_setup ()
+@@ -339,6 +367,20 @@ do_desktop_setup ()
    if (root_desktop)
      {
        desktop_icon ("Cygwin", batname);
@@ -167,148 +131,135 @@ diff -purN --exclude=*~ --exclude=config
      }
  }
  
-diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/ini.cc ./ini.cc
---- ../cinstall.orig/ini.cc	Thu Nov 29 10:52:32 2001
-+++ ./ini.cc	Sun Dec  2 16:11:25 2001
-@@ -187,7 +187,7 @@ fprintf (FILE * f, const char *fmt, ...)
+diff -purN --exclude=*~ ../cinstall.orig/ini.cc ./ini.cc
+--- ../cinstall.orig/ini.cc	Tue Jan 29 10:24:34 2002
++++ ./ini.cc	Tue Jan 29 10:33:01 2002
+@@ -282,7 +282,7 @@ fprintf (FILE * f, const char *fmt, ...)
  	{
  	  *nl = 0;
  	  /*OutputDebugString (stderrbuf); */
 -	  MessageBox (0, buf, "Cygwin Setup", 0);
-+ 	  MessageBox (0, buf, "GNU LilyPond Cygwin Setup", 0);
++ 	  MessageBox (0, buf, "GNU LilyPond Setup", 0);
  	  stderrbuf[0] = 0;
  	}
  
-diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/mklink2.c ./mklink2.c
---- ../cinstall.orig/mklink2.c	Tue Nov 13 02:49:32 2001
-+++ ./mklink2.c	Sun Dec  2 17:09:31 2001
-@@ -1,5 +1,5 @@
--#include <stdlib.h>
- #include "win32.h"
-+#include <stdlib.h>
- #include "shlobj.h"
- #include "mklink2.h"
- 
-diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/msg.cc ./msg.cc
---- ../cinstall.orig/msg.cc	Tue Nov 13 02:49:32 2001
-+++ ./msg.cc	Sun Dec  2 15:42:13 2001
-@@ -47,7 +47,7 @@ mbox (const char *name, int type, int id
+diff -purN --exclude=*~ ../cinstall.orig/msg.cc ./msg.cc
+--- ../cinstall.orig/msg.cc	Sun Dec 23 13:13:29 2001
++++ ./msg.cc	Tue Jan 29 11:10:03 2002
+@@ -47,7 +47,7 @@ mbox (HWND owner, const char *name, int 
  
    vsprintf (buf, fmt, args);
    log (0, "mbox %s: %s", name, buf);
--  return MessageBox (0, buf, "Cygwin Setup", type | MB_TOPMOST);
-+  return MessageBox (0, buf, "GNU LilyPond Cygwin Setup", type | MB_TOPMOST);
+-  return MessageBox (owner, buf, "Cygwin Setup", type);
++  return MessageBox (owner, buf, "GNU LilyPond Setup", type);
  }
  
  void
-diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/res.rc ./res.rc
---- ../cinstall.orig/res.rc	Wed Nov 14 01:11:35 2001
-+++ ./res.rc	Sun Dec  2 15:50:36 2001
-@@ -30,10 +30,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
+diff -purN --exclude=*~ ../cinstall.orig/res.rc ./res.rc
+--- ../cinstall.orig/res.rc	Tue Jan 29 10:24:34 2002
++++ ./res.rc	Tue Jan 29 22:26:51 2002
+@@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
  
- IDD_SOURCE DIALOG DISCARDABLE  0, 0, 215, 95
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+ IDD_SOURCE DIALOG DISCARDABLE  0, 0, 317, 179
+ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
 -CAPTION "Cygwin Setup"
 +CAPTION "GNU LilyPond Setup"
  FONT 8, "MS Sans Serif"
  BEGIN
--    ICON            IDI_CYGWIN,-1,5,5,20,20
-+    ICON            IDI_LILYPOND,-1,5,5,20,20
      CONTROL         "&Install from Internet",IDC_SOURCE_NETINST,"Button",
-                     BS_AUTORADIOBUTTON,55,15,75,10
-     CONTROL         "&Download from Internet",IDC_SOURCE_DOWNLOAD,"Button",
-@@ -46,10 +46,10 @@ END
- 
- IDD_LOCAL_DIR DIALOG DISCARDABLE  0, 0, 215, 95
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
--CAPTION "Cygwin Setup"
-+CAPTION "GNU LilyPond Setup"
- FONT 8, "MS Sans Serif"
- BEGIN
--    ICON            IDI_CYGWIN,IDC_STATIC,5,5,20,20
-+    ICON            IDI_LILYPOND,IDC_STATIC,5,5,20,20
-     PUSHBUTTON      "B&rowse...",IDC_LOCAL_DIR_BROWSE,150,10,34,14
-     LTEXT           "Local Package &Directory",IDC_STATIC,55,15,85,11
-     EDITTEXT        IDC_LOCAL_DIR,55,25,127,12,ES_AUTOHSCROLL
-@@ -60,10 +60,10 @@ END
- 
- IDD_ROOT DIALOG DISCARDABLE  0, 0, 215, 95
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+@@ -39,7 +39,7 @@ BEGIN
+                     BS_AUTORADIOBUTTON | WS_TABSTOP,101,84,115,10
+     CONTROL         "Install from &Local Directory",IDC_SOURCE_CWD,"Button",
+                     BS_AUTORADIOBUTTON | WS_TABSTOP,101,99,115,10
+-    ICON            IDI_CYGWIN,IDC_STATIC,290,0,21,20
++    ICON            IDI_LILYPOND,IDC_STATIC,290,0,21,20
+     CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
+                     317,1
+     LTEXT           "Choose A Download Source",IDC_STATIC_HEADER_TITLE,7,0,
+@@ -50,13 +50,13 @@ END
+ 
+ IDD_LOCAL_DIR DIALOG DISCARDABLE  0, 0, 317, 179
+ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
 -CAPTION "Cygwin Setup"
 +CAPTION "GNU LilyPond Setup"
  FONT 8, "MS Sans Serif"
  BEGIN
--    ICON            IDI_CYGWIN,IDC_STATIC,5,5,20,20
-+    ICON            IDI_LILYPOND,IDC_STATIC,5,5,20,20
-     PUSHBUTTON      "B&rowse...",IDC_ROOT_BROWSE,150,10,34,14
-     LTEXT           "Select install root &directory",IDC_STATIC,55,15,85,11
-     EDITTEXT        IDC_ROOT_DIR,55,25,127,12,ES_AUTOHSCROLL
-@@ -84,10 +84,10 @@ END
- 
- IDD_SITE DIALOG DISCARDABLE  0, 0, 222, 206
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+     EDITTEXT        IDC_LOCAL_DIR,58,83,165,15,ES_AUTOHSCROLL | WS_GROUP
+     PUSHBUTTON      "B&rowse...",IDC_LOCAL_DIR_BROWSE,223,83,34,14
+     GROUPBOX        "Local Package Directory",IDC_STATIC,53,67,210,45
+-    ICON            IDI_CYGWIN,IDC_STATIC,290,0,21,20
++    ICON            IDI_LILYPOND,IDC_STATIC,290,0,21,20
+     CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
+                     317,1
+     LTEXT           "Select a directory where you want Setup to store the installation files it dowmloads.  The directory will be created if it does not already exist.",
+@@ -67,7 +67,7 @@ END
+ 
+ IDD_ROOT DIALOG DISCARDABLE  0, 0, 317, 179
+ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
 -CAPTION "Cygwin Setup"
 +CAPTION "GNU LilyPond Setup"
  FONT 8, "MS Sans Serif"
  BEGIN
--    ICON            IDI_CYGWIN,IDC_STATIC,5,5,20,20
-+    ICON            IDI_LILYPOND,IDC_STATIC,5,5,20,20
-     LTEXT           "Select Download &Site",IDC_STATIC,55,5,135,11
-     LISTBOX         IDC_URL_LIST,55,20,160,155,LBS_NOINTEGRALHEIGHT | 
-                     WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-@@ -98,10 +98,10 @@ END
- 
- IDD_OTHER_URL DIALOG DISCARDABLE  0, 0, 215, 95
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+     GROUPBOX        "Root Directory",IDC_STATIC,5,50,305,40,WS_TABSTOP
+@@ -83,7 +83,7 @@ BEGIN
+                     WS_GROUP | WS_TABSTOP,170,120,90,8
+     CONTROL         "&Unix",IDC_ROOT_BINARY,"Button",BS_AUTORADIOBUTTON | 
+                     WS_TABSTOP,170,135,90,8
+-    ICON            IDI_CYGWIN,IDC_STATIC,290,0,20,20
++    ICON            IDI_LILYPOND,IDC_STATIC,290,0,21,20
+     CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
+                     317,1
+     LTEXT           "Select the directory where you want to install Cygwin.  Also choose a few installation parameters.",
+@@ -96,10 +96,10 @@ IDD_SITE DIALOG DISCARDABLE 0, 0, 317, 1
+ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
+     WS_CAPTION | WS_SYSMENU
+ EXSTYLE WS_EX_CONTROLPARENT
 -CAPTION "Cygwin Setup"
 +CAPTION "GNU LilyPond Setup"
  FONT 8, "MS Sans Serif"
  BEGIN
--    ICON            IDI_CYGWIN,IDC_STATIC,5,5,20,20
-+    ICON            IDI_LILYPOND,IDC_STATIC,5,5,20,20
-     LTEXT           "Select &URL to download from",IDC_STATIC,55,15,135,11
-     EDITTEXT        IDC_OTHER_URL,55,25,127,12,ES_AUTOHSCROLL
-     DEFPUSHBUTTON   "&Next -->",IDOK,100,75,45,15
-@@ -111,10 +111,10 @@ END
+-    ICON            IDI_CYGWIN,IDC_STATIC,290,0,20,20
++    ICON            IDI_LILYPOND,IDC_STATIC,290,0,21,20
+     LISTBOX         IDC_URL_LIST,66,45,185,110,LBS_NOINTEGRALHEIGHT | 
+                     LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_GROUP | 
+                     WS_TABSTOP
+@@ -119,7 +119,7 @@ END
  
- IDD_NET DIALOGEX 0, 0, 215, 95
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+ IDD_NET DIALOG DISCARDABLE  0, 0, 317, 179
+ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
 -CAPTION "Cygwin Setup"
 +CAPTION "GNU LilyPond Setup"
  FONT 8, "MS Sans Serif"
  BEGIN
--    ICON            IDI_CYGWIN,IDC_STATIC,5,5,20,20
-+    ICON            IDI_LILYPOND,IDC_STATIC,5,5,20,20
      CONTROL         "&Direct Connection",IDC_NET_DIRECT,"Button",
-                     BS_AUTORADIOBUTTON,55,10,73,10
-     CONTROL         "Use &IE5 Settings",IDC_NET_IE5,"Button",
-@@ -135,10 +135,10 @@ END
- IDD_DLSTATUS DIALOG DISCARDABLE  0, 0, 215, 95
- STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | 
-     WS_CAPTION | WS_SYSMENU
--CAPTION "Cygwin Setup"
-+CAPTION "GNU LilyPond Setup"
- FONT 8, "MS Sans Serif"
- BEGIN
--    ICON            IDI_CYGWIN,IDC_STATIC,5,5,20,20
-+    ICON            IDI_LILYPOND,IDC_STATIC,5,5,20,20
-     PUSHBUTTON      "Cancel",IDCANCEL,165,75,45,15
-     LTEXT           "Downloading...",IDC_STATIC,55,5,135,8
-     LTEXT           "(URL)",IDC_DLS_URL,55,15,150,8
-@@ -157,10 +157,10 @@ END
- IDD_INSTATUS DIALOG DISCARDABLE  0, 0, 215, 95
- STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | 
-     WS_CAPTION | WS_SYSMENU
+@@ -137,7 +137,7 @@ BEGIN
+                     NOT WS_GROUP
+     RTEXT           "Por&t",IDC_STATIC,85,125,30,12,SS_CENTERIMAGE | NOT 
+                     WS_GROUP
+-    ICON            IDI_CYGWIN,IDC_STATIC,290,0,21,20
++    ICON            IDI_LILYPOND,IDC_STATIC,290,0,21,20
+     CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
+                     317,1
+     LTEXT           "Setup needs to know how you want it to connect to the internet.  Choose the appropriate settings below.",
+@@ -149,7 +149,7 @@ END
+ IDD_INSTATUS DIALOG DISCARDABLE  0, 0, 317, 179
+ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
+     WS_SYSMENU
 -CAPTION "Cygwin Setup"
 +CAPTION "GNU LilyPond Setup"
  FONT 8, "MS Sans Serif"
  BEGIN
--    ICON            IDI_CYGWIN,IDC_STATIC,5,5,20,20
-+    ICON            IDI_LILYPOND,IDC_STATIC,5,5,20,20
-     PUSHBUTTON      "Cancel",IDCANCEL,165,75,45,15
-     LTEXT           "Installing...",IDC_INS_ACTION,55,5,135,8
-     LTEXT           "(PKG)",IDC_INS_PKG,55,15,150,8
-@@ -178,10 +178,10 @@ END
+     LTEXT           "Installing...",IDC_INS_ACTION,45,55,205,8,NOT WS_GROUP
+@@ -164,7 +164,7 @@ BEGIN
+     LTEXT           "Package:",IDC_INS_BL_PACKAGE,45,100,47,8,NOT WS_GROUP
+     LTEXT           "Total:",IDC_INS_BL_TOTAL,45,115,48,8,NOT WS_GROUP
+     LTEXT           "Disk:",IDC_INS_BL_DISK,45,130,47,8,NOT WS_GROUP
+-    ICON            IDI_CYGWIN,IDC_STATIC,290,0,20,20
++    ICON            IDI_LILYPOND,IDC_STATIC,290,0,20,20
+     CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
+                     317,1
+     LTEXT           "This page displays the progress of the download or installation.",
+@@ -175,10 +175,10 @@ END
  
  IDD_PROXY_AUTH DIALOG DISCARDABLE  0, 0, 215, 95
  STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -321,7 +272,7 @@ diff -purN --exclude=*~ --exclude=config
      LTEXT           "Proxy &User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
                      WS_EX_RIGHT
      EDITTEXT        IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
-@@ -195,10 +195,10 @@ END
+@@ -192,10 +192,10 @@ END
  
  IDD_NET_AUTH DIALOG DISCARDABLE  0, 0, 215, 95
  STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -334,59 +285,73 @@ diff -purN --exclude=*~ --exclude=config
      LTEXT           "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
                      WS_EX_RIGHT
      EDITTEXT        IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
-@@ -212,17 +212,14 @@ END
- 
- IDD_SPLASH DIALOG DISCARDABLE  0, 0, 215, 95
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+@@ -210,27 +210,26 @@ END
+ IDD_SPLASH DIALOG DISCARDABLE  0, 0, 317, 179
+ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
+     WS_CAPTION | WS_SYSMENU
 -CAPTION "Cygwin Setup"
 +CAPTION "GNU LilyPond Setup"
  FONT 8, "MS Sans Serif"
  BEGIN
--    ICON            IDI_CYGWIN,IDC_STATIC,5,5,20,20
--    LTEXT           "Cygwin Net Release Setup Program",IDC_STATIC,55,10,114,
--                    8
--    LTEXT           "Version (unknown)",IDC_VERSION,55,25,120,10
--    LTEXT           "Copyright 2000, 2001 Red Hat Inc.",IDC_STATIC,55,35,120,
--                    8
--    LTEXT           "http://sources.redhat.com/cygwin/",IDC_STATIC,55,50,112,
--                    8
-+    ICON            IDI_LILYPOND,IDC_STATIC,5,5,20,20
-+    LTEXT           "GNU LilyPond Setup Program",IDC_STATIC,55,10,114,8
-+    LTEXT           "Version 1.4.9",IDC_VERSION,55,25,120,10
-+    LTEXT           "Copyright (C) 2000-2001 Red Hat Inc",IDC_STATIC,55,35,135,8
-+    LTEXT           "                (C) 2001 Jan Nieuwenhuizen <janneke@gnu.org>",IDC_STATIC,55,45,135,8
-     DEFPUSHBUTTON   "&Next -->",IDOK,100,75,45,15
-     PUSHBUTTON      "Cancel",IDCANCEL,165,75,45,15
+-    ICON            IDI_CYGWIN,IDC_STATIC,113,112,21,20,WS_GROUP
++    ICON            IDI_LILYPOND,IDC_STATIC,113,100,21,20,WS_GROUP
+     CONTROL         "",IDC_STATIC,"Static",SS_WHITERECT,0,0,95,178
+-    LTEXT           "Version (unknown)",IDC_VERSION,115,137,195,10
+-    LTEXT           "Cygwin Net Release Setup Program",
++    LTEXT           "Version (1.4.10)",IDC_VERSION,115,137,195,10
++    LTEXT           "GNU LilyPond Setup Program",
+                     IDC_STATIC_WELCOME_TITLE,115,1,195,24
+-    LTEXT           "Copyright 2000, 2001 Red Hat Inc.",IDC_STATIC,115,150,
+-                    195,8
+-    LTEXT           "http://sources.redhat.com/cygwin/",IDC_STATIC,115,162,
+-                    195,8
+-    LTEXT           "This wizard will guide you through the installation and updating of the Cygwin environment and a plethora of GNU packages.",
+-                    IDC_STATIC,115,33,195,54
++    LTEXT           "Copyright (C) 2000-2002 Red Hat Inc.",
++			IDC_STATIC,115,138,195,8
++    LTEXT           "                (C) 2001 Jan Nieuwenhuizen <janneke@gnu.org>",IDC_STATIC,115,150,195,8
++    LTEXT           "http://www.lilypond.org/cygwin/",IDC_STATIC,115,162,195,8
++    LTEXT           "This wizard will guide you through the installation and updating LilyPond and all other necessary Cygwin packages.",IDC_STATIC,115,33,195,54
  END
-@@ -230,10 +227,10 @@ END
- IDD_CHOOSE DIALOG DISCARDABLE  0, 0, 429, 266
- STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION | 
-     WS_SYSMENU
+ 
+ IDD_CHOOSE DIALOG DISCARDABLE  0, 0, 430, 266
+ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
+     WS_CAPTION | WS_SYSMENU
+ EXSTYLE WS_EX_CONTROLPARENT
 -CAPTION "Cygwin Setup"
 +CAPTION "GNU LilyPond Setup"
  FONT 8, "MS Sans Serif"
  BEGIN
--    ICON            IDI_CYGWIN,IDC_STATIC,0,2,21,20
-+    ICON            IDI_LILYPOND,IDC_STATIC,0,2,21,20
+     DEFPUSHBUTTON   "&Next -->",IDOK,311,242,45,15,WS_GROUP
+@@ -243,7 +242,7 @@ BEGIN
+     CONTROL         "E&xp",IDC_CHOOSE_EXP,"Button",BS_AUTORADIOBUTTON,323,5,
+                     25,10
+     PUSHBUTTON      "&View",IDC_CHOOSE_VIEW,353,5,20,10,WS_GROUP
+-    ICON            IDI_CYGWIN,IDC_STATIC,0,2,20,20
++    ICON            IDI_LILYPOND,IDC_STATIC,0,2,20,20
      LTEXT           "Select packages to install",IDC_CHOOSE_INST_TEXT,125,5,
                      99,8
      CONTROL         "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT 
-@@ -256,10 +253,10 @@ END
- 
- IDD_DESKTOP DIALOG DISCARDABLE  0, 0, 215, 95
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+@@ -257,14 +256,14 @@ END
+ IDD_DESKTOP DIALOG DISCARDABLE  0, 0, 317, 179
+ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
+     WS_CAPTION | WS_SYSMENU
 -CAPTION "Cygwin Setup"
 +CAPTION "GNU LilyPond Setup"
  FONT 8, "MS Sans Serif"
  BEGIN
--    ICON            IDI_CYGWIN,IDC_STATIC,5,5,20,20
-+    ICON            IDI_LILYPOND,IDC_STATIC,5,5,20,20
-     CONTROL         "Create Desktop &Icon",IDC_ROOT_DESKTOP,"Button",
-                     BS_AUTOCHECKBOX,55,25,100,8
-     CONTROL         "Add to &Start Menu",IDC_ROOT_MENU,"Button",
-@@ -271,10 +268,10 @@ END
+     CONTROL         "Create icon on &Desktop",IDC_ROOT_DESKTOP,"Button",
+                     BS_AUTOCHECKBOX,108,78,100,8
+     CONTROL         "Add icon to &Start Menu",IDC_ROOT_MENU,"Button",
+                     BS_AUTOCHECKBOX,108,93,100,8
+-    ICON            IDI_CYGWIN,IDC_STATIC,290,0,21,20
++    ICON            IDI_LILYPOND,IDC_STATIC,290,0,21,20
+     CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
+                     317,1
+     LTEXT           "Tell setup if you want it to create a few icons for convenient access to the Cygwin environment.",
+@@ -275,10 +274,10 @@ END
  
- IDD_FTP_AUTH DIALOGEX 0, 0, 215, 95
+ IDD_FTP_AUTH DIALOG DISCARDABLE  0, 0, 215, 95
  STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 -CAPTION "Cygwin Setup"
 +CAPTION "GNU LilyPond Setup"
@@ -397,7 +362,16 @@ diff -purN --exclude=*~ --exclude=config
      LTEXT           "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
                      WS_EX_RIGHT
      EDITTEXT        IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
-@@ -322,6 +319,7 @@ END
+@@ -293,7 +292,7 @@ END
+ IDD_CHOOSER DIALOG DISCARDABLE  0, 0, 247, 116
+ STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
+     WS_SYSMENU
+-CAPTION "Cygwin Setup"
++CAPTION "GNU LilyPond Setup"
+ FONT 8, "MS Sans Serif"
+ BEGIN
+     CTEXT           "This space intentionally left blank",IDC_STATIC,57,45,
+@@ -336,6 +335,7 @@ END
  
  // Icon with lowest ID value placed first to ensure application icon
  // remains consistent on all systems.
@@ -405,7 +379,7 @@ diff -purN --exclude=*~ --exclude=config
  IDI_CYGWIN              ICON    DISCARDABLE     "cygwin.ico"
  
  /////////////////////////////////////////////////////////////////////////////
-@@ -329,6 +327,7 @@ IDI_CYGWIN              ICON    DISCARDA
+@@ -343,6 +343,7 @@ IDI_CYGWIN              ICON    DISCARDA
  // FILE
  //
  
@@ -413,20 +387,28 @@ diff -purN --exclude=*~ --exclude=config
  CYGWIN.ICON             FILE    DISCARDABLE     "cygwin.ico"
  
  /////////////////////////////////////////////////////////////////////////////
-@@ -383,7 +382,8 @@ STRINGTABLE DISCARDABLE 
+@@ -452,7 +453,7 @@ STRINGTABLE DISCARDABLE 
  BEGIN
      IDS_ROOT_SLASH          "Warning: we recommend you do NOT use the root of your hard drive as the cygwin root.  Proceed anyway?"
      IDS_ROOT_SPACE          "You should not choose a root path that include spaces in directory names.  Proceed anyway?"
 -    IDS_MIRROR_LST          "http://sources.redhat.com/cygwin/mirrors.lst"
-+    // IDS_MIRROR_LST          "http://appel.lilypond.org/lilypond/gnu-windows/mirrors.lst"
-+    IDS_MIRROR_LST          "http://www.lilypond.org/gnu-windows/mirrors.lst"
++    IDS_MIRROR_LST          "http://www.lilypond.org/cygwin/mirrors.lst"
      IDS_DIALOG_FAILED       "Unable to create Dialog Box"
      IDS_CYGWIN_FUNC_MISSING "Error: unable to find function `%s' in %s"
      IDS_DOWNLOAD_SHORT      "Download error: %s too short (%d, wanted %d)"
-diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/resource.h ./resource.h
---- ../cinstall.orig/resource.h	Sat Jun 30 03:37:55 2001
-+++ ./resource.h	Sun Dec  2 15:45:18 2001
-@@ -47,12 +47,13 @@
+@@ -461,7 +462,7 @@ BEGIN
+     IDS_OLD_SETUPINI        "This setup.ini is older than the one you used last time you installed cygwin.  Proceed anyway?"
+     IDS_ERR_RENAME          "Can't rename %s to %s: %s"
+     IDS_NOTHING_INSTALLED   "Nothing needed to be installed"
+-    IDS_INSTALL_COMPLETE    "Installation Complete"
++    IDS_INSTALL_COMPLETE    "Installation Complete.  See http://www.lilypond.org/cygwin/ for support."
+     IDS_REBOOT_REQUIRED     "In-use files have been replaced. You need to reboot as soon as possible to activate the new versions. Cygwin may operate incorrectly until you reboot."
+ END
+ 
+diff -purN --exclude=*~ ../cinstall.orig/resource.h ./resource.h
+--- ../cinstall.orig/resource.h	Tue Jan 29 10:24:34 2002
++++ ./resource.h	Tue Jan 29 10:34:12 2002
+@@ -48,13 +48,14 @@
  #define IDB_SPIN                        118
  #define IDB_RTARROW                     119
  #define IDI_SPIN                        120
@@ -437,7 +419,20 @@ diff -purN --exclude=*~ --exclude=config
  #define IDB_CHECK_NO                    124
  #define IDB_CHECK_NA                    125
  #define IDD_FTP_AUTH                    126
-+#define IDI_CYGWIN                      127
+ #define IDD_CHOOSER                     127
++#define IDI_CYGWIN                      128
  #define IDC_SOURCE_DOWNLOAD             1000
  #define IDC_SOURCE_NETINST              1001
  #define IDC_SOURCE_CWD                  1002
+diff -purN --exclude=*~ ../cinstall.orig/site.cc ./site.cc
+--- ../cinstall.orig/site.cc	Tue Jan 29 10:24:34 2002
++++ ./site.cc	Tue Jan 29 22:17:13 2002
+@@ -415,6 +415,8 @@ bool SitePage::OnMessageCmd (int id, HWN
+ 	  {
+ 	    // User pushed the Add button.
+ 	    other_url = eget (GetHWND (), IDC_EDIT_USER_URL, other_url);
++	    if (!other_url)
++	      break;
+ 	    site_list_type *
+ 	      newsite =
+ 	      new
diff -purN ../lilypond-1.5.28/Documentation/windows/installing.texi ./Documentation/windows/installing.texi
--- ../lilypond-1.5.28/Documentation/windows/installing.texi	Wed Dec  5 14:53:28 2001
+++ ./Documentation/windows/installing.texi	Thu Jan 31 13:17:54 2002
@@ -2,54 +2,40 @@
 @setfilename installing.info
 @settitle LilyPond on Windows
 
+@html
+<!--- @@WEB-TITLE@@=Windows Installation --->
+@end html
+
 @node Top
 @top
 
 @chapter WINDOWS - Installing GNU LilyPond on Windows
 
-This document explains how to install the binary release for windows
-on a Microsoft Windows 95, 98, NT or 2000 machine.
+This document explains how to install the binary release for windows on
+a Microsoft Windows 95, 98, NT or 2000 machine. Please follow the
+instructions carefully. If it doesn't work for you, please send a
+bugreport, following the guidelines in the section on bugreports below.
 
-This release is a free extra service of the developers to assist windows
-users.  When reporting problems,  please keep in mind that we (the developers)
-do not use Windows.  In fact,  if you know something about Windows, and
-are able to write code, please send us code that works better (see
-@uref{compiling.html,compiling}).
 
 @section Windows binary setup 
 
-Apart from LilyPond itself, you need Cygwin, GUILE, Python and a TeX
-installation, but all this software be installed by running setup.exe:
-
-@table @asis
-@item LilyPond
-Download and run
-@c let's do http, so that people read the README
-@uref{http://www.lilypond.org/gnu-windows/setup.exe, setup.exe}
-to install LilyPond.
-
-This will install the minimal set of cygwin tools needed to run
-LilyPond.  Make sure to install in the default place, @file{c:/cygwin},
-and install everything.
-
-As of version 1.3.150, you also have the option to install MiKTeX and
-GSView from this installer, which is recommended.  If you choose to
-install these by hand (see below), make sure to install them
-@strong{before} you install LilyPond, otherwise your LilyPond setup will
-be broken.
-
-If you already have cygwin installed, don't worry: nothing will be
-installed twice.  To expand on this minimal set, click
-@uref{http://sources.redhat.com/cygwin/setup.exe,here}, or visit a
-Cygwin @uref{http://sources.redhat.com/cygwin/mirrors.html,mirror site}.
-@end table
-
+All the software you need is installed by downloading and running
+@uref{http://www.lilypond.org/gnu-windows/setup.exe, setup.exe}.  You
+will be asked some questions. If you are unsure just click "Next".  Do
+not change the default install directory @file{c:/cygwin}.
+
+This installs LilyPond, and Cygwin, GUILE, Python, teTeX and GSView.  If
+you already have some of that software under @file{c:/cygwin}, then
+don't worry: nothing will be installed twice.
+
+If you want to install any of this software by hand, do this
+@strong{before} you run @file{setup.exe}, otherwise your LilyPond setup
+may not work.
 
-@section Windows running setup
+@section Testing LilyPond
 
-If you're lucky, after running @file{setup.exe} you're all set up.
-
-Open a LilyPond shell (or any bash shell), and type
+Open a LilyPond shell (To open a a lilypond shell, click the "GNU
+LilyPond" icon), and type
 
 @quotation
 @example
@@ -57,7 +43,7 @@ lilypond --help
 @end example
 @end quotation
 
-If you don't see something similar to
+You should see something similar to
 
 @quotation
 @example
@@ -75,25 +61,84 @@ Options:
 @end example
 @end quotation
 
-you should try adding @file{/usr/lilypond-x.y.z/bin} to your @var{PATH},
-do:
+Then, prepare a file called @file{foo.ly}, by issuing
+@example
+notepad foo.ly
+@end example
+Enter the following into the file
+@example
 
-@quotation
+\score @{ \notes @{ c4 ( ) c4 @} @}
+
+@end example
+Close the file and save it. Run the following command a few times (at
+least three times) until it says @code{PS output to `foo.ps', DVI output
+to `foo.dvi'}.
 @example
-PATH=/usr/lilypond-1.4.2/bin:$PATH
+
+ly2dvi -P foo
+
+@end example
+You can now view the file using the following command
+@example
+
+gsview32 foo.ps
+
 @end example
-@end quotation
 
-and try again.
+If this works, then you can head to the
+@uref{../../user/out-www/lilypond/Tutorial.html,Tutorial} to start using
+LilyPond.
 
 
-@subsection Trouble
+
+@section Removing LilyPond
+
+Start @file{setup.exe}, click Next, select "Install from Local
+Directory". Then click next until you reach "Select packages to
+install". Click "View". Now, for every package, click on the recycle
+icon until it says "Uninstall". Then, click Next.
+
+(If you find this too tedious, you can also simply remove
+@file{c:/cygwin}. This also removes the @file{/home/} directories under
+cygwin (i.e. @file{C:\CYGWIN\HOME}, so make sure that you bring
+important files in safety first.)
+
+@section Troubleshooting
 
 For problems and solutions see
 @uref{http://lilypond.org/wiki?TroubleshootingWindows,Troubleshooting
 Windows}
 
 
+@section Bugreports
+
+We can only help you with a problem if you give a full, detailed
+bugreport. A bugreport includes
+
+@itemize @bullet
+@item A @emph{precise} description of the problem.  
+@item A full description of your platform (machine type, operating
+system)
+@item All version numbers of relevant software you run.  Specifically, we
+want to see the output of the  following commands: 
+@example
+  python --version
+  lilypond --version
+  ly2dvi --version
+  gswin32  --version
+@end example
+@item If ly2dvi fails, then please run it as follows and include the
+  output in the 
+@example
+  ly2dvi --verbose MY-FILE
+@end example
+@end itemize
+
+You can also check out
+@uref{http://lilypond.org/wiki/?TroubleshootingWindows} for more
+instructions on how to make a bug report.
+@ignore
 @subsection Additional software
 
 LilyPond needs a number of software packages to be really useful.  These
@@ -110,10 +155,12 @@ These software packages are included in 
 @table @asis
 @item A full TeX installation.
 
-Currently, only MikTeX is supported.  Download and install
-@uref{http://downloads.sourceforge.net/miktex/miktex-2.0-lvl-1.zip,MikTeX},
-or visit @uref{http://www.miktex.org,www.miktex.org}.
-@c See @file{/usr/doc/cygwin/tetex-beta-20001218.README} for details.
+As of LilyPond versions 1.4.11 (and 1.5.29), only Cygwin's teTeX
+installation is supported (packages tetex-beta and texmf-base).  It is
+part of Cygwin and much more robust for use with LilyPond than MiKTeX.
+See @file{/usr/doc/Cygwin/tetex-beta-20001218.README} and
+@file{/usr/doc/Cygwin/texmf-20000804-2.README} for details.
+
 
 @item Ghostview.
 
@@ -137,11 +184,8 @@ Click @uref{ftp://mirror.cs.wisc.edu/pub
 @uref{ftp://ftp.cs.wisc.edu/ghost/ghostgum,ftp.cs.wisc.edu}.
 or visit the
 @uref{http://www.cs.wisc.edu/~ghost/,Ghostscript, Ghostview and GSview site}.
-
 @end table
 
-
-
 [TODO:
 
 
@@ -150,9 +194,6 @@ emacs-on-cygwin setup.
 
 ]
 
-
-@ignore 
-
   guile -v
   Guile 1.4.1
 
@@ -184,4 +225,19 @@ in each corner.
 
 @end ignore
 
+@ignore
+@c irrelevant.
+
+If you want to install more of cygwnTo expand on this minimal set,
+@section If you already have MikTeX, GSView or
 
+If you already have cygwin installed, don't worry: nothing will be
+installed twice.  To expand on this minimal set, click
+@uref{http://sources.redhat.com/cygwin/setup.exe,here}, or visit a
+Cygwin @uref{http://sources.redhat.com/cygwin/mirrors.html,mirror site}.
+
+
+This will install the minimal set of cygwin tools needed to run
+LilyPond.  Make sure to install in the default place, @file{c:/cygwin},
+and install everything. 
+@end ignore
diff -purN ../lilypond-1.5.28/Documentation/windows/registry.in ./Documentation/windows/registry.in
--- ../lilypond-1.5.28/Documentation/windows/registry.in	Thu Apr 19 12:56:39 2001
+++ ./Documentation/windows/registry.in	Thu Jan  1 01:00:00 1970
@@ -1,60 +0,0 @@
-regtool -v list HKLM\Software\
-Microsoft\ ()
-CLASSES\ ()
-Clients\ ()
-Description\ ()
-INTEL\ ()
-SmartDownload\ ()
-Netscape\ ()
-ODBC\ ()
-LTD\ ()
-Novell\ ()
-KasperskyLab\ ()
-Nico Mak Computing\ ()
-Avance\ ()
-Cygnus Solutions\ ()
-Adobe\ ()
-TRADOS\ ()
-RAINBOW TECHNOLOGIES\ ()
-GNU\ ()
-Aladdin Ghostscript\ ()
-Lilypond 1.3.119\ ()
-MiK\ ()
-Ghostgum\ ()
-Python\ ()
-AFPL Ghostscript\ ()
-
-regtool -v list HKLM\Software\Aladdin Ghostscript\5.50
-GS_LIB = "c:\cygwin\windows\gstools\gs5.50;c:\cygwin\windows\gstools\gs5.50\fonts"
-GS_DLL = "c:\cygwin\windows\gstools\gs5.50\\gsdll32.dll"
-
-regtool -v list HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX
-TEXMF Root Directories = "C:\cygwin\windows\miktex\spool\texmf;C:\cygwin\windows\MiKTeX"
-Install Root = "C:\cygwin\windows\MiKTeX"
-
-regtool -v list HKLM\Software\Ghostgum\GSview
-3.6 = "C:\cygwin\windows\Ghostgum"
-
-regtool -v list HKLM\Software\Python\PythonCore\1.5
-InstallPath\ ()
-PythonPath\ ()
-Dll\ ()
-Modules\ ()
-
-regtool -v list HKLM\Software\Python\PythonCore\1.5\InstallPath
-InstallGroup\ ()
- = "C:\cygwin\usr\windows\Python"
-
-regtool -v list HKLM\Software\Python\PythonCore\1.5\PythonPath
- = "C:\cygwin\usr\windows\Python\Lib\plat-win;C:\cygwin\usr\windows\Python\Lib;C:\cygwin\usr\windows\Python\DLLs;C:\cygwin\usr\windows\Python\Lib\lib-tk"
-
-regtool -v list HKLM\Software\Python\PythonCore\1.5\Dll
- = "C:\WINDOWS\SYSTEM\Python15.dll"
-
-regtool -v list HKLM\Software\Python\PythonCore\1.5\Modules\
- = ""
-
-regtool -v list HKLM\Software\AFPL Ghostscript\6.50
-GS_DLL = "C:\cygwin\windows\gs\gs6.50\bin\gsdll32.dll"
-GS_LIB = "C:\cygwin\windows\gs\gs6.50\lib;C:\cygwin\windows\gs\fonts"
-
diff -purN ../lilypond-1.5.28/Documentation/windows/setup.hint ./Documentation/windows/setup.hint
--- ../lilypond-1.5.28/Documentation/windows/setup.hint	Wed Dec  5 14:53:28 2001
+++ ./Documentation/windows/setup.hint	Thu Jan 31 13:17:54 2002
@@ -1,4 +1,8 @@
 sdesc: "A program for printing sheet music"
 category: Publishing
-requires: ash bash guile python tetex-beta texmf-base
-#suggests: rxvt xdvi
+requires: ash bash guile python tetex-beta texmf-tiny
+#suggests: rxvt xdvi texmf-base
+ldesc: "A program for printing sheet music.
+LilyPond is a music typesetter.  It produces beautiful sheet music
+using a high level description file as input.  LilyPond is part of
+the GNU Project."
\ No newline at end of file
diff -purN ../lilypond-1.5.28/Documentation/windows/zlily-profile.sh ./Documentation/windows/zlily-profile.sh
--- ../lilypond-1.5.28/Documentation/windows/zlily-profile.sh	Wed Dec  5 14:53:28 2001
+++ ./Documentation/windows/zlily-profile.sh	Thu Jan 31 13:17:54 2002
@@ -28,7 +28,16 @@ GS_LIB="$WINDOWS_GS_LIB"
 PATH="/usr/lilypond/bin:$PATH"
 PATH="@prefix@/bin:$PATH"
 
-# PATH="/usr/lilypond/wrappers:$PATH"
-# PATH="@prefix@/wrappers:$PATH"
+cat <<EOF
+Congratulations and welcome to GNU LilyPond.
 
+To get started, visit:
+    http://www.lilypond.org/Documentation/windows/out-www/installing.html
 
+If you encounter any problems, visit:
+    http://www.lilypond.org/wiki?TroubleshootingWindows
+
+When it all works, head straight to the tutorial:
+    http://www.lilypond.org/Documentation/user/out-www/lilypond/Tutorial.html
+    
+EOF
diff -purN ../lilypond-1.5.28/GNUmakefile.in ./GNUmakefile.in
--- ../lilypond-1.5.28/GNUmakefile.in	Wed Dec  5 14:53:28 2001
+++ ./GNUmakefile.in	Fri Feb  1 17:43:12 2002
@@ -20,7 +20,7 @@ SCRIPTS = configure aclocal.m4
 README_FILES =  ChangeLog CHANGES COPYING DEDICATION NEWS README.mandrake ROADMAP
 README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt FAQ.txt
 IN_FILES := $(wildcard *.in)
-EXTRA_DIST_FILES = lilypond-font-lock.el lilypond-mode.el lilypond-init.el vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch lexer-gcc-3.0.patch .cvsignore
+EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch lexer-gcc-3.0.patch .cvsignore
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(datadir)
 INSTALLATION_FILES=$(configuration) VERSION
diff -purN ../lilypond-1.5.28/VERSION ./VERSION
--- ../lilypond-1.5.28/VERSION	Sat Dec 29 20:31:44 2001
+++ ./VERSION	Fri Feb  1 19:10:01 2002
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
-PATCH_LEVEL=28
+PATCH_LEVEL=29
 MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
diff -purN ../lilypond-1.5.28/input/bugs/first-midi-tie.ly ./input/bugs/first-midi-tie.ly
--- ../lilypond-1.5.28/input/bugs/first-midi-tie.ly	Thu Jan  1 01:00:00 1970
+++ ./input/bugs/first-midi-tie.ly	Thu Jan 31 13:17:54 2002
@@ -0,0 +1,31 @@
+\header {
+
+texidoc="
+
+    Interpreting music...
+    m.ly:3:14: warning: No ties were created!:
+       <c4 g' e'>~
+                  <c g' e'>
+
+    MIDI output to `m.midi'...
+"
+}
+
+chordexamples = \notes \relative c' {
+  <c4 g' e'>~<c g' e'>
+  <c4 g' e'>~<cis4 gis' e'>
+  <c4 g' e'>~<\context Voice = x {<cis4 gis'>} e'>
+  <c e g>~<a cis e g bes>
+}
+
+\score {
+  \context PianoStaff <
+    \context Staff = upper <
+      \clef treble
+      \context Voice = i { \voiceOne \chordexamples }
+    >
+  >
+  \paper {  }
+  \midi { \tempo 4 = 120 }
+}
+
diff -purN ../lilypond-1.5.28/input/bugs/first-tie.ly ./input/bugs/first-tie.ly
--- ../lilypond-1.5.28/input/bugs/first-tie.ly	Thu Jan  1 01:00:00 1970
+++ ./input/bugs/first-tie.ly	Thu Jan 31 13:17:54 2002
@@ -0,0 +1,11 @@
+\header{
+    texidoc="no tie is generated for first chord of score.  workaround: begin
+with s1*0 spacer note."
+    }
+
+\score {
+    \context Staff \notes {
+	% s1*0
+	<a1> ~ <a>
+    }
+}
\ No newline at end of file
diff -purN ../lilypond-1.5.28/input/bugs/spacing-clash.ly ./input/bugs/spacing-clash.ly
--- ../lilypond-1.5.28/input/bugs/spacing-clash.ly	Thu Jan  1 01:00:00 1970
+++ ./input/bugs/spacing-clash.ly	Thu Jan 31 13:17:54 2002
@@ -0,0 +1,19 @@
+\header {
+    texidoc="Flat clashes with change-clef.  After real word example."
+}
+\score {
+    <
+	\time 3/4
+	\context Staff=a \notes\relative c'' {
+	    
+	    a16 a a a a a a a 
+	    a16 a a a
+	}
+	\context Staff=b \notes\relative c' {
+	    \clef bass a16 a a a b8 b \clef violin ces4
+	}
+    >
+    \paper{
+	linewidth= -1.
+    }
+}
\ No newline at end of file
diff -purN ../lilypond-1.5.28/input/bugs/tie-different-notes.ly ./input/bugs/tie-different-notes.ly
--- ../lilypond-1.5.28/input/bugs/tie-different-notes.ly	Thu Jan  1 01:00:00 1970
+++ ./input/bugs/tie-different-notes.ly	Thu Jan 31 13:17:54 2002
@@ -0,0 +1,14 @@
+\header {
+
+texidoc="
+
+  c ~ cis gets tied
+ 
+"
+}
+
+     \score {
+       \context Staff \context Voice = i { 
+          \notes\relative c'' { <c4 g' es'>~<cis4 gis' e'> } 
+       }
+     }
diff -purN ../lilypond-1.5.28/input/regression/note-head-style.ly ./input/regression/note-head-style.ly
--- ../lilypond-1.5.28/input/regression/note-head-style.ly	Fri May  4 15:57:55 2001
+++ ./input/regression/note-head-style.ly	Fri Feb  1 18:45:09 2002
@@ -11,7 +11,7 @@ either up or down stems.
 "
 }
 
-\score { \notes \relative c''{
+\score { \notes \relative c'{ \clef C
 % \property Voice.Stem \override #'thickness = #5.0
 \property Voice.NoteHead \set #'style = #'default
 c4 c2 c8  c16 c16 c1 c\breve b4 b2 b8  b16 b16 b1 b\breve \break
@@ -23,6 +23,8 @@ c4 c2 c8  c16 c16 c1 c\breve b4 b2 b8  b
 c4 c2 c8  c16 c16 c1 c\breve b4 b2 b8  b16 b16 b1 b\breve \break
 \property Voice.NoteHead \set #'style = #'xcircle
 c4 c2 c8  c16 c16 c1 c\breve b4 b2 b8  b16 b16 b1 b\breve \break
+\property Voice.NoteHead \set #'style = #'triangle
+c4 c2 c8  c16 c16 c1 c\breve b4 b2 b8  b16 b16 b1 b\breve \break
 \property Voice.NoteHead \set #'style = #'slash
 c4 c2 c8  c16 c16 c1 c\breve b4 b2 b8  b16 b16 b1 b\breve \break
 \property Voice.NoteHead \set #'style = #'mensural
diff -purN ../lilypond-1.5.28/input/test/ancient-font.ly ./input/test/ancient-font.ly
--- ../lilypond-1.5.28/input/test/ancient-font.ly	Sat Oct  6 12:09:06 2001
+++ ./input/test/ancient-font.ly	Fri Feb  1 17:57:19 2002
@@ -41,7 +41,7 @@ upperVoice =  \context Staff = upperVoic
 %	\property Staff.clefOctavation = #0 
 	\clef "vaticana_do2"
 
-	\property Voice.NoteHead \override #'style = #'vaticana_subbipunctum
+	\property Voice.NoteHead \override #'style = #'vaticana_inclinatum
 	a! b!
 	\property Staff.BarLine \override #'bar-size = #3.0 \bar "|"
 	\property Voice.NoteHead \override #'style = #'vaticana_virga
diff -purN ../lilypond-1.5.28/lily/a2-engraver.cc ./lily/a2-engraver.cc
--- ../lilypond-1.5.28/lily/a2-engraver.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/a2-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
diff -purN ../lilypond-1.5.28/lily/accidental-engraver.cc ./lily/accidental-engraver.cc
--- ../lilypond-1.5.28/lily/accidental-engraver.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/accidental-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -1,7 +1,7 @@
 /*
   accidental-engraver.cc -- implement accidental_engraver
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Modified 2001 by Rune Zedeler <rz@daimi.au.dk>
 */
 
diff -purN ../lilypond-1.5.28/lily/afm.cc ./lily/afm.cc
--- ../lilypond-1.5.28/lily/afm.cc	Sat Sep 22 14:13:06 2001
+++ ./lily/afm.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the Flower Library
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "afm.hh"
diff -purN ../lilypond-1.5.28/lily/align-interface.cc ./lily/align-interface.cc
--- ../lilypond-1.5.28/lily/align-interface.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/align-interface.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/all-font-metrics.cc ./lily/all-font-metrics.cc
--- ../lilypond-1.5.28/lily/all-font-metrics.cc	Wed Aug 22 23:23:14 2001
+++ ./lily/all-font-metrics.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/arpeggio-engraver.cc ./lily/arpeggio-engraver.cc
--- ../lilypond-1.5.28/lily/arpeggio-engraver.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/arpeggio-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "engraver.hh"
diff -purN ../lilypond-1.5.28/lily/arpeggio.cc ./lily/arpeggio.cc
--- ../lilypond-1.5.28/lily/arpeggio.cc	Sat Oct 13 01:23:40 2001
+++ ./lily/arpeggio.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "molecule.hh"
diff -purN ../lilypond-1.5.28/lily/audio-column.cc ./lily/audio-column.cc
--- ../lilypond-1.5.28/lily/audio-column.cc	Sun Mar 11 19:10:32 2001
+++ ./lily/audio-column.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "audio-column.hh"
diff -purN ../lilypond-1.5.28/lily/audio-element-info.cc ./lily/audio-element-info.cc
--- ../lilypond-1.5.28/lily/audio-element-info.cc	Sun Mar 11 19:10:32 2001
+++ ./lily/audio-element-info.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "audio-element-info.hh"
diff -purN ../lilypond-1.5.28/lily/audio-element.cc ./lily/audio-element.cc
--- ../lilypond-1.5.28/lily/audio-element.cc	Sun Mar 11 19:10:32 2001
+++ ./lily/audio-element.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "audio-element.hh"
diff -purN ../lilypond-1.5.28/lily/audio-item.cc ./lily/audio-item.cc
--- ../lilypond-1.5.28/lily/audio-item.cc	Fri Mar  2 11:04:39 2001
+++ ./lily/audio-item.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 #include "debug.hh"
 #include "audio-item.hh"
diff -purN ../lilypond-1.5.28/lily/audio-staff.cc ./lily/audio-staff.cc
--- ../lilypond-1.5.28/lily/audio-staff.cc	Mon Jul  2 01:15:26 2001
+++ ./lily/audio-staff.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "audio-staff.hh"
diff -purN ../lilypond-1.5.28/lily/auto-beam-engraver.cc ./lily/auto-beam-engraver.cc
--- ../lilypond-1.5.28/lily/auto-beam-engraver.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/auto-beam-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/auto-change-iterator.cc ./lily/auto-change-iterator.cc
--- ../lilypond-1.5.28/lily/auto-change-iterator.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/auto-change-iterator.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/axis-group-engraver.cc ./lily/axis-group-engraver.cc
--- ../lilypond-1.5.28/lily/axis-group-engraver.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/axis-group-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 #include "spanner.hh"
diff -purN ../lilypond-1.5.28/lily/axis-group-interface.cc ./lily/axis-group-interface.cc
--- ../lilypond-1.5.28/lily/axis-group-interface.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/axis-group-interface.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "hara-kiri-group-spanner.hh"
diff -purN ../lilypond-1.5.28/lily/bar-check-iterator.cc ./lily/bar-check-iterator.cc
--- ../lilypond-1.5.28/lily/bar-check-iterator.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/bar-check-iterator.cc	Fri Feb  1 19:17:38 2002
@@ -4,7 +4,7 @@
 
      source file of the GNU LilyPond music typesetter
 
-     (c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+     (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
  */
 
diff -purN ../lilypond-1.5.28/lily/bar-engraver.cc ./lily/bar-engraver.cc
--- ../lilypond-1.5.28/lily/bar-engraver.cc	Fri Dec 14 01:18:57 2001
+++ ./lily/bar-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff -purN ../lilypond-1.5.28/lily/bar-number-engraver.cc ./lily/bar-number-engraver.cc
--- ../lilypond-1.5.28/lily/bar-number-engraver.cc	Fri Dec 14 01:18:57 2001
+++ ./lily/bar-number-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/bar.cc ./lily/bar.cc
--- ../lilypond-1.5.28/lily/bar.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/bar.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <math.h>
 
@@ -53,8 +53,9 @@ Bar::compound_barline (Grob*me, String s
   Real fatline = gh_scm2double (me->get_grob_property ("thick-thickness"));
 
   Real staffline = me->paper_l ()->get_var ("stafflinethickness");
+  Real staff_space = Staff_symbol_referencer::staff_space (me);
   Real staffspace = me->paper_l ()->get_var ("staffspace")
-    * Staff_symbol_referencer::staff_space (me);
+    * staff_space;
 
   kern *= staffline;
   thinkern *= staffline;
@@ -65,7 +66,8 @@ Bar::compound_barline (Grob*me, String s
   Molecule thick = simple_barline (me, fatline, h);
   Molecule colon;
   Molecule dot = Font_interface::get_default_font (me)->find_by_name ("dots-dot");
-  Real dist = (2-(Staff_symbol_referencer::line_count (me) & 1))*staffspace;
+  Real dist = ( Staff_symbol_referencer::line_count (me) & 1 ? 1 :
+		staff_space<2 ? 2 : .5 ) * staffspace;
   dot.translate_axis(dist/2,Y_AXIS);
   colon.add_molecule(dot);
   dot.translate_axis(-dist,Y_AXIS);
diff -purN ../lilypond-1.5.28/lily/beam-engraver.cc ./lily/beam-engraver.cc
--- ../lilypond-1.5.28/lily/beam-engraver.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/beam-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "engraver-group-engraver.hh"
diff -purN ../lilypond-1.5.28/lily/beam.cc ./lily/beam.cc
--- ../lilypond-1.5.28/lily/beam.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/beam.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
     Jan Nieuwenhuizen <janneke@gnu.org>
 
 */
diff -purN ../lilypond-1.5.28/lily/beaming-info.cc ./lily/beaming-info.cc
--- ../lilypond-1.5.28/lily/beaming-info.cc	Sun Sep 30 18:21:48 2001
+++ ./lily/beaming-info.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/bezier-bow.cc ./lily/bezier-bow.cc
--- ../lilypond-1.5.28/lily/bezier-bow.cc	Sun Mar 11 19:10:32 2001
+++ ./lily/bezier-bow.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <math.h>
diff -purN ../lilypond-1.5.28/lily/bezier.cc ./lily/bezier.cc
--- ../lilypond-1.5.28/lily/bezier.cc	Sun Apr  1 14:59:01 2001
+++ ./lily/bezier.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <math.h>
diff -purN ../lilypond-1.5.28/lily/box.cc ./lily/box.cc
--- ../lilypond-1.5.28/lily/box.cc	Sun Mar 11 19:10:32 2001
+++ ./lily/box.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "box.hh"
diff -purN ../lilypond-1.5.28/lily/break-algorithm.cc ./lily/break-algorithm.cc
--- ../lilypond-1.5.28/lily/break-algorithm.cc	Fri Aug 17 13:28:16 2001
+++ ./lily/break-algorithm.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "paper-column.hh"
diff -purN ../lilypond-1.5.28/lily/break-align-engraver.cc ./lily/break-align-engraver.cc
--- ../lilypond-1.5.28/lily/break-align-engraver.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/break-align-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "engraver.hh"
diff -purN ../lilypond-1.5.28/lily/break-align-item.cc ./lily/break-align-item.cc
--- ../lilypond-1.5.28/lily/break-align-item.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/break-align-item.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/change-iterator.cc ./lily/change-iterator.cc
--- ../lilypond-1.5.28/lily/change-iterator.cc	Fri Jun 29 02:01:20 2001
+++ ./lily/change-iterator.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "change-iterator.hh"
diff -purN ../lilypond-1.5.28/lily/chord-name-engraver.cc ./lily/chord-name-engraver.cc
--- ../lilypond-1.5.28/lily/chord-name-engraver.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/chord-name-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
diff -purN ../lilypond-1.5.28/lily/chord-name.cc ./lily/chord-name.cc
--- ../lilypond-1.5.28/lily/chord-name.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/chord-name.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "chord-name.hh"
diff -purN ../lilypond-1.5.28/lily/chord-tremolo-engraver.cc ./lily/chord-tremolo-engraver.cc
--- ../lilypond-1.5.28/lily/chord-tremolo-engraver.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/chord-tremolo-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/chord-tremolo-iterator.cc ./lily/chord-tremolo-iterator.cc
--- ../lilypond-1.5.28/lily/chord-tremolo-iterator.cc	Tue Aug 14 13:41:27 2001
+++ ./lily/chord-tremolo-iterator.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/chord.cc ./lily/chord.cc
--- ../lilypond-1.5.28/lily/chord.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/chord.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "chord.hh"
diff -purN ../lilypond-1.5.28/lily/clef-engraver.cc ./lily/clef-engraver.cc
--- ../lilypond-1.5.28/lily/clef-engraver.cc	Fri Oct 19 11:14:48 2001
+++ ./lily/clef-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
 
   Mats Bengtsson <matsb@s3.kth.se>
 */
diff -purN ../lilypond-1.5.28/lily/clef-item.cc ./lily/clef-item.cc
--- ../lilypond-1.5.28/lily/clef-item.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/clef-item.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/collision-engraver.cc ./lily/collision-engraver.cc
--- ../lilypond-1.5.28/lily/collision-engraver.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/collision-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "note-column.hh"
diff -purN ../lilypond-1.5.28/lily/collision.cc ./lily/collision.cc
--- ../lilypond-1.5.28/lily/collision.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/collision.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "debug.hh"
diff -purN ../lilypond-1.5.28/lily/column-x-positions.cc ./lily/column-x-positions.cc
--- ../lilypond-1.5.28/lily/column-x-positions.cc	Sun Mar 11 19:10:33 2001
+++ ./lily/column-x-positions.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "column-x-positions.hh"
diff -purN ../lilypond-1.5.28/lily/command-request.cc ./lily/command-request.cc
--- ../lilypond-1.5.28/lily/command-request.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/command-request.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "command-request.hh"
diff -purN ../lilypond-1.5.28/lily/completion-note-heads-engraver.cc ./lily/completion-note-heads-engraver.cc
--- ../lilypond-1.5.28/lily/completion-note-heads-engraver.cc	Mon Dec 24 00:04:03 2001
+++ ./lily/completion-note-heads-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -1,7 +1,7 @@
 /*
   head-grav.cc -- part of GNU LilyPond
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <ctype.h>
diff -purN ../lilypond-1.5.28/lily/context-specced-music.cc ./lily/context-specced-music.cc
--- ../lilypond-1.5.28/lily/context-specced-music.cc	Sun Mar 11 19:10:33 2001
+++ ./lily/context-specced-music.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "context-specced-music.hh"
diff -purN ../lilypond-1.5.28/lily/cxx-function-smob.cc ./lily/cxx-function-smob.cc
--- ../lilypond-1.5.28/lily/cxx-function-smob.cc	Wed Jul 11 14:54:52 2001
+++ ./lily/cxx-function-smob.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/dimension-cache.cc ./lily/dimension-cache.cc
--- ../lilypond-1.5.28/lily/dimension-cache.cc	Sun Mar 11 19:10:33 2001
+++ ./lily/dimension-cache.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 #include <math.h>
 #include "warn.hh"
diff -purN ../lilypond-1.5.28/lily/directional-element-interface.cc ./lily/directional-element-interface.cc
--- ../lilypond-1.5.28/lily/directional-element-interface.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/directional-element-interface.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/dot-column-engraver.cc ./lily/dot-column-engraver.cc
--- ../lilypond-1.5.28/lily/dot-column-engraver.cc	Thu Sep 27 01:54:34 2001
+++ ./lily/dot-column-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/dot-column.cc ./lily/dot-column.cc
--- ../lilypond-1.5.28/lily/dot-column.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/dot-column.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "dots.hh"
diff -purN ../lilypond-1.5.28/lily/dots.cc ./lily/dots.cc
--- ../lilypond-1.5.28/lily/dots.cc	Sun Mar 11 19:10:33 2001
+++ ./lily/dots.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "dots.hh"
diff -purN ../lilypond-1.5.28/lily/duration.cc ./lily/duration.cc
--- ../lilypond-1.5.28/lily/duration.cc	Sun Oct 14 15:15:44 2001
+++ ./lily/duration.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
            Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 */
diff -purN ../lilypond-1.5.28/lily/dynamic-engraver.cc ./lily/dynamic-engraver.cc
--- ../lilypond-1.5.28/lily/dynamic-engraver.cc	Fri Oct 19 11:14:48 2001
+++ ./lily/dynamic-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "debug.hh"
 #include "dimensions.hh"
diff -purN ../lilypond-1.5.28/lily/engraver-group-engraver.cc ./lily/engraver-group-engraver.cc
--- ../lilypond-1.5.28/lily/engraver-group-engraver.cc	Fri Dec 14 01:18:57 2001
+++ ./lily/engraver-group-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "flower-proto.hh"
diff -purN ../lilypond-1.5.28/lily/engraver.cc ./lily/engraver.cc
--- ../lilypond-1.5.28/lily/engraver.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   Sourcefile of GNU LilyPond music type setter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "music.hh"
diff -purN ../lilypond-1.5.28/lily/fingering-engraver.cc ./lily/fingering-engraver.cc
--- ../lilypond-1.5.28/lily/fingering-engraver.cc	Mon Dec  3 00:28:24 2001
+++ ./lily/fingering-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/folded-repeat-iterator.cc ./lily/folded-repeat-iterator.cc
--- ../lilypond-1.5.28/lily/folded-repeat-iterator.cc	Mon Oct  8 01:49:09 2001
+++ ./lily/folded-repeat-iterator.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/font-interface.cc ./lily/font-interface.cc
--- ../lilypond-1.5.28/lily/font-interface.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/font-interface.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/font-metric.cc ./lily/font-metric.cc
--- ../lilypond-1.5.28/lily/font-metric.cc	Sun Oct 14 15:15:44 2001
+++ ./lily/font-metric.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
     Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
  */
diff -purN ../lilypond-1.5.28/lily/font-size-engraver.cc ./lily/font-size-engraver.cc
--- ../lilypond-1.5.28/lily/font-size-engraver.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/font-size-engraver.cc	Fri Feb  1 19:17:38 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/global-ctor.cc ./lily/global-ctor.cc
--- ../lilypond-1.5.28/lily/global-ctor.cc	Sun Nov  4 20:54:32 2001
+++ ./lily/global-ctor.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "global-ctor.hh"
diff -purN ../lilypond-1.5.28/lily/global-translator.cc ./lily/global-translator.cc
--- ../lilypond-1.5.28/lily/global-translator.cc	Fri Oct 19 11:14:48 2001
+++ ./lily/global-translator.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "debug.hh"
diff -purN ../lilypond-1.5.28/lily/gourlay-breaking.cc ./lily/gourlay-breaking.cc
--- ../lilypond-1.5.28/lily/gourlay-breaking.cc	Wed Dec  5 17:07:40 2001
+++ ./lily/gourlay-breaking.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <math.h>		// rint
 
diff -purN ../lilypond-1.5.28/lily/grace-iterator.cc ./lily/grace-iterator.cc
--- ../lilypond-1.5.28/lily/grace-iterator.cc	Thu Aug 16 01:38:02 2001
+++ ./lily/grace-iterator.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/grace-music.cc ./lily/grace-music.cc
--- ../lilypond-1.5.28/lily/grace-music.cc	Thu Aug 16 01:38:02 2001
+++ ./lily/grace-music.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/grob-info.cc ./lily/grob-info.cc
--- ../lilypond-1.5.28/lily/grob-info.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/grob-info.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "grob-info.hh"
diff -purN ../lilypond-1.5.28/lily/grob-pitch-tuple.cc ./lily/grob-pitch-tuple.cc
--- ../lilypond-1.5.28/lily/grob-pitch-tuple.cc	Fri Nov  9 00:47:52 2001
+++ ./lily/grob-pitch-tuple.cc	Fri Feb  1 19:17:38 2002
@@ -3,7 +3,7 @@ grob-pitch-tuple.cc --  implement Grob_p
 
 source file of the GNU LilyPond music typesetter
 
-(c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+(c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
  */
 #include "grob-pitch-tuple.hh"
diff -purN ../lilypond-1.5.28/lily/grob-pq-engraver.cc ./lily/grob-pq-engraver.cc
--- ../lilypond-1.5.28/lily/grob-pq-engraver.cc	Mon Dec 24 00:04:03 2001
+++ ./lily/grob-pq-engraver.cc	Fri Feb  1 19:17:38 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "translator-group.hh"
diff -purN ../lilypond-1.5.28/lily/grob.cc ./lily/grob.cc
--- ../lilypond-1.5.28/lily/grob.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/grob.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/group-interface.cc ./lily/group-interface.cc
--- ../lilypond-1.5.28/lily/group-interface.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/group-interface.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "group-interface.hh"
diff -purN ../lilypond-1.5.28/lily/hairpin.cc ./lily/hairpin.cc
--- ../lilypond-1.5.28/lily/hairpin.cc	Sat Sep 22 14:13:06 2001
+++ ./lily/hairpin.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "molecule.hh"
diff -purN ../lilypond-1.5.28/lily/hara-kiri-group-spanner.cc ./lily/hara-kiri-group-spanner.cc
--- ../lilypond-1.5.28/lily/hara-kiri-group-spanner.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/hara-kiri-group-spanner.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
diff -purN ../lilypond-1.5.28/lily/includable-lexer.cc ./lily/includable-lexer.cc
--- ../lilypond-1.5.28/lily/includable-lexer.cc	Sun Mar 18 15:15:32 2001
+++ ./lily/includable-lexer.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <strstream.h>
diff -purN ../lilypond-1.5.28/lily/include/afm.hh ./lily/include/afm.hh
--- ../lilypond-1.5.28/lily/include/afm.hh	Fri Apr 27 22:17:18 2001
+++ ./lily/include/afm.hh	Fri Feb  1 19:16:22 2002
@@ -4,7 +4,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/align-interface.hh ./lily/include/align-interface.hh
--- ../lilypond-1.5.28/lily/include/align-interface.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/align-interface.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/all-font-metrics.hh ./lily/include/all-font-metrics.hh
--- ../lilypond-1.5.28/lily/include/all-font-metrics.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/all-font-metrics.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/arpeggio.hh ./lily/include/arpeggio.hh
--- ../lilypond-1.5.28/lily/include/arpeggio.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/arpeggio.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef ARPEGGIO_HH
diff -purN ../lilypond-1.5.28/lily/include/audio-column.hh ./lily/include/audio-column.hh
--- ../lilypond-1.5.28/lily/include/audio-column.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/audio-column.hh	Fri Feb  1 19:16:22 2002
@@ -1,7 +1,7 @@
 /*
   audio-column.hh -- declare Audio_column
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef AUDIO_COLUMN_HH
diff -purN ../lilypond-1.5.28/lily/include/audio-element-info.hh ./lily/include/audio-element-info.hh
--- ../lilypond-1.5.28/lily/include/audio-element-info.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/audio-element-info.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/audio-element.hh ./lily/include/audio-element.hh
--- ../lilypond-1.5.28/lily/include/audio-element.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/audio-element.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/audio-item.hh ./lily/include/audio-item.hh
--- ../lilypond-1.5.28/lily/include/audio-item.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/audio-item.hh	Fri Feb  1 19:16:22 2002
@@ -1,7 +1,7 @@
 /*
   audio-item.hh -- declare Audio_items
 
-  (c) 1996--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef AUDIO_ITEM_HH
diff -purN ../lilypond-1.5.28/lily/include/audio-staff.hh ./lily/include/audio-staff.hh
--- ../lilypond-1.5.28/lily/include/audio-staff.hh	Mon Mar 26 11:56:07 2001
+++ ./lily/include/audio-staff.hh	Fri Feb  1 19:16:22 2002
@@ -1,7 +1,7 @@
 /*
   audio-staff.hh -- declare Audio_staff
 
-  (c) 1996--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef AUDIO_STAFF_HH
diff -purN ../lilypond-1.5.28/lily/include/auto-change-iterator.hh ./lily/include/auto-change-iterator.hh
--- ../lilypond-1.5.28/lily/include/auto-change-iterator.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/auto-change-iterator.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/axis-group-interface.hh ./lily/include/axis-group-interface.hh
--- ../lilypond-1.5.28/lily/include/axis-group-interface.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/axis-group-interface.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/bar.hh ./lily/include/bar.hh
--- ../lilypond-1.5.28/lily/include/bar.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/bar.hh	Fri Feb  1 19:16:22 2002
@@ -1,7 +1,7 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996--2001 Han-Wen Nienhuys
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
 #ifndef BAR_HH
diff -purN ../lilypond-1.5.28/lily/include/beam.hh ./lily/include/beam.hh
--- ../lilypond-1.5.28/lily/include/beam.hh	Mon Mar 26 00:02:17 2001
+++ ./lily/include/beam.hh	Fri Feb  1 19:16:22 2002
@@ -1,7 +1,7 @@
 /*
   beam.hh -- part of GNU LilyPond
 
-  (c) 1996--2001 Han-Wen Nienhuys
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
 #ifndef BEAM_HH
diff -purN ../lilypond-1.5.28/lily/include/beaming.hh ./lily/include/beaming.hh
--- ../lilypond-1.5.28/lily/include/beaming.hh	Sun Sep 30 18:21:48 2001
+++ ./lily/include/beaming.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/bezier-bow.hh ./lily/include/bezier-bow.hh
--- ../lilypond-1.5.28/lily/include/bezier-bow.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/bezier-bow.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/bezier.hh ./lily/include/bezier.hh
--- ../lilypond-1.5.28/lily/include/bezier.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/bezier.hh	Fri Feb  1 19:16:22 2002
@@ -1,7 +1,7 @@
 /*
   bezier.hh -- declare Bezier and Bezier_bow
 
-  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef BEZIER_HH
diff -purN ../lilypond-1.5.28/lily/include/break-algorithm.hh ./lily/include/break-algorithm.hh
--- ../lilypond-1.5.28/lily/include/break-algorithm.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/break-algorithm.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/break-align-item.hh ./lily/include/break-align-item.hh
--- ../lilypond-1.5.28/lily/include/break-align-item.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/break-align-item.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/change-iterator.hh ./lily/include/change-iterator.hh
--- ../lilypond-1.5.28/lily/include/change-iterator.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/change-iterator.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/chord-name.hh ./lily/include/chord-name.hh
--- ../lilypond-1.5.28/lily/include/chord-name.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/chord-name.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef CHORD_NAME_HH
diff -purN ../lilypond-1.5.28/lily/include/chord-tremolo-iterator.hh ./lily/include/chord-tremolo-iterator.hh
--- ../lilypond-1.5.28/lily/include/chord-tremolo-iterator.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/chord-tremolo-iterator.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/chord.hh ./lily/include/chord.hh
--- ../lilypond-1.5.28/lily/include/chord.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/chord.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef CHORD_HH
diff -purN ../lilypond-1.5.28/lily/include/clef.hh ./lily/include/clef.hh
--- ../lilypond-1.5.28/lily/include/clef.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/clef.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/collision.hh ./lily/include/collision.hh
--- ../lilypond-1.5.28/lily/include/collision.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/collision.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/column-x-positions.hh ./lily/include/column-x-positions.hh
--- ../lilypond-1.5.28/lily/include/column-x-positions.hh	Fri Aug 17 01:13:09 2001
+++ ./lily/include/column-x-positions.hh	Fri Feb  1 19:16:22 2002
@@ -1,7 +1,7 @@
 /*
   column-x-positions.hh -- part of GNU LilyPond
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef COLUMN_X_POSITIONS_HH
diff -purN ../lilypond-1.5.28/lily/include/command-request.hh ./lily/include/command-request.hh
--- ../lilypond-1.5.28/lily/include/command-request.hh	Sat Dec 29 20:30:41 2001
+++ ./lily/include/command-request.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/context-specced-music.hh ./lily/include/context-specced-music.hh
--- ../lilypond-1.5.28/lily/include/context-specced-music.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/context-specced-music.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/cxx-function-smob.hh ./lily/include/cxx-function-smob.hh
--- ../lilypond-1.5.28/lily/include/cxx-function-smob.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/cxx-function-smob.hh	Fri Feb  1 19:16:22 2002
@@ -2,7 +2,7 @@
      cxx-function-smob.hh --  
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/dimension-cache-callback.hh ./lily/include/dimension-cache-callback.hh
--- ../lilypond-1.5.28/lily/include/dimension-cache-callback.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/dimension-cache-callback.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/dimension-cache.hh ./lily/include/dimension-cache.hh
--- ../lilypond-1.5.28/lily/include/dimension-cache.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/dimension-cache.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/directional-element-interface.hh ./lily/include/directional-element-interface.hh
--- ../lilypond-1.5.28/lily/include/directional-element-interface.hh	Fri Oct 19 11:14:48 2001
+++ ./lily/include/directional-element-interface.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/dot-column.hh ./lily/include/dot-column.hh
--- ../lilypond-1.5.28/lily/include/dot-column.hh	Mon Sep 24 01:04:29 2001
+++ ./lily/include/dot-column.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/dots.hh ./lily/include/dots.hh
--- ../lilypond-1.5.28/lily/include/dots.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/dots.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/duration.hh ./lily/include/duration.hh
--- ../lilypond-1.5.28/lily/include/duration.hh	Fri Nov  9 00:47:52 2001
+++ ./lily/include/duration.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 
 */
 
diff -purN ../lilypond-1.5.28/lily/include/engraver-group-engraver.hh ./lily/include/engraver-group-engraver.hh
--- ../lilypond-1.5.28/lily/include/engraver-group-engraver.hh	Fri Dec 14 01:18:57 2001
+++ ./lily/include/engraver-group-engraver.hh	Fri Feb  1 19:16:22 2002
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/engraver.hh ./lily/include/engraver.hh
--- ../lilypond-1.5.28/lily/include/engraver.hh	Fri Nov  9 00:47:52 2001
+++ ./lily/include/engraver.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/file-results.hh ./lily/include/file-results.hh
--- ../lilypond-1.5.28/lily/include/file-results.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/file-results.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/folded-repeat-iterator.hh ./lily/include/folded-repeat-iterator.hh
--- ../lilypond-1.5.28/lily/include/folded-repeat-iterator.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/folded-repeat-iterator.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/font-interface.hh ./lily/include/font-interface.hh
--- ../lilypond-1.5.28/lily/include/font-interface.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/font-interface.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/font-metric.hh ./lily/include/font-metric.hh
--- ../lilypond-1.5.28/lily/include/font-metric.hh	Sun Oct 14 15:15:44 2001
+++ ./lily/include/font-metric.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/global-ctor.hh ./lily/include/global-ctor.hh
--- ../lilypond-1.5.28/lily/include/global-ctor.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/global-ctor.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/global-translator.hh ./lily/include/global-translator.hh
--- ../lilypond-1.5.28/lily/include/global-translator.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/global-translator.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/gourlay-breaking.hh ./lily/include/gourlay-breaking.hh
--- ../lilypond-1.5.28/lily/include/gourlay-breaking.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/gourlay-breaking.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/grace-iterator.hh ./lily/include/grace-iterator.hh
--- ../lilypond-1.5.28/lily/include/grace-iterator.hh	Mon Jul  2 01:15:27 2001
+++ ./lily/include/grace-iterator.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/grace-music.hh ./lily/include/grace-music.hh
--- ../lilypond-1.5.28/lily/include/grace-music.hh	Mon Jul  2 01:15:27 2001
+++ ./lily/include/grace-music.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/grob-info.hh ./lily/include/grob-info.hh
--- ../lilypond-1.5.28/lily/include/grob-info.hh	Mon Dec 24 00:04:03 2001
+++ ./lily/include/grob-info.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/grob.hh ./lily/include/grob.hh
--- ../lilypond-1.5.28/lily/include/grob.hh	Sat Dec 29 20:30:41 2001
+++ ./lily/include/grob.hh	Fri Feb  1 19:16:22 2002
@@ -1,7 +1,7 @@
 /*
   grob.hh -- declare Grob
 
-  (c) 1996-1999--2001 Han-Wen Nienhuys
+  (c) 1996-1999--2002 Han-Wen Nienhuys
 */
 
 #ifndef STAFFELEM_HH
diff -purN ../lilypond-1.5.28/lily/include/group-interface.hh ./lily/include/group-interface.hh
--- ../lilypond-1.5.28/lily/include/group-interface.hh	Sat Dec 29 20:30:41 2001
+++ ./lily/include/group-interface.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/hairpin.hh ./lily/include/hairpin.hh
--- ../lilypond-1.5.28/lily/include/hairpin.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/hairpin.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/hara-kiri-group-spanner.hh ./lily/include/hara-kiri-group-spanner.hh
--- ../lilypond-1.5.28/lily/include/hara-kiri-group-spanner.hh	Fri Sep 28 23:58:21 2001
+++ ./lily/include/hara-kiri-group-spanner.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/includable-lexer.hh ./lily/include/includable-lexer.hh
--- ../lilypond-1.5.28/lily/include/includable-lexer.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/includable-lexer.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/input-smob.hh ./lily/include/input-smob.hh
--- ../lilypond-1.5.28/lily/include/input-smob.hh	Sun Oct 14 15:15:44 2001
+++ ./lily/include/input-smob.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/interpretation-context-handle.hh ./lily/include/interpretation-context-handle.hh
--- ../lilypond-1.5.28/lily/include/interpretation-context-handle.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/interpretation-context-handle.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/item.hh ./lily/include/item.hh
--- ../lilypond-1.5.28/lily/include/item.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/item.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #ifndef ITEM_HH
 #define ITEM_HH
diff -purN ../lilypond-1.5.28/lily/include/key-item.hh ./lily/include/key-item.hh
--- ../lilypond-1.5.28/lily/include/key-item.hh	Sun Apr  1 14:59:01 2001
+++ ./lily/include/key-item.hh	Fri Feb  1 19:16:22 2002
@@ -1,7 +1,7 @@
 /*
   key-item.hh -- part of GNU LilyPond
 
-  (c) 1996--2001 Han-Wen Nienhuys
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
 #ifndef KEYITEM_HH
diff -purN ../lilypond-1.5.28/lily/include/keyword.hh ./lily/include/keyword.hh
--- ../lilypond-1.5.28/lily/include/keyword.hh	Mon Jul  9 00:21:17 2001
+++ ./lily/include/keyword.hh	Fri Feb  1 19:16:22 2002
@@ -1,7 +1,7 @@
 /*
   keyword.hh -- part of GNU LilyPond
 
-  (c) 1996--2001 Han-Wen Nienhuys
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
 #ifndef KEYWORD_HH
diff -purN ../lilypond-1.5.28/lily/include/kpath.hh ./lily/include/kpath.hh
--- ../lilypond-1.5.28/lily/include/kpath.hh	Wed Aug 22 23:23:14 2001
+++ ./lily/include/kpath.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@ kpath.hh -- declare kpath funcs.
 
 source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
  */
 
diff -purN ../lilypond-1.5.28/lily/include/least-squares.hh ./lily/include/least-squares.hh
--- ../lilypond-1.5.28/lily/include/least-squares.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/least-squares.hh	Fri Feb  1 19:16:22 2002
@@ -1,7 +1,7 @@
 /*
   leastsquare.hh -- part of GNU LilyPond
 
-  (c) 1996--2001 Han-Wen Nienhuys
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
 #ifndef LEASTSQUARE_HH
diff -purN ../lilypond-1.5.28/lily/include/lily-guile.hh ./lily/include/lily-guile.hh
--- ../lilypond-1.5.28/lily/include/lily-guile.hh	Fri Dec 28 16:52:42 2001
+++ ./lily/include/lily-guile.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef LILY_GUILE_HH
diff -purN ../lilypond-1.5.28/lily/include/lily-proto.hh ./lily/include/lily-proto.hh
--- ../lilypond-1.5.28/lily/include/lily-proto.hh	Sat Dec 29 20:30:41 2001
+++ ./lily/include/lily-proto.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
  source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef LILY_PROTO_HH
diff -purN ../lilypond-1.5.28/lily/include/lily-version.hh ./lily/include/lily-version.hh
--- ../lilypond-1.5.28/lily/include/lily-version.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/lily-version.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/lilypond-input-version.hh ./lily/include/lilypond-input-version.hh
--- ../lilypond-1.5.28/lily/include/lilypond-input-version.hh	Mon Apr 23 00:27:16 2001
+++ ./lily/include/lilypond-input-version.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 
 */
 
diff -purN ../lilypond-1.5.28/lily/include/line-group-group-engraver.hh ./lily/include/line-group-group-engraver.hh
--- ../lilypond-1.5.28/lily/include/line-group-group-engraver.hh	Mon Sep 24 01:04:29 2001
+++ ./lily/include/line-group-group-engraver.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/line-of-score.hh ./lily/include/line-of-score.hh
--- ../lilypond-1.5.28/lily/include/line-of-score.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/line-of-score.hh	Fri Feb  1 19:16:22 2002
@@ -1,7 +1,7 @@
 /*
   line-of-score.hh -- part of GNU LilyPond
 
-  (c) 1996--2001 Han-Wen Nienhuys
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
 #ifndef SCORELINE_HH
diff -purN ../lilypond-1.5.28/lily/include/line-spanner.hh ./lily/include/line-spanner.hh
--- ../lilypond-1.5.28/lily/include/line-spanner.hh	Tue Jul 24 13:39:46 2001
+++ ./lily/include/line-spanner.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/local-key-item.hh ./lily/include/local-key-item.hh
--- ../lilypond-1.5.28/lily/include/local-key-item.hh	Tue Feb 27 18:35:55 2001
+++ ./lily/include/local-key-item.hh	Fri Feb  1 19:16:22 2002
@@ -1,7 +1,7 @@
 /*
   local-key-item.hh -- part of GNU LilyPond
 
-  (c) 1996--2001 Han-Wen Nienhuys
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
 #ifndef LOCALKEYITEM_HH
diff -purN ../lilypond-1.5.28/lily/include/lookup.hh ./lily/include/lookup.hh
--- ../lilypond-1.5.28/lily/include/lookup.hh	Sat Mar 24 01:28:01 2001
+++ ./lily/include/lookup.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff -purN ../lilypond-1.5.28/lily/include/lyric-combine-music-iterator.hh ./lily/include/lyric-combine-music-iterator.hh
--- ../lilypond-1.5.28/lily/include/lyric-combine-music-iterator.hh	Mon Dec 24 00:04:03 2001
+++ ./lily/include/lyric-combine-music-iterator.hh	Fri Feb  1 19:16:22 2002
@@ -4,7 +4,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/lyric-combine-music.hh ./lily/include/lyric-combine-music.hh
--- ../lilypond-1.5.28/lily/include/lyric-combine-music.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/lyric-combine-music.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/lyric-extender.hh ./lily/include/lyric-extender.hh
--- ../lilypond-1.5.28/lily/include/lyric-extender.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/lyric-extender.hh	Fri Feb  1 19:16:22 2002
@@ -2,7 +2,7 @@
 /*
   extender-spanner.hh -- part of GNU LilyPond
 
-  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef EXTENDER_SPANNER_HH
diff -purN ../lilypond-1.5.28/lily/include/main.hh ./lily/include/main.hh
--- ../lilypond-1.5.28/lily/include/main.hh	Sun Sep 16 19:11:28 2001
+++ ./lily/include/main.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #ifndef MAIN_HH
 #define MAIN_HH
diff -purN ../lilypond-1.5.28/lily/include/midi-def.hh ./lily/include/midi-def.hh
--- ../lilypond-1.5.28/lily/include/midi-def.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/midi-def.hh	Fri Feb  1 19:16:22 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/midi-item.hh ./lily/include/midi-item.hh
--- ../lilypond-1.5.28/lily/include/midi-item.hh	Mon Jul  2 01:15:27 2001
+++ ./lily/include/midi-item.hh	Fri Feb  1 19:16:23 2002
@@ -1,7 +1,7 @@
 /*
   midi-item.hh -- declare Midi items
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef MIDI_ITEM_HH
diff -purN ../lilypond-1.5.28/lily/include/midi-stream.hh ./lily/include/midi-stream.hh
--- ../lilypond-1.5.28/lily/include/midi-stream.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/midi-stream.hh	Fri Feb  1 19:16:23 2002
@@ -1,7 +1,7 @@
 /*
   midi-stream.hh -- declare Midi_stream
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef MIDI_STREAM_HH
diff -purN ../lilypond-1.5.28/lily/include/midi-walker.hh ./lily/include/midi-walker.hh
--- ../lilypond-1.5.28/lily/include/midi-walker.hh	Mon Jul  2 01:15:27 2001
+++ ./lily/include/midi-walker.hh	Fri Feb  1 19:16:23 2002
@@ -1,7 +1,7 @@
 /*
   midi-walker.hh -- declare Midi_walker
 
-  (c) 1996--2001 Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys  <hanwen@cs.uu.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
diff -purN ../lilypond-1.5.28/lily/include/minterval.hh ./lily/include/minterval.hh
--- ../lilypond-1.5.28/lily/include/minterval.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/minterval.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/molecule.hh ./lily/include/molecule.hh
--- ../lilypond-1.5.28/lily/include/molecule.hh	Sun Oct 14 15:15:44 2001
+++ ./lily/include/molecule.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #ifndef MOLECULE_HH
 #define MOLECULE_HH
diff -purN ../lilypond-1.5.28/lily/include/moment.hh ./lily/include/moment.hh
--- ../lilypond-1.5.28/lily/include/moment.hh	Sun Oct 14 15:15:44 2001
+++ ./lily/include/moment.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/multi-measure-rest.hh ./lily/include/multi-measure-rest.hh
--- ../lilypond-1.5.28/lily/include/multi-measure-rest.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/multi-measure-rest.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/music-iterator.hh ./lily/include/music-iterator.hh
--- ../lilypond-1.5.28/lily/include/music-iterator.hh	Fri Jun 29 02:01:20 2001
+++ ./lily/include/music-iterator.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/music-list.hh ./lily/include/music-list.hh
--- ../lilypond-1.5.28/lily/include/music-list.hh	Fri Jun 29 01:03:00 2001
+++ ./lily/include/music-list.hh	Fri Feb  1 19:16:23 2002
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/music-output-def.hh ./lily/include/music-output-def.hh
--- ../lilypond-1.5.28/lily/include/music-output-def.hh	Sun Oct 14 15:15:44 2001
+++ ./lily/include/music-output-def.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/music-output.hh ./lily/include/music-output.hh
--- ../lilypond-1.5.28/lily/include/music-output.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/music-output.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/music-sequence.hh ./lily/include/music-sequence.hh
--- ../lilypond-1.5.28/lily/include/music-sequence.hh	Mon Oct  8 01:49:09 2001
+++ ./lily/include/music-sequence.hh	Fri Feb  1 19:16:23 2002
@@ -5,7 +5,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/music-wrapper-iterator.hh ./lily/include/music-wrapper-iterator.hh
--- ../lilypond-1.5.28/lily/include/music-wrapper-iterator.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/music-wrapper-iterator.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/music-wrapper.hh ./lily/include/music-wrapper.hh
--- ../lilypond-1.5.28/lily/include/music-wrapper.hh	Fri Jun 29 01:03:00 2001
+++ ./lily/include/music-wrapper.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/music.hh ./lily/include/music.hh
--- ../lilypond-1.5.28/lily/include/music.hh	Fri Nov  9 00:47:52 2001
+++ ./lily/include/music.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/musical-request.hh ./lily/include/musical-request.hh
--- ../lilypond-1.5.28/lily/include/musical-request.hh	Sat Dec  1 15:34:56 2001
+++ ./lily/include/musical-request.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/my-lily-lexer.hh ./lily/include/my-lily-lexer.hh
--- ../lilypond-1.5.28/lily/include/my-lily-lexer.hh	Sun Sep 16 19:11:28 2001
+++ ./lily/include/my-lily-lexer.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef LEXER_HH
diff -purN ../lilypond-1.5.28/lily/include/my-lily-parser.hh ./lily/include/my-lily-parser.hh
--- ../lilypond-1.5.28/lily/include/my-lily-parser.hh	Sat Dec 29 20:30:41 2001
+++ ./lily/include/my-lily-parser.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/note-column.hh ./lily/include/note-column.hh
--- ../lilypond-1.5.28/lily/include/note-column.hh	Mon Dec 24 00:04:03 2001
+++ ./lily/include/note-column.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/note-head.hh ./lily/include/note-head.hh
--- ../lilypond-1.5.28/lily/include/note-head.hh	Sat Dec  1 15:34:56 2001
+++ ./lily/include/note-head.hh	Fri Feb  1 19:16:23 2002
@@ -1,7 +1,7 @@
 /*
   note-head.hh -- part of GNU LilyPond
 
-  (c) 1996--2001 Han-Wen Nienhuys
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
 #ifndef NOTEHEAD_HH
diff -purN ../lilypond-1.5.28/lily/include/output-property-music-iterator.hh ./lily/include/output-property-music-iterator.hh
--- ../lilypond-1.5.28/lily/include/output-property-music-iterator.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/output-property-music-iterator.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef OUTPUT_PROPERTY_MUSIC_ITERATOR_HH
diff -purN ../lilypond-1.5.28/lily/include/output-property.hh ./lily/include/output-property.hh
--- ../lilypond-1.5.28/lily/include/output-property.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/output-property.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/paper-column.hh ./lily/include/paper-column.hh
--- ../lilypond-1.5.28/lily/include/paper-column.hh	Mon Dec 24 00:04:03 2001
+++ ./lily/include/paper-column.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/paper-def.hh ./lily/include/paper-def.hh
--- ../lilypond-1.5.28/lily/include/paper-def.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/paper-def.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/paper-outputter.hh ./lily/include/paper-outputter.hh
--- ../lilypond-1.5.28/lily/include/paper-outputter.hh	Sun Nov  4 20:54:32 2001
+++ ./lily/include/paper-outputter.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/paper-score.hh ./lily/include/paper-score.hh
--- ../lilypond-1.5.28/lily/include/paper-score.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/paper-score.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/part-combine-music-iterator.hh ./lily/include/part-combine-music-iterator.hh
--- ../lilypond-1.5.28/lily/include/part-combine-music-iterator.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/part-combine-music-iterator.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/part-combine-music.hh ./lily/include/part-combine-music.hh
--- ../lilypond-1.5.28/lily/include/part-combine-music.hh	Sun Mar 11 16:30:08 2001
+++ ./lily/include/part-combine-music.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/performance.hh ./lily/include/performance.hh
--- ../lilypond-1.5.28/lily/include/performance.hh	Mon Jul  2 01:15:27 2001
+++ ./lily/include/performance.hh	Fri Feb  1 19:16:23 2002
@@ -1,7 +1,7 @@
 /*
   performance.hh -- declare Performance
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef PERFORMANCE_HH
diff -purN ../lilypond-1.5.28/lily/include/performer-group-performer.hh ./lily/include/performer-group-performer.hh
--- ../lilypond-1.5.28/lily/include/performer-group-performer.hh	Mon Sep 24 01:04:29 2001
+++ ./lily/include/performer-group-performer.hh	Fri Feb  1 19:16:23 2002
@@ -1,7 +1,7 @@
 /*
   performer-group-performer.hh -- declare Performer_group_performer
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
diff -purN ../lilypond-1.5.28/lily/include/performer.hh ./lily/include/performer.hh
--- ../lilypond-1.5.28/lily/include/performer.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/performer.hh	Fri Feb  1 19:16:23 2002
@@ -1,7 +1,7 @@
 /*
   performer.hh -- declare Performer
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
diff -purN ../lilypond-1.5.28/lily/include/pitch.hh ./lily/include/pitch.hh
--- ../lilypond-1.5.28/lily/include/pitch.hh	Sun Oct 14 15:15:44 2001
+++ ./lily/include/pitch.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/property-iterator.hh ./lily/include/property-iterator.hh
--- ../lilypond-1.5.28/lily/include/property-iterator.hh	Fri Mar 16 01:42:02 2001
+++ ./lily/include/property-iterator.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/protected-scm.hh ./lily/include/protected-scm.hh
--- ../lilypond-1.5.28/lily/include/protected-scm.hh	Fri Oct 19 11:14:48 2001
+++ ./lily/include/protected-scm.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/relative-music.hh ./lily/include/relative-music.hh
--- ../lilypond-1.5.28/lily/include/relative-music.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/relative-music.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/repeated-music.hh ./lily/include/repeated-music.hh
--- ../lilypond-1.5.28/lily/include/repeated-music.hh	Mon Oct  8 01:49:09 2001
+++ ./lily/include/repeated-music.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/request-chord-iterator.hh ./lily/include/request-chord-iterator.hh
--- ../lilypond-1.5.28/lily/include/request-chord-iterator.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/request-chord-iterator.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/request.hh ./lily/include/request.hh
--- ../lilypond-1.5.28/lily/include/request.hh	Fri May 11 01:57:13 2001
+++ ./lily/include/request.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef REQUEST_HH
diff -purN ../lilypond-1.5.28/lily/include/rest-collision.hh ./lily/include/rest-collision.hh
--- ../lilypond-1.5.28/lily/include/rest-collision.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/rest-collision.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/rest.hh ./lily/include/rest.hh
--- ../lilypond-1.5.28/lily/include/rest.hh	Sun Mar 18 15:15:32 2001
+++ ./lily/include/rest.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/rhythmic-head.hh ./lily/include/rhythmic-head.hh
--- ../lilypond-1.5.28/lily/include/rhythmic-head.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/rhythmic-head.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/rod.hh ./lily/include/rod.hh
--- ../lilypond-1.5.28/lily/include/rod.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/rod.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/scaled-font-metric.hh ./lily/include/scaled-font-metric.hh
--- ../lilypond-1.5.28/lily/include/scaled-font-metric.hh	Wed May  9 13:19:26 2001
+++ ./lily/include/scaled-font-metric.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/scm-hash.hh ./lily/include/scm-hash.hh
--- ../lilypond-1.5.28/lily/include/scm-hash.hh	Thu Sep 27 01:54:34 2001
+++ ./lily/include/scm-hash.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/scope.hh ./lily/include/scope.hh
--- ../lilypond-1.5.28/lily/include/scope.hh	Sun Mar  4 02:21:00 2001
+++ ./lily/include/scope.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/score-engraver.hh ./lily/include/score-engraver.hh
--- ../lilypond-1.5.28/lily/include/score-engraver.hh	Fri Dec 14 01:18:57 2001
+++ ./lily/include/score-engraver.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/score-performer.hh ./lily/include/score-performer.hh
--- ../lilypond-1.5.28/lily/include/score-performer.hh	Mon Sep 24 01:04:29 2001
+++ ./lily/include/score-performer.hh	Fri Feb  1 19:16:23 2002
@@ -1,7 +1,7 @@
 /*
   score-performer.hh -- declare Score_performer
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
diff -purN ../lilypond-1.5.28/lily/include/score.hh ./lily/include/score.hh
--- ../lilypond-1.5.28/lily/include/score.hh	Sun Oct 14 15:15:44 2001
+++ ./lily/include/score.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/script-column.hh ./lily/include/script-column.hh
--- ../lilypond-1.5.28/lily/include/script-column.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/script-column.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/script.hh ./lily/include/script.hh
--- ../lilypond-1.5.28/lily/include/script.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/script.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/separating-group-spanner.hh ./lily/include/separating-group-spanner.hh
--- ../lilypond-1.5.28/lily/include/separating-group-spanner.hh	Sat Oct 13 01:23:40 2001
+++ ./lily/include/separating-group-spanner.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/separation-item.hh ./lily/include/separation-item.hh
--- ../lilypond-1.5.28/lily/include/separation-item.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/separation-item.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/sequential-music-iterator.hh ./lily/include/sequential-music-iterator.hh
--- ../lilypond-1.5.28/lily/include/sequential-music-iterator.hh	Tue Aug 14 13:41:27 2001
+++ ./lily/include/sequential-music-iterator.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef SEQUENTIAL_MUSIC_ITERATOR_HH
diff -purN ../lilypond-1.5.28/lily/include/side-position-interface.hh ./lily/include/side-position-interface.hh
--- ../lilypond-1.5.28/lily/include/side-position-interface.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/side-position-interface.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/simple-music-iterator.hh ./lily/include/simple-music-iterator.hh
--- ../lilypond-1.5.28/lily/include/simple-music-iterator.hh	Fri Jun 29 14:30:46 2001
+++ ./lily/include/simple-music-iterator.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 #ifndef SIMPLE_MUSIC_ITERATOR_HH
diff -purN ../lilypond-1.5.28/lily/include/simple-spacer.hh ./lily/include/simple-spacer.hh
--- ../lilypond-1.5.28/lily/include/simple-spacer.hh	Wed Dec  5 17:15:28 2001
+++ ./lily/include/simple-spacer.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/simultaneous-music-iterator.hh ./lily/include/simultaneous-music-iterator.hh
--- ../lilypond-1.5.28/lily/include/simultaneous-music-iterator.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/simultaneous-music-iterator.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/slur-bezier-bow.hh ./lily/include/slur-bezier-bow.hh
--- ../lilypond-1.5.28/lily/include/slur-bezier-bow.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/slur-bezier-bow.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2001  Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef SLUR_BEZIER_BOW_HH
diff -purN ../lilypond-1.5.28/lily/include/slur.hh ./lily/include/slur.hh
--- ../lilypond-1.5.28/lily/include/slur.hh	Thu Mar 22 01:19:49 2001
+++ ./lily/include/slur.hh	Fri Feb  1 19:16:23 2002
@@ -1,7 +1,7 @@
 /*
   slur.hh -- declare Slur
 
-  (c) 1996--2001 Han-Wen Nienhuys
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
 #ifndef SLUR_HH
diff -purN ../lilypond-1.5.28/lily/include/smobs.hh ./lily/include/smobs.hh
--- ../lilypond-1.5.28/lily/include/smobs.hh	Sun Oct 14 15:15:44 2001
+++ ./lily/include/smobs.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/spaceable-grob.hh ./lily/include/spaceable-grob.hh
--- ../lilypond-1.5.28/lily/include/spaceable-grob.hh	Fri Jun 29 01:03:00 2001
+++ ./lily/include/spaceable-grob.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/spacing-spanner.hh ./lily/include/spacing-spanner.hh
--- ../lilypond-1.5.28/lily/include/spacing-spanner.hh	Sat Dec 29 20:30:41 2001
+++ ./lily/include/spacing-spanner.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/span-bar.hh ./lily/include/span-bar.hh
--- ../lilypond-1.5.28/lily/include/span-bar.hh	Wed May  2 23:56:40 2001
+++ ./lily/include/span-bar.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/spanner.hh ./lily/include/spanner.hh
--- ../lilypond-1.5.28/lily/include/spanner.hh	Thu Mar 22 01:19:49 2001
+++ ./lily/include/spanner.hh	Fri Feb  1 19:16:23 2002
@@ -1,7 +1,7 @@
 /*
   spanner.hh -- part of GNU LilyPond
 
-  (c) 1996--2001 Han-Wen Nienhuys
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
 #ifndef SPANNER_HH
diff -purN ../lilypond-1.5.28/lily/include/spring.hh ./lily/include/spring.hh
--- ../lilypond-1.5.28/lily/include/spring.hh	Sun Jul 29 15:45:23 2001
+++ ./lily/include/spring.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/staff-symbol-referencer.hh ./lily/include/staff-symbol-referencer.hh
--- ../lilypond-1.5.28/lily/include/staff-symbol-referencer.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/staff-symbol-referencer.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
  
  source file of the GNU LilyPond music typesetter
  
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  
  */
 
diff -purN ../lilypond-1.5.28/lily/include/staff-symbol.hh ./lily/include/staff-symbol.hh
--- ../lilypond-1.5.28/lily/include/staff-symbol.hh	Fri Dec 14 01:18:57 2001
+++ ./lily/include/staff-symbol.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/stem-info.hh ./lily/include/stem-info.hh
--- ../lilypond-1.5.28/lily/include/stem-info.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/stem-info.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/stem-tremolo.hh ./lily/include/stem-tremolo.hh
--- ../lilypond-1.5.28/lily/include/stem-tremolo.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/stem-tremolo.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/stem.hh ./lily/include/stem.hh
--- ../lilypond-1.5.28/lily/include/stem.hh	Sat Sep  8 19:20:07 2001
+++ ./lily/include/stem.hh	Fri Feb  1 19:16:23 2002
@@ -1,7 +1,7 @@
 /*
   stem.hh -- declare Stem
 
-  (c) 1996--2001 Han-Wen Nienhuys
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
 #ifndef STEM_HH
diff -purN ../lilypond-1.5.28/lily/include/swallow-perf.hh ./lily/include/swallow-perf.hh
--- ../lilypond-1.5.28/lily/include/swallow-perf.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/swallow-perf.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/system-start-delimiter.hh ./lily/include/system-start-delimiter.hh
--- ../lilypond-1.5.28/lily/include/system-start-delimiter.hh	Fri Aug 10 14:56:43 2001
+++ ./lily/include/system-start-delimiter.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
      
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/text-item.hh ./lily/include/text-item.hh
--- ../lilypond-1.5.28/lily/include/text-item.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/text-item.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
diff -purN ../lilypond-1.5.28/lily/include/text-spanner.hh ./lily/include/text-spanner.hh
--- ../lilypond-1.5.28/lily/include/text-spanner.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/text-spanner.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/tfm-reader.hh ./lily/include/tfm-reader.hh
--- ../lilypond-1.5.28/lily/include/tfm-reader.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/tfm-reader.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
   revamped code from GNU Fontutils-0.6
diff -purN ../lilypond-1.5.28/lily/include/tfm.hh ./lily/include/tfm.hh
--- ../lilypond-1.5.28/lily/include/tfm.hh	Fri Apr 27 22:17:18 2001
+++ ./lily/include/tfm.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
   revamped code from GNU Fontutils-0.6
diff -purN ../lilypond-1.5.28/lily/include/tie-column.hh ./lily/include/tie-column.hh
--- ../lilypond-1.5.28/lily/include/tie-column.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/tie-column.hh	Fri Feb  1 19:16:23 2002
@@ -4,7 +4,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/tie.hh ./lily/include/tie.hh
--- ../lilypond-1.5.28/lily/include/tie.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/tie.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/time-scaled-music-iterator.hh ./lily/include/time-scaled-music-iterator.hh
--- ../lilypond-1.5.28/lily/include/time-scaled-music-iterator.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/time-scaled-music-iterator.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/time-scaled-music.hh ./lily/include/time-scaled-music.hh
--- ../lilypond-1.5.28/lily/include/time-scaled-music.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/time-scaled-music.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/time-signature.hh ./lily/include/time-signature.hh
--- ../lilypond-1.5.28/lily/include/time-signature.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/time-signature.hh	Fri Feb  1 19:16:23 2002
@@ -1,7 +1,7 @@
 /*
   time_signature.hh -- declare Time_signature
 
-  (c) 1996--2001 Han-Wen Nienhuys
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
 #ifndef METER_HH
diff -purN ../lilypond-1.5.28/lily/include/timing-translator.hh ./lily/include/timing-translator.hh
--- ../lilypond-1.5.28/lily/include/timing-translator.hh	Sat Dec 29 20:30:41 2001
+++ ./lily/include/timing-translator.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/translation-property.hh ./lily/include/translation-property.hh
--- ../lilypond-1.5.28/lily/include/translation-property.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/translation-property.hh	Fri Feb  1 19:16:23 2002
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/translator-change.hh ./lily/include/translator-change.hh
--- ../lilypond-1.5.28/lily/include/translator-change.hh	Sat Feb 24 22:06:30 2001
+++ ./lily/include/translator-change.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/translator-def.hh ./lily/include/translator-def.hh
--- ../lilypond-1.5.28/lily/include/translator-def.hh	Sun Oct 14 15:15:44 2001
+++ ./lily/include/translator-def.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/translator-group.hh ./lily/include/translator-group.hh
--- ../lilypond-1.5.28/lily/include/translator-group.hh	Fri Oct 19 11:14:48 2001
+++ ./lily/include/translator-group.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/translator.hh ./lily/include/translator.hh
--- ../lilypond-1.5.28/lily/include/translator.hh	Fri Oct 19 11:14:48 2001
+++ ./lily/include/translator.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/transposed-music.hh ./lily/include/transposed-music.hh
--- ../lilypond-1.5.28/lily/include/transposed-music.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/transposed-music.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/include/tuplet-spanner.hh ./lily/include/tuplet-spanner.hh
--- ../lilypond-1.5.28/lily/include/tuplet-spanner.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/tuplet-spanner.hh	Fri Feb  1 19:16:23 2002
@@ -1,7 +1,7 @@
 /*
   plet-spanner.hh -- part of GNU LilyPond
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef Tuplet_bracket_HH
diff -purN ../lilypond-1.5.28/lily/include/type-swallow-translator.hh ./lily/include/type-swallow-translator.hh
--- ../lilypond-1.5.28/lily/include/type-swallow-translator.hh	Mon Sep 24 01:04:29 2001
+++ ./lily/include/type-swallow-translator.hh	Fri Feb  1 19:16:23 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/include/volta-spanner.hh ./lily/include/volta-spanner.hh
--- ../lilypond-1.5.28/lily/include/volta-spanner.hh	Sun Mar 11 19:10:33 2001
+++ ./lily/include/volta-spanner.hh	Fri Feb  1 19:16:23 2002
@@ -1,7 +1,7 @@
 /*
   volta-spanner.hh -- part of GNU LilyPond
 
-  (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef VOLTA_SPANNER_HH
diff -purN ../lilypond-1.5.28/lily/input-smob.cc ./lily/input-smob.cc
--- ../lilypond-1.5.28/lily/input-smob.cc	Wed Oct  3 01:30:17 2001
+++ ./lily/input-smob.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/instrument-name-engraver.cc ./lily/instrument-name-engraver.cc
--- ../lilypond-1.5.28/lily/instrument-name-engraver.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/instrument-name-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/interpretation-context-handle.cc ./lily/interpretation-context-handle.cc
--- ../lilypond-1.5.28/lily/interpretation-context-handle.cc	Sun Mar 11 19:10:33 2001
+++ ./lily/interpretation-context-handle.cc	Fri Feb  1 19:16:15 2002
@@ -4,7 +4,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/item.cc ./lily/item.cc
--- ../lilypond-1.5.28/lily/item.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/item.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/key-engraver.cc ./lily/key-engraver.cc
--- ../lilypond-1.5.28/lily/key-engraver.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/key-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   */
 
 #include "key-item.hh"
diff -purN ../lilypond-1.5.28/lily/key-item.cc ./lily/key-item.cc
--- ../lilypond-1.5.28/lily/key-item.cc	Fri Sep 28 23:58:21 2001
+++ ./lily/key-item.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
   keyplacement by Mats Bengtsson
 */
diff -purN ../lilypond-1.5.28/lily/key-performer.cc ./lily/key-performer.cc
--- ../lilypond-1.5.28/lily/key-performer.cc	Tue Oct 16 08:09:59 2001
+++ ./lily/key-performer.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "lily-guile.hh"
diff -purN ../lilypond-1.5.28/lily/kpath.cc ./lily/kpath.cc
--- ../lilypond-1.5.28/lily/kpath.cc	Wed Aug 22 23:23:14 2001
+++ ./lily/kpath.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <stdio.h>
diff -purN ../lilypond-1.5.28/lily/least-squares.cc ./lily/least-squares.cc
--- ../lilypond-1.5.28/lily/least-squares.cc	Sun Mar 11 19:10:33 2001
+++ ./lily/least-squares.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/lily-guile.cc ./lily/lily-guile.cc
--- ../lilypond-1.5.28/lily/lily-guile.cc	Thu Dec 13 19:53:17 2001
+++ ./lily/lily-guile.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 
   Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
diff -purN ../lilypond-1.5.28/lily/lily-version.cc ./lily/lily-version.cc
--- ../lilypond-1.5.28/lily/lily-version.cc	Thu Mar 15 22:41:22 2001
+++ ./lily/lily-version.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "config.h"
diff -purN ../lilypond-1.5.28/lily/lilypond-version.cc ./lily/lilypond-version.cc
--- ../lilypond-1.5.28/lily/lilypond-version.cc	Mon Apr 23 00:27:16 2001
+++ ./lily/lilypond-version.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 
 */
 
diff -purN ../lilypond-1.5.28/lily/line-group-group-engraver.cc ./lily/line-group-group-engraver.cc
--- ../lilypond-1.5.28/lily/line-group-group-engraver.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/line-group-group-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "command-request.hh"
diff -purN ../lilypond-1.5.28/lily/line-of-score.cc ./lily/line-of-score.cc
--- ../lilypond-1.5.28/lily/line-of-score.cc	Sat Dec 29 20:30:41 2001
+++ ./lily/line-of-score.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "input-smob.hh"
diff -purN ../lilypond-1.5.28/lily/line-spanner.cc ./lily/line-spanner.cc
--- ../lilypond-1.5.28/lily/line-spanner.cc	Sat Sep 22 14:13:06 2001
+++ ./lily/line-spanner.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "molecule.hh"
diff -purN ../lilypond-1.5.28/lily/local-key-item.cc ./lily/local-key-item.cc
--- ../lilypond-1.5.28/lily/local-key-item.cc	Fri Oct 19 13:07:57 2001
+++ ./lily/local-key-item.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "local-key-item.hh"
 #include "molecule.hh"
diff -purN ../lilypond-1.5.28/lily/lookup.cc ./lily/lookup.cc
--- ../lilypond-1.5.28/lily/lookup.cc	Sun Nov 18 01:08:12 2001
+++ ./lily/lookup.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
   Jan Nieuwenhuizen <janneke@gnu.org>
 
diff -purN ../lilypond-1.5.28/lily/lyric-combine-music-iterator.cc ./lily/lyric-combine-music-iterator.cc
--- ../lilypond-1.5.28/lily/lyric-combine-music-iterator.cc	Mon Dec 24 00:04:03 2001
+++ ./lily/lyric-combine-music-iterator.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/lyric-combine-music.cc ./lily/lyric-combine-music.cc
--- ../lilypond-1.5.28/lily/lyric-combine-music.cc	Sun Oct  7 12:26:33 2001
+++ ./lily/lyric-combine-music.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/lyric-engraver.cc ./lily/lyric-engraver.cc
--- ../lilypond-1.5.28/lily/lyric-engraver.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/lyric-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff -purN ../lilypond-1.5.28/lily/lyric-extender.cc ./lily/lyric-extender.cc
--- ../lilypond-1.5.28/lily/lyric-extender.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/lyric-extender.cc	Fri Feb  1 19:16:15 2002
@@ -2,7 +2,7 @@
   lyric-extender.cc -- implement Lyric_extender
   source file of the GNU LilyPond music typesetter
 
-  (c)  1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys
 */
 
diff -purN ../lilypond-1.5.28/lily/lyric-performer.cc ./lily/lyric-performer.cc
--- ../lilypond-1.5.28/lily/lyric-performer.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/lyric-performer.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "musical-request.hh"
diff -purN ../lilypond-1.5.28/lily/main.cc ./lily/main.cc
--- ../lilypond-1.5.28/lily/main.cc	Tue Nov 20 19:23:49 2001
+++ ./lily/main.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <stdlib.h>
@@ -180,7 +180,7 @@ version ()
     "lilypond");
   cout << endl;
 
-  cout << _f ("Copyright (c) %s by", "1996--2001");
+  cout << _f ("Copyright (c) %s by", "1996--2002");
   cout << '\n';
   cout << "  Han-Wen Nienhuys <hanwen@cs.uu.nl>\n";
   cout << "  Jan Nieuwenhuizen <janneke@gnu.org>\n";
@@ -192,7 +192,7 @@ notice ()
   cout << '\n';
   cout << _ ("GNU LilyPond -- The music typesetter");
   cout << '\n';
-  cout << _f ("Copyright (c) %s by", "1996--2001");
+  cout << _f ("Copyright (c) %s by", "1996--2002");
   cout << '\n';
   cout << "  Han-Wen Nienhuys <hanwen@cs.uu.nl>\n";
   cout << "  Jan Nieuwenhuizen <janneke@gnu.org>\n";
diff -purN ../lilypond-1.5.28/lily/mark-engraver.cc ./lily/mark-engraver.cc
--- ../lilypond-1.5.28/lily/mark-engraver.cc	Fri Dec 14 01:18:57 2001
+++ ./lily/mark-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <ctype.h>
diff -purN ../lilypond-1.5.28/lily/melisma-engraver.cc ./lily/melisma-engraver.cc
--- ../lilypond-1.5.28/lily/melisma-engraver.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/melisma-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/midi-def.cc ./lily/midi-def.cc
--- ../lilypond-1.5.28/lily/midi-def.cc	Tue Oct 30 18:12:08 2001
+++ ./lily/midi-def.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 
 */
 #include <math.h>
diff -purN ../lilypond-1.5.28/lily/midi-item.cc ./lily/midi-item.cc
--- ../lilypond-1.5.28/lily/midi-item.cc	Tue Aug 14 13:41:27 2001
+++ ./lily/midi-item.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "debug.hh"
diff -purN ../lilypond-1.5.28/lily/midi-stream.cc ./lily/midi-stream.cc
--- ../lilypond-1.5.28/lily/midi-stream.cc	Sun Nov  4 20:54:32 2001
+++ ./lily/midi-stream.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/midi-walker.cc ./lily/midi-walker.cc
--- ../lilypond-1.5.28/lily/midi-walker.cc	Tue Aug 14 13:41:27 2001
+++ ./lily/midi-walker.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
          Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
diff -purN ../lilypond-1.5.28/lily/misc.cc ./lily/misc.cc
--- ../lilypond-1.5.28/lily/misc.cc	Sun Mar 11 19:10:34 2001
+++ ./lily/misc.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
     Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff -purN ../lilypond-1.5.28/lily/molecule.cc ./lily/molecule.cc
--- ../lilypond-1.5.28/lily/molecule.cc	Sun Oct 14 15:15:44 2001
+++ ./lily/molecule.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <math.h>
diff -purN ../lilypond-1.5.28/lily/moment.cc ./lily/moment.cc
--- ../lilypond-1.5.28/lily/moment.cc	Sun Oct 14 15:15:44 2001
+++ ./lily/moment.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/multi-measure-rest-engraver.cc ./lily/multi-measure-rest-engraver.cc
--- ../lilypond-1.5.28/lily/multi-measure-rest-engraver.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/multi-measure-rest-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -1,7 +1,7 @@
 /*
   multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver
 
-  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
        Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
diff -purN ../lilypond-1.5.28/lily/multi-measure-rest.cc ./lily/multi-measure-rest.cc
--- ../lilypond-1.5.28/lily/multi-measure-rest.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/multi-measure-rest.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/music-constructor.cc ./lily/music-constructor.cc
--- ../lilypond-1.5.28/lily/music-constructor.cc	Mon Apr 16 23:17:45 2001
+++ ./lily/music-constructor.cc	Fri Feb  1 19:17:38 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/music-iterator.cc ./lily/music-iterator.cc
--- ../lilypond-1.5.28/lily/music-iterator.cc	Mon Dec 24 00:04:03 2001
+++ ./lily/music-iterator.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 /*
diff -purN ../lilypond-1.5.28/lily/music-output-def.cc ./lily/music-output-def.cc
--- ../lilypond-1.5.28/lily/music-output-def.cc	Sun Oct 14 15:15:44 2001
+++ ./lily/music-output-def.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "scm-hash.hh"
diff -purN ../lilypond-1.5.28/lily/music-sequence.cc ./lily/music-sequence.cc
--- ../lilypond-1.5.28/lily/music-sequence.cc	Mon Oct  8 01:49:09 2001
+++ ./lily/music-sequence.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "music-list.hh"
diff -purN ../lilypond-1.5.28/lily/music-wrapper-iterator.cc ./lily/music-wrapper-iterator.cc
--- ../lilypond-1.5.28/lily/music-wrapper-iterator.cc	Fri Jun 29 02:01:20 2001
+++ ./lily/music-wrapper-iterator.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 
diff -purN ../lilypond-1.5.28/lily/music-wrapper.cc ./lily/music-wrapper.cc
--- ../lilypond-1.5.28/lily/music-wrapper.cc	Fri Jun 29 01:03:00 2001
+++ ./lily/music-wrapper.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/music.cc ./lily/music.cc
--- ../lilypond-1.5.28/lily/music.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/music.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "input-smob.hh"
diff -purN ../lilypond-1.5.28/lily/musical-request.cc ./lily/musical-request.cc
--- ../lilypond-1.5.28/lily/musical-request.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/musical-request.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "musical-request.hh"
diff -purN ../lilypond-1.5.28/lily/my-lily-lexer.cc ./lily/my-lily-lexer.cc
--- ../lilypond-1.5.28/lily/my-lily-lexer.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/my-lily-lexer.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <strstream.h>
diff -purN ../lilypond-1.5.28/lily/my-lily-parser.cc ./lily/my-lily-parser.cc
--- ../lilypond-1.5.28/lily/my-lily-parser.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/my-lily-parser.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
        Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff -purN ../lilypond-1.5.28/lily/new-spacing-spanner.cc ./lily/new-spacing-spanner.cc
--- ../lilypond-1.5.28/lily/new-spacing-spanner.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/new-spacing-spanner.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/note-column.cc ./lily/note-column.cc
--- ../lilypond-1.5.28/lily/note-column.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/note-column.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <math.h>		// ceil
 
diff -purN ../lilypond-1.5.28/lily/note-head-line-engraver.cc ./lily/note-head-line-engraver.cc
--- ../lilypond-1.5.28/lily/note-head-line-engraver.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/note-head-line-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "engraver.hh"
diff -purN ../lilypond-1.5.28/lily/note-head.cc ./lily/note-head.cc
--- ../lilypond-1.5.28/lily/note-head.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/note-head.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <math.h>
 
diff -purN ../lilypond-1.5.28/lily/note-heads-engraver.cc ./lily/note-heads-engraver.cc
--- ../lilypond-1.5.28/lily/note-heads-engraver.cc	Mon Dec 24 00:04:03 2001
+++ ./lily/note-heads-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -1,7 +1,7 @@
 /*
   head-grav.cc -- part of GNU LilyPond
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <ctype.h>
 
diff -purN ../lilypond-1.5.28/lily/note-name-engraver.cc ./lily/note-name-engraver.cc
--- ../lilypond-1.5.28/lily/note-name-engraver.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/note-name-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/note-performer.cc ./lily/note-performer.cc
--- ../lilypond-1.5.28/lily/note-performer.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/note-performer.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "performer.hh"
diff -purN ../lilypond-1.5.28/lily/note-spacing.cc ./lily/note-spacing.cc
--- ../lilypond-1.5.28/lily/note-spacing.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/note-spacing.cc	Fri Feb  1 19:17:38 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/output-property-engraver.cc ./lily/output-property-engraver.cc
--- ../lilypond-1.5.28/lily/output-property-engraver.cc	Fri Oct 19 11:14:48 2001
+++ ./lily/output-property-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/output-property-music-iterator.cc ./lily/output-property-music-iterator.cc
--- ../lilypond-1.5.28/lily/output-property-music-iterator.cc	Fri Jun 29 02:01:20 2001
+++ ./lily/output-property-music-iterator.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "input.hh"
diff -purN ../lilypond-1.5.28/lily/paper-column.cc ./lily/paper-column.cc
--- ../lilypond-1.5.28/lily/paper-column.cc	Mon Dec 24 00:04:03 2001
+++ ./lily/paper-column.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "moment.hh"
diff -purN ../lilypond-1.5.28/lily/paper-def.cc ./lily/paper-def.cc
--- ../lilypond-1.5.28/lily/paper-def.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/paper-def.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <math.h>
diff -purN ../lilypond-1.5.28/lily/paper-outputter.cc ./lily/paper-outputter.cc
--- ../lilypond-1.5.28/lily/paper-outputter.cc	Thu Nov 22 11:57:34 2001
+++ ./lily/paper-outputter.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff -purN ../lilypond-1.5.28/lily/paper-score.cc ./lily/paper-score.cc
--- ../lilypond-1.5.28/lily/paper-score.cc	Sun Nov  4 20:54:32 2001
+++ ./lily/paper-score.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "main.hh"
diff -purN ../lilypond-1.5.28/lily/part-combine-music-iterator.cc ./lily/part-combine-music-iterator.cc
--- ../lilypond-1.5.28/lily/part-combine-music-iterator.cc	Fri Oct 19 11:14:48 2001
+++ ./lily/part-combine-music-iterator.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "part-combine-music.hh"
diff -purN ../lilypond-1.5.28/lily/part-combine-music.cc ./lily/part-combine-music.cc
--- ../lilypond-1.5.28/lily/part-combine-music.cc	Sun Oct  7 12:26:33 2001
+++ ./lily/part-combine-music.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/percent-repeat-engraver.cc ./lily/percent-repeat-engraver.cc
--- ../lilypond-1.5.28/lily/percent-repeat-engraver.cc	Fri Nov  9 00:47:52 2001
+++ ./lily/percent-repeat-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/percent-repeat-item.cc ./lily/percent-repeat-item.cc
--- ../lilypond-1.5.28/lily/percent-repeat-item.cc	Sat Mar 24 01:28:01 2001
+++ ./lily/percent-repeat-item.cc	Fri Feb  1 19:17:38 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include <math.h>
diff -purN ../lilypond-1.5.28/lily/percent-repeat-iterator.cc ./lily/percent-repeat-iterator.cc
--- ../lilypond-1.5.28/lily/percent-repeat-iterator.cc	Sun Aug 12 20:51:08 2001
+++ ./lily/percent-repeat-iterator.cc	Fri Feb  1 19:17:38 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/performance.cc ./lily/performance.cc
--- ../lilypond-1.5.28/lily/performance.cc	Wed Oct 17 22:15:36 2001
+++ ./lily/performance.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <time.h>
diff -purN ../lilypond-1.5.28/lily/performer-group-performer.cc ./lily/performer-group-performer.cc
--- ../lilypond-1.5.28/lily/performer-group-performer.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/performer-group-performer.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
diff -purN ../lilypond-1.5.28/lily/performer.cc ./lily/performer.cc
--- ../lilypond-1.5.28/lily/performer.cc	Sun Mar 11 19:10:34 2001
+++ ./lily/performer.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
diff -purN ../lilypond-1.5.28/lily/phrasing-slur-engraver.cc ./lily/phrasing-slur-engraver.cc
--- ../lilypond-1.5.28/lily/phrasing-slur-engraver.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/phrasing-slur-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -1,7 +1,7 @@
 /*
   phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "musical-request.hh"
diff -purN ../lilypond-1.5.28/lily/piano-pedal-engraver.cc ./lily/piano-pedal-engraver.cc
--- ../lilypond-1.5.28/lily/piano-pedal-engraver.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/piano-pedal-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "engraver.hh"
diff -purN ../lilypond-1.5.28/lily/pitch-squash-engraver.cc ./lily/pitch-squash-engraver.cc
--- ../lilypond-1.5.28/lily/pitch-squash-engraver.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/pitch-squash-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "staff-symbol-referencer.hh"
diff -purN ../lilypond-1.5.28/lily/pitch.cc ./lily/pitch.cc
--- ../lilypond-1.5.28/lily/pitch.cc	Wed Dec  5 17:06:15 2001
+++ ./lily/pitch.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "pitch.hh"
diff -purN ../lilypond-1.5.28/lily/porrectus-engraver.cc ./lily/porrectus-engraver.cc
--- ../lilypond-1.5.28/lily/porrectus-engraver.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/porrectus-engraver.cc	Fri Feb  1 19:17:38 2002
@@ -1,7 +1,7 @@
 /*
   porrectus-engraver.cc -- implement Porrectus_engraver
 
-  Copyright (C) 2001 Juergen Reuter
+  Copyright (c) 2001--2002  Juergen Reuter
 
   written for the GNU LilyPond music typesetter
 */
diff -purN ../lilypond-1.5.28/lily/porrectus.cc ./lily/porrectus.cc
--- ../lilypond-1.5.28/lily/porrectus.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/porrectus.cc	Fri Feb  1 19:17:38 2002
@@ -1,7 +1,7 @@
 /*
   porrectus.cc -- implement Porrectus
 
-  Copyright (C) 2001 Juergen Reuter
+  Copyright (c) 2001--2002  Juergen Reuter
 
   written for the GNU LilyPond music typesetter
 
diff -purN ../lilypond-1.5.28/lily/property-engraver.cc ./lily/property-engraver.cc
--- ../lilypond-1.5.28/lily/property-engraver.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/property-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/property-iterator.cc ./lily/property-iterator.cc
--- ../lilypond-1.5.28/lily/property-iterator.cc	Fri Oct 19 11:14:48 2001
+++ ./lily/property-iterator.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "property-iterator.hh"
diff -purN ../lilypond-1.5.28/lily/protected-scm.cc ./lily/protected-scm.cc
--- ../lilypond-1.5.28/lily/protected-scm.cc	Wed Jul 11 14:54:52 2001
+++ ./lily/protected-scm.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "protected-scm.hh"
diff -purN ../lilypond-1.5.28/lily/regular-spacing-engraver.cc ./lily/regular-spacing-engraver.cc
--- ../lilypond-1.5.28/lily/regular-spacing-engraver.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/regular-spacing-engraver.cc	Fri Feb  1 19:17:38 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/relative-octave-music.cc ./lily/relative-octave-music.cc
--- ../lilypond-1.5.28/lily/relative-octave-music.cc	Sun Mar 11 19:10:34 2001
+++ ./lily/relative-octave-music.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/repeat-acknowledge-engraver.cc ./lily/repeat-acknowledge-engraver.cc
--- ../lilypond-1.5.28/lily/repeat-acknowledge-engraver.cc	Thu Nov  1 16:36:23 2001
+++ ./lily/repeat-acknowledge-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "engraver.hh"
diff -purN ../lilypond-1.5.28/lily/repeated-music.cc ./lily/repeated-music.cc
--- ../lilypond-1.5.28/lily/repeated-music.cc	Mon Oct  8 01:49:09 2001
+++ ./lily/repeated-music.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/request-chord-iterator.cc ./lily/request-chord-iterator.cc
--- ../lilypond-1.5.28/lily/request-chord-iterator.cc	Sat Sep 22 02:43:07 2001
+++ ./lily/request-chord-iterator.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "translator-group.hh"
diff -purN ../lilypond-1.5.28/lily/request.cc ./lily/request.cc
--- ../lilypond-1.5.28/lily/request.cc	Fri May 11 01:57:13 2001
+++ ./lily/request.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "request.hh"
diff -purN ../lilypond-1.5.28/lily/rest-collision-engraver.cc ./lily/rest-collision-engraver.cc
--- ../lilypond-1.5.28/lily/rest-collision-engraver.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/rest-collision-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "debug.hh"
diff -purN ../lilypond-1.5.28/lily/rest-collision.cc ./lily/rest-collision.cc
--- ../lilypond-1.5.28/lily/rest-collision.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/rest-collision.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <math.h>		// ceil.
diff -purN ../lilypond-1.5.28/lily/rest-engraver.cc ./lily/rest-engraver.cc
--- ../lilypond-1.5.28/lily/rest-engraver.cc	Fri Nov  9 00:47:52 2001
+++ ./lily/rest-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "item.hh"
 #include "staff-symbol-referencer.hh"
diff -purN ../lilypond-1.5.28/lily/rest.cc ./lily/rest.cc
--- ../lilypond-1.5.28/lily/rest.cc	Fri Nov  9 00:47:52 2001
+++ ./lily/rest.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "molecule.hh"
@@ -60,7 +60,7 @@ Rest::glyph_name (Grob * me, int balltyp
       ledger_b = ledger_b || (balltype == 1 &&
 			      (pos  <= -rad -2 || pos > rad));
     }
-  
+
   return ("rests-") + to_str (balltype)
     + (ledger_b ? "o" : "") + style;
 }
@@ -88,8 +88,14 @@ Rest::brew_internal_molecule (SCM smob)
       style = ly_scm2string (scm_symbol_to_string (style_sym));
     }
 
-  String idx = glyph_name (me, balltype, style);
-  return Font_interface::get_default_font (me)->find_by_name (idx).smobbed_copy ();
+  for(;;) {
+    String idx = glyph_name (me, balltype, style);
+    Molecule res = Font_interface::get_default_font (me)->find_by_name (idx);
+    if(res.empty_b() && style!="")
+      style="";
+    else	      
+      return res.smobbed_copy();
+  }
 }
 
 SCM 
diff -purN ../lilypond-1.5.28/lily/rhythmic-column-engraver.cc ./lily/rhythmic-column-engraver.cc
--- ../lilypond-1.5.28/lily/rhythmic-column-engraver.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/rhythmic-column-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/rhythmic-head.cc ./lily/rhythmic-head.cc
--- ../lilypond-1.5.28/lily/rhythmic-head.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/rhythmic-head.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "rhythmic-head.hh"
diff -purN ../lilypond-1.5.28/lily/rod.cc ./lily/rod.cc
--- ../lilypond-1.5.28/lily/rod.cc	Fri Jun 29 01:03:00 2001
+++ ./lily/rod.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "rod.hh"
diff -purN ../lilypond-1.5.28/lily/scaled-font-metric.cc ./lily/scaled-font-metric.cc
--- ../lilypond-1.5.28/lily/scaled-font-metric.cc	Sat Sep 22 02:43:07 2001
+++ ./lily/scaled-font-metric.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/scm-hash.cc ./lily/scm-hash.cc
--- ../lilypond-1.5.28/lily/scm-hash.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/scm-hash.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include <stdio.h>
diff -purN ../lilypond-1.5.28/lily/scm-option.cc ./lily/scm-option.cc
--- ../lilypond-1.5.28/lily/scm-option.cc	Wed Jul 11 14:54:52 2001
+++ ./lily/scm-option.cc	Fri Feb  1 19:17:38 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/scope.cc ./lily/scope.cc
--- ../lilypond-1.5.28/lily/scope.cc	Sun Mar 11 19:10:34 2001
+++ ./lily/scope.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/score-engraver.cc ./lily/score-engraver.cc
--- ../lilypond-1.5.28/lily/score-engraver.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/score-engraver.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "debug.hh"
diff -purN ../lilypond-1.5.28/lily/score-performer.cc ./lily/score-performer.cc
--- ../lilypond-1.5.28/lily/score-performer.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/score-performer.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "score-performer.hh"
diff -purN ../lilypond-1.5.28/lily/score.cc ./lily/score.cc
--- ../lilypond-1.5.28/lily/score.cc	Sun Oct 14 15:15:44 2001
+++ ./lily/score.cc	Fri Feb  1 19:16:15 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "ly-smobs.icc"
diff -purN ../lilypond-1.5.28/lily/scores.cc ./lily/scores.cc
--- ../lilypond-1.5.28/lily/scores.cc	Wed Jul 11 14:54:52 2001
+++ ./lily/scores.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "config.h"
 
diff -purN ../lilypond-1.5.28/lily/script-column-engraver.cc ./lily/script-column-engraver.cc
--- ../lilypond-1.5.28/lily/script-column-engraver.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/script-column-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/script-column.cc ./lily/script-column.cc
--- ../lilypond-1.5.28/lily/script-column.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/script-column.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "script-column.hh"
diff -purN ../lilypond-1.5.28/lily/script-engraver.cc ./lily/script-engraver.cc
--- ../lilypond-1.5.28/lily/script-engraver.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/script-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -1,7 +1,7 @@
 /*
   script-engraver.cc -- implement Script_engraver
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "script.hh"
diff -purN ../lilypond-1.5.28/lily/script.cc ./lily/script.cc
--- ../lilypond-1.5.28/lily/script.cc	Sat Sep 22 02:43:07 2001
+++ ./lily/script.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/separating-group-spanner.cc ./lily/separating-group-spanner.cc
--- ../lilypond-1.5.28/lily/separating-group-spanner.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/separating-group-spanner.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/separating-line-group-engraver.cc ./lily/separating-line-group-engraver.cc
--- ../lilypond-1.5.28/lily/separating-line-group-engraver.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/separating-line-group-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/separation-item.cc ./lily/separation-item.cc
--- ../lilypond-1.5.28/lily/separation-item.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/separation-item.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/sequential-music-iterator.cc ./lily/sequential-music-iterator.cc
--- ../lilypond-1.5.28/lily/sequential-music-iterator.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/sequential-music-iterator.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "translator-group.hh"
diff -purN ../lilypond-1.5.28/lily/side-position-interface.cc ./lily/side-position-interface.cc
--- ../lilypond-1.5.28/lily/side-position-interface.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/side-position-interface.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include <math.h>		// ceil.
diff -purN ../lilypond-1.5.28/lily/simple-music-iterator.cc ./lily/simple-music-iterator.cc
--- ../lilypond-1.5.28/lily/simple-music-iterator.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/simple-music-iterator.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/simple-spacer.cc ./lily/simple-spacer.cc
--- ../lilypond-1.5.28/lily/simple-spacer.cc	Wed Dec  5 17:18:40 2001
+++ ./lily/simple-spacer.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
   TODO:
   - add support for different stretch/shrink constants?
diff -purN ../lilypond-1.5.28/lily/simultaneous-music-iterator.cc ./lily/simultaneous-music-iterator.cc
--- ../lilypond-1.5.28/lily/simultaneous-music-iterator.cc	Mon Oct  8 01:49:09 2001
+++ ./lily/simultaneous-music-iterator.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "translator-group.hh"
diff -purN ../lilypond-1.5.28/lily/slur-bezier-bow.cc ./lily/slur-bezier-bow.cc
--- ../lilypond-1.5.28/lily/slur-bezier-bow.cc	Sat Sep 22 02:43:07 2001
+++ ./lily/slur-bezier-bow.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2001  Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "debug.hh"
diff -purN ../lilypond-1.5.28/lily/slur-engraver.cc ./lily/slur-engraver.cc
--- ../lilypond-1.5.28/lily/slur-engraver.cc	Fri Nov  2 17:30:53 2001
+++ ./lily/slur-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -1,7 +1,7 @@
 /*
   slur-engraver.cc -- implement Slur_engraver
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "musical-request.hh"
diff -purN ../lilypond-1.5.28/lily/slur.cc ./lily/slur.cc
--- ../lilypond-1.5.28/lily/slur.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/slur.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
     Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff -purN ../lilypond-1.5.28/lily/spaceable-grob.cc ./lily/spaceable-grob.cc
--- ../lilypond-1.5.28/lily/spaceable-grob.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/spaceable-grob.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/spacing-engraver.cc ./lily/spacing-engraver.cc
--- ../lilypond-1.5.28/lily/spacing-engraver.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/spacing-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/spacing-spanner.cc ./lily/spacing-spanner.cc
--- ../lilypond-1.5.28/lily/spacing-spanner.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/spacing-spanner.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/span-arpeggio-engraver.cc ./lily/span-arpeggio-engraver.cc
--- ../lilypond-1.5.28/lily/span-arpeggio-engraver.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/span-arpeggio-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
diff -purN ../lilypond-1.5.28/lily/span-bar-engraver.cc ./lily/span-bar-engraver.cc
--- ../lilypond-1.5.28/lily/span-bar-engraver.cc	Fri Oct 19 11:14:48 2001
+++ ./lily/span-bar-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/span-bar.cc ./lily/span-bar.cc
--- ../lilypond-1.5.28/lily/span-bar.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/span-bar.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "span-bar.hh"
diff -purN ../lilypond-1.5.28/lily/spanner.cc ./lily/spanner.cc
--- ../lilypond-1.5.28/lily/spanner.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/spanner.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <math.h>
 #include <libc-extension.hh>
diff -purN ../lilypond-1.5.28/lily/spring.cc ./lily/spring.cc
--- ../lilypond-1.5.28/lily/spring.cc	Sun Jul 29 15:45:23 2001
+++ ./lily/spring.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/staff-collecting-engraver.cc ./lily/staff-collecting-engraver.cc
--- ../lilypond-1.5.28/lily/staff-collecting-engraver.cc	Fri Dec 14 01:18:57 2001
+++ ./lily/staff-collecting-engraver.cc	Fri Feb  1 19:17:38 2002
@@ -3,7 +3,7 @@ staff-collecting-engraver.cc --  impleme
 
 source file of the GNU LilyPond music typesetter
 
-(c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+(c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
  */
 #include "staff-symbol.hh"
diff -purN ../lilypond-1.5.28/lily/staff-performer.cc ./lily/staff-performer.cc
--- ../lilypond-1.5.28/lily/staff-performer.cc	Fri Oct 19 11:14:48 2001
+++ ./lily/staff-performer.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "translator-group.hh"
diff -purN ../lilypond-1.5.28/lily/staff-spacing.cc ./lily/staff-spacing.cc
--- ../lilypond-1.5.28/lily/staff-spacing.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/staff-spacing.cc	Fri Feb  1 19:17:38 2002
@@ -3,7 +3,7 @@ staff-spacing.cc --  implement Staff_spa
 
 source file of the GNU LilyPond music typesetter
 
-(c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+(c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
  */
 
diff -purN ../lilypond-1.5.28/lily/staff-symbol-engraver.cc ./lily/staff-symbol-engraver.cc
--- ../lilypond-1.5.28/lily/staff-symbol-engraver.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/staff-symbol-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/staff-symbol-referencer.cc ./lily/staff-symbol-referencer.cc
--- ../lilypond-1.5.28/lily/staff-symbol-referencer.cc	Sun Mar 11 19:10:34 2001
+++ ./lily/staff-symbol-referencer.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 #include <math.h>
diff -purN ../lilypond-1.5.28/lily/staff-symbol.cc ./lily/staff-symbol.cc
--- ../lilypond-1.5.28/lily/staff-symbol.cc	Sun Mar 11 19:10:34 2001
+++ ./lily/staff-symbol.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "lookup.hh"
diff -purN ../lilypond-1.5.28/lily/stanza-number-engraver.cc ./lily/stanza-number-engraver.cc
--- ../lilypond-1.5.28/lily/stanza-number-engraver.cc	Fri Nov 30 20:53:13 2001
+++ ./lily/stanza-number-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>, Glen Prideaux <glenprideaux@iname.com>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>, Glen Prideaux <glenprideaux@iname.com>
   
   Similar to (and derived from) Instrument_name_engraver.
  */
diff -purN ../lilypond-1.5.28/lily/stem-engraver.cc ./lily/stem-engraver.cc
--- ../lilypond-1.5.28/lily/stem-engraver.cc	Mon Dec 24 00:04:03 2001
+++ ./lily/stem-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "staff-symbol-referencer.hh"
diff -purN ../lilypond-1.5.28/lily/stem-tremolo.cc ./lily/stem-tremolo.cc
--- ../lilypond-1.5.28/lily/stem-tremolo.cc	Sun Mar 11 19:10:34 2001
+++ ./lily/stem-tremolo.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/stem.cc ./lily/stem.cc
--- ../lilypond-1.5.28/lily/stem.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/stem.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
     Jan Nieuwenhuizen <janneke@gnu.org>
 
   TODO: This is way too hairy
@@ -563,7 +563,7 @@ Stem::brew_molecule (SCM smob) 
 
   // dy?
   Real dy = Staff_symbol_referencer::staff_space (me) * 0.5;
-    
+
   if (Grob *hed = support_head (me))
     {
       /*
@@ -573,7 +573,7 @@ Stem::brew_molecule (SCM smob) 
       Real y_attach = Note_head::stem_attachment_coordinate ( hed, Y_AXIS);
 
       y_attach = head_height.linear_combination (y_attach);
-      stem_y[Direction (-d)] += d * 2*y_attach;
+      stem_y[Direction (-d)] += d * y_attach/dy;
     }
   
   if (!invisible_b (me))
diff -purN ../lilypond-1.5.28/lily/sustain-pedal.cc ./lily/sustain-pedal.cc
--- ../lilypond-1.5.28/lily/sustain-pedal.cc	Sun Mar 11 19:10:34 2001
+++ ./lily/sustain-pedal.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "grob.hh"
diff -purN ../lilypond-1.5.28/lily/swallow-engraver.cc ./lily/swallow-engraver.cc
--- ../lilypond-1.5.28/lily/swallow-engraver.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/swallow-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "engraver.hh"
diff -purN ../lilypond-1.5.28/lily/swallow-perf.cc ./lily/swallow-perf.cc
--- ../lilypond-1.5.28/lily/swallow-perf.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/swallow-perf.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "performer.hh"
diff -purN ../lilypond-1.5.28/lily/system-start-delimiter-engraver.cc ./lily/system-start-delimiter-engraver.cc
--- ../lilypond-1.5.28/lily/system-start-delimiter-engraver.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/system-start-delimiter-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/system-start-delimiter.cc ./lily/system-start-delimiter.cc
--- ../lilypond-1.5.28/lily/system-start-delimiter.cc	Sat Oct 13 01:23:40 2001
+++ ./lily/system-start-delimiter.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include <math.h>
diff -purN ../lilypond-1.5.28/lily/template5.cc ./lily/template5.cc
--- ../lilypond-1.5.28/lily/template5.cc	Sun Mar 11 19:10:34 2001
+++ ./lily/template5.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <limits.h>
diff -purN ../lilypond-1.5.28/lily/tempo-performer.cc ./lily/tempo-performer.cc
--- ../lilypond-1.5.28/lily/tempo-performer.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/tempo-performer.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "command-request.hh"
diff -purN ../lilypond-1.5.28/lily/text-engraver.cc ./lily/text-engraver.cc
--- ../lilypond-1.5.28/lily/text-engraver.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/text-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/text-item.cc ./lily/text-item.cc
--- ../lilypond-1.5.28/lily/text-item.cc	Mon Dec 24 00:04:03 2001
+++ ./lily/text-item.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
  */
 #include <math.h>
diff -purN ../lilypond-1.5.28/lily/text-spanner-engraver.cc ./lily/text-spanner-engraver.cc
--- ../lilypond-1.5.28/lily/text-spanner-engraver.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/text-spanner-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "dimensions.hh"
diff -purN ../lilypond-1.5.28/lily/text-spanner.cc ./lily/text-spanner.cc
--- ../lilypond-1.5.28/lily/text-spanner.cc	Sat Sep 22 02:43:07 2001
+++ ./lily/text-spanner.cc	Fri Feb  1 19:16:16 2002
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "molecule.hh"
diff -purN ../lilypond-1.5.28/lily/tfm-reader.cc ./lily/tfm-reader.cc
--- ../lilypond-1.5.28/lily/tfm-reader.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/tfm-reader.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   
 
   some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c
diff -purN ../lilypond-1.5.28/lily/tfm.cc ./lily/tfm.cc
--- ../lilypond-1.5.28/lily/tfm.cc	Wed May  9 14:10:13 2001
+++ ./lily/tfm.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   
 
   some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c
diff -purN ../lilypond-1.5.28/lily/third-try.cc ./lily/third-try.cc
--- ../lilypond-1.5.28/lily/third-try.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/third-try.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "line-of-score.hh"
diff -purN ../lilypond-1.5.28/lily/thread-devnull-engraver.cc ./lily/thread-devnull-engraver.cc
--- ../lilypond-1.5.28/lily/thread-devnull-engraver.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/thread-devnull-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
diff -purN ../lilypond-1.5.28/lily/tie-column.cc ./lily/tie-column.cc
--- ../lilypond-1.5.28/lily/tie-column.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/tie-column.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/tie-engraver.cc ./lily/tie-engraver.cc
--- ../lilypond-1.5.28/lily/tie-engraver.cc	Mon Dec 24 14:56:28 2001
+++ ./lily/tie-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/tie-performer.cc ./lily/tie-performer.cc
--- ../lilypond-1.5.28/lily/tie-performer.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/tie-performer.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/tie.cc ./lily/tie.cc
--- ../lilypond-1.5.28/lily/tie.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/tie.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <math.h>
 
diff -purN ../lilypond-1.5.28/lily/time-scaled-music-iterator.cc ./lily/time-scaled-music-iterator.cc
--- ../lilypond-1.5.28/lily/time-scaled-music-iterator.cc	Sun Aug 12 20:51:08 2001
+++ ./lily/time-scaled-music-iterator.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/time-scaled-music.cc ./lily/time-scaled-music.cc
--- ../lilypond-1.5.28/lily/time-scaled-music.cc	Sun Mar 11 19:10:34 2001
+++ ./lily/time-scaled-music.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/time-signature-engraver.cc ./lily/time-signature-engraver.cc
--- ../lilypond-1.5.28/lily/time-signature-engraver.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/time-signature-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "time-signature.hh"
diff -purN ../lilypond-1.5.28/lily/time-signature-performer.cc ./lily/time-signature-performer.cc
--- ../lilypond-1.5.28/lily/time-signature-performer.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/time-signature-performer.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "audio-item.hh"
diff -purN ../lilypond-1.5.28/lily/time-signature.cc ./lily/time-signature.cc
--- ../lilypond-1.5.28/lily/time-signature.cc	Sat Sep 22 02:43:07 2001
+++ ./lily/time-signature.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/timing-engraver.cc ./lily/timing-engraver.cc
--- ../lilypond-1.5.28/lily/timing-engraver.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/timing-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "translator-group.hh"
 #include "command-request.hh"
diff -purN ../lilypond-1.5.28/lily/timing-translator.cc ./lily/timing-translator.cc
--- ../lilypond-1.5.28/lily/timing-translator.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/timing-translator.cc	Fri Feb  1 19:16:16 2002
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "debug.hh"
diff -purN ../lilypond-1.5.28/lily/translator-ctors.cc ./lily/translator-ctors.cc
--- ../lilypond-1.5.28/lily/translator-ctors.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/translator-ctors.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "translator.hh"
diff -purN ../lilypond-1.5.28/lily/translator-def.cc ./lily/translator-def.cc
--- ../lilypond-1.5.28/lily/translator-def.cc	Mon Dec  3 00:28:24 2001
+++ ./lily/translator-def.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/translator-group.cc ./lily/translator-group.cc
--- ../lilypond-1.5.28/lily/translator-group.cc	Mon Dec 24 00:04:03 2001
+++ ./lily/translator-group.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "music-output-def.hh"
diff -purN ../lilypond-1.5.28/lily/translator.cc ./lily/translator.cc
--- ../lilypond-1.5.28/lily/translator.cc	Fri Nov  9 00:47:52 2001
+++ ./lily/translator.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff -purN ../lilypond-1.5.28/lily/transposed-music.cc ./lily/transposed-music.cc
--- ../lilypond-1.5.28/lily/transposed-music.cc	Sun Mar 11 19:10:34 2001
+++ ./lily/transposed-music.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/tuplet-bracket.cc ./lily/tuplet-bracket.cc
--- ../lilypond-1.5.28/lily/tuplet-bracket.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/tuplet-bracket.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <math.h>
diff -purN ../lilypond-1.5.28/lily/tuplet-engraver.cc ./lily/tuplet-engraver.cc
--- ../lilypond-1.5.28/lily/tuplet-engraver.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/tuplet-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/type-swallow-translator.cc ./lily/type-swallow-translator.cc
--- ../lilypond-1.5.28/lily/type-swallow-translator.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/type-swallow-translator.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "type-swallow-translator.hh"
diff -purN ../lilypond-1.5.28/lily/un-relativable-music.cc ./lily/un-relativable-music.cc
--- ../lilypond-1.5.28/lily/un-relativable-music.cc	Fri Mar 16 01:42:02 2001
+++ ./lily/un-relativable-music.cc	Fri Feb  1 19:17:38 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/unfolded-repeat-iterator.cc ./lily/unfolded-repeat-iterator.cc
--- ../lilypond-1.5.28/lily/unfolded-repeat-iterator.cc	Sat Nov  3 01:30:51 2001
+++ ./lily/unfolded-repeat-iterator.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/untransposable-music.cc ./lily/untransposable-music.cc
--- ../lilypond-1.5.28/lily/untransposable-music.cc	Sun Sep 16 19:11:28 2001
+++ ./lily/untransposable-music.cc	Fri Feb  1 19:17:38 2002
@@ -3,7 +3,7 @@ untransposable-music.cc --  implement Un
 
 source file of the GNU LilyPond music typesetter
 
-(c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+(c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
  */
 
diff -purN ../lilypond-1.5.28/lily/vertical-align-engraver.cc ./lily/vertical-align-engraver.cc
--- ../lilypond-1.5.28/lily/vertical-align-engraver.cc	Sat Dec  1 15:34:56 2001
+++ ./lily/vertical-align-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "translator-group.hh"
 #include "paper-column.hh"
diff -purN ../lilypond-1.5.28/lily/voice-devnull-engraver.cc ./lily/voice-devnull-engraver.cc
--- ../lilypond-1.5.28/lily/voice-devnull-engraver.cc	Mon Sep 24 01:04:29 2001
+++ ./lily/voice-devnull-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
diff -purN ../lilypond-1.5.28/lily/volta-engraver.cc ./lily/volta-engraver.cc
--- ../lilypond-1.5.28/lily/volta-engraver.cc	Fri Dec 14 01:18:57 2001
+++ ./lily/volta-engraver.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff -purN ../lilypond-1.5.28/lily/volta-spanner.cc ./lily/volta-spanner.cc
--- ../lilypond-1.5.28/lily/volta-spanner.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/volta-spanner.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <string.h>
diff -purN ../lilypond-1.5.28/lily/warn.cc ./lily/warn.cc
--- ../lilypond-1.5.28/lily/warn.cc	Sat Dec 29 20:30:42 2001
+++ ./lily/warn.cc	Fri Feb  1 19:16:16 2002
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "debug.hh"
diff -purN ../lilypond-1.5.28/lilypond-font-lock.el ./lilypond-font-lock.el
--- ../lilypond-1.5.28/lilypond-font-lock.el	Sun Nov 18 01:08:12 2001
+++ ./lilypond-font-lock.el	Thu Jan 31 13:17:54 2002
@@ -24,9 +24,7 @@
 ;;
 
 ;; TODO:
-;;   - should handle block comments too.
 ;;   - handle lexer modes (\header, \melodic, \lyric) etc.
-;;   - indentation
 
 (defconst LilyPond-font-lock-keywords
   (let* ((keywords '( ; need special order due to over[lapping] of words
@@ -131,7 +129,13 @@
 ;; highlight keywords
       (cons (concat "\\([_^]?\\(" kwregex "\\)\\)+\\($\\|[] \t(~{}>\\\\]\\)") '(0 font-lock-keyword-face t))
 
-      '("\\([][><}{]\\)" 0 font-lock-warning-face t)
+;; highlight bracketing constructs
+      '("\\([][}{]\\)" 0 font-lock-warning-face t)
+;; these regexps allow angle-brackets to be highlighted,
+;; but leave accented notes, e.g. a b c->, alone
+      '("[^\\]\\(<\\)" 1 font-lock-warning-face t)
+      '("[_^-]\\s-*[-^]\\s-*\\(>\\)" 1 font-lock-warning-face t)
+      '("[^\\t\\n _^-]\\s-*\\(>\\)" 1 font-lock-warning-face t)
 
       '("\\([(~)]\\|\\\\<\\|\\\\!\\|\\\\>\\)" 0 font-lock-builtin-face t)
 
@@ -158,24 +162,21 @@
   (mapcar (function
 	   (lambda (x) (modify-syntax-entry
 			(car x) (cdr x) LilyPond-mode-syntax-table)))
-	  '(( ?\( . "()" ) ( ?\) . ")(" )   ; need matching parens for inline lisp
- 	    ( ?\[ . "." ) ( ?\] . "." )
-	    ( ?\{ . "(}" ) ( ?\} . "){" )
-	    ( ?\< . "(>" )( ?\> . ")>") 
+	  '(( ?\( . "." ) ( ?\) . "." ) 
+	    ( ?\[ . "." ) ( ?\] . "." )
+	    ( ?\{  .  "(}2b" )
+	    ( ?\}  .  "){4b" )
+	    ( ?\< . "." )( ?\> . ".") 
 	    ( ?\$ . "." ) ( ?\% . "." ) ( ?\& . "." )
-	    ( ?\* . "." ) ( ?\+ . "." ) ( ?\- . "." )
+	    ( ?\* . "." ) ( ?\+ . "." )
 	    ( ?\/ . "." )  ( ?\= . "." )
 	    ( ?\| . "." ) (?\\ . "\\" )
-	    ( ?\_ . "." )	
+	    ( ?\- . "." ) ( ?\_ . "." ) ( ?\^ . "." )
 	    ( ?\' . "w")	
 	    ( ?\" . "\"" )
-	    ( ?\% . "<")
+	    ( ?\%  .  ". 1b3b" )
 	    ( ?\n . ">")
-
-; FIXME
-;	    ( ?%  .  ". 124b" )
-;	    ( ?{  .  ". 23" )
+	    ( ?\r . ">")
 	    ))
-
-  )	
+  )
 
diff -purN ../lilypond-1.5.28/lilypond-indent.el ./lilypond-indent.el
--- ../lilypond-1.5.28/lilypond-indent.el	Thu Jan  1 01:00:00 1970
+++ ./lilypond-indent.el	Fri Feb  1 17:44:12 2002
@@ -0,0 +1,316 @@
+;;; lilypond-indent.el --- Auto-indentation for lilypond code
+;;;
+;;; Chris Jackson <chris@fluffhouse.org.uk>
+;;; some code is taken from ESS (Emacs Speaks Statistics) S-mode by A.J.Rossini <rossini@biostat.washington.edu>
+
+;;; Variables for customising indentation style
+
+(defcustom LilyPond-indent-level 4
+  "*Indentation of lilypond statements with respect to containing block.")
+
+(defcustom LilyPond-brace-offset 0
+  "*Extra indentation for open braces.
+Compares with other text in same context.")
+
+(defcustom LilyPond-angle-offset 0
+  "*Extra indentation for open angled brackets .
+Compares with other text in same context.")
+
+(defcustom LilyPond-scheme-paren-offset 0
+  "*Extra indentation for open scheme parens .
+Compares with other text in same context.")
+
+(defcustom LilyPond-close-brace-offset 0
+  "*Extra indentation for closing braces.")
+
+(defcustom LilyPond-close-angle-offset 0
+  "*Extra indentation for closing angle brackets.")
+
+(defcustom LilyPond-close-scheme-paren-offset 0
+  "*Extra indentation for closing scheme parens.")
+
+(defcustom LilyPond-fancy-comments t
+  "*Non-nil means distiguish between %, %%, and %%% for indentation.")
+
+
+(defun LilyPond-calculate-indent ()
+  "Return appropriate indentation for current line as lilypond code.
+In usual case returns an integer: the column to indent to.
+Returns nil if line starts inside a string"
+  (save-excursion
+    (beginning-of-line)
+    (let ((indent-point (point))
+	  (case-fold-search nil)
+	  state)
+      (setq containing-sexp (save-excursion (LilyPond-beginning-of-containing-sexp)))
+      (beginning-of-defun)
+      (while (< (point) indent-point)
+	(setq state (parse-partial-sexp (point) indent-point 0)))
+      ;; (setq containing-sexp (car (cdr state))) is the traditional way for languages
+      ;; with simpler parenthesis delimiters
+      (cond ((nth 3 state) 
+	     ;; point is in the middle of a string 
+	     nil)
+	    ((nth 4 state)
+	     ;; point is in the middle of a block comment
+	     (LilyPond-calculate-indent-within-blockcomment))
+	    ((null containing-sexp)
+	     ;; Line is at top level - no indent
+	     (beginning-of-line)
+	     0)
+	    (t
+	     ;; Find previous non-comment character.
+	     (goto-char indent-point)
+	     (LilyPond-backward-to-noncomment containing-sexp)
+	     ;; Now we get the answer.
+	     ;; Position following last unclosed open.
+	     (goto-char containing-sexp)
+	     (or
+	      ;; Is line first statement after an open brace or bracket?
+	      ;; If no, find that first statement and indent like it.
+	      (save-excursion
+		(forward-char 1)
+		;; Skip over comments following open brace.
+		(skip-chars-forward " \t\n")
+		(cond ((looking-at "%{")
+		       (while  (progn 
+				 (and (not (looking-at "%}"))
+				      (< (point) (point-max))))
+			 (forward-line 1)
+			 (skip-chars-forward " \t\n"))
+		       (forward-line 1)
+		       (skip-chars-forward " \t\n"))
+		      ((looking-at "%")
+		       (while (progn (skip-chars-forward " \t\n")
+				     (looking-at "%"))
+			 (forward-line 1))))
+		;; The first following code counts
+		;; if it is before the line we want to indent.
+		(and (< (point) indent-point)
+		     (current-column)))
+	      ;; If no previous statement,
+	      ;; indent it relative to line brace is on.
+	      ;; For open brace in column zero, don't let statement
+	      ;; start there too.  If LilyPond-indent-level is zero, use
+	      ;; LilyPond-brace-offset instead
+	      (+ (if (and (bolp) (zerop LilyPond-indent-level))
+		     (cond ((= (following-char) ?{) 
+			    LilyPond-brace-offset)
+			   ((= (following-char) ?<) 
+			    LilyPond-angle-offset)
+			   ((= (following-char) ?\))
+			    LilyPond-scheme-paren-offset)
+			   (t
+			    0))
+		   LilyPond-indent-level)
+		 (progn
+		   (skip-chars-backward " \t")
+		   (current-indentation)))))))))
+
+
+
+(defun LilyPond-indent-line ()
+  "Indent current line as lilypond code.
+Return the amount the indentation changed by."
+  (let ((indent (LilyPond-calculate-indent))
+	beg shift-amt
+	(case-fold-search nil)
+	(pos (- (point-max) (point))))
+    (beginning-of-line)
+    (setq beg (point))
+    (cond ((eq indent nil)
+	   (setq indent (current-indentation)))
+	  (t
+	   (skip-chars-forward " \t")
+	   (if (and LilyPond-fancy-comments (looking-at "%%%\\|%{\\|%}"))
+	       (setq indent 0))
+	   (if (and LilyPond-fancy-comments
+		    (looking-at "%")
+		    (not (looking-at "%%\\|%{\\|%}")))
+	       (setq indent comment-column)
+	     (if (eq indent t) (setq indent 0))
+	     (if (listp indent) (setq indent (car indent)))
+	     (cond
+	      ((= (following-char) ?})
+	       (setq indent  (+ indent (- LilyPond-close-brace-offset LilyPond-indent-level))))
+	      ((= (following-char) ?>)
+	       (setq indent  (+ indent (- LilyPond-close-angle-offset LilyPond-indent-level))))
+	      ((and (= (following-char) ?\)) (LilyPond-inside-scheme-p))
+	       (setq indent  (+ indent (- LilyPond-close-scheme-paren-offset LilyPond-indent-level))))
+	      ((= (following-char) ?{)
+	       (setq indent  (+ indent LilyPond-brace-offset)))
+	      ((= (following-char) ?<)
+	       (setq indent  (+ indent LilyPond-angle-offset)))
+	      ((and (= (following-char) ?\() (LilyPond-inside-scheme-p))
+	       (setq indent  (+ indent LilyPond-scheme-paren-offset)))
+	      ))))
+    (skip-chars-forward " \t")
+    (setq shift-amt (- indent (current-column)))
+    (if (zerop shift-amt)
+	(if (> (- (point-max) pos) (point))
+	    (goto-char (- (point-max) pos)))
+      (delete-region beg (point))
+      (indent-to indent)
+      ;; If initial point was within line's indentation,
+      ;; position after the indentation.
+      ;; Else stay at same point in text.
+      (if (> (- (point-max) pos) (point))
+	  (goto-char (- (point-max) pos))))
+    shift-amt))
+
+
+(defun LilyPond-inside-comment-p ()
+  "Return non-nil if point is inside a line or block comment"
+  (setq this-point (point))
+  (or (save-excursion (beginning-of-line)
+		      (skip-chars-forward " \t")
+		      (looking-at "%"))
+      (save-excursion 
+	;; point is in the middle of a block comment
+	(setq lastopen  (save-excursion (re-search-backward "%{[ \\t]*" (point-min) t)))
+	(setq lastclose (save-excursion (re-search-backward "%}[ \\t]*" (point-min) t)))
+	(if (or (and (= (char-before) ?%) (= (char-after) ?{))
+		(and (= (char-after)  ?%) (= (char-after (1+ (point))) ?{)))
+	    (setq lastopen (save-excursion (backward-char) (point))))
+	(and 
+	 lastopen
+	 (or (not lastclose)
+	     (<= lastclose lastopen))))
+      ))
+
+
+(defun LilyPond-inside-string-or-comment-p ()
+  "Test if point is inside a string or a comment"
+  (setq this-point (point))
+  (or (save-excursion (beginning-of-line)
+		      (skip-chars-forward " \t")
+		      (looking-at "%"))
+      (save-excursion 
+	(beginning-of-defun)
+	(while (< (point) this-point)
+	  (setq state (parse-partial-sexp (point) this-point 0)))
+	(cond ((nth 3 state) 
+	       ;; point is in the middle of a string 
+	       t )
+	      ((nth 4 state)
+	       ;; point is in the middle of a block comment
+	       t ) 
+	      (t
+	       nil)))))
+
+
+(defun LilyPond-backward-over-blockcomments (lim)
+  "Move point back to closest non-whitespace character not part of a block comment"
+  (setq lastopen  (save-excursion (re-search-backward "%{[ \\t]*" lim t)))
+  (setq lastclose (save-excursion (re-search-backward "%}[ \\t]*" lim t)))
+  (if lastopen
+      (if lastclose
+	  (if (<= lastclose lastopen)
+	      (goto-char lastopen))
+	(goto-char lastopen)))
+  (skip-chars-backward " %\t\n\f"))
+
+
+(defun LilyPond-backward-over-linecomments (lim)
+  "Move point back to the closest non-whitespace character not part of a line comment.
+Argument LIM limit."
+  (let (opoint stop)
+    (while (not stop)
+      (skip-chars-backward " \t\n\f" lim)
+      (setq opoint (point))
+      (beginning-of-line)
+      (search-forward "%" opoint 'move)
+      (skip-chars-backward " \t%")
+      (setq stop (or (/= (preceding-char) ?\n) (<= (point) lim)))
+      (if stop (point)
+	(beginning-of-line)))))
+
+
+(defun LilyPond-backward-to-noncomment (lim)
+  "Move point back to closest non-whitespace character not part of a comment"
+  (LilyPond-backward-over-linecomments lim)
+  (LilyPond-backward-over-blockcomments lim))
+
+
+(defun LilyPond-calculate-indent-within-blockcomment ()
+  "Return the indentation amount for line inside a block comment."
+  (let (end percent-start)
+    (save-excursion
+      (beginning-of-line)
+      (skip-chars-forward " \t")
+      (skip-chars-backward " \t\n")
+      (setq end (point))
+      (beginning-of-line)
+      (skip-chars-forward " \t")
+      (and (re-search-forward "%{[ \t]*" end t)
+	   (goto-char (1+ (match-beginning 0))))
+      (if (and (looking-at "[ \t]*$") (= (preceding-char) ?\%))
+	  (1+ (current-column))
+	(current-column)))))
+
+
+(defconst LilyPond-parens-regexp-alist
+  `(("[^\\]<" .  "[^ \\n\\t_^-]\\s-*>\\|[_^-]\\s-*[-^]\\s-*>")
+    ;; a b c->, a b c^> and a b c_> are not close-angle-brackets, they're accents
+    ;; but a b c^-> and a b c^^> are close brackets with tenuto/marcato before them
+    ;; also \> and \< are hairpins
+    ("{" . "}")))
+
+
+(defconst LilyPond-parens-combined-regexp
+  (concat (mapconcat 'car LilyPond-parens-regexp-alist "\\|")
+	  "\\|"
+	  (mapconcat 'cdr LilyPond-parens-regexp-alist "\\|")))
+
+
+(defun LilyPond-beginning-of-containing-sexp ()
+  "Move point to the beginning of the deepest parenthesis pair enclosing point."
+  (interactive)
+  (let ((level 1))
+    (if (LilyPond-inside-scheme-p)
+	(setq paren-regexp "(\\|)" inside-scheme t)
+      (setq paren-regexp LilyPond-parens-combined-regexp inside-scheme nil))
+    (while (and (> level 0) 
+		(re-search-backward paren-regexp nil t)
+		(setq match (char-before (match-end 0))))
+      (if (not (save-excursion (goto-char (match-end 0)) 
+			       (LilyPond-inside-string-or-comment-p)))
+	  (if (memq match '(?} ?> ?\)))
+	      (progn (setq level (1+ level))
+		     (if (and (= match ?>) 
+			      (looking-at ".\\s-+>\\|\\({\\|}\\|<\\|>\\|(\\|)\\)>"))
+			 (forward-char 1)))
+	    (progn (setq level (1- level))
+		   (if (and (= match ?<)
+			    (looking-at ".\\s-+<\\|\\({\\|}\\|<\\|>\\|(\\|)\\)<"))
+		       (forward-char 1))))))
+    (if (looking-at ".<\\|.>") (forward-char 1))
+    (if (/= level 1) 
+	(point)
+      nil)))
+
+
+(defun LilyPond-inside-scheme-p ()
+  "Tests if point is inside embedded Scheme code"
+  (interactive)
+  (let ( (test-point (point))
+	 (level 0) )
+    (save-excursion 
+      (if (or (and (= (char-after (point)) ?\()
+		   (or (= (char-after (- (point) 1)) ?#)
+		       (and (= (char-after (- (point) 2)) ?#)
+			    (= (char-after (- (point) 1)) ?`))))
+	      (and (re-search-backward "#(\\|#`(" nil t)
+		   (progn 
+		     (search-forward "(")
+		     (setq level 1)
+		     (while (and (> level 0)
+				 (re-search-forward "(\\|)" test-point t)
+				 (setq match (char-after (match-beginning 0)))
+				 (<= (point) test-point))
+		       (if (= match ?\()
+			   (setq level (1+ level))
+			 (setq level (1- level))))
+		     (> level 0))))
+	  t
+	nil))))
diff -purN ../lilypond-1.5.28/lilypond-mode.el ./lilypond-mode.el
--- ../lilypond-1.5.28/lilypond-mode.el	Mon Dec 17 10:11:42 2001
+++ ./lilypond-mode.el	Thu Jan 31 13:17:54 2002
@@ -20,14 +20,15 @@
 ;;; 
 
 (load-library "lilypond-font-lock")
+(load-library "lilypond-indent")
 
 (require 'easymenu)
 (require 'compile)
 
-(defconst LilyPond-version "1.3.143"
+(defconst LilyPond-version "1.5.28"
   "`LilyPond-mode' version number.")
 
-(defconst LilyPond-help-address "bug-gnu-music@gnu.org"
+(defconst LilyPond-help-address "bug-lilypond@gnu.org"
   "Address accepting submission of bug reports.")
 
 (defvar LilyPond-mode-hook nil
@@ -633,8 +634,8 @@ LilyPond-xdvi-command\t\tcommand to disp
   (setq block-comment-end   "%}")
 
   (make-local-variable 'indent-line-function)
-  (setq indent-line-function 'indent-relative-maybe)
- 
+  (setq indent-line-function 'LilyPond-indent-line)
+
     (set-syntax-table LilyPond-mode-syntax-table)
   (setq major-mode 'LilyPond-mode)
   (setq mode-name "LilyPond")
diff -purN ../lilypond-1.5.28/ly/property-init.ly ./ly/property-init.ly
--- ../lilypond-1.5.28/ly/property-init.ly	Thu Dec 13 13:20:46 2001
+++ ./ly/property-init.ly	Sat Dec 29 23:25:57 2001
@@ -156,8 +156,8 @@ autoBeamOn = \property Voice.noAutoBeami
 emptyText = \property Voice.textNonEmpty = ##f
 fatText = \property Voice.textNonEmpty = ##t
 
-showStaffSwitch = \property PianoStaff.followVoice = ##t
-hideStaffSwitch = \property PianoStaff.followVoice = ##f
+showStaffSwitch = \property Voice.followVoice = ##t
+hideStaffSwitch = \property Voice.followVoice = ##f
 
 % FIXME: Move this docu (to where?)
 
diff -purN ../lilypond-1.5.28/mf/feta-autometric.mf ./mf/feta-autometric.mf
--- ../lilypond-1.5.28/mf/feta-autometric.mf	Wed Dec  5 18:54:28 2001
+++ ./mf/feta-autometric.mf	Fri Feb  1 19:20:59 2002
@@ -4,7 +4,7 @@
 % source file of the Feta (not an acronym for Font-En-Tja)
 % pretty-but-neat music font
 % 
-% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 %          Jan Nieuwenhuizen <janneke@gnu.org>
 % 
 % these macros help create ascii logging output
diff -purN ../lilypond-1.5.28/mf/feta-banier.mf ./mf/feta-banier.mf
--- ../lilypond-1.5.28/mf/feta-banier.mf	Wed Dec  5 18:54:28 2001
+++ ./mf/feta-banier.mf	Fri Feb  1 19:20:59 2002
@@ -266,187 +266,6 @@ fet_endchar;
 %
 %
 %
-% Mensural Notation
-%
-%
-%
-
-def draw_mensural_outermost_flag_i =
-	define_pixels(stafflinethickness, staff_space)
-
-	pickup pencircle
-		xscaled 1.00 stafflinethickness
-		yscaled 0.22 staff_space
-		rotated -35;
-
-	save za, zb, zc, zd, ze;
-	pair za, zb, zc, zd, ze;
-
-	za = (+0.00 staff_space, -0.00 staff_space);
-	zb = (+0.15 staff_space, -0.00 staff_space);
-	zc = (+0.45 staff_space, -0.35 staff_space);
-	zd = (+0.45 staff_space, -0.85 staff_space);
-	ze = (+0.00 staff_space, -2.00 staff_space);
-
-	draw za .. zb -- zc{zc-zb} .. {ze-zd}zd -- ze;
-enddef;
-
-def draw_mensural_outermost_flag_ii =
-	define_pixels(stafflinethickness, staff_space)
-
-	pickup pencircle
-		xscaled 1.00 stafflinethickness
-		yscaled 0.22 staff_space
-		rotated -35;
-
-	save za, zb, zc, zd, ze;
-	pair za, zb, zc, zd, ze;
-
-	za = (+0.00 staff_space, -0.00 staff_space);
-	zb = (+0.15 staff_space, -0.00 staff_space);
-	zc = (+0.20 staff_space, -0.05 staff_space);
-	zd = (+0.20 staff_space, -1.15 staff_space);
-	ze = (+0.00 staff_space, -1.40 staff_space);
-
-	draw za .. zb -- zc{zc-zb} .. {ze-zd}zd -- ze;
-enddef;
-
-def draw_mensural_inner_flag(expr il_shift) =
-	define_pixels(stafflinethickness, staff_space)
-
-	pickup pencircle
-		xscaled 1.00 stafflinethickness
-		yscaled 0.22 staff_space
-		rotated -35;
-
-	save zs, za, zb, zc, zd;
-	pair zs, za, zb, zc, zd;
-
-	zs = (0, -il_shift * staff_space);
-	za = zs + (+0.00 staff_space, -0.10 staff_space);
-	zb = zs + (+0.33 staff_space, -0.30 staff_space);
-	zc = zs + (+0.33 staff_space, -0.70 staff_space);
-	zd = zs + (+0.00 staff_space, -0.90 staff_space);
-
-	draw za{2,1} .. zb .. zc .. {-2,-1}zd;
-enddef;
-
-fet_beginchar("8th Mensural Flag (up)", "mensuralu03", "menseighthflag")
-	set_char_box(0, 0.60 staff_space#, 2.00 staff_space#, 0)
-	draw_mensural_outermost_flag_i
-fet_endchar;
-
-fet_beginchar("8th Mensural Flag (up)", "mensuralu13", "mens1eighthflag")
-	set_char_box(0, 0.60 staff_space#, 1.50 staff_space#, 0)
-	draw_mensural_outermost_flag_ii
-fet_endchar;
-
-fet_beginchar("8th Mensural Flag (down)", "mensurald03", "mensdeighthflag")
-	set_char_box(0.60 staff_space#, 0, 0, 2.00 staff_space#)
-	draw_mensural_outermost_flag_i
-	currentpicture := currentpicture xscaled -1 yscaled -1;
-fet_endchar;
-
-fet_beginchar("8th Mensural Flag (down)", "mensurald13", "mensd1eighthflag")
-	set_char_box(0.60 staff_space#, 0, 0, 1.50 staff_space#)
-	draw_mensural_outermost_flag_ii
-	currentpicture := currentpicture xscaled -1 yscaled -1;
-fet_endchar;
-
-fet_beginchar("16th Mensural Flag (up)", "mensuralu04", "menssixteenthflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_i
-	draw_mensural_inner_flag(2.0)
-fet_endchar;
-
-fet_beginchar("16th Mensural Flag (up)", "mensuralu14", "mens1sixteenthflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_ii
-	draw_mensural_inner_flag(1.5)
-fet_endchar;
-
-fet_beginchar("16th Mensural Flag (down)", "mensurald04", "mensdsixteenthflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_i
-	draw_mensural_inner_flag(2.0)
-	currentpicture := currentpicture xscaled -1 yscaled -1;
-fet_endchar;
-
-fet_beginchar("16th Mensural Flag (down)", "mensurald14", "mensd1sixteenthflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_ii
-	draw_mensural_inner_flag(1.5)
-	currentpicture := currentpicture xscaled -1 yscaled -1;
-fet_endchar;
-
-fet_beginchar("32th Mensural Flag (up)", "mensuralu05", "mensthirtysecondflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_i
-	draw_mensural_inner_flag(2.0)
-	draw_mensural_inner_flag(3.0)
-fet_endchar;
-
-fet_beginchar("32th Mensural Flag (up)", "mensuralu15", "mens1thirtysecondflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_ii
-	draw_mensural_inner_flag(1.5)
-	draw_mensural_inner_flag(2.5)
-fet_endchar;
-
-fet_beginchar("32th Mensural Flag (down)", "mensurald05", "mensdthirtysecondflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_i
-	draw_mensural_inner_flag(2.0)
-	draw_mensural_inner_flag(3.0)
-	currentpicture := currentpicture xscaled -1 yscaled -1;
-fet_endchar;
-
-fet_beginchar("32th Mensural Flag (down)", "mensurald15", "mensd1thirtysecondflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_ii
-	draw_mensural_inner_flag(1.5)
-	draw_mensural_inner_flag(2.5)
-	currentpicture := currentpicture xscaled -1 yscaled -1;
-fet_endchar;
-
-fet_beginchar("64th Mensural Flag (up)", "mensuralu06", "menssixtyfourthflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_i
-	draw_mensural_inner_flag(1.5)
-	draw_mensural_inner_flag(2.5)
-	draw_mensural_inner_flag(3.5)
-fet_endchar;
-
-fet_beginchar("64th Mensural Flag (up)", "mensuralu16", "mens1sixtyfourthflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_ii
-	draw_mensural_inner_flag(1.17)
-	draw_mensural_inner_flag(2.08)
-	draw_mensural_inner_flag(3.00)
-fet_endchar;
-
-fet_beginchar("64th Mensural Flag (down)", "mensurald06", "mensdsixtyfourthflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_i
-	draw_mensural_inner_flag(1.5)
-	draw_mensural_inner_flag(2.5)
-	draw_mensural_inner_flag(3.5)
-	currentpicture := currentpicture xscaled -1 yscaled -1;
-fet_endchar;
-
-fet_beginchar("64th Mensural Flag (down)", "mensurald16", "mensd1sixtyfourthflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_ii
-	draw_mensural_inner_flag(1.17)
-	draw_mensural_inner_flag(2.08)
-	draw_mensural_inner_flag(3.00)
-	currentpicture := currentpicture xscaled -1 yscaled -1;
-fet_endchar;
-
-%%%%%%%%
-%
-%
-%
 % Single Stroke for Short Appogiatura
 %
 %
@@ -593,245 +412,6 @@ fet_beginchar("64th (down)", "d6", "dsix
 	y_mirror_char;
 fet_endchar;
 
-%%%%%%%%
-%
-%
-%
-% Mensural Notation
-%
-%
-%
-
-def draw_mensural_outermost_flag_i =
-	define_pixels(stafflinethickness, staff_space)
-
-	pickup pencircle
-		xscaled 1.00 stafflinethickness
-		yscaled 0.22 staff_space
-		rotated -35;
-
-	save za, zb, zc, zd, ze;
-	pair za, zb, zc, zd, ze;
-
-	za = (+0.00 staff_space, -0.00 staff_space);
-	zb = (+0.15 staff_space, -0.00 staff_space);
-	zc = (+0.45 staff_space, -0.35 staff_space);
-	zd = (+0.45 staff_space, -0.85 staff_space);
-	ze = (+0.00 staff_space, -2.00 staff_space);
-
-	draw za .. zb -- zc{zc-zb} .. {ze-zd}zd -- ze;
-enddef;
-
-def draw_mensural_outermost_flag_ii =
-	define_pixels(stafflinethickness, staff_space)
-
-	pickup pencircle
-		xscaled 1.00 stafflinethickness
-		yscaled 0.22 staff_space
-		rotated -35;
-
-	save za, zb, zc, zd, ze;
-	pair za, zb, zc, zd, ze;
-
-	za = (+0.00 staff_space, -0.00 staff_space);
-	zb = (+0.15 staff_space, -0.00 staff_space);
-	zc = (+0.20 staff_space, -0.05 staff_space);
-	zd = (+0.20 staff_space, -1.15 staff_space);
-	ze = (+0.00 staff_space, -1.40 staff_space);
-
-	draw za .. zb -- zc{zc-zb} .. {ze-zd}zd -- ze;
-enddef;
-
-def draw_mensural_inner_flag(expr il_shift) =
-	define_pixels(stafflinethickness, staff_space)
-
-	pickup pencircle
-		xscaled 1.00 stafflinethickness
-		yscaled 0.22 staff_space
-		rotated -35;
-
-	save zs, za, zb, zc, zd;
-	pair zs, za, zb, zc, zd;
-
-	zs = (0, -il_shift * staff_space);
-	za = zs + (+0.00 staff_space, -0.10 staff_space);
-	zb = zs + (+0.33 staff_space, -0.30 staff_space);
-	zc = zs + (+0.33 staff_space, -0.70 staff_space);
-	zd = zs + (+0.00 staff_space, -0.90 staff_space);
-
-	draw za{2,1} .. zb .. zc .. {-2,-1}zd;
-enddef;
-
-fet_beginchar("8th Mensural Flag (up)", "mensuralu03", "menseighthflag")
-	set_char_box(0, 0.60 staff_space#, 2.00 staff_space#, 0)
-	draw_mensural_outermost_flag_i
-fet_endchar;
-
-fet_beginchar("8th Mensural Flag (up)", "mensuralu13", "mens1eighthflag")
-	set_char_box(0, 0.60 staff_space#, 1.50 staff_space#, 0)
-	draw_mensural_outermost_flag_ii
-fet_endchar;
-
-fet_beginchar("8th Mensural Flag (down)", "mensurald03", "mensdeighthflag")
-	set_char_box(0.60 staff_space#, 0, 0, 2.00 staff_space#)
-	draw_mensural_outermost_flag_i
-	currentpicture := currentpicture xscaled -1 yscaled -1;
-fet_endchar;
-
-fet_beginchar("8th Mensural Flag (down)", "mensurald13", "mensd1eighthflag")
-	set_char_box(0.60 staff_space#, 0, 0, 1.50 staff_space#)
-	draw_mensural_outermost_flag_ii
-	currentpicture := currentpicture xscaled -1 yscaled -1;
-fet_endchar;
-
-fet_beginchar("16th Mensural Flag (up)", "mensuralu04", "menssixteenthflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_i
-	draw_mensural_inner_flag(2.0)
-fet_endchar;
-
-fet_beginchar("16th Mensural Flag (up)", "mensuralu14", "mens1sixteenthflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_ii
-	draw_mensural_inner_flag(1.5)
-fet_endchar;
-
-fet_beginchar("16th Mensural Flag (down)", "mensurald04", "mensdsixteenthflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_i
-	draw_mensural_inner_flag(2.0)
-	currentpicture := currentpicture xscaled -1 yscaled -1;
-fet_endchar;
-
-fet_beginchar("16th Mensural Flag (down)", "mensurald14", "mensd1sixteenthflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_ii
-	draw_mensural_inner_flag(1.5)
-	currentpicture := currentpicture xscaled -1 yscaled -1;
-fet_endchar;
-
-fet_beginchar("32th Mensural Flag (up)", "mensuralu05", "mensthirtysecondflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_i
-	draw_mensural_inner_flag(2.0)
-	draw_mensural_inner_flag(3.0)
-fet_endchar;
-
-fet_beginchar("32th Mensural Flag (up)", "mensuralu15", "mens1thirtysecondflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_ii
-	draw_mensural_inner_flag(1.5)
-	draw_mensural_inner_flag(2.5)
-fet_endchar;
-
-fet_beginchar("32th Mensural Flag (down)", "mensurald05", "mensdthirtysecondflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_i
-	draw_mensural_inner_flag(2.0)
-	draw_mensural_inner_flag(3.0)
-	currentpicture := currentpicture xscaled -1 yscaled -1;
-fet_endchar;
-
-fet_beginchar("32th Mensural Flag (down)", "mensurald15", "mensd1thirtysecondflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_ii
-	draw_mensural_inner_flag(1.5)
-	draw_mensural_inner_flag(2.5)
-	currentpicture := currentpicture xscaled -1 yscaled -1;
-fet_endchar;
-
-fet_beginchar("64th Mensural Flag (up)", "mensuralu06", "menssixtyfourthflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_i
-	draw_mensural_inner_flag(1.5)
-	draw_mensural_inner_flag(2.5)
-	draw_mensural_inner_flag(3.5)
-fet_endchar;
-
-fet_beginchar("64th Mensural Flag (up)", "mensuralu16", "mens1sixtyfourthflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_ii
-	draw_mensural_inner_flag(1.17)
-	draw_mensural_inner_flag(2.08)
-	draw_mensural_inner_flag(3.00)
-fet_endchar;
-
-fet_beginchar("64th Mensural Flag (down)", "mensurald06", "mensdsixtyfourthflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_i
-	draw_mensural_inner_flag(1.5)
-	draw_mensural_inner_flag(2.5)
-	draw_mensural_inner_flag(3.5)
-	currentpicture := currentpicture xscaled -1 yscaled -1;
-fet_endchar;
-
-fet_beginchar("64th Mensural Flag (down)", "mensurald16", "mensd1sixtyfourthflag")
-	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
-	draw_mensural_outermost_flag_ii
-	draw_mensural_inner_flag(1.17)
-	draw_mensural_inner_flag(2.08)
-	draw_mensural_inner_flag(3.00)
-	currentpicture := currentpicture xscaled -1 yscaled -1;
-fet_endchar;
-
-%%%%%%%%
-%
-%
-%
-% Single Stroke for Short Appogiatura
-%
-%
-%
-
-fet_beginchar("grace dash (up)", "ugrace", "gracedash")
-	save flare, 
-		hip_depth_ratio, hip_width,
-		foot_depth;
-
-	flare# = 1.0 staff_space#;
-	hip_depth_ratio = .72; 
-	hip_width# = upflag_width# - hip_thickness#/2;
-
-	foot_depth# =  3 staff_space#;
-
-	define_pixels(flare, hip_width, hip_thickness,
-		foot_depth, foot_thickness);
-
-	set_char_box(hip_width# * hip_depth_ratio,
-	  hip_width# + stemthickness#/2 + right_upflag_space#, 
-	  foot_depth# * hip_depth_ratio, -flare#)
-
-	pickup pencircle scaled 1.5 stemthickness;
-	draw (-b ,-d) ..
-	  (w, h);
-fet_endchar;
-
-fet_beginchar("grace dash (down)", "dgrace", "dgracedash")
-	save flare, hip_depth_ratio, hip_width,	foot_depth;
-	save flagspace, total_depth, flag_count;
-	
-	flag_count = 1;
-	flare# = .99 staff_space#;
-	flagspace# = .9 staff_space#;	
-	hip_depth_ratio = .72 ;
-	hip_width# = downflag_width# - hip_thickness#/2;
-	total_depth# = 2.85 staff_space#;
-	(flag_count-1) * flagspace# + foot_depth# = total_depth#;
-
-	foot_width_ratio = .8;
-
-	define_pixels(flare, hip_width, hip_thickness,
-		flagspace, foot_depth);
-
-	set_char_box(hip_width# * hip_depth_ratio,
-	  hip_width# + stemthickness#/2 + right_downflag_space#,
-	  foot_depth# * hip_depth_ratio, -flare#)
-
-	pickup pencircle scaled 1.5 stemthickness;
-	draw (-b, -d) .. (w,h);
-	y_mirror_char;
-fet_endchar;
-
 % ustem?
 %
 %
diff -purN ../lilypond-1.5.28/mf/feta-beum.mf ./mf/feta-beum.mf
--- ../lilypond-1.5.28/mf/feta-beum.mf	Wed Dec  5 18:54:28 2001
+++ ./mf/feta-beum.mf	Fri Feb  1 19:20:59 2002
@@ -3,7 +3,7 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 % 
 mode_setup;
 
diff -purN ../lilypond-1.5.28/mf/feta-bolletjes.mf ./mf/feta-bolletjes.mf
--- ../lilypond-1.5.28/mf/feta-bolletjes.mf	Wed Dec  5 18:54:28 2001
+++ ./mf/feta-bolletjes.mf	Fri Feb  1 19:20:59 2002
@@ -3,8 +3,9 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 % & Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% & Juergen Reuter <reuter@ipd.uka.de>
 % 
 
 
@@ -21,225 +22,10 @@ fet_begingroup("noteheads");
 noteheight#:=staff_space#+ (1 + overdone_heads) *stafflinethickness#;
 define_pixels(noteheight);
 
-
-%%%%%%%%
-%
-%
-%
-% MENSURAL NOTATION
-%
-%
-%
-brevis_wid# := 2 staff_space#;
-
-def draw_brevis(expr brevwid) =
-	save beamheight, head_width;
-	save holeheight, stem_width;
-	save serif_size, serif_protrude;
-
-	head_width# = brevwid;
-	holeheight = 3 stafflinethickness;
-	stem_width = 1.4 stafflinethickness;
-
-
-	define_pixels(head_width);
-	set_char_box(0, head_width#, noteheight#/2, noteheight#/2);
-	
-	2 beamheight + holeheight = noteheight;
-	serif_size = (holeheight - stafflinethickness)/2;
-	serif_protrude = 1.5 serif_size;
-	penpos1(stem_width, 0);
-	penpos2(stem_width, 0);
-	penpos3(beamheight, 90);
-	penpos4(beamheight, 90);
-	penpos5(stem_width, 180);
-
-	z1l = (0, 0);
-	z2l = (0, -stafflinethickness/2);
-	z3r = z2r + serif_size *(1,-1);
-	y4r = y3r;
-	x4r = head_width/2;
-	z5l = z3l + (-serif_size, -serif_protrude);
-
-	penlabels(1,2,3,4, 5);
-	fill z1r -- z1l -- z5r{down} .. z5l{up} .. z3l{right}
-		-- z4l -- z4r -- z3r{left} .. z2r{up} -- cycle;
-
-	addto currentpicture also currentpicture yscaled -1;
-	show z4r; show z4l;
-	addto currentpicture also currentpicture 
-		shifted (-x4r,0) xscaled -1 shifted (x4l,0);
-
-enddef;
-
-
-%
-% Some sources (eg Musix/OpusTeX think that the appendage should be on
-% the left, some say right. Right wins democratically.
-%
-def draw_longa (expr wid) =
-	draw_brevis(wid);
-	save theta;
-
-	x7r = head_width;
-	y7 = y5;
-%	z7 = z5;
-	z6 - z7 = (stem_width/2, -staff_space);
-	theta = angle(z6-z7)+ 90;
-	penpos7(stem_width, theta);
-	penpos6(1.2 stem_width, theta);
-	
-	fill z7r .. z6r{z6-z7} .. {z7-z6} z6l -- z7l -- cycle;
-	penlabels(6,7);
-enddef;
-
 %
-% En wij presenteren U: de opvolgster van Emily
-%
-% (ze is wel breed)
-% 
-fet_beginchar("Maxima notehead", "-3mensural", "mensuralmaximahead");
-	draw_longa (1.3 brevis_wid#)
-fet_endchar;
-
-fet_beginchar("Longa notehead", "-2mensural", "mensurallongahead");
-	draw_longa (brevis_wid#)
-fet_endchar;
-
-fet_beginchar("Brevis notehead", "-1mensural", "mensuralbrevishead")
-	draw_brevis(brevis_wid#);
-fet_endchar;
-
-def draw_neo_mensural_black_head (expr wid) =
-	save head_width;
-	head_width# = wid;
-	set_char_box (0, head_width#, noteheight#/2, noteheight#/2);
-
-
-	y3 = y1 =0;
-	x2 = x4 = (x1 + x3) /2;
-	define_pixels (head_width);
-	pickup pencircle scaled blot_diameter;
-	top y2 = h;
-	bot y4 = -d;
-	lft x1 = 0;
-	rt x3 = w;
-
-	filldraw z1 -- z2 -- z3 -- z4 -- cycle;
-enddef;
-
-def draw_neo_mensural_open_head (expr wid)=
-	draw_neo_mensural_black_head (wid);
-	save diamNW, diamSW;
-	diamNW = length (z2 - z1) + blot_diameter;
-	diamSW = length (z4 - z1) + blot_diameter;
-	
-	save hole_widthNW, hole_widthSW;
-	hole_widthNW = 0.34 diamNW ;
-	hole_widthSW + 2.6 stafflinethickness = diamSW;
-
-	(z7 + z5)/2 = (w/2, 0);
-	(z8 + z6)/2 = (w/2, 0);
-	(z6 - z5) = hole_widthNW * unitvector (z2 - z1);
-	(z7 - z6) = hole_widthSW * unitvector (z4 - z1);
-
-	labels (1,2,3,4,5,6,7,8);
-
-	unfill z5 -- z6 -- z7 -- z8 --cycle;
-enddef;
-
-fet_beginchar("Neo-mensural open head","0neo_mensural","neomensuralminimhead")
-      draw_neo_mensural_open_head (staff_space#);
-fet_endchar;
-
-fet_beginchar("Neo-mensural open head","1neo_mensural","neomensuralsemiminimhead")
-      draw_neo_mensural_open_head (staff_space#);
-fet_endchar;
-
-fet_beginchar("Neo-mensural black head","2neo_mensural","neofusahead")
-      draw_neo_mensural_black_head (staff_space#);
-fet_endchar;
-
-
-def draw_mensural_head (expr wid, open) =
-      save head_width;
-      head_width# = wid;
-      set_char_box (head_width#/2, head_width#/2,
-		    noteheight#/2, noteheight#/2);
-
-      define_pixels(head_width, noteheight);
-
-      x1 = -x3;
-      y1 = x2 = y3 = x4 = 0;
-      y4 = -y2;
-      y2 = 1.4 noteheight/2;
-      tand(30) = x3 / y2;
-
-      pickup pencircle
-	     xscaled 0.15 head_width
-	     yscaled 0.30 head_width
-	     rotated -30;
-
-      % pencircle width correction
-      save zc, zd; pair zc, zd;
-      zc = (+0.150 head_width * sind(30), +0.150 head_width * cosd(30));
-      zd = (+0.075 head_width * sind(30), -0.075 head_width * cosd(30));
-
-      if open:
-	      draw (z1+zc+zd) -- (z2-zc+zd) --
-		   (z3-zc-zd) -- (z4+zc-zd) -- cycle;
-      else:
-	      filldraw (z1+zc+zd) -- (z2-zc+zd) --
-		       (z3-zc-zd) -- (z4+zc-zd) -- cycle;
-      fi;
-enddef;
 
-
-fet_beginchar("Mensural open head","0mensural","mensuralminimhead")
-	draw_mensural_head (staff_space#, true);
-fet_endchar;
-
-fet_beginchar("Mensural open head","1mensural","mensuralsemiminimhead")
-	draw_mensural_head (staff_space#, true);
-fet_endchar;
-
-fet_beginchar("Mensural black head","2mensural","fusahead")
-	draw_mensural_head (staff_space#, false);
-fet_endchar;
-
-
-%%%%%%%%%%%%
-%
+%%% TODO: Document these!
 %
-% ledger (leger) lines
-%
-fet_beginchar("Ledger ending", "ledgerending", "ledgerending")
-set_char_box (5/2 ledgerlinethickness#, 5/2 ledgerlinethickness#,
-  		ledgerlinethickness#/2,ledgerlinethickness#/2);
-	pickup pencircle scaled 1.3 blot_diameter;
-
-	rt x2 = w;
-	lft x1 = -b;
-	x3 = x2;
-	bot y1 = -d;
-	y2 = y1;
-
-	top y3 = h;
-	y4 = y3;
-	x4 = x1;
-
-	filldraw z1 --- z2 --- z3 --- z4 --- cycle ;
-fet_endchar;
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-%
-%
-%
-% TODO: Document these!
 
 % setup user vars
 def setup_notehead_vars =
@@ -487,47 +273,76 @@ fet_beginchar("Quart diamondhead", "2dia
 	fill black;
 fet_endchar;
 
-save triangle; path triangle;
-triangle = (-sqrt3/4,-1/2) -- (0,1) -- (sqrt3/4,-1/2) -- cycle;
+
+
+begingroup;
+def def_triangle =
+	save triangle,kern; path triangle;
+	kern = 1/3(x2-x1);
+	z2 = z1 rotated 120;
+	z3 = z1 rotated 240;
+	z12 = caveness[.5[z1,z2],z3];
+	z23 = z12 rotated 120;
+	z31 = z12 rotated 240;
+	triangle = z1 .. z12 .. z2 ..
+		    z2 .. z23 .. z3 ..
+		    z3 .. z31 .. z1 ..
+		    cycle;
+	triangle := triangle shifted (-x1+pent/2-kern,0) xscaled xs;
+	pickup pencircle scaled pent xscaled xs;
+	hei = max(y1,-y2)+pent/2; 
+	%set_char_box(-kern*xs*fac, ((x3-x1)*fac+pent#)*xs,hei*fac,hei*fac);
+	set_char_box(0, ((x3-x1-kern)*fac+pent#)*xs,hei*fac,hei*fac);
+enddef;
+save fac,pent;
+fac = noteheight#/noteheight;
+pent# = 2stafflinethickness#;
+define_pixels(pent);
+
 
 fet_beginchar("Whole trianglehead", "0triangle", "wholetrianglehead")
-	set_char_box(0, 2(noteheight#+stafflinethickness#)/sqrt3*7/8,
-	  (noteheight#+stafflinethickness#)/2,(noteheight#+stafflinethickness#)/2);
-	fill triangle scaled (7h/6) shifted (w/2,-h/6);
-	unfill triangle scaled 0.72h shifted (w/2,-h/6);
+	save hei,xs;
+	z1 = dir(130)*3/4noteheight;
+	xs = 1.5;
+	caveness:=0.1;
+	def_triangle;
+	draw triangle;
 fet_endchar;
+
 fet_beginchar("Half trianglehead", "1triangle", "halftrianglehead")
-	thick := 1.2stafflinethickness;
-	set_char_box(0, 2noteheight#/sqrt3*7/8,noteheight#/2,noteheight#/2);
-	fill triangle scaled (7h/6) shifted (w/2,-h/6);
-	unfill triangle scaled 0.7h shifted (w/2,-h/6);
+	save hei,xs;
+	z1 = dir(130)*2/3noteheight;
+	xs = 1.2;
+	caveness:=0.1;
+	def_triangle;
+	draw triangle;
 fet_endchar;
+
 fet_beginchar("Quart trianglehead", "2triangle", "trianglehead")
-	thick := 1.2stafflinethickness;
-	set_char_box(0, 2noteheight#/sqrt3*7/8,noteheight#/2,noteheight#/2);
-	fill triangle scaled (7h/6) shifted (w/2,-h/6);
+	save hei,xs;
+	z1 = dir(130)*2/3noteheight;
+	xs = 1.0;
+	caveness:=0.1;
+	def_triangle;
+	filldraw triangle;
 fet_endchar;
 
+endgroup;
+
 %%% Editable values:
 slope := 1.7; % slope of slash. From scm/grob-description.scm. How to auto-copy?
-slt := 2/3*0.48staff_space; % thickness of lines. quarter notes get 1.5slt width.
-slh := 2staff_space; % height of char.
+slt# := 2/3*0.48staff_space#; % thickness of lines. quarter notes get 1.5slt width.
+slh# := 2staff_space#; % height of char.
 
 %%% Calculated values:
-sxa := 0; % how much the char exceeds the boundingbox horizontally:
-slxt := sqrt(slt*slt+(slt/slope)*(slt/slope)); % Width of hor. pen - with thanks to Pythagoras
-slw := slh/slope; % width of sloping part of slash:
-
-% is this really nessesary? -rz
-fac# := staff_space#/staff_space;
-slt# := fac#*slt;
-slh# := fac#*slh;
-sxa# := fac#*sxa;
-slxt# := fac#*slxt;
-slw# := fac#*slw;
+sxa# := 0; % how much the char exceeds the boundingbox horizontally:
+slxt# := sqrt(slt#*slt#+(slt#/slope)*(slt#/slope)); % Width of hor. pen - with thanks to Pythagoras
+slw# := slh#/slope; % width of sloping part of slash:
+
+define_pixels(slt,slh,sxa,slxt,slw);
 
-def draw_slash(expr hwid) =
-	wid# := slw#+2slxt#+hwid*fac#;
+def draw_slash(expr hwid_hash) =
+	wid# := slw#+2slxt#+hwid_hash;
 	set_char_box(0,wid#-2sxa#,slh#/2,slh#/2);
 	define_pixels (wid#);
 	pickup penrazor scaled slxt;
@@ -539,15 +354,15 @@ def draw_slash(expr hwid) =
 enddef;
 
 fet_beginchar("Whole slashhead","0slash","wholeslashhead")
-	draw_slash(staff_space);
+	draw_slash(staff_space#);
 fet_endchar;
 
 fet_beginchar("Half slashhead","1slash","halfslashhead")
-	draw_slash(0.6staff_space);
+	draw_slash(0.6staff_space#);
 fet_endchar;
 
 fet_beginchar("Quart slashhead","2slash","quartslashhead")
-	draw_slash(-slxt/2);
+	draw_slash(-slxt#/2);
 fet_endchar;
 
 % thick is the distance between the two parallel lines in the cross (distance between centres of lines)
@@ -593,10 +408,10 @@ fet_beginchar("Crossed notehead", "2cros
 fet_endchar;
 
 fet_beginchar("X-Circled notehead", "2xcircle", "xcircledhead")
-	wid# := black_notehead_width#;
-	hei# := noteheight#+stafflinethickness#;
+	wid# := black_notehead_width#*sqrt(sqrt2);
+	hei# := noteheight#*sqrt(sqrt2);
 	set_char_box(0, wid#,hei#/2,hei#/2);
-	cthick := 1.2stafflinethickness;
+	cthick := (1.2+1/4)*stafflinethickness;
 	cxr := w/2-cthick/2;
 	cyr := h-cthick/2;
 	pickup pencircle scaled cthick;
@@ -607,359 +422,30 @@ fet_beginchar("X-Circled notehead", "2xc
 	draw (-xpos+w/2,ypos) -- (xpos+w/2,-ypos);
 fet_endchar;
 
-%%%%%%%%
-%
-%
-%
-% EDITIO VATICANA
-%
-%
-%
-
-% subbipunctum
-fet_beginchar("Ed. Vat. subbipunctum", "0vaticana_subbipunctum",
-	"vatsubbipunctumhead")
-	save b_h, a_w;
-	a_b := 1.54; % b_h*a_b/a_w = wd/ht
-	b_h := 0.85;
-	a_w := 1.09;
-
-	save a, beta, ht, wd;
-	ht# = noteheight#;
-	2beta# = ht# * b_h;
-	a# = beta# * a_b;
-	wd# = 2a# / a_w;
-	set_char_box(0.3wd#, 0.3wd#, 0.5 ht#, 0.5 ht#);
-	black_notehead_width# := wd#;
-
-	save za, alpha, size;
-	pair za;
-	define_pixels(ht, wd);
-	alpha = 35;
-	size = 0.45ht;
-	pickup pencircle
-		xscaled 0
-		yscaled size rotated -alpha;
-	za = (0, size) / 2 rotated alpha;
-	draw -za .. za;
-
-fet_endchar;
-
-
-% parametrized punctum
-def punctum_char (expr verbose_name, internal_name, mudela_name,
-	left_stem, right_stem,
-	straight, reverse_convexity, excentric, up_shift, mag) =
-
-	fet_beginchar(verbose_name, internal_name, mudela_name)
-		save b_h, a_w;
-		a_b := 1.54; % b_h*a_b/a_w = wd/ht
-		b_h := 0.85;
-		a_w := 1.09;
-
-		save a, beta, ht, wd;
-		ht# = noteheight# * mag;
-		2beta# = ht# * b_h;
-		a# = beta# * a_b;
-		wd# = 2a# / a_w;
-		set_char_box(0.25wd#, 0.25wd#, 0.5ht#, 0.5ht#);
-		black_notehead_width# := wd#;
-
-		save convexity;
-		if straight:
-			if reverse_convexity:
-				convexity# = -0.02ht#;
-			else:
-				convexity# = +0.02ht#;
-			fi;
-		else:
-			if reverse_convexity:
-				convexity# = -0.05ht#;
-			else:
-				convexity# = +0.05ht#;
-			fi;
-		fi;
-
-		save yoffs;
-		if up_shift:
-			yoffs# = 0.08ht#;
-		else:
-			yoffs# = 0.00ht#;
-		fi
-
-		define_pixels(ht, wd, convexity, yoffs);
-		pickup pencircle scaled stafflinethickness;
-
-		if excentric:
-			z1 = (0.00wd, yoffs - 1.0convexity);
-			z2 = (0.08wd, yoffs + 1.4convexity);
-			z3 = (0.40wd, yoffs);
-			penpos1(0.50ht, 90);
-			penpos2(0.50ht, 90);
-			penpos3(0.50ht, 90);
-			if reverse_convexity:
-				penstroke z1e{up} .. z2e{right} .. z3e;
-			else:
-				penstroke z1e{down} .. z2e{right} ..z3e;
-			fi;
-		else:
-			z1 = (0.00wd, yoffs);
-			z2 = (0.20wd, yoffs + convexity);
-			z3 = (0.40wd, yoffs);
-			penpos1(0.50ht, 90);
-			penpos2(0.50ht, 90);
-			penpos3(0.50ht, 90);
-			penstroke z1e .. z2e .. z3e;
-		fi;
-
-		if left_stem:
-			z5=(0.00wd + 0.5 stafflinethickness, yoffs);
-			z6=(0.00wd + 0.5 stafflinethickness, yoffs - 1.5ht);
-			draw z5 -- z6;
-		elseif right_stem:
-			z5=(0.40wd - 0.25 stafflinethickness, yoffs);
-			z6=(0.40wd - 0.25 stafflinethickness, yoffs - 1.5ht);
-			draw z5 -- z6;
-		fi;
-
-	fet_endchar;
-enddef;
-
-
-% punctum
-punctum_char("Ed. Vat. punctum", "0vaticana_punctum", "vatpunctumhead",
-	false, false, false, false, false, false, 1.0);
-
-% virga (i.e. right stemmed punctum)
-punctum_char("Ed. Vat. virga", "0vaticana_virga", "vatvirgahead",
-	false, true, false, false, false, false, 1.0);
-
-% left stemmed punctum as used in clivis (flexa) ligature
-punctum_char("Ed. Vat. reverse virga", "0vaticana_rvirga", "vatrvirgahead",
-	true, false, false, false, false, false, 1.0);
-
-% pes lower punctum
-punctum_char("Ed. Vat. pes lower punctum", "0vaticana_lpes", "vatlpeshead",
-	false, false, true, true, false, false, 1.0);
-
-% pes upper punctum
-punctum_char("Ed. Vat. pes upper punctum", "0vaticana_upes", "vatupeshead",
-	false, false, true, false, false, false, 1.0);
-
-% pes upper punctum (shifted variation)
-%
-% Note: This note head is used instead of the regular pes upper
-% punctum to avoid collision with the lower punctum note of the pes when
-% the upper punctum sits directly on top of the lower punctum.
-punctum_char("Ed. Vat. var pes upper punctum", "0vaticana_vupes",
-	"vatvupeshead",
-	false, false, true, false, false, true, 1.0);
-
-% small punctum as used in epiphonus/cephalicus
-punctum_char("Ed. Vat. plica", "0vaticana_plica", "vatplicahead",
-	false, false, true, false, false, false, 0.5);
-
-% excentric punctum as used in epiphonus
-punctum_char("Ed. Vat. epiphonus", "0vaticana_epiphonus", "vatepiphonushead",
-	false, false, false, true, true, false, 1.0);
-
-% excentric punctum as used in cephalicus
-punctum_char("Ed. Vat. cephalicus", "0vaticana_cephalicus",
-	"vatcephalicushead",
-	false, false, false, false, true, false, 1.0);
-
-% quilisma
-fet_beginchar("Ed. Vat. quilisma", "0vaticana_quilisma", "vatquilismahead")
-	save b_h,a_w;
-	a_b:=1.54; % b_h*a_b/a_w = wd/ht
-	b_h:=0.85;
-	a_w:=1.09;
-
-	save a, beta, ht, wd;
-	ht# =noteheight#;
-	2beta#=ht#*b_h;
-	a# = beta#*a_b;
-	wd# = 2a# / a_w;
-	set_char_box(0.1wd#, 0.4wd#, 0.5 ht#, 0.5 ht#);
-	black_notehead_width# := wd#;
-
-	define_pixels(ht, wd);
-	pickup pencircle xscaled stafflinethickness yscaled 0.4ht;
-	z1=(0.00wd,-0.10ht);
-	z2=(0.00wd,+0.05ht);
-	z3=(0.15wd,-0.05ht);
-	z4=(0.15wd,+0.10ht);
-	z5=(0.30wd,+0.00ht);
-	z6=(0.30wd,+0.15ht);
-	draw z1 -- z2 -- z3 -- z4 -- z5 -- z6;
 
-fet_endchar;
-
-%%%%%%%%
-%
-%
-%
-% EDITIO MEDICAEA
+%%%%%%%%%%%%
 %
 %
+% ledger (leger) lines
 %
+fet_beginchar("Ledger ending", "ledgerending", "ledgerending")
+set_char_box (5/2 ledgerlinethickness#, 5/2 ledgerlinethickness#,
+  		ledgerlinethickness#/2,ledgerlinethickness#/2);
+	pickup pencircle scaled 1.3 blot_diameter;
 
-% subbipunctum
-fet_beginchar("Ed. Med. subbipunctum", "0medicaea_subbipunctum",
-	"medsubbipunctumhead")
-	save b_h, a_w;
-	a_b := 1.54; % b_h*a_b/a_w = wd/ht
-	b_h := 0.85;
-	a_w := 1.09;
-
-	save a, beta, ht, wd;
-	ht# = noteheight#;
-	2beta# = ht# * b_h;
-	a# = beta# * a_b;
-	wd# = 2a# / a_w;
-	set_char_box(wd#/2, wd#/2, 0.5 ht#, 0.5 ht#);
-	black_notehead_width# := wd#;
+	rt x2 = w;
+	lft x1 = -b;
+	x3 = x2;
+	bot y1 = -d;
+	y2 = y1;
 
-	save za, alpha, size;
-	pair za;
-	define_pixels(ht, wd);
-	alpha = 35;
-	size = 0.7ht;
-	pickup pencircle
-		xscaled 0
-		yscaled size rotated -alpha;
-	za = (0, size) / 2 rotated alpha;
-	draw -za .. za;
+	top y3 = h;
+	y4 = y3;
+	x4 = x1;
 
+	filldraw z1 --- z2 --- z3 --- z4 --- cycle ;
 fet_endchar;
 
-% parametrized punctum
-def punctum_char (expr verbose_name, internal_name, mudela_name,
-	left_up_stem, left_down_stem) =
-
-	fet_beginchar(verbose_name, internal_name, mudela_name)
-
-		save a, beta, ht, wd;
-		ht# = 2 staff_space#;
-		wd# = ht#;
-		set_char_box(0.0, 0.4wd#, 0.5ht#, 0.5ht#);
-		black_notehead_width# := wd#;
-
-		define_pixels(ht, wd);
-		pickup pencircle scaled stafflinethickness;
-
-			z1 = (0.00wd, 0);
-			z2 = (0.20wd, 0);
-			z3 = (0.40wd, 0);
-			penpos1(0.50ht, 90);
-			penpos2(0.50ht, 90);
-			penpos3(0.50ht, 90);
-			penstroke z1e .. z2e .. z3e;
-
-		if left_down_stem:
-			z5=(0.00wd + 0.5 stafflinethickness, 0);
-			z6=(0.00wd + 0.5 stafflinethickness, - 1.25ht);
-			draw z5 -- z6;
-		elseif left_up_stem:
-			z5=(0.00wd + 0.5 stafflinethickness, 0);
-			z6=(0.00wd + 0.5 stafflinethickness, + 1.25ht);
-			draw z5 -- z6;
-		fi;
-
-	fet_endchar;
-enddef;
-
-% punctum
-punctum_char("Ed. Med. punctum", "0medicaea_punctum", "medpunctumhead",
-	false, false);
-
-% left up-stemmed punctum
-punctum_char("Ed. Med. reverse virga", "0medicaea_rvirga", "medrvirgahead",
-	true, false);
-
-% virga (i.e. left down-stemmed punctum)
-punctum_char("Ed. Med. virga", "0medicaea_virga", "medvirgahead",
-	false, true);
-
-%%%%%%%%
-%
-%
-%
-% HUFNAGEL
-%
-%
-%
-
-% punctum
-% parametrized punctum
-def punctum_char (expr verbose_name, internal_name, mudela_name,
-	down_stem) =
-
-	fet_beginchar(verbose_name, internal_name, mudela_name)
-		save b_h, a_w;
-		a_b := 1.54; % b_h*a_b/a_w = wd/ht
-		b_h := 0.85;
-		a_w := 1.09;
-
-		save a, beta, ht, wd;
-		ht# = noteheight#;
-		2beta# = ht# * b_h;
-		a# = beta# * a_b;
-		wd# = 2a# / a_w;
-		set_char_box(wd#/2, wd#/2, 0.5 ht#, 0.5 ht#);
-		black_notehead_width# := wd#;
-
-		save za, zb, zc, alpha, size;
-		pair za, zb, zc;
-		define_pixels(ht, wd);
-		alpha = 55;
-		size = 0.7ht;
-		pickup pencircle
-			xscaled 0
-			yscaled size rotated -alpha;
-		za = (0, size) / 2 rotated alpha;
-		draw -za .. za;
-
-		if down_stem:
-			zb = (0.00wd, 0);
-			zc = (0.00wd, - 1.25ht);
-			draw zb -- zc;
-		fi;
-	fet_endchar;
-enddef;
-
-% punctum
-punctum_char("Hufnagel punctum", "0hufnagel_punctum", "hufpunctumhead", false)
-
-% virga
-punctum_char("Hufnagel virga", "0hufnagel_virga", "hufvirgahead", true)
-
-% pes lower punctum
-fet_beginchar("Hufnagel pes lower punctum", "0hufnagel_lpes", "huflpeshead")
-	save b_h, a_w;
-	a_b := 1.54; % b_h*a_b/a_w = wd/ht
-	b_h := 0.85;
-	a_w := 1.09;
-
-	save a, beta, ht, wd;
-	ht# = noteheight#;
-	2beta# = ht# * b_h;
-	a# = beta# * a_b;
-	wd# = 2a# / a_w;
-	set_char_box(wd#, wd#, 0.7 ht#, 0.7 ht#);
-	black_notehead_width# := wd#;
-
-	save za, alpha, size;
-	pair za;
-	define_pixels(ht, wd);
-	alpha = 35;
-	size = 0.7ht;
-	pickup pencircle
-		xscaled 0
-		yscaled size rotated -alpha;
-	za = (size, 0);
-	draw -za .. za;
-fet_endchar;
 
 fet_endgroup("noteheads");
 define_pixels(black_notehead_width);
diff -purN ../lilypond-1.5.28/mf/feta-braces0.mf ./mf/feta-braces0.mf
--- ../lilypond-1.5.28/mf/feta-braces0.mf	Wed Dec  5 18:54:28 2001
+++ ./mf/feta-braces0.mf	Fri Feb  1 19:20:59 2002
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 font_count := 0;
diff -purN ../lilypond-1.5.28/mf/feta-braces1.mf ./mf/feta-braces1.mf
--- ../lilypond-1.5.28/mf/feta-braces1.mf	Wed Dec  5 18:54:28 2001
+++ ./mf/feta-braces1.mf	Fri Feb  1 19:20:59 2002
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 font_count := 1;
diff -purN ../lilypond-1.5.28/mf/feta-braces2.mf ./mf/feta-braces2.mf
--- ../lilypond-1.5.28/mf/feta-braces2.mf	Wed Dec  5 18:54:28 2001
+++ ./mf/feta-braces2.mf	Fri Feb  1 19:20:59 2002
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 font_count := 2;
diff -purN ../lilypond-1.5.28/mf/feta-braces3.mf ./mf/feta-braces3.mf
--- ../lilypond-1.5.28/mf/feta-braces3.mf	Wed Dec  5 18:54:28 2001
+++ ./mf/feta-braces3.mf	Fri Feb  1 19:20:59 2002
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 font_count := 3;
diff -purN ../lilypond-1.5.28/mf/feta-braces4.mf ./mf/feta-braces4.mf
--- ../lilypond-1.5.28/mf/feta-braces4.mf	Wed Dec  5 18:54:28 2001
+++ ./mf/feta-braces4.mf	Fri Feb  1 19:20:59 2002
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 font_count := 4;
diff -purN ../lilypond-1.5.28/mf/feta-braces5.mf ./mf/feta-braces5.mf
--- ../lilypond-1.5.28/mf/feta-braces5.mf	Wed Dec  5 18:54:28 2001
+++ ./mf/feta-braces5.mf	Fri Feb  1 19:20:59 2002
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 font_count := 5;
diff -purN ../lilypond-1.5.28/mf/feta-braces6.mf ./mf/feta-braces6.mf
--- ../lilypond-1.5.28/mf/feta-braces6.mf	Wed Dec  5 18:54:28 2001
+++ ./mf/feta-braces6.mf	Fri Feb  1 19:20:59 2002
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 font_count := 6;
diff -purN ../lilypond-1.5.28/mf/feta-braces7.mf ./mf/feta-braces7.mf
--- ../lilypond-1.5.28/mf/feta-braces7.mf	Wed Dec  5 18:54:28 2001
+++ ./mf/feta-braces7.mf	Fri Feb  1 19:20:59 2002
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 font_count := 7;
diff -purN ../lilypond-1.5.28/mf/feta-braces8.mf ./mf/feta-braces8.mf
--- ../lilypond-1.5.28/mf/feta-braces8.mf	Wed Dec  5 18:54:28 2001
+++ ./mf/feta-braces8.mf	Fri Feb  1 19:20:59 2002
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 font_count := 8;
diff -purN ../lilypond-1.5.28/mf/feta-custodes.mf ./mf/feta-custodes.mf
--- ../lilypond-1.5.28/mf/feta-custodes.mf	Wed Dec  5 18:54:28 2001
+++ ./mf/feta-custodes.mf	Thu Jan  1 01:00:00 1970
@@ -1,273 +0,0 @@
-% -*-Fundamental-*-
-% feta-custodes.mf --  implement custos symbols
-% 
-% source file of LilyPond's pretty-but-neat music font
-% 
-% (C) 2000 Juergen Reuter <reuterj@ira.uka.de>
-% 
-
-save black_notehead_width;
-numeric black_notehead_width;
-
-fet_begingroup("custodes");
-
-noteheight#:=staff_space#+ (1 + overdone_heads) *stafflinethickness#;
-define_pixels(noteheight);
-
-
-%%%%%%%%
-%
-% Hufnagel style
-%
-
-% stem up
-fet_beginchar("Custos Hufnagel", "hufnagel", "hufnagel")
-	save b_h,a_w;
-	a_b:=1.54; % b_h*a_b/a_w = wd/ht
-	b_h:=0.85;
-	a_w:=1.09;
-
-	save a, beta, ht, wd;
-	ht# =noteheight#;
-	2beta#=ht#*b_h;
-	a# = beta#*a_b;
-	wd# = 2a# / a_w;
-	set_char_box(0, wd#, ht#/2, ht#/2);
-	black_notehead_width# := wd#;
-
-	save rh_width, rh_height, rh_edge; % rhombus dimensions
-	rh_width#=0.7ht#; % ht*tan(35)
-	rh_height#=1.0ht#;
-	rh_edge#=0.61ht#; % (ht/2)/cos(35)
-
-	define_pixels(rh_width, rh_height, rh_edge);
-	pickup pencircle
-	  xscaled stafflinethickness
-	  yscaled rh_edge rotated -35;
-	z1=(0.5rh_width,+0.25rh_height);
-	z2=(1.0rh_width,-0.25rh_height);
-	z3=(2.0rh_width,+0.50rh_height);
-	draw z1 -- z2 -- z3;
-fet_endchar;
-
-% stem down
-fet_beginchar("Reverse Custos Hufnagel", "rhufnagel", "rhufnagel")
-	save b_h,a_w;
-	a_b:=1.54; % b_h*a_b/a_w = wd/ht
-	b_h:=0.85;
-	a_w:=1.09;
-
-	save a, beta, ht, wd;
-	ht# =noteheight#;
-	2beta#=ht#*b_h;
-	a# = beta#*a_b;
-	wd# = 2a# / a_w;
-	set_char_box(0, wd#, ht#/2, ht#/2);
-	black_notehead_width# := wd#;
-
-	save rh_width, rh_height, rh_edge; % rhombus dimensions
-	rh_width#=0.7ht#; % ht*tan(35)
-	rh_height#=1.0ht#;
-	rh_edge#=0.61ht#; % (ht/2)/cos(35)
-
-	define_pixels(rh_width, rh_height, rh_edge);
-	pickup pencircle
-	  xscaled stafflinethickness
-	  yscaled rh_edge rotated +35;
-	z1=(0.5rh_width,-0.25rh_height);
-	z2=(1.0rh_width,+0.25rh_height);
-	z3=(2.0rh_width,-0.50rh_height);
-	draw z1 -- z2 -- z3;
-fet_endchar;
-
-
-%%%%%%%%
-%
-% Medicaea style
-%
-
-% stem up
-fet_beginchar("Custos Med.", "medicaea", "medicaea")
-	save b_h, a_w;
-	a_b := 1.54; % b_h*a_b/a_w = wd/ht
-	b_h := 0.85;
-	a_w := 1.09;
-
-	save a, beta, ht, wd;
-	ht# = noteheight# * mag;
-	2beta# = ht# * b_h;
-	a# = beta# * a_b;
-	wd# = 0.4a# / a_w;
-	set_char_box(0, wd#, ht#/2, ht#/2); % width intentionally too small
-	black_notehead_width# := wd#;
-
-	define_pixels(ht, wd);
-	pickup pencircle scaled stafflinethickness;
-
-	z1 = (0.0wd, +0.0ht);
-	z2 = (1.0wd + 0.5stafflinethickness, +0.0ht);
-	penpos1(1.0ht, 90);
-	penpos2(1.0ht, 90);
-	penstroke z1e{z2 - z1} .. {right}z2e;
-
-	z3=(1.0wd, +0.0ht);
-	z4=(1.0wd, +1.0ht);
-	draw z3 -- z4;
-fet_endchar;
-
-
-% stem down
-fet_beginchar("Reverse Custos Med.", "rmedicaea", "rmedicaea")
-	save b_h, a_w;
-	a_b := 1.54; % b_h*a_b/a_w = wd/ht
-	b_h := 0.85;
-	a_w := 1.09;
-
-	save a, beta, ht, wd;
-	ht# = noteheight# * mag;
-	2beta# = ht# * b_h;
-	a# = beta# * a_b;
-	wd# = 0.4a# / a_w;
-	set_char_box(0, wd#, ht#/2, ht#/2); % width intentionally too small
-	black_notehead_width# := wd#;
-
-	define_pixels(ht, wd);
-	pickup pencircle scaled stafflinethickness;
-
-	z1 = (0.0wd, +0.0ht);
-	z2 = (1.0wd + 0.5stafflinethickness, -0.0ht);
-	penpos1(1.0ht, 90);
-	penpos2(1.0ht, 90);
-	penstroke z1e{z2 - z1} .. {right}z2e;
-
-	z3=(1.0wd, -0.0ht);
-	z4=(1.0wd, -1.0ht);
-	draw z3 -- z4;
-fet_endchar;
-
-
-%%%%%%%%
-%
-% Editio Vaticana style
-%
-
-% stem up
-fet_beginchar("Custos Ed. Vat.", "vaticana", "vaticana")
-	save b_h, a_w;
-	a_b := 1.54; % b_h*a_b/a_w = wd/ht
-	b_h := 0.85;
-	a_w := 1.09;
-
-	save a, beta, ht, wd;
-	ht# = noteheight# * mag;
-	2beta# = ht# * b_h;
-	a# = beta# * a_b;
-	wd# = 0.4a# / a_w;
-	set_char_box(0, wd#, ht#/2, ht#/2);
-	black_notehead_width# := wd#;
-
-	define_pixels(ht, wd);
-	pickup pencircle scaled stafflinethickness;
-
-	z1 = (0.0wd, +0.05ht);
-	z2 = (1.0wd + 0.5stafflinethickness, 0.0ht);
-	penpos1(0.5ht, 90);
-	penpos2(0.5ht, 90);
-	penstroke z1e{z2 - z1} .. {right}z2e;
-
-	z3=(1.0wd, +0.0ht);
-	z4=(1.0wd, +1.0ht);
-	draw z3 -- z4;
-fet_endchar;
-
-
-% stem down
-fet_beginchar("Reverse Custos Ed. Vat.", "rvaticana", "rvaticana")
-	save b_h, a_w;
-	a_b := 1.54; % b_h*a_b/a_w = wd/ht
-	b_h := 0.85;
-	a_w := 1.09;
-
-	save a, beta, ht, wd;
-	ht# = noteheight# * mag;
-	2beta# = ht# * b_h;
-	a# = beta# * a_b;
-	wd# = 0.4a# / a_w;
-	set_char_box(0, wd#, ht#/2, ht#/2);
-	black_notehead_width# := wd#;
-
-	define_pixels(ht, wd);
-	pickup pencircle scaled stafflinethickness;
-
-	z1 = (0.0wd, -0.05ht);
-	z2 = (1.0wd + 0.5stafflinethickness, -0.0ht);
-	penpos1(0.5ht, 90);
-	penpos2(0.5ht, 90);
-	penstroke z1e{z2 - z1} .. {right}z2e;
-
-	z3=(1.0wd, -0.0ht);
-	z4=(1.0wd, -1.0ht);
-	draw z3 -- z4;
-fet_endchar;
-
-
-%%%%%%%%
-%
-% Mensural style
-%
-
-% stem up
-fet_beginchar("Custos Mensural", "mensural", "mensural")
-	save b_h,a_w;
-	a_b:=1.54; % b_h*a_b/a_w = wd/ht
-	b_h:=0.85;
-	a_w:=1.09;
-
-	save a, beta, ht, wd;
-	ht# =noteheight#;
-	2beta#=ht#*b_h;
-	a# = beta#*a_b;
-	wd# = 2a# / a_w;
-	set_char_box(0, wd#, ht#/2, ht#/2); % width intentionally too small
-	black_notehead_width# := wd#;
-
-	define_pixels(ht, wd);
-	pickup pencircle xscaled stafflinethickness yscaled 0.4ht rotated -35;
-	z1=(0.0wd,-0.2ht);
-	z2=(0.2wd,+0.2ht);
-	z3=(0.4wd,-0.2ht);
-	z4=(0.6wd,+0.2ht);
-	z5=(0.8wd,-0.2ht);
-	z6=(1.6wd,+1.4ht);
-	draw z1 -- z2 -- z3 -- z4 -- z5 -- z6;
-fet_endchar;
-
-% stem down
-fet_beginchar("Reverse Custos Mensural", "rmensural", "rmensural")
-	save b_h,a_w;
-	a_b:=1.54; % b_h*a_b/a_w = wd/ht
-	b_h:=0.85;
-	a_w:=1.09;
-
-	save a, beta, ht, wd;
-	ht# =noteheight#;
-	2beta#=ht#*b_h;
-	a# = beta#*a_b;
-	wd# = 2a# / a_w;
-	set_char_box(0, wd#, ht#/2, ht#/2); % width intentionally too small
-	black_notehead_width# := wd#;
-
-	define_pixels(ht, wd);
-	pickup pencircle xscaled stafflinethickness yscaled 0.4ht rotated +35;
-	z1=(0.0wd,+0.2ht);
-	z2=(0.2wd,-0.2ht);
-	z3=(0.4wd,+0.2ht);
-	z4=(0.6wd,-0.2ht);
-	z5=(0.8wd,+0.2ht);
-	z6=(1.6wd,-1.4ht);
-	draw z1 -- z2 -- z3 -- z4 -- z5 -- z6;
-fet_endchar;
-
-fet_endgroup("custodes");
-define_pixels(black_notehead_width);
-
diff -purN ../lilypond-1.5.28/mf/feta-eindelijk.mf ./mf/feta-eindelijk.mf
--- ../lilypond-1.5.28/mf/feta-eindelijk.mf	Wed Dec  5 18:54:29 2001
+++ ./mf/feta-eindelijk.mf	Fri Feb  1 19:20:59 2002
@@ -4,7 +4,7 @@
 %
 % source file of the Feta (not the Font-En-Tja) music font
 % 
-% (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 
 fet_begingroup("rests");
 
@@ -179,7 +179,7 @@ def rest_crook(expr a, w) =
 	balled_crook(a, w, ball_crook_balldiam, ball_crook_stem)
 enddef;
 
-fet_beginchar("8th rest","3","eighthrest");
+def draw_eighth_rest =
 %	draw_staff (-2, 2, 0.0);
 	save yshift, ballcorrection;
 	ballcorrection = 0.005 staff_space;
@@ -203,7 +203,11 @@ fet_beginchar("8th rest","3","eighthrest
 	rest_crook (z1,w-stem/6);
 	z2-z1=whatever*dir70;
 	y2= yshift + stem/2;
-	brush(z1,2/3stem,z2,stem);
+	brush(z1,2/3stem,z2,stem);	
+enddef;
+
+fet_beginchar("8th rest","3","eighthrest");
+	draw_eighth_rest;
 
 	fet_endchar;
 
@@ -343,8 +347,14 @@ fet_beginchar("128th rest","7","hundredt
 	
 	fet_endchar;
 
+fet_beginchar("Classical quarter rest","2classical","clasquartrest");
+	draw_eighth_rest;
+	currentpicture := currentpicture xscaled -1 shifted (w,0);
+	fet_endchar;
+
 endgroup;
 
+
 %%%%%%%%
 %
 %
@@ -394,153 +404,5 @@ fet_beginchar("Neo-mensural half rest", 
 	neomens_half_block_rest;
 fet_endchar;
 
-neomensrestsize# = .8staff_space#;
-
-fet_beginchar("Neo-mensural 4th rest","2neo_mensural","neomenssemiminimarest")
-	set_char_box(0,neomensrestsize#,0,neomensrestsize#);
-        pickup pencircle scaled 2 stafflinethickness;
-	lft x1 = 0;
-	bot y1 = 0;
-	lft x2 = 0;
-	top y2 = h;
-	rt x3 = w;
-	bot y3 = h/2;
-	draw z1 .. z2;
-	draw z2 .. z3;
-fet_endchar
-
-fet_beginchar("Neo-mensural 8th rest","3neo_mensural","neomensfusarest")
-	set_char_box(0,neomensrestsize#,0,neomensrestsize#);
-        pickup pencircle scaled 2 stafflinethickness;
-	rt x1 = w;
-	bot y1 = 0;
-	rt x2 = w;
-	top y2 = h;
-	lft x3 = 0;
-	bot y3 = h/2;
-	draw z1 .. z2;
-	draw z2 .. z3;
-fet_endchar
-
-fet_beginchar("Neo-mensural 16th rest","4neo_mensural","neomenssemifusarest")
-	set_char_box(0,neomensrestsize#,0,staff_space#);
-        pickup pencircle scaled 2 stafflinethickness;
-	rt x1 = w;
-	bot y1 = 0;
-	rt x2 = w;
-	top y2 = h;
-
-	draw z1 .. z2;
-
-        pickup pencircle scaled 2 stafflinethickness;
-	rt x3 = w;
-	top y3 = h;
-	lft x4 = 0;
-	bot y4 = h/2;
-	rt x5 = w;
-	top y5 = 5/8h;
-	lft x6 = 0;
-	bot y6 = h/8;
-
-	draw z3 .. z4;
-	draw z5 .. z6;
-fet_endchar
-
-pen_width# = 2/5 staff_space#;
-pen_height# = 0;
-pen_rotation = 30;
-slight_pen_rotation = 15;
-
-mens_block_rest_y# = 1/1 staff_space#;
-mens_half_block_rest_y# = 5/8 staff_space#;
-
-define_pixels(mens_block_rest_y, mens_half_block_rest_y,
-	      pen_width, pen_height);
-
-fet_beginchar("Mensural longa rest", "-2mensural", "menslongarest");
-	set_char_box(pen_width#/2, pen_width#/2,
-		     mens_block_rest_y#, mens_block_rest_y#);
-	pickup pencircle
-		xscaled pen_width
-		yscaled pen_height
-		rotated slight_pen_rotation;
-	draw (0, -mens_block_rest_y) -- (0, mens_block_rest_y);
-fet_endchar;
-
-fet_beginchar("Mensural breve rest", "-1mensural", "mensbreverest");
-	set_char_box(pen_width#/2, pen_width#/2,
-		     0, mens_block_rest_y#);
-	pickup pencircle
-		xscaled pen_width
-		yscaled pen_height
-		rotated slight_pen_rotation;
-	draw (0, 0) -- (0, mens_block_rest_y);
-fet_endchar;
-
-fet_beginchar("Mensural whole rest", "0mensural", "menssemibrevisrest");
-	set_char_box(pen_width#/2, pen_width#/2,
-		     mens_half_block_rest_y#, 0);
-	pickup pencircle
-		xscaled pen_width
-		yscaled pen_height
-		rotated slight_pen_rotation;
-	draw (0, 0) -- (0, -mens_half_block_rest_y);
-fet_endchar;
-
-fet_beginchar("Mensural half rest", "1mensural", "mensminimahalfrest");
-	set_char_box(pen_width#/2, pen_width#/2,
-		     0, mens_half_block_rest_y#);
-	pickup pencircle
-		xscaled pen_width
-		yscaled pen_height
-		rotated slight_pen_rotation;
-	draw (0, 0) -- (0, mens_half_block_rest_y);
-fet_endchar;
-
-mensrestsize# = .8staff_space#;
-
-fet_beginchar("Mensural 4th rest","2mensural","menssemiminimarest")
-	set_char_box(0,mensrestsize#,0,mensrestsize#);
-	pickup pencircle
-		xscaled pen_width
-		yscaled pen_height
-		rotated pen_rotation;
-	lft x1 =      0;     y1 = 0;
-	lft x2 =      0; top y2 = 5/8 h;
-	rt  x3 =  4/8 w; bot y3 = 6/8 h;
-	rt  x4 = 10/8 w; bot y4 = 4/8 h;
-	draw z1 -- z2 -- z3 -- z4;
-fet_endchar
-
-fet_beginchar("Mensural 8th rest","3mensural","mensfusarest")
-	set_char_box(0,mensrestsize#,0,mensrestsize#);
-	pickup pencircle
-		xscaled pen_width
-		yscaled pen_height
-		rotated pen_rotation;
-	rt  x1 = 10/8 w;     y1 = 0;
-	rt  x2 = 10/8 w; top y2 = 5/8 h;
-	lft x3 =  2/8 w; bot y3 = 6/8 h;
-	lft x4 =      0; bot y4 = 4/8 h;
-	draw z1 -- z2 -- z3 -- z4;
-fet_endchar
-
-fet_beginchar("Mensural 16th rest","4mensural","menssemifusarest")
-	set_char_box(0,mensrestsize#,0,staff_space#);
-	pickup pencircle
-		xscaled pen_width
-		yscaled pen_height
-		rotated pen_rotation;
-
-	rt  x1 = 10/8 w;     y1 = 0;
-	rt  x2 = 10/8 w; top y2 = 5.5/8 h;
-	lft x3 =  2/8 w; bot y3 = 6.5/8 h;
-	lft x4 =      0; bot y4 = 4.5/8 h;
-	rt  x5 = 10/8 w; top y5 = 2.5/8 h;
-	lft x6 =  2/8 w; bot y6 = 3.5/8 h;
-	lft x7 =      0; bot y7 = 1.5/8 h;
-	draw z1 -- z2 -- z3 -- z4;
-	draw z5 -- z6 -- z7;
-fet_endchar
 
 fet_endgroup("rests")
diff -purN ../lilypond-1.5.28/mf/feta-generic.mf ./mf/feta-generic.mf
--- ../lilypond-1.5.28/mf/feta-generic.mf	Wed Dec  5 18:54:29 2001
+++ ./mf/feta-generic.mf	Fri Feb  1 19:20:59 2002
@@ -5,7 +5,7 @@
 % source file of the Feta (defintively not an abbreviation for Font-En-Tja)
 % music font
 % 
-% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 
@@ -35,7 +35,7 @@ if test = 0: 
 	input feta-timesig;
 	input feta-pendaal;
 	input feta-accordion;
-	input feta-custodes;	
+
 else:
 %	input feta-bolletjes;	
 %	input feta-banier;
diff -purN ../lilypond-1.5.28/mf/feta-klef.mf ./mf/feta-klef.mf
--- ../lilypond-1.5.28/mf/feta-klef.mf	Wed Dec  5 18:54:30 2001
+++ ./mf/feta-klef.mf	Fri Feb  1 19:20:59 2002
@@ -4,9 +4,9 @@
 %
 % source file of the Feta (not the Font-En-Tja) music font
 % 
-% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
 % Jan Nieuwenhuizen <janneke@gnu.org>,
-% Juergen Reuter <reuterj@ira.uka.de>
+% Juergen Reuter <reuter@ipd.uka.de>
 
 
 fet_begingroup("clefs");
@@ -309,823 +309,11 @@ fet_beginchar("G clef", "G_change", "ctr
 	draw_gclef((1.3 staff_space#,0), .8);
 fet_endchar;
 
-%%%%%%%%
+%%%%
+% PERCUSSION
 %
 %
-%
-% Editio Vaticana
-%
-%
-%
-def draw_vaticana_do_clef(expr exact_center, reduction) = 
-	save reduced_il;
-
-	reduced_il# = staff_space# * reduction;
-	
-	set_char_box(0.4reduced_il#, 0.4reduced_il#, 0, reduced_il#);
-
-	define_pixels(reduced_il);
-
-	pickup pencircle xscaled stafflinethickness yscaled 0.6reduced_il;
-
-	save za, zb, zc, zd, ze, zf;
-	pair za, zb, zc, zd, ze, zf;
-
-	za = exact_center + (-0.0reduced_il, -.45reduced_il);
-	zb = exact_center + (-0.2reduced_il, -.50reduced_il);
-	zc = exact_center + (-0.4reduced_il, -.25reduced_il);
-	zd = exact_center + (-0.4reduced_il, +.25reduced_il);
-	ze = exact_center + (-0.2reduced_il, +.50reduced_il);
-	zf = exact_center + (-0.0reduced_il, +.45reduced_il);
-	draw za .. zb .. zc --	% lower punctum
-	     zd .. ze .. zf;	% upper punctum
-enddef;
-
-
-fet_beginchar("Ed. Vat. do clef", "vaticana_do", "vatdoclef")
-	if test = 1:
-		draw_staff(-1,3, 0.0);
-	fi;
-	draw_vaticana_do_clef((0,0), 1.0);
-fet_endchar;
-fet_beginchar("Ed. Vat. do clef", "vaticana_do_change", "vatcdoclef")
-	draw_vaticana_do_clef((0,0), 1.0); % no reduction
-fet_endchar;
-
-
-def draw_vaticana_fa_clef(expr exact_center, reduction) = 
-
-	save reduced_il, z;
-	reduced_il# = staff_space# * reduction;
-	define_pixels(reduced_il);
-
-	save za, zb, zc, zd, ze;
-	pair za, zb, zc, zd, ze;
-
-	%stem
-	pickup pencircle scaled stafflinethickness;
-	xpart za = xpart zb =
-		xpart exact_center + 0.4reduced_il;
-	ypart za = ypart exact_center = ypart zb + 1.5reduced_il;
-	draw za .. zb;
-
-	%left-handed punctum
-	pickup pencircle xscaled stafflinethickness yscaled 0.5reduced_il;
-	zc = exact_center +
-		(+0.4reduced_il, -0.05reduced_il);
-	zd = exact_center +
-		(+0.2reduced_il, +0.05reduced_il);
-	ze = exact_center +
-		(+0.0reduced_il, +0.00reduced_il);
-	draw zc .. zd .. ze;
-
-	%right-handed puncta as in do clef
-	draw_vaticana_do_clef(
-		exact_center +
-		(+0.8reduced_il + 1.25stafflinethickness, 0),
-		reduction);
-
-	set_char_box(0.5reduced_il#, 1.5reduced_il#, 0, reduced_il#);
-enddef;
-
-
-fet_beginchar("Ed. Vat. fa clef", "vaticana_fa", "vatfaclef")
-	if test = 1:
-		draw_staff(-1,3, 0.0);
-	fi;
-	draw_vaticana_fa_clef((0,0), 1.0);
-fet_endchar;
-fet_beginchar("Ed. Vat. fa clef", "vaticana_fa_change", "vatcfaclef")
-	draw_vaticana_fa_clef((0,0), 1.0); % no reduction
-fet_endchar;
-
-%%%%%%%%
-%
-%
-%
-% Editio Medicaea
-%
-%
-%
-def draw_medicaea_do_clef(expr exact_center, reduction) = 
-	save reduced_il, reduced_slt;
-	reduced_il# = staff_space# * reduction;
-	reduced_slt# = stafflinethickness# * reduction;
-	define_pixels(reduced_il);
-	define_pixels(reduced_slt);
-
-	save flag_height;
-	flag_height# = 0.5 reduced_il#;
-	define_pixels(flag_height);
-
-	%lower flag
-	save za, zb;
-	pair za, zb;
-	pickup pencircle xscaled reduced_slt yscaled flag_height;
-	xpart exact_center
-		= xpart za + 0.5 reduced_il
-		= xpart zb - 0.5 reduced_il;
-	ypart za = ypart exact_center - 0.5 flag_height
-			- 0.5 (staff_space - reduced_il);
-	ypart zb = ypart za - reduced_il + flag_height;
-	draw za .. zb;
-
-	%upper flag
-	save za, zb;
-	pair za, zb;
-	pickup pencircle xscaled reduced_slt yscaled flag_height;
-	xpart exact_center
-		= xpart za + 0.5 reduced_il
-		= xpart zb - 0.5 reduced_il;
-	ypart za = ypart exact_center - 0.5 flag_height
-			- 0.5 (staff_space - reduced_il)
-			+ staff_space;
-	ypart zb = ypart za - reduced_il + flag_height;
-	draw za .. zb;
-
-	%stem
-	save za, zb;
-	pair za, zb;
-	pickup pencircle scaled reduced_slt;
-	xpart za = xpart zb = xpart exact_center - 0.5 reduced_il;
-	ypart exact_center
-		= ypart za + 1.5 reduced_il
-		= ypart zb - 1.5 reduced_il;
-	draw za .. zb;
-
-	set_char_box(0.5reduced_il#, 1.5reduced_il#,
-		     1.5reduced_il#, 1.5reduced_il#);
-enddef;
-
-
-fet_beginchar("Ed. Med. do clef", "medicaea_do", "meddoclef")
-	if test = 1:
-		draw_staff(-1,3, 0.0);
-	fi;
-	draw_medicaea_do_clef((0,0), 1.0);
-fet_endchar;
-fet_beginchar("Ed. Med. do clef", "medicaea_do_change", "cmeddoclef")
-	draw_medicaea_do_clef((0,0), .8);
-fet_endchar;
-
-
-def draw_medicaea_fa_clef(expr exact_center, reduction) = 
-	% inspired by Regensburger Edition of Medicaea (1885/86), in:
-	% MGG, volume 2, col. 1327 ("Choralreform"), fig. 2.
-
-	save reduced_il, reduced_slt;
-	reduced_il# = staff_space# * reduction;
-	reduced_slt# = stafflinethickness# * reduction;
-	define_pixels(reduced_il);
-	define_pixels(reduced_slt);
-
-	save za, zb, zc, zd, ze;
-	pair za, zb, zc, zd, ze;
-
-	%stem
-	pickup pencircle scaled stafflinethickness;
-	xpart za = xpart zb =
-		xpart exact_center + 0.4reduced_il;
-	ypart za = ypart exact_center = ypart zb + 1.5reduced_il;
-	draw za -- zb;
-
-	%left-handed punctum
-	pickup pencircle xscaled reduced_slt yscaled reduced_il;
-	zc = exact_center +
-		(+0.4reduced_il, 0);
-	zd = exact_center +
-		(+0.0reduced_il, 0);
-	draw zc -- zd;
-
-	%right-handed puncta as in do clef
-	draw_medicaea_do_clef(
-		exact_center +
-		(+1.1reduced_il + 1.25stafflinethickness, 0),
-		reduction);
-
-	set_char_box(reduced_il#/2, 2.6reduced_il#, 0, reduced_il#);
-enddef;
-
-
-fet_beginchar("Ed. Med. fa clef", "medicaea_fa", "medfaclef")
-	if test = 1:
-		draw_staff(-1,3, 0.0);
-	fi;
-	draw_medicaea_fa_clef((0,0), 1.0);
-fet_endchar;
-fet_beginchar("Ed. Med. fa clef", "medicaea_fa_change", "cmedfaclef")
-	draw_medicaea_fa_clef((0,0), .8);
-fet_endchar;
-
-
-%%%%%%%%
-%
-%
-%
-% Mensural Notation
-%
-%
-%
-brevis_wid# := 2 staff_space#;
-
-def draw_brevis(expr exact_center, reduction, small_width, small_height) =
-	%
-	% inspired by function draw_brevis of
-	% feta-bolletjes.mf
-	%
-	save reduced_slt, reduced_nht;
-	save stem_width, head_width;
-	save serif_size, serif_protrude;
-	save holeheight, beamheight;
-
-	reduced_slt# = stafflinethickness# * reduction;
-	reduced_nht# = noteheight# * reduction;
-	stem_width# = 1.4 reduced_slt#;
-	if small_width:
-		head_width# = 0.5brevis_wid# * reduction;
-	else:
-		head_width# = brevis_wid# * reduction;
-	fi;
-	if small_height:
-		serif_size# = 0.64 reduced_slt#;
-		serif_protrude# = 0.96 serif_size#;
-		holeheight# = 3 reduced_slt#;
-		beamheight# = 0.32(reduced_nht# - holeheight#);
-	else:
-		serif_size# = 1.0 reduced_slt#;
-		serif_protrude# = 1.5 serif_size#;
-		holeheight# = 3 reduced_slt#;
-		beamheight# = 0.5(reduced_nht# - holeheight#);
-	fi;
-	define_pixels(reduced_slt);
-	define_pixels(stem_width);
-	define_pixels(head_width);
-	define_pixels(serif_size);
-	define_pixels(serif_protrude);
-	define_pixels(beamheight);
-
-	penpos1(stem_width, 0);
-	penpos2(stem_width, 0);
-	penpos3(beamheight, 90);
-	penpos4(beamheight, 90);
-	penpos5(stem_width, 180);
-
-	z1l = exact_center;
-	z2l = z1l + (0, -reduced_slt/2);
-	z3r = z2r + serif_size*(1,-1);
-	y4r = y3r;
-	x4l = x1l + head_width/2;
-	z5l = z3l + (-serif_size, -serif_protrude);
-
-	penlabels(1,2,3,4,5);
-	fill z1r -- z1l -- z5r{down} .. z5l{up} .. z3l{right}
-		-- z4l -- z4r -- z3r{left} .. z2r{up} -- cycle;
-enddef;
-
-
-def draw_neo_mensural_c_clef(expr exact_center, reduction) = 
-	draw_brevis(exact_center, reduction, false, false);
-
-	save reduced_il, reduced_slt;
-	save stem_width;
-
-	reduced_il# = staff_space# * reduction;
-	reduced_slt# = stafflinethickness# * reduction;
-	stem_width# = 1.4 reduced_slt#;
-
-	define_pixels(reduced_il);
-	define_pixels(reduced_slt);
-	define_pixels(stem_width);
-
-	penpos6(stem_width, 0);
-	penpos7(stem_width, 0);
-	z6l = exact_center;
-	z7l = z6l + (0, -2reduced_il);
-	fill z6l -- z7l -- z7r -- z6r -- cycle;
-	penpos8(stem_width, 0);
-	penpos9(stem_width, 0);
-	z8l = z6l + (-3reduced_slt, 0);
-	z9l = z8l + (0, -2reduced_il);
-	fill z8l -- z9l -- z9r -- z8r -- cycle;
-
-	addto currentpicture also currentpicture
-		yscaled -1 shifted (0, 2*(ypart exact_center));
-	addto currentpicture also currentpicture 
-		xscaled -1 shifted (2x4l,0);
-
-	set_char_box(0, 2head_width#,
-		     6reduced_slt#*reduction, 6reduced_slt#*reduction);
-enddef;
-
-
-fet_beginchar("neo-mensural c clef", "neo_mensural_c", "neomenscclef")
-	if test = 1:
-		draw_staff(-1,3, 0.0);
-	fi;
-	draw_neo_mensural_c_clef((0,0), 1.0);
-fet_endchar;
-fet_beginchar("neo-mensural c clef", "neo_mensural_c_change", "cneomenscclef")
-	draw_neo_mensural_c_clef((1.3 staff_space#,0), .8);
-fet_endchar;
-
-
-def draw_petrucci_c_clef(expr exact_center, reduction) = 
-	% inspired by Josquin Desprez, "Stabat Mater", Libro tertio,
-	% 1519, printed by Petrucci, in: MGG, volume 7, Table 11.
-	draw_brevis(exact_center, reduction, true, true);
-
-	save reduced_il, reduced_slt;
-	save stem_width, interline;
-
-	reduced_il# = staff_space# * reduction;
-	reduced_slt# = stafflinethickness# * reduction;
-	stem_width# = 1.4 reduced_slt#;
-	interline# = staff_space#;
-
-	define_pixels(reduced_il);
-	define_pixels(reduced_slt);
-	define_pixels(stem_width);
-	define_pixels(interline);
-
-	addto currentpicture also currentpicture
-		yscaled -1 shifted (0, 2*(ypart exact_center) - interline);
-
-	penpos6(stem_width, 0);
-	penpos7(stem_width, 0);
-	z6l = exact_center + (0, 0);
-	z7l = z6l + (0, -2.2reduced_il);
-	fill z6l -- z7l -- z7r -- z6r -- cycle;
-
-	addto currentpicture also currentpicture 
-		xscaled -1 shifted (2x4l,0);
-
-	penpos8(stem_width, 0);
-	penpos9(stem_width, 0);
-	z8l = exact_center + (0, 0);
-	z9l = z8l + (0, -3.2reduced_il);
-	fill z8l -- z9l -- z9r -- z8r -- cycle;
-
-	addto currentpicture also currentpicture
-		yscaled -1 shifted (0, 4*(ypart exact_center));
-
-	set_char_box(0, 2head_width#,
-		     noteheight#*4*reduction, noteheight#*4*reduction);
-enddef;
-
-
-fet_beginchar("petrucci c clef", "petrucci_c", "petruccicclef")
-	if test = 1:
-		draw_staff(-1,3, 0.0);
-	fi;
-	draw_petrucci_c_clef((0,0), 1.0);
-fet_endchar;
-fet_beginchar("petrucci c clef", "petrucci_c_change", "cpetruccicclef")
-	draw_petrucci_c_clef((1.3 staff_space#,0), .8);
-fet_endchar;
-
-
-def draw_mensural_c_clef(expr exact_center, reduction) =
-	% inspired by Ockeghem, "Missa Prolationum", in: MGG, volume
-	% 9, table 94.
-	draw_petrucci_c_clef(exact_center, reduction);
-
-	addto currentpicture also currentpicture
-		shifted (0, -interline);
-
-	set_char_box(0, 2head_width#,
-		     noteheight#*6*reduction, noteheight#*6*reduction);
-enddef;
-
-
-fet_beginchar("mensural c clef", "mensural_c", "menscclef")
-	if test = 1:
-		draw_staff(-1,3, 0.0);
-	fi;
-	draw_mensural_c_clef((0,0), 1.0);
-fet_endchar;
-fet_beginchar("mensural c clef", "mensural_c_change", "cmenscclef")
-	draw_mensural_c_clef((0,0), .8);
-fet_endchar;
-
-def draw_diamond(expr exact_center, reduction) =
-	save stem_width, reduced_il, reduced_nht, holeheight, beamheight;
-	save rh_height, rh_width;
-
-	stem_width# = 1.4 reduced_slt#;
-	reduced_il# = staff_space# * reduction;
-	reduced_nht# = noteheight# * reduction;
-	holeheight# = 3 reduced_slt#;
-	beamheight# = 0.4(reduced_nht# - holeheight#);
-
-	rh_height# = 1.2reduced_il#;
-	rh_width# / rh_height# = 0.58; % tan(30)
-
-	define_pixels(beamheight);
-	define_pixels(stem_width);
-	define_pixels(rh_height);
-	define_pixels(rh_width);
-
-	pickup pencircle
-		xscaled beamheight
-		yscaled stem_width
-		rotated 45;
-
-	draw
-		exact_center + (-rh_width/2, 0) --
-		exact_center + (0, rh_height/2) --
-		exact_center + (+rh_width/2, 0) --
-		exact_center + (0, -rh_height/2) --
-		cycle;
-enddef;
-
-def draw_petrucci_f_clef(expr exact_center, reduction) =
-	% inspired by L'homme arme super voces musicales in Misse
-	% Josquin, 1502, Petrucci, in: MGG, volume 7, col. 200; also
-	% inspired by Gaspar van Weerbeke, "Virgo Maria" (1502), in:
-	% MGG, volume 9, col. 653 ("Motette"), fig. 3.; also by Andr'e
-	% Campra, "Entr'ee des s'er'enades" (1710), in: MGG, volume 2,
-	% col. 1649 ("Contredanse"), fig. 2.
-	%
-	draw_brevis(exact_center, reduction, true, false);
-
-	save reduced_il, reduced_slt;
-	save stem_width, interline;
-
-	reduced_il# = staff_space# * reduction;
-	reduced_slt# = stafflinethickness# * reduction;
-	stem_width# = 1.4 reduced_slt#;
-	interline# = staff_space#;
-
-	define_pixels(reduced_il);
-	define_pixels(reduced_slt);
-	define_pixels(stem_width);
-	define_pixels(interline);
-
-	addto currentpicture also currentpicture
-		yscaled -1 shifted (0, 2*(ypart exact_center));
-	addto currentpicture also currentpicture 
-		xscaled -1 shifted (2x4l,0);
-
-	penpos6(stem_width, 0);
-	penpos7(stem_width, 0);
-	z6r = exact_center + (2x4l, 0);
-	z7r = z6r + (0, -4reduced_il);
-	fill z6l -- z7l -- z7r -- z6r -- cycle;
-
-	draw_diamond(exact_center +
-		     (1.6interline*reduction, interline/2), reduction);
-
-	% upper stem
-	penpos8(stem_width, 0);
-	penpos9(stem_width, 0);
-	z8l = exact_center + (1.6interline*reduction, interline*reduction);
-	z9l = z8l + (0, 1.5interline*reduction);
-	fill z8l -- z9l -- z9r -- z8r -- cycle;
-
-	draw_diamond(exact_center +
-		     (1.6interline*reduction, -interline/2), reduction);
-	penpos10(stem_width, 0);
-	penpos11(stem_width, 0);
-	z10r = exact_center + (1.6interline*reduction, -interline*reduction);
-	z11r = z10r + (0, -3.5interline*reduction);
-	fill z10l -- z11l -- z11r -- z10r -- cycle;
-
-	set_char_box(0, 3head_width#,
-		     3.5noteheight#*reduction, 1.5noteheight#*reduction);
-enddef;
-
-
-fet_beginchar("petrucci f clef", "petrucci_f", "petruccifclef")
-	if test = 1:
-		draw_staff(-1,3, 0.0);
-	fi;
-	draw_petrucci_f_clef((0,0), 1.0);
-fet_endchar;
-fet_beginchar("petrucci f clef", "petrucci_f_change", "cpetruccifclef")
-	draw_petrucci_f_clef((0,0), .8);
-fet_endchar;
-
-
-def draw_mensural_f_clef(expr exact_center, reduction) =
-	%
-	% inspired by Philippe le Duc, "Dite Signori" (1590), in: MGG,
-	% volume 3, col. 848 ("Duc"); also by John Dowland, "The First
-	% Booke of Songes" (1597), in: MGG, volume 3, col. 721
-	% ("Dowland"), fig. 3.
-
-	save reduced_slt, stem_width, reduced_nht, holeheight, beamheight;
-
-	reduced_slt# = stafflinethickness# * reduction;
-	stem_width# = 1.4 reduced_slt#;
-	reduced_nht# = noteheight# * reduction;
-	holeheight# = 3 reduced_slt#;
-	beamheight# = 0.4(reduced_nht# - holeheight#);
-
-	define_pixels(beamheight, stem_width, staff_space);
-
-	pickup pencircle
-		xscaled beamheight
-		yscaled stem_width
-		rotated 45;
-
-	draw
-		exact_center + (1.0 staff_space, 0.6 staff_space) --
-		exact_center + (1.25 staff_space, 0.4 staff_space);
-
-	draw
-		exact_center + (1.0 staff_space, -0.4 staff_space) --
-		exact_center + (1.25 staff_space, -0.6 staff_space);
-
-	draw	halfcircle scaled 1.2 staff_space rotated -90
-		shifted (-exact_center + (+0.1 staff_space, 0));
-
-	set_char_box(0, 3staff_space#, 3staff_space#, 0);
-enddef;
-
-fet_beginchar("mensural f clef", "mensural_f", "mensfclef")
-	if test = 1:
-		draw_staff(-1,3, 0.0);
-	fi;
-	draw_mensural_f_clef((0,0), 1.0);
-fet_endchar;
-fet_beginchar("mensural f clef", "mensural_f_change", "cmensfclef")
-	draw_mensural_f_clef((0,0), .8);
-fet_endchar;
-
-
-def draw_mensural_g_clef(expr exact_center, reduction) =
-	%
-	% inspired by Francisco Guerrero, "Lib. 1.  Missarum" (1566),
-	% in: MGG, volume 3, col. 858 ("Ducis"); also by Stefano
-	% Fabri, "Quam speciosa veteranis" (1611), in: MGG, volume 3,
-	% col. 1698 ("Fabri"); also by Philippus Dulichius,
-	% "Fasciculus novus ..." (1598), in: MGG, volume 3, col. 919
-	% ("Dulichius"), fig. 1; also by Noe Faignient, "Ic sal de
-	% Heer myn God gebenedye" (1568), in: MGG, volume 3, col. 1735
-	% ("Faignient").
-	%
-	% Metafont code partially inspired by Schwabacher 'G' of yswab
-	% font.
-
-	save reduced_il, stem_width, height, width, apex_o, hair;
-
-	reduced_il#=staff_space#*reduction;
-
-	set_char_box(0.5reduced_il#, 1.5reduced_il#,
-		     1.5reduced_il#, 1.5reduced_il#);
-
-	stem_width# = 0.17 reduced_il#;
-	height# = 1.5 reduced_il#;
-	width# = 1.13 reduced_il#;
-	apex_o# = 0.02 reduced_il#;
-	hair# =  3 stafflinethickness#;
-	define_pixels(reduced_il, stem_width, height, width, apex_o, hair);
-
-	penpos1(2 stem_width, -142);
-	z1l = (0.715 width, 0.742 height);
-	penpos1'(hair, -90);
-	z1'l = z1r;
-	penpos2(1.179 stem_width, -142);
-	z2l = (width, 0.466 height);
-	penpos3(hair, 77);
-	z3 = (0.764 width, 0.067 height); 
-	z4 = (0.59 width, -apex_o);
-	penpos5(1.179 stem_width, 32);
-	z5l=(0, 0.457 height);
-	penpos6(hair, -56.5);
-	z7 = (x4 - 0.843 stem_width, height + apex_o);
-	z7 - z6l = whatever * dir33.5;
-	penpos8(1.286 stem_width, -130);
-	z8r = (0.715 width, 0.742 height) + (-apex_o, apex_o);
-	z6r - z8r = whatever * (z7 - z8l);
-	filldraw
-		z1'r{dir45} .. z2r{down} .. z3r{dir207} .. z5r{up} ..
-		z6r{z7-z6l} & z6r -- z8r -- z8l -- z7 --- z6l ...
-		z5l{down} .. z4{right} .. z3l{dir27} .. z2l{up} ..
-		z1l{1/3[z6l,z7]-z1l} & z1l -- z1r -- z1'r & cycle
-		shifted (-exact_center + (0, -0.75reduced_il));
-
-	penpos9(stem_width, 0);
-	x9r = x4; y9 = 0.3 height;
-
-	pickup pencircle
-		scaled stem_width
-		rotated 45;
-	draw	z9 -- (z9 + (0, -0.4reduced_il))
-		shifted (-exact_center + (0, -0.75reduced_il));
-
-	pickup pencircle
-		xscaled stem_width
-		yscaled hair
-		rotated 30;
-
-	draw halfcircle
-		scaled 0.5 reduced_il
-		rotated -90
-		shifted z8
-		shifted (0, 0.25reduced_il)
-		shifted (-exact_center + (0, -0.75reduced_il));
-
-	draw halfcircle
-		scaled 0.4 reduced_il
-		rotated 90
-		shifted (z8 + (0, 0.45 reduced_il))
-		shifted (0, 0.25reduced_il)
-		shifted (-exact_center + (0, -0.75reduced_il));
-enddef;
-
-
-fet_beginchar("mensural g clef", "mensural_g", "mensgclef")
-	if test = 1:
-		draw_staff(-1,3, 0.0);
-	fi;
-	draw_mensural_g_clef((0,0), 1.0);
-fet_endchar;
-fet_beginchar("mensural g clef", "mensural_g_change", "cmensgclef")
-	draw_mensural_g_clef((0,0), .8);
-fet_endchar;
-
-
-
-def draw_petrucci_g_clef(expr exact_center, reduction) =
-	% inspired by Josquin Desprez, "Stabat Mater", Libro tertio,
-	% 1519, printed by Petrucci, in: MGG, volume 7, Table 11.
-
-	set_char_box(0.6 staff_space#, 0.8 staff_space#, 0.6 staff_space#, 
-	  4.0 staff_space#);
-
-	save reduced_il, reduced_slt;
-
-	reduced_il# = staff_space# * reduction;
-	reduced_slt# = stafflinethickness# * reduction;
-	define_pixels(reduced_il, reduced_slt);
-
-	save za, zb, zc, zd, ze, zf, zg, zh, zi, zj;
-	pair za, zb, zc, zd, ze, zf, zg, zh, zi, zj;
-
-	pickup pencircle
-		xscaled 0.50 reduced_slt
-		yscaled 0.22 reduced_il
-		rotated -35;
-
-	za = exact_center + (+0.00 reduced_il, +0.00 reduced_il);
-	zb = exact_center + (+0.20 reduced_il, +1.20 reduced_il);
-	zc = exact_center + (-0.10 reduced_il, +2.00 reduced_il);
-	zd = exact_center + (-0.50 reduced_il, +3.00 reduced_il);
-	ze = exact_center + (+0.00 reduced_il, +3.70 reduced_il);
-	zf = exact_center + (+0.20 reduced_il, +3.00 reduced_il);
-	zg = exact_center + (-0.20 reduced_il, +2.00 reduced_il);
-	zh = exact_center + (-0.50 reduced_il, +1.70 reduced_il);
-	zi = exact_center + (-0.80 reduced_il, +0.75 reduced_il);
-	zj = exact_center + (-0.60 reduced_il, +0.60 reduced_il);
-
-	draw za{-1,2} .. zb .. zc .. zd .. ze .. zf .. zg .. zh .. zi .. zj;
-
-	save za, zb, zc, zd, ze, zf;
-	pair za, zb, zc, zd, ze, zf;
-
-	pickup pencircle
-		xscaled 0.75 reduced_slt
-		yscaled 0.33 reduced_il
-		rotated -35;
-
-	za = exact_center + (+0.25 reduced_il, +0.45 reduced_il);
-	zb = exact_center + (-0.25 reduced_il, +0.45 reduced_il);
-	zc = exact_center + (-0.25 reduced_il, -0.45 reduced_il);
-	zd = exact_center + (+0.25 reduced_il, -0.45 reduced_il);
-	ze = exact_center + (+0.30 reduced_il, +0.00 reduced_il);
-	zf = exact_center + (+0.00 reduced_il, +0.00 reduced_il);
-
-	draw za .. zb .. zc .. zd .. {up}ze -- zf;
-enddef;
-
-
-fet_beginchar("petrucci g clef", "petrucci_g", "petruccigclef")
-	if test = 1:
-		draw_staff(-1,3, 0.0);
-	fi;
-	draw_petrucci_g_clef((0,0), 1.0);
-fet_endchar;
-fet_beginchar("petrucci g clef", "petrucci_g_change", "cpetruccigclef")
-	draw_petrucci_g_clef((0,0), .8);
-fet_endchar;
-
-
-
-%%%%%%%%
-%
-%
-%
-% Hufnagel
-%
-%
-%
-def draw_hufnagel_do_clef(expr exact_center, reduction) =
-	%
-	% inspired by Graduale of Friedrich Zollner (1442), in: MGG,
-	% volume 9, col. 1413 ("Neustift"), fig. 1.
-	%
-	save reduced_il;
-
-	reduced_il# = staff_space# * reduction;
 
-	define_pixels(reduced_il);
-
-	pickup pencircle
-		xscaled (0.60reduced_il)
-		yscaled (0.10reduced_il)
-		rotated 40;
-	save za, zb, zc, zd, ze, zf;
-	pair za, zb, zc, zd, ze, zf;
-
-	za = exact_center + (+0.30reduced_il, +.45reduced_il);
-	zb = exact_center + (+0.20reduced_il, +.45reduced_il);
-	zc = exact_center + (-0.10reduced_il, +.60reduced_il);
-	zd = exact_center + (-0.40reduced_il, +.45reduced_il);
-	ze = exact_center + (-0.40reduced_il, -.45reduced_il);
-	zf = exact_center + (-0.20reduced_il, -.55reduced_il);
-	draw za .. zb .. zc -- zd -- ze -- zf;
-
-	set_char_box(0.5reduced_il#, 0.5reduced_il#, 0, reduced_il#);
-enddef;
-
-
-fet_beginchar("Hufnagel do clef", "hufnagel_do", "hufnageldoclef")
-	if test = 1:
-		draw_staff(-1,3, 0.0);
-	fi;
-	draw_hufnagel_do_clef((0,0), 1.0);
-fet_endchar;
-fet_beginchar("Hufnagel do clef", "hufnagel_do_change", "chufnageldoclef")
-	draw_hufnagel_do_clef((1.3 staff_space#,0), .8);
-fet_endchar;
-
-
-def draw_hufnagel_fa_clef(expr exact_center, reduction) =
-	%
-	% inspired by Bamberger Manuscript (15th century), in:
-	% MGG, volume 2, table 59.
-	%
-	save reduced_il;
-
-	reduced_il# = staff_space# * reduction;
-
-	define_pixels(reduced_il);
-
-	pickup pencircle
-		xscaled (0.60reduced_il)
-		yscaled (0.10reduced_il)
-		rotated 40;
-	save za, zb, zc, zd, ze, zf;
-	pair za, zb, zc, zd, ze, zf;
-
-	za = exact_center + (+0.30reduced_il, +0.70reduced_il);
-	zb = exact_center + (+0.20reduced_il, +0.70reduced_il);
-	zc = exact_center + (-0.10reduced_il, +0.85reduced_il);
-	zd = exact_center + (-0.40reduced_il, +0.70reduced_il);
-	ze = exact_center + (-0.40reduced_il, -1.10reduced_il);
-	draw za .. zb .. zc -- zd -- ze;
-
-	save zg, zh, zi, zj;
-	pair zg, zh, zi, zj;
-
-	zg = exact_center + (+0.30reduced_il, -0.05reduced_il);
-	zh = exact_center + (+0.20reduced_il, -0.05reduced_il);
-	zi = exact_center + (-0.10reduced_il, +0.10reduced_il);
-	zj = exact_center + (-0.40reduced_il, -0.05reduced_il);
-	draw zg .. zh .. zi -- zj;
-
-	set_char_box(0.5reduced_il#, 0.5reduced_il#, 0, reduced_il#);
-enddef;
-
-
-fet_beginchar("Hufnagel fa clef", "hufnagel_fa", "hufnagelfaclef")
-	if test = 1:
-		draw_staff(-1,3, 0.0);
-	fi;
-	draw_hufnagel_fa_clef((0,0), 1.0);
-fet_endchar;
-fet_beginchar("Hufnagel fa clef", "hufnagel_fa_change", "chufnagelfaclef")
-	draw_hufnagel_fa_clef((0,0), .8);
-fet_endchar;
-
-
-def draw_hufnagel_do_fa_clef(expr exact_center, reduction) =
-	draw_hufnagel_do_clef(exact_center, reduction);
-	draw_hufnagel_fa_clef(exact_center + (0, -2staff_space), reduction);
-enddef;
-
-
-fet_beginchar("Hufnagel do/fa clef", "hufnagel_do_fa", "hufnageldofaclef")
-	if test = 1:
-		draw_staff(-1,3, 0.0);
-	fi;
-	draw_hufnagel_do_fa_clef((0,0), 1.0);
-fet_endchar;
-fet_beginchar("Hufnagel do/fa clef", "hufnagel_do_fa_change",
-	      "chufnageldofaclef")
-	draw_hufnagel_do_fa_clef((0,0), .8);
-fet_endchar;
 
 def draw_percussion_clef(expr reduction) =
 	save reduced_il;
@@ -1133,51 +321,198 @@ def draw_percussion_clef(expr reduction)
 	define_pixels(reduced_il);
 	set_char_box(-.67reduced_il#,2.0reduced_il#,reduced_il#,reduced_il#);
 	razt := 0.45reduced_il;
-        pickup penrazor scaled razt;
-	draw (-b+razt/2,h) -- (-b+razt/2,-d);
-	draw (w-razt/2,h) -- (w-razt/2,-d);
+	draw_block((-b,-d),(-b+razt,h));
+	draw_block((w-razt,-d),(w,h));
 enddef;
 
 fet_beginchar("percussion clef", "percussion", "percussionclef")
 	draw_percussion_clef(1.0);
 fet_endchar;
 
-fet_beginchar("percussion clef", "percussion_change", "cpercussionclef")
+fet_beginchar("percussion clef (reduced)", "percussion_change", "cpercussionclef")
 	draw_percussion_clef(.8);
 fet_endchar;
 
+def draw_tab_T(expr pos, siz, slant) =
+	begingroup;
+	clearxy;
+	pair vx,vy;
+	vx=(xpart siz) * dir 0;
+	vy=(ypart siz) * dir 90;
+
+	penpos1(.75penh, 100);
+	z1=z2+(1/6*vx-.15*vy);
+	penpos2(.9penw, 0);
+	z2l = pos+.75vy;
+	penpos3(penh,-100);
+	z3l = pos+.4vx+vy;
+	penpos4(penh,-90);
+	z4=-.1vy+.5[z3,z5];
+	penpos5(.8penh,-30);
+	x5r=xpart (pos+siz);
+	y5l=ypart (pos+siz);
+
+	penpos10(penw,170);
+	z10=pos+.55vx+.85vy;
+	penpos11(.75[penh,penw],170);
+	z11=z10-.5vy+.025vx;
+	penpos12(penh,100);
+	z12l=(xpart .5[z13,z11],ypart (pos-.025*siz));
+	penpos13(.75penh,60);
+	z13=pos +.2vx+.15vy;
+	
+	% penlabels (1,2,3,4,5,10,11,12,13);
+
+	soft_penstroke (z1e..tension 1.1
+		..z2e
+	   	..z3e{right}..tension 1.5
+		..z4e
+		..z5e
+		) slanted slant shifted (slant*-ypart pos,0);
+
+	soft_penstroke (z10e..tension 1.5
+		..z11e
+		..z12e..tension 1.1
+		..z13e{(z13r-z13l) rotated 90}
+		) slanted slant shifted (slant*-ypart pos,0);
+	endgroup;
+enddef;
+	   
+def draw_tab_A(expr pos, siz, slant) =
+	begingroup;
+	clearxy;
+	pair vx,vy;
+	vx=(xpart siz) * dir 0;
+	vy=(ypart siz) * dir 90;
+	
+	penpos1(.75penh,-110);
+	z1r=pos+.07vy;
+	penpos2(penh,-75);
+	z2r=(.5[x1,x3],ypart pos);
+	penpos3(.25[penh,penw],-30);
+	z3=(.45[x2,x4],.15[y2,y4]);
+	penpos4(1[penh,penw],0);
+	z4=pos+.5vx+.975vy;
+
+	penpos5(1[penh,penw],-180);
+	z5=z4;
+	penpos6(.2[penh,penw],-150);
+	z6l=(.8[x5l,x7l],.9[y5l,y7l]);
+	penpos7(penh,-90);
+	z7r=(.5[x6,x8],ypart pos);
+	penpos8(.75penh,-70);
+	z8r=(xpart(pos+siz),y7r+.075ypart(siz));
+
+	penpos10(penh,-105);
+	z10=.2[z3,z4];
+	penpos11(.9penh,-90);
+	z11=.4[z10,z6]-0.05vy;
+	penpos12(.75penh,-75);
+	z12=.3[z11,z6]+0.02vy;
+
+	% penlabels(1,2,3,4,5,6,7,8,10,11,12);
+
+	soft_penstroke (z1e {(z1r-z1l) rotated 90}
+		..z2e 
+		..z3e
+		..z4e
+		) slanted slant shifted (slant*-ypart pos,0);
+
+	soft_penstroke (z5e
+		..z6e 
+		..z7e
+		..z8e {(z8r-z8l) rotated 90}
+		) slanted slant shifted (slant*-ypart pos,0);
+
+	soft_penstroke (z10e
+		..z11e
+		..z12e
+		) slanted slant shifted (slant*-ypart pos,0);
+
+	endgroup;
+enddef;
+
+def draw_tab_B(expr pos, siz, slant) =
+	begingroup;
+	clearxy;
+	pair vx,vy;
+	vx=(xpart siz) * dir 0;
+	vy=(ypart siz) * dir 90;
+
+	penpos1(.75penh, 100);
+	z1=z2+(.15*vx-.1*vy);
+	penpos2(.9penw, 0);
+	z2l = pos+.75vy;
+	penpos3(penh,-100);
+	z3l = pos+.4vx+1.05vy;
+	penpos4(.8[penh,penw],-180);
+	z4=(xpart(pos+.75siz),.5[y3,y5]);
+	penpos5(.8penh,90);
+	z5=(.5[x10,x4],ypart (pos+.55siz));
+
+	penpos6(.8penh,270);
+	z6=z5;
+	penpos7(penw,180);
+	z7l=(xpart(pos+siz),.5[y6,y8]);
+	penpos8(.8penh,45);
+	z8=.5[z12l,z11l]+.15vx-.05vy;
+
+	penpos10(.75[penh,penw],170);
+	z10=pos+.375vx+.95vy;
+	penpos11(.8[penh,penw],150);
+	z11=z10-.5vy+.04vx;
+	penpos12(penh,100);
+	z12l=(xpart .5[z13,z11],ypart pos);
+	penpos13(.75penh,60);
+	z13=pos+.1vx+.15vy;
+	
+	% penlabels (1,2,3,4,5,6,7,8,10,11,12,13);
+
+	soft_penstroke (z1e..tension 1.1
+		..z2e
+	   	..z3e
+		..z4e
+		..z5e{left}
+		) slanted slant shifted (slant*-ypart pos,0);
+
+	soft_penstroke (z6e{right}
+		..z7e
+	   	..z8e{(z8r-z8l) rotated 90}
+		) slanted slant shifted (slant*-ypart pos,0);
+
+	soft_penstroke (z10e.. tension 1.5
+		..z11e
+		..z12e..tension 1.1
+		..z13e{(z13r-z13l) rotated 90}
+		) slanted slant shifted (slant*-ypart pos,0);
+	endgroup;
+enddef;
+
 def draw_tab_clef(expr reduction) =
-	save reduced_il;
+        save reduced_il,vx,vy,letterheight,penw,penh;
 	reduced_il# = staff_space# * reduction;
-	define_pixels(reduced_il);
-	set_char_box(-.5reduced_il#,1.8reduced_il#,2.25reduced_il#,2.25reduced_il#);
-	bs := -d+0.65reduced_il;
-	cx := 0.5(-b+w);
-	xp := 0.32 reduced_il;
-	yp := 0.25reduced_il;
-        pickup pensquare xscaled xp yscaled yp;
-
-	draw (-b,h) -- (w,h);
-	draw (cx,h) -- (cx,h-1.2reduced_il);
-
-	pickup penrazor scaled yp rotated 90;
-	draw (-0.85b+0.15w,-0.25reduced_il) -- (-0.15b+0.85w,-0.25reduced_il);
-	pickup penrazor scaled xp;
-	draw (-b,-0.6reduced_il-yp/2) -- (cx,0.6reduced_il+yp/2) -- (w,-0.6reduced_il-yp/2);
-
-
-        pickup pensquare xscaled xp yscaled yp;
-	draw (-b,-d+1.2reduced_il) -- (-b,-d);
-        pickup pencircle xscaled xp yscaled yp;
-	draw (-b,-d) --- (cx,-d) .. (w,0.5(bs-d)) .. (cx,bs) --- (-b,bs) --- (cx,bs)
-	     .. (0.3cx+0.7w,0.5(bs-d+1.2reduced_il)) .. (cx,-d+1.2reduced_il) --- (-b,-d+1.2reduced_il)
+	letterheight# = 1.8*reduced_il#;
+	define_pixels(reduced_il,letterheight);
+	set_char_box(-.2*reduced_il#,2.8*reduced_il#,1.6*letterheight#,1.6*letterheight#);
+
+		%draw_staff (-3,2, 0.5);
+
+	penw = .45reduced_il;
+	penh = .2reduced_il;
+
+	draw_tab_T((-b+.15reduced_il,h-letterheight),
+	  (2.1*reduced_il,letterheight),0.2);
+	draw_tab_A((-b-.05reduced_il,-.5letterheight +.15reduced_il),
+	  (2.2*reduced_il,letterheight),0.4);
+	draw_tab_B((-b+.025reduced_il,-d),
+	  (2.1*reduced_il,letterheight),0.25);
 enddef;
 
 fet_beginchar("tab clef", "tab", "tabclef")
 	draw_tab_clef(1.0);
 fet_endchar;
 
-fet_beginchar("tab clef", "tab_change", "ctabclef")
+fet_beginchar("tab clef (reduced)", "tab_change", "ctabclef")
 	draw_tab_clef(.8);
 fet_endchar;
 
diff -purN ../lilypond-1.5.28/mf/feta-macros.mf ./mf/feta-macros.mf
--- ../lilypond-1.5.28/mf/feta-macros.mf	Wed Dec  5 18:54:30 2001
+++ ./mf/feta-macros.mf	Fri Feb  1 19:20:59 2002
@@ -95,6 +95,15 @@ enddef;
 % drawing
 %
 
+def soft_penstroke text t =
+	forsuffixes e = l,r: path_.e:=t; endfor
+	if cycle path_.l:
+	  cyclestroke_
+	else:
+	  fill path_.l .. tension1.5 .. reverse path_.r .. tension1.5 .. cycle
+	fi
+enddef;
+
 def simple_serif(expr p,q, a)= 
 	p{dir(angle(q-p) -a)} .. q{ - dir(angle(p -q) + a)}
 enddef;
@@ -192,6 +201,7 @@ begingroup;
 endgroup;
 enddef;
 
+
 def y_mirror_char =
 	currentpicture := currentpicture yscaled -1;
 	set_char_box(charbp, charwd, charht, chardp);
diff -purN ../lilypond-1.5.28/mf/feta-nummer-code.mf ./mf/feta-nummer-code.mf
--- ../lilypond-1.5.28/mf/feta-nummer-code.mf	Wed Dec  5 18:54:30 2001
+++ ./mf/feta-nummer-code.mf	Fri Feb  1 19:20:59 2002
@@ -4,7 +4,7 @@
 %
 % source file of the Feta (not the Font-En-Tja) music font
 % 
-% (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 
 fet_begingroup("number")
 
diff -purN ../lilypond-1.5.28/mf/feta-params.mf ./mf/feta-params.mf
--- ../lilypond-1.5.28/mf/feta-params.mf	Wed Dec  5 18:54:30 2001
+++ ./mf/feta-params.mf	Fri Feb  1 19:20:59 2002
@@ -1,5 +1,8 @@
 
 stafflines = 5;
+% [reuter] URG!  This is not always true.  One of the effects of
+% keeping this a constant is that, for notation with less stafflines,
+% stafflinethickness gets too small.
 
 staff_space#:=staffsize#/(stafflines-1);
 
diff -purN ../lilypond-1.5.28/mf/feta-pendaal.mf ./mf/feta-pendaal.mf
--- ../lilypond-1.5.28/mf/feta-pendaal.mf	Wed Dec  5 18:54:30 2001
+++ ./mf/feta-pendaal.mf	Fri Feb  1 19:20:59 2002
@@ -127,7 +127,7 @@ def draw_pedal_P =
 	y11 = 1/5h;
 
 	penlabels (1,2,3,4,5,6,7,8,9,10,11);
-	penstroke z1e..tension 2.5 .. z2e.. tension 1.5 .. z3e ..tension 2.5
+	soft_penstroke z1e..tension 2.5 .. z2e.. tension 1.5 .. z3e ..tension 2.5
 		..z4e..tension 1.5
 		..z5e..z6e..tension 1.5
 		..z7e..tension 1.5
@@ -148,7 +148,7 @@ def draw_pedal_P =
 	y16r = y2r;
 
 	penlabels (12,13,14,15,16);
-	penstroke z12e{down}..tension 1.1
+	soft_penstroke z12e{down}..tension 1.1
 		..z13e{dir (180-pedbeta)}..tension 1.1
 		..z14e{right}..tension 1.1
 		..z15e{dir (180+pedbeta)}..tension 1.1
@@ -177,7 +177,7 @@ def draw_pedal_d =
 
 	penlabels (1,2,3,4,5);
 
-	penstroke z1e{dir (-70-90)}..tension 1.1
+	soft_penstroke z1e{dir (-70-90)}..tension 1.1
 		..z2e{down}..tension 1.1
 		..z3e{right}..tension 1.1
 		..z4e{dir (90+10)}..tension 1.1
@@ -217,7 +217,7 @@ def draw_pedal_e =
 	y8 = 1/5pedalh;
 
 	penlabels (1,2,3,4,5,6,7,8);
-	penstroke z1e{dir pedalpha}
+	soft_penstroke z1e{dir pedalpha}
 		..z2e{dir pedalpha}.. tension 1.1
 		%urg
 		..z3e..tension 1.05
diff -purN ../lilypond-1.5.28/mf/feta-puntje.mf ./mf/feta-puntje.mf
--- ../lilypond-1.5.28/mf/feta-puntje.mf	Wed Dec  5 18:54:30 2001
+++ ./mf/feta-puntje.mf	Fri Feb  1 19:20:59 2002
@@ -6,7 +6,7 @@ define_pixels(dot_diam);
 
 fet_beginchar("duration dot","dot", "dot")
 	pickup pencircle scaled dot_diam;
-	draw (dot_diam/2,0);
+	drawdot (dot_diam/2,0);
 	set_char_box(0, dot_diam#, dot_diam#/2, dot_diam#/2);
 fet_endchar;
 
diff -purN ../lilypond-1.5.28/mf/feta-slag.mf ./mf/feta-slag.mf
--- ../lilypond-1.5.28/mf/feta-slag.mf	Wed Dec  5 18:54:30 2001
+++ ./mf/feta-slag.mf	Fri Feb  1 19:20:59 2002
@@ -4,7 +4,7 @@
 % source file of the Feta (defintively not an abbreviation for Font-En-Tja)
 % music font
 % 
-% (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 % 
 
 % this file is included by feta-scripts.mf
diff -purN ../lilypond-1.5.28/mf/feta-sleur.mf ./mf/feta-sleur.mf
--- ../lilypond-1.5.28/mf/feta-sleur.mf	Wed Dec  5 18:54:30 2001
+++ ./mf/feta-sleur.mf	Fri Feb  1 19:20:59 2002
@@ -3,7 +3,7 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 % & Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 % see Documentation/fonts.tex
diff -purN ../lilypond-1.5.28/mf/feta-test11.mf ./mf/feta-test11.mf
--- ../lilypond-1.5.28/mf/feta-test11.mf	Wed Dec  5 18:54:30 2001
+++ ./mf/feta-test11.mf	Fri Feb  1 19:20:59 2002
@@ -1,9 +1,9 @@
-% feta-test16
+% feta-test11
 % part of LilyPond's pretty-but-neat music font
 
 input feta-autometric;
-fet_beginfont("feta-test", 23);
-staffsize#:=23pt#;
+fet_beginfont("feta-test", 11);
+staffsize#:=11pt#;
 test:=1;
 
 % smoked cheese
diff -purN ../lilypond-1.5.28/mf/feta-test13.mf ./mf/feta-test13.mf
--- ../lilypond-1.5.28/mf/feta-test13.mf	Wed Dec  5 18:54:30 2001
+++ ./mf/feta-test13.mf	Fri Feb  1 19:20:59 2002
@@ -1,4 +1,4 @@
-% feta-test16
+% feta-test13
 % part of LilyPond's pretty-but-neat music font
 
 input feta-autometric;
diff -purN ../lilypond-1.5.28/mf/feta-test26.mf ./mf/feta-test26.mf
--- ../lilypond-1.5.28/mf/feta-test26.mf	Wed Dec  5 18:54:30 2001
+++ ./mf/feta-test26.mf	Fri Feb  1 19:20:59 2002
@@ -1,4 +1,4 @@
-% feta-test16
+% feta-test26
 % part of LilyPond's pretty-but-neat music font
 
 input feta-autometric;
diff -purN ../lilypond-1.5.28/mf/feta-timesig.mf ./mf/feta-timesig.mf
--- ../lilypond-1.5.28/mf/feta-timesig.mf	Wed Dec  5 18:54:30 2001
+++ ./mf/feta-timesig.mf	Fri Feb  1 19:20:59 2002
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (not an abbreviation of Font-En-Tja) music font
 % 
-% (c) 1998--2001 Mats Bengtsson <matsb@s3.kth.se>,
+% (c) 1998--2002 Mats Bengtsson <matsb@s3.kth.se>,
 %		 Christian Mondrup <scancm@biobase.dk>
 
 fet_begingroup("timesig");
@@ -69,126 +69,4 @@ fet_beginchar ("2/2 meter", "C2/2", "all
 	draw_block((- .75 stafflinethickness, -d) + excentricity, (.75 stafflinethickness , h) + excentricity);
 fet_endchar;
 
-path threequartercircle;
-threequartercircle = halfcircle & quartercircle rotated 180;
-
-save Cdiameter,Cthickness;
-Cdiameter# := 3/2 staff_space#;
-Cthickness# := 2 stafflinethickness#;
-define_pixels(Cdiameter,Cthickness);
-
-%% tempus imperfectum cum prolatione imperfecta
-fet_beginchar ("Mensural 4/4 meter", "old4/4", "oldfourfourmeter")
-	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
-		.5 Cdiameter#, .5 Cdiameter#);
-	
-	pickup pencircle scaled Cthickness;
-	draw threequartercircle rotated 45 scaled Cdiameter;
-fet_endchar;
-
-%% tempus imperfectum cum prolatione imperfecta proportio dupla
-fet_beginchar ("Mensural 2/2 meter", "old2/2", "oldallabreve")
-	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
-		staff_space#, staff_space#);
-	
-	pickup pencircle scaled Cthickness;
-	draw threequartercircle rotated 45 scaled Cdiameter;
-	draw_block((-Cthickness, -d), (0, h));
-fet_endchar;
-
-%% tempus perfectum cum prolatione imperfecta
-fet_beginchar ("Mensural 3/2 meter", "old3/2", "oldthreetwometer")
-	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
-		.5 Cdiameter#, .5 Cdiameter#);
-	
-	pickup pencircle scaled Cthickness;
-	draw fullcircle scaled Cdiameter;
-fet_endchar;
-
-%% tempus imperfectum cum prolatione perfecta
-fet_beginchar ("Mensural 6/4 meter", "old6/4", "oldsixfourmeter")
-	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
-		.5 Cdiameter#, .5 Cdiameter#);
-	
-	pickup pencircle scaled Cthickness;
-	draw threequartercircle rotated 45 scaled Cdiameter;
-	pickup pencircle scaled 4 stafflinethickness;
-	draw (0,0);
-fet_endchar;
-
-%% tempus perfectum cum prolatione perfecta
-fet_beginchar ("Mensural 9/4 meter", "old9/4", "oldninefourmeter")
-	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
-		.5 Cdiameter#, .5 Cdiameter#);
-	
-	pickup pencircle scaled Cthickness;
-	draw fullcircle scaled Cdiameter;
-	pickup pencircle scaled 4 stafflinethickness;
-	draw (0,0);
-fet_endchar;
-
-%% tempus perfectum cum prolatione imperfecta proportio dupla
-fet_beginchar ("Mensural 3/4 meter", "old3/4", "oldthreefourmeter")
-	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
-		staff_space#, staff_space#);
-	
-	pickup pencircle scaled Cthickness;
-	draw fullcircle scaled Cdiameter;
-	draw_block((-Cthickness/2, -d), (Cthickness/2, h));
-fet_endchar;
-
-%% tempus imperfectum cum prolatione perfecta proportio dupla
-fet_beginchar ("Mensural 6/8 meter", "old6/8", "oldsixeightmeter")
-	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
-		 staff_space#, staff_space#);
-	
-	pickup pencircle scaled Cthickness;
-	draw threequartercircle rotated 45 scaled Cdiameter;
-	pickup pencircle scaled 4 stafflinethickness;
-	draw (0,0);
-	draw_block((-Cthickness/2, -d), (Cthickness/2, h));
-fet_endchar;
-
-%% tempus perfectum cum prolatione perfecta proportio dupla
-fet_beginchar ("Mensural 9/8 meter", "old9/8", "oldnineeight")
-	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
-		staff_space#, staff_space#);
-	
-	pickup pencircle scaled Cthickness;
-	draw fullcircle scaled Cdiameter;
-	pickup pencircle scaled 4 stafflinethickness;
-	draw (0,0);
-	draw_block((-Cthickness/2, -d), (Cthickness/2, h));
-fet_endchar;
-
-%% tempus imperfectum cum prolatione imperfecta diminutio simplex
-fet_beginchar ("Mensural 4/8 meter", "old4/8", "oldfoureightmeter")
-	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
-	.5 Cdiameter#, .5 Cdiameter#);
-	
-	pickup pencircle scaled Cthickness;
-	draw threequartercircle rotated 225 scaled Cdiameter;
-fet_endchar;
-
-%% tempus imperfectum cum prolatione perfecta diminutio simplex
-fet_beginchar ("Mensural 6/8 meter", "old6/8alt", "oldsixeightmeteralt")
-	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
-		.5 Cdiameter#, .5 Cdiameter#);
-	
-	pickup pencircle scaled Cthickness;
-	draw threequartercircle rotated 225 scaled Cdiameter;
-	pickup pencircle scaled 4 stafflinethickness;
-	draw (0,0);
-fet_endchar;
-
-%% tempus imperfectum cum prolatione imperfecta diminutio duplex
-fet_beginchar ("Mensural 2/4 meter", "old2/4", "oldtwofourmeter")
-	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
-		staff_space#, staff_space#);
-	
-	pickup pencircle scaled Cthickness;
-	draw threequartercircle rotated 225 scaled Cdiameter;
-	draw_block((-Cthickness, -d), (0, h));
-fet_endchar;
-
 fet_endgroup("timesig");
diff -purN ../lilypond-1.5.28/mf/feta-toevallig.mf ./mf/feta-toevallig.mf
--- ../lilypond-1.5.28/mf/feta-toevallig.mf	Wed Dec  5 18:54:31 2001
+++ ./mf/feta-toevallig.mf	Fri Feb  1 19:20:59 2002
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 
@@ -280,169 +280,5 @@ fet_beginchar("Left Parenthesis", "(", "
         set_char_box(charwd, charbp, chardp, charht);
 fet_endchar;
 
-%%%%%%%%
-%
-%
-%
-% EDITIO MEDICAEA
-%
-%
-%
-fet_beginchar("Ed. Med. Flat" , "medicaea-1", "medicaeaflat");
-	set_char_box(0, 0.8 staff_space#, 0.6 staff_space#, 
-	  2.0 staff_space#);
-
-	pickup pencircle
-		xscaled 0.50 stafflinethickness
-		yscaled 0.22 staff_space;
-
-	save za, zb;
-	pair za, zb;
-
-	za = (0.00 staff_space, +0.90 staff_space);
-	zb = (0.00 staff_space, -0.50 staff_space);
-	draw za -- zb;
-
-	pickup pencircle
-		xscaled 0.50 stafflinethickness
-		yscaled 0.22 staff_space
-		rotated -63;
-
-	save zc, zd, ze;
-	pair zc, zd, ze;
-
-	zc = (0.10 staff_space, -0.50 staff_space);
-	zd = (0.40 staff_space, +0.40 staff_space);
-	ze = (0.10 staff_space, +0.40 staff_space);
-
-	draw zc{(1,2)} .. zd .. ze{(-1,-1)};
-
-	fet_endchar;
-
-%%%%%%%%
-%
-%
-%
-% EDITIO VATICANA
-%
-%
-%
-fet_beginchar("Ed. Vat. Flat" , "vaticana-1", "vaticanaflat");
-        set_char_box(0, 0.7 staff_space#, 0.6 staff_space#, 
-                2.0 staff_space#);
-        define_pixels (stafflinethickness, staff_space);
-
-        save za, zb, zc, zd, ze, zf, zg;
-        pair za, zb, zc, zd, ze, zf, zg;
-        za = (0.00 staff_space, +0.80 staff_space);
-        zb = (0.00 staff_space, -0.03 staff_space);
-        zc = (0.25 staff_space, -0.23 staff_space);
-        zd = (0.50 staff_space, -0.23 staff_space);
-        ze = (0.50 staff_space, +0.00 staff_space);
-        zf = (0.25 staff_space, +0.20 staff_space);
-        zg = (0.15 staff_space, +0.26 staff_space);
-
-        pickup pencircle
-                xscaled 0.50 stafflinethickness
-                yscaled 0.22 staff_space;
-        draw za{down} .. {down}zb .. zc .. zd{up} .. {up}ze .. zf .. zg;
-        fet_endchar;
-
-fet_beginchar("Ed. Vat. Natural" , "vaticana0", "vaticananatural");
-	set_char_box(0, 0.6 staff_space#, 0.6 staff_space#, 
-		2.0 staff_space#);
-	define_pixels (stafflinethickness, staff_space);
-
-	save za, zb, zc, zd;
-	pair za, zb, zc, zd;
-	pickup pencircle
-		xscaled 0.80 stafflinethickness
-		yscaled 0.22 staff_space;
-	za = (0.00 staff_space, +0.65 staff_space);
-	zb = (0.00 staff_space, -0.35 staff_space);
-	zc = (0.00 staff_space, -0.30 staff_space);
-	zd = (0.40 staff_space, -0.08 staff_space);
-	draw za -- zb;
-	draw zc -- zd;
-
-	addto currentpicture also currentpicture
-		xscaled -1
-		yscaled -1
-		shifted (0.40 staff_space, 0.0 staff_space);
-
-	fet_endchar;
-
-%%%%%%%%
-%
-%
-%
-% MENSURAL NOTATION
-%
-%
-%
-fet_beginchar("Mensural Sharp" , "mensural1", "mensuralsharp");
-	set_char_box(0.4 staff_space#, 0.6 staff_space#, 0.5 staff_space#, 
-		0.5 staff_space#);
-	save stemthick;
-	define_pixels (stemthick, staff_space);
-	stemthick# = stafflinethickness#;
-
-	save za, zb;
-	pair za, zb;
-	pickup pencircle scaled 0.8 stemthick;
-	za = 0.4 * staff_space * (0.8, 1);
-	za = -zb;
-	draw za .. zb;
-
-	addto currentpicture also currentpicture xscaled -1;
-	addto currentpicture also currentpicture shifted (0.20 staff_space, 0);
-
-	fet_endchar;
-
-fet_beginchar("Mensural Flat" , "mensural-1", "mensuralflat");
-	set_char_box(0.1 staff_space#, 0.7 staff_space#, 0.4 staff_space#, 
-		1.8 staff_space#);
-	save stemthick;
-	define_pixels (stemthick, staff_space);
-	stemthick# = stafflinethickness#;
-
-	save za, zb, zc, zd, ze;
-	pair za, zb, zc, zd, ze;
-	pickup pencircle
-		xscaled 1.4 stemthick
-		yscaled 0.6 stemthick
-		rotated 45;
-
-	za = (0.00 staff_space, +1.80 staff_space);
-	zb = (0.00 staff_space, -0.25 staff_space);
-	zc = (0.35 staff_space, -0.25 staff_space);
-	zd = (0.35 staff_space, +0.25 staff_space);
-	ze = (0.00 staff_space, +0.25 staff_space);
-	draw za -- zb .. zc .. zd .. ze;
-	fet_endchar;
-
-fet_beginchar("Hufnagel Flat" , "hufnagel-1", "hufnagelflat");
-	set_char_box(0.5 staff_space#, 0.7 staff_space#, 0.4 staff_space#, 
-		1.8 staff_space#);
-	save stemthick;
-	define_pixels (stemthick, staff_space);
-	stemthick# = stafflinethickness#;
-
-	save za, zb, zc, zd, ze, zf;
-	pair za, zb, zc, zd, ze, zf;
-	pickup pencircle
-		xscaled 2.4 stemthick
-		yscaled 0.4 stemthick
-		rotated 45;
-
-	za = (0.00 staff_space, +1.80 staff_space);
-	zb = (0.00 staff_space, -0.15 staff_space);
-	zc = (0.25 staff_space, -0.30 staff_space);
-	zd = (0.50 staff_space, +0.00 staff_space);
-	ze = (0.30 staff_space, +0.30 staff_space);
-	zf = (0.00 staff_space, +0.15 staff_space);
-	draw za -- zb -- zc .. zd .. ze -- zf;
-	fet_endchar;
-
 fet_endgroup("accidentals");
 
diff -purN ../lilypond-1.5.28/mf/parmesan-clefs.mf ./mf/parmesan-clefs.mf
--- ../lilypond-1.5.28/mf/parmesan-clefs.mf	Thu Jan  1 01:00:00 1970
+++ ./mf/parmesan-clefs.mf	Fri Feb  1 19:20:59 2002
@@ -0,0 +1,828 @@
+% feta-klef.mf --  implement Clefs -*-Fundamental-*-
+% 
+% part of LilyPond's pretty-but-neat music font
+%
+% source file of the Feta (not the Font-En-Tja) music font
+% 
+% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+% Jan Nieuwenhuizen <janneke@gnu.org>,
+% Juergen Reuter <reuter@ipd.uka.de>
+
+
+fet_begingroup("clefs");
+
+%%%%%%%%
+%
+%
+%
+% Editio Vaticana
+%
+%
+%
+def draw_vaticana_do_clef(expr exact_center, reduction) = 
+	save reduced_il;
+
+	reduced_il# = staff_space# * reduction;
+	
+	set_char_box(0.4reduced_il#, 0.4reduced_il#, 0, reduced_il#);
+
+	define_pixels(reduced_il);
+
+	pickup pencircle xscaled stafflinethickness yscaled 0.6reduced_il;
+
+	save za, zb, zc, zd, ze, zf;
+	pair za, zb, zc, zd, ze, zf;
+
+	za = exact_center + (-0.0reduced_il, -.45reduced_il);
+	zb = exact_center + (-0.2reduced_il, -.50reduced_il);
+	zc = exact_center + (-0.4reduced_il, -.25reduced_il);
+	zd = exact_center + (-0.4reduced_il, +.25reduced_il);
+	ze = exact_center + (-0.2reduced_il, +.50reduced_il);
+	zf = exact_center + (-0.0reduced_il, +.45reduced_il);
+	draw za .. zb .. zc --	% lower punctum
+	     zd .. ze .. zf;	% upper punctum
+enddef;
+
+
+fet_beginchar("Ed. Vat. do clef", "vaticana_do", "vatdoclef")
+	if test = 1:
+		draw_staff(-1,3, 0.0);
+	fi;
+	draw_vaticana_do_clef((0,0), 1.0);
+fet_endchar;
+fet_beginchar("Ed. Vat. do clef", "vaticana_do_change", "vatcdoclef")
+	draw_vaticana_do_clef((0,0), 1.0); % no reduction
+fet_endchar;
+
+
+def draw_vaticana_fa_clef(expr exact_center, reduction) = 
+
+	save reduced_il, z;
+	reduced_il# = staff_space# * reduction;
+	define_pixels(reduced_il);
+
+	save za, zb, zc, zd, ze;
+	pair za, zb, zc, zd, ze;
+
+	%stem
+	pickup pencircle scaled stafflinethickness;
+	xpart za = xpart zb =
+		xpart exact_center + 0.4reduced_il;
+	ypart za = ypart exact_center = ypart zb + 1.5reduced_il;
+	draw za .. zb;
+
+	%left-handed punctum
+	pickup pencircle xscaled stafflinethickness yscaled 0.5reduced_il;
+	zc = exact_center +
+		(+0.4reduced_il, -0.05reduced_il);
+	zd = exact_center +
+		(+0.2reduced_il, +0.05reduced_il);
+	ze = exact_center +
+		(+0.0reduced_il, +0.00reduced_il);
+	draw zc .. zd .. ze;
+
+	%right-handed puncta as in do clef
+	draw_vaticana_do_clef(
+		exact_center +
+		(+0.8reduced_il + 1.25stafflinethickness, 0),
+		reduction);
+
+	set_char_box(0.5reduced_il#, 1.5reduced_il#, 0, reduced_il#);
+enddef;
+
+
+fet_beginchar("Ed. Vat. fa clef", "vaticana_fa", "vatfaclef")
+	if test = 1:
+		draw_staff(-1,3, 0.0);
+	fi;
+	draw_vaticana_fa_clef((0,0), 1.0);
+fet_endchar;
+fet_beginchar("Ed. Vat. fa clef", "vaticana_fa_change", "vatcfaclef")
+	draw_vaticana_fa_clef((0,0), 1.0); % no reduction
+fet_endchar;
+
+%%%%%%%%
+%
+%
+%
+% Editio Medicaea
+%
+%
+%
+def draw_medicaea_do_clef(expr exact_center, reduction) = 
+	save reduced_il, reduced_slt;
+	reduced_il# = staff_space# * reduction;
+	reduced_slt# = stafflinethickness# * reduction;
+	define_pixels(reduced_il);
+	define_pixels(reduced_slt);
+
+	save flag_height;
+	flag_height# = 0.5 reduced_il#;
+	define_pixels(flag_height);
+
+	%lower flag
+	save za, zb;
+	pair za, zb;
+	pickup pencircle xscaled reduced_slt yscaled flag_height;
+	xpart exact_center
+		= xpart za + 0.5 reduced_il
+		= xpart zb - 0.5 reduced_il;
+	ypart za = ypart exact_center - 0.5 flag_height
+			- 0.5 (staff_space - reduced_il);
+	ypart zb = ypart za - reduced_il + flag_height;
+	draw za .. zb;
+
+	%upper flag
+	save za, zb;
+	pair za, zb;
+	pickup pencircle xscaled reduced_slt yscaled flag_height;
+	xpart exact_center
+		= xpart za + 0.5 reduced_il
+		= xpart zb - 0.5 reduced_il;
+	ypart za = ypart exact_center - 0.5 flag_height
+			- 0.5 (staff_space - reduced_il)
+			+ staff_space;
+	ypart zb = ypart za - reduced_il + flag_height;
+	draw za .. zb;
+
+	%stem
+	save za, zb;
+	pair za, zb;
+	pickup pencircle scaled reduced_slt;
+	xpart za = xpart zb = xpart exact_center - 0.5 reduced_il;
+	ypart exact_center
+		= ypart za + 1.5 reduced_il
+		= ypart zb - 1.5 reduced_il;
+	draw za .. zb;
+
+	set_char_box(0.5reduced_il#, 1.5reduced_il#,
+		     1.5reduced_il#, 1.5reduced_il#);
+enddef;
+
+
+fet_beginchar("Ed. Med. do clef", "medicaea_do", "meddoclef")
+	if test = 1:
+		draw_staff(-1,3, 0.0);
+	fi;
+	draw_medicaea_do_clef((0,0), 1.0);
+fet_endchar;
+fet_beginchar("Ed. Med. do clef", "medicaea_do_change", "cmeddoclef")
+	draw_medicaea_do_clef((0,0), .8);
+fet_endchar;
+
+
+def draw_medicaea_fa_clef(expr exact_center, reduction) = 
+	% inspired by Regensburger Edition of Medicaea (1885/86), in:
+	% MGG, volume 2, col. 1327 ("Choralreform"), fig. 2.
+
+	save reduced_il, reduced_slt;
+	reduced_il# = staff_space# * reduction;
+	reduced_slt# = stafflinethickness# * reduction;
+	define_pixels(reduced_il);
+	define_pixels(reduced_slt);
+
+	save za, zb, zc, zd, ze;
+	pair za, zb, zc, zd, ze;
+
+	%stem
+	pickup pencircle scaled stafflinethickness;
+	xpart za = xpart zb =
+		xpart exact_center + 0.4reduced_il;
+	ypart za = ypart exact_center = ypart zb + 1.5reduced_il;
+	draw za -- zb;
+
+	%left-handed punctum
+	pickup pencircle xscaled reduced_slt yscaled reduced_il;
+	zc = exact_center +
+		(+0.4reduced_il, 0);
+	zd = exact_center +
+		(+0.0reduced_il, 0);
+	draw zc -- zd;
+
+	%right-handed puncta as in do clef
+	draw_medicaea_do_clef(
+		exact_center +
+		(+1.1reduced_il + 1.25stafflinethickness, 0),
+		reduction);
+
+	set_char_box(reduced_il#/2, 2.6reduced_il#, 0, reduced_il#);
+enddef;
+
+
+fet_beginchar("Ed. Med. fa clef", "medicaea_fa", "medfaclef")
+	if test = 1:
+		draw_staff(-1,3, 0.0);
+	fi;
+	draw_medicaea_fa_clef((0,0), 1.0);
+fet_endchar;
+fet_beginchar("Ed. Med. fa clef", "medicaea_fa_change", "cmedfaclef")
+	draw_medicaea_fa_clef((0,0), .8);
+fet_endchar;
+
+
+%%%%%%%%
+%
+%
+%
+% Mensural Notation
+%
+%
+%
+brevis_wid# := 2 staff_space#;
+
+def draw_brevis(expr exact_center, reduction, small_width, small_height) =
+	%
+	% inspired by function draw_brevis of
+	% feta-bolletjes.mf
+	%
+	save reduced_slt, reduced_nht;
+	save stem_width, head_width;
+	save serif_size, serif_protrude;
+	save holeheight, beamheight;
+
+	reduced_slt# = stafflinethickness# * reduction;
+	reduced_nht# = noteheight# * reduction;
+	stem_width# = 1.4 reduced_slt#;
+	if small_width:
+		head_width# = 0.5brevis_wid# * reduction;
+	else:
+		head_width# = brevis_wid# * reduction;
+	fi;
+	if small_height:
+		serif_size# = 0.64 reduced_slt#;
+		serif_protrude# = 0.96 serif_size#;
+		holeheight# = 3 reduced_slt#;
+		beamheight# = 0.32(reduced_nht# - holeheight#);
+	else:
+		serif_size# = 1.0 reduced_slt#;
+		serif_protrude# = 1.5 serif_size#;
+		holeheight# = 3 reduced_slt#;
+		beamheight# = 0.5(reduced_nht# - holeheight#);
+	fi;
+	define_pixels(reduced_slt);
+	define_pixels(stem_width);
+	define_pixels(head_width);
+	define_pixels(serif_size);
+	define_pixels(serif_protrude);
+	define_pixels(beamheight);
+
+	penpos1(stem_width, 0);
+	penpos2(stem_width, 0);
+	penpos3(beamheight, 90);
+	penpos4(beamheight, 90);
+	penpos5(stem_width, 180);
+
+	z1l = exact_center;
+	z2l = z1l + (0, -reduced_slt/2);
+	z3r = z2r + serif_size*(1,-1);
+	y4r = y3r;
+	x4l = x1l + head_width/2;
+	z5l = z3l + (-serif_size, -serif_protrude);
+
+	penlabels(1,2,3,4,5);
+	fill z1r -- z1l -- z5r{down} .. z5l{up} .. z3l{right}
+		-- z4l -- z4r -- z3r{left} .. z2r{up} -- cycle;
+enddef;
+
+
+def draw_neo_mensural_c_clef(expr exact_center, reduction) = 
+	draw_brevis(exact_center, reduction, false, false);
+
+	save reduced_il, reduced_slt;
+	save stem_width;
+
+	reduced_il# = staff_space# * reduction;
+	reduced_slt# = stafflinethickness# * reduction;
+	stem_width# = 1.4 reduced_slt#;
+
+	define_pixels(reduced_il);
+	define_pixels(reduced_slt);
+	define_pixels(stem_width);
+
+	pickup pencircle xscaled stem_width yscaled blot_diameter;
+	z6 = exact_center + (stem_width/2, 0);
+	z7 = z6 + (0, -2reduced_il);
+	z8 = z6 + (-3reduced_slt, 0);
+	z9 - z8 = z7 - z6;
+	draw z6 .. z7;
+	draw z8 .. z9;
+
+	addto currentpicture also currentpicture
+		yscaled -1 shifted (0, 2*(ypart exact_center));
+	addto currentpicture also currentpicture 
+		xscaled -1 shifted (2x4l,0);
+
+	set_char_box(0, 2head_width#,
+		     6reduced_slt#*reduction, 6reduced_slt#*reduction);
+enddef;
+
+
+fet_beginchar("neo-mensural c clef", "neo_mensural_c", "neomenscclef")
+	if test = 1:
+		draw_staff(-1,3, 0.0);
+	fi;
+	draw_neo_mensural_c_clef((0,0), 1.0);
+fet_endchar;
+fet_beginchar("neo-mensural c clef", "neo_mensural_c_change", "cneomenscclef")
+	draw_neo_mensural_c_clef((1.3 staff_space#,0), .8);
+fet_endchar;
+
+
+def draw_petrucci_c_clef(expr exact_center, reduction) = 
+	% inspired by Josquin Desprez, "Stabat Mater", Libro tertio,
+	% 1519, printed by Petrucci, in: MGG, volume 7, Table 11.
+	draw_brevis(exact_center, reduction, true, true);
+
+	save reduced_il, reduced_slt;
+	save stem_width, interline;
+
+	reduced_il# = staff_space# * reduction;
+	reduced_slt# = stafflinethickness# * reduction;
+	stem_width# = 1.4 reduced_slt#;
+	interline# = staff_space#;
+
+	define_pixels(reduced_il);
+	define_pixels(reduced_slt);
+	define_pixels(stem_width);
+	define_pixels(interline);
+
+	addto currentpicture also currentpicture
+		yscaled -1 shifted (0, 2*(ypart exact_center) - interline);
+
+	pickup pencircle xscaled stem_width yscaled blot_diameter;
+	z6 = exact_center + (stem_width/2, 0);
+	z7 = z6 + (0, -2.2reduced_il);
+	draw z6 .. z7;
+
+	addto currentpicture also currentpicture 
+		xscaled -1 shifted (2x4l,0);
+
+	z8 = exact_center + (stem_width/2, 0);
+	z9 = z8 + (0, -3.2reduced_il);
+	draw z8 .. z9;
+
+	addto currentpicture also currentpicture
+		yscaled -1 shifted (0, 4*(ypart exact_center));
+
+	set_char_box(0, 2head_width#,
+		     noteheight#*4*reduction, noteheight#*4*reduction);
+enddef;
+
+
+fet_beginchar("petrucci c clef", "petrucci_c", "petruccicclef")
+	if test = 1:
+		draw_staff(-1,3, 0.0);
+	fi;
+	draw_petrucci_c_clef((0,0), 1.0);
+fet_endchar;
+fet_beginchar("petrucci c clef", "petrucci_c_change", "cpetruccicclef")
+	draw_petrucci_c_clef((1.3 staff_space#,0), .8);
+fet_endchar;
+
+
+def draw_mensural_c_clef(expr exact_center, reduction) =
+	% inspired by Ockeghem, "Missa Prolationum", in: MGG, volume
+	% 9, table 94.
+	draw_petrucci_c_clef(exact_center, reduction);
+
+	addto currentpicture also currentpicture
+		shifted (0, -interline);
+
+	set_char_box(0, 2head_width#,
+		     noteheight#*6*reduction, noteheight#*6*reduction);
+enddef;
+
+
+fet_beginchar("mensural c clef", "mensural_c", "menscclef")
+	if test = 1:
+		draw_staff(-1,3, 0.0);
+	fi;
+	draw_mensural_c_clef((0,0), 1.0);
+fet_endchar;
+fet_beginchar("mensural c clef", "mensural_c_change", "cmenscclef")
+	draw_mensural_c_clef((0,0), .8);
+fet_endchar;
+
+def draw_diamond(expr exact_center, reduction) =
+	save stem_width, reduced_il, reduced_nht, holeheight, beamheight;
+	save rh_height, rh_width;
+
+	stem_width# = 1.4 reduced_slt#;
+	reduced_il# = staff_space# * reduction;
+	reduced_nht# = noteheight# * reduction;
+	holeheight# = 3 reduced_slt#;
+	beamheight# = 0.4(reduced_nht# - holeheight#);
+
+	rh_height# = 1.2reduced_il#;
+	rh_width# / rh_height# = 0.58; % tan(30)
+
+	define_pixels(beamheight);
+	define_pixels(stem_width);
+	define_pixels(rh_height);
+	define_pixels(rh_width);
+
+	pickup pencircle
+		xscaled beamheight
+		yscaled stem_width
+		rotated 45;
+
+	draw
+		exact_center + (-rh_width/2, 0) --
+		exact_center + (0, rh_height/2) --
+		exact_center + (+rh_width/2, 0) --
+		exact_center + (0, -rh_height/2) --
+		cycle;
+enddef;
+
+def draw_petrucci_f_clef(expr exact_center, reduction) =
+	% inspired by L'homme arme super voces musicales in Misse
+	% Josquin, 1502, Petrucci, in: MGG, volume 7, col. 200; also
+	% inspired by Gaspar van Weerbeke, "Virgo Maria" (1502), in:
+	% MGG, volume 9, col. 653 ("Motette"), fig. 3.; also by Andr'e
+	% Campra, "Entr'ee des s'er'enades" (1710), in: MGG, volume 2,
+	% col. 1649 ("Contredanse"), fig. 2.
+	%
+	draw_brevis(exact_center, reduction, true, false);
+
+	save reduced_il, reduced_slt;
+	save stem_width, interline;
+
+	reduced_il# = staff_space# * reduction;
+	reduced_slt# = stafflinethickness# * reduction;
+	stem_width# = 1.4 reduced_slt#;
+	interline# = staff_space#;
+
+	define_pixels(reduced_il);
+	define_pixels(reduced_slt);
+	define_pixels(stem_width);
+	define_pixels(interline);
+
+	addto currentpicture also currentpicture
+		yscaled -1 shifted (0, 2*(ypart exact_center));
+	addto currentpicture also currentpicture 
+		xscaled -1 shifted (2x4l,0);
+
+
+	% brevis stem
+	pickup pencircle xscaled stem_width yscaled blot_diameter;
+	z6 = exact_center + (2x4l - stem_width/2, 0);
+	z7 = z6 + (0, -4reduced_il);
+	draw z6 .. z7;
+
+	% upper diamond
+	draw_diamond(exact_center + (1.6interline*reduction, interline/2),
+		     reduction);
+	pickup pencircle xscaled stem_width yscaled blot_diameter;
+	z8 = exact_center +
+	     (1.6interline*reduction + stem_width/2, interline*reduction);
+	z9 = z8 + (0, 1.5interline*reduction);
+	draw z8 .. z9; % diamond stem
+
+	% lower diamond
+	draw_diamond(exact_center + (1.6interline*reduction, -interline/2),
+		     reduction);
+	pickup pencircle xscaled stem_width yscaled blot_diameter;
+	z10 = exact_center +
+	      (1.6interline*reduction - stem_width/2, -interline*reduction);
+	z11 = z10 + (0, -3.5interline*reduction);
+	draw z10 .. z11; % diamond stem
+
+	set_char_box(0, 3head_width#,
+		     3.5noteheight#*reduction, 1.5noteheight#*reduction);
+enddef;
+
+
+fet_beginchar("petrucci f clef", "petrucci_f", "petruccifclef")
+	if test = 1:
+		draw_staff(-1,3, 0.0);
+	fi;
+	draw_petrucci_f_clef((0,0), 1.0);
+fet_endchar;
+fet_beginchar("petrucci f clef", "petrucci_f_change", "cpetruccifclef")
+	draw_petrucci_f_clef((0,0), .8);
+fet_endchar;
+
+
+def draw_mensural_f_clef(expr exact_center, reduction) =
+	%
+	% inspired by Philippe le Duc, "Dite Signori" (1590), in: MGG,
+	% volume 3, col. 848 ("Duc"); also by John Dowland, "The First
+	% Booke of Songes" (1597), in: MGG, volume 3, col. 721
+	% ("Dowland"), fig. 3.
+
+	save reduced_slt, stem_width, reduced_nht, holeheight, beamheight;
+
+	reduced_slt# = stafflinethickness# * reduction;
+	stem_width# = 1.4 reduced_slt#;
+	reduced_nht# = noteheight# * reduction;
+	holeheight# = 3 reduced_slt#;
+	beamheight# = 0.4(reduced_nht# - holeheight#);
+
+	define_pixels(beamheight, stem_width, staff_space);
+
+	pickup pencircle
+		xscaled beamheight
+		yscaled stem_width
+		rotated 45;
+
+	draw
+		exact_center + (1.0 staff_space, 0.6 staff_space) --
+		exact_center + (1.25 staff_space, 0.4 staff_space);
+
+	draw
+		exact_center + (1.0 staff_space, -0.4 staff_space) --
+		exact_center + (1.25 staff_space, -0.6 staff_space);
+
+	draw	halfcircle scaled 1.2 staff_space rotated -90
+		shifted (-exact_center + (+0.1 staff_space, 0));
+
+	set_char_box(0, 3staff_space#, 3staff_space#, 0);
+enddef;
+
+fet_beginchar("mensural f clef", "mensural_f", "mensfclef")
+	if test = 1:
+		draw_staff(-1,3, 0.0);
+	fi;
+	draw_mensural_f_clef((0,0), 1.0);
+fet_endchar;
+fet_beginchar("mensural f clef", "mensural_f_change", "cmensfclef")
+	draw_mensural_f_clef((0,0), .8);
+fet_endchar;
+
+
+def draw_mensural_g_clef(expr exact_center, reduction) =
+	%
+	% inspired by Francisco Guerrero, "Lib. 1.  Missarum" (1566),
+	% in: MGG, volume 3, col. 858 ("Ducis"); also by Stefano
+	% Fabri, "Quam speciosa veteranis" (1611), in: MGG, volume 3,
+	% col. 1698 ("Fabri"); also by Philippus Dulichius,
+	% "Fasciculus novus ..." (1598), in: MGG, volume 3, col. 919
+	% ("Dulichius"), fig. 1; also by Noe Faignient, "Ic sal de
+	% Heer myn God gebenedye" (1568), in: MGG, volume 3, col. 1735
+	% ("Faignient").
+	%
+	% Metafont code partially inspired by Schwabacher 'G' of yswab
+	% font.
+
+	save reduced_il, stem_width, height, width, apex_o, hair;
+
+	reduced_il#=staff_space#*reduction;
+
+	set_char_box(0.5reduced_il#, 1.5reduced_il#,
+		     1.5reduced_il#, 1.5reduced_il#);
+
+	stem_width# = 0.17 reduced_il#;
+	height# = 1.5 reduced_il#;
+	width# = 1.13 reduced_il#;
+	apex_o# = 0.02 reduced_il#;
+	hair# =  3 stafflinethickness#;
+	define_pixels(reduced_il, stem_width, height, width, apex_o, hair);
+
+	penpos1(2 stem_width, -142);
+	z1l = (0.715 width, 0.742 height);
+	penpos1'(hair, -90);
+	z1'l = z1r;
+	penpos2(1.179 stem_width, -142);
+	z2l = (width, 0.466 height);
+	penpos3(hair, 77);
+	z3 = (0.764 width, 0.067 height); 
+	z4 = (0.59 width, -apex_o);
+	penpos5(1.179 stem_width, 32);
+	z5l=(0, 0.457 height);
+	penpos6(hair, -56.5);
+	z7 = (x4 - 0.843 stem_width, height + apex_o);
+	z7 - z6l = whatever * dir33.5;
+	penpos8(1.286 stem_width, -130);
+	z8r = (0.715 width, 0.742 height) + (-apex_o, apex_o);
+	z6r - z8r = whatever * (z7 - z8l);
+	filldraw
+		z1'r{dir45} .. z2r{down} .. z3r{dir207} .. z5r{up} ..
+		z6r{z7-z6l} & z6r -- z8r -- z8l -- z7 --- z6l ...
+		z5l{down} .. z4{right} .. z3l{dir27} .. z2l{up} ..
+		z1l{1/3[z6l,z7]-z1l} & z1l -- z1r -- z1'r & cycle
+		shifted (-exact_center + (0, -0.75reduced_il));
+
+	penpos9(stem_width, 0);
+	x9r = x4; y9 = 0.3 height;
+
+	pickup pencircle
+		scaled stem_width
+		rotated 45;
+	draw	z9 -- (z9 + (0, -0.4reduced_il))
+		shifted (-exact_center + (0, -0.75reduced_il));
+
+	pickup pencircle
+		xscaled stem_width
+		yscaled hair
+		rotated 30;
+
+	draw halfcircle
+		scaled 0.5 reduced_il
+		rotated -90
+		shifted z8
+		shifted (0, 0.25reduced_il)
+		shifted (-exact_center + (0, -0.75reduced_il));
+
+	draw halfcircle
+		scaled 0.4 reduced_il
+		rotated 90
+		shifted (z8 + (0, 0.45 reduced_il))
+		shifted (0, 0.25reduced_il)
+		shifted (-exact_center + (0, -0.75reduced_il));
+enddef;
+
+
+fet_beginchar("mensural g clef", "mensural_g", "mensgclef")
+	if test = 1:
+		draw_staff(-1,3, 0.0);
+	fi;
+	draw_mensural_g_clef((0,0), 1.0);
+fet_endchar;
+fet_beginchar("mensural g clef", "mensural_g_change", "cmensgclef")
+	draw_mensural_g_clef((0,0), .8);
+fet_endchar;
+
+
+
+def draw_petrucci_g_clef(expr exact_center, reduction) =
+	% inspired by Josquin Desprez, "Stabat Mater", Libro tertio,
+	% 1519, printed by Petrucci, in: MGG, volume 7, Table 11.
+
+	set_char_box(0.6 staff_space#, 0.8 staff_space#, 0.6 staff_space#, 
+	  4.0 staff_space#);
+
+	save reduced_il, reduced_slt;
+
+	reduced_il# = staff_space# * reduction;
+	reduced_slt# = stafflinethickness# * reduction;
+	define_pixels(reduced_il, reduced_slt);
+
+	save za, zb, zc, zd, ze, zf, zg, zh, zi, zj;
+	pair za, zb, zc, zd, ze, zf, zg, zh, zi, zj;
+
+	pickup pencircle
+		xscaled 0.50 reduced_slt
+		yscaled 0.22 reduced_il
+		rotated -35;
+
+	za = exact_center + (+0.00 reduced_il, +0.00 reduced_il);
+	zb = exact_center + (+0.20 reduced_il, +1.20 reduced_il);
+	zc = exact_center + (-0.10 reduced_il, +2.00 reduced_il);
+	zd = exact_center + (-0.50 reduced_il, +3.00 reduced_il);
+	ze = exact_center + (+0.00 reduced_il, +3.70 reduced_il);
+	zf = exact_center + (+0.20 reduced_il, +3.00 reduced_il);
+	zg = exact_center + (-0.20 reduced_il, +2.00 reduced_il);
+	zh = exact_center + (-0.50 reduced_il, +1.70 reduced_il);
+	zi = exact_center + (-0.80 reduced_il, +0.75 reduced_il);
+	zj = exact_center + (-0.60 reduced_il, +0.60 reduced_il);
+
+	draw za{-1,2} .. zb .. zc .. zd .. ze .. zf .. zg .. zh .. zi .. zj;
+
+	save za, zb, zc, zd, ze, zf;
+	pair za, zb, zc, zd, ze, zf;
+
+	pickup pencircle
+		xscaled 0.75 reduced_slt
+		yscaled 0.33 reduced_il
+		rotated -35;
+
+	za = exact_center + (+0.25 reduced_il, +0.45 reduced_il);
+	zb = exact_center + (-0.25 reduced_il, +0.45 reduced_il);
+	zc = exact_center + (-0.25 reduced_il, -0.45 reduced_il);
+	zd = exact_center + (+0.25 reduced_il, -0.45 reduced_il);
+	ze = exact_center + (+0.30 reduced_il, +0.00 reduced_il);
+	zf = exact_center + (+0.00 reduced_il, +0.00 reduced_il);
+
+	draw za .. zb .. zc .. zd .. {up}ze -- zf;
+enddef;
+
+
+fet_beginchar("petrucci g clef", "petrucci_g", "petruccigclef")
+	if test = 1:
+		draw_staff(-1,3, 0.0);
+	fi;
+	draw_petrucci_g_clef((0,0), 1.0);
+fet_endchar;
+fet_beginchar("petrucci g clef", "petrucci_g_change", "cpetruccigclef")
+	draw_petrucci_g_clef((0,0), .8);
+fet_endchar;
+
+
+
+%%%%%%%%
+%
+%
+%
+% Hufnagel
+%
+%
+%
+def draw_hufnagel_do_clef(expr exact_center, reduction) =
+	%
+	% inspired by Graduale of Friedrich Zollner (1442), in: MGG,
+	% volume 9, col. 1413 ("Neustift"), fig. 1.
+	%
+	save reduced_il;
+
+	reduced_il# = staff_space# * reduction;
+
+	define_pixels(reduced_il);
+
+	pickup pencircle
+		xscaled (0.60reduced_il)
+		yscaled (0.10reduced_il)
+		rotated 40;
+	save za, zb, zc, zd, ze, zf;
+	pair za, zb, zc, zd, ze, zf;
+
+	za = exact_center + (+0.30reduced_il, +.45reduced_il);
+	zb = exact_center + (+0.20reduced_il, +.45reduced_il);
+	zc = exact_center + (-0.10reduced_il, +.60reduced_il);
+	zd = exact_center + (-0.40reduced_il, +.45reduced_il);
+	ze = exact_center + (-0.40reduced_il, -.45reduced_il);
+	zf = exact_center + (-0.20reduced_il, -.55reduced_il);
+	draw za .. zb .. zc -- zd -- ze -- zf;
+
+	set_char_box(0.5reduced_il#, 0.5reduced_il#, 0, reduced_il#);
+enddef;
+
+
+fet_beginchar("Hufnagel do clef", "hufnagel_do", "hufnageldoclef")
+	if test = 1:
+		draw_staff(-1,3, 0.0);
+	fi;
+	draw_hufnagel_do_clef((0,0), 1.0);
+fet_endchar;
+fet_beginchar("Hufnagel do clef", "hufnagel_do_change", "chufnageldoclef")
+	draw_hufnagel_do_clef((1.3 staff_space#,0), .8);
+fet_endchar;
+
+
+def draw_hufnagel_fa_clef(expr exact_center, reduction) =
+	%
+	% inspired by Bamberger Manuscript (15th century), in:
+	% MGG, volume 2, table 59.
+	%
+	save reduced_il;
+
+	reduced_il# = staff_space# * reduction;
+
+	define_pixels(reduced_il);
+
+	pickup pencircle
+		xscaled (0.60reduced_il)
+		yscaled (0.10reduced_il)
+		rotated 40;
+	save za, zb, zc, zd, ze, zf;
+	pair za, zb, zc, zd, ze, zf;
+
+	za = exact_center + (+0.30reduced_il, +0.70reduced_il);
+	zb = exact_center + (+0.20reduced_il, +0.70reduced_il);
+	zc = exact_center + (-0.10reduced_il, +0.85reduced_il);
+	zd = exact_center + (-0.40reduced_il, +0.70reduced_il);
+	ze = exact_center + (-0.40reduced_il, -1.10reduced_il);
+	draw za .. zb .. zc -- zd -- ze;
+
+	save zg, zh, zi, zj;
+	pair zg, zh, zi, zj;
+
+	zg = exact_center + (+0.30reduced_il, -0.05reduced_il);
+	zh = exact_center + (+0.20reduced_il, -0.05reduced_il);
+	zi = exact_center + (-0.10reduced_il, +0.10reduced_il);
+	zj = exact_center + (-0.40reduced_il, -0.05reduced_il);
+	draw zg .. zh .. zi -- zj;
+
+	set_char_box(0.5reduced_il#, 0.5reduced_il#, 0, reduced_il#);
+enddef;
+
+
+fet_beginchar("Hufnagel fa clef", "hufnagel_fa", "hufnagelfaclef")
+	if test = 1:
+		draw_staff(-1,3, 0.0);
+	fi;
+	draw_hufnagel_fa_clef((0,0), 1.0);
+fet_endchar;
+fet_beginchar("Hufnagel fa clef", "hufnagel_fa_change", "chufnagelfaclef")
+	draw_hufnagel_fa_clef((0,0), .8);
+fet_endchar;
+
+
+def draw_hufnagel_do_fa_clef(expr exact_center, reduction) =
+	draw_hufnagel_do_clef(exact_center, reduction);
+	draw_hufnagel_fa_clef(exact_center + (0, -2staff_space), reduction);
+enddef;
+
+
+fet_beginchar("Hufnagel do/fa clef", "hufnagel_do_fa", "hufnageldofaclef")
+	if test = 1:
+		draw_staff(-1,3, 0.0);
+	fi;
+	draw_hufnagel_do_fa_clef((0,0), 1.0);
+fet_endchar;
+fet_beginchar("Hufnagel do/fa clef", "hufnagel_do_fa_change",
+	      "chufnageldofaclef")
+	draw_hufnagel_do_fa_clef((0,0), .8);
+fet_endchar;
+
+
+fet_endgroup("clefs");
diff -purN ../lilypond-1.5.28/mf/parmesan-custodes.mf ./mf/parmesan-custodes.mf
--- ../lilypond-1.5.28/mf/parmesan-custodes.mf	Thu Jan  1 01:00:00 1970
+++ ./mf/parmesan-custodes.mf	Fri Feb  1 19:20:59 2002
@@ -0,0 +1,275 @@
+% -*-Fundamental-*-
+% feta-custodes.mf --  implement custos symbols
+% 
+% source file of LilyPond's pretty-but-neat music font
+% 
+% (C) 2000, 2002 Juergen Reuter <reuter@ipd.uka.de>
+% 
+
+save black_notehead_width;
+numeric black_notehead_width;
+
+fet_begingroup("custodes");
+
+noteheight#:=staff_space#+ (1 + overdone_heads) *stafflinethickness#;
+define_pixels(noteheight);
+
+
+%%%%%%%%
+%
+% Hufnagel style
+%
+
+% stem up
+fet_beginchar("Custos Hufnagel", "hufnagel", "hufnagel")
+	save b_h,a_w;
+	a_b:=1.54; % b_h*a_b/a_w = wd/ht
+	b_h:=0.85;
+	a_w:=1.09;
+
+	save a, beta, ht, wd;
+	ht# =noteheight#;
+	2beta#=ht#*b_h;
+	a# = beta#*a_b;
+	wd# = 2a# / a_w;
+	set_char_box(0, wd#, ht#/2, ht#/2);
+	black_notehead_width# := wd#;
+
+	save rh_width, rh_height, rh_edge; % rhombus dimensions
+	rh_width#=0.7ht#; % ht*tan(35)
+	rh_height#=1.0ht#;
+	rh_edge#=0.61ht#; % (ht/2)/cos(35)
+
+	define_pixels(rh_width, rh_height, rh_edge);
+	pickup pencircle
+	  xscaled stafflinethickness
+	  yscaled rh_edge rotated -35;
+	z1=(0.5rh_width,+0.25rh_height);
+	z2=(1.0rh_width,-0.25rh_height);
+	z3=(2.0rh_width,+0.50rh_height);
+	draw z1 -- z2 -- z3;
+fet_endchar;
+
+% stem down
+fet_beginchar("Reverse Custos Hufnagel", "rhufnagel", "rhufnagel")
+	save b_h,a_w;
+	a_b:=1.54; % b_h*a_b/a_w = wd/ht
+	b_h:=0.85;
+	a_w:=1.09;
+
+	save a, beta, ht, wd;
+	ht# =noteheight#;
+	2beta#=ht#*b_h;
+	a# = beta#*a_b;
+	wd# = 2a# / a_w;
+	set_char_box(0, wd#, ht#/2, ht#/2);
+	black_notehead_width# := wd#;
+
+	save rh_width, rh_height, rh_edge; % rhombus dimensions
+	rh_width#=0.7ht#; % ht*tan(35)
+	rh_height#=1.0ht#;
+	rh_edge#=0.61ht#; % (ht/2)/cos(35)
+
+	define_pixels(rh_width, rh_height, rh_edge);
+	pickup pencircle
+	  xscaled stafflinethickness
+	  yscaled rh_edge rotated +35;
+	z1=(0.5rh_width,-0.25rh_height);
+	z2=(1.0rh_width,+0.25rh_height);
+	z3=(2.0rh_width,-0.50rh_height);
+	draw z1 -- z2 -- z3;
+fet_endchar;
+
+
+%%%%%%%%
+%
+% Medicaea style
+%
+
+% stem up
+fet_beginchar("Custos Med.", "medicaea", "medicaea")
+	save b_h, a_w;
+	a_b := 1.54; % b_h*a_b/a_w = wd/ht
+	b_h := 0.85;
+	a_w := 1.09;
+
+	save a, beta, ht, wd;
+	ht# = noteheight# * mag;
+	2beta# = ht# * b_h;
+	a# = beta# * a_b;
+	wd# = 0.4a# / a_w;
+	set_char_box(0, wd#, ht#/2, ht#/2); % width intentionally too small
+	black_notehead_width# := wd#;
+
+	define_pixels(ht, wd);
+
+	% head
+	pickup pencircle xscaled blot_diameter yscaled 1.0ht;
+	z1 = (0.0wd, 0.0ht);
+	z2 = z1 + (1.0wd - blot_diameter/2, 0);
+	draw z1 .. z2;
+
+	% stem
+	pickup pencircle scaled stafflinethickness;
+	z3 = (1.0wd - stafflinethickness/2, 0.0ht);
+	z4 = z3 + (0, +1.0ht);
+	draw z3 .. z4;
+fet_endchar;
+
+
+% stem down
+fet_beginchar("Reverse Custos Med.", "rmedicaea", "rmedicaea")
+	save b_h, a_w;
+	a_b := 1.54; % b_h*a_b/a_w = wd/ht
+	b_h := 0.85;
+	a_w := 1.09;
+
+	save a, beta, ht, wd;
+	ht# = noteheight# * mag;
+	2beta# = ht# * b_h;
+	a# = beta# * a_b;
+	wd# = 0.4a# / a_w;
+	set_char_box(0, wd#, ht#/2, ht#/2); % width intentionally too small
+	black_notehead_width# := wd#;
+
+	define_pixels(ht, wd);
+
+	% head
+	pickup pencircle xscaled blot_diameter yscaled 1.0ht;
+	z1 = (0.0wd, 0.0ht);
+	z2 = z1 + (1.0wd - blot_diameter/2, 0);
+	draw z1 .. z2;
+
+	% stem
+	pickup pencircle scaled stafflinethickness;
+	z3 = (1.0wd - stafflinethickness/2, 0.0ht);
+	z4 = z3 + (0, -1.0ht);
+	draw z3 .. z4;
+fet_endchar;
+
+
+%%%%%%%%
+%
+% Editio Vaticana style
+%
+
+% stem up
+fet_beginchar("Custos Ed. Vat.", "vaticana", "vaticana")
+	save b_h, a_w;
+	a_b := 1.54; % b_h*a_b/a_w = wd/ht
+	b_h := 0.85;
+	a_w := 1.09;
+
+	save a, beta, ht, wd;
+	ht# = noteheight# * mag;
+	2beta# = ht# * b_h;
+	a# = beta# * a_b;
+	wd# = 0.4a# / a_w;
+	set_char_box(0, wd#, ht#/2, ht#/2);
+	black_notehead_width# := wd#;
+
+	define_pixels(ht, wd);
+	pickup pencircle scaled stafflinethickness;
+
+	z1 = (0.0wd, +0.05ht);
+	z2 = (1.0wd + 0.5stafflinethickness, 0.0ht);
+	penpos1(0.5ht, 90);
+	penpos2(0.5ht, 90);
+	penstroke z1e{z2 - z1} .. {right}z2e;
+
+	z3=(1.0wd, +0.0ht);
+	z4=(1.0wd, +1.0ht);
+	draw z3 -- z4;
+fet_endchar;
+
+
+% stem down
+fet_beginchar("Reverse Custos Ed. Vat.", "rvaticana", "rvaticana")
+	save b_h, a_w;
+	a_b := 1.54; % b_h*a_b/a_w = wd/ht
+	b_h := 0.85;
+	a_w := 1.09;
+
+	save a, beta, ht, wd;
+	ht# = noteheight# * mag;
+	2beta# = ht# * b_h;
+	a# = beta# * a_b;
+	wd# = 0.4a# / a_w;
+	set_char_box(0, wd#, ht#/2, ht#/2);
+	black_notehead_width# := wd#;
+
+	define_pixels(ht, wd);
+	pickup pencircle scaled stafflinethickness;
+
+	z1 = (0.0wd, -0.05ht);
+	z2 = (1.0wd + 0.5stafflinethickness, -0.0ht);
+	penpos1(0.5ht, 90);
+	penpos2(0.5ht, 90);
+	penstroke z1e{z2 - z1} .. {right}z2e;
+
+	z3=(1.0wd, -0.0ht);
+	z4=(1.0wd, -1.0ht);
+	draw z3 -- z4;
+fet_endchar;
+
+
+%%%%%%%%
+%
+% Mensural style
+%
+
+% stem up
+fet_beginchar("Custos Mensural", "mensural", "mensural")
+	save b_h,a_w;
+	a_b:=1.54; % b_h*a_b/a_w = wd/ht
+	b_h:=0.85;
+	a_w:=1.09;
+
+	save a, beta, ht, wd;
+	ht# =noteheight#;
+	2beta#=ht#*b_h;
+	a# = beta#*a_b;
+	wd# = 2a# / a_w;
+	set_char_box(0, wd#, ht#/2, ht#/2); % width intentionally too small
+	black_notehead_width# := wd#;
+
+	define_pixels(ht, wd);
+	pickup pencircle xscaled stafflinethickness yscaled 0.4ht rotated -35;
+	z1=(0.0wd,-0.2ht);
+	z2=(0.2wd,+0.2ht);
+	z3=(0.4wd,-0.2ht);
+	z4=(0.6wd,+0.2ht);
+	z5=(0.8wd,-0.2ht);
+	z6=(1.6wd,+1.4ht);
+	draw z1 -- z2 -- z3 -- z4 -- z5 -- z6;
+fet_endchar;
+
+% stem down
+fet_beginchar("Reverse Custos Mensural", "rmensural", "rmensural")
+	save b_h,a_w;
+	a_b:=1.54; % b_h*a_b/a_w = wd/ht
+	b_h:=0.85;
+	a_w:=1.09;
+
+	save a, beta, ht, wd;
+	ht# =noteheight#;
+	2beta#=ht#*b_h;
+	a# = beta#*a_b;
+	wd# = 2a# / a_w;
+	set_char_box(0, wd#, ht#/2, ht#/2); % width intentionally too small
+	black_notehead_width# := wd#;
+
+	define_pixels(ht, wd);
+	pickup pencircle xscaled stafflinethickness yscaled 0.4ht rotated +35;
+	z1=(0.0wd,+0.2ht);
+	z2=(0.2wd,-0.2ht);
+	z3=(0.4wd,+0.2ht);
+	z4=(0.6wd,-0.2ht);
+	z5=(0.8wd,+0.2ht);
+	z6=(1.6wd,-1.4ht);
+	draw z1 -- z2 -- z3 -- z4 -- z5 -- z6;
+fet_endchar;
+
+fet_endgroup("custodes");
+define_pixels(black_notehead_width);
+
diff -purN ../lilypond-1.5.28/mf/parmesan-flags.mf ./mf/parmesan-flags.mf
--- ../lilypond-1.5.28/mf/parmesan-flags.mf	Thu Jan  1 01:00:00 1970
+++ ./mf/parmesan-flags.mf	Fri Feb  1 19:20:59 2002
@@ -0,0 +1,471 @@
+% flags 
+%
+
+
+fet_begingroup("flags")
+save outer_path;
+path outer_path;
+% Flags pointing down overlap with  the notehead (in x-direction), so 
+% the down-flag can be bigger
+upflag_width# = .750 black_notehead_width# + stemthickness#/2;
+downflag_width# = .833 black_notehead_width# + stemthickness#/2;
+
+right_upflag_space# = .2 upflag_width#;
+right_downflag_space# = .2 downflag_width#;
+
+%
+% Flags pointing down cannot overlap with the notehead in y-direction,
+% so they have less slant.
+
+% Because of optical illusion, the utmost flag (bottom for
+% down-pointing, top for up-pointing) should be smaller than the other
+% flags.  Adobe Sonata doesn't do this correctly.  (Instead they have
+% an extension flag, which looks less elegant)
+%
+
+save hip_thickness, foot_thickness;
+hip_thickness# = 1.3 stemthickness#;
+foot_thickness# =  hip_thickness#;
+
+%%%%%%%%
+%
+%
+%
+% Mensural Notation
+%
+%
+%
+
+def draw_mensural_outermost_flag_i =
+	define_pixels(stafflinethickness, staff_space)
+
+	pickup pencircle
+		xscaled 1.00 stafflinethickness
+		yscaled 0.22 staff_space
+		rotated -35;
+
+	save za, zb, zc, zd, ze;
+	pair za, zb, zc, zd, ze;
+
+	za = (+0.00 staff_space, -0.00 staff_space);
+	zb = (+0.15 staff_space, -0.00 staff_space);
+	zc = (+0.45 staff_space, -0.35 staff_space);
+	zd = (+0.45 staff_space, -0.85 staff_space);
+	ze = (+0.00 staff_space, -2.00 staff_space);
+
+	draw za .. zb -- zc{zc-zb} .. {ze-zd}zd -- ze;
+enddef;
+
+def draw_mensural_outermost_flag_ii =
+	define_pixels(stafflinethickness, staff_space)
+
+	pickup pencircle
+		xscaled 1.00 stafflinethickness
+		yscaled 0.22 staff_space
+		rotated -35;
+
+	save za, zb, zc, zd, ze;
+	pair za, zb, zc, zd, ze;
+
+	za = (+0.00 staff_space, -0.00 staff_space);
+	zb = (+0.15 staff_space, -0.00 staff_space);
+	zc = (+0.20 staff_space, -0.05 staff_space);
+	zd = (+0.20 staff_space, -1.15 staff_space);
+	ze = (+0.00 staff_space, -1.40 staff_space);
+
+	draw za .. zb -- zc{zc-zb} .. {ze-zd}zd -- ze;
+enddef;
+
+def draw_mensural_inner_flag(expr il_shift) =
+	define_pixels(stafflinethickness, staff_space)
+
+	pickup pencircle
+		xscaled 1.00 stafflinethickness
+		yscaled 0.22 staff_space
+		rotated -35;
+
+	save zs, za, zb, zc, zd;
+	pair zs, za, zb, zc, zd;
+
+	zs = (0, -il_shift * staff_space);
+	za = zs + (+0.00 staff_space, -0.10 staff_space);
+	zb = zs + (+0.33 staff_space, -0.30 staff_space);
+	zc = zs + (+0.33 staff_space, -0.70 staff_space);
+	zd = zs + (+0.00 staff_space, -0.90 staff_space);
+
+	draw za{2,1} .. zb .. zc .. {-2,-1}zd;
+enddef;
+
+fet_beginchar("8th Mensural Flag (up)", "mensuralu03", "menseighthflag")
+	set_char_box(0, 0.60 staff_space#, 2.00 staff_space#, 0)
+	draw_mensural_outermost_flag_i
+fet_endchar;
+
+fet_beginchar("8th Mensural Flag (up)", "mensuralu13", "mens1eighthflag")
+	set_char_box(0, 0.60 staff_space#, 1.50 staff_space#, 0)
+	draw_mensural_outermost_flag_ii
+fet_endchar;
+
+fet_beginchar("8th Mensural Flag (down)", "mensurald03", "mensdeighthflag")
+	set_char_box(0.60 staff_space#, 0, 0, 2.00 staff_space#)
+	draw_mensural_outermost_flag_i
+	currentpicture := currentpicture xscaled -1 yscaled -1;
+fet_endchar;
+
+fet_beginchar("8th Mensural Flag (down)", "mensurald13", "mensd1eighthflag")
+	set_char_box(0.60 staff_space#, 0, 0, 1.50 staff_space#)
+	draw_mensural_outermost_flag_ii
+	currentpicture := currentpicture xscaled -1 yscaled -1;
+fet_endchar;
+
+fet_beginchar("16th Mensural Flag (up)", "mensuralu04", "menssixteenthflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_i
+	draw_mensural_inner_flag(2.0)
+fet_endchar;
+
+fet_beginchar("16th Mensural Flag (up)", "mensuralu14", "mens1sixteenthflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_ii
+	draw_mensural_inner_flag(1.5)
+fet_endchar;
+
+fet_beginchar("16th Mensural Flag (down)", "mensurald04", "mensdsixteenthflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_i
+	draw_mensural_inner_flag(2.0)
+	currentpicture := currentpicture xscaled -1 yscaled -1;
+fet_endchar;
+
+fet_beginchar("16th Mensural Flag (down)", "mensurald14", "mensd1sixteenthflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_ii
+	draw_mensural_inner_flag(1.5)
+	currentpicture := currentpicture xscaled -1 yscaled -1;
+fet_endchar;
+
+fet_beginchar("32th Mensural Flag (up)", "mensuralu05", "mensthirtysecondflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_i
+	draw_mensural_inner_flag(2.0)
+	draw_mensural_inner_flag(3.0)
+fet_endchar;
+
+fet_beginchar("32th Mensural Flag (up)", "mensuralu15", "mens1thirtysecondflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_ii
+	draw_mensural_inner_flag(1.5)
+	draw_mensural_inner_flag(2.5)
+fet_endchar;
+
+fet_beginchar("32th Mensural Flag (down)", "mensurald05", "mensdthirtysecondflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_i
+	draw_mensural_inner_flag(2.0)
+	draw_mensural_inner_flag(3.0)
+	currentpicture := currentpicture xscaled -1 yscaled -1;
+fet_endchar;
+
+fet_beginchar("32th Mensural Flag (down)", "mensurald15", "mensd1thirtysecondflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_ii
+	draw_mensural_inner_flag(1.5)
+	draw_mensural_inner_flag(2.5)
+	currentpicture := currentpicture xscaled -1 yscaled -1;
+fet_endchar;
+
+fet_beginchar("64th Mensural Flag (up)", "mensuralu06", "menssixtyfourthflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_i
+	draw_mensural_inner_flag(1.5)
+	draw_mensural_inner_flag(2.5)
+	draw_mensural_inner_flag(3.5)
+fet_endchar;
+
+fet_beginchar("64th Mensural Flag (up)", "mensuralu16", "mens1sixtyfourthflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_ii
+	draw_mensural_inner_flag(1.17)
+	draw_mensural_inner_flag(2.08)
+	draw_mensural_inner_flag(3.00)
+fet_endchar;
+
+fet_beginchar("64th Mensural Flag (down)", "mensurald06", "mensdsixtyfourthflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_i
+	draw_mensural_inner_flag(1.5)
+	draw_mensural_inner_flag(2.5)
+	draw_mensural_inner_flag(3.5)
+	currentpicture := currentpicture xscaled -1 yscaled -1;
+fet_endchar;
+
+fet_beginchar("64th Mensural Flag (down)", "mensurald16", "mensd1sixtyfourthflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_ii
+	draw_mensural_inner_flag(1.17)
+	draw_mensural_inner_flag(2.08)
+	draw_mensural_inner_flag(3.00)
+	currentpicture := currentpicture xscaled -1 yscaled -1;
+fet_endchar;
+
+%%%%%%%%
+%
+%
+%
+% Mensural Notation
+%
+%
+%
+
+def draw_mensural_outermost_flag_i =
+	define_pixels(stafflinethickness, staff_space)
+
+	pickup pencircle
+		xscaled 1.00 stafflinethickness
+		yscaled 0.22 staff_space
+		rotated -35;
+
+	save za, zb, zc, zd, ze;
+	pair za, zb, zc, zd, ze;
+
+	za = (+0.00 staff_space, -0.00 staff_space);
+	zb = (+0.15 staff_space, -0.00 staff_space);
+	zc = (+0.45 staff_space, -0.35 staff_space);
+	zd = (+0.45 staff_space, -0.85 staff_space);
+	ze = (+0.00 staff_space, -2.00 staff_space);
+
+	draw za .. zb -- zc{zc-zb} .. {ze-zd}zd -- ze;
+enddef;
+
+def draw_mensural_outermost_flag_ii =
+	define_pixels(stafflinethickness, staff_space)
+
+	pickup pencircle
+		xscaled 1.00 stafflinethickness
+		yscaled 0.22 staff_space
+		rotated -35;
+
+	save za, zb, zc, zd, ze;
+	pair za, zb, zc, zd, ze;
+
+	za = (+0.00 staff_space, -0.00 staff_space);
+	zb = (+0.15 staff_space, -0.00 staff_space);
+	zc = (+0.20 staff_space, -0.05 staff_space);
+	zd = (+0.20 staff_space, -1.15 staff_space);
+	ze = (+0.00 staff_space, -1.40 staff_space);
+
+	draw za .. zb -- zc{zc-zb} .. {ze-zd}zd -- ze;
+enddef;
+
+def draw_mensural_inner_flag(expr il_shift) =
+	define_pixels(stafflinethickness, staff_space)
+
+	pickup pencircle
+		xscaled 1.00 stafflinethickness
+		yscaled 0.22 staff_space
+		rotated -35;
+
+	save zs, za, zb, zc, zd;
+	pair zs, za, zb, zc, zd;
+
+	zs = (0, -il_shift * staff_space);
+	za = zs + (+0.00 staff_space, -0.10 staff_space);
+	zb = zs + (+0.33 staff_space, -0.30 staff_space);
+	zc = zs + (+0.33 staff_space, -0.70 staff_space);
+	zd = zs + (+0.00 staff_space, -0.90 staff_space);
+
+	draw za{2,1} .. zb .. zc .. {-2,-1}zd;
+enddef;
+
+fet_beginchar("8th Mensural Flag (up)", "mensuralu03", "menseighthflag")
+	set_char_box(0, 0.60 staff_space#, 2.00 staff_space#, 0)
+	draw_mensural_outermost_flag_i
+fet_endchar;
+
+fet_beginchar("8th Mensural Flag (up)", "mensuralu13", "mens1eighthflag")
+	set_char_box(0, 0.60 staff_space#, 1.50 staff_space#, 0)
+	draw_mensural_outermost_flag_ii
+fet_endchar;
+
+fet_beginchar("8th Mensural Flag (down)", "mensurald03", "mensdeighthflag")
+	set_char_box(0.60 staff_space#, 0, 0, 2.00 staff_space#)
+	draw_mensural_outermost_flag_i
+	currentpicture := currentpicture xscaled -1 yscaled -1;
+fet_endchar;
+
+fet_beginchar("8th Mensural Flag (down)", "mensurald13", "mensd1eighthflag")
+	set_char_box(0.60 staff_space#, 0, 0, 1.50 staff_space#)
+	draw_mensural_outermost_flag_ii
+	currentpicture := currentpicture xscaled -1 yscaled -1;
+fet_endchar;
+
+fet_beginchar("16th Mensural Flag (up)", "mensuralu04", "menssixteenthflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_i
+	draw_mensural_inner_flag(2.0)
+fet_endchar;
+
+fet_beginchar("16th Mensural Flag (up)", "mensuralu14", "mens1sixteenthflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_ii
+	draw_mensural_inner_flag(1.5)
+fet_endchar;
+
+fet_beginchar("16th Mensural Flag (down)", "mensurald04", "mensdsixteenthflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_i
+	draw_mensural_inner_flag(2.0)
+	currentpicture := currentpicture xscaled -1 yscaled -1;
+fet_endchar;
+
+fet_beginchar("16th Mensural Flag (down)", "mensurald14", "mensd1sixteenthflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_ii
+	draw_mensural_inner_flag(1.5)
+	currentpicture := currentpicture xscaled -1 yscaled -1;
+fet_endchar;
+
+fet_beginchar("32th Mensural Flag (up)", "mensuralu05", "mensthirtysecondflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_i
+	draw_mensural_inner_flag(2.0)
+	draw_mensural_inner_flag(3.0)
+fet_endchar;
+
+fet_beginchar("32th Mensural Flag (up)", "mensuralu15", "mens1thirtysecondflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_ii
+	draw_mensural_inner_flag(1.5)
+	draw_mensural_inner_flag(2.5)
+fet_endchar;
+
+fet_beginchar("32th Mensural Flag (down)", "mensurald05", "mensdthirtysecondflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_i
+	draw_mensural_inner_flag(2.0)
+	draw_mensural_inner_flag(3.0)
+	currentpicture := currentpicture xscaled -1 yscaled -1;
+fet_endchar;
+
+fet_beginchar("32th Mensural Flag (down)", "mensurald15", "mensd1thirtysecondflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_ii
+	draw_mensural_inner_flag(1.5)
+	draw_mensural_inner_flag(2.5)
+	currentpicture := currentpicture xscaled -1 yscaled -1;
+fet_endchar;
+
+fet_beginchar("64th Mensural Flag (up)", "mensuralu06", "menssixtyfourthflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_i
+	draw_mensural_inner_flag(1.5)
+	draw_mensural_inner_flag(2.5)
+	draw_mensural_inner_flag(3.5)
+fet_endchar;
+
+fet_beginchar("64th Mensural Flag (up)", "mensuralu16", "mens1sixtyfourthflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_ii
+	draw_mensural_inner_flag(1.17)
+	draw_mensural_inner_flag(2.08)
+	draw_mensural_inner_flag(3.00)
+fet_endchar;
+
+fet_beginchar("64th Mensural Flag (down)", "mensurald06", "mensdsixtyfourthflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_i
+	draw_mensural_inner_flag(1.5)
+	draw_mensural_inner_flag(2.5)
+	draw_mensural_inner_flag(3.5)
+	currentpicture := currentpicture xscaled -1 yscaled -1;
+fet_endchar;
+
+fet_beginchar("64th Mensural Flag (down)", "mensurald16", "mensd1sixtyfourthflag")
+	set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0)
+	draw_mensural_outermost_flag_ii
+	draw_mensural_inner_flag(1.17)
+	draw_mensural_inner_flag(2.08)
+	draw_mensural_inner_flag(3.00)
+	currentpicture := currentpicture xscaled -1 yscaled -1;
+fet_endchar;
+
+%%%%%%%%
+%
+%
+%
+% Single Stroke for Short Appogiatura
+%
+%
+%
+
+fet_beginchar("grace dash (up)", "ugrace", "gracedash")
+	save flare, 
+		hip_depth_ratio, hip_width,
+		foot_depth;
+
+	flare# = 1.0 staff_space#;
+	hip_depth_ratio = .72; 
+	hip_width# = upflag_width# - hip_thickness#/2;
+
+	foot_depth# =  3 staff_space#;
+
+	define_pixels(flare, hip_width, hip_thickness,
+		foot_depth, foot_thickness);
+
+	set_char_box(hip_width# * hip_depth_ratio,
+	  hip_width# + stemthickness#/2 + right_upflag_space#, 
+	  foot_depth# * hip_depth_ratio, -flare#)
+
+	pickup pencircle scaled 1.5 stemthickness;
+	draw (-b ,-d) ..
+	  (w, h);
+fet_endchar;
+
+fet_beginchar("grace dash (down)", "dgrace", "dgracedash")
+	save flare, hip_depth_ratio, hip_width,	foot_depth;
+	save flagspace, total_depth, flag_count;
+	
+	flag_count = 1;
+	flare# = .99 staff_space#;
+	flagspace# = .9 staff_space#;	
+	hip_depth_ratio = .72 ;
+	hip_width# = downflag_width# - hip_thickness#/2;
+	total_depth# = 2.85 staff_space#;
+	(flag_count-1) * flagspace# + foot_depth# = total_depth#;
+
+	foot_width_ratio = .8;
+
+	define_pixels(flare, hip_width, hip_thickness,
+		flagspace, foot_depth);
+
+	set_char_box(hip_width# * hip_depth_ratio,
+	  hip_width# + stemthickness#/2 + right_downflag_space#,
+	  foot_depth# * hip_depth_ratio, -flare#)
+
+	pickup pencircle scaled 1.5 stemthickness;
+	draw (-b, -d) .. (w,h);
+	y_mirror_char;
+fet_endchar;
+
+% ustem?
+%
+%
+% Stem characters so we can compose metronome markings with Feta
+% entirely.
+%
+
+fet_beginchar("stem (up)", "stem", "stem")
+	set_char_box(stemthickness#/2, stemthickness#/2, 0, 3.5staff_space#);
+	pickup pencircle scaled stemthickness;
+	draw (0, 0.2staff_space) .. (0, 3.5staff_space);
+fet_endchar;
+
+% do we want this?
+fet_beginchar("stem (down)", "dstem", "dstem")
+	set_char_box(stemthickness#/2, stemthickness#/2, 3.5staff_space#, 0);
+	pickup pencircle scaled stemthickness;
+	draw (0, -0.2staff_space) .. (0, -3.5staff_space);
+fet_endchar;
+
+
+fet_endgroup("flags");
diff -purN ../lilypond-1.5.28/mf/parmesan-generic.mf ./mf/parmesan-generic.mf
--- ../lilypond-1.5.28/mf/parmesan-generic.mf	Thu Jan  1 01:00:00 1970
+++ ./mf/parmesan-generic.mf	Fri Feb  1 19:20:59 2002
@@ -0,0 +1,38 @@
+% 
+% feta-generic.mf --  implement generic stuff: include lots of files, but don't
+%  set dims.
+%
+% source file of the Feta (defintively not an abbreviation for Font-En-Tja)
+% music font
+% 
+% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% 
+
+
+if test = -1:
+	mode := smoke;
+fi
+
+mode_setup;
+%
+
+input feta-macros;
+
+make_pen_stack;
+make_picture_stack;
+input feta-params;
+
+font_x_height  staff_space#;
+
+if test = 0: 
+	input parmesan-rests;
+	input parmesan-heads;
+	input parmesan-clefs;
+	input parmesan-custodes
+	input parmesan-accidentals;
+	input parmesan-flags;
+	input parmesan-timesig;
+
+else:
+
+fi
diff -purN ../lilypond-1.5.28/mf/parmesan-heads.mf ./mf/parmesan-heads.mf
--- ../lilypond-1.5.28/mf/parmesan-heads.mf	Thu Jan  1 01:00:00 1970
+++ ./mf/parmesan-heads.mf	Fri Feb  1 19:20:59 2002
@@ -0,0 +1,768 @@
+%  -*-Fundamental-*-
+% feta-bolletjes.mf --  implement noteheads
+% 
+% source file of LilyPond's pretty-but-neat music font
+% 
+% (c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+% & Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% & Juergen Reuter <reuter@ipd.uka.de>
+% 
+
+
+% most beautiful noteheads are pronounced, not circular, 
+% and not even symmetric.
+% These examples are inspired by [Wanske], see literature list
+
+
+save black_notehead_width;
+numeric black_notehead_width;
+
+fet_begingroup("noteheads");
+
+noteheight#:=staff_space#+ (1 + overdone_heads) *stafflinethickness#;
+define_pixels(noteheight);
+
+
+%%%%%%%%
+%
+%
+%
+% MENSURAL NOTATION
+%
+%
+%
+brevis_wid# := 2 staff_space#;
+
+def draw_brevis(expr brevwid) =
+	save beamheight, head_width;
+	save holeheight, stem_width;
+	save serif_size, serif_protrude;
+
+	head_width# = brevwid;
+	holeheight = 3 stafflinethickness;
+	stem_width = 1.4 stafflinethickness;
+
+
+	define_pixels(head_width);
+	set_char_box(0, head_width#, noteheight#/2, noteheight#/2);
+	
+	2 beamheight + holeheight = noteheight;
+	serif_size = (holeheight - stafflinethickness)/2;
+	serif_protrude = 1.5 serif_size;
+	penpos1(stem_width, 0);
+	penpos2(stem_width, 0);
+	penpos3(beamheight, 90);
+	penpos4(beamheight, 90);
+	penpos5(stem_width, 180);
+
+	z1l = (0, 0);
+	z2l = (0, -stafflinethickness/2);
+	z3r = z2r + serif_size *(1,-1);
+	y4r = y3r;
+	x4r = head_width/2;
+	z5l = z3l + (-serif_size, -serif_protrude);
+
+	penlabels(1,2,3,4, 5);
+	fill z1r -- z1l -- z5r{down} .. z5l{up} .. z3l{right}
+		-- z4l -- z4r -- z3r{left} .. z2r{up} -- cycle;
+
+	addto currentpicture also currentpicture yscaled -1;
+	show z4r; show z4l;
+	addto currentpicture also currentpicture 
+		shifted (-x4r,0) xscaled -1 shifted (x4l,0);
+
+enddef;
+
+
+%
+% Some sources (eg Musix/OpusTeX think that the appendage should be on
+% the left, some say right. Right wins democratically.
+%
+def draw_longa (expr wid) =
+	draw_brevis(wid);
+	save theta;
+
+	x7r = head_width;
+	y7 = y5;
+%	z7 = z5;
+	z6 - z7 = (stem_width/2, -staff_space);
+	theta = angle(z6-z7)+ 90;
+	penpos7(stem_width, theta);
+	penpos6(1.2 stem_width, theta);
+	
+	fill z7r .. z6r{z6-z7} .. {z7-z6} z6l -- z7l -- cycle;
+	penlabels(6,7);
+enddef;
+
+%
+% En wij presenteren U: de opvolgster van Emily
+%
+% (ze is wel breed)
+% 
+fet_beginchar("Maxima notehead", "-3mensural", "mensuralmaximahead");
+	draw_longa (1.3 brevis_wid#)
+fet_endchar;
+
+fet_beginchar("Longa notehead", "-2mensural", "mensurallongahead");
+	draw_longa (brevis_wid#)
+fet_endchar;
+
+fet_beginchar("Brevis notehead", "-1mensural", "mensuralbrevishead")
+	draw_brevis(brevis_wid#);
+fet_endchar;
+
+def draw_neo_mensural_black_head (expr wid) =
+	save head_width;
+	head_width# = wid;
+	set_char_box (0, head_width#, noteheight#/2, noteheight#/2);
+
+
+	y3 = y1 =0;
+	x2 = x4 = (x1 + x3) /2;
+	define_pixels (head_width);
+	pickup pencircle scaled blot_diameter;
+	top y2 = h;
+	bot y4 = -d;
+	lft x1 = 0;
+	rt x3 = w;
+
+	filldraw z1 -- z2 -- z3 -- z4 -- cycle;
+enddef;
+
+def draw_neo_mensural_open_head (expr wid)=
+	draw_neo_mensural_black_head (wid);
+	save diamNW, diamSW;
+	diamNW = length (z2 - z1) + blot_diameter;
+	diamSW = length (z4 - z1) + blot_diameter;
+	
+	save hole_widthNW, hole_widthSW;
+	hole_widthNW = 0.34 diamNW ;
+	hole_widthSW + 2.6 stafflinethickness = diamSW;
+
+	(z7 + z5)/2 = (w/2, 0);
+	(z8 + z6)/2 = (w/2, 0);
+	(z6 - z5) = hole_widthNW * unitvector (z2 - z1);
+	(z7 - z6) = hole_widthSW * unitvector (z4 - z1);
+
+	labels (1,2,3,4,5,6,7,8);
+
+	unfill z5 -- z6 -- z7 -- z8 --cycle;
+enddef;
+
+fet_beginchar("Neo-mensural open head","0neo_mensural","neomensuralminimhead")
+      draw_neo_mensural_open_head (staff_space#);
+fet_endchar;
+
+fet_beginchar("Neo-mensural open head","1neo_mensural","neomensuralsemiminimhead")
+      draw_neo_mensural_open_head (staff_space#);
+fet_endchar;
+
+fet_beginchar("Neo-mensural black head","2neo_mensural","neofusahead")
+      draw_neo_mensural_black_head (staff_space#);
+fet_endchar;
+
+
+def draw_mensural_head (expr wid, open) =
+      save head_width;
+      head_width# = wid;
+      set_char_box (head_width#/2, head_width#/2,
+		    noteheight#/2, noteheight#/2);
+
+      define_pixels(head_width, noteheight);
+
+      x1 = -x3;
+      y1 = x2 = y3 = x4 = 0;
+      y4 = -y2;
+      y2 = 1.4 noteheight/2;
+      tand(30) = x3 / y2;
+
+      pickup pencircle
+	     xscaled 0.15 head_width
+	     yscaled 0.30 head_width
+	     rotated -30;
+
+      % pencircle width correction
+      save zc, zd; pair zc, zd;
+      zc = (+0.150 head_width * sind(30), +0.150 head_width * cosd(30));
+      zd = (+0.075 head_width * sind(30), -0.075 head_width * cosd(30));
+
+      if open:
+	      draw (z1+zc+zd) -- (z2-zc+zd) --
+		   (z3-zc-zd) -- (z4+zc-zd) -- cycle;
+      else:
+	      filldraw (z1+zc+zd) -- (z2-zc+zd) --
+		       (z3-zc-zd) -- (z4+zc-zd) -- cycle;
+      fi;
+enddef;
+
+
+fet_beginchar("Mensural open head","0mensural","mensuralminimhead")
+	draw_mensural_head (staff_space#, true);
+fet_endchar;
+
+fet_beginchar("Mensural open head","1mensural","mensuralsemiminimhead")
+	draw_mensural_head (staff_space#, true);
+fet_endchar;
+
+fet_beginchar("Mensural black head","2mensural","fusahead")
+	draw_mensural_head (staff_space#, false);
+fet_endchar;
+
+
+%%%%%%%%%%%%
+%
+%
+% ledger (leger) lines
+%
+fet_beginchar("Ledger ending", "ledgerending", "ledgerending")
+set_char_box (5/2 ledgerlinethickness#, 5/2 ledgerlinethickness#,
+  		ledgerlinethickness#/2,ledgerlinethickness#/2);
+	pickup pencircle scaled 1.3 blot_diameter;
+
+	rt x2 = w;
+	lft x1 = -b;
+	x3 = x2;
+	bot y1 = -d;
+	y2 = y1;
+
+	top y3 = h;
+	y4 = y3;
+	x4 = x1;
+
+	filldraw z1 --- z2 --- z3 --- z4 --- cycle ;
+fet_endchar;
+
+
+%%%%%%%%
+%
+%
+%
+% EDITIO VATICANA (including solesmes extensions)
+%
+%
+%
+
+% parameterized punctum
+def punctum_char (expr verbose_name, internal_name, mudela_name,
+		  left_stem, right_stem, linea, cavum,
+		  straight, auctum, direction_up, excentric, up_shift, mag) =
+
+	fet_beginchar(verbose_name, internal_name, mudela_name)
+		save b_h, a_w;
+		a_b := 1.54; % b_h*a_b/a_w = wd/ht
+		b_h := 0.85;
+		a_w := 1.09;
+
+		save a, beta, ht, wd;
+		ht# = noteheight# * mag;
+		2beta# = ht# * b_h;
+		a# = beta# * a_b;
+		wd# = 2a# / a_w;
+		set_char_box(0.50wd#, 0.10wd#, 0.5ht#, 0);
+		black_notehead_width# := wd#;
+
+		% direction
+		save direction, direction_sign;
+		pair direction;
+		if direction_up:
+			direction = up;
+			direction_sign# = 1;
+		else:
+			direction = down;
+			direction_sign# = -1;
+		fi;
+
+		% convexity and excentricity
+		save u_convexity, u_excentricity;
+		if straight:
+			u_convexity# = -0.01ht#;
+			u_excentricity# = 0.0ht#; % dummy
+		elseif auctum:
+			u_convexity# = -0.03ht#;
+			u_excentricity# = +0.25ht#;
+		else:
+			u_convexity# = -0.05ht#;
+			u_excentricity# = 0.0ht#; % dummy
+		fi;
+		save convexity, excentricity;
+		convexity# = direction_sign# * u_convexity#;
+		excentricity# = direction_sign# * u_excentricity#;
+
+		% y shift offset
+		save yoffs;
+		if up_shift:
+			yoffs# = 0.08ht#;
+		else:
+			yoffs# = 0.00ht#;
+		fi
+
+		define_pixels(convexity, excentricity, yoffs, ht, wd);
+		pickup pencircle scaled stafflinethickness;
+
+		path p;
+		save height, yoffs_bt;
+		define_pixels (height, yoffs_bt);
+		height# = max (0.5ht# - stafflinethickness#, 0);
+		yoffs_bt# = yoffs# - (height# - stafflinethickness#)/2 -
+			    convexity#;
+		xpart z1a = xpart z1b;
+		xpart z2a = xpart z2b;
+		xpart z3a = xpart z3b;
+		ypart z1a + height = ypart z1b;
+		ypart z2a + height = ypart z2b;
+		ypart z3a + height = ypart z3b;
+
+		if auctum:
+			z1a = (0.00wd + stafflinethickness/2, yoffs_bt);
+			z2a = (0.20wd, yoffs_bt + 1.0*convexity);
+			z3a = (0.40wd - stafflinethickness/2,
+			       yoffs_bt + 1.0*excentricity);
+			p = z1a .. {right}z2a .. {direction}z3a --
+			    z3b{-direction} .. z2b{left} .. z1b -- cycle;
+		elseif excentric:
+			z1a = (0.00wd + stafflinethickness/2,
+			       yoffs_bt - 1.0*convexity);
+			z2a = (0.08wd, yoffs_bt + 1.4*convexity);
+			z3a = (0.40wd - stafflinethickness/2, yoffs_bt);
+			p = z1a{direction} .. z2a{right} .. z3a --
+			    z3b .. {left}z2b .. {-direction}z1b -- cycle;
+		else:
+			z1a = (0.00wd + stafflinethickness/2, yoffs_bt);
+			z2a = (0.20wd, yoffs_bt + 1.0*convexity);
+			z3a = (0.40wd - stafflinethickness/2, yoffs_bt);
+			p = z1a .. z2a .. z3a --
+			    z3b .. z2b .. z1b -- cycle;
+		fi;
+
+		if cavum:
+			draw p;
+		else:
+			filldraw p;
+		fi;
+
+
+		pickup pencircle scaled stafflinethickness;
+
+		if left_stem:
+			z5=(0.00wd + stafflinethickness/2, yoffs);
+			z6=(0.00wd + stafflinethickness/2, yoffs - 1.5ht);
+			draw z5 -- z6;
+		fi;
+
+		if right_stem:
+			z5=(0.40wd - stafflinethickness/2, yoffs);
+			z6=(0.40wd - stafflinethickness/2, yoffs - 1.5ht);
+			draw z5 -- z6;
+		fi;
+
+		if linea:
+			save linea_width, linea_height;
+			linea_width# = stafflinethickness#;
+			linea_height# = 0.85 ht#;
+			define_pixels (linea_width, linea_height);
+			draw_block ((-0.10wd - linea_width/2,
+				     yoffs - linea_height/2),
+				    (-0.10wd + linea_width/2,
+				     yoffs + linea_height/2));
+			draw_block ((+0.50wd - linea_width/2,
+				     yoffs - linea_height/2),
+				    (+0.50wd + linea_width/2,
+				     yoffs + linea_height/2));
+		fi;
+	fet_endchar;
+enddef;
+
+% parameterized punctum inclinatum
+def inclinatum_char(expr verbose_name, internal_name, mudela_name,
+		    small, stropha, auctum) =
+
+	fet_beginchar(verbose_name, internal_name, mudela_name)
+
+		save b_h, a_w;
+		a_b := 1.54; % b_h*a_b/a_w = wd/ht
+		b_h := 0.85;
+		a_w := 1.09;
+
+		save a, beta, ht, wd;
+		ht# = noteheight#;
+		2beta# = ht# * b_h;
+		a# = beta# * a_b;
+		wd# = 2a# / a_w;
+		set_char_box(0.3wd#, 0.3wd#, 0.5 ht#, 0.5 ht#);
+		black_notehead_width# := wd#;
+
+		save za, alpha, size;
+		pair za;
+		alpha = 35;
+		define_pixels(ht, wd);
+
+		if small:
+			size# = 0.23ht#;
+		else:
+			size# = 0.45ht#;
+		fi;
+
+		define_pixels(size);
+
+		pickup pencircle
+			xscaled blot_diameter
+			yscaled size rotated -alpha;
+		za = (0, size - blot_diameter/2) / 2 rotated alpha;
+		draw -za .. za;
+
+		if stropha:
+			pickup pencircle
+				xscaled (size/3)
+				yscaled size rotated alpha;
+			save za, off_angle; pair za;
+			off_angle := 15;
+			za = (0, -size) / 2 rotated -(alpha + off_angle);
+			undraw za;
+		fi;
+
+		if auctum:
+			pickup pencircle scaled stafflinethickness;
+			save za, zb;
+			pair za, zb;
+			za = ((0, -size) rotated -alpha) +
+			     (0, stafflinethickness/2);
+			xpart zb = 0;
+			ypart zb = ypart za;
+			draw za{(0,-1) rotated alpha} ..
+			     {(0,1) rotated -alpha}zb;
+		fi;
+	fet_endchar;
+enddef;
+
+% punctum
+punctum_char("Ed. Vat. punctum", "0vaticana_punctum", "vatpunctumhead",
+	     false, false, false, false, false,
+	     false, false, false, false, 1.0);
+
+% punctum cavum (for OpusTeX compatibility)
+%punctum_char("Ed. Vat. punctum cavum", "0vaticana_punctum_cavum",
+%	     "vatpunctumcavumhead",
+%	     false, false, false, true, false,
+%	     false, false, false, false, 1.0);
+
+% linea punctum (for OpusTeX compatibility)
+%punctum_char("Ed. Vat. linea punctum", "0vaticana_linea_punctum",
+%	     "vatlineapunctumhead",
+%	     false, false, true, false, false,
+%	     false, false, false, false, 1.0);
+
+% linea punctum cavum (for OpusTeX compatibility)
+%punctum_char("Ed. Vat. linea punctum cavum", "0vaticana_linea_punctum_cavum",
+%	     "vatlineapunctumcavumhead",
+%	     false, false, true, true, false,
+%	     false, false, false, false, 1.0);
+
+% punctum inclinatum
+inclinatum_char("Ed. Vat. inclinatum", "0vaticana_inclinatum",
+		"vatinclinatumhead",
+		false, false, false);
+
+% virga (i.e. right stemmed punctum)
+punctum_char("Ed. Vat. virga", "0vaticana_virga", "vatvirgahead",
+	     false, true, false, false, false,
+	     false, false, false, false, 1.0);
+
+% left stemmed punctum as used in clivis (flexa) ligature
+punctum_char("Ed. Vat. reverse virga", "0vaticana_rvirga", "vatrvirgahead",
+	     true, false, false, false, false,
+	     false, false, false, false, 1.0);
+
+% pes lower punctum
+punctum_char("Ed. Vat. pes lower punctum", "0vaticana_lpes", "vatlpeshead",
+	     false, false, false, false, true,
+	     false, true, false, false, 1.0);
+
+% pes upper punctum
+punctum_char("Ed. Vat. pes upper punctum", "0vaticana_upes", "vatupeshead",
+	     false, false, false, false, true,
+	     false, false, false, false, 1.0);
+
+% pes upper punctum (shifted variation)
+%
+% Note: This note head is used instead of the regular pes upper
+% punctum to avoid collision with the lower punctum note of the pes when
+% the upper punctum sits directly on top of the lower punctum.
+%
+punctum_char("Ed. Vat. var pes upper punctum", "0vaticana_vupes",
+	     "vatvupeshead",
+	     false, false, false, false, true,
+	     false, false, false, true, 1.0);
+
+% small punctum as used in epiphonus/cephalicus
+punctum_char("Ed. Vat. plica", "0vaticana_plica", "vatplicahead",
+	     false, false, false, false, true,
+	     false, false, false, false, 0.5);
+
+% excentric punctum as used in epiphonus
+punctum_char("Ed. Vat. epiphonus", "0vaticana_epiphonus", "vatepiphonushead",
+	     false, false, false, false, false,
+	     false, true, true, false, 1.0);
+
+% excentric punctum as used in cephalicus
+punctum_char("Ed. Vat. cephalicus", "0vaticana_cephalicus",
+	     "vatcephalicushead",
+	     false, false, false, false, false,
+	     false, false, true, false, 1.0);
+
+% quilisma
+fet_beginchar("Ed. Vat. quilisma", "0vaticana_quilisma", "vatquilismahead")
+	save b_h,a_w;
+	a_b:=1.54; % b_h*a_b/a_w = wd/ht
+	b_h:=0.85;
+	a_w:=1.09;
+
+	save a, beta, ht, wd;
+	ht# = noteheight#;
+	2beta# = ht#*b_h;
+	a# = beta#*a_b;
+	wd# = 2a# / a_w;
+	set_char_box(0.4wd#, 0.00wd#, 0.5 ht#, 0.5 ht#);
+	black_notehead_width# := wd#;
+
+	define_pixels(ht, wd);
+	pickup pencircle xscaled stafflinethickness yscaled 0.4ht;
+	z1 = (0.00wd, -0.11ht);
+	z2 = (0.00wd, +0.06ht);
+	z3 = (0.10wd, -0.05ht);
+	z4 = (0.16wd, +0.11ht);
+	z5 = (0.24wd, -0.01ht);
+	z6 = (0.30wd, +0.15ht);
+	z7 = (0.40wd, +0.04ht);
+	z8 = (0.40wd, +0.21ht);
+	draw z1 -- z2 -- z3 -- z4 -- z5 -- z6 -- z7 -- z8;
+fet_endchar;
+
+% solesmes punctum inclinatum parvum
+%inclinatum_char("Solesmes punctum inclinatum parvum", "0solesmes_incl_parvum",
+%		"solinclparvumhead",
+%		true, false, false);
+
+% solesmes punctum auctum ascendens
+%punctum_char("Solesmes punctum auctum ascendens", "0solesmes_auct_asc",
+%	     "solauctaschead",
+%	     false, false, false, false, false,
+%	     true, true, false, false, 1.0);
+
+% solesmes punctum auctum descendens
+%punctum_char("Solesmes punctum auctum descendens", "0solesmes_auct_desc",
+%	     "solauctdeschead",
+%	     false, false, false, false, false,
+%	     true, false, false, false, 1.0);
+
+% solesmes punctum inclinatum auctum
+%inclinatum_char("Solesmes punctum incl. auctum", "0solesmes_incl_auctum",
+%		"solpunctuminclinatumauctumhead",
+%		false, false, true);
+
+% solesmes stropha
+%inclinatum_char("Solesmes stropha", "0solesmes_stropha",
+%		"solstrophahead",
+%		false, true, false);
+
+% solesmes stropha aucta
+%inclinatum_char("Solesmes stropha aucta", "0solesmes_stropha_aucta",
+%		"solstrophaauctahead",
+%		false, true, true);
+
+% solesmes oriscus
+fet_beginchar("Solesmes oriscus", "0solesmes_oriscus",
+	"soloriscushead")
+	save b_h, a_w;
+	a_b := 1.54; % b_h*a_b/a_w = wd/ht
+	b_h := 0.85;
+	a_w := 1.09;
+
+	save a, beta, ht, wd;
+	ht# = noteheight# * mag;
+	2beta# = ht# * b_h;
+	a# = beta# * a_b;
+	wd# = 2a# / a_w;
+	set_char_box(0.5wd#, 0.0wd#, 0.5ht#, 0.5ht#);
+	black_notehead_width# := wd#;
+
+	save convexity;
+	convexity# = +0.05ht#;
+
+	define_pixels(ht, wd, convexity);
+	pickup pencircle xscaled blot_diameter yscaled 0.50ht;
+	z1 = (0.00wd, -convexity);
+	z2 = (0.16wd, +convexity);
+	z3 = (0.33wd, -convexity);
+	z4 = (0.50wd, +convexity);
+	draw z1 .. z2 .. z3 .. z4;
+fet_endchar;
+
+%%%%%%%%
+%
+%
+%
+% EDITIO MEDICAEA
+%
+%
+%
+
+% inclinatum
+fet_beginchar("Ed. Med. inclinatum", "0medicaea_inclinatum",
+	"medinclinatumhead")
+	save b_h, a_w;
+	a_b := 1.54; % b_h*a_b/a_w = wd/ht
+	b_h := 0.85;
+	a_w := 1.09;
+
+	save a, beta, ht, wd;
+	ht# = noteheight#;
+	2beta# = ht# * b_h;
+	a# = beta# * a_b;
+	wd# = 2a# / a_w;
+	set_char_box(wd#/2, wd#/2, 0.5 ht#, 0.5 ht#);
+	black_notehead_width# := wd#;
+
+	save za, alpha, size;
+	pair za;
+	define_pixels(ht, wd);
+	alpha = 35;
+	size = 0.7ht;
+	pickup pencircle
+		xscaled blot_diameter
+		yscaled size rotated -alpha;
+	za = (0, size) / 2 rotated alpha;
+	draw -za .. za;
+
+fet_endchar;
+
+% parametrized punctum
+def punctum_char (expr verbose_name, internal_name, mudela_name,
+	left_up_stem, left_down_stem) =
+
+	fet_beginchar(verbose_name, internal_name, mudela_name)
+
+		save a, beta, ht, wd;
+		ht# = 2 staff_space#;
+		wd# = ht#;
+		set_char_box(0.0, 0.4wd#, 0.5ht#, 0.5ht#);
+		black_notehead_width# := wd#;
+
+		define_pixels(ht, wd);
+		pickup pencircle
+			xscaled blot_diameter
+			yscaled 0.50ht;
+		z1 = (0.00wd + blot_diameter/2, 0);
+		z2 = (0.40wd - blot_diameter/2, 0);
+		draw z1 .. z2;
+
+		pickup pencircle
+			xscaled stafflinethickness
+			yscaled blot_diameter;
+
+		if left_down_stem:
+			z4=(0.00wd + stafflinethickness/2, blot_diameter/2);
+			z5=(0.00wd + stafflinethickness/2, - 1.25ht);
+			draw z4 .. z5;
+		elseif left_up_stem:
+			z4=(0.00wd + stafflinethickness/2, blot_diameter/2);
+			z5=(0.00wd + stafflinethickness/2, + 1.25ht);
+			draw z4 .. z5;
+		fi;
+
+	fet_endchar;
+enddef;
+
+% punctum
+punctum_char("Ed. Med. punctum", "0medicaea_punctum", "medpunctumhead",
+	false, false);
+
+% left up-stemmed punctum
+punctum_char("Ed. Med. reverse virga", "0medicaea_rvirga", "medrvirgahead",
+	true, false);
+
+% virga (i.e. left down-stemmed punctum)
+punctum_char("Ed. Med. virga", "0medicaea_virga", "medvirgahead",
+	false, true);
+
+%%%%%%%%
+%
+%
+%
+% HUFNAGEL
+%
+%
+%
+
+% punctum
+% parametrized punctum
+def punctum_char (expr verbose_name, internal_name, mudela_name,
+	down_stem) =
+
+	fet_beginchar(verbose_name, internal_name, mudela_name)
+		save b_h, a_w;
+		a_b := 1.54; % b_h*a_b/a_w = wd/ht
+		b_h := 0.85;
+		a_w := 1.09;
+
+		save a, beta, ht, wd;
+		ht# = noteheight#;
+		2beta# = ht# * b_h;
+		a# = beta# * a_b;
+		wd# = 2a# / a_w;
+		set_char_box(wd#/2, wd#/2, 0.5 ht#, 0.5 ht#);
+		black_notehead_width# := wd#;
+
+		save za, zb, zc, alpha, size;
+		pair za, zb, zc;
+		define_pixels(ht, wd);
+		alpha = 55;
+		size = 0.7ht;
+		pickup pencircle
+			xscaled blot_diameter
+			yscaled size rotated -alpha;
+		za = (0, size) / 2 rotated alpha;
+		draw -za .. za;
+
+		if down_stem:
+			zb = (0.00wd, 0);
+			zc = (0.00wd, - 1.25ht);
+			draw zb -- zc;
+		fi;
+	fet_endchar;
+enddef;
+
+% punctum
+punctum_char("Hufnagel punctum", "0hufnagel_punctum", "hufpunctumhead", false)
+
+% virga
+punctum_char("Hufnagel virga", "0hufnagel_virga", "hufvirgahead", true)
+
+% pes lower punctum
+fet_beginchar("Hufnagel pes lower punctum", "0hufnagel_lpes", "huflpeshead")
+	save b_h, a_w;
+	a_b := 1.54; % b_h*a_b/a_w = wd/ht
+	b_h := 0.85;
+	a_w := 1.09;
+
+	save a, beta, ht, wd;
+	ht# = noteheight#;
+	2beta# = ht# * b_h;
+	a# = beta# * a_b;
+	wd# = 2a# / a_w;
+	set_char_box(wd#, wd#, 0.7 ht#, 0.7 ht#);
+	black_notehead_width# := wd#;
+
+	save za, alpha, size;
+	pair za;
+	define_pixels(ht, wd);
+	alpha = 35;
+	size = 0.7ht;
+	pickup pencircle
+		xscaled blot_diameter
+		yscaled size rotated -alpha;
+	za = (size, 0);
+	draw -za .. za;
+fet_endchar;
+
+fet_endgroup("noteheads");
+define_pixels(black_notehead_width);
diff -purN ../lilypond-1.5.28/mf/parmesan-rests.mf ./mf/parmesan-rests.mf
--- ../lilypond-1.5.28/mf/parmesan-rests.mf	Thu Jan  1 01:00:00 1970
+++ ./mf/parmesan-rests.mf	Fri Feb  1 19:20:59 2002
@@ -0,0 +1,177 @@
+% 
+% feta-toevallig.mf --  implement Accidentals
+% 
+% source file of the Feta (Font-En-Tja) music font
+% 
+% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% 
+
+fet_begingroup("accidentals");
+
+
+
+%%%%%%%%
+%
+%
+%
+% EDITIO MEDICAEA
+%
+%
+%
+fet_beginchar("Ed. Med. Flat" , "medicaea-1", "medicaeaflat");
+	set_char_box(0, 0.8 staff_space#, 0.6 staff_space#, 
+	  2.0 staff_space#);
+
+	pickup pencircle
+		xscaled 0.50 stafflinethickness
+		yscaled 0.22 staff_space;
+
+	save za, zb;
+	pair za, zb;
+
+	za = (0.00 staff_space, +0.90 staff_space);
+	zb = (0.00 staff_space, -0.50 staff_space);
+	draw za -- zb;
+
+	pickup pencircle
+		xscaled 0.50 stafflinethickness
+		yscaled 0.22 staff_space
+		rotated -63;
+
+	save zc, zd, ze;
+	pair zc, zd, ze;
+
+	zc = (0.10 staff_space, -0.50 staff_space);
+	zd = (0.40 staff_space, +0.40 staff_space);
+	ze = (0.10 staff_space, +0.40 staff_space);
+
+	draw zc{(1,2)} .. zd .. ze{(-1,-1)};
+
+	fet_endchar;
+
+%%%%%%%%
+%
+%
+%
+% EDITIO VATICANA
+%
+%
+%
+fet_beginchar("Ed. Vat. Flat" , "vaticana-1", "vaticanaflat");
+        set_char_box(0, 0.7 staff_space#, 0.6 staff_space#, 
+                2.0 staff_space#);
+        define_pixels (stafflinethickness, staff_space);
+
+        save za, zb, zc, zd, ze, zf, zg;
+        pair za, zb, zc, zd, ze, zf, zg;
+        za = (0.00 staff_space, +0.80 staff_space);
+        zb = (0.00 staff_space, -0.03 staff_space);
+        zc = (0.25 staff_space, -0.23 staff_space);
+        zd = (0.50 staff_space, -0.23 staff_space);
+        ze = (0.50 staff_space, +0.00 staff_space);
+        zf = (0.25 staff_space, +0.20 staff_space);
+        zg = (0.15 staff_space, +0.26 staff_space);
+
+        pickup pencircle
+                xscaled 0.50 stafflinethickness
+                yscaled 0.22 staff_space;
+        draw za{down} .. {down}zb .. zc .. zd{up} .. {up}ze .. zf .. zg;
+        fet_endchar;
+
+fet_beginchar("Ed. Vat. Natural" , "vaticana0", "vaticananatural");
+	set_char_box(0, 0.6 staff_space#, 0.6 staff_space#, 
+		2.0 staff_space#);
+	define_pixels (stafflinethickness, staff_space);
+
+	save za, zb, zc, zd;
+	pair za, zb, zc, zd;
+	pickup pencircle
+		xscaled 0.80 stafflinethickness
+		yscaled 0.22 staff_space;
+	za = (0.00 staff_space, +0.65 staff_space);
+	zb = (0.00 staff_space, -0.35 staff_space);
+	zc = (0.00 staff_space, -0.30 staff_space);
+	zd = (0.40 staff_space, -0.08 staff_space);
+	draw za -- zb;
+	draw zc -- zd;
+
+	addto currentpicture also currentpicture
+		xscaled -1
+		yscaled -1
+		shifted (0.40 staff_space, 0.0 staff_space);
+
+	fet_endchar;
+
+%%%%%%%%
+%
+%
+%
+% MENSURAL NOTATION
+%
+%
+%
+fet_beginchar("Mensural Sharp" , "mensural1", "mensuralsharp");
+	set_char_box(0.4 staff_space#, 0.6 staff_space#, 0.5 staff_space#, 
+		0.5 staff_space#);
+	save stemthick;
+	define_pixels (stemthick, staff_space);
+	stemthick# = stafflinethickness#;
+
+	save za, zb;
+	pair za, zb;
+	pickup pencircle scaled 0.8 stemthick;
+	za = 0.4 * staff_space * (0.8, 1);
+	za = -zb;
+	draw za .. zb;
+
+	addto currentpicture also currentpicture xscaled -1;
+	addto currentpicture also currentpicture shifted (0.20 staff_space, 0);
+
+	fet_endchar;
+
+fet_beginchar("Mensural Flat" , "mensural-1", "mensuralflat");
+	set_char_box(0.1 staff_space#, 0.7 staff_space#, 0.4 staff_space#, 
+		1.8 staff_space#);
+	save stemthick;
+	define_pixels (stemthick, staff_space);
+	stemthick# = stafflinethickness#;
+
+	save za, zb, zc, zd, ze;
+	pair za, zb, zc, zd, ze;
+	pickup pencircle
+		xscaled 1.4 stemthick
+		yscaled 0.6 stemthick
+		rotated 45;
+
+	za = (0.00 staff_space, +1.80 staff_space);
+	zb = (0.00 staff_space, -0.25 staff_space);
+	zc = (0.35 staff_space, -0.25 staff_space);
+	zd = (0.35 staff_space, +0.25 staff_space);
+	ze = (0.00 staff_space, +0.25 staff_space);
+	draw za -- zb .. zc .. zd .. ze;
+	fet_endchar;
+
+fet_beginchar("Hufnagel Flat" , "hufnagel-1", "hufnagelflat");
+	set_char_box(0.5 staff_space#, 0.7 staff_space#, 0.4 staff_space#, 
+		1.8 staff_space#);
+	save stemthick;
+	define_pixels (stemthick, staff_space);
+	stemthick# = stafflinethickness#;
+
+	save za, zb, zc, zd, ze, zf;
+	pair za, zb, zc, zd, ze, zf;
+	pickup pencircle
+		xscaled 2.4 stemthick
+		yscaled 0.4 stemthick
+		rotated 45;
+
+	za = (0.00 staff_space, +1.80 staff_space);
+	zb = (0.00 staff_space, -0.15 staff_space);
+	zc = (0.25 staff_space, -0.30 staff_space);
+	zd = (0.50 staff_space, +0.00 staff_space);
+	ze = (0.30 staff_space, +0.30 staff_space);
+	zf = (0.00 staff_space, +0.15 staff_space);
+	draw za -- zb -- zc .. zd .. ze -- zf;
+	fet_endchar;
+
+fet_endgroup ("accidentals")
diff -purN ../lilypond-1.5.28/mf/parmesan-timesig.mf ./mf/parmesan-timesig.mf
--- ../lilypond-1.5.28/mf/parmesan-timesig.mf	Thu Jan  1 01:00:00 1970
+++ ./mf/parmesan-timesig.mf	Fri Feb  1 19:20:59 2002
@@ -0,0 +1,133 @@
+% 
+% feta-timesig.mf --  implement Time Signatures
+% 
+% source file of the Feta (not an abbreviation of Font-En-Tja) music font
+% 
+% (c) 1998--2002 Mats Bengtsson <matsb@s3.kth.se>,
+%		 Christian Mondrup <scancm@biobase.dk>
+
+fet_begingroup("timesig");
+
+path threequartercircle;
+threequartercircle = halfcircle & quartercircle rotated 180;
+
+save Cdiameter,Cthickness;
+Cdiameter# := 3/2 staff_space#;
+Cthickness# := 2 stafflinethickness#;
+define_pixels(Cdiameter,Cthickness);
+
+%% tempus imperfectum cum prolatione imperfecta
+fet_beginchar ("Mensural 4/4 meter", "old4/4", "oldfourfourmeter")
+	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
+		.5 Cdiameter#, .5 Cdiameter#);
+	
+	pickup pencircle scaled Cthickness;
+	draw threequartercircle rotated 45 scaled Cdiameter;
+fet_endchar;
+
+%% tempus imperfectum cum prolatione imperfecta proportio dupla
+fet_beginchar ("Mensural 2/2 meter", "old2/2", "oldallabreve")
+	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
+		staff_space#, staff_space#);
+	
+	pickup pencircle scaled Cthickness;
+	draw threequartercircle rotated 45 scaled Cdiameter;
+	draw_block((-Cthickness, -d), (0, h));
+fet_endchar;
+
+%% tempus perfectum cum prolatione imperfecta
+fet_beginchar ("Mensural 3/2 meter", "old3/2", "oldthreetwometer")
+	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
+		.5 Cdiameter#, .5 Cdiameter#);
+	
+	pickup pencircle scaled Cthickness;
+	draw fullcircle scaled Cdiameter;
+fet_endchar;
+
+%% tempus imperfectum cum prolatione perfecta
+fet_beginchar ("Mensural 6/4 meter", "old6/4", "oldsixfourmeter")
+	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
+		.5 Cdiameter#, .5 Cdiameter#);
+	
+	pickup pencircle scaled Cthickness;
+	draw threequartercircle rotated 45 scaled Cdiameter;
+	pickup pencircle scaled 4 stafflinethickness;
+	draw (0,0);
+fet_endchar;
+
+%% tempus perfectum cum prolatione perfecta
+fet_beginchar ("Mensural 9/4 meter", "old9/4", "oldninefourmeter")
+	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
+		.5 Cdiameter#, .5 Cdiameter#);
+	
+	pickup pencircle scaled Cthickness;
+	draw fullcircle scaled Cdiameter;
+	pickup pencircle scaled 4 stafflinethickness;
+	draw (0,0);
+fet_endchar;
+
+%% tempus perfectum cum prolatione imperfecta proportio dupla
+fet_beginchar ("Mensural 3/4 meter", "old3/4", "oldthreefourmeter")
+	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
+		staff_space#, staff_space#);
+	
+	pickup pencircle scaled Cthickness;
+	draw fullcircle scaled Cdiameter;
+	draw_block((-Cthickness/2, -d), (Cthickness/2, h));
+fet_endchar;
+
+%% tempus imperfectum cum prolatione perfecta proportio dupla
+fet_beginchar ("Mensural 6/8 meter", "old6/8", "oldsixeightmeter")
+	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
+		 staff_space#, staff_space#);
+	
+	pickup pencircle scaled Cthickness;
+	draw threequartercircle rotated 45 scaled Cdiameter;
+	pickup pencircle scaled 4 stafflinethickness;
+	draw (0,0);
+	draw_block((-Cthickness/2, -d), (Cthickness/2, h));
+fet_endchar;
+
+%% tempus perfectum cum prolatione perfecta proportio dupla
+fet_beginchar ("Mensural 9/8 meter", "old9/8", "oldnineeight")
+	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
+		staff_space#, staff_space#);
+	
+	pickup pencircle scaled Cthickness;
+	draw fullcircle scaled Cdiameter;
+	pickup pencircle scaled 4 stafflinethickness;
+	draw (0,0);
+	draw_block((-Cthickness/2, -d), (Cthickness/2, h));
+fet_endchar;
+
+%% tempus imperfectum cum prolatione imperfecta diminutio simplex
+fet_beginchar ("Mensural 4/8 meter", "old4/8", "oldfoureightmeter")
+	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
+	.5 Cdiameter#, .5 Cdiameter#);
+	
+	pickup pencircle scaled Cthickness;
+	draw threequartercircle rotated 225 scaled Cdiameter;
+fet_endchar;
+
+%% tempus imperfectum cum prolatione perfecta diminutio simplex
+fet_beginchar ("Mensural 6/8 meter", "old6/8alt", "oldsixeightmeteralt")
+	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
+		.5 Cdiameter#, .5 Cdiameter#);
+	
+	pickup pencircle scaled Cthickness;
+	draw threequartercircle rotated 225 scaled Cdiameter;
+	pickup pencircle scaled 4 stafflinethickness;
+	draw (0,0);
+fet_endchar;
+
+%% tempus imperfectum cum prolatione imperfecta diminutio duplex
+fet_beginchar ("Mensural 2/4 meter", "old2/4", "oldtwofourmeter")
+	set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, 
+		staff_space#, staff_space#);
+	
+	pickup pencircle scaled Cthickness;
+	draw threequartercircle rotated 225 scaled Cdiameter;
+	draw_block((-Cthickness, -d), (0, h));
+fet_endchar;
+
+fet_endgroup("timesig");
diff -purN ../lilypond-1.5.28/mf/parmesan20.mf ./mf/parmesan20.mf
--- ../lilypond-1.5.28/mf/parmesan20.mf	Thu Jan  1 01:00:00 1970
+++ ./mf/parmesan20.mf	Fri Feb  1 19:20:59 2002
@@ -0,0 +1,17 @@
+% feta20.mf
+% part of LilyPond's pretty-but-neat music font
+
+staffsize#:=20pt#;
+
+input feta-autometric;
+fet_beginfont("feta", 20);
+
+% AFBLIJVEN! Gebruik feta-test16/20, anders verneuk je de distributie.
+test := 0;
+
+input parmesan-generic;
+
+fet_endfont("feta");
+
+end.
+
diff -purN ../lilypond-1.5.28/po/da.po ./po/da.po
--- ../lilypond-1.5.28/po/da.po	Sun Sep 23 10:13:04 2001
+++ ./po/da.po	Thu Jan 31 13:17:54 2002
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.4.6\n"
-"POT-Creation-Date: 2001-06-14 13:22+0200\n"
+"POT-Creation-Date: 2002-01-29 23:08+0100\n"
 "PO-Revision-Date: 2001-09-22 21:00+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -13,291 +13,351 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ly2dvi.py:105
-msgid "Generate .dvi with LaTeX for LilyPond"
-msgstr "Generér .dvi med LaTeX for LilyPond"
-
-#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93
-#: update-lily.py:118 warn.cc:23
+#: data-file.cc:118 input.cc:85 ly2dvi.py:113 midi2ly.py:148
+#: update-lily.py:136 warn.cc:23
 msgid "warning: "
 msgstr "advarsel: "
 
-#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188
-#: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17
+#: input.cc:90 ly2dvi.py:116 ly2dvi.py:132 ly2dvi.py:691 ly2dvi.py:709
+#: midi2ly.py:163 midi2ly.py:1012 midi2ly.py:1081 update-lily.py:151
+#: update-lily.py:426 warn.cc:9 warn.cc:17
 msgid "error: "
 msgstr "fejl: "
 
-#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125
+#: ly2dvi.py:133 midi2ly.py:164 update-lily.py:152
 msgid "Exiting ... "
 msgstr "Afslutter... "
 
-#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183
+#: ly2dvi.py:191 midi2ly.py:222 update-lily.py:210
 #, c-format
 msgid "Usage: %s [OPTION]... FILE"
 msgstr "Brug: %s [FLAG]... FIL"
 
-#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187
+#: ly2dvi.py:195 main.cc:151 midi2ly.py:226 update-lily.py:214
 msgid "Options:"
 msgstr "Flag:"
 
-#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191
+#: ly2dvi.py:199 main.cc:168 midi2ly.py:230 update-lily.py:218
 #, c-format
 msgid "Report bugs to %s"
 msgstr ""
 "Rapportér programfejl til %s\n"
 "Rapportér fejl i oversættelsen til <dansk@klid.dk>"
 
-#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208
+#: ly2dvi.py:227 midi2ly.py:258 update-lily.py:246
 #, c-format
 msgid "Invoking `%s'"
 msgstr "Starter \"%s\""
 
-#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211
+#: ly2dvi.py:231 midi2ly.py:262 update-lily.py:250
 #, c-format
 msgid "command exited with value %d"
 msgstr "kommandoen afsluttede med værdi %d"
 
-#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213
+#: ly2dvi.py:233 midi2ly.py:264 update-lily.py:252
 msgid "(ignored)"
 msgstr "(ignoreret)"
 
 # hær er det spørg om rensning af en temporærkatalog
-#: ly2dvi.py:321
+#: ly2dvi.py:243 midi2ly.py:274 update-lily.py:262
 #, c-format
 msgid "Cleaning %s..."
 msgstr "Renser %s..."
 
-#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237
-#, c-format
-msgid "no such setting: %s"
-msgstr "indstillingen findes ikke: %s"
+#: ly2dvi.py:301
+msgid "Generate .dvi with LaTeX for LilyPond"
+msgstr "Generér .dvi med LaTeX for LilyPond"
 
-#: ly2dvi.py:349 main.cc:112
+#: ly2dvi.py:304 main.cc:115
 msgid "write Makefile dependencies for every input file"
 msgstr "skriv Makefile-afhængigheder for hver inddatafil"
 
 # forklaring af flag -h
-#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251
+#: ly2dvi.py:305 main.cc:111 midi2ly.py:98 mup2ly.py:74 update-lily.py:86
 msgid "this help"
 msgstr "denne hjælp"
 
-#: ly2dvi.py:351 main.cc:110 main.cc:115
+#: ly2dvi.py:306 main.cc:113 main.cc:118
 msgid "DIR"
 msgstr "KATALOG"
 
-#: ly2dvi.py:351
+#: ly2dvi.py:306
 msgid "add DIR to LilyPond's search path"
 msgstr "tilføj KATALOG til LilyPonds søgesti"
 
 # %s er programmets navn
-#: ly2dvi.py:352
+#: ly2dvi.py:307
 #, c-format
 msgid "keep all output, and name the directory %s.dir"
 msgstr "behold al uddata, og navngiv kataloget %s.dir"
 
-#: ly2dvi.py:353
+#: ly2dvi.py:308
 msgid "don't run LilyPond"
 msgstr "kør ikke LilyPond"
 
-#: ly2dvi.py:354 main.cc:113
+#: ly2dvi.py:309 main.cc:116
 msgid "produce MIDI output only"
 msgstr "lav kun MIDI-uddata"
 
-#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114
+#: ly2dvi.py:310 ly2dvi.py:311 main.cc:114 main.cc:117 midi2ly.py:100
 msgid "FILE"
 msgstr "FIL"
 
-#: ly2dvi.py:355
+#: ly2dvi.py:310 midi2ly.py:100
 msgid "write ouput to FILE"
 msgstr "skriv uddata til FIL"
 
-#: ly2dvi.py:357
+#: ly2dvi.py:311
+msgid "find pfa fonts used in FILE"
+msgstr ""
+
+#: ly2dvi.py:313
 msgid "generate PostScript output"
 msgstr "lav PostScript-uddata"
 
-#: ly2dvi.py:358
+#: ly2dvi.py:314
 msgid "KEY=VAL"
 msgstr "NØGLE=VÆRDI"
 
-#: ly2dvi.py:358
+#: ly2dvi.py:314
 msgid "change global setting KEY to VAL"
 msgstr "ændr global indstilling NØGLE til VÆRDI"
 
 # Førklaring til --verbose (borde være længre)
-#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255
+#: ly2dvi.py:315 main.cc:121 midi2ly.py:103 mup2ly.py:77 update-lily.py:90
 msgid "verbose"
 msgstr "udførlig uddata"
 
-#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256
+#: ly2dvi.py:316 main.cc:120 midi2ly.py:104 mup2ly.py:78 update-lily.py:91
 msgid "print version number"
 msgstr "vis versionsnummer"
 
-#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258
+#: ly2dvi.py:317 main.cc:122 midi2ly.py:105 mup2ly.py:79 update-lily.py:93
 msgid "show warranty and copyright"
 msgstr "vis garanti og copyright"
 
-#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603
+#: ly2dvi.py:406
+#, c-format
+msgid "no such setting: %s"
+msgstr "indstillingen findes ikke: %s"
+
+#: ly2dvi.py:434 ly2dvi.py:632 ly2dvi.py:657
 #, c-format
 msgid "Running %s..."
 msgstr "Kør %s..."
 
-#: ly2dvi.py:396
+#: ly2dvi.py:449
 #, c-format
 msgid "Analyzing %s..."
 msgstr "Analyserer %s..."
 
-#: ly2dvi.py:452
+#: ly2dvi.py:505
 #, c-format
 msgid "no lilypond output found for %s"
 msgstr "ingen lilyponduddata fundet for %s"
 
-#: ly2dvi.py:494
+#: ly2dvi.py:547
 #, c-format
 msgid "invalid value: %s"
 msgstr "ugyldigt værdi: %s"
 
+#: ly2dvi.py:691
+#, fuzzy, c-format
+msgid "not a PostScript file: `%s'"
+msgstr "kan ikke åbne fil: \"%s\""
+
+#: ly2dvi.py:709 midi2ly.py:1012 update-lily.py:426
+#, c-format
+msgid "getopt says: `%s'"
+msgstr ""
+
+#: ly2dvi.py:820
+#, fuzzy, c-format
+msgid "filename should not contain spaces: `%s'"
+msgstr "Indholder allerede: \"%s\""
+
 # hær er det spørg om skrivning til en fil
-#: ly2dvi.py:781 scores.cc:44
+#: ly2dvi.py:885 scores.cc:44
 #, c-format
 msgid "dependencies output to `%s'..."
 msgstr "afhængigheder udskrevet til \"%s\"..."
 
 # hær er det spørg om skrivning til en fil (første parametern er t.ex
 # DVI, LATEX, MIDI, TEX)
-#: ly2dvi.py:791
+#: ly2dvi.py:896 midi2ly.py:996
 #, c-format
 msgid "%s output to `%s'..."
 msgstr "%s udskrevet til \"%s\"..."
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793
-#: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
+#: includable-lexer.cc:49 lily-guile.cc:134 ly2dvi.py:898 scores.cc:136
+#: scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "kan ikke finde fil: \"%s\""
 
-#: ly2dvi.py:804
+#: ly2dvi.py:909 midi2ly.py:1081
 msgid "no files specified on command line."
 msgstr "ingen filer angivne på kommandolinjen."
 
-#: mup2ly.py:51
-msgid "Convert mup to ly"
-msgstr "Konvertér mup til ly"
+#: midi2ly.py:92
+msgid "Convert MIDI to LilyPond source"
+msgstr ""
 
-# %s er progravnavnet (mup2ly)
-#: mup2ly.py:166
-#, c-format
-msgid "%s is far from completed.  Not all constructs are recognised."
-msgstr "%s er langt fra færdig, og kan ikke genkende alle konstruktioner."
+#: midi2ly.py:95
+msgid "print absolute pitches"
+msgstr ""
 
-#: mup2ly.py:964
-#, c-format
-msgid "no such context: %s"
-msgstr "omgivelse findes ikke: %s"
+#: midi2ly.py:96 midi2ly.py:101
+msgid "DUR"
+msgstr "LÆNGDE"
+
+#: midi2ly.py:96
+msgid "quantise note durations on DUR"
+msgstr ""
+
+#: midi2ly.py:97
+msgid "print explicit durations"
+msgstr ""
+
+#: midi2ly.py:99
+#, fuzzy
+msgid "ALT[:MINOR]"
+msgstr "TONE[:MOL]"
+
+#: midi2ly.py:99
+#, fuzzy
+msgid "set key: ALT=+sharps|-flats; MINOR=1"
+msgstr "sæt tonart: TONE +forhøjelser/-sænkninger; :1 mol"
+
+#: midi2ly.py:101
+msgid "quantise note starts on DUR"
+msgstr ""
+
+#: midi2ly.py:102
+msgid "DUR*NUM/DEN"
+msgstr ""
 
-#: mup2ly.py:1115
+#: midi2ly.py:102
+msgid "allow tuplet durations DUR*NUM/DEN"
+msgstr ""
+
+#: midi2ly.py:106
+msgid "treat every text as a lyric"
+msgstr ""
+
+#: midi2ly.py:1027
+msgid "Example:"
+msgstr ""
+
+#: mup2ly.py:69
+#, fuzzy
+msgid "Convert mup to LilyPond source"
+msgstr "Konvertér mup til ly"
+
+#: mup2ly.py:72
 msgid "debug"
 msgstr "fejlsøgningsuddata"
 
-#: mup2ly.py:1116
+#: mup2ly.py:73
 msgid "define macro NAME [optional expansion EXP]"
 msgstr "definér makro NAVN [valfri makroudvidelse EXP]"
 
-#: main.cc:114 mup2ly.py:1118
+#: main.cc:117 mup2ly.py:75
 msgid "write output to FILE"
 msgstr "skriv uddata til FIL"
 
-#: mup2ly.py:1119
+#: mup2ly.py:76
 msgid "only pre-process"
 msgstr "kun forbehandling"
 
-#: mup2ly.py:1200
+#: mup2ly.py:827
+#, c-format
+msgid "no such context: %s"
+msgstr "omgivelse findes ikke: %s"
+
+#: mup2ly.py:1051
 #, c-format
 msgid "Processing `%s'..."
 msgstr "Behandler \"%s\"..."
 
-#: mup2ly.py:1219
+#: mup2ly.py:1070
 #, c-format
 msgid "Writing `%s'..."
 msgstr "Skriver \"%s\"..."
 
-#: update-lily.py:51
+#: update-lily.py:75
 msgid "Fetch and rebuild from latest source package"
 msgstr "Hent og byg om fra seneste kildekodepakke"
 
-#: update-lily.py:223
-#, c-format
-msgid "Cleaning `%s'..."
-msgstr "Renser \"%s\"..."
-
-#: update-lily.py:243
+#: update-lily.py:78
 #, c-format
 msgid "unpack and build in DIR [%s]"
 msgstr "udpak og byg i DIR [%s]"
 
-#: update-lily.py:244
+#: update-lily.py:79
 msgid "execute COMMAND, subtitute:"
 msgstr "kør COMMAND, erstat:"
 
-#: update-lily.py:245
+#: update-lily.py:80
 msgid "%b: build root"
 msgstr "%b: rod for opbygning"
 
-#: update-lily.py:246
+#: update-lily.py:81
 #, c-format
 msgid "%n: package name"
 msgstr "%n: pakkenavn"
 
-#: update-lily.py:247
+#: update-lily.py:82
 msgid "%r: release directory"
 msgstr "%r: katalog for programudgivelse"
 
-#: update-lily.py:248
+#: update-lily.py:83
 msgid "%t: tarball"
 msgstr "%t: tarball"
 
-#: update-lily.py:249
+#: update-lily.py:84
 msgid "%v: package version"
 msgstr "%v: pakkeversion"
 
-#: update-lily.py:252
+#: update-lily.py:87
 #, c-format
 msgid "keep all output, and name the directory %s"
 msgstr "behold al uddata, og døb kataloget til %s"
 
-#: update-lily.py:253
+#: update-lily.py:88
 msgid "upon failure notify EMAIL[,EMAIL]"
 msgstr "ved fejl, underret EMAIL[,EMAIL]"
 
-#: update-lily.py:254
+#: update-lily.py:89
 msgid "remove previous build"
 msgstr "fjern foregående bygning"
 
-#: update-lily.py:257
+#: update-lily.py:92
 #, c-format
 msgid "fetch and build URL [%s]"
 msgstr "hent og byg URL [%s]"
 
-#: update-lily.py:365
+#: update-lily.py:397
 #, c-format
 msgid "Listing `%s'..."
 msgstr "Lister \"%s\"..."
 
-#: update-lily.py:426
+#: update-lily.py:465
 #, c-format
 msgid "latest is: %s"
 msgstr "seneste er: %s"
 
-#: update-lily.py:427
+#: update-lily.py:466
 #, c-format
 msgid "relax, %s is up to date"
 msgstr "slap af, %s er seneste version"
 
-#: update-lily.py:435 update-lily.py:448
+#: update-lily.py:474 update-lily.py:487
 #, c-format
 msgid "Fetching `%s'..."
 msgstr "Henter \"%s\"..."
 
-#: update-lily.py:457
+#: update-lily.py:496
 #, c-format
 msgid "Building `%s'..."
 msgstr "Bygger \"%s\"..."
@@ -339,8 +399,8 @@ msgstr "ukendt position"
 msgid "can't map file"
 msgstr "kan ikke lave \"mmap\" på filen"
 
-#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45
-#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
+#: mapped-file-storage.cc:87 scores.cc:48 simple-file-storage.cc:44
+#: streams.cc:37 text-stream.cc:23
 #, c-format
 msgid "can't open file: `%s'"
 msgstr "kan ikke åbne fil: \"%s\""
@@ -362,6 +422,16 @@ msgstr "programmeringsfejl: "
 msgid " (Continuing; cross thumbs)"
 msgstr " (Fortsætter, kryds fingrene)"
 
+#: accidental-engraver.cc:136
+#, fuzzy, c-format
+msgid "unknown accidental typesetting: %s"
+msgstr "ukendt \"escaped\" streng: \"\\%s\""
+
+#: accidental-engraver.cc:139
+#, c-format
+msgid "Accidental typesetting must be pair: %s"
+msgstr ""
+
 #: afm.cc:59
 #, c-format
 msgid "can't find character number: %d"
@@ -388,8 +458,12 @@ msgid "does not match: `%s'"
 msgstr "matcher ikke: \"%s\""
 
 #: all-font-metrics.cc:102
-msgid " Rebuild all .afm files, and remove all .pk and .tfm files.  Rerun with -V to show font paths."
-msgstr " Genopbyg alle .afm-filer, og fjern alle .pk- og .tfm-filer. Kør igen med -V for at vise skrifttypesøgestier."
+msgid ""
+" Rebuild all .afm files, and remove all .pk and .tfm files.  Rerun with -V "
+"to show font paths."
+msgstr ""
+" Genopbyg alle .afm-filer, og fjern alle .pk- og .tfm-filer. Kør igen med -V "
+"for at vise skrifttypesøgestier."
 
 #: all-font-metrics.cc:167
 #, c-format
@@ -419,38 +493,49 @@ msgstr "Giver op"
 msgid "Can't switch translators, I'm there already"
 msgstr "Kan ikke skifte oversætter, jeg er her allerede"
 
-#: beam.cc:86
-msgid "beam has less than two stems"
-msgstr "bjælke har mindre end to nodehalse"
-
-#: beam.cc:637
-msgid "weird beam vertical offset"
-msgstr "underligt lodret afstand for bjælke"
+#: bar-check-iterator.cc:58
+#, c-format
+msgid "barcheck failed at: %s"
+msgstr "taktkontrol mislykkedes ved: %s"
 
-#: beam-engraver.cc:91 beam-engraver.cc:124
+#: beam-engraver.cc:93 beam-engraver.cc:126
 msgid "can't find start of beam"
 msgstr "kan ikke finde start på bjælke"
 
-#: beam-engraver.cc:158
+#: beam-engraver.cc:150
 msgid "already have a beam"
 msgstr "har allerede en bjælke"
 
-#: beam-engraver.cc:222
+#: beam-engraver.cc:216
 msgid "unterminated beam"
 msgstr "uafsluttet bjælke"
 
-#: beam-engraver.cc:260 chord-tremolo-engraver.cc:195
+#: beam-engraver.cc:249 chord-tremolo-engraver.cc:193
 msgid "stem must have Rhythmic structure"
 msgstr "nodehals skal have en rytmisk struktur"
 
-#: beam-engraver.cc:272
+#: beam-engraver.cc:261
 msgid "stem doesn't fit in beam"
 msgstr "nodehalsen passer ikke i bjælke"
 
-#: beam-engraver.cc:273
+#: beam-engraver.cc:262
 msgid "beam was started here"
 msgstr "bjælken startede her"
 
+#: beam.cc:93
+#, fuzzy
+msgid "beam has less than two visible stems"
+msgstr "bjælke har mindre end to nodehalse"
+
+#: beam.cc:98
+#, fuzzy
+msgid "Beam has less than two stems. Removing beam."
+msgstr "bjælke har mindre end to nodehalse"
+
+#: beam.cc:660
+msgid "weird beam vertical offset"
+msgstr "underligt lodret afstand for bjælke"
+
 #: break-align-item.cc:136
 #, c-format
 msgid "unknown spacing pair `%s', `%s'"
@@ -475,26 +560,26 @@ msgstr "Jeg er selv én"
 msgid "none of these in my family"
 msgstr "ingen af disse i min familie"
 
-#: chord.cc:369
+#: chord-tremolo-engraver.cc:139 percent-repeat-engraver.cc:182
+msgid "unterminated chord tremolo"
+msgstr "ikke-afsluttet akkordtremolo"
+
+#: chord-tremolo-iterator.cc:48
+msgid "no one to print a tremolos"
+msgstr "der er ingen som kan skrive en tremolo"
+
+#: chord.cc:376
 #, c-format
 msgid "invalid subtraction: not part of chord: %s"
 msgstr "ugyldig subtraktion: ikke del af akkord: %s"
 
 # "pitch" hær skal alltså være en ton i et akkord
-#: chord.cc:398
+#: chord.cc:405
 #, c-format
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr "ugyldig tone for inversion: ikke del af en akkord: %s"
 
-#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192
-msgid "unterminated chord tremolo"
-msgstr "ikke-afsluttet akkordtremolo"
-
-#: chord-tremolo-iterator.cc:48
-msgid "no one to print a tremolos"
-msgstr "der er ingen som kan skrive en tremolo"
-
-#: collision.cc:127
+#: collision.cc:281
 msgid "Too many clashing notecolumns.  Ignoring them."
 msgstr "For mange sammenhængende nodekolonner. Ignorerer dem."
 
@@ -502,50 +587,44 @@ msgstr "For mange sammenhængende nodekol
 msgid "NaN"
 msgstr "-"
 
-#: dynamic-engraver.cc:197 span-dynamic-performer.cc:86
+#: dynamic-engraver.cc:195 span-dynamic-performer.cc:82
 msgid "can't find start of (de)crescendo"
 msgstr "kan ikke finde starten på crescendo/diminuendo"
 
-#: dynamic-engraver.cc:222
+#: dynamic-engraver.cc:220
 msgid "already have a crescendo"
 msgstr "har allerede et crescendo"
 
-#: dynamic-engraver.cc:223
+#: dynamic-engraver.cc:221
 msgid "already have a decrescendo"
 msgstr "har allerede et diminuendo"
 
-#: dynamic-engraver.cc:317
+#: dynamic-engraver.cc:315
 msgid "unterminated (de)crescendo"
 msgstr "uafsluttet crescendo/diminuendo"
 
-#: extender-engraver.cc:97
+#: extender-engraver.cc:96
 msgid "unterminated extender"
 msgstr "uafsluttet udvider"
 
-#: extender-engraver.cc:109
+#: extender-engraver.cc:108
 msgid "Nothing to connect extender to on the left.  Ignoring extender request."
-msgstr "Der er ingenting at forbinde udvideren mod til venstre. Ignorerer ønsket om udvider"
+msgstr ""
+"Der er ingenting at forbinde udvideren mod til venstre. Ignorerer ønsket om "
+"udvider"
 
 #: folded-repeat-iterator.cc:78
 msgid "no one to print a repeat brace"
 msgstr "det er ingen som kan skrive et gentagelsestegn"
 
-#: font-interface.cc:237
+#: font-interface.cc:238
 msgid "couldn't find any font satisfying "
 msgstr "kunne ikke finde nogen skrifttype som opfylder "
 
-#: gourlay-breaking.cc:157
+#: gourlay-breaking.cc:168
 msgid "No feasible line breaking found"
 msgstr "Ingen mulig linjebrydning fandtes"
 
-#: grace-iterator.cc:43
-msgid "no Grace context available"
-msgstr "ingen prydomgivelse tilgængelig"
-
-#: grace-position-engraver.cc:96
-msgid "Unattached grace notes.  Attaching to last musical column."
-msgstr "Ikke-fæstede prydsnoder. Fæster ved sidste musikkolonne."
-
 #: hairpin.cc:93
 msgid "decrescendo too small"
 msgstr "diminuendo for lille"
@@ -554,27 +633,34 @@ msgstr "diminuendo for lille"
 msgid "crescendo too small"
 msgstr "crescendo for lille"
 
-#: hyphen-engraver.cc:90
+#: hyphen-engraver.cc:89
 msgid "unterminated hyphen"
 msgstr "uafsluttet bindestreg"
 
-#: hyphen-engraver.cc:102
+#: hyphen-engraver.cc:101
 msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen request."
-msgstr "Det er ingenting at forbinde bindestregen mod til venstre. Ignorerer bindestregsforespørgslen."
+msgstr ""
+"Det er ingenting at forbinde bindestregen mod til venstre. Ignorerer "
+"bindestregsforespørgslen."
 
-#: key-engraver.cc:99
+#: key-engraver.cc:93
 msgid "Conflicting key signatures found."
 msgstr "Konfliktende tonartssignaturer fundet."
 
-#: key-engraver.cc:100
+#: key-engraver.cc:94
 msgid "This was the other key definition."
 msgstr "Dette var den anden tonartsdefinition."
 
-#: key-performer.cc:77
+#: key-performer.cc:91
 msgid "FIXME: key change merge"
 msgstr "FIX: tonartsskiftsfletning"
 
-#: lily-guile.cc:141
+#: kpath.cc:64
+#, fuzzy, c-format
+msgid "Kpathsea couldn't find TFM file `%s'"
+msgstr "kan ikke finde fil: \"%s\""
+
+#: lily-guile.cc:136
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(indlæsningssøgesti: \"%s\""
@@ -584,78 +670,80 @@ msgstr "(indlæsningssøgesti: \"%s\""
 msgid "Element count %d."
 msgstr "Elementantal %d."
 
-#: line-of-score.cc:253 paper-score.cc:77
+#: line-of-score.cc:325 paper-score.cc:76
 #, c-format
 msgid "Element count %d "
 msgstr "Elementantal %d "
 
-#: line-of-score.cc:267
+#: line-of-score.cc:339
 msgid "Calculating column positions..."
 msgstr "Beregner kolonnepositioner..."
 
-#: lyric-phrasing-engraver.cc:284
+#: lyric-phrasing-engraver.cc:278
 msgid "lyrics found without any matching notehead"
 msgstr "tekst fundet uden noget matchende nodehoved"
 
-#: lyric-phrasing-engraver.cc:289
+#: lyric-phrasing-engraver.cc:283
 msgid "Huh? Melismatic note found to have associated lyrics."
 msgstr "Øh? Melismatisk node har tilhørende tekst."
 
-#: main.cc:104
+#. print example usage:  lilypond -e "(set-lily-option 'help 0)" ?
+#: main.cc:107
 msgid "EXPR"
 msgstr "UDTR"
 
-#: main.cc:104
+#: main.cc:107
 msgid "evalute EXPR as Scheme after .scm init is read"
 msgstr "evaluér UDTR som Scheme efter .scm-init er læst"
 
 #. another bug in option parser: --output=foe is taken as an abbreviation
 #. for --output-format
-#: main.cc:107
+#: main.cc:110
 msgid "EXT"
 msgstr "FMT"
 
-#: main.cc:107
-msgid "use output format EXT (scm, ps, tex or as)"
+#: main.cc:110
+#, fuzzy
+msgid "use output format EXT (tex [default], pdftex, ps, scm or as)"
 msgstr "brug uddataformat FMT (scm, ps, tex eller as)"
 
-#: main.cc:109
+#: main.cc:112
 msgid "FIELD"
 msgstr "FELT"
 
-#: main.cc:109
+#: main.cc:112
 msgid "write header field to BASENAME.FIELD"
 msgstr "skriv rubrikfælt til BASNAVN.FELT"
 
-#: main.cc:110
+#: main.cc:113
 msgid "add DIR to search path"
 msgstr "tilføj KATALOG til søgestien"
 
-#: main.cc:111
+#: main.cc:114
 msgid "use FILE as init file"
 msgstr "brug FIL som init-fil"
 
-#: main.cc:115
+#: main.cc:118
 msgid "prepend DIR to dependencies"
 msgstr "tilføj KATALOG efter afhængigheder"
 
-#: main.cc:116
+#: main.cc:119
 msgid "inhibit file output naming and exporting"
 msgstr "hindr navngivning af filuddata og eksportering"
 
 #.
 #. No version number or newline here. It confuses help2man
 #.
-#: main.cc:136
+#: main.cc:139
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Brug: %s [FLAG]... FIL..."
 
-#: main.cc:138
+#: main.cc:141
 msgid "Typeset music and or play MIDI from FILE"
 msgstr "Typesæt musik og/eller afspil MIDI fra FIL"
 
-#: main.cc:142
+#: main.cc:145
 msgid ""
 "LilyPond is a music typesetter.  It produces beautiful sheet music\n"
 "using a high level description file as input.  LilyPond is part of \n"
@@ -665,11 +753,11 @@ msgstr ""
 "højniveaubeskrivning af musikken i en fil. LilyPond er en del af\n"
 "GNU-projektet.\n"
 
-#: main.cc:152
+#: main.cc:155
 msgid "This binary was compiled with the following options:"
 msgstr "Dette program blev oversat med følgende flag:"
 
-#: main.cc:56 main.cc:179
+#: main.cc:176
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -680,16 +768,16 @@ msgstr ""
 "og du må ændre og/eller distribuere kopier af det under visse\n"
 "betingelser. Kør \"%s --warranty\" for mere information.\n"
 
-#: main.cc:63 main.cc:186 main.cc:198
+#: main.cc:183 main.cc:195
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright © %s af"
 
-#: main.cc:196
+#: main.cc:193
 msgid "GNU LilyPond -- The music typesetter"
 msgstr "GNU Lilypond -- Musiktypesætteren"
 
-#: main.cc:72 main.cc:204
+#: main.cc:201
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License version 2\n"
@@ -718,49 +806,49 @@ msgstr ""
 "dette program. Hvis ikke, skriv til Free Software Foundation, Inc., 59\n"
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: midi-item.cc:139
+#: midi-item.cc:144
 #, c-format
 msgid "no such instrument: `%s'"
 msgstr "instrumentet findes ikke: \"%s\""
 
-#: midi-item.cc:228
+#: midi-item.cc:234
 msgid "silly duration"
 msgstr "tåbelig længde"
 
-#: midi-item.cc:241
+#: midi-item.cc:247
 msgid "silly pitch"
 msgstr "tåbelig tone"
 
-#: musical-request.cc:28
+#: music-output-def.cc:119
+#, c-format
+msgid "can't find `%s' context"
+msgstr "kan ikke finde omgivelsen \"%s\""
+
+#: music.cc:144
 #, c-format
 msgid "Transposition by %s makes accidental larger than two"
 msgstr "Transponering med %s gør accicental større end to"
 
-#: music.cc:232
+#: music.cc:249
 msgid "ly_get_mus_property (): Not a Music"
 msgstr "ly_get_mus_property (): Ikke en \"Music\""
 
-#: music.cc:246
+#: music.cc:263
 msgid "ly_set_mus_property (): Not a symbol"
 msgstr "ly_set_mus_property (): ikke et symbol"
 
-#: music.cc:258
+#: music.cc:275
 msgid "ly_set_mus_property ():  not of type Music"
 msgstr "ly_set_mus_property (): ikke af typen \"Music\""
 
-#: music.cc:272
+#: music.cc:289
 msgid "ly_make_music (): Not a string"
 msgstr "ly_make_music (): Ikke en streng"
 
-#: music.cc:292
+#: music.cc:309
 msgid "ly_music_name (): Not a music expression"
 msgstr "ly_music_name (): Ikke et musikudtryk"
 
-#: music-output-def.cc:115
-#, c-format
-msgid "can't find `%s' context"
-msgstr "kan ikke finde omgivelsen \"%s\""
-
 #: my-lily-lexer.cc:139
 #, c-format
 msgid "Identifier name is a keyword: `%s'"
@@ -771,7 +859,7 @@ msgstr "Identificerernavn er et nøgleord
 msgid "error at EOF: %s"
 msgstr "fejl ved filslutning: %s"
 
-#: midi-score-parser.cc:94 my-lily-parser.cc:47
+#: my-lily-parser.cc:47
 msgid "Parsing..."
 msgstr "Tolker..."
 
@@ -789,32 +877,18 @@ msgstr "Stryger forespørgslen: \"%s\""
 msgid "paper output to `%s'..."
 msgstr "papirsuddata til \"%s\"..."
 
-#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99
+#: paper-outputter.cc:60
 msgid ", at "
 msgstr ", ved "
 
-#: paper-outputter.cc:232
-#, c-format
-msgid "writing header field `%s' to `%s'..."
-msgstr "skriver rubrikfelt \"%s\" til \"%s\"..."
-
-#: paper-score.cc:80
+#: paper-score.cc:79
 msgid "Preprocessing elements..."
 msgstr "Forbehandler element..."
 
-#: paper-score.cc:114
+#: paper-score.cc:113
 msgid "Outputting Score, defined at: "
 msgstr "Udskriver partitur, defineret ved: "
 
-#: paper-stream.cc:41
-#, c-format
-msgid "can't create directory: `%s'"
-msgstr "kan ikke oprette katalog: \"%s\""
-
-#: paper-stream.cc:55
-msgid "Error syncing file (disk full?)"
-msgstr "Fejl ved synkning af fil (disken fuld?)"
-
 #.
 #. We could change the current translator's id, but that would make
 #. errors hard to catch
@@ -831,7 +905,7 @@ msgstr "Jag er selv én: \"%s\""
 msgid "none of these in my family: `%s'"
 msgstr "ingen af disse i min familie: \"%s\""
 
-#: percent-repeat-engraver.cc:117
+#: percent-repeat-engraver.cc:116
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr "Véd ikke hvordan en procentgentagelse af denne længde skal håndteres."
 
@@ -847,26 +921,31 @@ msgstr "Spor... "
 msgid "Creator: "
 msgstr "Skaber: "
 
-#: performance.cc:113
+#: performance.cc:103
+#, fuzzy
+msgid "at "
+msgstr ", ved "
+
+#: performance.cc:114
 #, c-format
 msgid "from musical definition: %s"
 msgstr "fra musikdefinition: %s"
 
-#: performance.cc:168
+#: performance.cc:169
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "MIDI-uddata til \"%s\"..."
 
-#: phrasing-slur-engraver.cc:119
+#: phrasing-slur-engraver.cc:117
 msgid "unterminated phrasing slur"
 msgstr "uafsluttet fraseringsbue"
 
-#: phrasing-slur-engraver.cc:134
+#: phrasing-slur-engraver.cc:132
 msgid "can't find start of phrasing slur"
 msgstr "kan ikke finde start på fraseringsbue"
 
-#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154
-#: piano-pedal-performer.cc:87
+#: piano-pedal-engraver.cc:141 piano-pedal-engraver.cc:153
+#: piano-pedal-performer.cc:82
 #, c-format
 msgid "can't find start of piano pedal: `%s'"
 msgstr "kan ikke finde start på pianopedal: \"%s\""
@@ -875,7 +954,35 @@ msgstr "kan ikke finde start på pianoped
 msgid "Pitch arguments out of range"
 msgstr "Toneargument udenfor intervallet"
 
-#: property-engraver.cc:121
+#: porrectus.cc:34
+msgid "(left_head == 0)"
+msgstr ""
+
+#: porrectus.cc:45
+msgid "undefined left_head"
+msgstr ""
+
+#: porrectus.cc:64
+msgid "(right_head == 0)"
+msgstr ""
+
+#: porrectus.cc:75
+msgid "undefined right_head"
+msgstr ""
+
+#: porrectus.cc:164
+msgid "junking lonely porrectus"
+msgstr ""
+
+#: porrectus.cc:174
+msgid "porrectus style undefined; using mensural"
+msgstr ""
+
+#: porrectus.cc:301
+msgid "ascending vaticana style porrectus"
+msgstr ""
+
+#: property-engraver.cc:116
 #, c-format
 msgid ""
 "`%s' is deprecated.  Use\n"
@@ -884,7 +991,7 @@ msgstr ""
 "\"%s\" er forældet. Brug\n"
 " \\property %s.%s \\override #'%s = #%s"
 
-#: property-engraver.cc:145
+#: property-engraver.cc:140
 #, c-format
 msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s"
 msgstr "Forkert type for egenskab: %s, type: %s, værdi fundet: %s, type: %s"
@@ -897,33 +1004,33 @@ msgstr "for mange kolliderende pauser"
 msgid "too many notes for rest collision"
 msgstr "for mange noder for pausesammenstød"
 
-#: scm-option.cc:59
+#: scm-option.cc:63
 msgid "Scheme options:"
 msgstr "Scheme-flag:"
 
-#: score.cc:78
+#: score-engraver.cc:178
+#, c-format
+msgid "unbound spanner `%s'"
+msgstr "ubunden bro \"%s\""
+
+#: score.cc:88
 msgid "Interpreting music..."
 msgstr "Tolker musik..."
 
-#: score.cc:92
+#: score.cc:102
 msgid "Need music in a score"
 msgstr "Behøver musik i partitur"
 
 #. should we? hampers debugging.
-#: score.cc:105
+#: score.cc:115
 msgid "Errors found/*, not processing score*/"
 msgstr "Fejl fundne/*, behandler ikke partitur*/"
 
-#: score.cc:112
+#: score.cc:122
 #, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr "tidsforbrug: %.2f sekunder"
 
-#: score-engraver.cc:188
-#, c-format
-msgid "unbound spanner `%s'"
-msgstr "ubunden bro \"%s\""
-
 #: scores.cc:106
 msgid "Score contains errors; will not process it"
 msgstr "Partitur indholder fejl; vil ikke behandle det"
@@ -933,7 +1040,7 @@ msgstr "Partitur indholder fejl; vil ikk
 msgid "Now processing: `%s'"
 msgstr "Behandler nu: \"%s\""
 
-#: script-engraver.cc:66
+#: script-engraver.cc:65
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr "Kan ikke tolke artikulering \"%s\""
@@ -943,53 +1050,62 @@ msgstr "Kan ikke tolke artikulering \"%s
 msgid "Separation_item:  I've been drinking too much"
 msgstr "Separation_item: Jeg har drukket for meget"
 
-#: slur.cc:48
-msgid "Putting slur over rest.  Ignoring."
-msgstr "Sætter bue over pause. Ignorerer."
-
-#: slur.cc:383
-msgid "Slur over rest?"
-msgstr "Bue over pause?"
+#: simple-spacer.cc:202
+#, c-format
+msgid "No spring between column %d and next one"
+msgstr ""
 
-#: slur-engraver.cc:127
+#: slur-engraver.cc:124
 msgid "unterminated slur"
 msgstr "uafsluttet bue"
 
 #. How to shut up this warning, when Voice_devnull_engraver has
 #. eaten start request?
-#: slur-engraver.cc:144
+#: slur-engraver.cc:141
 msgid "can't find start of slur"
 msgstr "kan ikke finde start på bue"
 
+#: slur.cc:48
+msgid "Putting slur over rest.  Ignoring."
+msgstr "Sætter bue over pause. Ignorerer."
+
+#: slur.cc:393
+msgid "Slur over rest?"
+msgstr "Bue over pause?"
+
+#: stem-engraver.cc:117
+#, c-format
+msgid "Adding note head to incompatible stem (type = %d)"
+msgstr "Tilføjer nodehoved til inkompatibel bue (type = %d)"
+
 #: stem.cc:116
 msgid "Weird stem size; check for narrow beams"
 msgstr "Mærkelig nodehalsstørrelse; tjek for smalle bjælker"
 
-#: stem-engraver.cc:115
+#: streams.cc:33
 #, c-format
-msgid "Adding note head to incompatible stem (type = %d)"
-msgstr "Tilføjer nodehoved til inkompatibel bue (type = %d)"
+msgid "can't create directory: `%s'"
+msgstr "kan ikke oprette katalog: \"%s\""
 
-#: text-spanner.cc:121
-msgid "Text_spanner too small"
-msgstr "Tekst_bro for lille"
+#: streams.cc:47
+msgid "Error syncing file (disk full?)"
+msgstr "Fejl ved synkning af fil (disken fuld?)"
 
-#: text-spanner-engraver.cc:94
+#: text-spanner-engraver.cc:92
 msgid "can't find start of text spanner"
 msgstr "kan ikke finde start på tekstbro"
 
-#: text-spanner-engraver.cc:114
+#: text-spanner-engraver.cc:112
 msgid "already have a text spanner"
 msgstr "har allerede en tekstbro"
 
-#: text-spanner-engraver.cc:169
+#: text-spanner-engraver.cc:167
 msgid "unterminated text spanner"
 msgstr "uafsluttet tekstbro"
 
-#: tfm.cc:77
-#, c-format
-msgid "can't find ascii character: %d"
-msgstr "kan ikke finde ASCII-tegn: %d"
+#: text-spanner.cc:121
+msgid "Text_spanner too small"
+msgstr "Tekst_bro for lille"
 
 #: tfm-reader.cc:106
 #, c-format
@@ -999,408 +1115,361 @@ msgstr "TFM-rubrik i \"%s\" har kun %u o
 #: tfm-reader.cc:140
 #, c-format
 msgid "%s: TFM file has %u parameters, which is more than the %u I can handle"
-msgstr "%s: TFM-fil har %u parametre, hvilket er mere end de %u jeg kan håndtere"
+msgstr ""
+"%s: TFM-fil har %u parametre, hvilket er mere end de %u jeg kan håndtere"
 
-#. How to shut up this warning, when no notes appeared because
-#. they were suicided by Thread_devnull_engraver?
-#: tie-engraver.cc:220 tie-performer.cc:173
-msgid "No ties were created!"
-msgstr "Ingen buer blev lavet!"
+#: tfm.cc:77
+#, c-format
+msgid "can't find ascii character: %d"
+msgstr "kan ikke finde ASCII-tegn: %d"
 
-#: tie-engraver.cc:240
+#: tie-engraver.cc:220
 msgid "lonely tie"
 msgstr "ensom bue"
 
+#: tie-performer.cc:161
+msgid "No ties were created!"
+msgstr "Ingen buer blev lavet!"
+
 #: time-scaled-music-iterator.cc:25
 msgid "no one to print a tuplet start bracket"
 msgstr "der findes ingen som kan skrive en startparentes for tuppel"
 
-#: timing-translator.cc:38
-#, c-format
-msgid "barcheck failed at: %s"
-msgstr "taktkontrol mislykkedes ved: %s"
-
-#: translator-ctors.cc:40
+#: translator-ctors.cc:61
 #, c-format
 msgid "unknown translator: `%s'"
 msgstr "ukendt oversætter: \"%s\""
 
-#: translator-def.cc:99
+#: translator-def.cc:87
 msgid "Program has no such type"
 msgstr "Programmet har ingen sådan type"
 
-#: translator-def.cc:105
+#: translator-def.cc:93
 #, c-format
 msgid "Already contains: `%s'"
 msgstr "Indholder allerede: \"%s\""
 
-#: translator-def.cc:106
+#: translator-def.cc:94
 #, c-format
 msgid "Not adding translator: `%s'"
 msgstr "Tilføjer ikke oversætter: \"%s\""
 
-#: translator-def.cc:224
+#: translator-def.cc:212
 #, c-format
 msgid "can't find: `%s'"
 msgstr "kan ikke finde: \"%s\""
 
-#: translator-group.cc:146
+#: translator-group.cc:147
 #, c-format
 msgid "can't find or create `%s' called `%s'"
 msgstr "kan ikke finde eller oprette \"%s\" kaldet \"%s\""
 
-#: translator-group.cc:231
+#: translator-group.cc:232
 #, c-format
 msgid "can't find or create: `%s'"
 msgstr "kan ikke finde eller oprette: \"%s\""
 
-#: translator-group.cc:414
+#: translator-group.cc:407
 #, c-format
-msgid "Can't find property type-check for `%s'.  Perhaps you made a typing error? Doing assignment anyway."
-msgstr "Kan ikke finde egenskabstypekontrol for \"%s\". Måske har du lavet en tastefejl? Laver tildeling alligevel."
+msgid ""
+"Can't find property type-check for `%s'.  Perhaps you made a typing error? "
+"Doing assignment anyway."
+msgstr ""
+"Kan ikke finde egenskabstypekontrol for \"%s\". Måske har du lavet en "
+"tastefejl? Laver tildeling alligevel."
 
-#: translator-group.cc:428
+#: translator-group.cc:421
 #, c-format
 msgid "Type check for `%s' failed; value `%s' must be of type `%s'"
-msgstr "Typekontrol for \"%s\" mislykkedes; værdi \"%s\" skal have typen \"%s\""
+msgstr ""
+"Typekontrol for \"%s\" mislykkedes; værdi \"%s\" skal have typen \"%s\""
 
 #. programming_error?
-#: translator-group.cc:447
+#: translator-group.cc:440
 msgid "ly-get-trans-property: expecting a Translator_group argument"
 msgstr "ly-get-trans-property: forventede et Translator_group-argument"
 
-#: volta-engraver.cc:87
+#: volta-engraver.cc:108
 msgid "No volta spanner to end"
 msgstr "Ingen reprisebro til slut"
 
-#: volta-engraver.cc:104
+#: volta-engraver.cc:125
 msgid "Already have a volta spanner.  Stopping that one prematurely."
 msgstr "Har allerede en reprisebro. Stopper denne for tidligt."
 
-#: volta-engraver.cc:108
+#: volta-engraver.cc:129
 msgid "Also have a stopped spanner.  Giving up."
 msgstr "Har også en stoppet bro. Giver op."
 
-#: parser.yy:121
+#: parser.yy:129
 #, c-format
 msgid "Expecting %d arguments"
 msgstr "Forventer %d argumenter"
 
-#: parser.yy:423
+#: parser.yy:434
 msgid "Identifier should have  alphabetic characters only"
 msgstr "Identificerer må kun indeholde alfabetiske tegn"
 
-#: parser.yy:697
+#: parser.yy:715
 msgid "More alternatives than repeats.  Junking excess alternatives."
 msgstr "Flere alternativer end repriser. Stryger tiloversblevne alternativer."
 
-#: parser.yy:761
+#: parser.yy:767
 msgid "Second argument must be a symbol"
 msgstr "Andet argument skal være et symbol"
 
-#: parser.yy:766
+#: parser.yy:772
 msgid "First argument must be a procedure taking 1 argument"
 msgstr "Første argument skal være en procedure som tager 1 argument"
 
-#: parser.yy:1263
+#: parser.yy:1315
 msgid "Expecting string as script definition"
 msgstr "Forventer streng som skriptdefinition"
 
-#: parser.yy:1273
+#: parser.yy:1325
 msgid "Can't specify direction for this request"
 msgstr "Kan ikke angive retning for denne forespørgsel"
 
-#: parser.yy:1398
+#: parser.yy:1451
 msgid "Expecting musical-pitch value"
 msgstr "Forventer nodeværdi"
 
-#: parser.yy:1409
+#: parser.yy:1462
 msgid "Must have duration object"
 msgstr "Skal have tidslængdeobjekt"
 
-#: parser.yy:1418 parser.yy:1426
+#: parser.yy:1471 parser.yy:1479
 msgid "Have to be in Lyric mode for lyrics"
 msgstr "Skal være i teksttilstand (Lyric mode) for tekst"
 
-#: parser.yy:1579 parser.yy:1636
+#: parser.yy:1638 parser.yy:1691
 #, c-format
 msgid "not a duration: %d"
 msgstr "ikke en tidslængde: %d"
 
-#: parser.yy:1645
+#: parser.yy:1752
 msgid "Have to be in Note mode for notes"
 msgstr "Skal være i nodetilstand (Note mode) for noder"
 
-#: parser.yy:1731
+#: parser.yy:1845
 msgid "Have to be in Chord mode for chords"
 msgstr "Skal være i akkordtilstand (Chord mode) for akkord"
 
-#: parser.yy:1910
+#: parser.yy:2025
 msgid "need integer number arg"
 msgstr "behøver heltalsargument"
 
-#: lexer.ll:174
+#: parser.yy:2097
+msgid "Suspect duration found following this beam"
+msgstr ""
+
+#: lexer.ll:175
 msgid "EOF found inside a comment"
 msgstr "filslutning fundet inden i en kommentar"
 
-#: lexer.ll:188
+#: lexer.ll:189
 msgid "\\maininput disallowed outside init files"
 msgstr "\\maininput forbudt udenfor init-filer"
 
-#: lexer.ll:212
+#: lexer.ll:213
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "fejlagtig eller udefineret identificerer: \"%s\""
 
 #. backup rule
-#: lexer.ll:221
+#: lexer.ll:222
 msgid "Missing end quote"
 msgstr "Mangler slutcitationstegn"
 
 #. backup rule
-#: lexer.ll:243 lexer.ll:247
+#: lexer.ll:244 lexer.ll:248
 msgid "white expected"
 msgstr "forventede mellemrum"
 
-#: lexer.ll:256
+#: lexer.ll:257
 msgid "Can't evaluate Scheme in safe mode"
 msgstr "Kan ikke evaluere Scheme i sikker tilstand"
 
-#: lexer.ll:349
+#: lexer.ll:358
 msgid "Brace found at end of lyric. Did you forget a space?"
 msgstr "Krølleparentes fundet i slutning af tekst. Glemte du et mellemrum?"
 
-#: lexer.ll:457
+#: lexer.ll:468
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "ugyldigt tegn: \"%c\""
 
-#: lexer.ll:538
+#: lexer.ll:554
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "ukendt \"escaped\" streng: \"\\%s\""
 
-#: lexer.ll:617
+#: lexer.ll:639
 #, c-format
 msgid "Oldest supported input version: %s"
 msgstr "Ældste inddataversion som understøttes: %s"
 
-#: lexer.ll:629
+#: lexer.ll:651
 #, c-format
 msgid "incorrect lilypond version: %s (%s, %s)"
 msgstr "fejlagtig lilypond-version: %s (%s, %s)"
 
-#: lexer.ll:630
+#: lexer.ll:652
 msgid "Consider converting the input with the convert-ly script"
 msgstr "Overvej at konvertere inddata med skriptet \"convert-ly\""
 
-#: lilypond-item.cc:161
-#, c-format
-msgid "#32 in quarter: %d"
-msgstr "#32 i fjerdedel: %d"
+# %s er progravnavnet (mup2ly)
+#~ msgid "%s is far from completed.  Not all constructs are recognised."
+#~ msgstr "%s er langt fra færdig, og kan ikke genkende alle konstruktioner."
 
-#: lilypond-score.cc:108
-#, c-format
-msgid "LY output to `%s'..."
-msgstr "LY-uddata til \"%s\"..."
+#~ msgid "Cleaning `%s'..."
+#~ msgstr "Renser \"%s\"..."
 
-#: lilypond-score.cc:119
-#, c-format
-msgid "track %d:"
-msgstr "spor %d:"
+#~ msgid "no Grace context available"
+#~ msgstr "ingen prydomgivelse tilgængelig"
 
-#: lilypond-score.cc:155
-msgid "Processing..."
-msgstr "Behandler..."
+#~ msgid "Unattached grace notes.  Attaching to last musical column."
+#~ msgstr "Ikke-fæstede prydsnoder. Fæster ved sidste musikkolonne."
 
-#: lilypond-score.cc:164
-msgid "Creating voices..."
-msgstr "Laver stemmer..."
+#~ msgid "writing header field `%s' to `%s'..."
+#~ msgstr "skriver rubrikfelt \"%s\" til \"%s\"..."
 
-#: lilypond-score.cc:168
-msgid "track "
-msgstr "spor "
+#~ msgid "#32 in quarter: %d"
+#~ msgstr "#32 i fjerdedel: %d"
 
-#: lilypond-score.cc:177
-msgid "NOT Filtering tempo..."
-msgstr "Filtrerer IKKE tempo..."
+#~ msgid "LY output to `%s'..."
+#~ msgstr "LY-uddata til \"%s\"..."
 
-#: lilypond-score.cc:186
-msgid "NOT Quantifying columns..."
-msgstr "Kvantificerer IKKE kolonner..."
+#~ msgid "track %d:"
+#~ msgstr "spor %d:"
 
-#: lilypond-score.cc:190
-msgid "Quantifying columns..."
-msgstr "Kvantificerer kolonner..."
+#~ msgid "Processing..."
+#~ msgstr "Behandler..."
 
-#: lilypond-score.cc:223
-msgid "Settling columns..."
-msgstr "Bestemmer kolonner..."
+#~ msgid "Creating voices..."
+#~ msgstr "Laver stemmer..."
 
-#: lilypond-staff.cc:209
-msgid "% MIDI copyright:"
-msgstr "% MIDI-copyright:"
+#~ msgid "track "
+#~ msgstr "spor "
 
-#: lilypond-staff.cc:210
-msgid "% MIDI instrument:"
-msgstr "% MIDI-instrument:"
+#~ msgid "NOT Filtering tempo..."
+#~ msgstr "Filtrerer IKKE tempo..."
 
-#: lilypond-stream.cc:37
-#, c-format
-msgid "lily indent level: %d"
-msgstr "indenteringsniveau for lily: %d"
+#~ msgid "NOT Quantifying columns..."
+#~ msgstr "Kvantificerer IKKE kolonner..."
+
+#~ msgid "Quantifying columns..."
+#~ msgstr "Kvantificerer kolonner..."
+
+#~ msgid "Settling columns..."
+#~ msgstr "Bestemmer kolonner..."
+
+#~ msgid "% MIDI copyright:"
+#~ msgstr "% MIDI-copyright:"
+
+#~ msgid "% MIDI instrument:"
+#~ msgstr "% MIDI-instrument:"
+
+#~ msgid "lily indent level: %d"
+#~ msgstr "indenteringsniveau for lily: %d"
 
 # Kanske man ikke skal oversætta, men når får de tage bort _() i stællet for
 # at skrive en fånig kommentar
-#. Maybe better not to translate these?
-#: lilypond-stream.cc:83
-msgid "% Creator: "
-msgstr "% Kreatør: "
-
-#: lilypond-stream.cc:88
-msgid "% Automatically generated"
-msgstr "% Automatgenereret"
-
-#: lilypond-stream.cc:97
-#, c-format
-msgid "% from input file: "
-msgstr "% fra inddatafil: "
-
-#: main.cc:94
-msgid "write exact durations, e.g.: a4*385/384"
-msgstr "skriv eksakte tidslængder, fx: a4*385/384"
-
-#: main.cc:95
-msgid "enable debugging output"
-msgstr "aktivér fejlsøgningsuddata"
+#~ msgid "% Creator: "
+#~ msgstr "% Kreatør: "
 
-#: main.cc:97
-msgid "ACC[:MINOR]"
-msgstr "TONE[:MOL]"
+#~ msgid "% Automatically generated"
+#~ msgstr "% Automatgenereret"
 
-#: main.cc:97
-msgid "set key: ACC +sharps/-flads; :1 minor"
-msgstr "sæt tonart: TONE +forhøjelser/-sænkninger; :1 mol"
+#~ msgid "% from input file: "
+#~ msgstr "% fra inddatafil: "
 
-#: main.cc:98
-msgid "don't output tuplets, double dots or rests, smallest is 32"
-msgstr "udskriv ikke tupler, dobbeltpunktninger eller pauser, mindste er 32"
-
-#: main.cc:99
-msgid "set FILE as default output"
-msgstr "sæt FIL som standarduddata"
-
-#: main.cc:100
-msgid "don't output tuplets"
-msgstr "udskriv ikke tupler"
-
-#: main.cc:101
-msgid "be quiet"
-msgstr "vær stille"
-
-#: main.cc:102
-msgid "don't output rests or skips"
-msgstr "udskriv ikke pauser eller hop"
+#~ msgid "write exact durations, e.g.: a4*385/384"
+#~ msgstr "skriv eksakte tidslængder, fx: a4*385/384"
 
-#: main.cc:103
-msgid "DUR"
-msgstr "LÆNGDE"
+#~ msgid "enable debugging output"
+#~ msgstr "aktivér fejlsøgningsuddata"
 
-#: main.cc:103
-msgid "set smallest duration"
-msgstr "indstil mindste længde"
+#~ msgid "don't output tuplets, double dots or rests, smallest is 32"
+#~ msgstr "udskriv ikke tupler, dobbeltpunktninger eller pauser, mindste er 32"
 
-#: main.cc:104
-msgid "don't timestamp the output"
-msgstr "tidsstempl ikke uddata"
+#~ msgid "set FILE as default output"
+#~ msgstr "sæt FIL som standarduddata"
 
-#: main.cc:106
-msgid "be verbose"
-msgstr "vær udførlig"
+#~ msgid "don't output tuplets"
+#~ msgstr "udskriv ikke tupler"
 
-#: main.cc:108
-msgid "assume no double dotted notes"
-msgstr "antag ingen dobbeltpunktede noder"
+#~ msgid "be quiet"
+#~ msgstr "vær stille"
 
-#: main.cc:115
-#, c-format
-msgid "Usage: %s [OPTION]... [FILE]"
-msgstr "Brug: %s [FLAG]... [FIL]"
+#~ msgid "don't output rests or skips"
+#~ msgstr "udskriv ikke pauser eller hop"
 
-#: main.cc:117
-msgid "Translate MIDI-file to lilypond"
-msgstr "Oversæt MIDI-fil til lilypond"
+#~ msgid "set smallest duration"
+#~ msgstr "indstil mindste længde"
 
-#: main.cc:131
-#, c-format
-msgid "no_double_dots: %d\n"
-msgstr "no_double_dots: %d\n"
+#~ msgid "don't timestamp the output"
+#~ msgstr "tidsstempl ikke uddata"
 
-#: main.cc:133
-#, c-format
-msgid "no_rests: %d\n"
-msgstr "no_rests: %d\n"
+#~ msgid "be verbose"
+#~ msgstr "vær udførlig"
 
-#: main.cc:135
-#, c-format
-msgid "no_quantify_b_s: %d\n"
-msgstr "no_quantify_b_s: %d\n"
+#~ msgid "assume no double dotted notes"
+#~ msgstr "antag ingen dobbeltpunktede noder"
 
-#: main.cc:137
-#, c-format
-msgid "no_smaller_than: %d (1/%d)\n"
-msgstr "no_smaller_than: %d (1/%d)\n"
+#~ msgid "Usage: %s [OPTION]... [FILE]"
+#~ msgstr "Brug: %s [FLAG]... [FIL]"
 
-#: main.cc:140
-#, c-format
-msgid "no_tuplets: %d\n"
-msgstr "no_tuplets: %d\n"
+#~ msgid "Translate MIDI-file to lilypond"
+#~ msgstr "Oversæt MIDI-fil til lilypond"
 
-#: midi-parser.cc:64
-msgid "zero length string encountered"
-msgstr "streng med længde nul mødtes"
+#~ msgid "no_double_dots: %d\n"
+#~ msgstr "no_double_dots: %d\n"
 
-#: midi-score-parser.cc:44
-msgid "MIDI header expected"
-msgstr "forventede MIDI-rubrik"
+#~ msgid "no_rests: %d\n"
+#~ msgstr "no_rests: %d\n"
 
-#: midi-score-parser.cc:49
-msgid "invalid header length"
-msgstr "ugyldig rubriklængde"
+#~ msgid "no_quantify_b_s: %d\n"
+#~ msgstr "no_quantify_b_s: %d\n"
 
-#: midi-score-parser.cc:52
-msgid "invalid MIDI format"
-msgstr "ugyldigt MIDI-format"
+#~ msgid "no_smaller_than: %d (1/%d)\n"
+#~ msgstr "no_smaller_than: %d (1/%d)\n"
 
-#: midi-score-parser.cc:55
-msgid "invalid number of tracks"
-msgstr "ugyldigt antal spor"
+#~ msgid "no_tuplets: %d\n"
+#~ msgstr "no_tuplets: %d\n"
 
-#: midi-score-parser.cc:58
-msgid "can't handle non-metrical time"
-msgstr "kan ikke håndtere ikke-metrisk tid"
+#~ msgid "zero length string encountered"
+#~ msgstr "streng med længde nul mødtes"
 
-#: midi-track-parser.cc:68
-#, c-format
-msgid "Junking note-end event: channel = %d, pitch = %d"
-msgstr "Stryger nodeslutshændelse: kanal = %d, tone = %d"
+#~ msgid "MIDI header expected"
+#~ msgstr "forventede MIDI-rubrik"
+
+#~ msgid "invalid header length"
+#~ msgstr "ugyldig rubriklængde"
+
+#~ msgid "invalid MIDI format"
+#~ msgstr "ugyldigt MIDI-format"
+
+#~ msgid "invalid number of tracks"
+#~ msgstr "ugyldigt antal spor"
+
+#~ msgid "can't handle non-metrical time"
+#~ msgstr "kan ikke håndtere ikke-metrisk tid"
+
+#~ msgid "Junking note-end event: channel = %d, pitch = %d"
+#~ msgstr "Stryger nodeslutshændelse: kanal = %d, tone = %d"
 
-#: midi-track-parser.cc:124
-msgid "invalid running status"
-msgstr "ugyldig kørselstatus"
+#~ msgid "invalid running status"
+#~ msgstr "ugyldig kørselstatus"
 
-#: midi-track-parser.cc:328
-msgid "unimplemented MIDI meta-event"
-msgstr "uimplementeret MIDI-metahændelse"
+#~ msgid "unimplemented MIDI meta-event"
+#~ msgstr "uimplementeret MIDI-metahændelse"
 
-#: midi-track-parser.cc:333
-msgid "invalid MIDI event"
-msgstr "ugyldig MIDI-hændelse"
+#~ msgid "invalid MIDI event"
+#~ msgstr "ugyldig MIDI-hændelse"
 
-#: midi-track-parser.cc:348
-msgid "MIDI track expected"
-msgstr "forventede MIDI-spor"
+#~ msgid "MIDI track expected"
+#~ msgstr "forventede MIDI-spor"
 
-#: midi-track-parser.cc:353
-msgid "invalid track length"
-msgstr "ugyldig sporlængde"
+#~ msgid "invalid track length"
+#~ msgstr "ugyldig sporlængde"
diff -purN ../lilypond-1.5.28/po/de.po ./po/de.po
--- ../lilypond-1.5.28/po/de.po	Sun Sep 16 17:09:58 2001
+++ ./po/de.po	Thu Jan 31 13:17:54 2002
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Lilypond 1.2.8\n"
-"POT-Creation-Date: 2001-09-09 17:41+0200\n"
+"POT-Creation-Date: 2002-01-29 23:08+0100\n"
 "PO-Revision-Date: 1999-09-18 01:30+0200\n"
 "Last-Translator: Erwin Dieterich <bamse@gmx.de>\n"
 "Language-Team: LANGUAGE <de@li.org>\n"
@@ -13,304 +13,349 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: ly2dvi.py:115
-msgid "Generate .dvi with LaTeX for LilyPond"
-msgstr ""
-
-#: data-file.cc:118 input.cc:85 ly2dvi.py:197 midi-parser.cc:100 mup2ly.py:93
-#: update-lily.py:119 warn.cc:23
+#: data-file.cc:118 input.cc:85 ly2dvi.py:113 midi2ly.py:148
+#: update-lily.py:136 warn.cc:23
 msgid "warning: "
 msgstr "Warnung: "
 
-#: input.cc:90 ly2dvi.py:212 ly2dvi.py:641 ly2dvi.py:659 ly2dvi.py:850
-#: mup2ly.py:98 mup2ly.py:188 update-lily.py:124 update-lily.py:212 warn.cc:9
-#: warn.cc:17
+#: input.cc:90 ly2dvi.py:116 ly2dvi.py:132 ly2dvi.py:691 ly2dvi.py:709
+#: midi2ly.py:163 midi2ly.py:1012 midi2ly.py:1081 update-lily.py:151
+#: update-lily.py:426 warn.cc:9 warn.cc:17
 msgid "error: "
 msgstr "Fehler: "
 
-#: ly2dvi.py:213 mup2ly.py:100 update-lily.py:126
+#: ly2dvi.py:133 midi2ly.py:164 update-lily.py:152
 #, fuzzy
 msgid "Exiting ... "
 msgstr "Linie ... "
 
-#: ly2dvi.py:271 mup2ly.py:158 update-lily.py:184
+#: ly2dvi.py:191 midi2ly.py:222 update-lily.py:210
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE"
 msgstr "Verwendung: %s [OPTIONEN] ... [DATEI]"
 
-#: ly2dvi.py:275 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:188
+#: ly2dvi.py:195 main.cc:151 midi2ly.py:226 update-lily.py:214
 msgid "Options:"
 msgstr "Optionen:"
 
-#: ly2dvi.py:279 main.cc:124 main.cc:166 mup2ly.py:168 update-lily.py:192
+#: ly2dvi.py:199 main.cc:168 midi2ly.py:230 update-lily.py:218
 #, fuzzy, c-format
 msgid "Report bugs to %s"
 msgstr "Melde Fehler an"
 
-#: ly2dvi.py:307 mup2ly.py:185 update-lily.py:209
+#: ly2dvi.py:227 midi2ly.py:258 update-lily.py:246
 #, fuzzy, c-format
 msgid "Invoking `%s'"
 msgstr "Uralt-Bitte: `%s'"
 
-#: ly2dvi.py:311 mup2ly.py:188 update-lily.py:212
+#: ly2dvi.py:231 midi2ly.py:262 update-lily.py:250
 #, c-format
 msgid "command exited with value %d"
 msgstr ""
 
-#: ly2dvi.py:313 mup2ly.py:190 update-lily.py:214
+#: ly2dvi.py:233 midi2ly.py:264 update-lily.py:252
 msgid "(ignored)"
 msgstr ""
 
-#: ly2dvi.py:323
+#: ly2dvi.py:243 midi2ly.py:274 update-lily.py:262
 #, fuzzy, c-format
 msgid "Cleaning %s..."
 msgstr "Uralt-Bitte: `%s'"
 
-#: ly2dvi.py:338 mup2ly.py:214 update-lily.py:238
-#, fuzzy, c-format
-msgid "no such setting: %s"
-msgstr "Kein solches instrument: `%s'"
+#: ly2dvi.py:301
+msgid "Generate .dvi with LaTeX for LilyPond"
+msgstr ""
 
-#: ly2dvi.py:351 main.cc:113
+#: ly2dvi.py:304 main.cc:115
 msgid "write Makefile dependencies for every input file"
 msgstr "Schreibe Makefile-Abhängigkeiten für jede Eingabedatei"
 
-#: ly2dvi.py:352 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:252
+#: ly2dvi.py:305 main.cc:111 midi2ly.py:98 mup2ly.py:74 update-lily.py:86
 msgid "this help"
 msgstr "Diese Hilfe"
 
-#: ly2dvi.py:353 main.cc:111 main.cc:116
+#: ly2dvi.py:306 main.cc:113 main.cc:118
 msgid "DIR"
 msgstr "DIR"
 
-#: ly2dvi.py:353
+#: ly2dvi.py:306
 #, fuzzy
 msgid "add DIR to LilyPond's search path"
 msgstr "Hänge DIR an den Suchpfad an"
 
-#: ly2dvi.py:354
+#: ly2dvi.py:307
 #, c-format
 msgid "keep all output, and name the directory %s.dir"
 msgstr ""
 
-#: ly2dvi.py:355
+#: ly2dvi.py:308
 msgid "don't run LilyPond"
 msgstr ""
 
-#: ly2dvi.py:356 main.cc:114
+#: ly2dvi.py:309 main.cc:116
 #, fuzzy
 msgid "produce MIDI output only"
 msgstr "Nur Midiausgabe"
 
-#: ly2dvi.py:357 ly2dvi.py:358 main.cc:99 main.cc:112 main.cc:115
+#: ly2dvi.py:310 ly2dvi.py:311 main.cc:114 main.cc:117 midi2ly.py:100
 msgid "FILE"
 msgstr "DATEI"
 
-#: ly2dvi.py:357
+#: ly2dvi.py:310 midi2ly.py:100
 #, fuzzy
 msgid "write ouput to FILE"
 msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung"
 
-#: ly2dvi.py:358
+#: ly2dvi.py:311
 msgid "find pfa fonts used in FILE"
 msgstr ""
 
-#: ly2dvi.py:360
+#: ly2dvi.py:313
 #, fuzzy
 msgid "generate PostScript output"
 msgstr "Degenerierte Zwangsbedingungen"
 
-#: ly2dvi.py:361
+#: ly2dvi.py:314
 msgid "KEY=VAL"
 msgstr ""
 
-#: ly2dvi.py:361
+#: ly2dvi.py:314
 msgid "change global setting KEY to VAL"
 msgstr ""
 
-#: ly2dvi.py:362 main.cc:119 mup2ly.py:1120 update-lily.py:256
+#: ly2dvi.py:315 main.cc:121 midi2ly.py:103 mup2ly.py:77 update-lily.py:90
 #, fuzzy
 msgid "verbose"
 msgstr "Sei geschwätzig"
 
-#: ly2dvi.py:363 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:257
+#: ly2dvi.py:316 main.cc:120 midi2ly.py:104 mup2ly.py:78 update-lily.py:91
 msgid "print version number"
 msgstr "Zeige die Versionsnummer"
 
-#: ly2dvi.py:364 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:259
+#: ly2dvi.py:317 main.cc:122 midi2ly.py:105 mup2ly.py:79 update-lily.py:93
 msgid "show warranty and copyright"
 msgstr "Zeige Garantie und Urheberrechte"
 
-#: ly2dvi.py:386 ly2dvi.py:582 ly2dvi.py:607
+#: ly2dvi.py:406
+#, fuzzy, c-format
+msgid "no such setting: %s"
+msgstr "Kein solches instrument: `%s'"
+
+#: ly2dvi.py:434 ly2dvi.py:632 ly2dvi.py:657
 #, fuzzy, c-format
 msgid "Running %s..."
 msgstr "Uralt-Bitte: `%s'"
 
-#: ly2dvi.py:399
+#: ly2dvi.py:449
 #, fuzzy, c-format
 msgid "Analyzing %s..."
 msgstr "Uralt-Bitte: `%s'"
 
-#: ly2dvi.py:455
+#: ly2dvi.py:505
 #, c-format
 msgid "no lilypond output found for %s"
 msgstr ""
 
-#: ly2dvi.py:497
+#: ly2dvi.py:547
 #, fuzzy, c-format
 msgid "invalid value: %s"
 msgstr "Ungültiger Buchstabe `%c'"
 
-#: ly2dvi.py:641
+#: ly2dvi.py:691
 #, fuzzy, c-format
 msgid "not a PostScript file: `%s'"
 msgstr "Kann die Datei %s nicht öffnen"
 
-#: ly2dvi.py:659
+#: ly2dvi.py:709 midi2ly.py:1012 update-lily.py:426
 #, c-format
 msgid "getopt says: `%s'"
 msgstr ""
 
-#: ly2dvi.py:826 scores.cc:44
+#: ly2dvi.py:820
+#, fuzzy, c-format
+msgid "filename should not contain spaces: `%s'"
+msgstr "Enthält schon ein `%s'"
+
+#: ly2dvi.py:885 scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to `%s'..."
 msgstr "Ausgabe auf Papier auf %s..."
 
-#: ly2dvi.py:837
+#: ly2dvi.py:896 midi2ly.py:996
 #, fuzzy, c-format
 msgid "%s output to `%s'..."
 msgstr "MIDI-Ausgabe nach %s..."
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:839
-#: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
+#: includable-lexer.cc:49 lily-guile.cc:134 ly2dvi.py:898 scores.cc:136
+#: scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "Kann Datei `%s' nicht finden"
 
-#: ly2dvi.py:850
+#: ly2dvi.py:909 midi2ly.py:1081
 msgid "no files specified on command line."
 msgstr ""
 
-#: mup2ly.py:51
-msgid "Convert mup to ly"
+#: midi2ly.py:92
+msgid "Convert MIDI to LilyPond source"
 msgstr ""
 
-#: mup2ly.py:166
-#, c-format
-msgid "%s is far from completed.  Not all constructs are recognised."
+#: midi2ly.py:95
+msgid "print absolute pitches"
 msgstr ""
 
-#: mup2ly.py:964
-#, fuzzy, c-format
-msgid "no such context: %s"
-msgstr "Kein solches instrument: `%s'"
+#: midi2ly.py:96 midi2ly.py:101
+msgid "DUR"
+msgstr "DUR"
+
+#: midi2ly.py:96
+msgid "quantise note durations on DUR"
+msgstr ""
+
+#: midi2ly.py:97
+msgid "print explicit durations"
+msgstr ""
+
+#: midi2ly.py:99
+#, fuzzy
+msgid "ALT[:MINOR]"
+msgstr "ACC[:MOLL]"
+
+#: midi2ly.py:99
+#, fuzzy
+msgid "set key: ALT=+sharps|-flats; MINOR=1"
+msgstr "Setze Tonart: ACC +Kreuze/-Bes; :1 Moll"
+
+#: midi2ly.py:101
+msgid "quantise note starts on DUR"
+msgstr ""
+
+#: midi2ly.py:102
+msgid "DUR*NUM/DEN"
+msgstr ""
+
+#: midi2ly.py:102
+msgid "allow tuplet durations DUR*NUM/DEN"
+msgstr ""
+
+#: midi2ly.py:106
+msgid "treat every text as a lyric"
+msgstr ""
+
+#: midi2ly.py:1027
+msgid "Example:"
+msgstr ""
+
+#: mup2ly.py:69
+msgid "Convert mup to LilyPond source"
+msgstr ""
 
-#: mup2ly.py:1115
+#: mup2ly.py:72
 msgid "debug"
 msgstr ""
 
-#: mup2ly.py:1116
+#: mup2ly.py:73
 msgid "define macro NAME [optional expansion EXP]"
 msgstr ""
 
-#: main.cc:115 mup2ly.py:1118
+#: main.cc:117 mup2ly.py:75
 #, fuzzy
 msgid "write output to FILE"
 msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung"
 
-#: mup2ly.py:1119
+#: mup2ly.py:76
 msgid "only pre-process"
 msgstr ""
 
-#: mup2ly.py:1200
+#: mup2ly.py:827
+#, fuzzy, c-format
+msgid "no such context: %s"
+msgstr "Kein solches instrument: `%s'"
+
+#: mup2ly.py:1051
 #, fuzzy, c-format
 msgid "Processing `%s'..."
 msgstr "Verarbeite..."
 
-#: mup2ly.py:1219
+#: mup2ly.py:1070
 #, fuzzy, c-format
 msgid "Writing `%s'..."
 msgstr "Linie ... "
 
-#: update-lily.py:52
+#: update-lily.py:75
 msgid "Fetch and rebuild from latest source package"
 msgstr ""
 
-#: update-lily.py:224
-#, fuzzy, c-format
-msgid "Cleaning `%s'..."
-msgstr "Uralt-Bitte: `%s'"
-
-#: update-lily.py:244
+#: update-lily.py:78
 #, c-format
 msgid "unpack and build in DIR [%s]"
 msgstr ""
 
-#: update-lily.py:245
+#: update-lily.py:79
 msgid "execute COMMAND, subtitute:"
 msgstr ""
 
-#: update-lily.py:246
+#: update-lily.py:80
 msgid "%b: build root"
 msgstr ""
 
-#: update-lily.py:247
+#: update-lily.py:81
 #, c-format
 msgid "%n: package name"
 msgstr ""
 
-#: update-lily.py:248
+#: update-lily.py:82
 #, fuzzy
 msgid "%r: release directory"
 msgstr "Kann ein `%s' weder finden noch erzeugen"
 
-#: update-lily.py:249
+#: update-lily.py:83
 msgid "%t: tarball"
 msgstr ""
 
-#: update-lily.py:250
+#: update-lily.py:84
 msgid "%v: package version"
 msgstr ""
 
-#: update-lily.py:253
+#: update-lily.py:87
 #, c-format
 msgid "keep all output, and name the directory %s"
 msgstr ""
 
-#: update-lily.py:254
+#: update-lily.py:88
 msgid "upon failure notify EMAIL[,EMAIL]"
 msgstr ""
 
-#: update-lily.py:255
+#: update-lily.py:89
 msgid "remove previous build"
 msgstr ""
 
-#: update-lily.py:258
+#: update-lily.py:92
 #, c-format
 msgid "fetch and build URL [%s]"
 msgstr ""
 
-#: update-lily.py:366
+#: update-lily.py:397
 #, fuzzy, c-format
 msgid "Listing `%s'..."
 msgstr "Linie ... "
 
-#: update-lily.py:427
+#: update-lily.py:465
 #, c-format
 msgid "latest is: %s"
 msgstr ""
 
-#: update-lily.py:428
+#: update-lily.py:466
 #, c-format
 msgid "relax, %s is up to date"
 msgstr ""
 
-#: update-lily.py:436 update-lily.py:449
+#: update-lily.py:474 update-lily.py:487
 #, fuzzy, c-format
 msgid "Fetching `%s'..."
 msgstr "Uralt-Bitte: `%s'"
 
-#: update-lily.py:458
+#: update-lily.py:496
 #, fuzzy, c-format
 msgid "Building `%s'..."
 msgstr "Uralt-Bitte: `%s'"
@@ -352,8 +397,8 @@ msgstr "Position unbekannt"
 msgid "can't map file"
 msgstr "Kann die Datei nicht mappen"
 
-#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45
-#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
+#: mapped-file-storage.cc:87 scores.cc:48 simple-file-storage.cc:44
+#: streams.cc:37 text-stream.cc:23
 #, c-format
 msgid "can't open file: `%s'"
 msgstr "Kann die Datei %s nicht öffnen"
@@ -377,6 +422,16 @@ msgstr "Programmierfehler: "
 msgid " (Continuing; cross thumbs)"
 msgstr " (Ich mache weiter: Drück´ mir die Daumen!)"
 
+#: accidental-engraver.cc:136
+#, fuzzy, c-format
+msgid "unknown accidental typesetting: %s"
+msgstr "Unbekannte Sonder-Zeichenkette"
+
+#: accidental-engraver.cc:139
+#, c-format
+msgid "Accidental typesetting must be pair: %s"
+msgstr ""
+
 #: afm.cc:59
 #, fuzzy, c-format
 msgid "can't find character number: %d"
@@ -437,40 +492,50 @@ msgstr ""
 msgid "Can't switch translators, I'm there already"
 msgstr ""
 
-#: beam-engraver.cc:91 beam-engraver.cc:124
+#: bar-check-iterator.cc:58
+#, fuzzy, c-format
+msgid "barcheck failed at: %s"
+msgstr "Überprüfung der Takte is fehlgeschlagen bei: %s"
+
+#: beam-engraver.cc:93 beam-engraver.cc:126
 #, fuzzy
 msgid "can't find start of beam"
 msgstr "Kann nicht beide Enden von %s finden"
 
-#: beam-engraver.cc:158
+#: beam-engraver.cc:150
 #, fuzzy
 msgid "already have a beam"
 msgstr "Habe schon einen Balken"
 
-#: beam-engraver.cc:222
+#: beam-engraver.cc:216
 #, fuzzy
 msgid "unterminated beam"
 msgstr "Unbeendeter Bindestrich"
 
-#: beam-engraver.cc:255 chord-tremolo-engraver.cc:195
+#: beam-engraver.cc:249 chord-tremolo-engraver.cc:193
 #, fuzzy
 msgid "stem must have Rhythmic structure"
 msgstr "Ein Notenhals muss rhythmische Struktur haben."
 
-#: beam-engraver.cc:267
+#: beam-engraver.cc:261
 msgid "stem doesn't fit in beam"
 msgstr "Notenhals passt nicht in den Balken"
 
-#: beam-engraver.cc:268
+#: beam-engraver.cc:262
 msgid "beam was started here"
 msgstr "Der Balken bagann hier"
 
-#: beam.cc:86
+#: beam.cc:93
 #, fuzzy
-msgid "beam has less than two stems"
+msgid "beam has less than two visible stems"
 msgstr "Balken mit weniger als zwei Hälsen"
 
-#: beam.cc:637
+#: beam.cc:98
+#, fuzzy
+msgid "Beam has less than two stems. Removing beam."
+msgstr "Balken mit weniger als zwei Hälsen"
+
+#: beam.cc:660
 msgid "weird beam vertical offset"
 msgstr ""
 
@@ -498,7 +563,7 @@ msgstr ""
 msgid "none of these in my family"
 msgstr ""
 
-#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192
+#: chord-tremolo-engraver.cc:139 percent-repeat-engraver.cc:182
 #, fuzzy
 msgid "unterminated chord tremolo"
 msgstr "Unbeendeter Bindestrich"
@@ -518,7 +583,7 @@ msgstr "Unerlaubte Subtraktion: nicht Te
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr "Unerlaubter Baßton: gehört nicht zum Akkord: %s"
 
-#: collision.cc:245
+#: collision.cc:281
 msgid "Too many clashing notecolumns.  Ignoring them."
 msgstr "Zu viele aneinanderstoßende Notenspalten. Ich ignoriere sie."
 
@@ -526,31 +591,31 @@ msgstr "Zu viele aneinanderstoßende Note
 msgid "NaN"
 msgstr "NaN"
 
-#: dynamic-engraver.cc:197 span-dynamic-performer.cc:86
+#: dynamic-engraver.cc:195 span-dynamic-performer.cc:82
 #, fuzzy
 msgid "can't find start of (de)crescendo"
 msgstr "Ich kann kein (De)crescendo bis zum Ende finden"
 
-#: dynamic-engraver.cc:222
+#: dynamic-engraver.cc:220
 #, fuzzy
 msgid "already have a crescendo"
 msgstr "Habe schon einen Balken"
 
-#: dynamic-engraver.cc:223
+#: dynamic-engraver.cc:221
 #, fuzzy
 msgid "already have a decrescendo"
 msgstr "Habe schon einen Balken"
 
-#: dynamic-engraver.cc:317
+#: dynamic-engraver.cc:315
 #, fuzzy
 msgid "unterminated (de)crescendo"
 msgstr "Nichtbeendetes Crescendo"
 
-#: extender-engraver.cc:97
+#: extender-engraver.cc:96
 msgid "unterminated extender"
 msgstr "Unbeendete Linienfortführung"
 
-#: extender-engraver.cc:109
+#: extender-engraver.cc:108
 msgid "Nothing to connect extender to on the left.  Ignoring extender request."
 msgstr ""
 
@@ -563,7 +628,7 @@ msgstr "Keiner darf eine Wiederholungskl
 msgid "couldn't find any font satisfying "
 msgstr ""
 
-#: gourlay-breaking.cc:157
+#: gourlay-breaking.cc:168
 msgid "No feasible line breaking found"
 msgstr ""
 
@@ -576,23 +641,23 @@ msgstr ""
 msgid "crescendo too small"
 msgstr "Crescendo"
 
-#: hyphen-engraver.cc:90
+#: hyphen-engraver.cc:89
 msgid "unterminated hyphen"
 msgstr "Unbeendeter Bindestrich"
 
-#: hyphen-engraver.cc:102
+#: hyphen-engraver.cc:101
 msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen request."
 msgstr ""
 
-#: key-engraver.cc:99
+#: key-engraver.cc:93
 msgid "Conflicting key signatures found."
 msgstr ""
 
-#: key-engraver.cc:100
+#: key-engraver.cc:94
 msgid "This was the other key definition."
 msgstr ""
 
-#: key-performer.cc:77
+#: key-performer.cc:91
 msgid "FIXME: key change merge"
 msgstr ""
 
@@ -601,7 +666,7 @@ msgstr ""
 msgid "Kpathsea couldn't find TFM file `%s'"
 msgstr "Kann Datei `%s' nicht finden"
 
-#: lily-guile.cc:141
+#: lily-guile.cc:136
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(Ladepfad ist `%s')"
@@ -611,12 +676,12 @@ msgstr "(Ladepfad ist `%s')"
 msgid "Element count %d."
 msgstr ""
 
-#: line-of-score.cc:313 paper-score.cc:77
+#: line-of-score.cc:325 paper-score.cc:76
 #, c-format
 msgid "Element count %d "
 msgstr ""
 
-#: line-of-score.cc:327
+#: line-of-score.cc:339
 msgid "Calculating column positions..."
 msgstr "Berechne Position der Spalten..."
 
@@ -629,64 +694,64 @@ msgid "Huh? Melismatic note found to hav
 msgstr ""
 
 #. print example usage:  lilypond -e "(set-lily-option 'help 0)" ?
-#: main.cc:105
+#: main.cc:107
 msgid "EXPR"
 msgstr ""
 
-#: main.cc:105
+#: main.cc:107
 msgid "evalute EXPR as Scheme after .scm init is read"
 msgstr ""
 
 #. another bug in option parser: --output=foe is taken as an abbreviation
 #. for --output-format
-#: main.cc:108
+#: main.cc:110
 msgid "EXT"
 msgstr "EXT"
 
-#: main.cc:108
+#: main.cc:110
 #, fuzzy
 msgid "use output format EXT (tex [default], pdftex, ps, scm or as)"
 msgstr "Benutze das Ausgabeformat EXT"
 
-#: main.cc:110
+#: main.cc:112
 #, fuzzy
 msgid "FIELD"
 msgstr "DATEI"
 
-#: main.cc:110
+#: main.cc:112
 msgid "write header field to BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:111
+#: main.cc:113
 msgid "add DIR to search path"
 msgstr "Hänge DIR an den Suchpfad an"
 
-#: main.cc:112
+#: main.cc:114
 msgid "use FILE as init file"
 msgstr "Verwende FILE als Initialisierungsdatei"
 
-#: main.cc:116
+#: main.cc:118
 msgid "prepend DIR to dependencies"
 msgstr ""
 
-#: main.cc:117
+#: main.cc:119
 msgid "inhibit file output naming and exporting"
 msgstr "Unterdrücke die automatische Benennung von Ausgabedateien und Export"
 
 #.
 #. No version number or newline here. It confuses help2man
 #.
-#: main.cc:137
+#: main.cc:139
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Benutzung: %s [OPTIONEN] ... [DATEI] ..."
 
-#: main.cc:139
+#: main.cc:141
 #, fuzzy
 msgid "Typeset music and or play MIDI from FILE"
 msgstr "Setze Musik oder spiele MIDI von DATEI"
 
-#: main.cc:143
+#: main.cc:145
 msgid ""
 "LilyPond is a music typesetter.  It produces beautiful sheet music\n"
 "using a high level description file as input.  LilyPond is part of \n"
@@ -696,11 +761,11 @@ msgstr ""
 "Notenblätter erzeugen. Dazu verwendet es eine eigene Beschreibungssprache.\n"
 "lilyPond ist Teil des GNU-Projekts\n"
 
-#: main.cc:153
+#: main.cc:155
 msgid "This binary was compiled with the following options:"
 msgstr "Diese Programm wurde mit den folgenden Optionen übersetzt:"
 
-#: main.cc:56 main.cc:174
+#: main.cc:176
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -713,17 +778,17 @@ msgstr ""
 "einhalten. Wenn Sie das Programm mit `%s --warranty starten, bekommen\n"
 "Sie mehr Informationen.\n"
 
-#: main.cc:63 main.cc:181 main.cc:193
+#: main.cc:183 main.cc:195
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr "Urheberrechte (Copyright) (c) %s bei"
 
-#: main.cc:191
+#: main.cc:193
 #, fuzzy
 msgid "GNU LilyPond -- The music typesetter"
 msgstr "GNU LilyPond -- Der Notensatz des GNU-Projekts"
 
-#: main.cc:72 main.cc:199
+#: main.cc:201
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License version 2\n"
@@ -771,42 +836,42 @@ msgstr "unsinnige Tonhöhe"
 msgid "can't find `%s' context"
 msgstr "Kann Partiturkontext nicht finden"
 
-#: music.cc:239
+#: music.cc:144
+#, fuzzy, c-format
+msgid "Transposition by %s makes accidental larger than two"
+msgstr "Transponieren um %s macht Vorzecihen größer als zwei"
+
+#: music.cc:249
 msgid "ly_get_mus_property (): Not a Music"
 msgstr ""
 
-#: music.cc:253
+#: music.cc:263
 msgid "ly_set_mus_property (): Not a symbol"
 msgstr ""
 
-#: music.cc:265
+#: music.cc:275
 msgid "ly_set_mus_property ():  not of type Music"
 msgstr ""
 
-#: music.cc:279
+#: music.cc:289
 msgid "ly_make_music (): Not a string"
 msgstr ""
 
-#: music.cc:299
+#: music.cc:309
 msgid "ly_music_name (): Not a music expression"
 msgstr ""
 
-#: musical-request.cc:28
-#, fuzzy, c-format
-msgid "Transposition by %s makes accidental larger than two"
-msgstr "Transponieren um %s macht Vorzecihen größer als zwei"
-
-#: my-lily-lexer.cc:140
+#: my-lily-lexer.cc:139
 #, fuzzy, c-format
 msgid "Identifier name is a keyword: `%s'"
 msgstr "name ist ein Schlüsselbegriff (keyword) (`%s')"
 
-#: my-lily-lexer.cc:160
+#: my-lily-lexer.cc:159
 #, c-format
 msgid "error at EOF: %s"
 msgstr "Fehler am Dateiende(EOF): %s"
 
-#: midi-score-parser.cc:94 my-lily-parser.cc:47
+#: my-lily-parser.cc:47
 msgid "Parsing..."
 msgstr "Verarbeite..."
 
@@ -825,34 +890,19 @@ msgstr "Uralt-Bitte: `%s'"
 msgid "paper output to `%s'..."
 msgstr "Ausgabe auf Papier auf %s..."
 
-#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99
+#: paper-outputter.cc:60
 msgid ", at "
 msgstr ", bei "
 
-#: paper-outputter.cc:232
-#, fuzzy, c-format
-msgid "writing header field `%s' to `%s'..."
-msgstr "Schreibe Datei mit Abhängigkeiten: `%s'..."
-
-#: paper-score.cc:80
+#: paper-score.cc:79
 msgid "Preprocessing elements..."
 msgstr "Verarbeite Element vor..."
 
-#: paper-score.cc:114
+#: paper-score.cc:113
 #, fuzzy
 msgid "Outputting Score, defined at: "
 msgstr "Gebe Partitur aus, definiert bei: "
 
-#: paper-stream.cc:41
-#, fuzzy, c-format
-msgid "can't create directory: `%s'"
-msgstr "Kann ein `%s' weder finden noch erzeugen"
-
-#: paper-stream.cc:55
-#, fuzzy
-msgid "Error syncing file (disk full?)"
-msgstr "Fehler beim Abspeichern der Datei (Platte voll?)"
-
 #.
 #. We could change the current translator's id, but that would make
 #. errors hard to catch
@@ -869,7 +919,7 @@ msgstr ""
 msgid "none of these in my family: `%s'"
 msgstr ""
 
-#: percent-repeat-engraver.cc:117
+#: percent-repeat-engraver.cc:116
 #, fuzzy
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr "Weiß nicht, wie ich eine fehlende Tonart behandeln soll"
@@ -887,12 +937,17 @@ msgstr "Stück ... "
 msgid "Creator: "
 msgstr "Erstellt von: "
 
-#: performance.cc:113
+#: performance.cc:103
+#, fuzzy
+msgid "at "
+msgstr ", bei "
+
+#: performance.cc:114
 #, c-format
 msgid "from musical definition: %s"
 msgstr "von der musiaklischen Definition: %s"
 
-#: performance.cc:168
+#: performance.cc:169
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "MIDI-Ausgabe nach %s..."
@@ -907,8 +962,8 @@ msgstr "Unbeendeter Bindebogen"
 msgid "can't find start of phrasing slur"
 msgstr "Kann nicht beide Enden von %s finden"
 
-#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154
-#: piano-pedal-performer.cc:85
+#: piano-pedal-engraver.cc:141 piano-pedal-engraver.cc:153
+#: piano-pedal-performer.cc:82
 #, fuzzy, c-format
 msgid "can't find start of piano pedal: `%s'"
 msgstr "Kann keine kürzeste Note bei %s finden"
@@ -917,14 +972,42 @@ msgstr "Kann keine kürzeste Note bei %s 
 msgid "Pitch arguments out of range"
 msgstr ""
 
-#: property-engraver.cc:121
+#: porrectus.cc:34
+msgid "(left_head == 0)"
+msgstr ""
+
+#: porrectus.cc:45
+msgid "undefined left_head"
+msgstr ""
+
+#: porrectus.cc:64
+msgid "(right_head == 0)"
+msgstr ""
+
+#: porrectus.cc:75
+msgid "undefined right_head"
+msgstr ""
+
+#: porrectus.cc:164
+msgid "junking lonely porrectus"
+msgstr ""
+
+#: porrectus.cc:174
+msgid "porrectus style undefined; using mensural"
+msgstr ""
+
+#: porrectus.cc:301
+msgid "ascending vaticana style porrectus"
+msgstr ""
+
+#: property-engraver.cc:116
 #, c-format
 msgid ""
 "`%s' is deprecated.  Use\n"
 " \\property %s.%s \\override #'%s = #%s"
 msgstr ""
 
-#: property-engraver.cc:145
+#: property-engraver.cc:140
 #, fuzzy, c-format
 msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s"
 msgstr "Falsche Type für Besitz-Wert"
@@ -944,27 +1027,27 @@ msgstr "Zu viele Noten für kollidierende
 msgid "Scheme options:"
 msgstr "Optionen:"
 
-#: score-engraver.cc:189
+#: score-engraver.cc:178
 #, fuzzy, c-format
 msgid "unbound spanner `%s'"
 msgstr "Unbeschränkter Abstand `%s'"
 
-#: score.cc:78
+#: score.cc:88
 msgid "Interpreting music..."
 msgstr "Interpretiere die Noten..."
 
-#: score.cc:92
+#: score.cc:102
 #, fuzzy
 msgid "Need music in a score"
 msgstr "Ich brauche Noten in einer Partitur"
 
 #. should we? hampers debugging.
-#: score.cc:105
+#: score.cc:115
 #, fuzzy
 msgid "Errors found/*, not processing score*/"
 msgstr "Habe Fehler gefunden, /* die Partitur wird nicht verarbeitet */"
 
-#: score.cc:112
+#: score.cc:122
 #, fuzzy, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr "verstrichene Zeit %.2f Sekunden"
@@ -979,7 +1062,7 @@ msgstr "Partitur enthält Fehler; ich wer
 msgid "Now processing: `%s'"
 msgstr "Unbekannte Sonder-Zeichenkette"
 
-#: script-engraver.cc:66
+#: script-engraver.cc:65
 #, fuzzy, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr "Ich weiß nicht, wie ich die Artikulation `%s' interpretieren soll\n"
@@ -990,18 +1073,18 @@ msgstr "Ich weiß nicht, wie ich die Arti
 msgid "Separation_item:  I've been drinking too much"
 msgstr "Single_malt_grouping_item: Ich saufe zu viel"
 
-#: simple-spacer.cc:200
+#: simple-spacer.cc:202
 #, c-format
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:125
+#: slur-engraver.cc:124
 msgid "unterminated slur"
 msgstr "Unbeendeter Bindebogen"
 
 #. How to shut up this warning, when Voice_devnull_engraver has
 #. eaten start request?
-#: slur-engraver.cc:142
+#: slur-engraver.cc:141
 #, fuzzy
 msgid "can't find start of slur"
 msgstr "Kann nicht beide Enden von %s finden"
@@ -1011,11 +1094,11 @@ msgstr "Kann nicht beide Enden von %s fi
 msgid "Putting slur over rest.  Ignoring."
 msgstr "Setze Bindebogen über Pause. Wird ignoriert"
 
-#: slur.cc:383
+#: slur.cc:393
 msgid "Slur over rest?"
 msgstr "Bindebogen übe den Rest?"
 
-#: stem-engraver.cc:115
+#: stem-engraver.cc:117
 #, c-format
 msgid "Adding note head to incompatible stem (type = %d)"
 msgstr "Setze Note auf unpassenden Hals (Typ = %d)"
@@ -1026,17 +1109,27 @@ msgid "Weird stem size; check for narrow
 msgstr ""
 "Dubiose Größe des Notenhalses: Überprüfe die Eingabe auf schmale Balken"
 
-#: text-spanner-engraver.cc:94
+#: streams.cc:33
+#, fuzzy, c-format
+msgid "can't create directory: `%s'"
+msgstr "Kann ein `%s' weder finden noch erzeugen"
+
+#: streams.cc:47
+#, fuzzy
+msgid "Error syncing file (disk full?)"
+msgstr "Fehler beim Abspeichern der Datei (Platte voll?)"
+
+#: text-spanner-engraver.cc:92
 #, fuzzy
 msgid "can't find start of text spanner"
 msgstr "Kann nicht beide Enden von %s finden"
 
-#: text-spanner-engraver.cc:114
+#: text-spanner-engraver.cc:112
 #, fuzzy
 msgid "already have a text spanner"
 msgstr "Habe schon einen Balken"
 
-#: text-spanner-engraver.cc:169
+#: text-spanner-engraver.cc:167
 #, fuzzy
 msgid "unterminated text spanner"
 msgstr "Unbeendete Linienfortführung"
@@ -1060,427 +1153,344 @@ msgstr "%s: TFM-Datei hat %u Parameter. 
 msgid "can't find ascii character: %d"
 msgstr "Kann ASCII-Zeichen `%d' nicht finden"
 
-#. How to shut up this warning, when no notes appeared because
-#. they were suicided by Thread_devnull_engraver?
-#: tie-engraver.cc:220 tie-performer.cc:173
-msgid "No ties were created!"
-msgstr "Es wurden keine Haltebögen erzeugt!"
-
-#: tie-engraver.cc:240
+#: tie-engraver.cc:220
 msgid "lonely tie"
 msgstr "Einsamer Haltebogen"
 
+#: tie-performer.cc:161
+msgid "No ties were created!"
+msgstr "Es wurden keine Haltebögen erzeugt!"
+
 #: time-scaled-music-iterator.cc:25
 #, fuzzy
 msgid "no one to print a tuplet start bracket"
 msgstr "Niemand schreibt eine mehrfahce Anfangsklammer"
 
-#: timing-translator.cc:37
-#, fuzzy, c-format
-msgid "barcheck failed at: %s"
-msgstr "Überprüfung der Takte is fehlgeschlagen bei: %s"
-
-#: translator-ctors.cc:40
+#: translator-ctors.cc:61
 #, fuzzy, c-format
 msgid "unknown translator: `%s'"
 msgstr "unbekannter Übersetzer `%s'"
 
-#: translator-def.cc:99
+#: translator-def.cc:87
 msgid "Program has no such type"
 msgstr ""
 
-#: translator-def.cc:105
+#: translator-def.cc:93
 #, fuzzy, c-format
 msgid "Already contains: `%s'"
 msgstr "Enthält schon ein `%s'"
 
-#: translator-def.cc:106
+#: translator-def.cc:94
 #, fuzzy, c-format
 msgid "Not adding translator: `%s'"
 msgstr "unbekannter Übersetzer `%s'"
 
-#: translator-def.cc:224
+#: translator-def.cc:212
 #, fuzzy, c-format
 msgid "can't find: `%s'"
 msgstr "Kann `%s' nicht finden"
 
-#: translator-group.cc:145
+#: translator-group.cc:147
 #, c-format
 msgid "can't find or create `%s' called `%s'"
 msgstr "Kann ein `%s', genannt `%s' weder finden noch erzeugen"
 
-#: translator-group.cc:230
+#: translator-group.cc:232
 #, fuzzy, c-format
 msgid "can't find or create: `%s'"
 msgstr "Kann ein `%s' weder finden noch erzeugen"
 
-#: translator-group.cc:413
+#: translator-group.cc:407
 #, c-format
 msgid ""
 "Can't find property type-check for `%s'.  Perhaps you made a typing error? "
 "Doing assignment anyway."
 msgstr ""
 
-#: translator-group.cc:427
+#: translator-group.cc:421
 #, c-format
 msgid "Type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
 #. programming_error?
-#: translator-group.cc:446
+#: translator-group.cc:440
 msgid "ly-get-trans-property: expecting a Translator_group argument"
 msgstr ""
 
-#: volta-engraver.cc:88
+#: volta-engraver.cc:108
 msgid "No volta spanner to end"
 msgstr ""
 
-#: volta-engraver.cc:105
+#: volta-engraver.cc:125
 msgid "Already have a volta spanner.  Stopping that one prematurely."
 msgstr ""
 
-#: volta-engraver.cc:109
+#: volta-engraver.cc:129
 msgid "Also have a stopped spanner.  Giving up."
 msgstr ""
 
-#: parser.yy:121
+#: parser.yy:129
 #, c-format
 msgid "Expecting %d arguments"
 msgstr ""
 
-#: parser.yy:423
+#: parser.yy:434
 msgid "Identifier should have  alphabetic characters only"
 msgstr ""
 
-#: parser.yy:697
+#: parser.yy:715
 msgid "More alternatives than repeats.  Junking excess alternatives."
 msgstr ""
 
-#: parser.yy:761
+#: parser.yy:767
 msgid "Second argument must be a symbol"
 msgstr ""
 
-#: parser.yy:766
+#: parser.yy:772
 msgid "First argument must be a procedure taking 1 argument"
 msgstr ""
 
-#: parser.yy:1298
+#: parser.yy:1315
 msgid "Expecting string as script definition"
 msgstr ""
 
-#: parser.yy:1308
+#: parser.yy:1325
 msgid "Can't specify direction for this request"
 msgstr ""
 
-#: parser.yy:1433
+#: parser.yy:1451
 msgid "Expecting musical-pitch value"
 msgstr ""
 
-#: parser.yy:1444
+#: parser.yy:1462
 #, fuzzy
 msgid "Must have duration object"
 msgstr "Setze kürzeste Dauer (?)"
 
-#: parser.yy:1453 parser.yy:1461
+#: parser.yy:1471 parser.yy:1479
 #, fuzzy
 msgid "Have to be in Lyric mode for lyrics"
 msgstr "Um Text zu verarbeiten, muß ich im Text-(Lyrics)-Modus sein"
 
-#: parser.yy:1614 parser.yy:1671
+#: parser.yy:1638 parser.yy:1691
 #, c-format
 msgid "not a duration: %d"
 msgstr "Keine Dauer: %d"
 
-#: parser.yy:1682
+#: parser.yy:1752
 #, fuzzy
 msgid "Have to be in Note mode for notes"
 msgstr "Für Noten muß ich im Noten-(Note)-Modus sein"
 
-#: parser.yy:1765
+#: parser.yy:1845
 #, fuzzy
 msgid "Have to be in Chord mode for chords"
 msgstr "Für Akkorde muß ich im Akkord-(Chord)-Modus sein"
 
-#: parser.yy:1945
+#: parser.yy:2025
 msgid "need integer number arg"
 msgstr ""
 
-#: lexer.ll:174
+#: parser.yy:2097
+msgid "Suspect duration found following this beam"
+msgstr ""
+
+#: lexer.ll:175
 msgid "EOF found inside a comment"
 msgstr "Während eines Kommentar war die Datei zu Ende (EOF gefunden)"
 
-#: lexer.ll:188
+#: lexer.ll:189
 msgid "\\maininput disallowed outside init files"
 msgstr ""
 
-#: lexer.ll:212
+#: lexer.ll:213
 #, fuzzy, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "Unbekannter Identifier: `%s'"
 
 #. backup rule
-#: lexer.ll:221
+#: lexer.ll:222
 #, fuzzy
 msgid "Missing end quote"
 msgstr "Endnote fehlt"
 
 #. backup rule
-#: lexer.ll:243 lexer.ll:247
+#: lexer.ll:244 lexer.ll:248
 msgid "white expected"
 msgstr "Erwarte Weiß"
 
-#: lexer.ll:256
+#: lexer.ll:257
 #, fuzzy
 msgid "Can't evaluate Scheme in safe mode"
 msgstr "Kann Scheme nicht interpretieren, wenn ich im sicheren Modus bin"
 
-#: lexer.ll:349
+#: lexer.ll:358
 msgid "Brace found at end of lyric. Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:457
+#: lexer.ll:468
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "Ungültiger Buchstabe `%c'"
 
-#: lexer.ll:538
+#: lexer.ll:554
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "Unbekannte Sonder-Zeichenkette"
 
-#: lexer.ll:617
+#: lexer.ll:639
 #, c-format
 msgid "Oldest supported input version: %s"
 msgstr "Älteste noch unterstütze Version der Eingabe: %s"
 
-#: lexer.ll:629
+#: lexer.ll:651
 #, fuzzy, c-format
 msgid "incorrect lilypond version: %s (%s, %s)"
 msgstr "Falsche Version von Lilypond: %s (%s, %s)"
 
-#: lexer.ll:630
+#: lexer.ll:652
 msgid "Consider converting the input with the convert-ly script"
 msgstr ""
 
-#: lilypond-item.cc:161
-#, c-format
-msgid "#32 in quarter: %d"
-msgstr "#32 in Vierteln: %d"
-
-#: lilypond-score.cc:108
-#, fuzzy, c-format
-msgid "LY output to `%s'..."
-msgstr "MIDI-Ausgabe nach %s..."
-
-#: lilypond-score.cc:119
-#, fuzzy, c-format
-msgid "track %d:"
-msgstr "Spur "
-
-#: lilypond-score.cc:155
-msgid "Processing..."
-msgstr "Verarbeite..."
-
-#: lilypond-score.cc:164
-msgid "Creating voices..."
-msgstr "Erzeuge Stimmen..."
-
-#: lilypond-score.cc:168
-msgid "track "
-msgstr "Spur "
-
-#: lilypond-score.cc:177
-msgid "NOT Filtering tempo..."
-msgstr "Ich filtere das Tempo NICHT..."
-
-#: lilypond-score.cc:186
-msgid "NOT Quantifying columns..."
-msgstr "ich quantifiziere die Spalten NICHT..."
+#, fuzzy
+#~ msgid "Cleaning `%s'..."
+#~ msgstr "Uralt-Bitte: `%s'"
 
-#: lilypond-score.cc:190
-msgid "Quantifying columns..."
-msgstr "Quantifiziere Spalten..."
+#, fuzzy
+#~ msgid "writing header field `%s' to `%s'..."
+#~ msgstr "Schreibe Datei mit Abhängigkeiten: `%s'..."
 
-#: lilypond-score.cc:223
-msgid "Settling columns..."
-msgstr "Erledige Spalten..."
+#~ msgid "#32 in quarter: %d"
+#~ msgstr "#32 in Vierteln: %d"
 
-#: lilypond-staff.cc:209
 #, fuzzy
-msgid "% MIDI copyright:"
-msgstr "% Midi Urheberrecht:"
+#~ msgid "LY output to `%s'..."
+#~ msgstr "MIDI-Ausgabe nach %s..."
 
-#: lilypond-staff.cc:210
 #, fuzzy
-msgid "% MIDI instrument:"
-msgstr "% Instrument:"
+#~ msgid "track %d:"
+#~ msgstr "Spur "
 
-#: lilypond-stream.cc:37
-#, c-format
-msgid "lily indent level: %d"
-msgstr "lily Einrücklevel: %d"
+#~ msgid "Processing..."
+#~ msgstr "Verarbeite..."
 
-#. Maybe better not to translate these?
-#: lilypond-stream.cc:83
-msgid "% Creator: "
-msgstr "% erstellt von: "
+#~ msgid "Creating voices..."
+#~ msgstr "Erzeuge Stimmen..."
 
-#: lilypond-stream.cc:88
-msgid "% Automatically generated"
-msgstr "% Automatisch generiert"
+#~ msgid "track "
+#~ msgstr "Spur "
 
-#: lilypond-stream.cc:97
-#, c-format
-msgid "% from input file: "
-msgstr "% aus Eingabedatei: "
+#~ msgid "NOT Filtering tempo..."
+#~ msgstr "Ich filtere das Tempo NICHT..."
 
-#: main.cc:94
-msgid "write exact durations, e.g.: a4*385/384"
-msgstr "Schreibe genaue Dauer, z.B.: a4*385/384"
+#~ msgid "NOT Quantifying columns..."
+#~ msgstr "ich quantifiziere die Spalten NICHT..."
 
-#: main.cc:95
-msgid "enable debugging output"
-msgstr "Debugger Ausgabe an"
-
-#: main.cc:97
-msgid "ACC[:MINOR]"
-msgstr "ACC[:MOLL]"
+#~ msgid "Quantifying columns..."
+#~ msgstr "Quantifiziere Spalten..."
 
-#: main.cc:97
-msgid "set key: ACC +sharps/-flats; :1 minor"
-msgstr "Setze Tonart: ACC +Kreuze/-Bes; :1 Moll"
+#~ msgid "Settling columns..."
+#~ msgstr "Erledige Spalten..."
 
-#: main.cc:98
 #, fuzzy
-msgid "don't output tuplets, double dots or rests, smallest is 32"
-msgstr ""
-"Nimm an, dass keine -olen (Triolen, Quintolen etc.) oder Doppelpunkte \n"
-"vorliegen. Kleinste Teilung sind 32igstel"
+#~ msgid "% MIDI copyright:"
+#~ msgstr "% Midi Urheberrecht:"
 
-#: main.cc:99
-msgid "set FILE as default output"
-msgstr "Ausgabe standardmäßig in Datei FILE"
+#, fuzzy
+#~ msgid "% MIDI instrument:"
+#~ msgstr "% Instrument:"
 
-#: main.cc:100
-msgid "don't output tuplets"
-msgstr ""
+#~ msgid "lily indent level: %d"
+#~ msgstr "lily Einrücklevel: %d"
 
-#: main.cc:101
-msgid "be quiet"
-msgstr "Sei ruhig"
+#~ msgid "% Creator: "
+#~ msgstr "% erstellt von: "
 
-#: main.cc:102
-msgid "don't output rests or skips"
-msgstr ""
+#~ msgid "% Automatically generated"
+#~ msgstr "% Automatisch generiert"
 
-#: main.cc:103
-msgid "DUR"
-msgstr "DUR"
+#~ msgid "% from input file: "
+#~ msgstr "% aus Eingabedatei: "
 
-#: main.cc:103
-#, fuzzy
-msgid "set smallest duration"
-msgstr "Setze kürzeste Dauer (?)"
+#~ msgid "write exact durations, e.g.: a4*385/384"
+#~ msgstr "Schreibe genaue Dauer, z.B.: a4*385/384"
 
-#: main.cc:104
-msgid "don't timestamp the output"
-msgstr "Keine Datumsangabe auf der Ausgabe"
+#~ msgid "enable debugging output"
+#~ msgstr "Debugger Ausgabe an"
 
-#: main.cc:106
-msgid "be verbose"
-msgstr "Sei geschwätzig"
+#, fuzzy
+#~ msgid "don't output tuplets, double dots or rests, smallest is 32"
+#~ msgstr ""
+#~ "Nimm an, dass keine -olen (Triolen, Quintolen etc.) oder Doppelpunkte \n"
+#~ "vorliegen. Kleinste Teilung sind 32igstel"
 
-#: main.cc:108
-msgid "assume no double dotted notes"
-msgstr "Keine Noten mit Doppelpunkt"
+#~ msgid "set FILE as default output"
+#~ msgstr "Ausgabe standardmäßig in Datei FILE"
 
-#: main.cc:115
-#, c-format
-msgid "Usage: %s [OPTION]... [FILE]"
-msgstr "Verwendung: %s [OPTIONEN] ... [DATEI]"
+#~ msgid "be quiet"
+#~ msgstr "Sei ruhig"
 
-#: main.cc:117
 #, fuzzy
-msgid "Translate MIDI-file to lilypond"
-msgstr "Übersetze MIDI in Lilypond"
+#~ msgid "set smallest duration"
+#~ msgstr "Setze kürzeste Dauer (?)"
 
-#: main.cc:131
-#, c-format
-msgid "no_double_dots: %d\n"
-msgstr ""
+#~ msgid "don't timestamp the output"
+#~ msgstr "Keine Datumsangabe auf der Ausgabe"
 
-#: main.cc:133
-#, c-format
-msgid "no_rests: %d\n"
-msgstr ""
+#~ msgid "be verbose"
+#~ msgstr "Sei geschwätzig"
 
-#: main.cc:135
-#, c-format
-msgid "no_quantify_b_s: %d\n"
-msgstr ""
+#~ msgid "assume no double dotted notes"
+#~ msgstr "Keine Noten mit Doppelpunkt"
 
-#: main.cc:137
-#, c-format
-msgid "no_smaller_than: %d (1/%d)\n"
-msgstr ""
+#~ msgid "Usage: %s [OPTION]... [FILE]"
+#~ msgstr "Verwendung: %s [OPTIONEN] ... [DATEI]"
 
-#: main.cc:140
-#, c-format
-msgid "no_tuplets: %d\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Translate MIDI-file to lilypond"
+#~ msgstr "Übersetze MIDI in Lilypond"
 
-#: midi-parser.cc:64
-msgid "zero length string encountered"
-msgstr "Zeichenkette der Länge 0 gefunden"
+#~ msgid "zero length string encountered"
+#~ msgstr "Zeichenkette der Länge 0 gefunden"
 
-#: midi-score-parser.cc:44
-msgid "MIDI header expected"
-msgstr "Erwarte MIDI-Kopf"
+#~ msgid "MIDI header expected"
+#~ msgstr "Erwarte MIDI-Kopf"
 
-#: midi-score-parser.cc:49
 #, fuzzy
-msgid "invalid header length"
-msgstr "Ungültige Kopfteil-Länge"
+#~ msgid "invalid header length"
+#~ msgstr "Ungültige Kopfteil-Länge"
 
-#: midi-score-parser.cc:52
 #, fuzzy
-msgid "invalid MIDI format"
-msgstr "Ungültiges MIDI evant"
+#~ msgid "invalid MIDI format"
+#~ msgstr "Ungültiges MIDI evant"
 
-#: midi-score-parser.cc:55
 #, fuzzy
-msgid "invalid number of tracks"
-msgstr "Ungültige Anzahl an Spuren"
+#~ msgid "invalid number of tracks"
+#~ msgstr "Ungültige Anzahl an Spuren"
 
-#: midi-score-parser.cc:58
 #, fuzzy
-msgid "can't handle non-metrical time"
-msgstr "Nicht-Metrischer Takt"
+#~ msgid "can't handle non-metrical time"
+#~ msgstr "Nicht-Metrischer Takt"
 
-#: midi-track-parser.cc:68
-#, fuzzy, c-format
-msgid "Junking note-end event: channel = %d, pitch = %d"
-msgstr "Ich vernachlässige einen Event \"note-end\": Kanal = %d, Tonhöhe = %d"
+#, fuzzy
+#~ msgid "Junking note-end event: channel = %d, pitch = %d"
+#~ msgstr ""
+#~ "Ich vernachlässige einen Event \"note-end\": Kanal = %d, Tonhöhe = %d"
 
-#: midi-track-parser.cc:124
-msgid "invalid running status"
-msgstr "Ungültiger Laufzeit-Status"
+#~ msgid "invalid running status"
+#~ msgstr "Ungültiger Laufzeit-Status"
 
-#: midi-track-parser.cc:328
-msgid "unimplemented MIDI meta-event"
-msgstr "MIDI Meta-event nicht implementiert"
+#~ msgid "unimplemented MIDI meta-event"
+#~ msgstr "MIDI Meta-event nicht implementiert"
 
-#: midi-track-parser.cc:333
-msgid "invalid MIDI event"
-msgstr "Ungültiges MIDI evant"
+#~ msgid "invalid MIDI event"
+#~ msgstr "Ungültiges MIDI evant"
 
-#: midi-track-parser.cc:348
-msgid "MIDI track expected"
-msgstr "Erwarte MIDI-Stück"
+#~ msgid "MIDI track expected"
+#~ msgstr "Erwarte MIDI-Stück"
 
-#: midi-track-parser.cc:353
-msgid "invalid track length"
-msgstr "Unzulässige Länge für ein Stück"
+#~ msgid "invalid track length"
+#~ msgstr "Unzulässige Länge für ein Stück"
 
 #, fuzzy
 #~ msgid "no Grace context available"
diff -purN ../lilypond-1.5.28/po/fr.po ./po/fr.po
--- ../lilypond-1.5.28/po/fr.po	Sun Sep 16 17:09:58 2001
+++ ./po/fr.po	Thu Jan 31 13:17:54 2002
@@ -6,306 +6,349 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.3.18\n"
-"POT-Creation-Date: 2001-09-09 17:41+0200\n"
+"POT-Creation-Date: 2002-01-29 23:08+0100\n"
 "PO-Revision-Date: 1999-12-28 00:32 +1\n"
 "Last-Translator: Laurent Martelli <laurent@linuxfan.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 
-#: ly2dvi.py:115
-msgid "Generate .dvi with LaTeX for LilyPond"
-msgstr ""
-
-#: data-file.cc:118 input.cc:85 ly2dvi.py:197 midi-parser.cc:100 mup2ly.py:93
-#: update-lily.py:119 warn.cc:23
+#: data-file.cc:118 input.cc:85 ly2dvi.py:113 midi2ly.py:148
+#: update-lily.py:136 warn.cc:23
 msgid "warning: "
 msgstr "avertissement: "
 
-#: input.cc:90 ly2dvi.py:212 ly2dvi.py:641 ly2dvi.py:659 ly2dvi.py:850
-#: mup2ly.py:98 mup2ly.py:188 update-lily.py:124 update-lily.py:212 warn.cc:9
-#: warn.cc:17
+#: input.cc:90 ly2dvi.py:116 ly2dvi.py:132 ly2dvi.py:691 ly2dvi.py:709
+#: midi2ly.py:163 midi2ly.py:1012 midi2ly.py:1081 update-lily.py:151
+#: update-lily.py:426 warn.cc:9 warn.cc:17
 msgid "error: "
 msgstr "erreur: "
 
-#: ly2dvi.py:213 mup2ly.py:100 update-lily.py:126
+#: ly2dvi.py:133 midi2ly.py:164 update-lily.py:152
 #, fuzzy
 msgid "Exiting ... "
 msgstr "Ligne ..."
 
-#: ly2dvi.py:271 mup2ly.py:158 update-lily.py:184
+#: ly2dvi.py:191 midi2ly.py:222 update-lily.py:210
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE"
 msgstr "Usage: %s [OPTION... [FICHIER]"
 
-#: ly2dvi.py:275 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:188
+#: ly2dvi.py:195 main.cc:151 midi2ly.py:226 update-lily.py:214
 msgid "Options:"
 msgstr "Options: "
 
-#: ly2dvi.py:279 main.cc:124 main.cc:166 mup2ly.py:168 update-lily.py:192
+#: ly2dvi.py:199 main.cc:168 midi2ly.py:230 update-lily.py:218
 #, fuzzy, c-format
 msgid "Report bugs to %s"
 msgstr "Rapporter les bugs "
 
-#: ly2dvi.py:307 mup2ly.py:185 update-lily.py:209
+#: ly2dvi.py:227 midi2ly.py:258 update-lily.py:246
 #, c-format
 msgid "Invoking `%s'"
 msgstr ""
 
-#: ly2dvi.py:311 mup2ly.py:188 update-lily.py:212
+#: ly2dvi.py:231 midi2ly.py:262 update-lily.py:250
 #, c-format
 msgid "command exited with value %d"
 msgstr ""
 
-#: ly2dvi.py:313 mup2ly.py:190 update-lily.py:214
+#: ly2dvi.py:233 midi2ly.py:264 update-lily.py:252
 msgid "(ignored)"
 msgstr ""
 
-#: ly2dvi.py:323
+#: ly2dvi.py:243 midi2ly.py:274 update-lily.py:262
 #, fuzzy, c-format
 msgid "Cleaning %s..."
 msgstr "Cration des voix..."
 
-#: ly2dvi.py:338 mup2ly.py:214 update-lily.py:238
-#, fuzzy, c-format
-msgid "no such setting: %s"
-msgstr "Pas d'instrument tel: `%s'"
+#: ly2dvi.py:301
+msgid "Generate .dvi with LaTeX for LilyPond"
+msgstr ""
 
-#: ly2dvi.py:351 main.cc:113
+#: ly2dvi.py:304 main.cc:115
 msgid "write Makefile dependencies for every input file"
 msgstr ""
 
-#: ly2dvi.py:352 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:252
+#: ly2dvi.py:305 main.cc:111 midi2ly.py:98 mup2ly.py:74 update-lily.py:86
 msgid "this help"
 msgstr "cette aide"
 
-#: ly2dvi.py:353 main.cc:111 main.cc:116
+#: ly2dvi.py:306 main.cc:113 main.cc:118
 msgid "DIR"
 msgstr "REP"
 
-#: ly2dvi.py:353
+#: ly2dvi.py:306
 #, fuzzy
 msgid "add DIR to LilyPond's search path"
 msgstr "ajoute REP au chemin de recherche"
 
-#: ly2dvi.py:354
+#: ly2dvi.py:307
 #, c-format
 msgid "keep all output, and name the directory %s.dir"
 msgstr ""
 
-#: ly2dvi.py:355
+#: ly2dvi.py:308
 msgid "don't run LilyPond"
 msgstr ""
 
-#: ly2dvi.py:356 main.cc:114
+#: ly2dvi.py:309 main.cc:116
 #, fuzzy
 msgid "produce MIDI output only"
 msgstr "produit seulement la sortie MIDI"
 
-#: ly2dvi.py:357 ly2dvi.py:358 main.cc:99 main.cc:112 main.cc:115
+#: ly2dvi.py:310 ly2dvi.py:311 main.cc:114 main.cc:117 midi2ly.py:100
 msgid "FILE"
 msgstr "FICHIER"
 
-#: ly2dvi.py:357
+#: ly2dvi.py:310 midi2ly.py:100
 msgid "write ouput to FILE"
 msgstr ""
 
-#: ly2dvi.py:358
+#: ly2dvi.py:311
 msgid "find pfa fonts used in FILE"
 msgstr ""
 
-#: ly2dvi.py:360
+#: ly2dvi.py:313
 msgid "generate PostScript output"
 msgstr ""
 
-#: ly2dvi.py:361
+#: ly2dvi.py:314
 msgid "KEY=VAL"
 msgstr ""
 
-#: ly2dvi.py:361
+#: ly2dvi.py:314
 msgid "change global setting KEY to VAL"
 msgstr ""
 
-#: ly2dvi.py:362 main.cc:119 mup2ly.py:1120 update-lily.py:256
+#: ly2dvi.py:315 main.cc:121 midi2ly.py:103 mup2ly.py:77 update-lily.py:90
 msgid "verbose"
 msgstr ""
 
-#: ly2dvi.py:363 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:257
+#: ly2dvi.py:316 main.cc:120 midi2ly.py:104 mup2ly.py:78 update-lily.py:91
 msgid "print version number"
 msgstr "afficher le numro de version"
 
-#: ly2dvi.py:364 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:259
+#: ly2dvi.py:317 main.cc:122 midi2ly.py:105 mup2ly.py:79 update-lily.py:93
 msgid "show warranty and copyright"
 msgstr ""
 
-#: ly2dvi.py:386 ly2dvi.py:582 ly2dvi.py:607
+#: ly2dvi.py:406
+#, fuzzy, c-format
+msgid "no such setting: %s"
+msgstr "Pas d'instrument tel: `%s'"
+
+#: ly2dvi.py:434 ly2dvi.py:632 ly2dvi.py:657
 #, fuzzy, c-format
 msgid "Running %s..."
 msgstr "Cration des voix..."
 
-#: ly2dvi.py:399
+#: ly2dvi.py:449
 #, fuzzy, c-format
 msgid "Analyzing %s..."
 msgstr "Cration des voix..."
 
-#: ly2dvi.py:455
+#: ly2dvi.py:505
 #, c-format
 msgid "no lilypond output found for %s"
 msgstr ""
 
-#: ly2dvi.py:497
+#: ly2dvi.py:547
 #, fuzzy, c-format
 msgid "invalid value: %s"
 msgstr "caractres illgal: `%c'"
 
-#: ly2dvi.py:641
+#: ly2dvi.py:691
 #, fuzzy, c-format
 msgid "not a PostScript file: `%s'"
 msgstr "impossible d'ouvrir le fichier: `%s'"
 
-#: ly2dvi.py:659
+#: ly2dvi.py:709 midi2ly.py:1012 update-lily.py:426
 #, c-format
 msgid "getopt says: `%s'"
 msgstr ""
 
-#: ly2dvi.py:826 scores.cc:44
+#: ly2dvi.py:820
+#, fuzzy, c-format
+msgid "filename should not contain spaces: `%s'"
+msgstr "Contient dj un `%s'"
+
+#: ly2dvi.py:885 scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to `%s'..."
 msgstr "Sortie papier vers %s..."
 
-#: ly2dvi.py:837
+#: ly2dvi.py:896 midi2ly.py:996
 #, fuzzy, c-format
 msgid "%s output to `%s'..."
 msgstr "Sortie de Lily vers %s..."
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:839
-#: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
+#: includable-lexer.cc:49 lily-guile.cc:134 ly2dvi.py:898 scores.cc:136
+#: scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "ne peut pas trouver le fichier: `%s'"
 
-#: ly2dvi.py:850
+#: ly2dvi.py:909 midi2ly.py:1081
 msgid "no files specified on command line."
 msgstr ""
 
-#: mup2ly.py:51
-msgid "Convert mup to ly"
+#: midi2ly.py:92
+msgid "Convert MIDI to LilyPond source"
 msgstr ""
 
-#: mup2ly.py:166
-#, c-format
-msgid "%s is far from completed.  Not all constructs are recognised."
+#: midi2ly.py:95
+msgid "print absolute pitches"
 msgstr ""
 
-#: mup2ly.py:964
-#, fuzzy, c-format
-msgid "no such context: %s"
-msgstr "Pas d'instrument tel: `%s'"
+#: midi2ly.py:96 midi2ly.py:101
+msgid "DUR"
+msgstr ""
+
+#: midi2ly.py:96
+msgid "quantise note durations on DUR"
+msgstr ""
+
+#: midi2ly.py:97
+msgid "print explicit durations"
+msgstr ""
+
+#: midi2ly.py:99
+msgid "ALT[:MINOR]"
+msgstr ""
+
+#: midi2ly.py:99
+msgid "set key: ALT=+sharps|-flats; MINOR=1"
+msgstr ""
+
+#: midi2ly.py:101
+msgid "quantise note starts on DUR"
+msgstr ""
+
+#: midi2ly.py:102
+msgid "DUR*NUM/DEN"
+msgstr ""
+
+#: midi2ly.py:102
+msgid "allow tuplet durations DUR*NUM/DEN"
+msgstr ""
+
+#: midi2ly.py:106
+msgid "treat every text as a lyric"
+msgstr ""
+
+#: midi2ly.py:1027
+msgid "Example:"
+msgstr ""
 
-#: mup2ly.py:1115
+#: mup2ly.py:69
+msgid "Convert mup to LilyPond source"
+msgstr ""
+
+#: mup2ly.py:72
 msgid "debug"
 msgstr ""
 
-#: mup2ly.py:1116
+#: mup2ly.py:73
 msgid "define macro NAME [optional expansion EXP]"
 msgstr ""
 
-#: main.cc:115 mup2ly.py:1118
+#: main.cc:117 mup2ly.py:75
 msgid "write output to FILE"
 msgstr ""
 
-#: mup2ly.py:1119
+#: mup2ly.py:76
 msgid "only pre-process"
 msgstr ""
 
-#: mup2ly.py:1200
+#: mup2ly.py:827
+#, fuzzy, c-format
+msgid "no such context: %s"
+msgstr "Pas d'instrument tel: `%s'"
+
+#: mup2ly.py:1051
 #, fuzzy, c-format
 msgid "Processing `%s'..."
 msgstr "Traitement..."
 
-#: mup2ly.py:1219
+#: mup2ly.py:1070
 #, fuzzy, c-format
 msgid "Writing `%s'..."
 msgstr "Ligne ..."
 
-#: update-lily.py:52
+#: update-lily.py:75
 msgid "Fetch and rebuild from latest source package"
 msgstr ""
 
-#: update-lily.py:224
-#, fuzzy, c-format
-msgid "Cleaning `%s'..."
-msgstr "Cration des voix..."
-
-#: update-lily.py:244
+#: update-lily.py:78
 #, c-format
 msgid "unpack and build in DIR [%s]"
 msgstr ""
 
-#: update-lily.py:245
+#: update-lily.py:79
 msgid "execute COMMAND, subtitute:"
 msgstr ""
 
-#: update-lily.py:246
+#: update-lily.py:80
 msgid "%b: build root"
 msgstr ""
 
-#: update-lily.py:247
+#: update-lily.py:81
 #, c-format
 msgid "%n: package name"
 msgstr ""
 
-#: update-lily.py:248
+#: update-lily.py:82
 #, fuzzy
 msgid "%r: release directory"
 msgstr "ne peut pas trouver ou crer `%s'"
 
-#: update-lily.py:249
+#: update-lily.py:83
 msgid "%t: tarball"
 msgstr ""
 
-#: update-lily.py:250
+#: update-lily.py:84
 msgid "%v: package version"
 msgstr ""
 
-#: update-lily.py:253
+#: update-lily.py:87
 #, c-format
 msgid "keep all output, and name the directory %s"
 msgstr ""
 
-#: update-lily.py:254
+#: update-lily.py:88
 msgid "upon failure notify EMAIL[,EMAIL]"
 msgstr ""
 
-#: update-lily.py:255
+#: update-lily.py:89
 msgid "remove previous build"
 msgstr ""
 
-#: update-lily.py:258
+#: update-lily.py:92
 #, c-format
 msgid "fetch and build URL [%s]"
 msgstr ""
 
-#: update-lily.py:366
+#: update-lily.py:397
 #, fuzzy, c-format
 msgid "Listing `%s'..."
 msgstr "Ligne ..."
 
-#: update-lily.py:427
+#: update-lily.py:465
 #, c-format
 msgid "latest is: %s"
 msgstr ""
 
-#: update-lily.py:428
+#: update-lily.py:466
 #, c-format
 msgid "relax, %s is up to date"
 msgstr ""
 
-#: update-lily.py:436 update-lily.py:449
+#: update-lily.py:474 update-lily.py:487
 #, fuzzy, c-format
 msgid "Fetching `%s'..."
 msgstr "Cration des voix..."
 
-#: update-lily.py:458
+#: update-lily.py:496
 #, fuzzy, c-format
 msgid "Building `%s'..."
 msgstr "Cration des voix..."
@@ -348,8 +391,8 @@ msgstr "position inconnue"
 msgid "can't map file"
 msgstr "impossible de mapper le fichier"
 
-#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45
-#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
+#: mapped-file-storage.cc:87 scores.cc:48 simple-file-storage.cc:44
+#: streams.cc:37 text-stream.cc:23
 #, c-format
 msgid "can't open file: `%s'"
 msgstr "impossible d'ouvrir le fichier: `%s'"
@@ -373,6 +416,16 @@ msgstr "Erreur de programmation: "
 msgid " (Continuing; cross thumbs)"
 msgstr " (je continure; croisez les doigts)"
 
+#: accidental-engraver.cc:136
+#, fuzzy, c-format
+msgid "unknown accidental typesetting: %s"
+msgstr "chane d'chappement inconnue: `\\%s'"
+
+#: accidental-engraver.cc:139
+#, c-format
+msgid "Accidental typesetting must be pair: %s"
+msgstr ""
+
 #: afm.cc:59
 #, fuzzy, c-format
 msgid "can't find character number: %d"
@@ -433,40 +486,50 @@ msgstr ""
 msgid "Can't switch translators, I'm there already"
 msgstr ""
 
-#: beam-engraver.cc:91 beam-engraver.cc:124
+#: bar-check-iterator.cc:58
+#, c-format
+msgid "barcheck failed at: %s"
+msgstr ""
+
+#: beam-engraver.cc:93 beam-engraver.cc:126
 #, fuzzy
 msgid "can't find start of beam"
 msgstr "impossible de trouver le caractres numro %d"
 
-#: beam-engraver.cc:158
+#: beam-engraver.cc:150
 #, fuzzy
 msgid "already have a beam"
 msgstr "Il y a dj une barre"
 
-#: beam-engraver.cc:222
+#: beam-engraver.cc:216
 #, fuzzy
 msgid "unterminated beam"
 msgstr "Barre non termine"
 
-#: beam-engraver.cc:255 chord-tremolo-engraver.cc:195
+#: beam-engraver.cc:249 chord-tremolo-engraver.cc:193
 #, fuzzy
 msgid "stem must have Rhythmic structure"
 msgstr "La tige doit avoir une structure rythmique."
 
-#: beam-engraver.cc:267
+#: beam-engraver.cc:261
 msgid "stem doesn't fit in beam"
 msgstr "la tige ne rentre pas dans la barre"
 
-#: beam-engraver.cc:268
+#: beam-engraver.cc:262
 msgid "beam was started here"
 msgstr "la barre a commenc ici"
 
-#: beam.cc:86
+#: beam.cc:93
+#, fuzzy
+msgid "beam has less than two visible stems"
+msgstr "barre avec moins de deux tiges"
+
+#: beam.cc:98
 #, fuzzy
-msgid "beam has less than two stems"
+msgid "Beam has less than two stems. Removing beam."
 msgstr "barre avec moins de deux tiges"
 
-#: beam.cc:637
+#: beam.cc:660
 msgid "weird beam vertical offset"
 msgstr ""
 
@@ -494,7 +557,7 @@ msgstr ""
 msgid "none of these in my family"
 msgstr ""
 
-#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192
+#: chord-tremolo-engraver.cc:139 percent-repeat-engraver.cc:182
 msgid "unterminated chord tremolo"
 msgstr ""
 
@@ -512,7 +575,7 @@ msgstr "soustraction invalide: ne fait p
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr "renversement invalide: ne fait pas partie de l'accord: %s"
 
-#: collision.cc:245
+#: collision.cc:281
 #, fuzzy
 msgid "Too many clashing notecolumns.  Ignoring them."
 msgstr "Trop de colonnes de notes superposes. Je les ignore."
@@ -521,31 +584,31 @@ msgstr "Trop de colonnes de notes superp
 msgid "NaN"
 msgstr ""
 
-#: dynamic-engraver.cc:197 span-dynamic-performer.cc:86
+#: dynamic-engraver.cc:195 span-dynamic-performer.cc:82
 #, fuzzy
 msgid "can't find start of (de)crescendo"
 msgstr "ne peut pas trouver un (de)crescendo  la fin"
 
-#: dynamic-engraver.cc:222
+#: dynamic-engraver.cc:220
 #, fuzzy
 msgid "already have a crescendo"
 msgstr "Il y a dj une barre"
 
-#: dynamic-engraver.cc:223
+#: dynamic-engraver.cc:221
 #, fuzzy
 msgid "already have a decrescendo"
 msgstr "Il y a dj une barre"
 
-#: dynamic-engraver.cc:317
+#: dynamic-engraver.cc:315
 #, fuzzy
 msgid "unterminated (de)crescendo"
 msgstr "crescendo non termin"
 
-#: extender-engraver.cc:97
+#: extender-engraver.cc:96
 msgid "unterminated extender"
 msgstr ""
 
-#: extender-engraver.cc:109
+#: extender-engraver.cc:108
 msgid "Nothing to connect extender to on the left.  Ignoring extender request."
 msgstr ""
 
@@ -557,7 +620,7 @@ msgstr ""
 msgid "couldn't find any font satisfying "
 msgstr ""
 
-#: gourlay-breaking.cc:157
+#: gourlay-breaking.cc:168
 msgid "No feasible line breaking found"
 msgstr ""
 
@@ -570,23 +633,23 @@ msgstr ""
 msgid "crescendo too small"
 msgstr "trop petit"
 
-#: hyphen-engraver.cc:90
+#: hyphen-engraver.cc:89
 msgid "unterminated hyphen"
 msgstr ""
 
-#: hyphen-engraver.cc:102
+#: hyphen-engraver.cc:101
 msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen request."
 msgstr ""
 
-#: key-engraver.cc:99
+#: key-engraver.cc:93
 msgid "Conflicting key signatures found."
 msgstr ""
 
-#: key-engraver.cc:100
+#: key-engraver.cc:94
 msgid "This was the other key definition."
 msgstr ""
 
-#: key-performer.cc:77
+#: key-performer.cc:91
 msgid "FIXME: key change merge"
 msgstr ""
 
@@ -595,7 +658,7 @@ msgstr ""
 msgid "Kpathsea couldn't find TFM file `%s'"
 msgstr "ne peut pas trouver le fichier: `%s'"
 
-#: lily-guile.cc:141
+#: lily-guile.cc:136
 #, c-format
 msgid "(load path: `%s')"
 msgstr ""
@@ -605,12 +668,12 @@ msgstr ""
 msgid "Element count %d."
 msgstr ""
 
-#: line-of-score.cc:313 paper-score.cc:77
+#: line-of-score.cc:325 paper-score.cc:76
 #, c-format
 msgid "Element count %d "
 msgstr ""
 
-#: line-of-score.cc:327
+#: line-of-score.cc:339
 msgid "Calculating column positions..."
 msgstr "Calcul de la position des colonnes..."
 
@@ -623,64 +686,64 @@ msgid "Huh? Melismatic note found to hav
 msgstr ""
 
 #. print example usage:  lilypond -e "(set-lily-option 'help 0)" ?
-#: main.cc:105
+#: main.cc:107
 msgid "EXPR"
 msgstr ""
 
-#: main.cc:105
+#: main.cc:107
 msgid "evalute EXPR as Scheme after .scm init is read"
 msgstr ""
 
 #. another bug in option parser: --output=foe is taken as an abbreviation
 #. for --output-format
-#: main.cc:108
+#: main.cc:110
 msgid "EXT"
 msgstr ""
 
-#: main.cc:108
+#: main.cc:110
 msgid "use output format EXT (tex [default], pdftex, ps, scm or as)"
 msgstr ""
 
-#: main.cc:110
+#: main.cc:112
 #, fuzzy
 msgid "FIELD"
 msgstr "FICHIER"
 
-#: main.cc:110
+#: main.cc:112
 msgid "write header field to BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:111
+#: main.cc:113
 #, fuzzy
 msgid "add DIR to search path"
 msgstr "ajoute REP au chemin de recherche"
 
-#: main.cc:112
+#: main.cc:114
 #, fuzzy
 msgid "use FILE as init file"
 msgstr "utilise FICHIER comme fichier d'initialisation"
 
-#: main.cc:116
+#: main.cc:118
 msgid "prepend DIR to dependencies"
 msgstr ""
 
-#: main.cc:117
+#: main.cc:119
 msgid "inhibit file output naming and exporting"
 msgstr ""
 
 #.
 #. No version number or newline here. It confuses help2man
 #.
-#: main.cc:137
+#: main.cc:139
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Usage: %s [OPTION]... [FICHIER]..."
 
-#: main.cc:139
+#: main.cc:141
 msgid "Typeset music and or play MIDI from FILE"
 msgstr ""
 
-#: main.cc:143
+#: main.cc:145
 #, fuzzy
 msgid ""
 "LilyPond is a music typesetter.  It produces beautiful sheet music\n"
@@ -691,12 +754,12 @@ msgstr ""
 "paritions  partir de description de gaut niveau en entre. Lilypond\n"
 "fait partie du projet GNU.\n"
 
-#: main.cc:153
+#: main.cc:155
 #, fuzzy
 msgid "This binary was compiled with the following options:"
 msgstr "Cet excutable a t compil avec les options suivantes:"
 
-#: main.cc:56 main.cc:174
+#: main.cc:176
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -704,17 +767,17 @@ msgid ""
 "certain conditions.  Invoke as `%s --warranty' for more information.\n"
 msgstr ""
 
-#: main.cc:63 main.cc:181 main.cc:193
+#: main.cc:183 main.cc:195
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s par"
 
-#: main.cc:191
+#: main.cc:193
 #, fuzzy
 msgid "GNU LilyPond -- The music typesetter"
 msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU"
 
-#: main.cc:72 main.cc:199
+#: main.cc:201
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License version 2\n"
@@ -749,42 +812,42 @@ msgstr ""
 msgid "can't find `%s' context"
 msgstr "ne peut pas trouver `%s'"
 
-#: music.cc:239
+#: music.cc:144
+#, c-format
+msgid "Transposition by %s makes accidental larger than two"
+msgstr ""
+
+#: music.cc:249
 msgid "ly_get_mus_property (): Not a Music"
 msgstr ""
 
-#: music.cc:253
+#: music.cc:263
 msgid "ly_set_mus_property (): Not a symbol"
 msgstr ""
 
-#: music.cc:265
+#: music.cc:275
 msgid "ly_set_mus_property ():  not of type Music"
 msgstr ""
 
-#: music.cc:279
+#: music.cc:289
 msgid "ly_make_music (): Not a string"
 msgstr ""
 
-#: music.cc:299
+#: music.cc:309
 msgid "ly_music_name (): Not a music expression"
 msgstr ""
 
-#: musical-request.cc:28
-#, c-format
-msgid "Transposition by %s makes accidental larger than two"
-msgstr ""
-
-#: my-lily-lexer.cc:140
+#: my-lily-lexer.cc:139
 #, c-format
 msgid "Identifier name is a keyword: `%s'"
 msgstr ""
 
-#: my-lily-lexer.cc:160
+#: my-lily-lexer.cc:159
 #, c-format
 msgid "error at EOF: %s"
 msgstr ""
 
-#: midi-score-parser.cc:94 my-lily-parser.cc:47
+#: my-lily-parser.cc:47
 msgid "Parsing..."
 msgstr "Analyse..."
 
@@ -802,33 +865,18 @@ msgstr ""
 msgid "paper output to `%s'..."
 msgstr "Sortie papier vers %s..."
 
-#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99
+#: paper-outputter.cc:60
 msgid ", at "
 msgstr ",  "
 
-#: paper-outputter.cc:232
-#, fuzzy, c-format
-msgid "writing header field `%s' to `%s'..."
-msgstr "impossible d'ouvrir le fichier: `%s'"
-
-#: paper-score.cc:80
+#: paper-score.cc:79
 msgid "Preprocessing elements..."
 msgstr ""
 
-#: paper-score.cc:114
+#: paper-score.cc:113
 msgid "Outputting Score, defined at: "
 msgstr ""
 
-#: paper-stream.cc:41
-#, fuzzy, c-format
-msgid "can't create directory: `%s'"
-msgstr "ne peut pas trouver ou crer `%s'"
-
-#: paper-stream.cc:55
-#, fuzzy
-msgid "Error syncing file (disk full?)"
-msgstr ")"
-
 #.
 #. We could change the current translator's id, but that would make
 #. errors hard to catch
@@ -845,7 +893,7 @@ msgstr ""
 msgid "none of these in my family: `%s'"
 msgstr ""
 
-#: percent-repeat-engraver.cc:117
+#: percent-repeat-engraver.cc:116
 #, fuzzy
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr "ne sait pas traiter les cls vides"
@@ -863,12 +911,17 @@ msgstr "Piste ... "
 msgid "Creator: "
 msgstr "Auteur: "
 
-#: performance.cc:113
+#: performance.cc:103
+#, fuzzy
+msgid "at "
+msgstr ",  "
+
+#: performance.cc:114
 #, c-format
 msgid "from musical definition: %s"
 msgstr ""
 
-#: performance.cc:168
+#: performance.cc:169
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr ""
@@ -883,8 +936,8 @@ msgstr "Barre non termine"
 msgid "can't find start of phrasing slur"
 msgstr "impossible de trouver le caractres numro %d"
 
-#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154
-#: piano-pedal-performer.cc:85
+#: piano-pedal-engraver.cc:141 piano-pedal-engraver.cc:153
+#: piano-pedal-performer.cc:82
 #, fuzzy, c-format
 msgid "can't find start of piano pedal: `%s'"
 msgstr "ne peut pas trouver le fichier: `%s'"
@@ -893,14 +946,42 @@ msgstr "ne peut pas trouver le fichier: 
 msgid "Pitch arguments out of range"
 msgstr ""
 
-#: property-engraver.cc:121
+#: porrectus.cc:34
+msgid "(left_head == 0)"
+msgstr ""
+
+#: porrectus.cc:45
+msgid "undefined left_head"
+msgstr ""
+
+#: porrectus.cc:64
+msgid "(right_head == 0)"
+msgstr ""
+
+#: porrectus.cc:75
+msgid "undefined right_head"
+msgstr ""
+
+#: porrectus.cc:164
+msgid "junking lonely porrectus"
+msgstr ""
+
+#: porrectus.cc:174
+msgid "porrectus style undefined; using mensural"
+msgstr ""
+
+#: porrectus.cc:301
+msgid "ascending vaticana style porrectus"
+msgstr ""
+
+#: property-engraver.cc:116
 #, c-format
 msgid ""
 "`%s' is deprecated.  Use\n"
 " \\property %s.%s \\override #'%s = #%s"
 msgstr ""
 
-#: property-engraver.cc:145
+#: property-engraver.cc:140
 #, fuzzy, c-format
 msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s"
 msgstr "Mauvais type pour la valeur de la proprit"
@@ -918,25 +999,25 @@ msgstr ""
 msgid "Scheme options:"
 msgstr "Options: "
 
-#: score-engraver.cc:189
+#: score-engraver.cc:178
 #, fuzzy, c-format
 msgid "unbound spanner `%s'"
 msgstr "traducteur inconnu `%s'"
 
-#: score.cc:78
+#: score.cc:88
 msgid "Interpreting music..."
 msgstr ""
 
-#: score.cc:92
+#: score.cc:102
 msgid "Need music in a score"
 msgstr ""
 
 #. should we? hampers debugging.
-#: score.cc:105
+#: score.cc:115
 msgid "Errors found/*, not processing score*/"
 msgstr ""
 
-#: score.cc:112
+#: score.cc:122
 #, fuzzy, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr "temps ecoul: %.2f secondes"
@@ -950,7 +1031,7 @@ msgstr ""
 msgid "Now processing: `%s'"
 msgstr "chane d'chappement inconnue: `\\%s'"
 
-#: script-engraver.cc:66
+#: script-engraver.cc:65
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr ""
@@ -960,18 +1041,18 @@ msgstr ""
 msgid "Separation_item:  I've been drinking too much"
 msgstr ""
 
-#: simple-spacer.cc:200
+#: simple-spacer.cc:202
 #, c-format
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:125
+#: slur-engraver.cc:124
 msgid "unterminated slur"
 msgstr ""
 
 #. How to shut up this warning, when Voice_devnull_engraver has
 #. eaten start request?
-#: slur-engraver.cc:142
+#: slur-engraver.cc:141
 #, fuzzy
 msgid "can't find start of slur"
 msgstr "impossible de trouver le caractres numro %d"
@@ -980,11 +1061,11 @@ msgstr "impossible de trouver le caractr
 msgid "Putting slur over rest.  Ignoring."
 msgstr ""
 
-#: slur.cc:383
+#: slur.cc:393
 msgid "Slur over rest?"
 msgstr ""
 
-#: stem-engraver.cc:115
+#: stem-engraver.cc:117
 #, c-format
 msgid "Adding note head to incompatible stem (type = %d)"
 msgstr ""
@@ -994,17 +1075,27 @@ msgstr ""
 msgid "Weird stem size; check for narrow beams"
 msgstr "dcallage de barre bizarre, check your knees"
 
-#: text-spanner-engraver.cc:94
+#: streams.cc:33
+#, fuzzy, c-format
+msgid "can't create directory: `%s'"
+msgstr "ne peut pas trouver ou crer `%s'"
+
+#: streams.cc:47
+#, fuzzy
+msgid "Error syncing file (disk full?)"
+msgstr ")"
+
+#: text-spanner-engraver.cc:92
 #, fuzzy
 msgid "can't find start of text spanner"
 msgstr "impossible de trouver le caractres numro %d"
 
-#: text-spanner-engraver.cc:114
+#: text-spanner-engraver.cc:112
 #, fuzzy
 msgid "already have a text spanner"
 msgstr "Il y a dj une barre"
 
-#: text-spanner-engraver.cc:169
+#: text-spanner-engraver.cc:167
 #, fuzzy
 msgid "unterminated text spanner"
 msgstr "Barre non termine"
@@ -1028,421 +1119,303 @@ msgstr ""
 msgid "can't find ascii character: %d"
 msgstr "ne peut pas trouver le caractre ascii `%d'"
 
-#. How to shut up this warning, when no notes appeared because
-#. they were suicided by Thread_devnull_engraver?
-#: tie-engraver.cc:220 tie-performer.cc:173
-msgid "No ties were created!"
-msgstr "Aucune liaison n'a t cre"
-
-#: tie-engraver.cc:240
+#: tie-engraver.cc:220
 msgid "lonely tie"
 msgstr "liaison solitaire"
 
+#: tie-performer.cc:161
+msgid "No ties were created!"
+msgstr "Aucune liaison n'a t cre"
+
 #: time-scaled-music-iterator.cc:25
 msgid "no one to print a tuplet start bracket"
 msgstr ""
 
-#: timing-translator.cc:37
-#, c-format
-msgid "barcheck failed at: %s"
-msgstr ""
-
-#: translator-ctors.cc:40
+#: translator-ctors.cc:61
 #, fuzzy, c-format
 msgid "unknown translator: `%s'"
 msgstr "traducteur inconnu `%s'"
 
-#: translator-def.cc:99
+#: translator-def.cc:87
 msgid "Program has no such type"
 msgstr ""
 
-#: translator-def.cc:105
+#: translator-def.cc:93
 #, fuzzy, c-format
 msgid "Already contains: `%s'"
 msgstr "Contient dj un `%s'"
 
-#: translator-def.cc:106
+#: translator-def.cc:94
 #, fuzzy, c-format
 msgid "Not adding translator: `%s'"
 msgstr "traducteur inconnu `%s'"
 
-#: translator-def.cc:224
+#: translator-def.cc:212
 #, fuzzy, c-format
 msgid "can't find: `%s'"
 msgstr "ne peut pas trouver `%s'"
 
-#: translator-group.cc:145
+#: translator-group.cc:147
 #, c-format
 msgid "can't find or create `%s' called `%s'"
 msgstr "ne peut pas trouver ou crer `%s' nomm `%s'"
 
-#: translator-group.cc:230
+#: translator-group.cc:232
 #, fuzzy, c-format
 msgid "can't find or create: `%s'"
 msgstr "ne peut pas trouver ou crer `%s'"
 
-#: translator-group.cc:413
+#: translator-group.cc:407
 #, c-format
 msgid ""
 "Can't find property type-check for `%s'.  Perhaps you made a typing error? "
 "Doing assignment anyway."
 msgstr ""
 
-#: translator-group.cc:427
+#: translator-group.cc:421
 #, c-format
 msgid "Type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
 #. programming_error?
-#: translator-group.cc:446
+#: translator-group.cc:440
 msgid "ly-get-trans-property: expecting a Translator_group argument"
 msgstr ""
 
-#: volta-engraver.cc:88
+#: volta-engraver.cc:108
 msgid "No volta spanner to end"
 msgstr ""
 
-#: volta-engraver.cc:105
+#: volta-engraver.cc:125
 msgid "Already have a volta spanner.  Stopping that one prematurely."
 msgstr ""
 
-#: volta-engraver.cc:109
+#: volta-engraver.cc:129
 msgid "Also have a stopped spanner.  Giving up."
 msgstr ""
 
-#: parser.yy:121
+#: parser.yy:129
 #, c-format
 msgid "Expecting %d arguments"
 msgstr ""
 
-#: parser.yy:423
+#: parser.yy:434
 msgid "Identifier should have  alphabetic characters only"
 msgstr ""
 
-#: parser.yy:697
+#: parser.yy:715
 msgid "More alternatives than repeats.  Junking excess alternatives."
 msgstr ""
 
-#: parser.yy:761
+#: parser.yy:767
 msgid "Second argument must be a symbol"
 msgstr ""
 
-#: parser.yy:766
+#: parser.yy:772
 msgid "First argument must be a procedure taking 1 argument"
 msgstr ""
 
-#: parser.yy:1298
+#: parser.yy:1315
 msgid "Expecting string as script definition"
 msgstr ""
 
-#: parser.yy:1308
+#: parser.yy:1325
 msgid "Can't specify direction for this request"
 msgstr ""
 
-#: parser.yy:1433
+#: parser.yy:1451
 msgid "Expecting musical-pitch value"
 msgstr ""
 
-#: parser.yy:1444
+#: parser.yy:1462
 #, fuzzy
 msgid "Must have duration object"
 msgstr "Positionne la plus petite dure (?)"
 
-#: parser.yy:1453 parser.yy:1461
+#: parser.yy:1471 parser.yy:1479
 #, fuzzy
 msgid "Have to be in Lyric mode for lyrics"
 msgstr "il fayt tre en mode Parole pour les paroles"
 
-#: parser.yy:1614 parser.yy:1671
+#: parser.yy:1638 parser.yy:1691
 #, c-format
 msgid "not a duration: %d"
 msgstr "pas une dure: %d"
 
-#: parser.yy:1682
+#: parser.yy:1752
 #, fuzzy
 msgid "Have to be in Note mode for notes"
 msgstr "il faut tre en mode Note pour les notes"
 
-#: parser.yy:1765
+#: parser.yy:1845
 #, fuzzy
 msgid "Have to be in Chord mode for chords"
 msgstr "il faut tre en mode Accord pour les accords"
 
-#: parser.yy:1945
+#: parser.yy:2025
 msgid "need integer number arg"
 msgstr ""
 
-#: lexer.ll:174
+#: parser.yy:2097
+msgid "Suspect duration found following this beam"
+msgstr ""
+
+#: lexer.ll:175
 msgid "EOF found inside a comment"
 msgstr "EOF trouv dans un commentaire"
 
-#: lexer.ll:188
+#: lexer.ll:189
 msgid "\\maininput disallowed outside init files"
 msgstr ""
 
-#: lexer.ll:212
+#: lexer.ll:213
 #, fuzzy, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "indentifiant non dfini: `%s'"
 
 #. backup rule
-#: lexer.ll:221
+#: lexer.ll:222
 msgid "Missing end quote"
 msgstr ""
 
 #. backup rule
-#: lexer.ll:243 lexer.ll:247
+#: lexer.ll:244 lexer.ll:248
 msgid "white expected"
 msgstr "blanche attendue"
 
-#: lexer.ll:256
+#: lexer.ll:257
 msgid "Can't evaluate Scheme in safe mode"
 msgstr ""
 
-#: lexer.ll:349
+#: lexer.ll:358
 msgid "Brace found at end of lyric. Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:457
+#: lexer.ll:468
 #, fuzzy, c-format
 msgid "invalid character: `%c'"
 msgstr "caractres illgal: `%c'"
 
-#: lexer.ll:538
+#: lexer.ll:554
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "chane d'chappement inconnue: `\\%s'"
 
-#: lexer.ll:617
+#: lexer.ll:639
 #, c-format
 msgid "Oldest supported input version: %s"
 msgstr "Plus ancienne version supporte: %s"
 
-#: lexer.ll:629
+#: lexer.ll:651
 #, fuzzy, c-format
 msgid "incorrect lilypond version: %s (%s, %s)"
 msgstr "version de mudela incorrecte: %s (%s, %s)"
 
-#: lexer.ll:630
+#: lexer.ll:652
 msgid "Consider converting the input with the convert-ly script"
 msgstr ""
 
-#: lilypond-item.cc:161
-#, c-format
-msgid "#32 in quarter: %d"
-msgstr ""
-
-#: lilypond-score.cc:108
-#, fuzzy, c-format
-msgid "LY output to `%s'..."
-msgstr "Sortie de Lily vers %s..."
-
-#: lilypond-score.cc:119
-#, fuzzy, c-format
-msgid "track %d:"
-msgstr "piste "
-
-#: lilypond-score.cc:155
-msgid "Processing..."
-msgstr "Traitement..."
-
-#: lilypond-score.cc:164
-msgid "Creating voices..."
-msgstr "Cration des voix..."
-
-#: lilypond-score.cc:168
-msgid "track "
-msgstr "piste "
-
-#: lilypond-score.cc:177
-msgid "NOT Filtering tempo..."
-msgstr "PAS de filtrage du tempo..."
-
-#: lilypond-score.cc:186
-msgid "NOT Quantifying columns..."
-msgstr "PAS de quantification des colonnes..."
-
-#: lilypond-score.cc:190
-msgid "Quantifying columns..."
-msgstr "Quantification des colonnes..."
-
-#: lilypond-score.cc:223
-msgid "Settling columns..."
-msgstr ""
-
-#: lilypond-staff.cc:209
-msgid "% MIDI copyright:"
-msgstr ""
-
-#: lilypond-staff.cc:210
 #, fuzzy
-msgid "% MIDI instrument:"
-msgstr "Pas d'instrument tel: `%s'"
+#~ msgid "Cleaning `%s'..."
+#~ msgstr "Cration des voix..."
 
-#: lilypond-stream.cc:37
-#, c-format
-msgid "lily indent level: %d"
-msgstr "Niveau d'indentation de lily: %d"
+#, fuzzy
+#~ msgid "writing header field `%s' to `%s'..."
+#~ msgstr "impossible d'ouvrir le fichier: `%s'"
 
-#. Maybe better not to translate these?
-#: lilypond-stream.cc:83
-msgid "% Creator: "
-msgstr "% Auteur: "
+#, fuzzy
+#~ msgid "LY output to `%s'..."
+#~ msgstr "Sortie de Lily vers %s..."
 
-#: lilypond-stream.cc:88
-msgid "% Automatically generated"
-msgstr "% Gnr automatiquement"
+#, fuzzy
+#~ msgid "track %d:"
+#~ msgstr "piste "
 
-#: lilypond-stream.cc:97
-#, c-format
-msgid "% from input file: "
-msgstr "% dal file di input: "
+#~ msgid "Processing..."
+#~ msgstr "Traitement..."
 
-#: main.cc:94
-msgid "write exact durations, e.g.: a4*385/384"
-msgstr ""
+#~ msgid "Creating voices..."
+#~ msgstr "Cration des voix..."
 
-#: main.cc:95
-msgid "enable debugging output"
-msgstr ""
+#~ msgid "track "
+#~ msgstr "piste "
 
-#: main.cc:97
-msgid "ACC[:MINOR]"
-msgstr ""
+#~ msgid "NOT Filtering tempo..."
+#~ msgstr "PAS de filtrage du tempo..."
 
-#: main.cc:97
-msgid "set key: ACC +sharps/-flats; :1 minor"
-msgstr ""
+#~ msgid "NOT Quantifying columns..."
+#~ msgstr "PAS de quantification des colonnes..."
 
-#: main.cc:98
-msgid "don't output tuplets, double dots or rests, smallest is 32"
-msgstr ""
+#~ msgid "Quantifying columns..."
+#~ msgstr "Quantification des colonnes..."
 
-#: main.cc:99
 #, fuzzy
-msgid "set FILE as default output"
-msgstr "  -o, --output=FILE      set FILE come output di default\n"
+#~ msgid "% MIDI instrument:"
+#~ msgstr "Pas d'instrument tel: `%s'"
 
-#: main.cc:100
-msgid "don't output tuplets"
-msgstr ""
+#~ msgid "lily indent level: %d"
+#~ msgstr "Niveau d'indentation de lily: %d"
 
-#: main.cc:101
-msgid "be quiet"
-msgstr "mode silencieux"
+#~ msgid "% Creator: "
+#~ msgstr "% Auteur: "
 
-#: main.cc:102
-msgid "don't output rests or skips"
-msgstr ""
+#~ msgid "% Automatically generated"
+#~ msgstr "% Gnr automatiquement"
 
-#: main.cc:103
-msgid "DUR"
-msgstr ""
+#~ msgid "% from input file: "
+#~ msgstr "% dal file di input: "
 
-#: main.cc:103
 #, fuzzy
-msgid "set smallest duration"
-msgstr "Positionne la plus petite dure (?)"
-
-#: main.cc:104
-msgid "don't timestamp the output"
-msgstr ""
+#~ msgid "set FILE as default output"
+#~ msgstr "  -o, --output=FILE      set FILE come output di default\n"
 
-#: main.cc:106
-msgid "be verbose"
-msgstr ""
+#~ msgid "be quiet"
+#~ msgstr "mode silencieux"
 
-#: main.cc:108
-msgid "assume no double dotted notes"
-msgstr ""
-
-#: main.cc:115
-#, c-format
-msgid "Usage: %s [OPTION]... [FILE]"
-msgstr "Usage: %s [OPTION... [FICHIER]"
-
-#: main.cc:117
 #, fuzzy
-msgid "Translate MIDI-file to lilypond"
-msgstr "Traduction du fichier MIDI en mudela"
-
-#: main.cc:131
-#, c-format
-msgid "no_double_dots: %d\n"
-msgstr ""
-
-#: main.cc:133
-#, c-format
-msgid "no_rests: %d\n"
-msgstr ""
+#~ msgid "set smallest duration"
+#~ msgstr "Positionne la plus petite dure (?)"
 
-#: main.cc:135
-#, c-format
-msgid "no_quantify_b_s: %d\n"
-msgstr ""
+#~ msgid "Usage: %s [OPTION]... [FILE]"
+#~ msgstr "Usage: %s [OPTION... [FICHIER]"
 
-#: main.cc:137
-#, c-format
-msgid "no_smaller_than: %d (1/%d)\n"
-msgstr ""
-
-#: main.cc:140
-#, c-format
-msgid "no_tuplets: %d\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Translate MIDI-file to lilypond"
+#~ msgstr "Traduction du fichier MIDI en mudela"
 
-#: midi-parser.cc:64
-msgid "zero length string encountered"
-msgstr "chane de taille vide rencontre"
+#~ msgid "zero length string encountered"
+#~ msgstr "chane de taille vide rencontre"
 
-#: midi-score-parser.cc:44
-msgid "MIDI header expected"
-msgstr "entte MIDI attendue"
+#~ msgid "MIDI header expected"
+#~ msgstr "entte MIDI attendue"
 
-#: midi-score-parser.cc:49
 #, fuzzy
-msgid "invalid header length"
-msgstr "Taille d'entte invalide"
+#~ msgid "invalid header length"
+#~ msgstr "Taille d'entte invalide"
 
-#: midi-score-parser.cc:52
 #, fuzzy
-msgid "invalid MIDI format"
-msgstr "vnement MIDI invalide"
+#~ msgid "invalid MIDI format"
+#~ msgstr "vnement MIDI invalide"
 
-#: midi-score-parser.cc:55
 #, fuzzy
-msgid "invalid number of tracks"
-msgstr "Nombre de pistes invalide"
+#~ msgid "invalid number of tracks"
+#~ msgstr "Nombre de pistes invalide"
 
-#: midi-score-parser.cc:58
 #, fuzzy
-msgid "can't handle non-metrical time"
-msgstr "temps non mtrique"
-
-#: midi-track-parser.cc:68
-#, c-format
-msgid "Junking note-end event: channel = %d, pitch = %d"
-msgstr ""
-
-#: midi-track-parser.cc:124
-msgid "invalid running status"
-msgstr ""
+#~ msgid "can't handle non-metrical time"
+#~ msgstr "temps non mtrique"
 
-#: midi-track-parser.cc:328
-msgid "unimplemented MIDI meta-event"
-msgstr "meta-vnement MIDI non implment"
+#~ msgid "unimplemented MIDI meta-event"
+#~ msgstr "meta-vnement MIDI non implment"
 
-#: midi-track-parser.cc:333
-msgid "invalid MIDI event"
-msgstr "vnement MIDI invalide"
+#~ msgid "invalid MIDI event"
+#~ msgstr "vnement MIDI invalide"
 
-#: midi-track-parser.cc:348
-msgid "MIDI track expected"
-msgstr "piste MIDI attendue"
+#~ msgid "MIDI track expected"
+#~ msgstr "piste MIDI attendue"
 
-#: midi-track-parser.cc:353
-msgid "invalid track length"
-msgstr "taille de piste invalide"
+#~ msgid "invalid track length"
+#~ msgstr "taille de piste invalide"
 
 #, fuzzy
 #~ msgid "no Grace context available"
diff -purN ../lilypond-1.5.28/po/it.po ./po/it.po
--- ../lilypond-1.5.28/po/it.po	Sun Sep 16 17:09:58 2001
+++ ./po/it.po	Thu Jan 31 13:17:54 2002
@@ -5,7 +5,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2001-09-09 17:41+0200\n"
+"POT-Creation-Date: 2002-01-29 23:08+0100\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Date: 1998-05-30 00:17:12+0200\n"
 "From:  <jantien@xs4all.nl>\n"
@@ -13,304 +13,349 @@ msgstr ""
 "out --add-comments --keyword=_ --keyword=_f\n"
 "Files: bow.cc int.cc\n"
 
-#: ly2dvi.py:115
-msgid "Generate .dvi with LaTeX for LilyPond"
-msgstr ""
-
-#: data-file.cc:118 input.cc:85 ly2dvi.py:197 midi-parser.cc:100 mup2ly.py:93
-#: update-lily.py:119 warn.cc:23
+#: data-file.cc:118 input.cc:85 ly2dvi.py:113 midi2ly.py:148
+#: update-lily.py:136 warn.cc:23
 msgid "warning: "
 msgstr "attenzione: "
 
-#: input.cc:90 ly2dvi.py:212 ly2dvi.py:641 ly2dvi.py:659 ly2dvi.py:850
-#: mup2ly.py:98 mup2ly.py:188 update-lily.py:124 update-lily.py:212 warn.cc:9
-#: warn.cc:17
+#: input.cc:90 ly2dvi.py:116 ly2dvi.py:132 ly2dvi.py:691 ly2dvi.py:709
+#: midi2ly.py:163 midi2ly.py:1012 midi2ly.py:1081 update-lily.py:151
+#: update-lily.py:426 warn.cc:9 warn.cc:17
 msgid "error: "
 msgstr "errore: "
 
-#: ly2dvi.py:213 mup2ly.py:100 update-lily.py:126
+#: ly2dvi.py:133 midi2ly.py:164 update-lily.py:152
 msgid "Exiting ... "
 msgstr ""
 
-#: ly2dvi.py:271 mup2ly.py:158 update-lily.py:184
+#: ly2dvi.py:191 midi2ly.py:222 update-lily.py:210
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE"
 msgstr "Uso: %s [OPZIONE... [FILE]"
 
-#: ly2dvi.py:275 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:188
+#: ly2dvi.py:195 main.cc:151 midi2ly.py:226 update-lily.py:214
 msgid "Options:"
 msgstr "Opzioni: "
 
-#: ly2dvi.py:279 main.cc:124 main.cc:166 mup2ly.py:168 update-lily.py:192
+#: ly2dvi.py:199 main.cc:168 midi2ly.py:230 update-lily.py:218
 #, c-format
 msgid "Report bugs to %s"
 msgstr ""
 
-#: ly2dvi.py:307 mup2ly.py:185 update-lily.py:209
+#: ly2dvi.py:227 midi2ly.py:258 update-lily.py:246
 #, c-format
 msgid "Invoking `%s'"
 msgstr ""
 
-#: ly2dvi.py:311 mup2ly.py:188 update-lily.py:212
+#: ly2dvi.py:231 midi2ly.py:262 update-lily.py:250
 #, c-format
 msgid "command exited with value %d"
 msgstr ""
 
-#: ly2dvi.py:313 mup2ly.py:190 update-lily.py:214
+#: ly2dvi.py:233 midi2ly.py:264 update-lily.py:252
 msgid "(ignored)"
 msgstr ""
 
-#: ly2dvi.py:323
+#: ly2dvi.py:243 midi2ly.py:274 update-lily.py:262
 #, fuzzy, c-format
 msgid "Cleaning %s..."
 msgstr "Genero le voci..."
 
-#: ly2dvi.py:338 mup2ly.py:214 update-lily.py:238
-#, fuzzy, c-format
-msgid "no such setting: %s"
-msgstr "% strumento:"
+#: ly2dvi.py:301
+msgid "Generate .dvi with LaTeX for LilyPond"
+msgstr ""
 
-#: ly2dvi.py:351 main.cc:113
+#: ly2dvi.py:304 main.cc:115
 #, fuzzy
 msgid "write Makefile dependencies for every input file"
 msgstr ""
 "  -d, --dependencies     scrive le dependenze del Makefile per ogni file di "
 "input\n"
 
-#: ly2dvi.py:352 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:252
+#: ly2dvi.py:305 main.cc:111 midi2ly.py:98 mup2ly.py:74 update-lily.py:86
 msgid "this help"
 msgstr ""
 
-#: ly2dvi.py:353 main.cc:111 main.cc:116
+#: ly2dvi.py:306 main.cc:113 main.cc:118
 msgid "DIR"
 msgstr ""
 
-#: ly2dvi.py:353
+#: ly2dvi.py:306
 #, fuzzy
 msgid "add DIR to LilyPond's search path"
 msgstr "  -I, --include=DIR      aggiunge DIR ai path di ricerca\n"
 
-#: ly2dvi.py:354
+#: ly2dvi.py:307
 #, c-format
 msgid "keep all output, and name the directory %s.dir"
 msgstr ""
 
-#: ly2dvi.py:355
+#: ly2dvi.py:308
 msgid "don't run LilyPond"
 msgstr ""
 
-#: ly2dvi.py:356 main.cc:114
+#: ly2dvi.py:309 main.cc:116
 #, fuzzy
 msgid "produce MIDI output only"
 msgstr "  -M, --no-paper         produce solo output midi\n"
 
-#: ly2dvi.py:357 ly2dvi.py:358 main.cc:99 main.cc:112 main.cc:115
+#: ly2dvi.py:310 ly2dvi.py:311 main.cc:114 main.cc:117 midi2ly.py:100
 msgid "FILE"
 msgstr ""
 
-#: ly2dvi.py:357
+#: ly2dvi.py:310 midi2ly.py:100
 msgid "write ouput to FILE"
 msgstr ""
 
-#: ly2dvi.py:358
+#: ly2dvi.py:311
 msgid "find pfa fonts used in FILE"
 msgstr ""
 
-#: ly2dvi.py:360
+#: ly2dvi.py:313
 #, fuzzy
 msgid "generate PostScript output"
 msgstr "vincoli degenerati"
 
-#: ly2dvi.py:361
+#: ly2dvi.py:314
 msgid "KEY=VAL"
 msgstr ""
 
-#: ly2dvi.py:361
+#: ly2dvi.py:314
 msgid "change global setting KEY to VAL"
 msgstr ""
 
-#: ly2dvi.py:362 main.cc:119 mup2ly.py:1120 update-lily.py:256
+#: ly2dvi.py:315 main.cc:121 midi2ly.py:103 mup2ly.py:77 update-lily.py:90
 msgid "verbose"
 msgstr ""
 
-#: ly2dvi.py:363 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:257
+#: ly2dvi.py:316 main.cc:120 midi2ly.py:104 mup2ly.py:78 update-lily.py:91
 msgid "print version number"
 msgstr ""
 
-#: ly2dvi.py:364 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:259
+#: ly2dvi.py:317 main.cc:122 midi2ly.py:105 mup2ly.py:79 update-lily.py:93
 #, fuzzy
 msgid "show warranty and copyright"
 msgstr "  -w, --warranty         mostra la garanzia e il copyright\n"
 
-#: ly2dvi.py:386 ly2dvi.py:582 ly2dvi.py:607
+#: ly2dvi.py:406
+#, fuzzy, c-format
+msgid "no such setting: %s"
+msgstr "% strumento:"
+
+#: ly2dvi.py:434 ly2dvi.py:632 ly2dvi.py:657
 #, fuzzy, c-format
 msgid "Running %s..."
 msgstr "Genero le voci..."
 
-#: ly2dvi.py:399
+#: ly2dvi.py:449
 #, fuzzy, c-format
 msgid "Analyzing %s..."
 msgstr "Genero le voci..."
 
-#: ly2dvi.py:455
+#: ly2dvi.py:505
 #, c-format
 msgid "no lilypond output found for %s"
 msgstr ""
 
-#: ly2dvi.py:497
+#: ly2dvi.py:547
 #, fuzzy, c-format
 msgid "invalid value: %s"
 msgstr "carattere illegale: `%c'"
 
-#: ly2dvi.py:641
+#: ly2dvi.py:691
 #, fuzzy, c-format
 msgid "not a PostScript file: `%s'"
 msgstr "non posso aprire il file: `%s'"
 
-#: ly2dvi.py:659
+#: ly2dvi.py:709 midi2ly.py:1012 update-lily.py:426
 #, c-format
 msgid "getopt says: `%s'"
 msgstr ""
 
-#: ly2dvi.py:826 scores.cc:44
+#: ly2dvi.py:820
+#, c-format
+msgid "filename should not contain spaces: `%s'"
+msgstr ""
+
+#: ly2dvi.py:885 scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to `%s'..."
 msgstr "L'output stampato è inviato a %s..."
 
-#: ly2dvi.py:837
+#: ly2dvi.py:896 midi2ly.py:996
 #, fuzzy, c-format
 msgid "%s output to `%s'..."
 msgstr "L'output MIDI è inviato a %s..."
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:839
-#: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
+#: includable-lexer.cc:49 lily-guile.cc:134 ly2dvi.py:898 scores.cc:136
+#: scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "non trovo il file: `%s'"
 
-#: ly2dvi.py:850
+#: ly2dvi.py:909 midi2ly.py:1081
 msgid "no files specified on command line."
 msgstr ""
 
-#: mup2ly.py:51
-msgid "Convert mup to ly"
+#: midi2ly.py:92
+msgid "Convert MIDI to LilyPond source"
 msgstr ""
 
-#: mup2ly.py:166
-#, c-format
-msgid "%s is far from completed.  Not all constructs are recognised."
+#: midi2ly.py:95
+msgid "print absolute pitches"
 msgstr ""
 
-#: mup2ly.py:964
-#, fuzzy, c-format
-msgid "no such context: %s"
-msgstr "% strumento:"
+#: midi2ly.py:96 midi2ly.py:101
+msgid "DUR"
+msgstr ""
+
+#: midi2ly.py:96
+msgid "quantise note durations on DUR"
+msgstr ""
 
-#: mup2ly.py:1115
+#: midi2ly.py:97
+msgid "print explicit durations"
+msgstr ""
+
+#: midi2ly.py:99
+msgid "ALT[:MINOR]"
+msgstr ""
+
+#: midi2ly.py:99
+#, fuzzy
+msgid "set key: ALT=+sharps|-flats; MINOR=1"
+msgstr ""
+" -k, --key=ACC[:MINOR]  imposta l'armatura: ACC +diesis/-bemolli; :1 minore\n"
+
+#: midi2ly.py:101
+msgid "quantise note starts on DUR"
+msgstr ""
+
+#: midi2ly.py:102
+msgid "DUR*NUM/DEN"
+msgstr ""
+
+#: midi2ly.py:102
+msgid "allow tuplet durations DUR*NUM/DEN"
+msgstr ""
+
+#: midi2ly.py:106
+msgid "treat every text as a lyric"
+msgstr ""
+
+#: midi2ly.py:1027
+msgid "Example:"
+msgstr ""
+
+#: mup2ly.py:69
+msgid "Convert mup to LilyPond source"
+msgstr ""
+
+#: mup2ly.py:72
 msgid "debug"
 msgstr ""
 
-#: mup2ly.py:1116
+#: mup2ly.py:73
 msgid "define macro NAME [optional expansion EXP]"
 msgstr ""
 
-#: main.cc:115 mup2ly.py:1118
+#: main.cc:117 mup2ly.py:75
 msgid "write output to FILE"
 msgstr ""
 
-#: mup2ly.py:1119
+#: mup2ly.py:76
 msgid "only pre-process"
 msgstr ""
 
-#: mup2ly.py:1200
+#: mup2ly.py:827
+#, fuzzy, c-format
+msgid "no such context: %s"
+msgstr "% strumento:"
+
+#: mup2ly.py:1051
 #, fuzzy, c-format
 msgid "Processing `%s'..."
 msgstr "Elaboro..."
 
-#: mup2ly.py:1219
+#: mup2ly.py:1070
 #, fuzzy, c-format
 msgid "Writing `%s'..."
 msgstr "Genero le voci..."
 
-#: update-lily.py:52
+#: update-lily.py:75
 msgid "Fetch and rebuild from latest source package"
 msgstr ""
 
-#: update-lily.py:224
-#, fuzzy, c-format
-msgid "Cleaning `%s'..."
-msgstr "Genero le voci..."
-
-#: update-lily.py:244
+#: update-lily.py:78
 #, c-format
 msgid "unpack and build in DIR [%s]"
 msgstr ""
 
-#: update-lily.py:245
+#: update-lily.py:79
 msgid "execute COMMAND, subtitute:"
 msgstr ""
 
-#: update-lily.py:246
+#: update-lily.py:80
 msgid "%b: build root"
 msgstr ""
 
-#: update-lily.py:247
+#: update-lily.py:81
 #, c-format
 msgid "%n: package name"
 msgstr ""
 
-#: update-lily.py:248
+#: update-lily.py:82
 #, fuzzy
 msgid "%r: release directory"
 msgstr "non trovo e non posso creare `%s'"
 
-#: update-lily.py:249
+#: update-lily.py:83
 msgid "%t: tarball"
 msgstr ""
 
-#: update-lily.py:250
+#: update-lily.py:84
 msgid "%v: package version"
 msgstr ""
 
-#: update-lily.py:253
+#: update-lily.py:87
 #, c-format
 msgid "keep all output, and name the directory %s"
 msgstr ""
 
-#: update-lily.py:254
+#: update-lily.py:88
 msgid "upon failure notify EMAIL[,EMAIL]"
 msgstr ""
 
-#: update-lily.py:255
+#: update-lily.py:89
 msgid "remove previous build"
 msgstr ""
 
-#: update-lily.py:258
+#: update-lily.py:92
 #, c-format
 msgid "fetch and build URL [%s]"
 msgstr ""
 
-#: update-lily.py:366
+#: update-lily.py:397
 #, fuzzy, c-format
 msgid "Listing `%s'..."
 msgstr "Genero le voci..."
 
-#: update-lily.py:427
+#: update-lily.py:465
 #, c-format
 msgid "latest is: %s"
 msgstr ""
 
-#: update-lily.py:428
+#: update-lily.py:466
 #, c-format
 msgid "relax, %s is up to date"
 msgstr ""
 
-#: update-lily.py:436 update-lily.py:449
+#: update-lily.py:474 update-lily.py:487
 #, fuzzy, c-format
 msgid "Fetching `%s'..."
 msgstr "Genero le voci..."
 
-#: update-lily.py:458
+#: update-lily.py:496
 #, fuzzy, c-format
 msgid "Building `%s'..."
 msgstr "Genero le voci..."
@@ -352,8 +397,8 @@ msgstr "posizione sconosciuta"
 msgid "can't map file"
 msgstr "non posso mappare il documento"
 
-#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45
-#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
+#: mapped-file-storage.cc:87 scores.cc:48 simple-file-storage.cc:44
+#: streams.cc:37 text-stream.cc:23
 #, c-format
 msgid "can't open file: `%s'"
 msgstr "non posso aprire il file: `%s'"
@@ -375,6 +420,16 @@ msgstr ""
 msgid " (Continuing; cross thumbs)"
 msgstr ""
 
+#: accidental-engraver.cc:136
+#, fuzzy, c-format
+msgid "unknown accidental typesetting: %s"
+msgstr "stringa di escape sconosciuta: `\\%s'"
+
+#: accidental-engraver.cc:139
+#, c-format
+msgid "Accidental typesetting must be pair: %s"
+msgstr ""
+
 #: afm.cc:59
 #, fuzzy, c-format
 msgid "can't find character number: %d"
@@ -434,39 +489,49 @@ msgstr ""
 msgid "Can't switch translators, I'm there already"
 msgstr ""
 
-#: beam-engraver.cc:91 beam-engraver.cc:124
+#: bar-check-iterator.cc:58
+#, fuzzy, c-format
+msgid "barcheck failed at: %s"
+msgstr "controllo del battute fallito: %s"
+
+#: beam-engraver.cc:93 beam-engraver.cc:126
 #, fuzzy
 msgid "can't find start of beam"
 msgstr "non trovo le estremità di %s"
 
-#: beam-engraver.cc:158
+#: beam-engraver.cc:150
 msgid "already have a beam"
 msgstr ""
 
-#: beam-engraver.cc:222
+#: beam-engraver.cc:216
 #, fuzzy
 msgid "unterminated beam"
 msgstr "beam non terminato"
 
-#: beam-engraver.cc:255 chord-tremolo-engraver.cc:195
+#: beam-engraver.cc:249 chord-tremolo-engraver.cc:193
 #, fuzzy
 msgid "stem must have Rhythmic structure"
 msgstr "I gambi devono avere una struttura ritmica."
 
-#: beam-engraver.cc:267
+#: beam-engraver.cc:261
 msgid "stem doesn't fit in beam"
 msgstr "il gambo non rientra nel beam"
 
-#: beam-engraver.cc:268
+#: beam-engraver.cc:262
 msgid "beam was started here"
 msgstr ""
 
-#: beam.cc:86
+#: beam.cc:93
+#, fuzzy
+msgid "beam has less than two visible stems"
+msgstr "beam con meno di due gambi"
+
+#: beam.cc:98
 #, fuzzy
-msgid "beam has less than two stems"
+msgid "Beam has less than two stems. Removing beam."
 msgstr "beam con meno di due gambi"
 
-#: beam.cc:637
+#: beam.cc:660
 msgid "weird beam vertical offset"
 msgstr ""
 
@@ -494,7 +559,7 @@ msgstr ""
 msgid "none of these in my family"
 msgstr ""
 
-#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192
+#: chord-tremolo-engraver.cc:139 percent-repeat-engraver.cc:182
 #, fuzzy
 msgid "unterminated chord tremolo"
 msgstr "beam non terminato"
@@ -513,7 +578,7 @@ msgstr ""
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr ""
 
-#: collision.cc:245
+#: collision.cc:281
 #, fuzzy
 msgid "Too many clashing notecolumns.  Ignoring them."
 msgstr "Troppe collisioni tra colonne di note. Le ignoro."
@@ -522,31 +587,31 @@ msgstr "Troppe collisioni tra colonne di
 msgid "NaN"
 msgstr ""
 
-#: dynamic-engraver.cc:197 span-dynamic-performer.cc:86
+#: dynamic-engraver.cc:195 span-dynamic-performer.cc:82
 #, fuzzy
 msgid "can't find start of (de)crescendo"
 msgstr "non trovo un (de)crescendo fino alla fine"
 
-#: dynamic-engraver.cc:222
+#: dynamic-engraver.cc:220
 #, fuzzy
 msgid "already have a crescendo"
 msgstr "crescendo non terminato"
 
-#: dynamic-engraver.cc:223
+#: dynamic-engraver.cc:221
 #, fuzzy
 msgid "already have a decrescendo"
 msgstr "crescendo non terminato"
 
-#: dynamic-engraver.cc:317
+#: dynamic-engraver.cc:315
 #, fuzzy
 msgid "unterminated (de)crescendo"
 msgstr "crescendo non terminato"
 
-#: extender-engraver.cc:97
+#: extender-engraver.cc:96
 msgid "unterminated extender"
 msgstr "extender non terminato"
 
-#: extender-engraver.cc:109
+#: extender-engraver.cc:108
 msgid "Nothing to connect extender to on the left.  Ignoring extender request."
 msgstr ""
 
@@ -558,7 +623,7 @@ msgstr ""
 msgid "couldn't find any font satisfying "
 msgstr ""
 
-#: gourlay-breaking.cc:157
+#: gourlay-breaking.cc:168
 msgid "No feasible line breaking found"
 msgstr ""
 
@@ -571,24 +636,24 @@ msgstr ""
 msgid "crescendo too small"
 msgstr "troppo piccolo"
 
-#: hyphen-engraver.cc:90
+#: hyphen-engraver.cc:89
 #, fuzzy
 msgid "unterminated hyphen"
 msgstr "beam non terminato"
 
-#: hyphen-engraver.cc:102
+#: hyphen-engraver.cc:101
 msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen request."
 msgstr ""
 
-#: key-engraver.cc:99
+#: key-engraver.cc:93
 msgid "Conflicting key signatures found."
 msgstr ""
 
-#: key-engraver.cc:100
+#: key-engraver.cc:94
 msgid "This was the other key definition."
 msgstr ""
 
-#: key-performer.cc:77
+#: key-performer.cc:91
 msgid "FIXME: key change merge"
 msgstr ""
 
@@ -597,7 +662,7 @@ msgstr ""
 msgid "Kpathsea couldn't find TFM file `%s'"
 msgstr "non trovo il file: `%s'"
 
-#: lily-guile.cc:141
+#: lily-guile.cc:136
 #, fuzzy, c-format
 msgid "(load path: `%s')"
 msgstr "(Il path di caricamento è `%s'"
@@ -607,12 +672,12 @@ msgstr "(Il path di caricamento è `%s'"
 msgid "Element count %d."
 msgstr ""
 
-#: line-of-score.cc:313 paper-score.cc:77
+#: line-of-score.cc:325 paper-score.cc:76
 #, c-format
 msgid "Element count %d "
 msgstr ""
 
-#: line-of-score.cc:327
+#: line-of-score.cc:339
 msgid "Calculating column positions..."
 msgstr "Calcolo delle posizioni della colonne..."
 
@@ -625,47 +690,47 @@ msgid "Huh? Melismatic note found to hav
 msgstr ""
 
 #. print example usage:  lilypond -e "(set-lily-option 'help 0)" ?
-#: main.cc:105
+#: main.cc:107
 msgid "EXPR"
 msgstr ""
 
-#: main.cc:105
+#: main.cc:107
 msgid "evalute EXPR as Scheme after .scm init is read"
 msgstr ""
 
 #. another bug in option parser: --output=foe is taken as an abbreviation
 #. for --output-format
-#: main.cc:108
+#: main.cc:110
 msgid "EXT"
 msgstr ""
 
-#: main.cc:108
+#: main.cc:110
 msgid "use output format EXT (tex [default], pdftex, ps, scm or as)"
 msgstr ""
 
-#: main.cc:110
+#: main.cc:112
 msgid "FIELD"
 msgstr ""
 
-#: main.cc:110
+#: main.cc:112
 msgid "write header field to BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:111
+#: main.cc:113
 #, fuzzy
 msgid "add DIR to search path"
 msgstr "  -I, --include=DIR      aggiunge DIR ai path di ricerca\n"
 
-#: main.cc:112
+#: main.cc:114
 #, fuzzy
 msgid "use FILE as init file"
 msgstr "  -i, --init=NOMEFILE    usa NOMEFILE come file iniziale\n"
 
-#: main.cc:116
+#: main.cc:118
 msgid "prepend DIR to dependencies"
 msgstr ""
 
-#: main.cc:117
+#: main.cc:119
 #, fuzzy
 msgid "inhibit file output naming and exporting"
 msgstr ""
@@ -675,29 +740,29 @@ msgstr ""
 #.
 #. No version number or newline here. It confuses help2man
 #.
-#: main.cc:137
+#: main.cc:139
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Uso: %s [OPZIONE]... [FILE]..."
 
-#: main.cc:139
+#: main.cc:141
 #, fuzzy
 msgid "Typeset music and or play MIDI from FILE"
 msgstr "Stampa partitura oppure suona una song MIDI da FILE o <stdin>"
 
-#: main.cc:143
+#: main.cc:145
 msgid ""
 "LilyPond is a music typesetter.  It produces beautiful sheet music\n"
 "using a high level description file as input.  LilyPond is part of \n"
 "the GNU Project.\n"
 msgstr ""
 
-#: main.cc:153
+#: main.cc:155
 #, fuzzy
 msgid "This binary was compiled with the following options:"
 msgstr "GNU LilyPond è stata compilata con le seguenti impostazioni:"
 
-#: main.cc:56 main.cc:174
+#: main.cc:176
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -705,17 +770,17 @@ msgid ""
 "certain conditions.  Invoke as `%s --warranty' for more information.\n"
 msgstr ""
 
-#: main.cc:63 main.cc:181 main.cc:193
+#: main.cc:183 main.cc:195
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s di"
 
-#: main.cc:191
+#: main.cc:193
 #, fuzzy
 msgid "GNU LilyPond -- The music typesetter"
 msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU"
 
-#: main.cc:72 main.cc:199
+#: main.cc:201
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License version 2\n"
@@ -765,42 +830,42 @@ msgstr "indicazione altezza priva di sen
 msgid "can't find `%s' context"
 msgstr "non trovo `%s'"
 
-#: music.cc:239
+#: music.cc:144
+#, fuzzy, c-format
+msgid "Transposition by %s makes accidental larger than two"
+msgstr "la trasposizine di %s rende le alterazioni più che doppie"
+
+#: music.cc:249
 msgid "ly_get_mus_property (): Not a Music"
 msgstr ""
 
-#: music.cc:253
+#: music.cc:263
 msgid "ly_set_mus_property (): Not a symbol"
 msgstr ""
 
-#: music.cc:265
+#: music.cc:275
 msgid "ly_set_mus_property ():  not of type Music"
 msgstr ""
 
-#: music.cc:279
+#: music.cc:289
 msgid "ly_make_music (): Not a string"
 msgstr ""
 
-#: music.cc:299
+#: music.cc:309
 msgid "ly_music_name (): Not a music expression"
 msgstr ""
 
-#: musical-request.cc:28
-#, fuzzy, c-format
-msgid "Transposition by %s makes accidental larger than two"
-msgstr "la trasposizine di %s rende le alterazioni più che doppie"
-
-#: my-lily-lexer.cc:140
+#: my-lily-lexer.cc:139
 #, fuzzy, c-format
 msgid "Identifier name is a keyword: `%s'"
 msgstr "Il nome dell'identificatore è una parola chiave (`%s')"
 
-#: my-lily-lexer.cc:160
+#: my-lily-lexer.cc:159
 #, c-format
 msgid "error at EOF: %s"
 msgstr "errore alla fine del file: %s"
 
-#: midi-score-parser.cc:94 my-lily-parser.cc:47
+#: my-lily-parser.cc:47
 msgid "Parsing..."
 msgstr "Analisi..."
 
@@ -819,34 +884,19 @@ msgstr "Cosa? Non è una richiesta: `%s'"
 msgid "paper output to `%s'..."
 msgstr "L'output stampato è inviato a %s..."
 
-#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99
+#: paper-outputter.cc:60
 msgid ", at "
 msgstr ", a "
 
-#: paper-outputter.cc:232
-#, fuzzy, c-format
-msgid "writing header field `%s' to `%s'..."
-msgstr "scrivo il file delle dipendenze: `%s'..."
-
-#: paper-score.cc:80
+#: paper-score.cc:79
 msgid "Preprocessing elements..."
 msgstr "Pre-elaborazione..."
 
-#: paper-score.cc:114
+#: paper-score.cc:113
 #, fuzzy
 msgid "Outputting Score, defined at: "
 msgstr "emetto lo Score, definito a: "
 
-#: paper-stream.cc:41
-#, fuzzy, c-format
-msgid "can't create directory: `%s'"
-msgstr "non trovo e non posso creare `%s'"
-
-#: paper-stream.cc:55
-#, fuzzy
-msgid "Error syncing file (disk full?)"
-msgstr "errore nel sincronizzare il file (disco pieno?)"
-
 #.
 #. We could change the current translator's id, but that would make
 #. errors hard to catch
@@ -863,7 +913,7 @@ msgstr ""
 msgid "none of these in my family: `%s'"
 msgstr ""
 
-#: percent-repeat-engraver.cc:117
+#: percent-repeat-engraver.cc:116
 #, fuzzy
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr "non so manipolare tasti vuoti"
@@ -881,12 +931,17 @@ msgstr "traccia "
 msgid "Creator: "
 msgstr "Autore: "
 
-#: performance.cc:113
+#: performance.cc:103
+#, fuzzy
+msgid "at "
+msgstr ", a "
+
+#: performance.cc:114
 #, c-format
 msgid "from musical definition: %s"
 msgstr "della definizione musicale: %s"
 
-#: performance.cc:168
+#: performance.cc:169
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "L'output MIDI è inviato a %s..."
@@ -901,8 +956,8 @@ msgstr "slur non terminato"
 msgid "can't find start of phrasing slur"
 msgstr "non trovo le estremità di %s"
 
-#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154
-#: piano-pedal-performer.cc:85
+#: piano-pedal-engraver.cc:141 piano-pedal-engraver.cc:153
+#: piano-pedal-performer.cc:82
 #, fuzzy, c-format
 msgid "can't find start of piano pedal: `%s'"
 msgstr "non risco a trovare una ruling note a %s"
@@ -911,14 +966,42 @@ msgstr "non risco a trovare una ruling n
 msgid "Pitch arguments out of range"
 msgstr ""
 
-#: property-engraver.cc:121
+#: porrectus.cc:34
+msgid "(left_head == 0)"
+msgstr ""
+
+#: porrectus.cc:45
+msgid "undefined left_head"
+msgstr ""
+
+#: porrectus.cc:64
+msgid "(right_head == 0)"
+msgstr ""
+
+#: porrectus.cc:75
+msgid "undefined right_head"
+msgstr ""
+
+#: porrectus.cc:164
+msgid "junking lonely porrectus"
+msgstr ""
+
+#: porrectus.cc:174
+msgid "porrectus style undefined; using mensural"
+msgstr ""
+
+#: porrectus.cc:301
+msgid "ascending vaticana style porrectus"
+msgstr ""
+
+#: property-engraver.cc:116
 #, c-format
 msgid ""
 "`%s' is deprecated.  Use\n"
 " \\property %s.%s \\override #'%s = #%s"
 msgstr ""
 
-#: property-engraver.cc:145
+#: property-engraver.cc:140
 #, fuzzy, c-format
 msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s"
 msgstr "Tipo sbagliato per il valore di una proprietà"
@@ -937,27 +1020,27 @@ msgstr ""
 msgid "Scheme options:"
 msgstr "Opzioni: "
 
-#: score-engraver.cc:189
+#: score-engraver.cc:178
 #, fuzzy, c-format
 msgid "unbound spanner `%s'"
 msgstr "Spanner non legato `%s'"
 
-#: score.cc:78
+#: score.cc:88
 msgid "Interpreting music..."
 msgstr "Interpretazione della musica..."
 
-#: score.cc:92
+#: score.cc:102
 #, fuzzy
 msgid "Need music in a score"
 msgstr "ho bisogno di musica nello spartito"
 
 #. should we? hampers debugging.
-#: score.cc:105
+#: score.cc:115
 #, fuzzy
 msgid "Errors found/*, not processing score*/"
 msgstr "ho trovato un errore, /*non sto elaborando lo spartito*/"
 
-#: score.cc:112
+#: score.cc:122
 #, fuzzy, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr "durata: %.2f secondi"
@@ -972,7 +1055,7 @@ msgstr "lo spartito contiene errori; non
 msgid "Now processing: `%s'"
 msgstr "stringa di escape sconosciuta: `\\%s'"
 
-#: script-engraver.cc:66
+#: script-engraver.cc:65
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr ""
@@ -982,18 +1065,18 @@ msgstr ""
 msgid "Separation_item:  I've been drinking too much"
 msgstr ""
 
-#: simple-spacer.cc:200
+#: simple-spacer.cc:202
 #, c-format
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:125
+#: slur-engraver.cc:124
 msgid "unterminated slur"
 msgstr "slur non terminato"
 
 #. How to shut up this warning, when Voice_devnull_engraver has
 #. eaten start request?
-#: slur-engraver.cc:142
+#: slur-engraver.cc:141
 #, fuzzy
 msgid "can't find start of slur"
 msgstr "non trovo le estremità di %s"
@@ -1003,12 +1086,12 @@ msgstr "non trovo le estremità di %s"
 msgid "Putting slur over rest.  Ignoring."
 msgstr "Metto uno slur sulla pausa."
 
-#: slur.cc:383
+#: slur.cc:393
 #, fuzzy
 msgid "Slur over rest?"
 msgstr "Metto uno slur sulla pausa."
 
-#: stem-engraver.cc:115
+#: stem-engraver.cc:117
 #, c-format
 msgid "Adding note head to incompatible stem (type = %d)"
 msgstr ""
@@ -1018,17 +1101,27 @@ msgstr ""
 msgid "Weird stem size; check for narrow beams"
 msgstr "dimensione del gambo poco ortodossa; check for narrow beams"
 
-#: text-spanner-engraver.cc:94
+#: streams.cc:33
+#, fuzzy, c-format
+msgid "can't create directory: `%s'"
+msgstr "non trovo e non posso creare `%s'"
+
+#: streams.cc:47
+#, fuzzy
+msgid "Error syncing file (disk full?)"
+msgstr "errore nel sincronizzare il file (disco pieno?)"
+
+#: text-spanner-engraver.cc:92
 #, fuzzy
 msgid "can't find start of text spanner"
 msgstr "non trovo le estremità di %s"
 
-#: text-spanner-engraver.cc:114
+#: text-spanner-engraver.cc:112
 #, fuzzy
 msgid "already have a text spanner"
 msgstr "crescendo non terminato"
 
-#: text-spanner-engraver.cc:169
+#: text-spanner-engraver.cc:167
 #, fuzzy
 msgid "unterminated text spanner"
 msgstr "extender non terminato"
@@ -1052,433 +1145,334 @@ msgstr ""
 msgid "can't find ascii character: %d"
 msgstr "non riesco a trovare il carattere `%s'"
 
-#. How to shut up this warning, when no notes appeared because
-#. they were suicided by Thread_devnull_engraver?
-#: tie-engraver.cc:220 tie-performer.cc:173
-msgid "No ties were created!"
+#: tie-engraver.cc:220
+msgid "lonely tie"
 msgstr ""
 
-#: tie-engraver.cc:240
-msgid "lonely tie"
+#: tie-performer.cc:161
+msgid "No ties were created!"
 msgstr ""
 
 #: time-scaled-music-iterator.cc:25
 msgid "no one to print a tuplet start bracket"
 msgstr ""
 
-#: timing-translator.cc:37
-#, fuzzy, c-format
-msgid "barcheck failed at: %s"
-msgstr "controllo del battute fallito: %s"
-
-#: translator-ctors.cc:40
+#: translator-ctors.cc:61
 #, fuzzy, c-format
 msgid "unknown translator: `%s'"
 msgstr "traduttore sconosciuto `%s'"
 
-#: translator-def.cc:99
+#: translator-def.cc:87
 msgid "Program has no such type"
 msgstr ""
 
-#: translator-def.cc:105
+#: translator-def.cc:93
 #, c-format
 msgid "Already contains: `%s'"
 msgstr ""
 
-#: translator-def.cc:106
+#: translator-def.cc:94
 #, fuzzy, c-format
 msgid "Not adding translator: `%s'"
 msgstr "traduttore sconosciuto `%s'"
 
-#: translator-def.cc:224
+#: translator-def.cc:212
 #, fuzzy, c-format
 msgid "can't find: `%s'"
 msgstr "non trovo `%s'"
 
-#: translator-group.cc:145
+#: translator-group.cc:147
 #, c-format
 msgid "can't find or create `%s' called `%s'"
 msgstr "non trovo e non posso creare '%s' chiamato '%s'"
 
-#: translator-group.cc:230
+#: translator-group.cc:232
 #, fuzzy, c-format
 msgid "can't find or create: `%s'"
 msgstr "non trovo e non posso creare `%s'"
 
-#: translator-group.cc:413
+#: translator-group.cc:407
 #, c-format
 msgid ""
 "Can't find property type-check for `%s'.  Perhaps you made a typing error? "
 "Doing assignment anyway."
 msgstr ""
 
-#: translator-group.cc:427
+#: translator-group.cc:421
 #, c-format
 msgid "Type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
 #. programming_error?
-#: translator-group.cc:446
+#: translator-group.cc:440
 msgid "ly-get-trans-property: expecting a Translator_group argument"
 msgstr ""
 
-#: volta-engraver.cc:88
+#: volta-engraver.cc:108
 msgid "No volta spanner to end"
 msgstr ""
 
-#: volta-engraver.cc:105
+#: volta-engraver.cc:125
 msgid "Already have a volta spanner.  Stopping that one prematurely."
 msgstr ""
 
-#: volta-engraver.cc:109
+#: volta-engraver.cc:129
 msgid "Also have a stopped spanner.  Giving up."
 msgstr ""
 
-#: parser.yy:121
+#: parser.yy:129
 #, c-format
 msgid "Expecting %d arguments"
 msgstr ""
 
-#: parser.yy:423
+#: parser.yy:434
 msgid "Identifier should have  alphabetic characters only"
 msgstr ""
 
-#: parser.yy:697
+#: parser.yy:715
 msgid "More alternatives than repeats.  Junking excess alternatives."
 msgstr ""
 
-#: parser.yy:761
+#: parser.yy:767
 msgid "Second argument must be a symbol"
 msgstr ""
 
-#: parser.yy:766
+#: parser.yy:772
 msgid "First argument must be a procedure taking 1 argument"
 msgstr ""
 
-#: parser.yy:1298
+#: parser.yy:1315
 msgid "Expecting string as script definition"
 msgstr ""
 
-#: parser.yy:1308
+#: parser.yy:1325
 msgid "Can't specify direction for this request"
 msgstr ""
 
-#: parser.yy:1433
+#: parser.yy:1451
 msgid "Expecting musical-pitch value"
 msgstr ""
 
-#: parser.yy:1444
+#: parser.yy:1462
 #, fuzzy
 msgid "Must have duration object"
 msgstr "indicazione durata priva di senso"
 
-#: parser.yy:1453 parser.yy:1461
+#: parser.yy:1471 parser.yy:1479
 #, fuzzy
 msgid "Have to be in Lyric mode for lyrics"
 msgstr "bisogna essere in Lyric mode per i testi"
 
-#: parser.yy:1614 parser.yy:1671
+#: parser.yy:1638 parser.yy:1691
 #, c-format
 msgid "not a duration: %d"
 msgstr "non è una durata: %d"
 
-#: parser.yy:1682
+#: parser.yy:1752
 #, fuzzy
 msgid "Have to be in Note mode for notes"
 msgstr "bisogna essere in Note mode per le note"
 
-#: parser.yy:1765
+#: parser.yy:1845
 #, fuzzy
 msgid "Have to be in Chord mode for chords"
 msgstr "bisogna essere in Chord mode per gli accordi"
 
-#: parser.yy:1945
+#: parser.yy:2025
 msgid "need integer number arg"
 msgstr ""
 
-#: lexer.ll:174
+#: parser.yy:2097
+msgid "Suspect duration found following this beam"
+msgstr ""
+
+#: lexer.ll:175
 msgid "EOF found inside a comment"
 msgstr "ho trovato un EOF in un commento"
 
-#: lexer.ll:188
+#: lexer.ll:189
 msgid "\\maininput disallowed outside init files"
 msgstr ""
 
-#: lexer.ll:212
+#: lexer.ll:213
 #, fuzzy, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "indentificatore non definito: `%s'"
 
 #. backup rule
-#: lexer.ll:221
+#: lexer.ll:222
 #, fuzzy
 msgid "Missing end quote"
 msgstr "apice finale mancante"
 
 #. backup rule
-#: lexer.ll:243 lexer.ll:247
+#: lexer.ll:244 lexer.ll:248
 msgid "white expected"
 msgstr "aspettavo uno spazio bianco"
 
-#: lexer.ll:256
+#: lexer.ll:257
 msgid "Can't evaluate Scheme in safe mode"
 msgstr ""
 
-#: lexer.ll:349
+#: lexer.ll:358
 msgid "Brace found at end of lyric. Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:457
+#: lexer.ll:468
 #, fuzzy, c-format
 msgid "invalid character: `%c'"
 msgstr "carattere illegale: `%c'"
 
-#: lexer.ll:538
+#: lexer.ll:554
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "stringa di escape sconosciuta: `\\%s'"
 
-#: lexer.ll:617
+#: lexer.ll:639
 #, c-format
 msgid "Oldest supported input version: %s"
 msgstr ""
 
-#: lexer.ll:629
+#: lexer.ll:651
 #, fuzzy, c-format
 msgid "incorrect lilypond version: %s (%s, %s)"
 msgstr "versione di mudela errata: %s (%s, %s)"
 
-#: lexer.ll:630
+#: lexer.ll:652
 msgid "Consider converting the input with the convert-ly script"
 msgstr ""
 
-#: lilypond-item.cc:161
-#, c-format
-msgid "#32 in quarter: %d"
-msgstr "#32 in un quarto: %d"
+#, fuzzy
+#~ msgid "Cleaning `%s'..."
+#~ msgstr "Genero le voci..."
 
-#: lilypond-score.cc:108
-#, fuzzy, c-format
-msgid "LY output to `%s'..."
-msgstr "L'output MIDI è inviato a %s..."
+#, fuzzy
+#~ msgid "writing header field `%s' to `%s'..."
+#~ msgstr "scrivo il file delle dipendenze: `%s'..."
 
-#: lilypond-score.cc:119
-#, fuzzy, c-format
-msgid "track %d:"
-msgstr "traccia "
+#~ msgid "#32 in quarter: %d"
+#~ msgstr "#32 in un quarto: %d"
 
-#: lilypond-score.cc:155
-msgid "Processing..."
-msgstr "Elaboro..."
+#, fuzzy
+#~ msgid "LY output to `%s'..."
+#~ msgstr "L'output MIDI è inviato a %s..."
 
-#: lilypond-score.cc:164
-msgid "Creating voices..."
-msgstr "Genero le voci..."
+#, fuzzy
+#~ msgid "track %d:"
+#~ msgstr "traccia "
 
-#: lilypond-score.cc:168
-msgid "track "
-msgstr "traccia "
+#~ msgid "Processing..."
+#~ msgstr "Elaboro..."
 
-#: lilypond-score.cc:177
-msgid "NOT Filtering tempo..."
-msgstr "NON filtro il tempo..."
+#~ msgid "Creating voices..."
+#~ msgstr "Genero le voci..."
 
-#: lilypond-score.cc:186
-msgid "NOT Quantifying columns..."
-msgstr "NON quantifico le colonne..."
+#~ msgid "track "
+#~ msgstr "traccia "
 
-#: lilypond-score.cc:190
-msgid "Quantifying columns..."
-msgstr "Quantifico le colonne..."
+#~ msgid "NOT Filtering tempo..."
+#~ msgstr "NON filtro il tempo..."
 
-#: lilypond-score.cc:223
-msgid "Settling columns..."
-msgstr "Sistemo le colonne..."
+#~ msgid "NOT Quantifying columns..."
+#~ msgstr "NON quantifico le colonne..."
 
-#: lilypond-staff.cc:209
-msgid "% MIDI copyright:"
-msgstr ""
+#~ msgid "Quantifying columns..."
+#~ msgstr "Quantifico le colonne..."
+
+#~ msgid "Settling columns..."
+#~ msgstr "Sistemo le colonne..."
 
-#: lilypond-staff.cc:210
 #, fuzzy
-msgid "% MIDI instrument:"
-msgstr "% strumento:"
+#~ msgid "% MIDI instrument:"
+#~ msgstr "% strumento:"
 
-#: lilypond-stream.cc:37
-#, c-format
-msgid "lily indent level: %d"
-msgstr "livello di indentazione di lili: %d"
+#~ msgid "lily indent level: %d"
+#~ msgstr "livello di indentazione di lili: %d"
 
-#. Maybe better not to translate these?
-#: lilypond-stream.cc:83
-msgid "% Creator: "
-msgstr "% Autore: "
+#~ msgid "% Creator: "
+#~ msgstr "% Autore: "
 
-#: lilypond-stream.cc:88
-msgid "% Automatically generated"
-msgstr "% Generato automaticamente"
+#~ msgid "% Automatically generated"
+#~ msgstr "% Generato automaticamente"
 
-#: lilypond-stream.cc:97
-#, c-format
-msgid "% from input file: "
-msgstr "% dal file di input: "
+#~ msgid "% from input file: "
+#~ msgstr "% dal file di input: "
 
-#: main.cc:94
 #, fuzzy
-msgid "write exact durations, e.g.: a4*385/384"
-msgstr "  -b, --no-quantify      scrive durate esatte,  p.es.: a4*385/384\n"
+#~ msgid "write exact durations, e.g.: a4*385/384"
+#~ msgstr "  -b, --no-quantify      scrive durate esatte,  p.es.: a4*385/384\n"
 
-#: main.cc:95
 #, fuzzy
-msgid "enable debugging output"
-msgstr "  -D, --debug            abilita l'output di debugging\n"
-
-#: main.cc:97
-msgid "ACC[:MINOR]"
-msgstr ""
+#~ msgid "enable debugging output"
+#~ msgstr "  -D, --debug            abilita l'output di debugging\n"
 
-#: main.cc:97
 #, fuzzy
-msgid "set key: ACC +sharps/-flats; :1 minor"
-msgstr ""
-" -k, --key=ACC[:MINOR]  imposta l'armatura: ACC +diesis/-bemolli; :1 minore\n"
+#~ msgid "don't output tuplets, double dots or rests, smallest is 32"
+#~ msgstr ""
+#~ "  -n, --no-silly         assume che non ci siano gruppetti o doppi punti, "
+#~ "la figura più piccola è 32\n"
 
-#: main.cc:98
 #, fuzzy
-msgid "don't output tuplets, double dots or rests, smallest is 32"
-msgstr ""
-"  -n, --no-silly         assume che non ci siano gruppetti o doppi punti, la "
-"figura più piccola è 32\n"
+#~ msgid "set FILE as default output"
+#~ msgstr "  -o, --output=FILE      set FILE come output di default\n"
 
-#: main.cc:99
 #, fuzzy
-msgid "set FILE as default output"
-msgstr "  -o, --output=FILE      set FILE come output di default\n"
+#~ msgid "set smallest duration"
+#~ msgstr "indicazione durata priva di senso"
 
-#: main.cc:100
-msgid "don't output tuplets"
-msgstr ""
-
-#: main.cc:101
-msgid "be quiet"
-msgstr ""
-
-#: main.cc:102
-msgid "don't output rests or skips"
-msgstr ""
-
-#: main.cc:103
-msgid "DUR"
-msgstr ""
-
-#: main.cc:103
 #, fuzzy
-msgid "set smallest duration"
-msgstr "indicazione durata priva di senso"
+#~ msgid "don't timestamp the output"
+#~ msgstr ""
+#~ "  -T, --no-timestamps    non inserisce marcatori temporali nell'output\n"
 
-#: main.cc:104
 #, fuzzy
-msgid "don't timestamp the output"
-msgstr ""
-"  -T, --no-timestamps    non inserisce marcatori temporali nell'output\n"
+#~ msgid "assume no double dotted notes"
+#~ msgstr ""
+#~ " -x, --no-double-dots   assume che non ci siano note con doppio punto\n"
 
-#: main.cc:106
-msgid "be verbose"
-msgstr ""
+#~ msgid "Usage: %s [OPTION]... [FILE]"
+#~ msgstr "Uso: %s [OPZIONE... [FILE]"
 
-#: main.cc:108
 #, fuzzy
-msgid "assume no double dotted notes"
-msgstr ""
-" -x, --no-double-dots   assume che non ci siano note con doppio punto\n"
+#~ msgid "Translate MIDI-file to lilypond"
+#~ msgstr "Traduce un file midi in mudela"
 
-#: main.cc:115
-#, c-format
-msgid "Usage: %s [OPTION]... [FILE]"
-msgstr "Uso: %s [OPZIONE... [FILE]"
-
-#: main.cc:117
-#, fuzzy
-msgid "Translate MIDI-file to lilypond"
-msgstr "Traduce un file midi in mudela"
-
-#: main.cc:131
-#, c-format
-msgid "no_double_dots: %d\n"
-msgstr ""
-
-#: main.cc:133
-#, c-format
-msgid "no_rests: %d\n"
-msgstr ""
-
-#: main.cc:135
-#, c-format
-msgid "no_quantify_b_s: %d\n"
-msgstr ""
-
-#: main.cc:137
-#, c-format
-msgid "no_smaller_than: %d (1/%d)\n"
-msgstr ""
+#~ msgid "zero length string encountered"
+#~ msgstr "ho incostrato una striga di lunghezza nulla"
 
-#: main.cc:140
-#, c-format
-msgid "no_tuplets: %d\n"
-msgstr ""
+#~ msgid "MIDI header expected"
+#~ msgstr "mi aspettavo un header MIDI"
 
-#: midi-parser.cc:64
-msgid "zero length string encountered"
-msgstr "ho incostrato una striga di lunghezza nulla"
-
-#: midi-score-parser.cc:44
-msgid "MIDI header expected"
-msgstr "mi aspettavo un header MIDI"
-
-#: midi-score-parser.cc:49
 #, fuzzy
-msgid "invalid header length"
-msgstr "Lunghezza dell'header non valida"
+#~ msgid "invalid header length"
+#~ msgstr "Lunghezza dell'header non valida"
 
-#: midi-score-parser.cc:52
 #, fuzzy
-msgid "invalid MIDI format"
-msgstr "evento MIDI non valido"
+#~ msgid "invalid MIDI format"
+#~ msgstr "evento MIDI non valido"
 
-#: midi-score-parser.cc:55
 #, fuzzy
-msgid "invalid number of tracks"
-msgstr "Numero di tracce non valido"
+#~ msgid "invalid number of tracks"
+#~ msgstr "Numero di tracce non valido"
 
-#: midi-score-parser.cc:58
 #, fuzzy
-msgid "can't handle non-metrical time"
-msgstr "tempo non metrico"
-
-#: midi-track-parser.cc:68
-#, c-format
-msgid "Junking note-end event: channel = %d, pitch = %d"
-msgstr ""
+#~ msgid "can't handle non-metrical time"
+#~ msgstr "tempo non metrico"
 
-#: midi-track-parser.cc:124
-msgid "invalid running status"
-msgstr "stato di eseguzione non valido"
+#~ msgid "invalid running status"
+#~ msgstr "stato di eseguzione non valido"
 
-#: midi-track-parser.cc:328
-msgid "unimplemented MIDI meta-event"
-msgstr "meta-evento MIDI non implementato"
+#~ msgid "unimplemented MIDI meta-event"
+#~ msgstr "meta-evento MIDI non implementato"
 
-#: midi-track-parser.cc:333
-msgid "invalid MIDI event"
-msgstr "evento MIDI non valido"
+#~ msgid "invalid MIDI event"
+#~ msgstr "evento MIDI non valido"
 
-#: midi-track-parser.cc:348
-msgid "MIDI track expected"
-msgstr "mi spettavo una traccia MIDI"
+#~ msgid "MIDI track expected"
+#~ msgstr "mi spettavo una traccia MIDI"
 
-#: midi-track-parser.cc:353
-msgid "invalid track length"
-msgstr "lunghezza della traccia non valida"
+#~ msgid "invalid track length"
+#~ msgstr "lunghezza della traccia non valida"
 
 #, fuzzy
 #~ msgid "no Grace context available"
diff -purN ../lilypond-1.5.28/po/ja.po ./po/ja.po
--- ../lilypond-1.5.28/po/ja.po	Sun Sep 16 17:09:58 2001
+++ ./po/ja.po	Thu Jan 31 13:17:54 2002
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.2.17\n"
-"POT-Creation-Date: 2001-09-09 17:41+0200\n"
+"POT-Creation-Date: 2002-01-29 23:08+0100\n"
 "PO-Revision-Date: 2000-03-29 20:50+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -13,303 +13,348 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ly2dvi.py:115
-msgid "Generate .dvi with LaTeX for LilyPond"
-msgstr ""
-
-#: data-file.cc:118 input.cc:85 ly2dvi.py:197 midi-parser.cc:100 mup2ly.py:93
-#: update-lily.py:119 warn.cc:23
+#: data-file.cc:118 input.cc:85 ly2dvi.py:113 midi2ly.py:148
+#: update-lily.py:136 warn.cc:23
 msgid "warning: "
 msgstr "·Ù¹ð: "
 
-#: input.cc:90 ly2dvi.py:212 ly2dvi.py:641 ly2dvi.py:659 ly2dvi.py:850
-#: mup2ly.py:98 mup2ly.py:188 update-lily.py:124 update-lily.py:212 warn.cc:9
-#: warn.cc:17
+#: input.cc:90 ly2dvi.py:116 ly2dvi.py:132 ly2dvi.py:691 ly2dvi.py:709
+#: midi2ly.py:163 midi2ly.py:1012 midi2ly.py:1081 update-lily.py:151
+#: update-lily.py:426 warn.cc:9 warn.cc:17
 msgid "error: "
 msgstr "¥¨¥é¡¼: "
 
-#: ly2dvi.py:213 mup2ly.py:100 update-lily.py:126
+#: ly2dvi.py:133 midi2ly.py:164 update-lily.py:152
 #, fuzzy
 msgid "Exiting ... "
 msgstr "¹Ô ..."
 
-#: ly2dvi.py:271 mup2ly.py:158 update-lily.py:184
+#: ly2dvi.py:191 midi2ly.py:222 update-lily.py:210
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE"
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]"
 
-#: ly2dvi.py:275 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:188
+#: ly2dvi.py:195 main.cc:151 midi2ly.py:226 update-lily.py:214
 msgid "Options:"
 msgstr "¥ª¥×¥·¥ç¥ó:"
 
-#: ly2dvi.py:279 main.cc:124 main.cc:166 mup2ly.py:168 update-lily.py:192
+#: ly2dvi.py:199 main.cc:168 midi2ly.py:230 update-lily.py:218
 #, c-format
 msgid "Report bugs to %s"
 msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø"
 
-#: ly2dvi.py:307 mup2ly.py:185 update-lily.py:209
+#: ly2dvi.py:227 midi2ly.py:258 update-lily.py:246
 #, fuzzy, c-format
 msgid "Invoking `%s'"
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: ly2dvi.py:311 mup2ly.py:188 update-lily.py:212
+#: ly2dvi.py:231 midi2ly.py:262 update-lily.py:250
 #, c-format
 msgid "command exited with value %d"
 msgstr ""
 
-#: ly2dvi.py:313 mup2ly.py:190 update-lily.py:214
+#: ly2dvi.py:233 midi2ly.py:264 update-lily.py:252
 msgid "(ignored)"
 msgstr ""
 
-#: ly2dvi.py:323
+#: ly2dvi.py:243 midi2ly.py:274 update-lily.py:262
 #, fuzzy, c-format
 msgid "Cleaning %s..."
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: ly2dvi.py:338 mup2ly.py:214 update-lily.py:238
-#, fuzzy, c-format
-msgid "no such setting: %s"
-msgstr "¤½¤ÎÍÍ¤Ê³Ú´ï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
+#: ly2dvi.py:301
+msgid "Generate .dvi with LaTeX for LilyPond"
+msgstr ""
 
-#: ly2dvi.py:351 main.cc:113
+#: ly2dvi.py:304 main.cc:115
 msgid "write Makefile dependencies for every input file"
 msgstr "Á´¤Æ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Î Makefile °ÍÂ¸´Ø·¸¤ò½ñ¤­¹þ¤à"
 
-#: ly2dvi.py:352 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:252
+#: ly2dvi.py:305 main.cc:111 midi2ly.py:98 mup2ly.py:74 update-lily.py:86
 msgid "this help"
 msgstr "¤³¤Î¥Ø¥ë¥×"
 
-#: ly2dvi.py:353 main.cc:111 main.cc:116
+#: ly2dvi.py:306 main.cc:113 main.cc:118
 msgid "DIR"
 msgstr "DIR"
 
-#: ly2dvi.py:353
+#: ly2dvi.py:306
 #, fuzzy
 msgid "add DIR to LilyPond's search path"
 msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄÉ²Ã"
 
-#: ly2dvi.py:354
+#: ly2dvi.py:307
 #, c-format
 msgid "keep all output, and name the directory %s.dir"
 msgstr ""
 
-#: ly2dvi.py:355
+#: ly2dvi.py:308
 msgid "don't run LilyPond"
 msgstr ""
 
-#: ly2dvi.py:356 main.cc:114
+#: ly2dvi.py:309 main.cc:116
 msgid "produce MIDI output only"
 msgstr "MIDI ½ÐÎÏ¤ÎÀ¸À®¤Î¤ß"
 
-#: ly2dvi.py:357 ly2dvi.py:358 main.cc:99 main.cc:112 main.cc:115
+#: ly2dvi.py:310 ly2dvi.py:311 main.cc:114 main.cc:117 midi2ly.py:100
 msgid "FILE"
 msgstr "FILE"
 
-#: ly2dvi.py:357
+#: ly2dvi.py:310 midi2ly.py:100
 #, fuzzy
 msgid "write ouput to FILE"
 msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎÏ¤ò½ñ¤­¹þ¤à"
 
-#: ly2dvi.py:358
+#: ly2dvi.py:311
 msgid "find pfa fonts used in FILE"
 msgstr ""
 
-#: ly2dvi.py:360
+#: ly2dvi.py:313
 #, fuzzy
 msgid "generate PostScript output"
 msgstr "À©¸Â¤ò´ËÏÂ"
 
-#: ly2dvi.py:361
+#: ly2dvi.py:314
 msgid "KEY=VAL"
 msgstr ""
 
-#: ly2dvi.py:361
+#: ly2dvi.py:314
 msgid "change global setting KEY to VAL"
 msgstr ""
 
-#: ly2dvi.py:362 main.cc:119 mup2ly.py:1120 update-lily.py:256
+#: ly2dvi.py:315 main.cc:121 midi2ly.py:103 mup2ly.py:77 update-lily.py:90
 #, fuzzy
 msgid "verbose"
 msgstr "¾ÜºÙ¤Ê¾ðÊó¤òÉ½¼¨¤·¤Þ¤¹"
 
-#: ly2dvi.py:363 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:257
+#: ly2dvi.py:316 main.cc:120 midi2ly.py:104 mup2ly.py:78 update-lily.py:91
 msgid "print version number"
 msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òÉ½¼¨"
 
-#: ly2dvi.py:364 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:259
+#: ly2dvi.py:317 main.cc:122 midi2ly.py:105 mup2ly.py:79 update-lily.py:93
 msgid "show warranty and copyright"
 msgstr "ÊÝ¾Ú¤ÈÃøºî¸¢¤Ë¤Ä¤¤¤ÆÉ½¼¨¤¹¤ë"
 
-#: ly2dvi.py:386 ly2dvi.py:582 ly2dvi.py:607
+#: ly2dvi.py:406
+#, fuzzy, c-format
+msgid "no such setting: %s"
+msgstr "¤½¤ÎÍÍ¤Ê³Ú´ï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
+
+#: ly2dvi.py:434 ly2dvi.py:632 ly2dvi.py:657
 #, fuzzy, c-format
 msgid "Running %s..."
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: ly2dvi.py:399
+#: ly2dvi.py:449
 #, fuzzy, c-format
 msgid "Analyzing %s..."
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: ly2dvi.py:455
+#: ly2dvi.py:505
 #, c-format
 msgid "no lilypond output found for %s"
 msgstr ""
 
-#: ly2dvi.py:497
+#: ly2dvi.py:547
 #, fuzzy, c-format
 msgid "invalid value: %s"
 msgstr "Ìµ¸ú¤ÊÊ¸»ú: `%c'"
 
-#: ly2dvi.py:641
+#: ly2dvi.py:691
 #, fuzzy, c-format
 msgid "not a PostScript file: `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
 
-#: ly2dvi.py:659
+#: ly2dvi.py:709 midi2ly.py:1012 update-lily.py:426
 #, c-format
 msgid "getopt says: `%s'"
 msgstr ""
 
-#: ly2dvi.py:826 scores.cc:44
+#: ly2dvi.py:820
+#, fuzzy, c-format
+msgid "filename should not contain spaces: `%s'"
+msgstr "´û¤Ë´Þ¤ó¤Ç¤¤¤Þ¤¹: `%s'"
+
+#: ly2dvi.py:885 scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to `%s'..."
 msgstr "%s ¤Ø paper ½ÐÎÏ..."
 
-#: ly2dvi.py:837
+#: ly2dvi.py:896 midi2ly.py:996
 #, fuzzy, c-format
 msgid "%s output to `%s'..."
 msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ"
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:839
-#: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
+#: includable-lexer.cc:49 lily-guile.cc:134 ly2dvi.py:898 scores.cc:136
+#: scores.cc:142
 #, fuzzy, c-format
 msgid "can't find file: `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: ly2dvi.py:850
+#: ly2dvi.py:909 midi2ly.py:1081
 msgid "no files specified on command line."
 msgstr ""
 
-#: mup2ly.py:51
-msgid "Convert mup to ly"
+#: midi2ly.py:92
+msgid "Convert MIDI to LilyPond source"
 msgstr ""
 
-#: mup2ly.py:166
-#, c-format
-msgid "%s is far from completed.  Not all constructs are recognised."
+#: midi2ly.py:95
+msgid "print absolute pitches"
 msgstr ""
 
-#: mup2ly.py:964
-#, fuzzy, c-format
-msgid "no such context: %s"
-msgstr "¤½¤ÎÍÍ¤Ê³Ú´ï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
+#: midi2ly.py:96 midi2ly.py:101
+msgid "DUR"
+msgstr "DUR"
+
+#: midi2ly.py:96
+msgid "quantise note durations on DUR"
+msgstr ""
+
+#: midi2ly.py:97
+msgid "print explicit durations"
+msgstr ""
+
+#: midi2ly.py:99
+#, fuzzy
+msgid "ALT[:MINOR]"
+msgstr "ACC[:MINOR]"
+
+#: midi2ly.py:99
+#, fuzzy
+msgid "set key: ALT=+sharps|-flats; MINOR=1"
+msgstr "Ä´¤òÀßÄê: ACC +¥·¥ã¡¼¥×/-¥Õ¥é¥Ã¥È :1 Ã»Ä´"
+
+#: midi2ly.py:101
+msgid "quantise note starts on DUR"
+msgstr ""
+
+#: midi2ly.py:102
+msgid "DUR*NUM/DEN"
+msgstr ""
+
+#: midi2ly.py:102
+msgid "allow tuplet durations DUR*NUM/DEN"
+msgstr ""
+
+#: midi2ly.py:106
+msgid "treat every text as a lyric"
+msgstr ""
+
+#: midi2ly.py:1027
+msgid "Example:"
+msgstr ""
 
-#: mup2ly.py:1115
+#: mup2ly.py:69
+msgid "Convert mup to LilyPond source"
+msgstr ""
+
+#: mup2ly.py:72
 msgid "debug"
 msgstr ""
 
-#: mup2ly.py:1116
+#: mup2ly.py:73
 msgid "define macro NAME [optional expansion EXP]"
 msgstr ""
 
-#: main.cc:115 mup2ly.py:1118
+#: main.cc:117 mup2ly.py:75
 #, fuzzy
 msgid "write output to FILE"
 msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎÏ¤ò½ñ¤­¹þ¤à"
 
-#: mup2ly.py:1119
+#: mup2ly.py:76
 msgid "only pre-process"
 msgstr ""
 
-#: mup2ly.py:1200
+#: mup2ly.py:827
+#, fuzzy, c-format
+msgid "no such context: %s"
+msgstr "¤½¤ÎÍÍ¤Ê³Ú´ï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
+
+#: mup2ly.py:1051
 #, fuzzy, c-format
 msgid "Processing `%s'..."
 msgstr "½èÍýÃæ..."
 
-#: mup2ly.py:1219
+#: mup2ly.py:1070
 #, fuzzy, c-format
 msgid "Writing `%s'..."
 msgstr "¹Ô ..."
 
-#: update-lily.py:52
+#: update-lily.py:75
 msgid "Fetch and rebuild from latest source package"
 msgstr ""
 
-#: update-lily.py:224
-#, fuzzy, c-format
-msgid "Cleaning `%s'..."
-msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
-
-#: update-lily.py:244
+#: update-lily.py:78
 #, c-format
 msgid "unpack and build in DIR [%s]"
 msgstr ""
 
-#: update-lily.py:245
+#: update-lily.py:79
 msgid "execute COMMAND, subtitute:"
 msgstr ""
 
-#: update-lily.py:246
+#: update-lily.py:80
 msgid "%b: build root"
 msgstr ""
 
-#: update-lily.py:247
+#: update-lily.py:81
 #, c-format
 msgid "%n: package name"
 msgstr ""
 
-#: update-lily.py:248
+#: update-lily.py:82
 #, fuzzy
 msgid "%r: release directory"
 msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
-#: update-lily.py:249
+#: update-lily.py:83
 msgid "%t: tarball"
 msgstr ""
 
-#: update-lily.py:250
+#: update-lily.py:84
 msgid "%v: package version"
 msgstr ""
 
-#: update-lily.py:253
+#: update-lily.py:87
 #, c-format
 msgid "keep all output, and name the directory %s"
 msgstr ""
 
-#: update-lily.py:254
+#: update-lily.py:88
 msgid "upon failure notify EMAIL[,EMAIL]"
 msgstr ""
 
-#: update-lily.py:255
+#: update-lily.py:89
 msgid "remove previous build"
 msgstr ""
 
-#: update-lily.py:258
+#: update-lily.py:92
 #, c-format
 msgid "fetch and build URL [%s]"
 msgstr ""
 
-#: update-lily.py:366
+#: update-lily.py:397
 #, fuzzy, c-format
 msgid "Listing `%s'..."
 msgstr "¹Ô ..."
 
-#: update-lily.py:427
+#: update-lily.py:465
 #, c-format
 msgid "latest is: %s"
 msgstr ""
 
-#: update-lily.py:428
+#: update-lily.py:466
 #, c-format
 msgid "relax, %s is up to date"
 msgstr ""
 
-#: update-lily.py:436 update-lily.py:449
+#: update-lily.py:474 update-lily.py:487
 #, fuzzy, c-format
 msgid "Fetching `%s'..."
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: update-lily.py:458
+#: update-lily.py:496
 #, fuzzy, c-format
 msgid "Building `%s'..."
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
@@ -352,8 +397,8 @@ msgstr "°ÌÃÖ¤¬È½¤ê¤Þ¤»¤ó"
 msgid "can't map file"
 msgstr "¥Õ¥¡¥¤¥ë¤ò¥Þ¥Ã¥×¤Ç¤­¤Þ¤»¤ó"
 
-#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45
-#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
+#: mapped-file-storage.cc:87 scores.cc:48 simple-file-storage.cc:44
+#: streams.cc:37 text-stream.cc:23
 #, fuzzy, c-format
 msgid "can't open file: `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
@@ -375,6 +420,16 @@ msgstr "¥×¥í¥°¥é¥à¾å¤Î¥¨¥é¡¼: "
 msgid " (Continuing; cross thumbs)"
 msgstr " (Â³¤±¤Þ¤¹ -- cross thumbs)"
 
+#: accidental-engraver.cc:136
+#, fuzzy, c-format
+msgid "unknown accidental typesetting: %s"
+msgstr "Ì¤ÃÎ¤Î¥¨¥¹¥±¡¼¥×Ê¸»úÎó: `\\%s'"
+
+#: accidental-engraver.cc:139
+#, c-format
+msgid "Accidental typesetting must be pair: %s"
+msgstr ""
+
 #: afm.cc:59
 #, fuzzy, c-format
 msgid "can't find character number: %d"
@@ -434,41 +489,51 @@ msgstr "Äü¤á¤Þ¤·¤¿"
 msgid "Can't switch translators, I'm there already"
 msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤òÀÚ¤êÂØ¤¨¤é¤ì¤Þ¤»¤ó¡£´û¤Ë¤½¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: beam-engraver.cc:91 beam-engraver.cc:124
+#: bar-check-iterator.cc:58
+#, c-format
+msgid "barcheck failed at: %s"
+msgstr "¾®Àá¥Á¥§¥Ã¥¯¤¬¼ºÇÔ: %s"
+
+#: beam-engraver.cc:93 beam-engraver.cc:126
 msgid "can't find start of beam"
 msgstr ""
 
-#: beam-engraver.cc:158
+#: beam-engraver.cc:150
 #, fuzzy
 msgid "already have a beam"
 msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹"
 
-#: beam-engraver.cc:222
+#: beam-engraver.cc:216
 #, fuzzy
 msgid "unterminated beam"
 msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó"
 
-#: beam-engraver.cc:255 chord-tremolo-engraver.cc:195
+#: beam-engraver.cc:249 chord-tremolo-engraver.cc:193
 #, fuzzy
 msgid "stem must have Rhythmic structure"
 msgstr "ÉäÈø¤Ï¥ê¥º¥à¹½Â¤¤ò»ý¤¿¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: beam-engraver.cc:267
+#: beam-engraver.cc:261
 #, fuzzy
 msgid "stem doesn't fit in beam"
 msgstr "ÉäÈø¤¬³Ã¤ÎÃæ¤Ë¤ª¤µ¤Þ¤ê¤Þ¤»¤ó"
 
-#: beam-engraver.cc:268
+#: beam-engraver.cc:262
 #, fuzzy
 msgid "beam was started here"
 msgstr "³Ã¤Ï¤³¤³¤«¤é³«»Ï¤µ¤ì¤Þ¤·¤¿"
 
-#: beam.cc:86
+#: beam.cc:93
 #, fuzzy
-msgid "beam has less than two stems"
+msgid "beam has less than two visible stems"
 msgstr "³Ã¤¬Æó¤ÄÌ¤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿"
 
-#: beam.cc:637
+#: beam.cc:98
+#, fuzzy
+msgid "Beam has less than two stems. Removing beam."
+msgstr "³Ã¤¬Æó¤ÄÌ¤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿"
+
+#: beam.cc:660
 msgid "weird beam vertical offset"
 msgstr "¿âÄ¾Êý¸þ¤Î°ÌÃÖ¤È¤·¤Æ¤ª¤«¤·¤Ê³Ã"
 
@@ -496,7 +561,7 @@ msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤½¤Î¤â¤Î¤Ç¤¹"
 msgid "none of these in my family"
 msgstr "¥Õ¥¡¥ß¥ê¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó"
 
-#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192
+#: chord-tremolo-engraver.cc:139 percent-repeat-engraver.cc:182
 #, fuzzy
 msgid "unterminated chord tremolo"
 msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó"
@@ -516,7 +581,7 @@ msgstr "Ìµ¸ú¤Ê°ú¤­»»: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr "Ìµ¸ú¤ÊÅ¾²ó¥Ô¥Ã¥Á: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
 
-#: collision.cc:245
+#: collision.cc:281
 msgid "Too many clashing notecolumns.  Ignoring them."
 msgstr "Äà¤ê¹ç¤ï¤Ê¤¤²»Éä¤¬Â¿¤¹¤®¤Þ¤¹¡£¤½¤ì¤é¤òÌµ»ë¤·¤Þ¤¹¡£"
 
@@ -524,31 +589,31 @@ msgstr "Äà¤ê¹ç¤ï¤Ê¤¤²»Éä¤¬Â¿¤¹¤®¤Þ¤¹¡£¤½
 msgid "NaN"
 msgstr "NaN"
 
-#: dynamic-engraver.cc:197 span-dynamic-performer.cc:86
+#: dynamic-engraver.cc:195 span-dynamic-performer.cc:82
 #, fuzzy
 msgid "can't find start of (de)crescendo"
 msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: dynamic-engraver.cc:222
+#: dynamic-engraver.cc:220
 #, fuzzy
 msgid "already have a crescendo"
 msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹"
 
-#: dynamic-engraver.cc:223
+#: dynamic-engraver.cc:221
 #, fuzzy
 msgid "already have a decrescendo"
 msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹"
 
-#: dynamic-engraver.cc:317
+#: dynamic-engraver.cc:315
 #, fuzzy
 msgid "unterminated (de)crescendo"
 msgstr "½ªÎ»¤·¤Æ¤¤¤Ê¤¤¥¯¥ì¥Ã¥·¥§¥ó¥É"
 
-#: extender-engraver.cc:97
+#: extender-engraver.cc:96
 msgid "unterminated extender"
 msgstr "½ªÃ¼¤Î¤Ê¤¤¥¨¥¯¥¹¥Æ¥ó¥À"
 
-#: extender-engraver.cc:109
+#: extender-engraver.cc:108
 msgid "Nothing to connect extender to on the left.  Ignoring extender request."
 msgstr "¥¨¥¯¥¹¥Æ¥ó¥À¤¬º¸Â¦¤Ë¤Ä¤Ê¤¬¤ê¤Þ¤»¤ó¡£¥¨¥¯¥¹¥Æ¥ó¥ÀÍ×µá¤òÌµ»ë¤·¤Þ¤¹¡£"
 
@@ -560,7 +625,7 @@ msgstr "È¿Éüµ­¹æ¤òÉ½¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»
 msgid "couldn't find any font satisfying "
 msgstr ""
 
-#: gourlay-breaking.cc:157
+#: gourlay-breaking.cc:168
 msgid "No feasible line breaking found"
 msgstr ""
 
@@ -573,23 +638,23 @@ msgstr ""
 msgid "crescendo too small"
 msgstr "¥¯¥ì¥Ã¥·¥§¥ó¥É"
 
-#: hyphen-engraver.cc:90
+#: hyphen-engraver.cc:89
 msgid "unterminated hyphen"
 msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó"
 
-#: hyphen-engraver.cc:102
+#: hyphen-engraver.cc:101
 msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen request."
 msgstr "º¸Â¦¤Ë·Ò¤²¤ë¥Ï¥¤¥Õ¥ó¤¬¤¢¤ê¤Þ¤»¤ó¡£¥Ï¥¤¥Õ¥ó¤ÎÍ×µá¤òÌµ»ë¤·¤Þ¤¹"
 
-#: key-engraver.cc:99
+#: key-engraver.cc:93
 msgid "Conflicting key signatures found."
 msgstr ""
 
-#: key-engraver.cc:100
+#: key-engraver.cc:94
 msgid "This was the other key definition."
 msgstr ""
 
-#: key-performer.cc:77
+#: key-performer.cc:91
 msgid "FIXME: key change merge"
 msgstr "FIXME: ¥­¡¼ÊÑ¹¹¤Î¥Þ¡¼¥¸"
 
@@ -598,7 +663,7 @@ msgstr "FIXME: ¥­¡¼ÊÑ¹¹¤Î¥Þ¡¼¥¸"
 msgid "Kpathsea couldn't find TFM file `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: lily-guile.cc:141
+#: lily-guile.cc:136
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(ÆÉ¹þ¥Ñ¥¹: `%s')"
@@ -608,12 +673,12 @@ msgstr "(ÆÉ¹þ¥Ñ¥¹: `%s')"
 msgid "Element count %d."
 msgstr ""
 
-#: line-of-score.cc:313 paper-score.cc:77
+#: line-of-score.cc:325 paper-score.cc:76
 #, c-format
 msgid "Element count %d "
 msgstr ""
 
-#: line-of-score.cc:327
+#: line-of-score.cc:339
 msgid "Calculating column positions..."
 msgstr "¥«¥é¥à°ÌÃÖ¤ò·×»»Ãæ..."
 
@@ -626,63 +691,63 @@ msgid "Huh? Melismatic note found to hav
 msgstr ""
 
 #. print example usage:  lilypond -e "(set-lily-option 'help 0)" ?
-#: main.cc:105
+#: main.cc:107
 msgid "EXPR"
 msgstr ""
 
-#: main.cc:105
+#: main.cc:107
 msgid "evalute EXPR as Scheme after .scm init is read"
 msgstr ""
 
 #. another bug in option parser: --output=foe is taken as an abbreviation
 #. for --output-format
-#: main.cc:108
+#: main.cc:110
 msgid "EXT"
 msgstr "EXT"
 
-#: main.cc:108
+#: main.cc:110
 #, fuzzy
 msgid "use output format EXT (tex [default], pdftex, ps, scm or as)"
 msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È EXT ¤ò»È¤¦"
 
-#: main.cc:110
+#: main.cc:112
 #, fuzzy
 msgid "FIELD"
 msgstr "FILE"
 
-#: main.cc:110
+#: main.cc:112
 msgid "write header field to BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:111
+#: main.cc:113
 msgid "add DIR to search path"
 msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄÉ²Ã"
 
-#: main.cc:112
+#: main.cc:114
 msgid "use FILE as init file"
 msgstr "FILE ¤ò½é´ü²½¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ"
 
-#: main.cc:116
+#: main.cc:118
 msgid "prepend DIR to dependencies"
 msgstr ""
 
-#: main.cc:117
+#: main.cc:119
 msgid "inhibit file output naming and exporting"
 msgstr "Ì¾Á°ÉÕ¤±¤È¥¨¥¯¥¹¥Ý¡¼¥È¤Î½ÐÎÏ¥Õ¥¡¥¤¥ë¤òÍÞÀ©¤¹¤ë"
 
 #.
 #. No version number or newline here. It confuses help2man
 #.
-#: main.cc:137
+#: main.cc:139
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..."
 
-#: main.cc:139
+#: main.cc:141
 msgid "Typeset music and or play MIDI from FILE"
 msgstr "¥Õ¥¡¥¤¥ë¤Î³Ú¶Ê¤òÁÈÈÇ¤·¤¿¤ê¡¢MIDI ±éÁÕ¤·¤¿¤ê¤¹¤ë"
 
-#: main.cc:143
+#: main.cc:145
 msgid ""
 "LilyPond is a music typesetter.  It produces beautiful sheet music\n"
 "using a high level description file as input.  LilyPond is part of \n"
@@ -692,11 +757,11 @@ msgstr ""
 "Èþ¤·¤¤ÉèÌÌ¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£LilyPond ¤Ï GNU ¥×¥í¥¸¥§¥¯¥È¤Î°ìÉô¤Ç"
 "¤¹¡£\n"
 
-#: main.cc:153
+#: main.cc:155
 msgid "This binary was compiled with the following options:"
 msgstr "¤³¤Î¥Ð¥¤¥Ê¥ê¤Ï°Ê²¼¤Î¥ª¥×¥·¥ç¥óÉÕ¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿"
 
-#: main.cc:56 main.cc:174
+#: main.cc:176
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -712,17 +777,17 @@ msgstr ""
 "¤³¤ì¤ò²þÊÑ¤·¤¿¤ê¡¢Ê£À½¤òÇÛÉÛ¤·¤¿¤ê¤¹¤ë»ö¤Ï´¿·Þ¤µ¤ì¤Þ¤¹¡£\n"
 "`--warranty' ¥ª¥×¥·¥ç¥óÉÕ¤­¤Çµ¯Æ°¤¹¤ë¤È¡¢¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£\n"
 
-#: main.cc:63 main.cc:181 main.cc:193
+#: main.cc:183 main.cc:195
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s by"
 
-#: main.cc:191
+#: main.cc:193
 #, fuzzy
 msgid "GNU LilyPond -- The music typesetter"
 msgstr "GNU LilyPond -- The GNU Project music typesetter"
 
-#: main.cc:72 main.cc:199
+#: main.cc:201
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License version 2\n"
@@ -787,42 +852,42 @@ msgstr "ÇÏ¼¯¤²¤¿¥Ô¥Ã¥Á"
 msgid "can't find `%s' context"
 msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: music.cc:239
+#: music.cc:144
+#, c-format
+msgid "Transposition by %s makes accidental larger than two"
+msgstr "%s ¤ÎÊÑÄ´¤Ë¤è¤Ã¤Æ¡¢Æó¤Ä¤òÄ¶¤¨¤ëÇÉÀ¸²»¤¬ºî¤é¤ì¤Þ¤·¤¿"
+
+#: music.cc:249
 msgid "ly_get_mus_property (): Not a Music"
 msgstr ""
 
-#: music.cc:253
+#: music.cc:263
 msgid "ly_set_mus_property (): Not a symbol"
 msgstr ""
 
-#: music.cc:265
+#: music.cc:275
 msgid "ly_set_mus_property ():  not of type Music"
 msgstr ""
 
-#: music.cc:279
+#: music.cc:289
 msgid "ly_make_music (): Not a string"
 msgstr ""
 
-#: music.cc:299
+#: music.cc:309
 msgid "ly_music_name (): Not a music expression"
 msgstr ""
 
-#: musical-request.cc:28
-#, c-format
-msgid "Transposition by %s makes accidental larger than two"
-msgstr "%s ¤ÎÊÑÄ´¤Ë¤è¤Ã¤Æ¡¢Æó¤Ä¤òÄ¶¤¨¤ëÇÉÀ¸²»¤¬ºî¤é¤ì¤Þ¤·¤¿"
-
-#: my-lily-lexer.cc:140
+#: my-lily-lexer.cc:139
 #, c-format
 msgid "Identifier name is a keyword: `%s'"
 msgstr "¼±ÊÌ»ÒÌ¾¤Ï¥­¡¼¥ï¡¼¥É¤Ç¤¹: `%s'"
 
-#: my-lily-lexer.cc:160
+#: my-lily-lexer.cc:159
 #, c-format
 msgid "error at EOF: %s"
 msgstr "EOF ¤Î¤È¤³¤í¤Ç¥¨¥é¡¼: %s"
 
-#: midi-score-parser.cc:94 my-lily-parser.cc:47
+#: my-lily-parser.cc:47
 msgid "Parsing..."
 msgstr "¹½Ê¸²òÀÏÃæ..."
 
@@ -840,32 +905,18 @@ msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 msgid "paper output to `%s'..."
 msgstr "%s ¤Ø paper ½ÐÎÏ..."
 
-#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99
+#: paper-outputter.cc:60
 msgid ", at "
 msgstr ", at "
 
-#: paper-outputter.cc:232
-#, fuzzy, c-format
-msgid "writing header field `%s' to `%s'..."
-msgstr "°ÍÂ¸´Ø·¸¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß: `%s'..."
-
-#: paper-score.cc:80
+#: paper-score.cc:79
 msgid "Preprocessing elements..."
 msgstr "Í×ÁÇ¤òÁ°½èÍýÃæ..."
 
-#: paper-score.cc:114
+#: paper-score.cc:113
 msgid "Outputting Score, defined at: "
 msgstr "ÉèÌÌ¤ò½ÐÎÏ¤·¤Þ¤¹¡£¤³¤³¤ÇÄêµÁ: "
 
-#: paper-stream.cc:41
-#, fuzzy, c-format
-msgid "can't create directory: `%s'"
-msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
-
-#: paper-stream.cc:55
-msgid "Error syncing file (disk full?)"
-msgstr "¥Õ¥¡¥¤¥ë¤ÎÆ±Ä´¥¨¥é¡¼ (¥Ç¥£¥¹¥¯¤¬°ìÇÕ?)"
-
 #.
 #. We could change the current translator's id, but that would make
 #. errors hard to catch
@@ -882,7 +933,7 @@ msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤½¤Î¤â¤Î¤Ç¤¹"
 msgid "none of these in my family: `%s'"
 msgstr "¥Õ¥¡¥ß¥ê¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó"
 
-#: percent-repeat-engraver.cc:117
+#: percent-repeat-engraver.cc:116
 #, fuzzy
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr "¶õ¤Î¥­¡¼¤Î°·¤¤Êý¤¬È½¤ê¤Þ¤»¤ó"
@@ -900,12 +951,17 @@ msgstr "¥È¥é¥Ã¥¯ ..."
 msgid "Creator: "
 msgstr "ºî¶Ê¼Ô: "
 
-#: performance.cc:113
+#: performance.cc:103
+#, fuzzy
+msgid "at "
+msgstr ", at "
+
+#: performance.cc:114
 #, c-format
 msgid "from musical definition: %s"
 msgstr "²»³ÚÅªÄêµÁ¤è¤ê: %s"
 
-#: performance.cc:168
+#: performance.cc:169
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ"
@@ -920,8 +976,8 @@ msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼"
 msgid "can't find start of phrasing slur"
 msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154
-#: piano-pedal-performer.cc:85
+#: piano-pedal-engraver.cc:141 piano-pedal-engraver.cc:153
+#: piano-pedal-performer.cc:82
 #, fuzzy, c-format
 msgid "can't find start of piano pedal: `%s'"
 msgstr "¸Æ¤Ó½Ð¤µ¤ì¤¿Ê¸»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
@@ -930,14 +986,42 @@ msgstr "¸Æ¤Ó½Ð¤µ¤ì¤¿Ê¸»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó
 msgid "Pitch arguments out of range"
 msgstr ""
 
-#: property-engraver.cc:121
+#: porrectus.cc:34
+msgid "(left_head == 0)"
+msgstr ""
+
+#: porrectus.cc:45
+msgid "undefined left_head"
+msgstr ""
+
+#: porrectus.cc:64
+msgid "(right_head == 0)"
+msgstr ""
+
+#: porrectus.cc:75
+msgid "undefined right_head"
+msgstr ""
+
+#: porrectus.cc:164
+msgid "junking lonely porrectus"
+msgstr ""
+
+#: porrectus.cc:174
+msgid "porrectus style undefined; using mensural"
+msgstr ""
+
+#: porrectus.cc:301
+msgid "ascending vaticana style porrectus"
+msgstr ""
+
+#: property-engraver.cc:116
 #, c-format
 msgid ""
 "`%s' is deprecated.  Use\n"
 " \\property %s.%s \\override #'%s = #%s"
 msgstr ""
 
-#: property-engraver.cc:145
+#: property-engraver.cc:140
 #, fuzzy, c-format
 msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s"
 msgstr "Â°À­ÃÍ¤Ø¤Î¥¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
@@ -955,25 +1039,25 @@ msgstr "µÙÉä¤Î¾×ÆÍ¤ËÂÐ¤·¤Æ²»Éä¤¬Â¿¤¹¤®¤Þ
 msgid "Scheme options:"
 msgstr "¥ª¥×¥·¥ç¥ó:"
 
-#: score-engraver.cc:189
+#: score-engraver.cc:178
 #, c-format
 msgid "unbound spanner `%s'"
 msgstr "ÊÄ¤¸¤Æ¤¤¤Ê¤¤¥¹¥Ñ¥Ê `%s'"
 
-#: score.cc:78
+#: score.cc:88
 msgid "Interpreting music..."
 msgstr "³Ú¶Ê¤Î²ò¼áÃæ..."
 
-#: score.cc:92
+#: score.cc:102
 msgid "Need music in a score"
 msgstr "³ÚÉè¤Ë¤Ï³Ú¶Ê¤¬É¬Í×¤Ç¤¹"
 
 #. should we? hampers debugging.
-#: score.cc:105
+#: score.cc:115
 msgid "Errors found/*, not processing score*/"
 msgstr "¥¨¥é¡¼¤òÈ¯¸«/*, ³ÚÉè¤ò½èÍý¤·¤Þ¤»¤ó*/"
 
-#: score.cc:112
+#: score.cc:122
 #, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr "·Ð²á»þ´Ö: %.2f ÉÃ"
@@ -987,7 +1071,7 @@ msgstr "³ÚÉè¤Ë¥¨¥é¡¼¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹ -- 
 msgid "Now processing: `%s'"
 msgstr "Ì¤ÃÎ¤Î¥¨¥¹¥±¡¼¥×Ê¸»úÎó: `\\%s'"
 
-#: script-engraver.cc:66
+#: script-engraver.cc:65
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr "²»Àá `%s' ¤Î²ò¼áÊýË¡¤¬È½¤ê¤Þ¤»¤ó"
@@ -998,18 +1082,18 @@ msgstr "²»Àá `%s' ¤Î²ò¼áÊýË¡¤¬È½¤ê¤Þ¤»¤ó
 msgid "Separation_item:  I've been drinking too much"
 msgstr "Single_malt_grouping_item:  °û¤ß¤¹¤®¤Á¤ã¤Ã¤¿"
 
-#: simple-spacer.cc:200
+#: simple-spacer.cc:202
 #, c-format
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:125
+#: slur-engraver.cc:124
 msgid "unterminated slur"
 msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼"
 
 #. How to shut up this warning, when Voice_devnull_engraver has
 #. eaten start request?
-#: slur-engraver.cc:142
+#: slur-engraver.cc:141
 #, fuzzy
 msgid "can't find start of slur"
 msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
@@ -1018,11 +1102,11 @@ msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä
 msgid "Putting slur over rest.  Ignoring."
 msgstr "µÙÉä¤ò¤Þ¤¿¤¤¤À¥¹¥é¡¼¤¬¤¢¤ê¤Þ¤¹¡£Ìµ»ë¤·¤Þ¤¹¡£"
 
-#: slur.cc:383
+#: slur.cc:393
 msgid "Slur over rest?"
 msgstr "¥¹¥é¡¼¤¬µÙÉä¤ò¤Þ¤¿¤¤¤Ç¤¤¤ë?"
 
-#: stem-engraver.cc:115
+#: stem-engraver.cc:117
 #, c-format
 msgid "Adding note head to incompatible stem (type = %d)"
 msgstr "Ì·½â¤·¤¿ÉäÈø¤ØÉäÆ¬¤òÄÉ²Ã¤·¤Þ¤¹ (¥¿¥¤¥× = %d)"
@@ -1031,17 +1115,26 @@ msgstr "Ì·½â¤·¤¿ÉäÈø¤ØÉäÆ¬¤òÄÉ²Ã¤·¤Þ¤¹ (
 msgid "Weird stem size; check for narrow beams"
 msgstr "ÊÑ¤ÊÉäÈø¤Î¥µ¥¤¥º -- ºÙ¤¤³Ã¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤"
 
-#: text-spanner-engraver.cc:94
+#: streams.cc:33
+#, fuzzy, c-format
+msgid "can't create directory: `%s'"
+msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
+
+#: streams.cc:47
+msgid "Error syncing file (disk full?)"
+msgstr "¥Õ¥¡¥¤¥ë¤ÎÆ±Ä´¥¨¥é¡¼ (¥Ç¥£¥¹¥¯¤¬°ìÇÕ?)"
+
+#: text-spanner-engraver.cc:92
 #, fuzzy
 msgid "can't find start of text spanner"
 msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: text-spanner-engraver.cc:114
+#: text-spanner-engraver.cc:112
 #, fuzzy
 msgid "already have a text spanner"
 msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹"
 
-#: text-spanner-engraver.cc:169
+#: text-spanner-engraver.cc:167
 #, fuzzy
 msgid "unterminated text spanner"
 msgstr "½ªÃ¼¤Î¤Ê¤¤¥¨¥¯¥¹¥Æ¥ó¥À"
@@ -1065,413 +1158,327 @@ msgstr "%s: TFM ¥Õ¥¡¥¤¥ë¤Ï %u ¸Ä¤Î¥Ñ¥é¥á
 msgid "can't find ascii character: %d"
 msgstr "ascii Ê¸»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%d'"
 
-#. How to shut up this warning, when no notes appeared because
-#. they were suicided by Thread_devnull_engraver?
-#: tie-engraver.cc:220 tie-performer.cc:173
-msgid "No ties were created!"
-msgstr "ºî¤é¤ì¤¿¥¿¥¤¤¬¤¢¤ê¤Þ¤»¤ó!"
-
-#: tie-engraver.cc:240
+#: tie-engraver.cc:220
 msgid "lonely tie"
 msgstr "°ì¤Ä¤À¤±¤Î¥¿¥¤"
 
+#: tie-performer.cc:161
+msgid "No ties were created!"
+msgstr "ºî¤é¤ì¤¿¥¿¥¤¤¬¤¢¤ê¤Þ¤»¤ó!"
+
 #: time-scaled-music-iterator.cc:25
 msgid "no one to print a tuplet start bracket"
 msgstr "¥¿¥×¥ì¥Ã¥È³«»Ï¥Ö¥é¥±¥Ã¥È¤òÉ½¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: timing-translator.cc:37
-#, c-format
-msgid "barcheck failed at: %s"
-msgstr "¾®Àá¥Á¥§¥Ã¥¯¤¬¼ºÇÔ: %s"
-
-#: translator-ctors.cc:40
+#: translator-ctors.cc:61
 #, c-format
 msgid "unknown translator: `%s'"
 msgstr "È½¤é¤Ê¤¤¥È¥é¥ó¥¹¥ì¡¼¥¿: `%s'"
 
-#: translator-def.cc:99
+#: translator-def.cc:87
 msgid "Program has no such type"
 msgstr "¥×¥í¥°¥é¥à¤Ë¤Ï¤½¤ÎÍÍ¤Ê¥¿¥¤¥×¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: translator-def.cc:105
+#: translator-def.cc:93
 #, c-format
 msgid "Already contains: `%s'"
 msgstr "´û¤Ë´Þ¤ó¤Ç¤¤¤Þ¤¹: `%s'"
 
-#: translator-def.cc:106
+#: translator-def.cc:94
 #, fuzzy, c-format
 msgid "Not adding translator: `%s'"
 msgstr "È½¤é¤Ê¤¤¥È¥é¥ó¥¹¥ì¡¼¥¿: `%s'"
 
-#: translator-def.cc:224
+#: translator-def.cc:212
 #, fuzzy, c-format
 msgid "can't find: `%s'"
 msgstr "¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: translator-group.cc:145
+#: translator-group.cc:147
 #, fuzzy, c-format
 msgid "can't find or create `%s' called `%s'"
 msgstr "`%2$s' ¤Ë¸Æ¤Ð¤ì¤¿ `%1$s' ¤¬¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó"
 
-#: translator-group.cc:230
+#: translator-group.cc:232
 #, fuzzy, c-format
 msgid "can't find or create: `%s'"
 msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
-#: translator-group.cc:413
+#: translator-group.cc:407
 #, c-format
 msgid ""
 "Can't find property type-check for `%s'.  Perhaps you made a typing error? "
 "Doing assignment anyway."
 msgstr ""
 
-#: translator-group.cc:427
+#: translator-group.cc:421
 #, c-format
 msgid "Type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
 #. programming_error?
-#: translator-group.cc:446
+#: translator-group.cc:440
 msgid "ly-get-trans-property: expecting a Translator_group argument"
 msgstr ""
 
-#: volta-engraver.cc:88
+#: volta-engraver.cc:108
 msgid "No volta spanner to end"
 msgstr ""
 
-#: volta-engraver.cc:105
+#: volta-engraver.cc:125
 msgid "Already have a volta spanner.  Stopping that one prematurely."
 msgstr ""
 
-#: volta-engraver.cc:109
+#: volta-engraver.cc:129
 msgid "Also have a stopped spanner.  Giving up."
 msgstr ""
 
-#: parser.yy:121
+#: parser.yy:129
 #, c-format
 msgid "Expecting %d arguments"
 msgstr ""
 
-#: parser.yy:423
+#: parser.yy:434
 msgid "Identifier should have  alphabetic characters only"
 msgstr ""
 
-#: parser.yy:697
+#: parser.yy:715
 msgid "More alternatives than repeats.  Junking excess alternatives."
 msgstr "·«¤êÊÖ¤·¤è¤ê¤âÁªÂò»è¤¬Â¿¤¤¡£Ä¶²áÊ¬¤ò¼Î¤Æ¤Þ¤¹¡£"
 
-#: parser.yy:761
+#: parser.yy:767
 msgid "Second argument must be a symbol"
 msgstr ""
 
-#: parser.yy:766
+#: parser.yy:772
 msgid "First argument must be a procedure taking 1 argument"
 msgstr ""
 
-#: parser.yy:1298
+#: parser.yy:1315
 msgid "Expecting string as script definition"
 msgstr ""
 
-#: parser.yy:1308
+#: parser.yy:1325
 msgid "Can't specify direction for this request"
 msgstr "¤³¤ÎÍ×µá¤ËÂÐ¤¹¤ëÊý¸þ¤ò»ØÄê¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
-#: parser.yy:1433
+#: parser.yy:1451
 msgid "Expecting musical-pitch value"
 msgstr ""
 
-#: parser.yy:1444
+#: parser.yy:1462
 #, fuzzy
 msgid "Must have duration object"
 msgstr "²»Ä¹¤òºÇ¾®¤ËÀßÄê¤·¤Þ¤¹"
 
-#: parser.yy:1453 parser.yy:1461
+#: parser.yy:1471 parser.yy:1479
 msgid "Have to be in Lyric mode for lyrics"
 msgstr "²Î»ì¤Ï Lyric ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤"
 
-#: parser.yy:1614 parser.yy:1671
+#: parser.yy:1638 parser.yy:1691
 #, c-format
 msgid "not a duration: %d"
 msgstr "²»Ä¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %d"
 
-#: parser.yy:1682
+#: parser.yy:1752
 msgid "Have to be in Note mode for notes"
 msgstr "²»Éä¤Ï Note ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤"
 
-#: parser.yy:1765
+#: parser.yy:1845
 msgid "Have to be in Chord mode for chords"
 msgstr "¥³¡¼¥É¤Ï Chord ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤"
 
-#: parser.yy:1945
+#: parser.yy:2025
 msgid "need integer number arg"
 msgstr ""
 
-#: lexer.ll:174
+#: parser.yy:2097
+msgid "Suspect duration found following this beam"
+msgstr ""
+
+#: lexer.ll:175
 msgid "EOF found inside a comment"
 msgstr "¥³¥á¥ó¥ÈÆâ¤Ë EOF ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 
-#: lexer.ll:188
+#: lexer.ll:189
 msgid "\\maininput disallowed outside init files"
 msgstr "½é´ü²½¥Õ¥¡¥¤¥ë¤Î³°¤Ç¤Ï \\maininput ¤òµ­½Ò¤Ç¤­¤Þ¤»¤ó"
 
-#: lexer.ll:212
+#: lexer.ll:213
 #, fuzzy, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "Ì¤ÄêµÁ¤Î¼±ÊÌ»Ò: `%s'"
 
 #. backup rule
-#: lexer.ll:221
+#: lexer.ll:222
 msgid "Missing end quote"
 msgstr "½ªÎ»¥¯¥ª¡¼¥È¤¬¤¢¤ê¤Þ¤»¤ó"
 
 #. backup rule
-#: lexer.ll:243 lexer.ll:247
+#: lexer.ll:244 lexer.ll:248
 msgid "white expected"
 msgstr "¶õÇò¤¬É¬Í×¤Ç¤¹"
 
-#: lexer.ll:256
+#: lexer.ll:257
 msgid "Can't evaluate Scheme in safe mode"
 msgstr "°ÂÁ´¥â¡¼¥É¤Ç¤Ï Scheme ¤ÎÉ¾²Á¤ò¤Ç¤­¤Þ¤»¤ó"
 
-#: lexer.ll:349
+#: lexer.ll:358
 msgid "Brace found at end of lyric. Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:457
+#: lexer.ll:468
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "Ìµ¸ú¤ÊÊ¸»ú: `%c'"
 
-#: lexer.ll:538
+#: lexer.ll:554
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "Ì¤ÃÎ¤Î¥¨¥¹¥±¡¼¥×Ê¸»úÎó: `\\%s'"
 
-#: lexer.ll:617
+#: lexer.ll:639
 #, c-format
 msgid "Oldest supported input version: %s"
 msgstr "°ìÈÖ¸Å¤¤ÆþÎÏ²ÄÇ½¥Ð¡¼¥¸¥ç¥ó: %s"
 
-#: lexer.ll:629
+#: lexer.ll:651
 #, fuzzy, c-format
 msgid "incorrect lilypond version: %s (%s, %s)"
 msgstr "´Ö°ã¤Ã¤¿ mudela ¥Ð¡¼¥¸¥ç¥ó: %s (%s, %s)"
 
-#: lexer.ll:630
+#: lexer.ll:652
 msgid "Consider converting the input with the convert-ly script"
 msgstr ""
 
-#: lilypond-item.cc:161
-#, c-format
-msgid "#32 in quarter: %d"
-msgstr "»ÍÊ¬¤ÎÃæ¤Ë #32: %d"
+#, fuzzy
+#~ msgid "Cleaning `%s'..."
+#~ msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: lilypond-score.cc:108
-#, fuzzy, c-format
-msgid "LY output to `%s'..."
-msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ"
+#, fuzzy
+#~ msgid "writing header field `%s' to `%s'..."
+#~ msgstr "°ÍÂ¸´Ø·¸¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß: `%s'..."
 
-#: lilypond-score.cc:119
-#, c-format
-msgid "track %d:"
-msgstr "¥È¥é¥Ã¥¯ %d:"
+#~ msgid "#32 in quarter: %d"
+#~ msgstr "»ÍÊ¬¤ÎÃæ¤Ë #32: %d"
 
-#: lilypond-score.cc:155
-msgid "Processing..."
-msgstr "½èÍýÃæ..."
+#, fuzzy
+#~ msgid "LY output to `%s'..."
+#~ msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ"
 
-#: lilypond-score.cc:164
-msgid "Creating voices..."
-msgstr "²»À¼¤òºîÀ®Ãæ..."
+#~ msgid "track %d:"
+#~ msgstr "¥È¥é¥Ã¥¯ %d:"
 
-#: lilypond-score.cc:168
-msgid "track "
-msgstr "¥È¥é¥Ã¥¯ "
+#~ msgid "Processing..."
+#~ msgstr "½èÍýÃæ..."
 
-#: lilypond-score.cc:177
-msgid "NOT Filtering tempo..."
-msgstr "¥Æ¥ó¥Ý¤Î¥Õ¥£¥ë¥¿¤ò¤·¤Þ¤»¤ó..."
+#~ msgid "Creating voices..."
+#~ msgstr "²»À¼¤òºîÀ®Ãæ..."
 
-#: lilypond-score.cc:186
-msgid "NOT Quantifying columns..."
-msgstr "¥«¥é¥à¤ÎÄ¹¤µ¤òÎÌ¤ê¤Þ¤»¤ó..."
+#~ msgid "track "
+#~ msgstr "¥È¥é¥Ã¥¯ "
 
-#: lilypond-score.cc:190
-msgid "Quantifying columns..."
-msgstr "¥«¥é¥à¤ÎÄ¹¤µ¤òÎÌ¤ê¤Þ¤¹..."
+#~ msgid "NOT Filtering tempo..."
+#~ msgstr "¥Æ¥ó¥Ý¤Î¥Õ¥£¥ë¥¿¤ò¤·¤Þ¤»¤ó..."
 
-#: lilypond-score.cc:223
-msgid "Settling columns..."
-msgstr "¥«¥é¥à¤ò·èÄê¤·¤Þ¤¹..."
+#~ msgid "NOT Quantifying columns..."
+#~ msgstr "¥«¥é¥à¤ÎÄ¹¤µ¤òÎÌ¤ê¤Þ¤»¤ó..."
 
-#: lilypond-staff.cc:209
-msgid "% MIDI copyright:"
-msgstr "% MIDI copyright:"
+#~ msgid "Quantifying columns..."
+#~ msgstr "¥«¥é¥à¤ÎÄ¹¤µ¤òÎÌ¤ê¤Þ¤¹..."
 
-#: lilypond-staff.cc:210
-msgid "% MIDI instrument:"
-msgstr "% MIDI instrument:"
+#~ msgid "Settling columns..."
+#~ msgstr "¥«¥é¥à¤ò·èÄê¤·¤Þ¤¹..."
 
-#: lilypond-stream.cc:37
-#, c-format
-msgid "lily indent level: %d"
-msgstr "lily indent level: %d"
+#~ msgid "% MIDI copyright:"
+#~ msgstr "% MIDI copyright:"
 
-#. Maybe better not to translate these?
-#: lilypond-stream.cc:83
-msgid "% Creator: "
-msgstr "%s Creator: "
+#~ msgid "% MIDI instrument:"
+#~ msgstr "% MIDI instrument:"
 
-#: lilypond-stream.cc:88
-msgid "% Automatically generated"
-msgstr "% Automatically generated"
+#~ msgid "lily indent level: %d"
+#~ msgstr "lily indent level: %d"
 
-#: lilypond-stream.cc:97
-#, c-format
-msgid "% from input file: "
-msgstr "% from input file: "
+#~ msgid "% Creator: "
+#~ msgstr "%s Creator: "
 
-#: main.cc:94
-msgid "write exact durations, e.g.: a4*385/384"
-msgstr "Àµ³Î¤Ê²»Ä¹¤ò½ñ¤¤¤Æ¤¯¤À¤µ¤¤¡£Îã: a4*385/384"
+#~ msgid "% Automatically generated"
+#~ msgstr "% Automatically generated"
 
-#: main.cc:95
-msgid "enable debugging output"
-msgstr "¥Ç¥Ð¥Ã¥°½ÐÎÏ¤òÍ­¸ú"
+#~ msgid "% from input file: "
+#~ msgstr "% from input file: "
 
-#: main.cc:97
-msgid "ACC[:MINOR]"
-msgstr "ACC[:MINOR]"
+#~ msgid "write exact durations, e.g.: a4*385/384"
+#~ msgstr "Àµ³Î¤Ê²»Ä¹¤ò½ñ¤¤¤Æ¤¯¤À¤µ¤¤¡£Îã: a4*385/384"
 
-#: main.cc:97
-msgid "set key: ACC +sharps/-flats; :1 minor"
-msgstr "Ä´¤òÀßÄê: ACC +¥·¥ã¡¼¥×/-¥Õ¥é¥Ã¥È :1 Ã»Ä´"
+#~ msgid "enable debugging output"
+#~ msgstr "¥Ç¥Ð¥Ã¥°½ÐÎÏ¤òÍ­¸ú"
 
-#: main.cc:98
 #, fuzzy
-msgid "don't output tuplets, double dots or rests, smallest is 32"
-msgstr "ÉäÅÀ¤äÊ£ÉäÅÀ¤ò¤Ê¤¯¤¹¤è¤¦»î¤ß¤Þ¤¹¡¢ºÇ¾®¤Ï 32"
+#~ msgid "don't output tuplets, double dots or rests, smallest is 32"
+#~ msgstr "ÉäÅÀ¤äÊ£ÉäÅÀ¤ò¤Ê¤¯¤¹¤è¤¦»î¤ß¤Þ¤¹¡¢ºÇ¾®¤Ï 32"
 
-#: main.cc:99
-msgid "set FILE as default output"
-msgstr "¥Ç¥Õ¥©¥ë¥È½ÐÎÏ¤È¤·¤Æ FILE ¤òÀßÄê¤¹¤ë"
-
-#: main.cc:100
-msgid "don't output tuplets"
-msgstr ""
+#~ msgid "set FILE as default output"
+#~ msgstr "¥Ç¥Õ¥©¥ë¥È½ÐÎÏ¤È¤·¤Æ FILE ¤òÀßÄê¤¹¤ë"
 
-#: main.cc:101
-msgid "be quiet"
-msgstr "ÀÅ¤«¤Ë¤·¤Þ¤¹"
+#~ msgid "be quiet"
+#~ msgstr "ÀÅ¤«¤Ë¤·¤Þ¤¹"
 
-#: main.cc:102
-msgid "don't output rests or skips"
-msgstr ""
+#~ msgid "set smallest duration"
+#~ msgstr "²»Ä¹¤òºÇ¾®¤ËÀßÄê¤·¤Þ¤¹"
 
-#: main.cc:103
-msgid "DUR"
-msgstr "DUR"
+#~ msgid "don't timestamp the output"
+#~ msgstr "½ÐÎÏ¤Ë¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¤Ä¤±¤Ê¤¤"
 
-#: main.cc:103
-msgid "set smallest duration"
-msgstr "²»Ä¹¤òºÇ¾®¤ËÀßÄê¤·¤Þ¤¹"
+#~ msgid "be verbose"
+#~ msgstr "¾ÜºÙ¤Ê¾ðÊó¤òÉ½¼¨¤·¤Þ¤¹"
 
-#: main.cc:104
-msgid "don't timestamp the output"
-msgstr "½ÐÎÏ¤Ë¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¤Ä¤±¤Ê¤¤"
+#~ msgid "assume no double dotted notes"
+#~ msgstr "Ê£ÉäÅÀ²»Éä¤òÌµ¤¯¤¹¤è¤¦»î¤ß¤Þ¤¹"
 
-#: main.cc:106
-msgid "be verbose"
-msgstr "¾ÜºÙ¤Ê¾ðÊó¤òÉ½¼¨¤·¤Þ¤¹"
+#~ msgid "Usage: %s [OPTION]... [FILE]"
+#~ msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]"
 
-#: main.cc:108
-msgid "assume no double dotted notes"
-msgstr "Ê£ÉäÅÀ²»Éä¤òÌµ¤¯¤¹¤è¤¦»î¤ß¤Þ¤¹"
-
-#: main.cc:115
-#, c-format
-msgid "Usage: %s [OPTION]... [FILE]"
-msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]"
-
-#: main.cc:117
 #, fuzzy
-msgid "Translate MIDI-file to lilypond"
-msgstr "MIDI ¥Õ¥¡¥¤¥ë¤ò mudela ¤ËÊÑ´¹¤·¤Þ¤¹"
-
-#: main.cc:131
-#, c-format
-msgid "no_double_dots: %d\n"
-msgstr ""
-
-#: main.cc:133
-#, c-format
-msgid "no_rests: %d\n"
-msgstr ""
+#~ msgid "Translate MIDI-file to lilypond"
+#~ msgstr "MIDI ¥Õ¥¡¥¤¥ë¤ò mudela ¤ËÊÑ´¹¤·¤Þ¤¹"
 
-#: main.cc:135
-#, c-format
-msgid "no_quantify_b_s: %d\n"
-msgstr ""
-
-#: main.cc:137
-#, c-format
-msgid "no_smaller_than: %d (1/%d)\n"
-msgstr ""
+#~ msgid "zero length string encountered"
+#~ msgstr "Ä¹¤µ¥¼¥í¤ÎÊ¸»úÎó¤¬¸½¤ï¤ì¤Þ¤·¤¿"
 
-#: main.cc:140
-#, c-format
-msgid "no_tuplets: %d\n"
-msgstr ""
-
-#: midi-parser.cc:64
-msgid "zero length string encountered"
-msgstr "Ä¹¤µ¥¼¥í¤ÎÊ¸»úÎó¤¬¸½¤ï¤ì¤Þ¤·¤¿"
+#~ msgid "MIDI header expected"
+#~ msgstr "MIDI ¥Ø¥Ã¥À¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: midi-score-parser.cc:44
-msgid "MIDI header expected"
-msgstr "MIDI ¥Ø¥Ã¥À¤¬¤¢¤ê¤Þ¤»¤ó"
+#~ msgid "invalid header length"
+#~ msgstr "Ìµ¸ú¤Ê¥Ø¥Ã¥ÀÄ¹¤Ç¤¹"
 
-#: midi-score-parser.cc:49
-msgid "invalid header length"
-msgstr "Ìµ¸ú¤Ê¥Ø¥Ã¥ÀÄ¹¤Ç¤¹"
+#~ msgid "invalid MIDI format"
+#~ msgstr "Ìµ¸ú¤Ê MIDI ¥Õ¥©¡¼¥Þ¥Ã¥È"
 
-#: midi-score-parser.cc:52
-msgid "invalid MIDI format"
-msgstr "Ìµ¸ú¤Ê MIDI ¥Õ¥©¡¼¥Þ¥Ã¥È"
+#~ msgid "invalid number of tracks"
+#~ msgstr "Ìµ¸ú¤Ê¥È¥é¥Ã¥¯¿ô"
 
-#: midi-score-parser.cc:55
-msgid "invalid number of tracks"
-msgstr "Ìµ¸ú¤Ê¥È¥é¥Ã¥¯¿ô"
-
-#: midi-score-parser.cc:58
 #, fuzzy
-msgid "can't handle non-metrical time"
-msgstr "±¤Î§¤Ë¤Ê¤é¤Ê¤¤Çï»Ò¤Ï°·¤¨¤Þ¤»¤ó"
+#~ msgid "can't handle non-metrical time"
+#~ msgstr "±¤Î§¤Ë¤Ê¤é¤Ê¤¤Çï»Ò¤Ï°·¤¨¤Þ¤»¤ó"
 
-#: midi-track-parser.cc:68
-#, c-format
-msgid "Junking note-end event: channel = %d, pitch = %d"
-msgstr "²»Éä½ªÃ¼¥¤¥Ù¥ó¥È¤ò¼Î¤Æ¤Þ¤¹: channel = %d, pitch = %d"
+#~ msgid "Junking note-end event: channel = %d, pitch = %d"
+#~ msgstr "²»Éä½ªÃ¼¥¤¥Ù¥ó¥È¤ò¼Î¤Æ¤Þ¤¹: channel = %d, pitch = %d"
 
-#: midi-track-parser.cc:124
-msgid "invalid running status"
-msgstr "Ìµ¸ú¤ÊÆ°ºî¾õÂÖ"
+#~ msgid "invalid running status"
+#~ msgstr "Ìµ¸ú¤ÊÆ°ºî¾õÂÖ"
 
-#: midi-track-parser.cc:328
-msgid "unimplemented MIDI meta-event"
-msgstr "Ì¤¼ÂÁõ¤Î MIDI ¥á¥¿¥¤¥Ù¥ó¥È"
+#~ msgid "unimplemented MIDI meta-event"
+#~ msgstr "Ì¤¼ÂÁõ¤Î MIDI ¥á¥¿¥¤¥Ù¥ó¥È"
 
-#: midi-track-parser.cc:333
-msgid "invalid MIDI event"
-msgstr "Ìµ¸ú¤Ê MIDI ¥¤¥Ù¥ó¥È"
+#~ msgid "invalid MIDI event"
+#~ msgstr "Ìµ¸ú¤Ê MIDI ¥¤¥Ù¥ó¥È"
 
-#: midi-track-parser.cc:348
-msgid "MIDI track expected"
-msgstr "MIDI ¥È¥é¥Ã¥¯¤¬É¬Í×¤Ç¤¹"
+#~ msgid "MIDI track expected"
+#~ msgstr "MIDI ¥È¥é¥Ã¥¯¤¬É¬Í×¤Ç¤¹"
 
-#: midi-track-parser.cc:353
-msgid "invalid track length"
-msgstr "Ìµ¸ú¤Ê¥È¥é¥Ã¥¯Ä¹¤Ç¤¹"
+#~ msgid "invalid track length"
+#~ msgstr "Ìµ¸ú¤Ê¥È¥é¥Ã¥¯Ä¹¤Ç¤¹"
 
 #~ msgid "no Grace context available"
 #~ msgstr "Áõ¾þ¥³¥ó¥Æ¥­¥¹¥È¤¬¤¢¤ê¤Þ¤»¤ó"
diff -purN ../lilypond-1.5.28/po/lilypond.pot ./po/lilypond.pot
--- ../lilypond-1.5.28/po/lilypond.pot	Sun Sep 16 17:09:58 2001
+++ ./po/lilypond.pot	Thu Jan 31 13:17:54 2002
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-09-09 17:41+0200\n"
+"POT-Creation-Date: 2002-01-29 23:08+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,296 +14,339 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ly2dvi.py:115
-msgid "Generate .dvi with LaTeX for LilyPond"
-msgstr ""
-
-#: data-file.cc:118 input.cc:85 ly2dvi.py:197 midi-parser.cc:100 mup2ly.py:93
-#: update-lily.py:119 warn.cc:23
+#: data-file.cc:118 input.cc:85 ly2dvi.py:113 midi2ly.py:148
+#: update-lily.py:136 warn.cc:23
 msgid "warning: "
 msgstr ""
 
-#: input.cc:90 ly2dvi.py:212 ly2dvi.py:641 ly2dvi.py:659 ly2dvi.py:850
-#: mup2ly.py:98 mup2ly.py:188 update-lily.py:124 update-lily.py:212 warn.cc:9
-#: warn.cc:17
+#: input.cc:90 ly2dvi.py:116 ly2dvi.py:132 ly2dvi.py:691 ly2dvi.py:709
+#: midi2ly.py:163 midi2ly.py:1012 midi2ly.py:1081 update-lily.py:151
+#: update-lily.py:426 warn.cc:9 warn.cc:17
 msgid "error: "
 msgstr ""
 
-#: ly2dvi.py:213 mup2ly.py:100 update-lily.py:126
+#: ly2dvi.py:133 midi2ly.py:164 update-lily.py:152
 msgid "Exiting ... "
 msgstr ""
 
-#: ly2dvi.py:271 mup2ly.py:158 update-lily.py:184
+#: ly2dvi.py:191 midi2ly.py:222 update-lily.py:210
 #, c-format
 msgid "Usage: %s [OPTION]... FILE"
 msgstr ""
 
-#: ly2dvi.py:275 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:188
+#: ly2dvi.py:195 main.cc:151 midi2ly.py:226 update-lily.py:214
 msgid "Options:"
 msgstr ""
 
-#: ly2dvi.py:279 main.cc:124 main.cc:166 mup2ly.py:168 update-lily.py:192
+#: ly2dvi.py:199 main.cc:168 midi2ly.py:230 update-lily.py:218
 #, c-format
 msgid "Report bugs to %s"
 msgstr ""
 
-#: ly2dvi.py:307 mup2ly.py:185 update-lily.py:209
+#: ly2dvi.py:227 midi2ly.py:258 update-lily.py:246
 #, c-format
 msgid "Invoking `%s'"
 msgstr ""
 
-#: ly2dvi.py:311 mup2ly.py:188 update-lily.py:212
+#: ly2dvi.py:231 midi2ly.py:262 update-lily.py:250
 #, c-format
 msgid "command exited with value %d"
 msgstr ""
 
-#: ly2dvi.py:313 mup2ly.py:190 update-lily.py:214
+#: ly2dvi.py:233 midi2ly.py:264 update-lily.py:252
 msgid "(ignored)"
 msgstr ""
 
-#: ly2dvi.py:323
+#: ly2dvi.py:243 midi2ly.py:274 update-lily.py:262
 #, c-format
 msgid "Cleaning %s..."
 msgstr ""
 
-#: ly2dvi.py:338 mup2ly.py:214 update-lily.py:238
-#, c-format
-msgid "no such setting: %s"
+#: ly2dvi.py:301
+msgid "Generate .dvi with LaTeX for LilyPond"
 msgstr ""
 
-#: ly2dvi.py:351 main.cc:113
+#: ly2dvi.py:304 main.cc:115
 msgid "write Makefile dependencies for every input file"
 msgstr ""
 
-#: ly2dvi.py:352 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:252
+#: ly2dvi.py:305 main.cc:111 midi2ly.py:98 mup2ly.py:74 update-lily.py:86
 msgid "this help"
 msgstr ""
 
-#: ly2dvi.py:353 main.cc:111 main.cc:116
+#: ly2dvi.py:306 main.cc:113 main.cc:118
 msgid "DIR"
 msgstr ""
 
-#: ly2dvi.py:353
+#: ly2dvi.py:306
 msgid "add DIR to LilyPond's search path"
 msgstr ""
 
-#: ly2dvi.py:354
+#: ly2dvi.py:307
 #, c-format
 msgid "keep all output, and name the directory %s.dir"
 msgstr ""
 
-#: ly2dvi.py:355
+#: ly2dvi.py:308
 msgid "don't run LilyPond"
 msgstr ""
 
-#: ly2dvi.py:356 main.cc:114
+#: ly2dvi.py:309 main.cc:116
 msgid "produce MIDI output only"
 msgstr ""
 
-#: ly2dvi.py:357 ly2dvi.py:358 main.cc:99 main.cc:112 main.cc:115
+#: ly2dvi.py:310 ly2dvi.py:311 main.cc:114 main.cc:117 midi2ly.py:100
 msgid "FILE"
 msgstr ""
 
-#: ly2dvi.py:357
+#: ly2dvi.py:310 midi2ly.py:100
 msgid "write ouput to FILE"
 msgstr ""
 
-#: ly2dvi.py:358
+#: ly2dvi.py:311
 msgid "find pfa fonts used in FILE"
 msgstr ""
 
-#: ly2dvi.py:360
+#: ly2dvi.py:313
 msgid "generate PostScript output"
 msgstr ""
 
-#: ly2dvi.py:361
+#: ly2dvi.py:314
 msgid "KEY=VAL"
 msgstr ""
 
-#: ly2dvi.py:361
+#: ly2dvi.py:314
 msgid "change global setting KEY to VAL"
 msgstr ""
 
-#: ly2dvi.py:362 main.cc:119 mup2ly.py:1120 update-lily.py:256
+#: ly2dvi.py:315 main.cc:121 midi2ly.py:103 mup2ly.py:77 update-lily.py:90
 msgid "verbose"
 msgstr ""
 
-#: ly2dvi.py:363 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:257
+#: ly2dvi.py:316 main.cc:120 midi2ly.py:104 mup2ly.py:78 update-lily.py:91
 msgid "print version number"
 msgstr ""
 
-#: ly2dvi.py:364 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:259
+#: ly2dvi.py:317 main.cc:122 midi2ly.py:105 mup2ly.py:79 update-lily.py:93
 msgid "show warranty and copyright"
 msgstr ""
 
-#: ly2dvi.py:386 ly2dvi.py:582 ly2dvi.py:607
+#: ly2dvi.py:406
+#, c-format
+msgid "no such setting: %s"
+msgstr ""
+
+#: ly2dvi.py:434 ly2dvi.py:632 ly2dvi.py:657
 #, c-format
 msgid "Running %s..."
 msgstr ""
 
-#: ly2dvi.py:399
+#: ly2dvi.py:449
 #, c-format
 msgid "Analyzing %s..."
 msgstr ""
 
-#: ly2dvi.py:455
+#: ly2dvi.py:505
 #, c-format
 msgid "no lilypond output found for %s"
 msgstr ""
 
-#: ly2dvi.py:497
+#: ly2dvi.py:547
 #, c-format
 msgid "invalid value: %s"
 msgstr ""
 
-#: ly2dvi.py:641
+#: ly2dvi.py:691
 #, c-format
 msgid "not a PostScript file: `%s'"
 msgstr ""
 
-#: ly2dvi.py:659
+#: ly2dvi.py:709 midi2ly.py:1012 update-lily.py:426
 #, c-format
 msgid "getopt says: `%s'"
 msgstr ""
 
-#: ly2dvi.py:826 scores.cc:44
+#: ly2dvi.py:820
+#, c-format
+msgid "filename should not contain spaces: `%s'"
+msgstr ""
+
+#: ly2dvi.py:885 scores.cc:44
 #, c-format
 msgid "dependencies output to `%s'..."
 msgstr ""
 
-#: ly2dvi.py:837
+#: ly2dvi.py:896 midi2ly.py:996
 #, c-format
 msgid "%s output to `%s'..."
 msgstr ""
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:839
-#: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
+#: includable-lexer.cc:49 lily-guile.cc:134 ly2dvi.py:898 scores.cc:136
+#: scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr ""
 
-#: ly2dvi.py:850
+#: ly2dvi.py:909 midi2ly.py:1081
 msgid "no files specified on command line."
 msgstr ""
 
-#: mup2ly.py:51
-msgid "Convert mup to ly"
+#: midi2ly.py:92
+msgid "Convert MIDI to LilyPond source"
 msgstr ""
 
-#: mup2ly.py:166
-#, c-format
-msgid "%s is far from completed.  Not all constructs are recognised."
+#: midi2ly.py:95
+msgid "print absolute pitches"
 msgstr ""
 
-#: mup2ly.py:964
-#, c-format
-msgid "no such context: %s"
+#: midi2ly.py:96 midi2ly.py:101
+msgid "DUR"
+msgstr ""
+
+#: midi2ly.py:96
+msgid "quantise note durations on DUR"
+msgstr ""
+
+#: midi2ly.py:97
+msgid "print explicit durations"
+msgstr ""
+
+#: midi2ly.py:99
+msgid "ALT[:MINOR]"
+msgstr ""
+
+#: midi2ly.py:99
+msgid "set key: ALT=+sharps|-flats; MINOR=1"
+msgstr ""
+
+#: midi2ly.py:101
+msgid "quantise note starts on DUR"
+msgstr ""
+
+#: midi2ly.py:102
+msgid "DUR*NUM/DEN"
 msgstr ""
 
-#: mup2ly.py:1115
+#: midi2ly.py:102
+msgid "allow tuplet durations DUR*NUM/DEN"
+msgstr ""
+
+#: midi2ly.py:106
+msgid "treat every text as a lyric"
+msgstr ""
+
+#: midi2ly.py:1027
+msgid "Example:"
+msgstr ""
+
+#: mup2ly.py:69
+msgid "Convert mup to LilyPond source"
+msgstr ""
+
+#: mup2ly.py:72
 msgid "debug"
 msgstr ""
 
-#: mup2ly.py:1116
+#: mup2ly.py:73
 msgid "define macro NAME [optional expansion EXP]"
 msgstr ""
 
-#: main.cc:115 mup2ly.py:1118
+#: main.cc:117 mup2ly.py:75
 msgid "write output to FILE"
 msgstr ""
 
-#: mup2ly.py:1119
+#: mup2ly.py:76
 msgid "only pre-process"
 msgstr ""
 
-#: mup2ly.py:1200
+#: mup2ly.py:827
+#, c-format
+msgid "no such context: %s"
+msgstr ""
+
+#: mup2ly.py:1051
 #, c-format
 msgid "Processing `%s'..."
 msgstr ""
 
-#: mup2ly.py:1219
+#: mup2ly.py:1070
 #, c-format
 msgid "Writing `%s'..."
 msgstr ""
 
-#: update-lily.py:52
+#: update-lily.py:75
 msgid "Fetch and rebuild from latest source package"
 msgstr ""
 
-#: update-lily.py:224
-#, c-format
-msgid "Cleaning `%s'..."
-msgstr ""
-
-#: update-lily.py:244
+#: update-lily.py:78
 #, c-format
 msgid "unpack and build in DIR [%s]"
 msgstr ""
 
-#: update-lily.py:245
+#: update-lily.py:79
 msgid "execute COMMAND, subtitute:"
 msgstr ""
 
-#: update-lily.py:246
+#: update-lily.py:80
 msgid "%b: build root"
 msgstr ""
 
-#: update-lily.py:247
+#: update-lily.py:81
 #, c-format
 msgid "%n: package name"
 msgstr ""
 
-#: update-lily.py:248
+#: update-lily.py:82
 msgid "%r: release directory"
 msgstr ""
 
-#: update-lily.py:249
+#: update-lily.py:83
 msgid "%t: tarball"
 msgstr ""
 
-#: update-lily.py:250
+#: update-lily.py:84
 msgid "%v: package version"
 msgstr ""
 
-#: update-lily.py:253
+#: update-lily.py:87
 #, c-format
 msgid "keep all output, and name the directory %s"
 msgstr ""
 
-#: update-lily.py:254
+#: update-lily.py:88
 msgid "upon failure notify EMAIL[,EMAIL]"
 msgstr ""
 
-#: update-lily.py:255
+#: update-lily.py:89
 msgid "remove previous build"
 msgstr ""
 
-#: update-lily.py:258
+#: update-lily.py:92
 #, c-format
 msgid "fetch and build URL [%s]"
 msgstr ""
 
-#: update-lily.py:366
+#: update-lily.py:397
 #, c-format
 msgid "Listing `%s'..."
 msgstr ""
 
-#: update-lily.py:427
+#: update-lily.py:465
 #, c-format
 msgid "latest is: %s"
 msgstr ""
 
-#: update-lily.py:428
+#: update-lily.py:466
 #, c-format
 msgid "relax, %s is up to date"
 msgstr ""
 
-#: update-lily.py:436 update-lily.py:449
+#: update-lily.py:474 update-lily.py:487
 #, c-format
 msgid "Fetching `%s'..."
 msgstr ""
 
-#: update-lily.py:458
+#: update-lily.py:496
 #, c-format
 msgid "Building `%s'..."
 msgstr ""
@@ -344,8 +387,8 @@ msgstr ""
 msgid "can't map file"
 msgstr ""
 
-#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45
-#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
+#: mapped-file-storage.cc:87 scores.cc:48 simple-file-storage.cc:44
+#: streams.cc:37 text-stream.cc:23
 #, c-format
 msgid "can't open file: `%s'"
 msgstr ""
@@ -367,6 +410,16 @@ msgstr ""
 msgid " (Continuing; cross thumbs)"
 msgstr ""
 
+#: accidental-engraver.cc:136
+#, c-format
+msgid "unknown accidental typesetting: %s"
+msgstr ""
+
+#: accidental-engraver.cc:139
+#, c-format
+msgid "Accidental typesetting must be pair: %s"
+msgstr ""
+
 #: afm.cc:59
 #, c-format
 msgid "can't find character number: %d"
@@ -426,35 +479,44 @@ msgstr ""
 msgid "Can't switch translators, I'm there already"
 msgstr ""
 
-#: beam-engraver.cc:91 beam-engraver.cc:124
+#: bar-check-iterator.cc:58
+#, c-format
+msgid "barcheck failed at: %s"
+msgstr ""
+
+#: beam-engraver.cc:93 beam-engraver.cc:126
 msgid "can't find start of beam"
 msgstr ""
 
-#: beam-engraver.cc:158
+#: beam-engraver.cc:150
 msgid "already have a beam"
 msgstr ""
 
-#: beam-engraver.cc:222
+#: beam-engraver.cc:216
 msgid "unterminated beam"
 msgstr ""
 
-#: beam-engraver.cc:255 chord-tremolo-engraver.cc:195
+#: beam-engraver.cc:249 chord-tremolo-engraver.cc:193
 msgid "stem must have Rhythmic structure"
 msgstr ""
 
-#: beam-engraver.cc:267
+#: beam-engraver.cc:261
 msgid "stem doesn't fit in beam"
 msgstr ""
 
-#: beam-engraver.cc:268
+#: beam-engraver.cc:262
 msgid "beam was started here"
 msgstr ""
 
-#: beam.cc:86
-msgid "beam has less than two stems"
+#: beam.cc:93
+msgid "beam has less than two visible stems"
 msgstr ""
 
-#: beam.cc:637
+#: beam.cc:98
+msgid "Beam has less than two stems. Removing beam."
+msgstr ""
+
+#: beam.cc:660
 msgid "weird beam vertical offset"
 msgstr ""
 
@@ -482,7 +544,7 @@ msgstr ""
 msgid "none of these in my family"
 msgstr ""
 
-#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192
+#: chord-tremolo-engraver.cc:139 percent-repeat-engraver.cc:182
 msgid "unterminated chord tremolo"
 msgstr ""
 
@@ -500,7 +562,7 @@ msgstr ""
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr ""
 
-#: collision.cc:245
+#: collision.cc:281
 msgid "Too many clashing notecolumns.  Ignoring them."
 msgstr ""
 
@@ -508,27 +570,27 @@ msgstr ""
 msgid "NaN"
 msgstr ""
 
-#: dynamic-engraver.cc:197 span-dynamic-performer.cc:86
+#: dynamic-engraver.cc:195 span-dynamic-performer.cc:82
 msgid "can't find start of (de)crescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:222
+#: dynamic-engraver.cc:220
 msgid "already have a crescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:223
+#: dynamic-engraver.cc:221
 msgid "already have a decrescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:317
+#: dynamic-engraver.cc:315
 msgid "unterminated (de)crescendo"
 msgstr ""
 
-#: extender-engraver.cc:97
+#: extender-engraver.cc:96
 msgid "unterminated extender"
 msgstr ""
 
-#: extender-engraver.cc:109
+#: extender-engraver.cc:108
 msgid "Nothing to connect extender to on the left.  Ignoring extender request."
 msgstr ""
 
@@ -540,7 +602,7 @@ msgstr ""
 msgid "couldn't find any font satisfying "
 msgstr ""
 
-#: gourlay-breaking.cc:157
+#: gourlay-breaking.cc:168
 msgid "No feasible line breaking found"
 msgstr ""
 
@@ -552,23 +614,23 @@ msgstr ""
 msgid "crescendo too small"
 msgstr ""
 
-#: hyphen-engraver.cc:90
+#: hyphen-engraver.cc:89
 msgid "unterminated hyphen"
 msgstr ""
 
-#: hyphen-engraver.cc:102
+#: hyphen-engraver.cc:101
 msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen request."
 msgstr ""
 
-#: key-engraver.cc:99
+#: key-engraver.cc:93
 msgid "Conflicting key signatures found."
 msgstr ""
 
-#: key-engraver.cc:100
+#: key-engraver.cc:94
 msgid "This was the other key definition."
 msgstr ""
 
-#: key-performer.cc:77
+#: key-performer.cc:91
 msgid "FIXME: key change merge"
 msgstr ""
 
@@ -577,7 +639,7 @@ msgstr ""
 msgid "Kpathsea couldn't find TFM file `%s'"
 msgstr ""
 
-#: lily-guile.cc:141
+#: lily-guile.cc:136
 #, c-format
 msgid "(load path: `%s')"
 msgstr ""
@@ -587,12 +649,12 @@ msgstr ""
 msgid "Element count %d."
 msgstr ""
 
-#: line-of-score.cc:313 paper-score.cc:77
+#: line-of-score.cc:325 paper-score.cc:76
 #, c-format
 msgid "Element count %d "
 msgstr ""
 
-#: line-of-score.cc:327
+#: line-of-score.cc:339
 msgid "Calculating column positions..."
 msgstr ""
 
@@ -605,72 +667,72 @@ msgid "Huh? Melismatic note found to hav
 msgstr ""
 
 #. print example usage:  lilypond -e "(set-lily-option 'help 0)" ?
-#: main.cc:105
+#: main.cc:107
 msgid "EXPR"
 msgstr ""
 
-#: main.cc:105
+#: main.cc:107
 msgid "evalute EXPR as Scheme after .scm init is read"
 msgstr ""
 
 #. another bug in option parser: --output=foe is taken as an abbreviation
 #. for --output-format
-#: main.cc:108
+#: main.cc:110
 msgid "EXT"
 msgstr ""
 
-#: main.cc:108
+#: main.cc:110
 msgid "use output format EXT (tex [default], pdftex, ps, scm or as)"
 msgstr ""
 
-#: main.cc:110
+#: main.cc:112
 msgid "FIELD"
 msgstr ""
 
-#: main.cc:110
+#: main.cc:112
 msgid "write header field to BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:111
+#: main.cc:113
 msgid "add DIR to search path"
 msgstr ""
 
-#: main.cc:112
+#: main.cc:114
 msgid "use FILE as init file"
 msgstr ""
 
-#: main.cc:116
+#: main.cc:118
 msgid "prepend DIR to dependencies"
 msgstr ""
 
-#: main.cc:117
+#: main.cc:119
 msgid "inhibit file output naming and exporting"
 msgstr ""
 
 #.
 #. No version number or newline here. It confuses help2man
 #.
-#: main.cc:137
+#: main.cc:139
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr ""
 
-#: main.cc:139
+#: main.cc:141
 msgid "Typeset music and or play MIDI from FILE"
 msgstr ""
 
-#: main.cc:143
+#: main.cc:145
 msgid ""
 "LilyPond is a music typesetter.  It produces beautiful sheet music\n"
 "using a high level description file as input.  LilyPond is part of \n"
 "the GNU Project.\n"
 msgstr ""
 
-#: main.cc:153
+#: main.cc:155
 msgid "This binary was compiled with the following options:"
 msgstr ""
 
-#: main.cc:56 main.cc:174
+#: main.cc:176
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -678,16 +740,16 @@ msgid ""
 "certain conditions.  Invoke as `%s --warranty' for more information.\n"
 msgstr ""
 
-#: main.cc:63 main.cc:181 main.cc:193
+#: main.cc:183 main.cc:195
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr ""
 
-#: main.cc:191
+#: main.cc:193
 msgid "GNU LilyPond -- The music typesetter"
 msgstr ""
 
-#: main.cc:72 main.cc:199
+#: main.cc:201
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License version 2\n"
@@ -722,42 +784,42 @@ msgstr ""
 msgid "can't find `%s' context"
 msgstr ""
 
-#: music.cc:239
+#: music.cc:144
+#, c-format
+msgid "Transposition by %s makes accidental larger than two"
+msgstr ""
+
+#: music.cc:249
 msgid "ly_get_mus_property (): Not a Music"
 msgstr ""
 
-#: music.cc:253
+#: music.cc:263
 msgid "ly_set_mus_property (): Not a symbol"
 msgstr ""
 
-#: music.cc:265
+#: music.cc:275
 msgid "ly_set_mus_property ():  not of type Music"
 msgstr ""
 
-#: music.cc:279
+#: music.cc:289
 msgid "ly_make_music (): Not a string"
 msgstr ""
 
-#: music.cc:299
+#: music.cc:309
 msgid "ly_music_name (): Not a music expression"
 msgstr ""
 
-#: musical-request.cc:28
-#, c-format
-msgid "Transposition by %s makes accidental larger than two"
-msgstr ""
-
-#: my-lily-lexer.cc:140
+#: my-lily-lexer.cc:139
 #, c-format
 msgid "Identifier name is a keyword: `%s'"
 msgstr ""
 
-#: my-lily-lexer.cc:160
+#: my-lily-lexer.cc:159
 #, c-format
 msgid "error at EOF: %s"
 msgstr ""
 
-#: midi-score-parser.cc:94 my-lily-parser.cc:47
+#: my-lily-parser.cc:47
 msgid "Parsing..."
 msgstr ""
 
@@ -775,32 +837,18 @@ msgstr ""
 msgid "paper output to `%s'..."
 msgstr ""
 
-#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99
+#: paper-outputter.cc:60
 msgid ", at "
 msgstr ""
 
-#: paper-outputter.cc:232
-#, c-format
-msgid "writing header field `%s' to `%s'..."
-msgstr ""
-
-#: paper-score.cc:80
+#: paper-score.cc:79
 msgid "Preprocessing elements..."
 msgstr ""
 
-#: paper-score.cc:114
+#: paper-score.cc:113
 msgid "Outputting Score, defined at: "
 msgstr ""
 
-#: paper-stream.cc:41
-#, c-format
-msgid "can't create directory: `%s'"
-msgstr ""
-
-#: paper-stream.cc:55
-msgid "Error syncing file (disk full?)"
-msgstr ""
-
 #.
 #. We could change the current translator's id, but that would make
 #. errors hard to catch
@@ -817,7 +865,7 @@ msgstr ""
 msgid "none of these in my family: `%s'"
 msgstr ""
 
-#: percent-repeat-engraver.cc:117
+#: percent-repeat-engraver.cc:116
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr ""
 
@@ -833,12 +881,16 @@ msgstr ""
 msgid "Creator: "
 msgstr ""
 
-#: performance.cc:113
+#: performance.cc:103
+msgid "at "
+msgstr ""
+
+#: performance.cc:114
 #, c-format
 msgid "from musical definition: %s"
 msgstr ""
 
-#: performance.cc:168
+#: performance.cc:169
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr ""
@@ -851,8 +903,8 @@ msgstr ""
 msgid "can't find start of phrasing slur"
 msgstr ""
 
-#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154
-#: piano-pedal-performer.cc:85
+#: piano-pedal-engraver.cc:141 piano-pedal-engraver.cc:153
+#: piano-pedal-performer.cc:82
 #, c-format
 msgid "can't find start of piano pedal: `%s'"
 msgstr ""
@@ -861,14 +913,42 @@ msgstr ""
 msgid "Pitch arguments out of range"
 msgstr ""
 
-#: property-engraver.cc:121
+#: porrectus.cc:34
+msgid "(left_head == 0)"
+msgstr ""
+
+#: porrectus.cc:45
+msgid "undefined left_head"
+msgstr ""
+
+#: porrectus.cc:64
+msgid "(right_head == 0)"
+msgstr ""
+
+#: porrectus.cc:75
+msgid "undefined right_head"
+msgstr ""
+
+#: porrectus.cc:164
+msgid "junking lonely porrectus"
+msgstr ""
+
+#: porrectus.cc:174
+msgid "porrectus style undefined; using mensural"
+msgstr ""
+
+#: porrectus.cc:301
+msgid "ascending vaticana style porrectus"
+msgstr ""
+
+#: property-engraver.cc:116
 #, c-format
 msgid ""
 "`%s' is deprecated.  Use\n"
 " \\property %s.%s \\override #'%s = #%s"
 msgstr ""
 
-#: property-engraver.cc:145
+#: property-engraver.cc:140
 #, c-format
 msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s"
 msgstr ""
@@ -885,25 +965,25 @@ msgstr ""
 msgid "Scheme options:"
 msgstr ""
 
-#: score-engraver.cc:189
+#: score-engraver.cc:178
 #, c-format
 msgid "unbound spanner `%s'"
 msgstr ""
 
-#: score.cc:78
+#: score.cc:88
 msgid "Interpreting music..."
 msgstr ""
 
-#: score.cc:92
+#: score.cc:102
 msgid "Need music in a score"
 msgstr ""
 
 #. should we? hampers debugging.
-#: score.cc:105
+#: score.cc:115
 msgid "Errors found/*, not processing score*/"
 msgstr ""
 
-#: score.cc:112
+#: score.cc:122
 #, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr ""
@@ -917,7 +997,7 @@ msgstr ""
 msgid "Now processing: `%s'"
 msgstr ""
 
-#: script-engraver.cc:66
+#: script-engraver.cc:65
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr ""
@@ -927,18 +1007,18 @@ msgstr ""
 msgid "Separation_item:  I've been drinking too much"
 msgstr ""
 
-#: simple-spacer.cc:200
+#: simple-spacer.cc:202
 #, c-format
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:125
+#: slur-engraver.cc:124
 msgid "unterminated slur"
 msgstr ""
 
 #. How to shut up this warning, when Voice_devnull_engraver has
 #. eaten start request?
-#: slur-engraver.cc:142
+#: slur-engraver.cc:141
 msgid "can't find start of slur"
 msgstr ""
 
@@ -946,11 +1026,11 @@ msgstr ""
 msgid "Putting slur over rest.  Ignoring."
 msgstr ""
 
-#: slur.cc:383
+#: slur.cc:393
 msgid "Slur over rest?"
 msgstr ""
 
-#: stem-engraver.cc:115
+#: stem-engraver.cc:117
 #, c-format
 msgid "Adding note head to incompatible stem (type = %d)"
 msgstr ""
@@ -959,15 +1039,24 @@ msgstr ""
 msgid "Weird stem size; check for narrow beams"
 msgstr ""
 
-#: text-spanner-engraver.cc:94
+#: streams.cc:33
+#, c-format
+msgid "can't create directory: `%s'"
+msgstr ""
+
+#: streams.cc:47
+msgid "Error syncing file (disk full?)"
+msgstr ""
+
+#: text-spanner-engraver.cc:92
 msgid "can't find start of text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:114
+#: text-spanner-engraver.cc:112
 msgid "already have a text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:169
+#: text-spanner-engraver.cc:167
 msgid "unterminated text spanner"
 msgstr ""
 
@@ -990,406 +1079,194 @@ msgstr ""
 msgid "can't find ascii character: %d"
 msgstr ""
 
-#. How to shut up this warning, when no notes appeared because
-#. they were suicided by Thread_devnull_engraver?
-#: tie-engraver.cc:220 tie-performer.cc:173
-msgid "No ties were created!"
+#: tie-engraver.cc:220
+msgid "lonely tie"
 msgstr ""
 
-#: tie-engraver.cc:240
-msgid "lonely tie"
+#: tie-performer.cc:161
+msgid "No ties were created!"
 msgstr ""
 
 #: time-scaled-music-iterator.cc:25
 msgid "no one to print a tuplet start bracket"
 msgstr ""
 
-#: timing-translator.cc:37
-#, c-format
-msgid "barcheck failed at: %s"
-msgstr ""
-
-#: translator-ctors.cc:40
+#: translator-ctors.cc:61
 #, c-format
 msgid "unknown translator: `%s'"
 msgstr ""
 
-#: translator-def.cc:99
+#: translator-def.cc:87
 msgid "Program has no such type"
 msgstr ""
 
-#: translator-def.cc:105
+#: translator-def.cc:93
 #, c-format
 msgid "Already contains: `%s'"
 msgstr ""
 
-#: translator-def.cc:106
+#: translator-def.cc:94
 #, c-format
 msgid "Not adding translator: `%s'"
 msgstr ""
 
-#: translator-def.cc:224
+#: translator-def.cc:212
 #, c-format
 msgid "can't find: `%s'"
 msgstr ""
 
-#: translator-group.cc:145
+#: translator-group.cc:147
 #, c-format
 msgid "can't find or create `%s' called `%s'"
 msgstr ""
 
-#: translator-group.cc:230
+#: translator-group.cc:232
 #, c-format
 msgid "can't find or create: `%s'"
 msgstr ""
 
-#: translator-group.cc:413
+#: translator-group.cc:407
 #, c-format
 msgid ""
 "Can't find property type-check for `%s'.  Perhaps you made a typing error? "
 "Doing assignment anyway."
 msgstr ""
 
-#: translator-group.cc:427
+#: translator-group.cc:421
 #, c-format
 msgid "Type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
 #. programming_error?
-#: translator-group.cc:446
+#: translator-group.cc:440
 msgid "ly-get-trans-property: expecting a Translator_group argument"
 msgstr ""
 
-#: volta-engraver.cc:88
+#: volta-engraver.cc:108
 msgid "No volta spanner to end"
 msgstr ""
 
-#: volta-engraver.cc:105
+#: volta-engraver.cc:125
 msgid "Already have a volta spanner.  Stopping that one prematurely."
 msgstr ""
 
-#: volta-engraver.cc:109
+#: volta-engraver.cc:129
 msgid "Also have a stopped spanner.  Giving up."
 msgstr ""
 
-#: parser.yy:121
+#: parser.yy:129
 #, c-format
 msgid "Expecting %d arguments"
 msgstr ""
 
-#: parser.yy:423
+#: parser.yy:434
 msgid "Identifier should have  alphabetic characters only"
 msgstr ""
 
-#: parser.yy:697
+#: parser.yy:715
 msgid "More alternatives than repeats.  Junking excess alternatives."
 msgstr ""
 
-#: parser.yy:761
+#: parser.yy:767
 msgid "Second argument must be a symbol"
 msgstr ""
 
-#: parser.yy:766
+#: parser.yy:772
 msgid "First argument must be a procedure taking 1 argument"
 msgstr ""
 
-#: parser.yy:1298
+#: parser.yy:1315
 msgid "Expecting string as script definition"
 msgstr ""
 
-#: parser.yy:1308
+#: parser.yy:1325
 msgid "Can't specify direction for this request"
 msgstr ""
 
-#: parser.yy:1433
+#: parser.yy:1451
 msgid "Expecting musical-pitch value"
 msgstr ""
 
-#: parser.yy:1444
+#: parser.yy:1462
 msgid "Must have duration object"
 msgstr ""
 
-#: parser.yy:1453 parser.yy:1461
+#: parser.yy:1471 parser.yy:1479
 msgid "Have to be in Lyric mode for lyrics"
 msgstr ""
 
-#: parser.yy:1614 parser.yy:1671
+#: parser.yy:1638 parser.yy:1691
 #, c-format
 msgid "not a duration: %d"
 msgstr ""
 
-#: parser.yy:1682
+#: parser.yy:1752
 msgid "Have to be in Note mode for notes"
 msgstr ""
 
-#: parser.yy:1765
+#: parser.yy:1845
 msgid "Have to be in Chord mode for chords"
 msgstr ""
 
-#: parser.yy:1945
+#: parser.yy:2025
 msgid "need integer number arg"
 msgstr ""
 
-#: lexer.ll:174
+#: parser.yy:2097
+msgid "Suspect duration found following this beam"
+msgstr ""
+
+#: lexer.ll:175
 msgid "EOF found inside a comment"
 msgstr ""
 
-#: lexer.ll:188
+#: lexer.ll:189
 msgid "\\maininput disallowed outside init files"
 msgstr ""
 
-#: lexer.ll:212
+#: lexer.ll:213
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr ""
 
 #. backup rule
-#: lexer.ll:221
+#: lexer.ll:222
 msgid "Missing end quote"
 msgstr ""
 
 #. backup rule
-#: lexer.ll:243 lexer.ll:247
+#: lexer.ll:244 lexer.ll:248
 msgid "white expected"
 msgstr ""
 
-#: lexer.ll:256
+#: lexer.ll:257
 msgid "Can't evaluate Scheme in safe mode"
 msgstr ""
 
-#: lexer.ll:349
+#: lexer.ll:358
 msgid "Brace found at end of lyric. Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:457
+#: lexer.ll:468
 #, c-format
 msgid "invalid character: `%c'"
 msgstr ""
 
-#: lexer.ll:538
+#: lexer.ll:554
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr ""
 
-#: lexer.ll:617
+#: lexer.ll:639
 #, c-format
 msgid "Oldest supported input version: %s"
 msgstr ""
 
-#: lexer.ll:629
+#: lexer.ll:651
 #, c-format
 msgid "incorrect lilypond version: %s (%s, %s)"
 msgstr ""
 
-#: lexer.ll:630
+#: lexer.ll:652
 msgid "Consider converting the input with the convert-ly script"
 msgstr ""
-
-#: lilypond-item.cc:161
-#, c-format
-msgid "#32 in quarter: %d"
-msgstr ""
-
-#: lilypond-score.cc:108
-#, c-format
-msgid "LY output to `%s'..."
-msgstr ""
-
-#: lilypond-score.cc:119
-#, c-format
-msgid "track %d:"
-msgstr ""
-
-#: lilypond-score.cc:155
-msgid "Processing..."
-msgstr ""
-
-#: lilypond-score.cc:164
-msgid "Creating voices..."
-msgstr ""
-
-#: lilypond-score.cc:168
-msgid "track "
-msgstr ""
-
-#: lilypond-score.cc:177
-msgid "NOT Filtering tempo..."
-msgstr ""
-
-#: lilypond-score.cc:186
-msgid "NOT Quantifying columns..."
-msgstr ""
-
-#: lilypond-score.cc:190
-msgid "Quantifying columns..."
-msgstr ""
-
-#: lilypond-score.cc:223
-msgid "Settling columns..."
-msgstr ""
-
-#: lilypond-staff.cc:209
-msgid "% MIDI copyright:"
-msgstr ""
-
-#: lilypond-staff.cc:210
-msgid "% MIDI instrument:"
-msgstr ""
-
-#: lilypond-stream.cc:37
-#, c-format
-msgid "lily indent level: %d"
-msgstr ""
-
-#. Maybe better not to translate these?
-#: lilypond-stream.cc:83
-msgid "% Creator: "
-msgstr ""
-
-#: lilypond-stream.cc:88
-msgid "% Automatically generated"
-msgstr ""
-
-#: lilypond-stream.cc:97
-#, c-format
-msgid "% from input file: "
-msgstr ""
-
-#: main.cc:94
-msgid "write exact durations, e.g.: a4*385/384"
-msgstr ""
-
-#: main.cc:95
-msgid "enable debugging output"
-msgstr ""
-
-#: main.cc:97
-msgid "ACC[:MINOR]"
-msgstr ""
-
-#: main.cc:97
-msgid "set key: ACC +sharps/-flats; :1 minor"
-msgstr ""
-
-#: main.cc:98
-msgid "don't output tuplets, double dots or rests, smallest is 32"
-msgstr ""
-
-#: main.cc:99
-msgid "set FILE as default output"
-msgstr ""
-
-#: main.cc:100
-msgid "don't output tuplets"
-msgstr ""
-
-#: main.cc:101
-msgid "be quiet"
-msgstr ""
-
-#: main.cc:102
-msgid "don't output rests or skips"
-msgstr ""
-
-#: main.cc:103
-msgid "DUR"
-msgstr ""
-
-#: main.cc:103
-msgid "set smallest duration"
-msgstr ""
-
-#: main.cc:104
-msgid "don't timestamp the output"
-msgstr ""
-
-#: main.cc:106
-msgid "be verbose"
-msgstr ""
-
-#: main.cc:108
-msgid "assume no double dotted notes"
-msgstr ""
-
-#: main.cc:115
-#, c-format
-msgid "Usage: %s [OPTION]... [FILE]"
-msgstr ""
-
-#: main.cc:117
-msgid "Translate MIDI-file to lilypond"
-msgstr ""
-
-#: main.cc:131
-#, c-format
-msgid "no_double_dots: %d\n"
-msgstr ""
-
-#: main.cc:133
-#, c-format
-msgid "no_rests: %d\n"
-msgstr ""
-
-#: main.cc:135
-#, c-format
-msgid "no_quantify_b_s: %d\n"
-msgstr ""
-
-#: main.cc:137
-#, c-format
-msgid "no_smaller_than: %d (1/%d)\n"
-msgstr ""
-
-#: main.cc:140
-#, c-format
-msgid "no_tuplets: %d\n"
-msgstr ""
-
-#: midi-parser.cc:64
-msgid "zero length string encountered"
-msgstr ""
-
-#: midi-score-parser.cc:44
-msgid "MIDI header expected"
-msgstr ""
-
-#: midi-score-parser.cc:49
-msgid "invalid header length"
-msgstr ""
-
-#: midi-score-parser.cc:52
-msgid "invalid MIDI format"
-msgstr ""
-
-#: midi-score-parser.cc:55
-msgid "invalid number of tracks"
-msgstr ""
-
-#: midi-score-parser.cc:58
-msgid "can't handle non-metrical time"
-msgstr ""
-
-#: midi-track-parser.cc:68
-#, c-format
-msgid "Junking note-end event: channel = %d, pitch = %d"
-msgstr ""
-
-#: midi-track-parser.cc:124
-msgid "invalid running status"
-msgstr ""
-
-#: midi-track-parser.cc:328
-msgid "unimplemented MIDI meta-event"
-msgstr ""
-
-#: midi-track-parser.cc:333
-msgid "invalid MIDI event"
-msgstr ""
-
-#: midi-track-parser.cc:348
-msgid "MIDI track expected"
-msgstr ""
-
-#: midi-track-parser.cc:353
-msgid "invalid track length"
-msgstr ""
diff -purN ../lilypond-1.5.28/po/nl.po ./po/nl.po
--- ../lilypond-1.5.28/po/nl.po	Sun Sep 16 17:09:58 2001
+++ ./po/nl.po	Thu Jan 31 13:17:54 2002
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.4.6\n"
-"POT-Creation-Date: 2001-09-09 17:41+0200\n"
+"POT-Creation-Date: 2002-01-29 23:08+0100\n"
 "PO-Revision-Date: 2001-09-09 17:34+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <janneke@gnu.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -23,298 +23,344 @@ msgstr ""
 "--add-comments --keyword=_\n"
 "Files: bow.cc int.cc\n"
 
-#: ly2dvi.py:115
-msgid "Generate .dvi with LaTeX for LilyPond"
-msgstr "Genereer .dvi met LaTeX voor LilyPond"
-
-#: data-file.cc:118 input.cc:85 ly2dvi.py:197 midi-parser.cc:100 mup2ly.py:93
-#: update-lily.py:119 warn.cc:23
+#: data-file.cc:118 input.cc:85 ly2dvi.py:113 midi2ly.py:148
+#: update-lily.py:136 warn.cc:23
 msgid "warning: "
 msgstr "waarschuwing: "
 
-#: input.cc:90 ly2dvi.py:212 ly2dvi.py:641 ly2dvi.py:659 ly2dvi.py:850
-#: mup2ly.py:98 mup2ly.py:188 update-lily.py:124 update-lily.py:212 warn.cc:9
-#: warn.cc:17
+#: input.cc:90 ly2dvi.py:116 ly2dvi.py:132 ly2dvi.py:691 ly2dvi.py:709
+#: midi2ly.py:163 midi2ly.py:1012 midi2ly.py:1081 update-lily.py:151
+#: update-lily.py:426 warn.cc:9 warn.cc:17
 msgid "error: "
 msgstr "fout: "
 
-#: ly2dvi.py:213 mup2ly.py:100 update-lily.py:126
+#: ly2dvi.py:133 midi2ly.py:164 update-lily.py:152
 msgid "Exiting ... "
 msgstr "Beëidigen ..."
 
-#: ly2dvi.py:271 mup2ly.py:158 update-lily.py:184
+#: ly2dvi.py:191 midi2ly.py:222 update-lily.py:210
 #, c-format
 msgid "Usage: %s [OPTION]... FILE"
 msgstr "Gebruik: %s [OPTIE]... BESTAND"
 
-#: ly2dvi.py:275 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:188
+#: ly2dvi.py:195 main.cc:151 midi2ly.py:226 update-lily.py:214
 msgid "Options:"
 msgstr "Opties:"
 
-#: ly2dvi.py:279 main.cc:124 main.cc:166 mup2ly.py:168 update-lily.py:192
+#: ly2dvi.py:199 main.cc:168 midi2ly.py:230 update-lily.py:218
 #, c-format
 msgid "Report bugs to %s"
 msgstr ""
 "Meld luizen in het programma aan %s;\n"
 "meld onjuistheden in de vertaling aan <janneke@gnu.org> of <hanwen@cs.uu.nl>"
 
-#: ly2dvi.py:307 mup2ly.py:185 update-lily.py:209
+#: ly2dvi.py:227 midi2ly.py:258 update-lily.py:246
 #, c-format
 msgid "Invoking `%s'"
 msgstr "Uitvoeren `%s'"
 
-#: ly2dvi.py:311 mup2ly.py:188 update-lily.py:212
+#: ly2dvi.py:231 midi2ly.py:262 update-lily.py:250
 #, c-format
 msgid "command exited with value %d"
 msgstr "opdracht eindigde met waarde %d"
 
-#: ly2dvi.py:313 mup2ly.py:190 update-lily.py:214
+#: ly2dvi.py:233 midi2ly.py:264 update-lily.py:252
 msgid "(ignored)"
 msgstr "(genegeerd)"
 
-#: ly2dvi.py:323
+#: ly2dvi.py:243 midi2ly.py:274 update-lily.py:262
 #, c-format
 msgid "Cleaning %s..."
 msgstr "Schoonmaken %s..."
 
-#: ly2dvi.py:338 mup2ly.py:214 update-lily.py:238
-#, c-format
-msgid "no such setting: %s"
-msgstr "geen dergelijke instelling: %s"
+#: ly2dvi.py:301
+msgid "Generate .dvi with LaTeX for LilyPond"
+msgstr "Genereer .dvi met LaTeX voor LilyPond"
 
-#: ly2dvi.py:351 main.cc:113
+#: ly2dvi.py:304 main.cc:115
 msgid "write Makefile dependencies for every input file"
 msgstr "schrijf Makefile afhankelijkheden voor elk invoerbestand"
 
-#: ly2dvi.py:352 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:252
+#: ly2dvi.py:305 main.cc:111 midi2ly.py:98 mup2ly.py:74 update-lily.py:86
 msgid "this help"
 msgstr "deze hulp"
 
-#: ly2dvi.py:353 main.cc:111 main.cc:116
+#: ly2dvi.py:306 main.cc:113 main.cc:118
 msgid "DIR"
 msgstr "DIR"
 
-#: ly2dvi.py:353
+#: ly2dvi.py:306
 msgid "add DIR to LilyPond's search path"
 msgstr "voeg DIR toe aan LilyPonds zoekpad"
 
-#: ly2dvi.py:354
+#: ly2dvi.py:307
 #, c-format
 msgid "keep all output, and name the directory %s.dir"
 msgstr "bewaar alle uitvoer, en noem de directory %s.dir"
 
-#: ly2dvi.py:355
+#: ly2dvi.py:308
 msgid "don't run LilyPond"
 msgstr "draai LilyPond niet"
 
-#: ly2dvi.py:356 main.cc:114
+#: ly2dvi.py:309 main.cc:116
 msgid "produce MIDI output only"
 msgstr "produceer alleen MIDI uitvoer"
 
-#: ly2dvi.py:357 ly2dvi.py:358 main.cc:99 main.cc:112 main.cc:115
+#: ly2dvi.py:310 ly2dvi.py:311 main.cc:114 main.cc:117 midi2ly.py:100
 msgid "FILE"
 msgstr "BESTAND"
 
-#: ly2dvi.py:357
+#: ly2dvi.py:310 midi2ly.py:100
 msgid "write ouput to FILE"
 msgstr "schrijf uitvoer naar BESTAND"
 
-#: ly2dvi.py:358
+#: ly2dvi.py:311
 msgid "find pfa fonts used in FILE"
 msgstr "zoek pfa fonts gebruikt in BESTAND"
 
-#: ly2dvi.py:360
+#: ly2dvi.py:313
 msgid "generate PostScript output"
 msgstr "genereer PostScipt uitvoer"
 
-#: ly2dvi.py:361
+#: ly2dvi.py:314
 msgid "KEY=VAL"
 msgstr "SEUTEL=WAARDE"
 
-#: ly2dvi.py:361
+#: ly2dvi.py:314
 msgid "change global setting KEY to VAL"
 msgstr "verander globale instelling SLEUTEL in WAARDE"
 
-#: ly2dvi.py:362 main.cc:119 mup2ly.py:1120 update-lily.py:256
+#: ly2dvi.py:315 main.cc:121 midi2ly.py:103 mup2ly.py:77 update-lily.py:90
 msgid "verbose"
 msgstr "breedsprakig"
 
-#: ly2dvi.py:363 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:257
+#: ly2dvi.py:316 main.cc:120 midi2ly.py:104 mup2ly.py:78 update-lily.py:91
 msgid "print version number"
 msgstr "druk versienummer af"
 
-#: ly2dvi.py:364 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:259
+#: ly2dvi.py:317 main.cc:122 midi2ly.py:105 mup2ly.py:79 update-lily.py:93
 msgid "show warranty and copyright"
 msgstr "toon garantie en auteursrechten"
 
-#: ly2dvi.py:386 ly2dvi.py:582 ly2dvi.py:607
+#: ly2dvi.py:406
+#, c-format
+msgid "no such setting: %s"
+msgstr "geen dergelijke instelling: %s"
+
+#: ly2dvi.py:434 ly2dvi.py:632 ly2dvi.py:657
 #, c-format
 msgid "Running %s..."
 msgstr "Uitvoeren %s..."
 
-#: ly2dvi.py:399
+#: ly2dvi.py:449
 #, c-format
 msgid "Analyzing %s..."
 msgstr "Analyseer %s..."
 
-#: ly2dvi.py:455
+#: ly2dvi.py:505
 #, c-format
 msgid "no lilypond output found for %s"
 msgstr "geen lilypond uitvoer gevonden voor %s"
 
-#: ly2dvi.py:497
+#: ly2dvi.py:547
 #, c-format
 msgid "invalid value: %s"
 msgstr "ongeldige waarde: %s"
 
-#: ly2dvi.py:641
+#: ly2dvi.py:691
 #, c-format
 msgid "not a PostScript file: `%s'"
 msgstr "geen PostScript bestand: `%s'"
 
-#: ly2dvi.py:659
+#: ly2dvi.py:709 midi2ly.py:1012 update-lily.py:426
 #, c-format
 msgid "getopt says: `%s'"
 msgstr "getopt zegt: `%s'"
 
-#: ly2dvi.py:826 scores.cc:44
+#: ly2dvi.py:820
+#, fuzzy, c-format
+msgid "filename should not contain spaces: `%s'"
+msgstr "Bevat reeds: `%s'"
+
+#: ly2dvi.py:885 scores.cc:44
 #, c-format
 msgid "dependencies output to `%s'..."
 msgstr "afhankelijkheden uitvoer naar `%s'..."
 
-#: ly2dvi.py:837
+#: ly2dvi.py:896 midi2ly.py:996
 #, c-format
 msgid "%s output to `%s'..."
 msgstr "%s uitvoer naar `%s'..."
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:839
-#: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
+#: includable-lexer.cc:49 lily-guile.cc:134 ly2dvi.py:898 scores.cc:136
+#: scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "kan bestand niet vinden: `%s'"
 
-#: ly2dvi.py:850
+#: ly2dvi.py:909 midi2ly.py:1081
 msgid "no files specified on command line."
 msgstr "geen bestanden gespecificeerd op de commandoregel."
 
-#: mup2ly.py:51
-msgid "Convert mup to ly"
-msgstr "Converteer mup naar ly"
+#: midi2ly.py:92
+msgid "Convert MIDI to LilyPond source"
+msgstr ""
 
-#: mup2ly.py:166
-#, c-format
-msgid "%s is far from completed.  Not all constructs are recognised."
-msgstr "%s is nog lang niet af.  Niet alle constructies worden herkend."
+#: midi2ly.py:95
+msgid "print absolute pitches"
+msgstr ""
 
-#: mup2ly.py:964
-#, c-format
-msgid "no such context: %s"
-msgstr "geen context als: `%s'"
+#: midi2ly.py:96 midi2ly.py:101
+msgid "DUR"
+msgstr "DUUR"
+
+#: midi2ly.py:96
+msgid "quantise note durations on DUR"
+msgstr ""
+
+#: midi2ly.py:97
+msgid "print explicit durations"
+msgstr ""
+
+#: midi2ly.py:99
+#, fuzzy
+msgid "ALT[:MINOR]"
+msgstr "ACC[:MINEUR]"
+
+#: midi2ly.py:99
+#, fuzzy
+msgid "set key: ALT=+sharps|-flats; MINOR=1"
+msgstr "zet toonsoort: ACC +kruizen/-mollen; :1 mineur"
+
+#: midi2ly.py:101
+msgid "quantise note starts on DUR"
+msgstr ""
+
+#: midi2ly.py:102
+msgid "DUR*NUM/DEN"
+msgstr ""
 
-#: mup2ly.py:1115
+#: midi2ly.py:102
+msgid "allow tuplet durations DUR*NUM/DEN"
+msgstr ""
+
+#: midi2ly.py:106
+msgid "treat every text as a lyric"
+msgstr ""
+
+#: midi2ly.py:1027
+msgid "Example:"
+msgstr ""
+
+#: mup2ly.py:69
+#, fuzzy
+msgid "Convert mup to LilyPond source"
+msgstr "Converteer mup naar ly"
+
+#: mup2ly.py:72
 msgid "debug"
 msgstr "debug"
 
-#: mup2ly.py:1116
+#: mup2ly.py:73
 msgid "define macro NAME [optional expansion EXP]"
 msgstr "definieer macro NAAM [optionele expansie EXP]"
 
-#: main.cc:115 mup2ly.py:1118
+#: main.cc:117 mup2ly.py:75
 msgid "write output to FILE"
 msgstr "schrijf uitvoer naar BESTAND"
 
-#: mup2ly.py:1119
+#: mup2ly.py:76
 msgid "only pre-process"
 msgstr "alleen pre-processen"
 
-#: mup2ly.py:1200
+#: mup2ly.py:827
+#, c-format
+msgid "no such context: %s"
+msgstr "geen context als: `%s'"
+
+#: mup2ly.py:1051
 #, c-format
 msgid "Processing `%s'..."
 msgstr "Verwerken van `%s'..."
 
-#: mup2ly.py:1219
+#: mup2ly.py:1070
 #, c-format
 msgid "Writing `%s'..."
 msgstr "Schrijven van `%s'..."
 
-#: update-lily.py:52
+#: update-lily.py:75
 msgid "Fetch and rebuild from latest source package"
 msgstr "Grijp en herbouw van meest recente source pakket"
 
-#: update-lily.py:224
-#, c-format
-msgid "Cleaning `%s'..."
-msgstr "Schoonmaken van `%s'..."
-
-#: update-lily.py:244
+#: update-lily.py:78
 #, c-format
 msgid "unpack and build in DIR [%s]"
 msgstr "pak uit en bouw in DIR [%s]"
 
-#: update-lily.py:245
+#: update-lily.py:79
 msgid "execute COMMAND, subtitute:"
 msgstr "voer COMMAND uit, substitueer:"
 
-#: update-lily.py:246
+#: update-lily.py:80
 msgid "%b: build root"
 msgstr "%b: bouw-root"
 
-#: update-lily.py:247
+#: update-lily.py:81
 #, c-format
 msgid "%n: package name"
 msgstr "%n: pakketnaam"
 
-#: update-lily.py:248
+#: update-lily.py:82
 msgid "%r: release directory"
 msgstr "%r: uitgave directory"
 
-#: update-lily.py:249
+#: update-lily.py:83
 msgid "%t: tarball"
 msgstr "%t: tar-bal"
 
-#: update-lily.py:250
+#: update-lily.py:84
 msgid "%v: package version"
 msgstr "%v: pakketversie"
 
-#: update-lily.py:253
+#: update-lily.py:87
 #, c-format
 msgid "keep all output, and name the directory %s"
 msgstr "bewaar alle uitvoer, en noem de directory %s"
 
-#: update-lily.py:254
+#: update-lily.py:88
 msgid "upon failure notify EMAIL[,EMAIL]"
 msgstr "bij fout bericht EMAIL[,EMAIL]"
 
-#: update-lily.py:255
+#: update-lily.py:89
 msgid "remove previous build"
 msgstr "verwijder vorige bouw"
 
-#: update-lily.py:258
+#: update-lily.py:92
 #, c-format
 msgid "fetch and build URL [%s]"
 msgstr "grijp en bouw URL [%s]"
 
-#: update-lily.py:366
+#: update-lily.py:397
 #, c-format
 msgid "Listing `%s'..."
 msgstr "Lijst van `%s'"
 
-#: update-lily.py:427
+#: update-lily.py:465
 #, c-format
 msgid "latest is: %s"
 msgstr "meest recente is: %s"
 
-#: update-lily.py:428
+#: update-lily.py:466
 #, c-format
 msgid "relax, %s is up to date"
 msgstr "ontspan, %s is bij de tijd"
 
-#: update-lily.py:436 update-lily.py:449
+#: update-lily.py:474 update-lily.py:487
 #, c-format
 msgid "Fetching `%s'..."
 msgstr "Grijpen van `%s'..."
 
-#: update-lily.py:458
+#: update-lily.py:496
 #, c-format
 msgid "Building `%s'..."
 msgstr "Bouwen van `%s'..."
@@ -355,8 +401,8 @@ msgstr "positie onbekend"
 msgid "can't map file"
 msgstr "kan bestand niet inkaarten"
 
-#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45
-#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
+#: mapped-file-storage.cc:87 scores.cc:48 simple-file-storage.cc:44
+#: streams.cc:37 text-stream.cc:23
 #, c-format
 msgid "can't open file: `%s'"
 msgstr "kan bestand niet openen: `%s'"
@@ -378,6 +424,16 @@ msgstr "programmeerfout: "
 msgid " (Continuing; cross thumbs)"
 msgstr " (Ga verder; duim maar)"
 
+#: accidental-engraver.cc:136
+#, fuzzy, c-format
+msgid "unknown accidental typesetting: %s"
+msgstr "onbekende ontsnapte string: `\\%s'"
+
+#: accidental-engraver.cc:139
+#, c-format
+msgid "Accidental typesetting must be pair: %s"
+msgstr ""
+
 #: afm.cc:59
 #, c-format
 msgid "can't find character number: %d"
@@ -439,35 +495,46 @@ msgstr "Geef op"
 msgid "Can't switch translators, I'm there already"
 msgstr "Kan niet wisselen van vertaler, ben al hier"
 
-#: beam-engraver.cc:91 beam-engraver.cc:124
+#: bar-check-iterator.cc:58
+#, c-format
+msgid "barcheck failed at: %s"
+msgstr "maatstreep controle gefaald op: %s"
+
+#: beam-engraver.cc:93 beam-engraver.cc:126
 msgid "can't find start of beam"
 msgstr "kan start van waardestreep niet vinden"
 
-#: beam-engraver.cc:158
+#: beam-engraver.cc:150
 msgid "already have a beam"
 msgstr "heb al een waardestreep"
 
-#: beam-engraver.cc:222
+#: beam-engraver.cc:216
 msgid "unterminated beam"
 msgstr "onbeëindigde waardestreep"
 
-#: beam-engraver.cc:255 chord-tremolo-engraver.cc:195
+#: beam-engraver.cc:249 chord-tremolo-engraver.cc:193
 msgid "stem must have Rhythmic structure"
 msgstr "stok moet Ritmische structuur hebben"
 
-#: beam-engraver.cc:267
+#: beam-engraver.cc:261
 msgid "stem doesn't fit in beam"
 msgstr "stok past niet in waardestreep"
 
-#: beam-engraver.cc:268
+#: beam-engraver.cc:262
 msgid "beam was started here"
 msgstr "waardestreep werd hier gestart"
 
-#: beam.cc:86
-msgid "beam has less than two stems"
+#: beam.cc:93
+#, fuzzy
+msgid "beam has less than two visible stems"
+msgstr "waardestreep heeft minder dan twee stokken"
+
+#: beam.cc:98
+#, fuzzy
+msgid "Beam has less than two stems. Removing beam."
 msgstr "waardestreep heeft minder dan twee stokken"
 
-#: beam.cc:637
+#: beam.cc:660
 msgid "weird beam vertical offset"
 msgstr "rare verticale waardestreep verplaatsing"
 
@@ -495,7 +562,7 @@ msgstr "Ben er zelf een"
 msgid "none of these in my family"
 msgstr "geen van deze in mijn gezin"
 
-#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192
+#: chord-tremolo-engraver.cc:139 percent-repeat-engraver.cc:182
 msgid "unterminated chord tremolo"
 msgstr "onbeëindigd akkoordtremolo"
 
@@ -513,7 +580,7 @@ msgstr "ongeldige aftrek: maakt geen dee
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr "ongeldige inversie toon: geen onderdeel van accoord: %s"
 
-#: collision.cc:245
+#: collision.cc:281
 msgid "Too many clashing notecolumns.  Ignoring them."
 msgstr "Te veel botsende nootkolommen.  Negeer ze."
 
@@ -521,27 +588,27 @@ msgstr "Te veel botsende nootkolommen.  
 msgid "NaN"
 msgstr "NaN"
 
-#: dynamic-engraver.cc:197 span-dynamic-performer.cc:86
+#: dynamic-engraver.cc:195 span-dynamic-performer.cc:82
 msgid "can't find start of (de)crescendo"
 msgstr "kan start van (de)crescendo niet vinden"
 
-#: dynamic-engraver.cc:222
+#: dynamic-engraver.cc:220
 msgid "already have a crescendo"
 msgstr "heb al een crescendo"
 
-#: dynamic-engraver.cc:223
+#: dynamic-engraver.cc:221
 msgid "already have a decrescendo"
 msgstr "heb al een decrescendo"
 
-#: dynamic-engraver.cc:317
+#: dynamic-engraver.cc:315
 msgid "unterminated (de)crescendo"
 msgstr "onbeëindigd (de)crescendo"
 
-#: extender-engraver.cc:97
+#: extender-engraver.cc:96
 msgid "unterminated extender"
 msgstr "onbeëindigde extender"
 
-#: extender-engraver.cc:109
+#: extender-engraver.cc:108
 msgid "Nothing to connect extender to on the left.  Ignoring extender request."
 msgstr ""
 "Niets om extender aan linkerkant aan vast te maken.  Negeer extender verzoek."
@@ -554,7 +621,7 @@ msgstr "niemand om een herhalings haak a
 msgid "couldn't find any font satisfying "
 msgstr "kon geen enkel font vinden dat voldoet aan "
 
-#: gourlay-breaking.cc:157
+#: gourlay-breaking.cc:168
 msgid "No feasible line breaking found"
 msgstr "Geen doenbare regelafbreuk gevonden"
 
@@ -566,24 +633,24 @@ msgstr "decrescendo te klein"
 msgid "crescendo too small"
 msgstr "crescendo te klein"
 
-#: hyphen-engraver.cc:90
+#: hyphen-engraver.cc:89
 msgid "unterminated hyphen"
 msgstr "onafgesloten waardestreep"
 
-#: hyphen-engraver.cc:102
+#: hyphen-engraver.cc:101
 msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen request."
 msgstr ""
 "Niets om streepje aan linkerkant aan vast te maken.  Negeer streepje verzoek."
 
-#: key-engraver.cc:99
+#: key-engraver.cc:93
 msgid "Conflicting key signatures found."
 msgstr "Tegenstrijdige toonsoorten gevonden."
 
-#: key-engraver.cc:100
+#: key-engraver.cc:94
 msgid "This was the other key definition."
 msgstr "Dit was de andere toonsoort definitie."
 
-#: key-performer.cc:77
+#: key-performer.cc:91
 msgid "FIXME: key change merge"
 msgstr "MAAKME: toonsoort sleutel samenvoeging"
 
@@ -592,7 +659,7 @@ msgstr "MAAKME: toonsoort sleutel samenv
 msgid "Kpathsea couldn't find TFM file `%s'"
 msgstr "kan bestand niet vinden: `%s'"
 
-#: lily-guile.cc:141
+#: lily-guile.cc:136
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(zoekpad: `%s')"
@@ -602,12 +669,12 @@ msgstr "(zoekpad: `%s')"
 msgid "Element count %d."
 msgstr "Aantal elementen: %d."
 
-#: line-of-score.cc:313 paper-score.cc:77
+#: line-of-score.cc:325 paper-score.cc:76
 #, c-format
 msgid "Element count %d "
 msgstr "Aantal elementen: %d."
 
-#: line-of-score.cc:327
+#: line-of-score.cc:339
 msgid "Calculating column positions..."
 msgstr "Berekenen van kolomposities..."
 
@@ -620,62 +687,62 @@ msgid "Huh? Melismatic note found to hav
 msgstr "Huh?  Melismatische noot blijkt bijbehorende liedtekst te hebben."
 
 #. print example usage:  lilypond -e "(set-lily-option 'help 0)" ?
-#: main.cc:105
+#: main.cc:107
 msgid "EXPR"
 msgstr "EXPR"
 
-#: main.cc:105
+#: main.cc:107
 msgid "evalute EXPR as Scheme after .scm init is read"
 msgstr "evalueer EXPR als Scheme nadat .scm init is gelezen"
 
 #. another bug in option parser: --output=foe is taken as an abbreviation
 #. for --output-format
-#: main.cc:108
+#: main.cc:110
 msgid "EXT"
 msgstr "EXT"
 
-#: main.cc:108
+#: main.cc:110
 #, fuzzy
 msgid "use output format EXT (tex [default], pdftex, ps, scm or as)"
 msgstr "gebruik uitvoer formaat EXT (scm, ps, tex of as)"
 
-#: main.cc:110
+#: main.cc:112
 msgid "FIELD"
 msgstr "VELD"
 
-#: main.cc:110
+#: main.cc:112
 msgid "write header field to BASENAME.FIELD"
 msgstr "schrijf kop veld naar BASISNAAM.VELD"
 
-#: main.cc:111
+#: main.cc:113
 msgid "add DIR to search path"
 msgstr "voeg DIR toe aan zoekpad"
 
-#: main.cc:112
+#: main.cc:114
 msgid "use FILE as init file"
 msgstr "gebruik BESTAND als initialisatiebestand"
 
-#: main.cc:116
+#: main.cc:118
 msgid "prepend DIR to dependencies"
 msgstr "voeg DIR voor aan afhankelijkheden"
 
-#: main.cc:117
+#: main.cc:119
 msgid "inhibit file output naming and exporting"
 msgstr "verbied naamgeving van uitvoerbestand en exportering"
 
 #.
 #. No version number or newline here. It confuses help2man
 #.
-#: main.cc:137
+#: main.cc:139
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Gebruik: %s [OPTIE]... BESTAND..."
 
-#: main.cc:139
+#: main.cc:141
 msgid "Typeset music and or play MIDI from FILE"
 msgstr "Zet muziek en of speel MIDI van BESTAND"
 
-#: main.cc:143
+#: main.cc:145
 msgid ""
 "LilyPond is a music typesetter.  It produces beautiful sheet music\n"
 "using a high level description file as input.  LilyPond is part of \n"
@@ -685,11 +752,11 @@ msgstr ""
 "uitgaande van een hoog niveau beschrijving bestand.  LilyPond \n"
 "maakt deel uit van het GNU Project.\n"
 
-#: main.cc:153
+#: main.cc:155
 msgid "This binary was compiled with the following options:"
 msgstr "Dit programma is gecompileerd met de volgende instellingen:"
 
-#: main.cc:56 main.cc:174
+#: main.cc:176
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -701,16 +768,16 @@ msgstr ""
 "onder bepaalde voorwaarden.  Roep aan als `%s --warranty' voor meer\n"
 "informatie.\n"
 
-#: main.cc:63 main.cc:181 main.cc:193
+#: main.cc:183 main.cc:195
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s "
 
-#: main.cc:191
+#: main.cc:193
 msgid "GNU LilyPond -- The music typesetter"
 msgstr "GNU LilyPond -- De Muziekzetter"
 
-#: main.cc:72 main.cc:199
+#: main.cc:201
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License version 2\n"
@@ -758,42 +825,42 @@ msgstr "rare toonhoogte"
 msgid "can't find `%s' context"
 msgstr "kan `%s' context niet vinden"
 
-#: music.cc:239
+#: music.cc:144
+#, c-format
+msgid "Transposition by %s makes accidental larger than two"
+msgstr "Transponering van %s geeft tripel kruizen/mollen"
+
+#: music.cc:249
 msgid "ly_get_mus_property (): Not a Music"
 msgstr "ly_get_mus_property (): Geen Muziek"
 
-#: music.cc:253
+#: music.cc:263
 msgid "ly_set_mus_property (): Not a symbol"
 msgstr "ly_set_mus_property (): Geen symbool"
 
-#: music.cc:265
+#: music.cc:275
 msgid "ly_set_mus_property ():  not of type Music"
 msgstr "ly_set_mus_property ():  niet van type Muziek"
 
-#: music.cc:279
+#: music.cc:289
 msgid "ly_make_music (): Not a string"
 msgstr "ly_make_music (): Geen string"
 
-#: music.cc:299
+#: music.cc:309
 msgid "ly_music_name (): Not a music expression"
 msgstr "ly_make_music (): Geen muziek expressie"
 
-#: musical-request.cc:28
-#, c-format
-msgid "Transposition by %s makes accidental larger than two"
-msgstr "Transponering van %s geeft tripel kruizen/mollen"
-
-#: my-lily-lexer.cc:140
+#: my-lily-lexer.cc:139
 #, c-format
 msgid "Identifier name is a keyword: `%s'"
 msgstr "Identifier naam is een sleutelwoord: `%s'"
 
-#: my-lily-lexer.cc:160
+#: my-lily-lexer.cc:159
 #, c-format
 msgid "error at EOF: %s"
 msgstr "fout bij EOF: %s"
 
-#: midi-score-parser.cc:94 my-lily-parser.cc:47
+#: my-lily-parser.cc:47
 msgid "Parsing..."
 msgstr "Ontleden..."
 
@@ -811,32 +878,18 @@ msgstr "Schroot verzoek: `%s'"
 msgid "paper output to `%s'..."
 msgstr "papier uitvoer naar %s..."
 
-#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99
+#: paper-outputter.cc:60
 msgid ", at "
 msgstr ", bij "
 
-#: paper-outputter.cc:232
-#, c-format
-msgid "writing header field `%s' to `%s'..."
-msgstr "Schijven van kop veld %s naar bestand %s..."
-
-#: paper-score.cc:80
+#: paper-score.cc:79
 msgid "Preprocessing elements..."
 msgstr "Voorbewerken van elementen..."
 
-#: paper-score.cc:114
+#: paper-score.cc:113
 msgid "Outputting Score, defined at: "
 msgstr "Uitvoer van Score, gedefinieerd op: "
 
-#: paper-stream.cc:41
-#, c-format
-msgid "can't create directory: `%s'"
-msgstr "kan directory niet scheppen: `%s'"
-
-#: paper-stream.cc:55
-msgid "Error syncing file (disk full?)"
-msgstr "Fout bij synchroniseren van bestand (schijf vol?)"
-
 #.
 #. We could change the current translator's id, but that would make
 #. errors hard to catch
@@ -853,7 +906,7 @@ msgstr "Ben er zelf een: `%s'"
 msgid "none of these in my family: `%s'"
 msgstr "geen van deze in mijn gezin: `%s'"
 
-#: percent-repeat-engraver.cc:117
+#: percent-repeat-engraver.cc:116
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr "Weet niet hoe procent herhaling van deze lengte af te handelen."
 
@@ -869,12 +922,17 @@ msgstr "Spoor ... "
 msgid "Creator: "
 msgstr "Schepper: "
 
-#: performance.cc:113
+#: performance.cc:103
+#, fuzzy
+msgid "at "
+msgstr ", bij "
+
+#: performance.cc:114
 #, c-format
 msgid "from musical definition: %s"
 msgstr "van muzikale definitie: %s"
 
-#: performance.cc:168
+#: performance.cc:169
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "MIDI uitvoer naar %s..."
@@ -887,8 +945,8 @@ msgstr "onbeëindigde fraseringsboog"
 msgid "can't find start of phrasing slur"
 msgstr "kan start van fraseringsboog niet vinden"
 
-#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154
-#: piano-pedal-performer.cc:85
+#: piano-pedal-engraver.cc:141 piano-pedal-engraver.cc:153
+#: piano-pedal-performer.cc:82
 #, c-format
 msgid "can't find start of piano pedal: `%s'"
 msgstr "kan start van piano pedaal niet vinden: `%s'"
@@ -897,7 +955,35 @@ msgstr "kan start van piano pedaal niet 
 msgid "Pitch arguments out of range"
 msgstr "Toonhoogte argumenten buiten schaal"
 
-#: property-engraver.cc:121
+#: porrectus.cc:34
+msgid "(left_head == 0)"
+msgstr ""
+
+#: porrectus.cc:45
+msgid "undefined left_head"
+msgstr ""
+
+#: porrectus.cc:64
+msgid "(right_head == 0)"
+msgstr ""
+
+#: porrectus.cc:75
+msgid "undefined right_head"
+msgstr ""
+
+#: porrectus.cc:164
+msgid "junking lonely porrectus"
+msgstr ""
+
+#: porrectus.cc:174
+msgid "porrectus style undefined; using mensural"
+msgstr ""
+
+#: porrectus.cc:301
+msgid "ascending vaticana style porrectus"
+msgstr ""
+
+#: property-engraver.cc:116
 #, c-format
 msgid ""
 "`%s' is deprecated.  Use\n"
@@ -906,7 +992,7 @@ msgstr ""
 "`%s' is verouderd.  Gebruik\n"
 " \\property %s.%s \\override #'%s = #%s"
 
-#: property-engraver.cc:145
+#: property-engraver.cc:140
 #, c-format
 msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s"
 msgstr "Verkeerd type voor property: %s, type: %s, gevonden: %s, type: %s"
@@ -923,25 +1009,25 @@ msgstr "te veel noten voor bosting met r
 msgid "Scheme options:"
 msgstr "Scheme opties:"
 
-#: score-engraver.cc:189
+#: score-engraver.cc:178
 #, c-format
 msgid "unbound spanner `%s'"
 msgstr "ongebonden spanner `%s'"
 
-#: score.cc:78
+#: score.cc:88
 msgid "Interpreting music..."
 msgstr "Vertolken van muziek..."
 
-#: score.cc:92
+#: score.cc:102
 msgid "Need music in a score"
 msgstr "Heb muziek nodig in een partituur"
 
 #. should we? hampers debugging.
-#: score.cc:105
+#: score.cc:115
 msgid "Errors found/*, not processing score*/"
 msgstr "Fouten gevonden, /*verwerk partituur niet */"
 
-#: score.cc:112
+#: score.cc:122
 #, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr "duur: %.2f seconden"
@@ -955,7 +1041,7 @@ msgstr "Partituur bevat fouten; zal hem 
 msgid "Now processing: `%s'"
 msgstr "Nu wordt verwerkt: `%s'"
 
-#: script-engraver.cc:66
+#: script-engraver.cc:65
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr "Weet niet hoe articulatie te vertolken `%s'"
@@ -965,18 +1051,18 @@ msgstr "Weet niet hoe articulatie te ver
 msgid "Separation_item:  I've been drinking too much"
 msgstr "Separation_item:  Ik heb te veel gedronken"
 
-#: simple-spacer.cc:200
+#: simple-spacer.cc:202
 #, c-format
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:125
+#: slur-engraver.cc:124
 msgid "unterminated slur"
 msgstr "onbeëindigde bindingsboog"
 
 #. How to shut up this warning, when Voice_devnull_engraver has
 #. eaten start request?
-#: slur-engraver.cc:142
+#: slur-engraver.cc:141
 msgid "can't find start of slur"
 msgstr "kan start van bindingsboog niet vinden"
 
@@ -984,11 +1070,11 @@ msgstr "kan start van bindingsboog niet 
 msgid "Putting slur over rest.  Ignoring."
 msgstr "Zet bindingsboog over rust.  Negeer."
 
-#: slur.cc:383
+#: slur.cc:393
 msgid "Slur over rest?"
 msgstr "Boogje over rust?"
 
-#: stem-engraver.cc:115
+#: stem-engraver.cc:117
 #, c-format
 msgid "Adding note head to incompatible stem (type = %d)"
 msgstr "Voeg noot bolletje toe aan onverenigbare stok (type = %d)"
@@ -997,15 +1083,24 @@ msgstr "Voeg noot bolletje toe aan onver
 msgid "Weird stem size; check for narrow beams"
 msgstr "Vreemde stoklengte; controleer op krappe waardestrepen"
 
-#: text-spanner-engraver.cc:94
+#: streams.cc:33
+#, c-format
+msgid "can't create directory: `%s'"
+msgstr "kan directory niet scheppen: `%s'"
+
+#: streams.cc:47
+msgid "Error syncing file (disk full?)"
+msgstr "Fout bij synchroniseren van bestand (schijf vol?)"
+
+#: text-spanner-engraver.cc:92
 msgid "can't find start of text spanner"
 msgstr "kan start van tekst spanner niet vinden"
 
-#: text-spanner-engraver.cc:114
+#: text-spanner-engraver.cc:112
 msgid "already have a text spanner"
 msgstr "heb al een tekst spanner"
 
-#: text-spanner-engraver.cc:169
+#: text-spanner-engraver.cc:167
 msgid "unterminated text spanner"
 msgstr "onbeëindigde tekst spanner"
 
@@ -1029,60 +1124,53 @@ msgstr ""
 msgid "can't find ascii character: %d"
 msgstr "kan ascii teken niet vinden: %d"
 
-#. How to shut up this warning, when no notes appeared because
-#. they were suicided by Thread_devnull_engraver?
-#: tie-engraver.cc:220 tie-performer.cc:173
-msgid "No ties were created!"
-msgstr "Geen overbindingen geschapen!"
-
-#: tie-engraver.cc:240
+#: tie-engraver.cc:220
 msgid "lonely tie"
 msgstr "eenzame overbinding"
 
+#: tie-performer.cc:161
+msgid "No ties were created!"
+msgstr "Geen overbindingen geschapen!"
+
 #: time-scaled-music-iterator.cc:25
 msgid "no one to print a tuplet start bracket"
 msgstr "niemand om een x-ool start haak af te drukken"
 
-#: timing-translator.cc:37
-#, c-format
-msgid "barcheck failed at: %s"
-msgstr "maatstreep controle gefaald op: %s"
-
-#: translator-ctors.cc:40
+#: translator-ctors.cc:61
 #, c-format
 msgid "unknown translator: `%s'"
 msgstr "onbekende translator: `%s'"
 
-#: translator-def.cc:99
+#: translator-def.cc:87
 msgid "Program has no such type"
 msgstr "Programma heeft geen dergelijk type"
 
-#: translator-def.cc:105
+#: translator-def.cc:93
 #, c-format
 msgid "Already contains: `%s'"
 msgstr "Bevat reeds: `%s'"
 
-#: translator-def.cc:106
+#: translator-def.cc:94
 #, c-format
 msgid "Not adding translator: `%s'"
 msgstr "Voeg translator niet toe: `%s'"
 
-#: translator-def.cc:224
+#: translator-def.cc:212
 #, c-format
 msgid "can't find: `%s'"
 msgstr "kan niet vinden: `%s'"
 
-#: translator-group.cc:145
+#: translator-group.cc:147
 #, c-format
 msgid "can't find or create `%s' called `%s'"
 msgstr "kan niet vinden of scheppen `%s' genaamd `%s'"
 
-#: translator-group.cc:230
+#: translator-group.cc:232
 #, c-format
 msgid "can't find or create: `%s'"
 msgstr "kan niet vinden of scheppen: `%s'"
 
-#: translator-group.cc:413
+#: translator-group.cc:407
 #, c-format
 msgid ""
 "Can't find property type-check for `%s'.  Perhaps you made a typing error? "
@@ -1090,350 +1178,292 @@ msgid ""
 msgstr ""
 "Kan geen type-controle vinden voor property `%s'.  Misschien een tikfout?"
 
-#: translator-group.cc:427
+#: translator-group.cc:421
 #, c-format
 msgid "Type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr "Type contole gefaald voor `%s'; waarde `%s' moet type hebben: `%s'"
 
 #. programming_error?
-#: translator-group.cc:446
+#: translator-group.cc:440
 msgid "ly-get-trans-property: expecting a Translator_group argument"
 msgstr "ly-get-trans-property: verwacht een Translator_group argument"
 
-#: volta-engraver.cc:88
+#: volta-engraver.cc:108
 msgid "No volta spanner to end"
 msgstr "Geen volta spanner te beëindigen"
 
-#: volta-engraver.cc:105
+#: volta-engraver.cc:125
 msgid "Already have a volta spanner.  Stopping that one prematurely."
 msgstr "Heb al een volta spanner.  Stop die nu voortijdig."
 
-#: volta-engraver.cc:109
+#: volta-engraver.cc:129
 msgid "Also have a stopped spanner.  Giving up."
 msgstr "Heb ook al een gestopte spanner.   Geef op."
 
-#: parser.yy:121
+#: parser.yy:129
 #, c-format
 msgid "Expecting %d arguments"
 msgstr "Verwacht %d argumenten"
 
-#: parser.yy:423
+#: parser.yy:434
 msgid "Identifier should have  alphabetic characters only"
 msgstr "Identifier zou alleen alfabetische tekens moeten hebben"
 
-#: parser.yy:697
+#: parser.yy:715
 msgid "More alternatives than repeats.  Junking excess alternatives."
 msgstr ""
 "Meer alternatieven dan herhalingen.  Schroot overvloedige alternatieven."
 
-#: parser.yy:761
+#: parser.yy:767
 msgid "Second argument must be a symbol"
 msgstr "Tweede argument moet een symbool zijn"
 
-#: parser.yy:766
+#: parser.yy:772
 msgid "First argument must be a procedure taking 1 argument"
 msgstr "Eerste argument moet een procedure zijn met 1 argument"
 
-#: parser.yy:1298
+#: parser.yy:1315
 msgid "Expecting string as script definition"
 msgstr "Verwacht string voor script definitie"
 
-#: parser.yy:1308
+#: parser.yy:1325
 msgid "Can't specify direction for this request"
 msgstr "Kan richting voor dit verzoek niet specificeren"
 
-#: parser.yy:1433
+#: parser.yy:1451
 msgid "Expecting musical-pitch value"
 msgstr "Verwacht musical-pitch waarde"
 
-#: parser.yy:1444
+#: parser.yy:1462
 msgid "Must have duration object"
 msgstr "Moet duur object hebben"
 
-#: parser.yy:1453 parser.yy:1461
+#: parser.yy:1471 parser.yy:1479
 msgid "Have to be in Lyric mode for lyrics"
 msgstr "Moet in Lyric modus zijn voor liedteksten"
 
-#: parser.yy:1614 parser.yy:1671
+#: parser.yy:1638 parser.yy:1691
 #, c-format
 msgid "not a duration: %d"
 msgstr "geen duur: %d"
 
-#: parser.yy:1682
+#: parser.yy:1752
 msgid "Have to be in Note mode for notes"
 msgstr "Moet in Note modus zijn voor noten"
 
-#: parser.yy:1765
+#: parser.yy:1845
 msgid "Have to be in Chord mode for chords"
 msgstr "Moet in Chord modus zijn voor accoorden"
 
-#: parser.yy:1945
+#: parser.yy:2025
 msgid "need integer number arg"
 msgstr "heb integer getal arg nogig"
 
-#: lexer.ll:174
+#: parser.yy:2097
+msgid "Suspect duration found following this beam"
+msgstr ""
+
+#: lexer.ll:175
 msgid "EOF found inside a comment"
 msgstr "EOF gevonden in een kommentaar"
 
-#: lexer.ll:188
+#: lexer.ll:189
 msgid "\\maininput disallowed outside init files"
 msgstr "\\maininput niet toegestaan buiten init bestanden"
 
-#: lexer.ll:212
+#: lexer.ll:213
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "verkeerde of ongedefiniëerde identifier: `%s'"
 
 #. backup rule
-#: lexer.ll:221
+#: lexer.ll:222
 msgid "Missing end quote"
 msgstr "Aanhalingsteken sluiten mist"
 
 #. backup rule
-#: lexer.ll:243 lexer.ll:247
+#: lexer.ll:244 lexer.ll:248
 msgid "white expected"
 msgstr "wit verwacht"
 
-#: lexer.ll:256
+#: lexer.ll:257
 msgid "Can't evaluate Scheme in safe mode"
 msgstr "Kan Scheme niet evalueren in veilige modus"
 
-#: lexer.ll:349
+#: lexer.ll:358
 msgid "Brace found at end of lyric. Did you forget a space?"
 msgstr "Accolade gevonden aan het eind van liedtektst.  Een spatie vergeten?"
 
-#: lexer.ll:457
+#: lexer.ll:468
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "ongeldig teken: `%c'"
 
-#: lexer.ll:538
+#: lexer.ll:554
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "onbekende ontsnapte string: `\\%s'"
 
-#: lexer.ll:617
+#: lexer.ll:639
 #, c-format
 msgid "Oldest supported input version: %s"
 msgstr "Oudst ondersteunde invoerversie: %s"
 
-#: lexer.ll:629
+#: lexer.ll:651
 #, c-format
 msgid "incorrect lilypond version: %s (%s, %s)"
 msgstr "verkeerde lilypond versie: %s (%s, %s)"
 
-#: lexer.ll:630
+#: lexer.ll:652
 msgid "Consider converting the input with the convert-ly script"
 msgstr "Overweeg de invoer te converteren met het convert-ly script"
 
-#: lilypond-item.cc:161
-#, c-format
-msgid "#32 in quarter: %d"
-msgstr "#32 in kwart: %d"
+#~ msgid "%s is far from completed.  Not all constructs are recognised."
+#~ msgstr "%s is nog lang niet af.  Niet alle constructies worden herkend."
 
-#: lilypond-score.cc:108
-#, c-format
-msgid "LY output to `%s'..."
-msgstr "LY uitvoer naar `%s'..."
+#~ msgid "Cleaning `%s'..."
+#~ msgstr "Schoonmaken van `%s'..."
 
-#: lilypond-score.cc:119
-#, c-format
-msgid "track %d:"
-msgstr "spoor %d:"
+#~ msgid "writing header field `%s' to `%s'..."
+#~ msgstr "Schijven van kop veld %s naar bestand %s..."
 
-#: lilypond-score.cc:155
-msgid "Processing..."
-msgstr "Verwerken..."
+#~ msgid "#32 in quarter: %d"
+#~ msgstr "#32 in kwart: %d"
 
-#: lilypond-score.cc:164
-msgid "Creating voices..."
-msgstr "Scheppen van stemmen..."
+#~ msgid "LY output to `%s'..."
+#~ msgstr "LY uitvoer naar `%s'..."
 
-#: lilypond-score.cc:168
-msgid "track "
-msgstr "spoor "
+#~ msgid "track %d:"
+#~ msgstr "spoor %d:"
 
-#: lilypond-score.cc:177
-msgid "NOT Filtering tempo..."
-msgstr "NIET Filteren van tempo..."
+#~ msgid "Processing..."
+#~ msgstr "Verwerken..."
 
-#: lilypond-score.cc:186
-msgid "NOT Quantifying columns..."
-msgstr "NIET Kwantificeren van kolommen..."
+#~ msgid "Creating voices..."
+#~ msgstr "Scheppen van stemmen..."
 
-#: lilypond-score.cc:190
-msgid "Quantifying columns..."
-msgstr "Kwantificeren van kolommen..."
+#~ msgid "track "
+#~ msgstr "spoor "
 
-#: lilypond-score.cc:223
-msgid "Settling columns..."
-msgstr "Zetten van kolommen..."
+#~ msgid "NOT Filtering tempo..."
+#~ msgstr "NIET Filteren van tempo..."
 
-#: lilypond-staff.cc:209
-msgid "% MIDI copyright:"
-msgstr "% MIDI copyright:"
+#~ msgid "NOT Quantifying columns..."
+#~ msgstr "NIET Kwantificeren van kolommen..."
 
-#: lilypond-staff.cc:210
-msgid "% MIDI instrument:"
-msgstr "% MIDI instrument:"
+#~ msgid "Quantifying columns..."
+#~ msgstr "Kwantificeren van kolommen..."
 
-#: lilypond-stream.cc:37
-#, c-format
-msgid "lily indent level: %d"
-msgstr "lelie inspring diepte: %d"
+#~ msgid "Settling columns..."
+#~ msgstr "Zetten van kolommen..."
 
-#. Maybe better not to translate these?
-#: lilypond-stream.cc:83
-msgid "% Creator: "
-msgstr "% Schepper: "
+#~ msgid "% MIDI copyright:"
+#~ msgstr "% MIDI copyright:"
 
-#: lilypond-stream.cc:88
-msgid "% Automatically generated"
-msgstr "% Automatisch gegenereerd"
+#~ msgid "% MIDI instrument:"
+#~ msgstr "% MIDI instrument:"
 
-#: lilypond-stream.cc:97
-#, c-format
-msgid "% from input file: "
-msgstr "% van invoerbestand: "
+#~ msgid "lily indent level: %d"
+#~ msgstr "lelie inspring diepte: %d"
 
-#: main.cc:94
-msgid "write exact durations, e.g.: a4*385/384"
-msgstr "schrijf exacte duren, bijv.: a4*385/384"
+#~ msgid "% Creator: "
+#~ msgstr "% Schepper: "
 
-#: main.cc:95
-msgid "enable debugging output"
-msgstr "maak ontluis uitvoer mogelijk"
+#~ msgid "% Automatically generated"
+#~ msgstr "% Automatisch gegenereerd"
 
-#: main.cc:97
-msgid "ACC[:MINOR]"
-msgstr "ACC[:MINEUR]"
+#~ msgid "% from input file: "
+#~ msgstr "% van invoerbestand: "
 
-#: main.cc:97
-msgid "set key: ACC +sharps/-flats; :1 minor"
-msgstr "zet toonsoort: ACC +kruizen/-mollen; :1 mineur"
+#~ msgid "write exact durations, e.g.: a4*385/384"
+#~ msgstr "schrijf exacte duren, bijv.: a4*385/384"
 
-#: main.cc:98
-msgid "don't output tuplets, double dots or rests, smallest is 32"
-msgstr "maak geen n-olen of dubbel gepunkteerd, kortste is 32"
-
-#: main.cc:99
-msgid "set FILE as default output"
-msgstr "zet BESTAND als verstek uitvoer"
-
-#: main.cc:100
-msgid "don't output tuplets"
-msgstr "maak geen n-olen"
-
-#: main.cc:101
-msgid "be quiet"
-msgstr "wees stil"
-
-#: main.cc:102
-msgid "don't output rests or skips"
-msgstr "maak geen rusten of skips"
+#~ msgid "enable debugging output"
+#~ msgstr "maak ontluis uitvoer mogelijk"
 
-#: main.cc:103
-msgid "DUR"
-msgstr "DUUR"
+#~ msgid "don't output tuplets, double dots or rests, smallest is 32"
+#~ msgstr "maak geen n-olen of dubbel gepunkteerd, kortste is 32"
 
-#: main.cc:103
-msgid "set smallest duration"
-msgstr "zet kortste duur"
+#~ msgid "set FILE as default output"
+#~ msgstr "zet BESTAND als verstek uitvoer"
 
-#: main.cc:104
-msgid "don't timestamp the output"
-msgstr "geen tijdsstempel in de uitvoer"
+#~ msgid "don't output tuplets"
+#~ msgstr "maak geen n-olen"
 
-#: main.cc:106
-msgid "be verbose"
-msgstr "wees breedsprakig"
+#~ msgid "be quiet"
+#~ msgstr "wees stil"
 
-#: main.cc:108
-msgid "assume no double dotted notes"
-msgstr "ga niet uit van dubbel gepunteerde noten"
+#~ msgid "don't output rests or skips"
+#~ msgstr "maak geen rusten of skips"
 
-#: main.cc:115
-#, c-format
-msgid "Usage: %s [OPTION]... [FILE]"
-msgstr "Gebruik: %s [OPTIE]... [BESTAND]"
+#~ msgid "set smallest duration"
+#~ msgstr "zet kortste duur"
 
-#: main.cc:117
-msgid "Translate MIDI-file to lilypond"
-msgstr "Vertaal MIDI-bestand naar lilypond"
+#~ msgid "don't timestamp the output"
+#~ msgstr "geen tijdsstempel in de uitvoer"
 
-#: main.cc:131
-#, c-format
-msgid "no_double_dots: %d\n"
-msgstr "no_double_dots: %d\n"
+#~ msgid "be verbose"
+#~ msgstr "wees breedsprakig"
 
-#: main.cc:133
-#, c-format
-msgid "no_rests: %d\n"
-msgstr "no_rests: %d\n"
+#~ msgid "assume no double dotted notes"
+#~ msgstr "ga niet uit van dubbel gepunteerde noten"
 
-#: main.cc:135
-#, c-format
-msgid "no_quantify_b_s: %d\n"
-msgstr "no_quantify_b_s: %d\n"
+#~ msgid "Usage: %s [OPTION]... [FILE]"
+#~ msgstr "Gebruik: %s [OPTIE]... [BESTAND]"
 
-#: main.cc:137
-#, c-format
-msgid "no_smaller_than: %d (1/%d)\n"
-msgstr "no_smaller_than: %d (1/%d)\n"
+#~ msgid "Translate MIDI-file to lilypond"
+#~ msgstr "Vertaal MIDI-bestand naar lilypond"
 
-#: main.cc:140
-#, c-format
-msgid "no_tuplets: %d\n"
-msgstr "no_tuplets: %d\n"
+#~ msgid "no_double_dots: %d\n"
+#~ msgstr "no_double_dots: %d\n"
 
-#: midi-parser.cc:64
-msgid "zero length string encountered"
-msgstr "string van lengte nul tegengekomen"
+#~ msgid "no_rests: %d\n"
+#~ msgstr "no_rests: %d\n"
 
-#: midi-score-parser.cc:44
-msgid "MIDI header expected"
-msgstr "MIDI kop verwacht"
+#~ msgid "no_quantify_b_s: %d\n"
+#~ msgstr "no_quantify_b_s: %d\n"
 
-#: midi-score-parser.cc:49
-msgid "invalid header length"
-msgstr "ongeldige koplengte"
+#~ msgid "no_smaller_than: %d (1/%d)\n"
+#~ msgstr "no_smaller_than: %d (1/%d)\n"
 
-#: midi-score-parser.cc:52
-msgid "invalid MIDI format"
-msgstr "ongeldig MIDI formaat"
+#~ msgid "no_tuplets: %d\n"
+#~ msgstr "no_tuplets: %d\n"
 
-#: midi-score-parser.cc:55
-msgid "invalid number of tracks"
-msgstr "ongeldig aantal sporen"
+#~ msgid "zero length string encountered"
+#~ msgstr "string van lengte nul tegengekomen"
 
-#: midi-score-parser.cc:58
-msgid "can't handle non-metrical time"
-msgstr "kan niet-metrische tijd niet aan"
+#~ msgid "MIDI header expected"
+#~ msgstr "MIDI kop verwacht"
 
-#: midi-track-parser.cc:68
-#, c-format
-msgid "Junking note-end event: channel = %d, pitch = %d"
-msgstr "Schroot noot-eind gebeurtenis: kanaal = %d, toonhoogte = %d"
+#~ msgid "invalid header length"
+#~ msgstr "ongeldige koplengte"
+
+#~ msgid "invalid MIDI format"
+#~ msgstr "ongeldig MIDI formaat"
+
+#~ msgid "invalid number of tracks"
+#~ msgstr "ongeldig aantal sporen"
+
+#~ msgid "can't handle non-metrical time"
+#~ msgstr "kan niet-metrische tijd niet aan"
+
+#~ msgid "Junking note-end event: channel = %d, pitch = %d"
+#~ msgstr "Schroot noot-eind gebeurtenis: kanaal = %d, toonhoogte = %d"
 
-#: midi-track-parser.cc:124
-msgid "invalid running status"
-msgstr "ongeldige lopende status"
+#~ msgid "invalid running status"
+#~ msgstr "ongeldige lopende status"
 
-#: midi-track-parser.cc:328
-msgid "unimplemented MIDI meta-event"
-msgstr "MIDI meta-gebeurtenis niet geïmplementeerd"
+#~ msgid "unimplemented MIDI meta-event"
+#~ msgstr "MIDI meta-gebeurtenis niet geïmplementeerd"
 
-#: midi-track-parser.cc:333
-msgid "invalid MIDI event"
-msgstr "ongeldige MIDI gebeurtenis"
+#~ msgid "invalid MIDI event"
+#~ msgstr "ongeldige MIDI gebeurtenis"
 
-#: midi-track-parser.cc:348
-msgid "MIDI track expected"
-msgstr "MIDI spoor verwacht"
+#~ msgid "MIDI track expected"
+#~ msgstr "MIDI spoor verwacht"
 
-#: midi-track-parser.cc:353
-msgid "invalid track length"
-msgstr "ongeldige spoorlengte"
+#~ msgid "invalid track length"
+#~ msgstr "ongeldige spoorlengte"
 
 #~ msgid "no Grace context available"
 #~ msgstr "geen Grace context voor handen"
diff -purN ../lilypond-1.5.28/po/ru.po ./po/ru.po
--- ../lilypond-1.5.28/po/ru.po	Sun Sep 16 17:09:58 2001
+++ ./po/ru.po	Thu Jan 31 13:17:54 2002
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-09-09 17:41+0200\n"
+"POT-Creation-Date: 2002-01-29 23:08+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: August S.Sigov <august@infran.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -14,301 +14,344 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: ly2dvi.py:115
-msgid "Generate .dvi with LaTeX for LilyPond"
-msgstr ""
-
-#: data-file.cc:118 input.cc:85 ly2dvi.py:197 midi-parser.cc:100 mup2ly.py:93
-#: update-lily.py:119 warn.cc:23
+#: data-file.cc:118 input.cc:85 ly2dvi.py:113 midi2ly.py:148
+#: update-lily.py:136 warn.cc:23
 msgid "warning: "
 msgstr "ÐÒÅÄÕÐÒÅÖÄÁÀ: "
 
-#: input.cc:90 ly2dvi.py:212 ly2dvi.py:641 ly2dvi.py:659 ly2dvi.py:850
-#: mup2ly.py:98 mup2ly.py:188 update-lily.py:124 update-lily.py:212 warn.cc:9
-#: warn.cc:17
+#: input.cc:90 ly2dvi.py:116 ly2dvi.py:132 ly2dvi.py:691 ly2dvi.py:709
+#: midi2ly.py:163 midi2ly.py:1012 midi2ly.py:1081 update-lily.py:151
+#: update-lily.py:426 warn.cc:9 warn.cc:17
 msgid "error: "
 msgstr "ÏÛÉÂËÁ: "
 
-#: ly2dvi.py:213 mup2ly.py:100 update-lily.py:126
+#: ly2dvi.py:133 midi2ly.py:164 update-lily.py:152
 msgid "Exiting ... "
 msgstr ""
 
-#: ly2dvi.py:271 mup2ly.py:158 update-lily.py:184
+#: ly2dvi.py:191 midi2ly.py:222 update-lily.py:210
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]"
 
-#: ly2dvi.py:275 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:188
+#: ly2dvi.py:195 main.cc:151 midi2ly.py:226 update-lily.py:214
 msgid "Options:"
 msgstr "ïÐÃÉÉ:"
 
-#: ly2dvi.py:279 main.cc:124 main.cc:166 mup2ly.py:168 update-lily.py:192
+#: ly2dvi.py:199 main.cc:168 midi2ly.py:230 update-lily.py:218
 #, c-format
 msgid "Report bugs to %s"
 msgstr "óÏÏÂÝÁÊÔÅ ÏÂ ÏÛÉÂËÁÈ ÐÏ %s"
 
-#: ly2dvi.py:307 mup2ly.py:185 update-lily.py:209
+#: ly2dvi.py:227 midi2ly.py:258 update-lily.py:246
 #, fuzzy, c-format
 msgid "Invoking `%s'"
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: ly2dvi.py:311 mup2ly.py:188 update-lily.py:212
+#: ly2dvi.py:231 midi2ly.py:262 update-lily.py:250
 #, c-format
 msgid "command exited with value %d"
 msgstr ""
 
-#: ly2dvi.py:313 mup2ly.py:190 update-lily.py:214
+#: ly2dvi.py:233 midi2ly.py:264 update-lily.py:252
 msgid "(ignored)"
 msgstr ""
 
-#: ly2dvi.py:323
+#: ly2dvi.py:243 midi2ly.py:274 update-lily.py:262
 #, fuzzy, c-format
 msgid "Cleaning %s..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: ly2dvi.py:338 mup2ly.py:214 update-lily.py:238
-#, fuzzy, c-format
-msgid "no such setting: %s"
-msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'"
+#: ly2dvi.py:301
+msgid "Generate .dvi with LaTeX for LilyPond"
+msgstr ""
 
-#: ly2dvi.py:351 main.cc:113
+#: ly2dvi.py:304 main.cc:115
 msgid "write Makefile dependencies for every input file"
 msgstr "ÚÁÐÉÓÙ×ÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ Makefile ÄÌÑ ËÁÖÄÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ"
 
-#: ly2dvi.py:352 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:252
+#: ly2dvi.py:305 main.cc:111 midi2ly.py:98 mup2ly.py:74 update-lily.py:86
 msgid "this help"
 msgstr "ÜÔÁ ÓÐÒÁ×ËÁ"
 
-#: ly2dvi.py:353 main.cc:111 main.cc:116
+#: ly2dvi.py:306 main.cc:113 main.cc:118
 msgid "DIR"
 msgstr "ëáô"
 
-#: ly2dvi.py:353
+#: ly2dvi.py:306
 #, fuzzy
 msgid "add DIR to LilyPond's search path"
 msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ"
 
-#: ly2dvi.py:354
+#: ly2dvi.py:307
 #, c-format
 msgid "keep all output, and name the directory %s.dir"
 msgstr ""
 
-#: ly2dvi.py:355
+#: ly2dvi.py:308
 msgid "don't run LilyPond"
 msgstr ""
 
-#: ly2dvi.py:356 main.cc:114
+#: ly2dvi.py:309 main.cc:116
 msgid "produce MIDI output only"
 msgstr "ÐÒÏÉÚ×ÏÄÉÔØ ×Ù×ÏÄ ÔÏÌØËÏ MIDI"
 
-#: ly2dvi.py:357 ly2dvi.py:358 main.cc:99 main.cc:112 main.cc:115
+#: ly2dvi.py:310 ly2dvi.py:311 main.cc:114 main.cc:117 midi2ly.py:100
 msgid "FILE"
 msgstr "æáêì"
 
-#: ly2dvi.py:357
+#: ly2dvi.py:310 midi2ly.py:100
 #, fuzzy
 msgid "write ouput to FILE"
 msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ"
 
-#: ly2dvi.py:358
+#: ly2dvi.py:311
 msgid "find pfa fonts used in FILE"
 msgstr ""
 
-#: ly2dvi.py:360
+#: ly2dvi.py:313
 msgid "generate PostScript output"
 msgstr ""
 
-#: ly2dvi.py:361
+#: ly2dvi.py:314
 msgid "KEY=VAL"
 msgstr ""
 
-#: ly2dvi.py:361
+#: ly2dvi.py:314
 msgid "change global setting KEY to VAL"
 msgstr ""
 
-#: ly2dvi.py:362 main.cc:119 mup2ly.py:1120 update-lily.py:256
+#: ly2dvi.py:315 main.cc:121 midi2ly.py:103 mup2ly.py:77 update-lily.py:90
 #, fuzzy
 msgid "verbose"
 msgstr "ÂÙÔØ ÂÏÌÔÌÉ×ÙÍ"
 
-#: ly2dvi.py:363 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:257
+#: ly2dvi.py:316 main.cc:120 midi2ly.py:104 mup2ly.py:78 update-lily.py:91
 msgid "print version number"
 msgstr "×Ù×ÏÄÉÔØ ÎÏÍÅÒ ×ÅÒÓÉÉ"
 
-#: ly2dvi.py:364 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:259
+#: ly2dvi.py:317 main.cc:122 midi2ly.py:105 mup2ly.py:79 update-lily.py:93
 msgid "show warranty and copyright"
 msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright"
 
-#: ly2dvi.py:386 ly2dvi.py:582 ly2dvi.py:607
+#: ly2dvi.py:406
+#, fuzzy, c-format
+msgid "no such setting: %s"
+msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'"
+
+#: ly2dvi.py:434 ly2dvi.py:632 ly2dvi.py:657
 #, fuzzy, c-format
 msgid "Running %s..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: ly2dvi.py:399
+#: ly2dvi.py:449
 #, fuzzy, c-format
 msgid "Analyzing %s..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: ly2dvi.py:455
+#: ly2dvi.py:505
 #, c-format
 msgid "no lilypond output found for %s"
 msgstr ""
 
-#: ly2dvi.py:497
+#: ly2dvi.py:547
 #, fuzzy, c-format
 msgid "invalid value: %s"
 msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'"
 
-#: ly2dvi.py:641
+#: ly2dvi.py:691
 #, fuzzy, c-format
 msgid "not a PostScript file: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'"
 
-#: ly2dvi.py:659
+#: ly2dvi.py:709 midi2ly.py:1012 update-lily.py:426
 #, c-format
 msgid "getopt says: `%s'"
 msgstr ""
 
-#: ly2dvi.py:826 scores.cc:44
+#: ly2dvi.py:820
+#, fuzzy, c-format
+msgid "filename should not contain spaces: `%s'"
+msgstr "õÖÅ ÓÏÄÅÒÖÉÔ: `%s'"
+
+#: ly2dvi.py:885 scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to `%s'..."
 msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..."
 
-#: ly2dvi.py:837
+#: ly2dvi.py:896 midi2ly.py:996
 #, fuzzy, c-format
 msgid "%s output to `%s'..."
 msgstr "×Ù×ÏÄ MIDI × %s..."
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:839
-#: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
+#: includable-lexer.cc:49 lily-guile.cc:134 ly2dvi.py:898 scores.cc:136
+#: scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'"
 
-#: ly2dvi.py:850
+#: ly2dvi.py:909 midi2ly.py:1081
 msgid "no files specified on command line."
 msgstr ""
 
-#: mup2ly.py:51
-msgid "Convert mup to ly"
+#: midi2ly.py:92
+msgid "Convert MIDI to LilyPond source"
 msgstr ""
 
-#: mup2ly.py:166
-#, c-format
-msgid "%s is far from completed.  Not all constructs are recognised."
+#: midi2ly.py:95
+msgid "print absolute pitches"
 msgstr ""
 
-#: mup2ly.py:964
-#, fuzzy, c-format
-msgid "no such context: %s"
-msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'"
+#: midi2ly.py:96 midi2ly.py:101
+msgid "DUR"
+msgstr "íáöïò"
+
+#: midi2ly.py:96
+msgid "quantise note durations on DUR"
+msgstr ""
+
+#: midi2ly.py:97
+msgid "print explicit durations"
+msgstr ""
+
+#: midi2ly.py:99
+msgid "ALT[:MINOR]"
+msgstr ""
+
+#: midi2ly.py:99
+msgid "set key: ALT=+sharps|-flats; MINOR=1"
+msgstr ""
+
+#: midi2ly.py:101
+msgid "quantise note starts on DUR"
+msgstr ""
+
+#: midi2ly.py:102
+msgid "DUR*NUM/DEN"
+msgstr ""
 
-#: mup2ly.py:1115
+#: midi2ly.py:102
+msgid "allow tuplet durations DUR*NUM/DEN"
+msgstr ""
+
+#: midi2ly.py:106
+msgid "treat every text as a lyric"
+msgstr ""
+
+#: midi2ly.py:1027
+msgid "Example:"
+msgstr ""
+
+#: mup2ly.py:69
+msgid "Convert mup to LilyPond source"
+msgstr ""
+
+#: mup2ly.py:72
 msgid "debug"
 msgstr ""
 
-#: mup2ly.py:1116
+#: mup2ly.py:73
 msgid "define macro NAME [optional expansion EXP]"
 msgstr ""
 
-#: main.cc:115 mup2ly.py:1118
+#: main.cc:117 mup2ly.py:75
 #, fuzzy
 msgid "write output to FILE"
 msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ"
 
-#: mup2ly.py:1119
+#: mup2ly.py:76
 msgid "only pre-process"
 msgstr ""
 
-#: mup2ly.py:1200
+#: mup2ly.py:827
+#, fuzzy, c-format
+msgid "no such context: %s"
+msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'"
+
+#: mup2ly.py:1051
 #, fuzzy, c-format
 msgid "Processing `%s'..."
 msgstr "ïÂÒÁÂÁÔÙ×ÁÀ..."
 
-#: mup2ly.py:1219
+#: mup2ly.py:1070
 #, fuzzy, c-format
 msgid "Writing `%s'..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: update-lily.py:52
+#: update-lily.py:75
 msgid "Fetch and rebuild from latest source package"
 msgstr ""
 
-#: update-lily.py:224
-#, fuzzy, c-format
-msgid "Cleaning `%s'..."
-msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
-
-#: update-lily.py:244
+#: update-lily.py:78
 #, c-format
 msgid "unpack and build in DIR [%s]"
 msgstr ""
 
-#: update-lily.py:245
+#: update-lily.py:79
 msgid "execute COMMAND, subtitute:"
 msgstr ""
 
-#: update-lily.py:246
+#: update-lily.py:80
 msgid "%b: build root"
 msgstr ""
 
-#: update-lily.py:247
+#: update-lily.py:81
 #, c-format
 msgid "%n: package name"
 msgstr ""
 
-#: update-lily.py:248
+#: update-lily.py:82
 #, fuzzy
 msgid "%r: release directory"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'"
 
-#: update-lily.py:249
+#: update-lily.py:83
 msgid "%t: tarball"
 msgstr ""
 
-#: update-lily.py:250
+#: update-lily.py:84
 msgid "%v: package version"
 msgstr ""
 
-#: update-lily.py:253
+#: update-lily.py:87
 #, c-format
 msgid "keep all output, and name the directory %s"
 msgstr ""
 
-#: update-lily.py:254
+#: update-lily.py:88
 msgid "upon failure notify EMAIL[,EMAIL]"
 msgstr ""
 
-#: update-lily.py:255
+#: update-lily.py:89
 msgid "remove previous build"
 msgstr ""
 
-#: update-lily.py:258
+#: update-lily.py:92
 #, c-format
 msgid "fetch and build URL [%s]"
 msgstr ""
 
-#: update-lily.py:366
+#: update-lily.py:397
 #, fuzzy, c-format
 msgid "Listing `%s'..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: update-lily.py:427
+#: update-lily.py:465
 #, c-format
 msgid "latest is: %s"
 msgstr ""
 
-#: update-lily.py:428
+#: update-lily.py:466
 #, c-format
 msgid "relax, %s is up to date"
 msgstr ""
 
-#: update-lily.py:436 update-lily.py:449
+#: update-lily.py:474 update-lily.py:487
 #, fuzzy, c-format
 msgid "Fetching `%s'..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: update-lily.py:458
+#: update-lily.py:496
 #, fuzzy, c-format
 msgid "Building `%s'..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
@@ -349,8 +392,8 @@ msgstr "ÐÏÌÏÖÅÎÉÅ ÎÅÉÚ×ÅÓÔÎÏ"
 msgid "can't map file"
 msgstr "ÎÅ ÍÏÇÕ ÏÔÏÂÒÁÚÉÔØ ÆÁÊÌ × ÐÁÍÑÔØ"
 
-#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45
-#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
+#: mapped-file-storage.cc:87 scores.cc:48 simple-file-storage.cc:44
+#: streams.cc:37 text-stream.cc:23
 #, c-format
 msgid "can't open file: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'"
@@ -372,6 +415,16 @@ msgstr "ÏÛÉÂËÁ ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÑ: "
 msgid " (Continuing; cross thumbs)"
 msgstr " (ðÒÏÄÏÌÖÁÀ; ÓËÒÅÓÔÉÔÅ ÐÁÌØÃÙ)"
 
+#: accidental-engraver.cc:136
+#, fuzzy, c-format
+msgid "unknown accidental typesetting: %s"
+msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `\\%s'"
+
+#: accidental-engraver.cc:139
+#, c-format
+msgid "Accidental typesetting must be pair: %s"
+msgstr ""
+
 #: afm.cc:59
 #, c-format
 msgid "can't find character number: %d"
@@ -431,35 +484,46 @@ msgstr "óÄÁÀÓØ"
 msgid "Can't switch translators, I'm there already"
 msgstr "îÅ ÍÏÇÕ ÐÅÒÅËÌÀÞÉÔØ ÐÅÒÅ×ÏÄÞÉËÏ×, Ñ ÕÖÅ ÔÁÍ"
 
-#: beam-engraver.cc:91 beam-engraver.cc:124
+#: bar-check-iterator.cc:58
+#, c-format
+msgid "barcheck failed at: %s"
+msgstr ""
+
+#: beam-engraver.cc:93 beam-engraver.cc:126
 msgid "can't find start of beam"
 msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
 
-#: beam-engraver.cc:158
+#: beam-engraver.cc:150
 msgid "already have a beam"
 msgstr "ÕÖÅ ÉÍÅÅÍ ÇÒÕÐÐÕ ÛÔÉÌÅÊ"
 
-#: beam-engraver.cc:222
+#: beam-engraver.cc:216
 msgid "unterminated beam"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÇÒÕÐÐÉÒÏ×ËÁ ÛÔÉÌÅÊ"
 
-#: beam-engraver.cc:255 chord-tremolo-engraver.cc:195
+#: beam-engraver.cc:249 chord-tremolo-engraver.cc:193
 msgid "stem must have Rhythmic structure"
 msgstr "ÛÔÉÌØ ÄÏÌÖÅÎ ÉÍÅÔØ ÒÉÔÍÏ×ÕÀ ÓÔÒÕËÔÕÒÕ"
 
-#: beam-engraver.cc:267
+#: beam-engraver.cc:261
 msgid "stem doesn't fit in beam"
 msgstr "ÛÔÉÌØ ÎÅ ×ÌÅÚÁÅÔ × ÇÒÕÐÐÉÒÏ×ËÕ"
 
-#: beam-engraver.cc:268
+#: beam-engraver.cc:262
 msgid "beam was started here"
 msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÎÁÞÉÎÁÌÁÓØ ÚÄÅÓØ"
 
-#: beam.cc:86
-msgid "beam has less than two stems"
+#: beam.cc:93
+#, fuzzy
+msgid "beam has less than two visible stems"
 msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÍÅÎÅÅ Ä×ÕÈ ÛÔÉÌÅÊ"
 
-#: beam.cc:637
+#: beam.cc:98
+#, fuzzy
+msgid "Beam has less than two stems. Removing beam."
+msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÍÅÎÅÅ Ä×ÕÈ ÛÔÉÌÅÊ"
+
+#: beam.cc:660
 msgid "weird beam vertical offset"
 msgstr "ÄÉËÏÅ ×ÅÒÔÉËÁÌØÎÏÅ ÓÍÅÝÅÎÉÅ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
 
@@ -487,7 +551,7 @@ msgstr "ñ ÅÄÉÎÓÔ×ÅÎÎÙÊ"
 msgid "none of these in my family"
 msgstr "ÏÎÉ ÍÎÅ ÎÅ ÒÏÄÓÔ×ÅÎÎÉËÉ"
 
-#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192
+#: chord-tremolo-engraver.cc:139 percent-repeat-engraver.cc:182
 msgid "unterminated chord tremolo"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÔÒÅÍÏÌÏ ÁËËÏÒÄÁ"
 
@@ -506,7 +570,7 @@ msgstr "ÎÅ×ÅÒÎÏÅ ×ÙÞÉÔÁÎÉÅ: ÎÅ ÞÁÓÔØ ÁËË
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr ""
 
-#: collision.cc:245
+#: collision.cc:281
 msgid "Too many clashing notecolumns.  Ignoring them."
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÐÅÒÅÓÅËÁÀÝÉÈÓÑ ÓÔÏÌÂÃÏ× ÎÏÔ. éÇÎÏÒÉÒÕÀ."
 
@@ -514,27 +578,27 @@ msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÐÅÒÅÓÅËÁÀÝÉÈÓÑ ÓÔÏ
 msgid "NaN"
 msgstr "NaN"
 
-#: dynamic-engraver.cc:197 span-dynamic-performer.cc:86
+#: dynamic-engraver.cc:195 span-dynamic-performer.cc:82
 msgid "can't find start of (de)crescendo"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÎÁÞÁÌÏ (ÄÅ)ËÒÅÝÅÎÄÏ"
 
-#: dynamic-engraver.cc:222
+#: dynamic-engraver.cc:220
 msgid "already have a crescendo"
 msgstr "ËÒÅÝÅÎÄÏ ÕÖÅ ÅÓÔØ"
 
-#: dynamic-engraver.cc:223
+#: dynamic-engraver.cc:221
 msgid "already have a decrescendo"
 msgstr "ÄÅËÒÅÝÅÎÄÏ ÕÖÅ ÅÓÔØ"
 
-#: dynamic-engraver.cc:317
+#: dynamic-engraver.cc:315
 msgid "unterminated (de)crescendo"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ (ÄÅ)ËÒÅÝÅÎÄÏ"
 
-#: extender-engraver.cc:97
+#: extender-engraver.cc:96
 msgid "unterminated extender"
 msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÙÊ ÒÁÓÛÉÒÉÔÅÌØ"
 
-#: extender-engraver.cc:109
+#: extender-engraver.cc:108
 msgid "Nothing to connect extender to on the left.  Ignoring extender request."
 msgstr "îÅËÕÄÁ ÐÒÉÓÏÅÄÉÎÉÔØ ÒÁÓÛÉÒÉÔÅÌØ ÓÌÅ×Á. éÇÎÏÒÉÒÕÀ ÚÁÐÒÏÓ ÒÁÓÛÉÒÉÔÅÌÑ."
 
@@ -546,7 +610,7 @@ msgstr "ÎÅËÏÍÕ ÒÉÓÏ×ÁÔØ ÓËÏÂÕ ÐÏ×ÔÏÒÁ"
 msgid "couldn't find any font satisfying "
 msgstr ""
 
-#: gourlay-breaking.cc:157
+#: gourlay-breaking.cc:168
 msgid "No feasible line breaking found"
 msgstr "îÅ ÎÁÊÄÅÎÏ ÕÄÏ×ÌÅÔ×ÏÒÉÔÅÌØÎÏÇÏ ÒÁÚÒÙ×Á ÓÔÒÏËÉ"
 
@@ -559,23 +623,23 @@ msgstr ""
 msgid "crescendo too small"
 msgstr "ËÒÅÝÅÎÄÏ"
 
-#: hyphen-engraver.cc:90
+#: hyphen-engraver.cc:89
 msgid "unterminated hyphen"
 msgstr "ÐÅÒÅÎÏÓ ÂÅÚ ÏËÏÎÞÁÎÉÑ"
 
-#: hyphen-engraver.cc:102
+#: hyphen-engraver.cc:101
 msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen request."
 msgstr "îÅ Ë ÞÅÍÕ ÐÒÉÓÏÅÄÉÎÉÔØ ÐÅÒÅÎÏÓ ÓÌÅ×Á. éÇÎÏÒÉÒÕÀ ÚÁÐÒÏÓ ÐÅÒÅÎÏÓÁ."
 
-#: key-engraver.cc:99
+#: key-engraver.cc:93
 msgid "Conflicting key signatures found."
 msgstr ""
 
-#: key-engraver.cc:100
+#: key-engraver.cc:94
 msgid "This was the other key definition."
 msgstr ""
 
-#: key-performer.cc:77
+#: key-performer.cc:91
 msgid "FIXME: key change merge"
 msgstr "éóðòá÷øíåîñ: ÓÌÉÑÎÉÅ ÓÍÅÎÙ ËÌÀÞÁ"
 
@@ -584,7 +648,7 @@ msgstr "éóðòá÷øíåîñ: ÓÌÉÑÎÉÅ ÓÍÅÎÙ ËÌÀÞÁ
 msgid "Kpathsea couldn't find TFM file `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'"
 
-#: lily-guile.cc:141
+#: lily-guile.cc:136
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(ÐÕÔØ ÚÁÇÒÕÚËÉ: `%s')"
@@ -594,12 +658,12 @@ msgstr "(ÐÕÔØ ÚÁÇÒÕÚËÉ: `%s')"
 msgid "Element count %d."
 msgstr ""
 
-#: line-of-score.cc:313 paper-score.cc:77
+#: line-of-score.cc:325 paper-score.cc:76
 #, c-format
 msgid "Element count %d "
 msgstr ""
 
-#: line-of-score.cc:327
+#: line-of-score.cc:339
 msgid "Calculating column positions..."
 msgstr "÷ÙÞÉÓÌÑÀ ÐÏÚÉÃÉÉ ÓÔÏÌÂÃÏ×"
 
@@ -612,63 +676,63 @@ msgid "Huh? Melismatic note found to hav
 msgstr ""
 
 #. print example usage:  lilypond -e "(set-lily-option 'help 0)" ?
-#: main.cc:105
+#: main.cc:107
 msgid "EXPR"
 msgstr ""
 
-#: main.cc:105
+#: main.cc:107
 msgid "evalute EXPR as Scheme after .scm init is read"
 msgstr ""
 
 #. another bug in option parser: --output=foe is taken as an abbreviation
 #. for --output-format
-#: main.cc:108
+#: main.cc:110
 msgid "EXT"
 msgstr "òáóû"
 
-#: main.cc:108
+#: main.cc:110
 #, fuzzy
 msgid "use output format EXT (tex [default], pdftex, ps, scm or as)"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ×ÙÈÏÄÎÏÊ ÆÏÒÍÁÔ òáóû"
 
-#: main.cc:110
+#: main.cc:112
 #, fuzzy
 msgid "FIELD"
 msgstr "æáêì"
 
-#: main.cc:110
+#: main.cc:112
 msgid "write header field to BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:111
+#: main.cc:113
 msgid "add DIR to search path"
 msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ"
 
-#: main.cc:112
+#: main.cc:114
 msgid "use FILE as init file"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ æáêì ËÁË ÆÁÊÌ ÉÎÉÃÉÁÌÉÚÁÃÉÉ"
 
-#: main.cc:116
+#: main.cc:118
 msgid "prepend DIR to dependencies"
 msgstr ""
 
-#: main.cc:117
+#: main.cc:119
 msgid "inhibit file output naming and exporting"
 msgstr "ÓËÒÙÔØ ÉÍÅÎÏ×ÁÎÉÅ É ÜËÓÐÏÒÔ ×Ù×ÏÄÁ × ÆÁÊÌ"
 
 #.
 #. No version number or newline here. It confuses help2man
 #.
-#: main.cc:137
+#: main.cc:139
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]..."
 
-#: main.cc:139
+#: main.cc:141
 msgid "Typeset music and or play MIDI from FILE"
 msgstr "îÁÂÉÒÁÔØ ÍÕÚÙËÕ É/ÉÌÉ ÐÒÏÉÇÒÙ×ÁÔØ MIDI ÉÚ æáêìÁ"
 
-#: main.cc:143
+#: main.cc:145
 msgid ""
 "LilyPond is a music typesetter.  It produces beautiful sheet music\n"
 "using a high level description file as input.  LilyPond is part of \n"
@@ -678,11 +742,11 @@ msgstr ""
 "ÎÁ ÂÕÍÁÇÅ, ÉÓÐÏÌØÚÕÑ ×ÙÓÏËÏÕÒÏ×ÎÅ×ÙÊ ÆÁÊÌ ÏÐÉÓÁÎÉÑ ÎÁ ××ÏÄÅ. Lilypond\n"
 "Ñ×ÌÑÅÔÓÑ ÞÁÓÔØÀ ðÒÏÅËÔÁ GNU.\n"
 
-#: main.cc:153
+#: main.cc:155
 msgid "This binary was compiled with the following options:"
 msgstr "üÔÏÔ ÉÓÐÏÌÎÑÅÍÙÊ ÆÁÊÌ ÂÙÌ ÓÏÂÒÁÎ ÓÏ ÓÌÅÄÕÀÝÉÍÉ ÏÐÃÉÑÍÉ:"
 
-#: main.cc:56 main.cc:174
+#: main.cc:176
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -694,17 +758,17 @@ msgstr ""
 "ÐÒÉ ÓÏÂÌÀÄÅÎÉÉ ÎÅËÏÔÏÒÙÈ ÕÓÌÏ×ÉÊ. ÷ÙÚÙ×ÁÊÔÅ ËÁË `%s --warranty' ÄÌÑ\n"
 "ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
 
-#: main.cc:63 main.cc:181 main.cc:193
+#: main.cc:183 main.cc:195
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr "÷ÓÅ ÐÒÁ×Á ÚÁÝÉÝÅÎÙ (c) %s by"
 
-#: main.cc:191
+#: main.cc:193
 #, fuzzy
 msgid "GNU LilyPond -- The music typesetter"
 msgstr "GNU LilyPond -- îÁÂÏÒÝÉË ÍÕÚÙËÉ ðÒÏÅËÔÁ GNU"
 
-#: main.cc:72 main.cc:199
+#: main.cc:201
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License version 2\n"
@@ -739,42 +803,42 @@ msgstr "ÇÌÕÐÙÊ ÔÏÎ"
 msgid "can't find `%s' context"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ËÏÎÔÅËÓÔ `%s'"
 
-#: music.cc:239
+#: music.cc:144
+#, c-format
+msgid "Transposition by %s makes accidental larger than two"
+msgstr ""
+
+#: music.cc:249
 msgid "ly_get_mus_property (): Not a Music"
 msgstr ""
 
-#: music.cc:253
+#: music.cc:263
 msgid "ly_set_mus_property (): Not a symbol"
 msgstr ""
 
-#: music.cc:265
+#: music.cc:275
 msgid "ly_set_mus_property ():  not of type Music"
 msgstr ""
 
-#: music.cc:279
+#: music.cc:289
 msgid "ly_make_music (): Not a string"
 msgstr ""
 
-#: music.cc:299
+#: music.cc:309
 msgid "ly_music_name (): Not a music expression"
 msgstr ""
 
-#: musical-request.cc:28
-#, c-format
-msgid "Transposition by %s makes accidental larger than two"
-msgstr ""
-
-#: my-lily-lexer.cc:140
+#: my-lily-lexer.cc:139
 #, c-format
 msgid "Identifier name is a keyword: `%s'"
 msgstr "éÍÑ ËÏÍÁÎÄÙ Ñ×ÌÑÅÔÓÑ ËÌÀÞÅ×ÙÍ ÓÌÏ×ÏÍ: `%s'"
 
-#: my-lily-lexer.cc:160
+#: my-lily-lexer.cc:159
 #, c-format
 msgid "error at EOF: %s"
 msgstr "ÏÛÍÂËÁ × ËÏÎÃÅ ÆÁÊÌÁ: %s"
 
-#: midi-score-parser.cc:94 my-lily-parser.cc:47
+#: my-lily-parser.cc:47
 msgid "Parsing..."
 msgstr "òÁÚÂÉÒÁÀ..."
 
@@ -792,32 +856,18 @@ msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÚÁÐÒÏÓ: `%s'"
 msgid "paper output to `%s'..."
 msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..."
 
-#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99
+#: paper-outputter.cc:60
 msgid ", at "
 msgstr ", ×"
 
-#: paper-outputter.cc:232
-#, fuzzy, c-format
-msgid "writing header field `%s' to `%s'..."
-msgstr "úÁÐÉÓÙ×ÁÀ ÆÁÊÌ ÚÁ×ÉÓÉÍÏÓÔÅÊ: `%s'..."
-
-#: paper-score.cc:80
+#: paper-score.cc:79
 msgid "Preprocessing elements..."
 msgstr "ðÒÅÄ×ÁÒÉÔÅÌØÎÏ ÏÂÒÁÂÁÔÙ×ÁÀ ÜÌÅÍÅÎÔÙ..."
 
-#: paper-score.cc:114
+#: paper-score.cc:113
 msgid "Outputting Score, defined at: "
 msgstr ""
 
-#: paper-stream.cc:41
-#, fuzzy, c-format
-msgid "can't create directory: `%s'"
-msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'"
-
-#: paper-stream.cc:55
-msgid "Error syncing file (disk full?)"
-msgstr "ïÛÉÂËÁ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ÆÁÊÌÁ (ÄÉÓË ÐÅÒÅÐÏÌÎÅÎ?)"
-
 #.
 #. We could change the current translator's id, but that would make
 #. errors hard to catch
@@ -834,7 +884,7 @@ msgstr "ñ ÅÄÉÎÓÔ×ÅÎÎÙÊ"
 msgid "none of these in my family: `%s'"
 msgstr "ÏÎÉ ÍÎÅ ÎÅ ÒÏÄÓÔ×ÅÎÎÉËÉ"
 
-#: percent-repeat-engraver.cc:117
+#: percent-repeat-engraver.cc:116
 #, fuzzy
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr "îÅ ÚÎÁÀ, ÞÔÏ ÄÅÌÁÔØ Ó ÐÕÓÔÙÍÉ ËÌÀÞÁÍÉ"
@@ -852,12 +902,17 @@ msgstr "äÏÒÏÖËÁ ..."
 msgid "Creator: "
 msgstr "óÏÚÄÁÔÅÌØ: "
 
-#: performance.cc:113
+#: performance.cc:103
+#, fuzzy
+msgid "at "
+msgstr ", ×"
+
+#: performance.cc:114
 #, c-format
 msgid "from musical definition: %s"
 msgstr "ÉÚ ÍÕÚÙËÁÌØÎÏÊ ÎÏÔÁÃÉÉ %s"
 
-#: performance.cc:168
+#: performance.cc:169
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "×Ù×ÏÄ MIDI × %s..."
@@ -872,8 +927,8 @@ msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÌÉÇÁ"
 msgid "can't find start of phrasing slur"
 msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
 
-#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154
-#: piano-pedal-performer.cc:85
+#: piano-pedal-engraver.cc:141 piano-pedal-engraver.cc:153
+#: piano-pedal-performer.cc:82
 #, fuzzy, c-format
 msgid "can't find start of piano pedal: `%s'"
 msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
@@ -882,14 +937,42 @@ msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×
 msgid "Pitch arguments out of range"
 msgstr ""
 
-#: property-engraver.cc:121
+#: porrectus.cc:34
+msgid "(left_head == 0)"
+msgstr ""
+
+#: porrectus.cc:45
+msgid "undefined left_head"
+msgstr ""
+
+#: porrectus.cc:64
+msgid "(right_head == 0)"
+msgstr ""
+
+#: porrectus.cc:75
+msgid "undefined right_head"
+msgstr ""
+
+#: porrectus.cc:164
+msgid "junking lonely porrectus"
+msgstr ""
+
+#: porrectus.cc:174
+msgid "porrectus style undefined; using mensural"
+msgstr ""
+
+#: porrectus.cc:301
+msgid "ascending vaticana style porrectus"
+msgstr ""
+
+#: property-engraver.cc:116
 #, c-format
 msgid ""
 "`%s' is deprecated.  Use\n"
 " \\property %s.%s \\override #'%s = #%s"
 msgstr ""
 
-#: property-engraver.cc:145
+#: property-engraver.cc:140
 #, c-format
 msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s"
 msgstr ""
@@ -907,25 +990,25 @@ msgstr ""
 msgid "Scheme options:"
 msgstr "ïÐÃÉÉ:"
 
-#: score-engraver.cc:189
+#: score-engraver.cc:178
 #, c-format
 msgid "unbound spanner `%s'"
 msgstr ""
 
-#: score.cc:78
+#: score.cc:88
 msgid "Interpreting music..."
 msgstr "éÎÔÅÒÐÒÅÔÉÒÕÀ ÍÕÚÙËÕ..."
 
-#: score.cc:92
+#: score.cc:102
 msgid "Need music in a score"
 msgstr ""
 
 #. should we? hampers debugging.
-#: score.cc:105
+#: score.cc:115
 msgid "Errors found/*, not processing score*/"
 msgstr "îÁÊÄÅÎÙ ÏÛÉÂËÉ/*, ÎÅ ÏÂÒÁÂÁÔÙ×ÁÀ ÎÏÔÙ*/"
 
-#: score.cc:112
+#: score.cc:122
 #, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr "ÚÁÔÒÁÞÅÎÎÏÅ ×ÒÅÍÑ: %.2f ÓÅËÕÎÄ"
@@ -939,7 +1022,7 @@ msgstr ""
 msgid "Now processing: `%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `\\%s'"
 
-#: script-engraver.cc:66
+#: script-engraver.cc:65
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr ""
@@ -950,18 +1033,18 @@ msgstr ""
 msgid "Separation_item:  I've been drinking too much"
 msgstr "Single_malt_grouping_item: Ñ ÌÉÛËÏÍ ÍÎÏÇÏ ×ÙÐÉÌ"
 
-#: simple-spacer.cc:200
+#: simple-spacer.cc:202
 #, c-format
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:125
+#: slur-engraver.cc:124
 msgid "unterminated slur"
 msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÌÉÇÁ"
 
 #. How to shut up this warning, when Voice_devnull_engraver has
 #. eaten start request?
-#: slur-engraver.cc:142
+#: slur-engraver.cc:141
 #, fuzzy
 msgid "can't find start of slur"
 msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
@@ -970,11 +1053,11 @@ msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×
 msgid "Putting slur over rest.  Ignoring."
 msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ. éÇÎÏÒÉÒÕÀ."
 
-#: slur.cc:383
+#: slur.cc:393
 msgid "Slur over rest?"
 msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ?"
 
-#: stem-engraver.cc:115
+#: stem-engraver.cc:117
 #, c-format
 msgid "Adding note head to incompatible stem (type = %d)"
 msgstr "äÏÂÁ×ÌÑÀ ÎÏÔÕ Ë ÎÅÓÏ×ÍÅÓÔÉÍÏÍÕ ÛÔÉÌÀ (ÔÉÐ = %d)"
@@ -983,17 +1066,26 @@ msgstr "äÏÂÁ×ÌÑÀ ÎÏÔÕ Ë ÎÅÓÏ×ÍÅÓÔÉÍÏÍÕ Û
 msgid "Weird stem size; check for narrow beams"
 msgstr ""
 
-#: text-spanner-engraver.cc:94
+#: streams.cc:33
+#, fuzzy, c-format
+msgid "can't create directory: `%s'"
+msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'"
+
+#: streams.cc:47
+msgid "Error syncing file (disk full?)"
+msgstr "ïÛÉÂËÁ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ÆÁÊÌÁ (ÄÉÓË ÐÅÒÅÐÏÌÎÅÎ?)"
+
+#: text-spanner-engraver.cc:92
 #, fuzzy
 msgid "can't find start of text spanner"
 msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
 
-#: text-spanner-engraver.cc:114
+#: text-spanner-engraver.cc:112
 #, fuzzy
 msgid "already have a text spanner"
 msgstr "ÕÖÅ ÉÍÅÅÍ ÇÒÕÐÐÕ ÛÔÉÌÅÊ"
 
-#: text-spanner-engraver.cc:169
+#: text-spanner-engraver.cc:167
 #, fuzzy
 msgid "unterminated text spanner"
 msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÙÊ ÒÁÓÛÉÒÉÔÅÌØ"
@@ -1017,412 +1109,305 @@ msgstr ""
 msgid "can't find ascii character: %d"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ ASCII: `%d'"
 
-#. How to shut up this warning, when no notes appeared because
-#. they were suicided by Thread_devnull_engraver?
-#: tie-engraver.cc:220 tie-performer.cc:173
-msgid "No ties were created!"
+#: tie-engraver.cc:220
+msgid "lonely tie"
 msgstr ""
 
-#: tie-engraver.cc:240
-msgid "lonely tie"
+#: tie-performer.cc:161
+msgid "No ties were created!"
 msgstr ""
 
 #: time-scaled-music-iterator.cc:25
 msgid "no one to print a tuplet start bracket"
 msgstr ""
 
-#: timing-translator.cc:37
-#, c-format
-msgid "barcheck failed at: %s"
-msgstr ""
-
-#: translator-ctors.cc:40
+#: translator-ctors.cc:61
 #, c-format
 msgid "unknown translator: `%s'"
 msgstr ""
 
-#: translator-def.cc:99
+#: translator-def.cc:87
 msgid "Program has no such type"
 msgstr ""
 
-#: translator-def.cc:105
+#: translator-def.cc:93
 #, c-format
 msgid "Already contains: `%s'"
 msgstr "õÖÅ ÓÏÄÅÒÖÉÔ: `%s'"
 
-#: translator-def.cc:106
+#: translator-def.cc:94
 #, c-format
 msgid "Not adding translator: `%s'"
 msgstr ""
 
-#: translator-def.cc:224
+#: translator-def.cc:212
 #, c-format
 msgid "can't find: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ: `%s'"
 
-#: translator-group.cc:145
+#: translator-group.cc:147
 #, c-format
 msgid "can't find or create `%s' called `%s'"
 msgstr ""
 
-#: translator-group.cc:230
+#: translator-group.cc:232
 #, c-format
 msgid "can't find or create: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'"
 
-#: translator-group.cc:413
+#: translator-group.cc:407
 #, c-format
 msgid ""
 "Can't find property type-check for `%s'.  Perhaps you made a typing error? "
 "Doing assignment anyway."
 msgstr ""
 
-#: translator-group.cc:427
+#: translator-group.cc:421
 #, c-format
 msgid "Type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
 #. programming_error?
-#: translator-group.cc:446
+#: translator-group.cc:440
 msgid "ly-get-trans-property: expecting a Translator_group argument"
 msgstr ""
 
-#: volta-engraver.cc:88
+#: volta-engraver.cc:108
 msgid "No volta spanner to end"
 msgstr ""
 
-#: volta-engraver.cc:105
+#: volta-engraver.cc:125
 msgid "Already have a volta spanner.  Stopping that one prematurely."
 msgstr ""
 
-#: volta-engraver.cc:109
+#: volta-engraver.cc:129
 msgid "Also have a stopped spanner.  Giving up."
 msgstr ""
 
-#: parser.yy:121
+#: parser.yy:129
 #, c-format
 msgid "Expecting %d arguments"
 msgstr ""
 
-#: parser.yy:423
+#: parser.yy:434
 msgid "Identifier should have  alphabetic characters only"
 msgstr ""
 
-#: parser.yy:697
+#: parser.yy:715
 msgid "More alternatives than repeats.  Junking excess alternatives."
 msgstr ""
 
-#: parser.yy:761
+#: parser.yy:767
 msgid "Second argument must be a symbol"
 msgstr "÷ÔÏÒÏÊ ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÓÉÍ×ÏÌÏÍ"
 
-#: parser.yy:766
+#: parser.yy:772
 msgid "First argument must be a procedure taking 1 argument"
 msgstr ""
 
-#: parser.yy:1298
+#: parser.yy:1315
 msgid "Expecting string as script definition"
 msgstr ""
 
-#: parser.yy:1308
+#: parser.yy:1325
 msgid "Can't specify direction for this request"
 msgstr "îÅ ÍÏÇÕ ÕËÁÚÁÔØ ÎÁÐÒÁ×ÌÅÎÉÅ ÄÌÑ ÜÔÏÇÏ ÚÁÐÒÏÓÁ"
 
-#: parser.yy:1433
+#: parser.yy:1451
 msgid "Expecting musical-pitch value"
 msgstr ""
 
-#: parser.yy:1444
+#: parser.yy:1462
 #, fuzzy
 msgid "Must have duration object"
 msgstr "ÕÓÔÁÎÏ×ÉÔØ ÎÁÉÍÅÎØÛÕÀ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ"
 
-#: parser.yy:1453 parser.yy:1461
+#: parser.yy:1471 parser.yy:1479
 msgid "Have to be in Lyric mode for lyrics"
 msgstr "äÏÌÖÅÎ ÂÙÔØ × ìÉÒÉÞÅÓËÏÍ ÒÅÖÉÍÅ ÄÌÑ ÌÉÒÉËÉ"
 
-#: parser.yy:1614 parser.yy:1671
+#: parser.yy:1638 parser.yy:1691
 #, c-format
 msgid "not a duration: %d"
 msgstr "ÎÅ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ: %d"
 
-#: parser.yy:1682
+#: parser.yy:1752
 msgid "Have to be in Note mode for notes"
 msgstr "äÏÌÖÅÎ ÂÙÔØ × îÏÔÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÎÏÔ"
 
-#: parser.yy:1765
+#: parser.yy:1845
 msgid "Have to be in Chord mode for chords"
 msgstr "äÏÌÖÅÎ ÂÙÔØ × áËËÏÒÄÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÁËËÏÒÄÏ×"
 
-#: parser.yy:1945
+#: parser.yy:2025
 msgid "need integer number arg"
 msgstr ""
 
-#: lexer.ll:174
+#: parser.yy:2097
+msgid "Suspect duration found following this beam"
+msgstr ""
+
+#: lexer.ll:175
 msgid "EOF found inside a comment"
 msgstr "ëÏÎÅÃ ÆÁÊÌÁ ×ÎÕÔÒÉ ËÏÍÍÅÎÔÁÒÉÑ"
 
-#: lexer.ll:188
+#: lexer.ll:189
 msgid "\\maininput disallowed outside init files"
 msgstr ""
 
-#: lexer.ll:212
+#: lexer.ll:213
 #, fuzzy, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÍÅÔËÁ/ËÏÍÁÎÄÁ: `%s'"
 
 #. backup rule
-#: lexer.ll:221
+#: lexer.ll:222
 msgid "Missing end quote"
 msgstr "ïÔÓÕÔÓ×ÕÅÔ ÚÁËÌÀÞÉÔÅÌØÎÁÑ ËÁ×ÙÞËÁ"
 
 #. backup rule
-#: lexer.ll:243 lexer.ll:247
+#: lexer.ll:244 lexer.ll:248
 msgid "white expected"
 msgstr "× ÔÏ ×ÒÅÍÑ ËÁË ÏÖÉÄÁÌÏÓØ"
 
-#: lexer.ll:256
+#: lexer.ll:257
 msgid "Can't evaluate Scheme in safe mode"
 msgstr "îÅ ÍÏÇÕ ×ÙÐÏÌÎÑÔØ ËÏÄ ÓÈÅÍÙ × ÂÅÚÏÐÁÓÎÏÍ ÒÅÖÉÍÅ"
 
-#: lexer.ll:349
+#: lexer.ll:358
 msgid "Brace found at end of lyric. Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:457
+#: lexer.ll:468
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'"
 
-#: lexer.ll:538
+#: lexer.ll:554
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `\\%s'"
 
-#: lexer.ll:617
+#: lexer.ll:639
 #, c-format
 msgid "Oldest supported input version: %s"
 msgstr ""
 
-#: lexer.ll:629
+#: lexer.ll:651
 #, fuzzy, c-format
 msgid "incorrect lilypond version: %s (%s, %s)"
 msgstr "ÎÅ×ÅÒÎÁÑ ×ÅÒÓÉÑ mudela: %s (%s, %s)"
 
-#: lexer.ll:630
+#: lexer.ll:652
 msgid "Consider converting the input with the convert-ly script"
 msgstr ""
 
-#: lilypond-item.cc:161
-#, c-format
-msgid "#32 in quarter: %d"
-msgstr "#32 × ÞÅÔ×ÅÒÔÎÏÊ: %d"
-
-#: lilypond-score.cc:108
-#, fuzzy, c-format
-msgid "LY output to `%s'..."
-msgstr "×Ù×ÏÄ MIDI × %s..."
-
-#: lilypond-score.cc:119
-#, c-format
-msgid "track %d:"
-msgstr "ÄÏÒÏÖËÁ %d:"
-
-#: lilypond-score.cc:155
-msgid "Processing..."
-msgstr "ïÂÒÁÂÁÔÙ×ÁÀ..."
-
-#: lilypond-score.cc:164
-msgid "Creating voices..."
-msgstr "óÏÚÄÁÀ ÇÏÌÏÓÁ..."
-
-#: lilypond-score.cc:168
-msgid "track "
-msgstr "ÄÏÒÏÖËÁ"
-
-#: lilypond-score.cc:177
-msgid "NOT Filtering tempo..."
-msgstr ""
+#, fuzzy
+#~ msgid "Cleaning `%s'..."
+#~ msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
-#: lilypond-score.cc:186
-msgid "NOT Quantifying columns..."
-msgstr ""
+#, fuzzy
+#~ msgid "writing header field `%s' to `%s'..."
+#~ msgstr "úÁÐÉÓÙ×ÁÀ ÆÁÊÌ ÚÁ×ÉÓÉÍÏÓÔÅÊ: `%s'..."
 
-#: lilypond-score.cc:190
-msgid "Quantifying columns..."
-msgstr ""
+#~ msgid "#32 in quarter: %d"
+#~ msgstr "#32 × ÞÅÔ×ÅÒÔÎÏÊ: %d"
 
-#: lilypond-score.cc:223
-msgid "Settling columns..."
-msgstr ""
+#, fuzzy
+#~ msgid "LY output to `%s'..."
+#~ msgstr "×Ù×ÏÄ MIDI × %s..."
 
-#: lilypond-staff.cc:209
-msgid "% MIDI copyright:"
-msgstr "% MIDI copyright:"
+#~ msgid "track %d:"
+#~ msgstr "ÄÏÒÏÖËÁ %d:"
 
-#: lilypond-staff.cc:210
-msgid "% MIDI instrument:"
-msgstr "% MIDI ÉÎÓÔÒÕÍÅÎÔ:"
+#~ msgid "Processing..."
+#~ msgstr "ïÂÒÁÂÁÔÙ×ÁÀ..."
 
-#: lilypond-stream.cc:37
-#, c-format
-msgid "lily indent level: %d"
-msgstr "ÕÒÏ×ÅÎØ ÏÔÓÔÕÐÏ× lily: %d"
+#~ msgid "Creating voices..."
+#~ msgstr "óÏÚÄÁÀ ÇÏÌÏÓÁ..."
 
-#. Maybe better not to translate these?
-#: lilypond-stream.cc:83
-msgid "% Creator: "
-msgstr "% óÏÚÄÁÔÅÌØ: "
+#~ msgid "track "
+#~ msgstr "ÄÏÒÏÖËÁ"
 
-#: lilypond-stream.cc:88
-msgid "% Automatically generated"
-msgstr "% á×ÔÏÍÁÔÉÞÅÓËÉ ÓÇÅÎÅÒÉÒÏ×ÁÎÏ"
+#~ msgid "% MIDI copyright:"
+#~ msgstr "% MIDI copyright:"
 
-#: lilypond-stream.cc:97
-#, c-format
-msgid "% from input file: "
-msgstr "% ÉÚ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ: "
+#~ msgid "% MIDI instrument:"
+#~ msgstr "% MIDI ÉÎÓÔÒÕÍÅÎÔ:"
 
-#: main.cc:94
-msgid "write exact durations, e.g.: a4*385/384"
-msgstr ""
+#~ msgid "lily indent level: %d"
+#~ msgstr "ÕÒÏ×ÅÎØ ÏÔÓÔÕÐÏ× lily: %d"
 
-#: main.cc:95
-msgid "enable debugging output"
-msgstr "×ËÌÀÞÉÔØ ×Ù×ÏÄ ÏÔÌÁÄÏÞÎÏÊ ÉÎÆÏÒÍÁÃÉÉ"
+#~ msgid "% Creator: "
+#~ msgstr "% óÏÚÄÁÔÅÌØ: "
 
-#: main.cc:97
-msgid "ACC[:MINOR]"
-msgstr ""
+#~ msgid "% Automatically generated"
+#~ msgstr "% á×ÔÏÍÁÔÉÞÅÓËÉ ÓÇÅÎÅÒÉÒÏ×ÁÎÏ"
 
-#: main.cc:97
-msgid "set key: ACC +sharps/-flats; :1 minor"
-msgstr ""
+#~ msgid "% from input file: "
+#~ msgstr "% ÉÚ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ: "
 
-#: main.cc:98
-msgid "don't output tuplets, double dots or rests, smallest is 32"
-msgstr ""
+#~ msgid "enable debugging output"
+#~ msgstr "×ËÌÀÞÉÔØ ×Ù×ÏÄ ÏÔÌÁÄÏÞÎÏÊ ÉÎÆÏÒÍÁÃÉÉ"
 
-#: main.cc:99
-msgid "set FILE as default output"
-msgstr "ÕÓÔÁÎÏ×ÉÔØ æáêì ÄÌÑ ×Ù×ÏÄÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
+#~ msgid "set FILE as default output"
+#~ msgstr "ÕÓÔÁÎÏ×ÉÔØ æáêì ÄÌÑ ×Ù×ÏÄÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: main.cc:100
-msgid "don't output tuplets"
-msgstr "ÎÅ ×Ù×ÏÄÉÔØ ÓËÏÂÙ ÔÒÉÏÌÅÊ"
+#~ msgid "don't output tuplets"
+#~ msgstr "ÎÅ ×Ù×ÏÄÉÔØ ÓËÏÂÙ ÔÒÉÏÌÅÊ"
 
-#: main.cc:101
-msgid "be quiet"
-msgstr "ÂÙÔØ ÍÏÌÞÁÌÉ×ÙÍ"
+#~ msgid "be quiet"
+#~ msgstr "ÂÙÔØ ÍÏÌÞÁÌÉ×ÙÍ"
 
-#: main.cc:102
 #, fuzzy
-msgid "don't output rests or skips"
-msgstr "ÎÅ ×Ù×ÏÄÉÔØ ÓËÏÂÙ ÔÒÉÏÌÅÊ"
+#~ msgid "don't output rests or skips"
+#~ msgstr "ÎÅ ×Ù×ÏÄÉÔØ ÓËÏÂÙ ÔÒÉÏÌÅÊ"
 
-#: main.cc:103
-msgid "DUR"
-msgstr "íáöïò"
+#~ msgid "set smallest duration"
+#~ msgstr "ÕÓÔÁÎÏ×ÉÔØ ÎÁÉÍÅÎØÛÕÀ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ"
 
-#: main.cc:103
-msgid "set smallest duration"
-msgstr "ÕÓÔÁÎÏ×ÉÔØ ÎÁÉÍÅÎØÛÕÀ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ"
+#~ msgid "don't timestamp the output"
+#~ msgstr "ÎÅ ÏÔÍÅÞÁÔØ ÄÁÔÕ É ×ÒÅÍÑ ×Ù×ÏÄÁ"
 
-#: main.cc:104
-msgid "don't timestamp the output"
-msgstr "ÎÅ ÏÔÍÅÞÁÔØ ÄÁÔÕ É ×ÒÅÍÑ ×Ù×ÏÄÁ"
+#~ msgid "be verbose"
+#~ msgstr "ÂÙÔØ ÂÏÌÔÌÉ×ÙÍ"
 
-#: main.cc:106
-msgid "be verbose"
-msgstr "ÂÙÔØ ÂÏÌÔÌÉ×ÙÍ"
-
-#: main.cc:108
-msgid "assume no double dotted notes"
-msgstr ""
+#~ msgid "Usage: %s [OPTION]... [FILE]"
+#~ msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]"
 
-#: main.cc:115
-#, c-format
-msgid "Usage: %s [OPTION]... [FILE]"
-msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]"
-
-#: main.cc:117
 #, fuzzy
-msgid "Translate MIDI-file to lilypond"
-msgstr "ôÒÁÎÓÌÉÒÏ×ÁÔØ MIDI-ÆÁÊÌ × mudela"
+#~ msgid "Translate MIDI-file to lilypond"
+#~ msgstr "ôÒÁÎÓÌÉÒÏ×ÁÔØ MIDI-ÆÁÊÌ × mudela"
 
-#: main.cc:131
-#, c-format
-msgid "no_double_dots: %d\n"
-msgstr ""
+#~ msgid "zero length string encountered"
+#~ msgstr "×ÓÔÒÅÔÉÌÁÓØ ÓÔÒÏËÁ ÎÕÌÅ×ÏÊ ÄÌÉÎÙ"
 
-#: main.cc:133
-#, c-format
-msgid "no_rests: %d\n"
-msgstr ""
+#~ msgid "MIDI header expected"
+#~ msgstr "ÏÖÉÄÁÌÓÑ ÚÁÇÏÌÏ×ÏË MIDI"
 
-#: main.cc:135
-#, c-format
-msgid "no_quantify_b_s: %d\n"
-msgstr ""
+#~ msgid "invalid header length"
+#~ msgstr "ÎÅ×ÅÒÎÁÑ ÄÌÉÎÁ ÚÁÇÏÌÏ×ËÁ"
 
-#: main.cc:137
-#, c-format
-msgid "no_smaller_than: %d (1/%d)\n"
-msgstr ""
+#~ msgid "invalid MIDI format"
+#~ msgstr "ÎÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ MIDI"
 
-#: main.cc:140
-#, c-format
-msgid "no_tuplets: %d\n"
-msgstr ""
-
-#: midi-parser.cc:64
-msgid "zero length string encountered"
-msgstr "×ÓÔÒÅÔÉÌÁÓØ ÓÔÒÏËÁ ÎÕÌÅ×ÏÊ ÄÌÉÎÙ"
-
-#: midi-score-parser.cc:44
-msgid "MIDI header expected"
-msgstr "ÏÖÉÄÁÌÓÑ ÚÁÇÏÌÏ×ÏË MIDI"
-
-#: midi-score-parser.cc:49
-msgid "invalid header length"
-msgstr "ÎÅ×ÅÒÎÁÑ ÄÌÉÎÁ ÚÁÇÏÌÏ×ËÁ"
-
-#: midi-score-parser.cc:52
-msgid "invalid MIDI format"
-msgstr "ÎÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ MIDI"
-
-#: midi-score-parser.cc:55
-msgid "invalid number of tracks"
-msgstr "ÎÅ×ÅÒÎÏÅ ÞÉÓÌÏ ÄÏÒÏÖÅË"
-
-#: midi-score-parser.cc:58
-msgid "can't handle non-metrical time"
-msgstr ""
-
-#: midi-track-parser.cc:68
-#, c-format
-msgid "Junking note-end event: channel = %d, pitch = %d"
-msgstr ""
+#~ msgid "invalid number of tracks"
+#~ msgstr "ÎÅ×ÅÒÎÏÅ ÞÉÓÌÏ ÄÏÒÏÖÅË"
 
-#: midi-track-parser.cc:124
-msgid "invalid running status"
-msgstr "ÎÅ×ÅÒÎÙÊ ÓÔÁÔÕÓ ×ÙÐÏÌÎÅÎÉÑ"
+#~ msgid "invalid running status"
+#~ msgstr "ÎÅ×ÅÒÎÙÊ ÓÔÁÔÕÓ ×ÙÐÏÌÎÅÎÉÑ"
 
-#: midi-track-parser.cc:328
-msgid "unimplemented MIDI meta-event"
-msgstr "ÎÅÐÏÄÄÅÒÖÉ×ÁÅÍÏÅ ÍÅÔÁ-ÓÏÂÙÔÉÅ MIDI"
+#~ msgid "unimplemented MIDI meta-event"
+#~ msgstr "ÎÅÐÏÄÄÅÒÖÉ×ÁÅÍÏÅ ÍÅÔÁ-ÓÏÂÙÔÉÅ MIDI"
 
-#: midi-track-parser.cc:333
-msgid "invalid MIDI event"
-msgstr "ÎÅ×ÅÒÎÏÅ ÓÏÂÙÔÉÅ MIDI"
+#~ msgid "invalid MIDI event"
+#~ msgstr "ÎÅ×ÅÒÎÏÅ ÓÏÂÙÔÉÅ MIDI"
 
-#: midi-track-parser.cc:348
-msgid "MIDI track expected"
-msgstr "ÏÖÉÄÁÌÁÓØ MIDI ÄÏÒÏÖËÁ"
+#~ msgid "MIDI track expected"
+#~ msgstr "ÏÖÉÄÁÌÁÓØ MIDI ÄÏÒÏÖËÁ"
 
-#: midi-track-parser.cc:353
-msgid "invalid track length"
-msgstr "ÎÅ×ÅÒÎÁÑ ÄÌÉÎÁ ÄÏÒÏÖËÉ"
+#~ msgid "invalid track length"
+#~ msgstr "ÎÅ×ÅÒÎÁÑ ÄÌÉÎÁ ÄÏÒÏÖËÉ"
 
 #~ msgid "no Grace context available"
 #~ msgstr "ÎÅÔ ÄÏÓÔÕÐÎÏÇÏ æÏÒÛÌÁÇ-ËÏÎÔÅËÓÔÁ"
diff -purN ../lilypond-1.5.28/po/sv.po ./po/sv.po
--- ../lilypond-1.5.28/po/sv.po	Sun Sep 16 17:09:58 2001
+++ ./po/sv.po	Thu Jan 31 13:17:54 2002
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.4.6\n"
-"POT-Creation-Date: 2001-09-09 17:41+0200\n"
+"POT-Creation-Date: 2002-01-29 23:08+0100\n"
 "PO-Revision-Date: 2001-09-03 21:00+0200\n"
 "Last-Translator: Martin Norbäck <d95mback@dtek.chalmers.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -13,306 +13,351 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ly2dvi.py:115
-msgid "Generate .dvi with LaTeX for LilyPond"
-msgstr "Generera .dvi med LaTeX för LilyPond"
-
-#: data-file.cc:118 input.cc:85 ly2dvi.py:197 midi-parser.cc:100 mup2ly.py:93
-#: update-lily.py:119 warn.cc:23
+#: data-file.cc:118 input.cc:85 ly2dvi.py:113 midi2ly.py:148
+#: update-lily.py:136 warn.cc:23
 msgid "warning: "
 msgstr "varning: "
 
-#: input.cc:90 ly2dvi.py:212 ly2dvi.py:641 ly2dvi.py:659 ly2dvi.py:850
-#: mup2ly.py:98 mup2ly.py:188 update-lily.py:124 update-lily.py:212 warn.cc:9
-#: warn.cc:17
+#: input.cc:90 ly2dvi.py:116 ly2dvi.py:132 ly2dvi.py:691 ly2dvi.py:709
+#: midi2ly.py:163 midi2ly.py:1012 midi2ly.py:1081 update-lily.py:151
+#: update-lily.py:426 warn.cc:9 warn.cc:17
 msgid "error: "
 msgstr "fel: "
 
-#: ly2dvi.py:213 mup2ly.py:100 update-lily.py:126
+#: ly2dvi.py:133 midi2ly.py:164 update-lily.py:152
 msgid "Exiting ... "
 msgstr "Avslutar... "
 
-#: ly2dvi.py:271 mup2ly.py:158 update-lily.py:184
+#: ly2dvi.py:191 midi2ly.py:222 update-lily.py:210
 #, c-format
 msgid "Usage: %s [OPTION]... FILE"
 msgstr "Användning: %s [FLAGGA]... FIL"
 
-#: ly2dvi.py:275 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:188
+#: ly2dvi.py:195 main.cc:151 midi2ly.py:226 update-lily.py:214
 msgid "Options:"
 msgstr "Flaggor:"
 
-#: ly2dvi.py:279 main.cc:124 main.cc:166 mup2ly.py:168 update-lily.py:192
+#: ly2dvi.py:199 main.cc:168 midi2ly.py:230 update-lily.py:218
 #, c-format
 msgid "Report bugs to %s"
 msgstr ""
 "Rapportera programfel till %s\n"
 "Rapportera fel i översättningen till <sv@li.org>"
 
-#: ly2dvi.py:307 mup2ly.py:185 update-lily.py:209
+#: ly2dvi.py:227 midi2ly.py:258 update-lily.py:246
 #, c-format
 msgid "Invoking `%s'"
 msgstr "Startar \"%s\""
 
-#: ly2dvi.py:311 mup2ly.py:188 update-lily.py:212
+#: ly2dvi.py:231 midi2ly.py:262 update-lily.py:250
 #, c-format
 msgid "command exited with value %d"
 msgstr "kommandot avslutade med värde %d"
 
-#: ly2dvi.py:313 mup2ly.py:190 update-lily.py:214
+#: ly2dvi.py:233 midi2ly.py:264 update-lily.py:252
 msgid "(ignored)"
 msgstr "(ignorerat)"
 
 # här är det fråga om rensning av en temporärkatalog
-#: ly2dvi.py:323
+#: ly2dvi.py:243 midi2ly.py:274 update-lily.py:262
 #, c-format
 msgid "Cleaning %s..."
 msgstr "Rensar %s..."
 
-#: ly2dvi.py:338 mup2ly.py:214 update-lily.py:238
-#, c-format
-msgid "no such setting: %s"
-msgstr "inställningen finns inte: %s"
+#: ly2dvi.py:301
+msgid "Generate .dvi with LaTeX for LilyPond"
+msgstr "Generera .dvi med LaTeX för LilyPond"
 
-#: ly2dvi.py:351 main.cc:113
+#: ly2dvi.py:304 main.cc:115
 msgid "write Makefile dependencies for every input file"
 msgstr "skriv Makefile-beroenden för varje indatafil"
 
 # förklaring av flaggan -h
-#: ly2dvi.py:352 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:252
+#: ly2dvi.py:305 main.cc:111 midi2ly.py:98 mup2ly.py:74 update-lily.py:86
 msgid "this help"
 msgstr "denna hjälp"
 
-#: ly2dvi.py:353 main.cc:111 main.cc:116
+#: ly2dvi.py:306 main.cc:113 main.cc:118
 msgid "DIR"
 msgstr "KATALOG"
 
-#: ly2dvi.py:353
+#: ly2dvi.py:306
 msgid "add DIR to LilyPond's search path"
 msgstr "lägg till KATALOG till LilyPonds sökväg"
 
 # %s är programmets namn
-#: ly2dvi.py:354
+#: ly2dvi.py:307
 #, c-format
 msgid "keep all output, and name the directory %s.dir"
 msgstr "behåll all utdata, och namnge katalogen %s.dir"
 
-#: ly2dvi.py:355
+#: ly2dvi.py:308
 msgid "don't run LilyPond"
 msgstr "kör inte LilyPond"
 
-#: ly2dvi.py:356 main.cc:114
+#: ly2dvi.py:309 main.cc:116
 msgid "produce MIDI output only"
 msgstr "skapa enbart MIDI-utdata"
 
-#: ly2dvi.py:357 ly2dvi.py:358 main.cc:99 main.cc:112 main.cc:115
+#: ly2dvi.py:310 ly2dvi.py:311 main.cc:114 main.cc:117 midi2ly.py:100
 msgid "FILE"
 msgstr "FIL"
 
-#: ly2dvi.py:357
+#: ly2dvi.py:310 midi2ly.py:100
 msgid "write ouput to FILE"
 msgstr "skriv utdata till FIL"
 
-#: ly2dvi.py:358
+#: ly2dvi.py:311
 msgid "find pfa fonts used in FILE"
 msgstr ""
 
-#: ly2dvi.py:360
+#: ly2dvi.py:313
 msgid "generate PostScript output"
 msgstr "skapa PostScript-utdata"
 
-#: ly2dvi.py:361
+#: ly2dvi.py:314
 msgid "KEY=VAL"
 msgstr "NYCKEL=VÄRDE"
 
-#: ly2dvi.py:361
+#: ly2dvi.py:314
 msgid "change global setting KEY to VAL"
 msgstr "ändra global inställning NYCKEL till VÄRDE"
 
 # Förklaring till --verbose (borde vara längre)
-#: ly2dvi.py:362 main.cc:119 mup2ly.py:1120 update-lily.py:256
+#: ly2dvi.py:315 main.cc:121 midi2ly.py:103 mup2ly.py:77 update-lily.py:90
 msgid "verbose"
 msgstr "utförlig utdata"
 
-#: ly2dvi.py:363 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:257
+#: ly2dvi.py:316 main.cc:120 midi2ly.py:104 mup2ly.py:78 update-lily.py:91
 msgid "print version number"
 msgstr "visa versionsnummer"
 
-#: ly2dvi.py:364 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:259
+#: ly2dvi.py:317 main.cc:122 midi2ly.py:105 mup2ly.py:79 update-lily.py:93
 msgid "show warranty and copyright"
 msgstr "visa garanti och copyright"
 
-#: ly2dvi.py:386 ly2dvi.py:582 ly2dvi.py:607
+#: ly2dvi.py:406
+#, c-format
+msgid "no such setting: %s"
+msgstr "inställningen finns inte: %s"
+
+#: ly2dvi.py:434 ly2dvi.py:632 ly2dvi.py:657
 #, c-format
 msgid "Running %s..."
 msgstr "Kör %s..."
 
-#: ly2dvi.py:399
+#: ly2dvi.py:449
 #, c-format
 msgid "Analyzing %s..."
 msgstr "Analyserar %s..."
 
-#: ly2dvi.py:455
+#: ly2dvi.py:505
 #, c-format
 msgid "no lilypond output found for %s"
 msgstr "ingen lilypondutdata funnen för %s"
 
-#: ly2dvi.py:497
+#: ly2dvi.py:547
 #, c-format
 msgid "invalid value: %s"
 msgstr "ogiltigt värde: %s"
 
-#: ly2dvi.py:641
+#: ly2dvi.py:691
 #, fuzzy, c-format
 msgid "not a PostScript file: `%s'"
 msgstr "kan inte öppna fil: \"%s\""
 
-#: ly2dvi.py:659
+#: ly2dvi.py:709 midi2ly.py:1012 update-lily.py:426
 #, c-format
 msgid "getopt says: `%s'"
 msgstr ""
 
+#: ly2dvi.py:820
+#, fuzzy, c-format
+msgid "filename should not contain spaces: `%s'"
+msgstr "Innehåller redan: \"%s\""
+
 # här är det fråga om skrivning till en fil
-#: ly2dvi.py:826 scores.cc:44
+#: ly2dvi.py:885 scores.cc:44
 #, c-format
 msgid "dependencies output to `%s'..."
 msgstr "beroenden skrivna till \"%s\"..."
 
 # här är det fråga om skrivning till en fil (första parametern är t.ex
 # DVI, LATEX, MIDI, TEX)
-#: ly2dvi.py:837
+#: ly2dvi.py:896 midi2ly.py:996
 #, c-format
 msgid "%s output to `%s'..."
 msgstr "%s skrivet till \"%s\"..."
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:839
-#: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
+#: includable-lexer.cc:49 lily-guile.cc:134 ly2dvi.py:898 scores.cc:136
+#: scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "kan inte hitta fil: \"%s\""
 
-#: ly2dvi.py:850
+#: ly2dvi.py:909 midi2ly.py:1081
 msgid "no files specified on command line."
 msgstr "inga filer angivna på kommandoraden."
 
-#: mup2ly.py:51
-msgid "Convert mup to ly"
-msgstr "Konvertera mup till ly"
+#: midi2ly.py:92
+msgid "Convert MIDI to LilyPond source"
+msgstr ""
 
-# %s är programnamnet (mup2ly)
-#: mup2ly.py:166
-#, c-format
-msgid "%s is far from completed.  Not all constructs are recognised."
-msgstr "%s är långt ifrån färdig, och kan inte alla konstruktioner."
+#: midi2ly.py:95
+msgid "print absolute pitches"
+msgstr ""
 
-#: mup2ly.py:964
-#, c-format
-msgid "no such context: %s"
-msgstr "omgivning finns inte: %s"
+#: midi2ly.py:96 midi2ly.py:101
+msgid "DUR"
+msgstr "LÄNGD"
+
+#: midi2ly.py:96
+msgid "quantise note durations on DUR"
+msgstr ""
+
+#: midi2ly.py:97
+msgid "print explicit durations"
+msgstr ""
+
+#: midi2ly.py:99
+#, fuzzy
+msgid "ALT[:MINOR]"
+msgstr "TON[:MOLL]"
+
+#: midi2ly.py:99
+#, fuzzy
+msgid "set key: ALT=+sharps|-flats; MINOR=1"
+msgstr "sätt tonart: TON +höjningar/-sänkningar; :1 moll"
+
+#: midi2ly.py:101
+msgid "quantise note starts on DUR"
+msgstr ""
+
+#: midi2ly.py:102
+msgid "DUR*NUM/DEN"
+msgstr ""
 
-#: mup2ly.py:1115
+#: midi2ly.py:102
+msgid "allow tuplet durations DUR*NUM/DEN"
+msgstr ""
+
+#: midi2ly.py:106
+msgid "treat every text as a lyric"
+msgstr ""
+
+#: midi2ly.py:1027
+msgid "Example:"
+msgstr ""
+
+#: mup2ly.py:69
+#, fuzzy
+msgid "Convert mup to LilyPond source"
+msgstr "Konvertera mup till ly"
+
+#: mup2ly.py:72
 msgid "debug"
 msgstr "felsökningsutdata"
 
-#: mup2ly.py:1116
+#: mup2ly.py:73
 msgid "define macro NAME [optional expansion EXP]"
 msgstr "definiera makro NAME [valfri makroersättning EXP]"
 
-#: main.cc:115 mup2ly.py:1118
+#: main.cc:117 mup2ly.py:75
 msgid "write output to FILE"
 msgstr "skriv utdata till FIL"
 
-#: mup2ly.py:1119
+#: mup2ly.py:76
 msgid "only pre-process"
 msgstr "förbehandla enbart"
 
-#: mup2ly.py:1200
+#: mup2ly.py:827
+#, c-format
+msgid "no such context: %s"
+msgstr "omgivning finns inte: %s"
+
+#: mup2ly.py:1051
 #, c-format
 msgid "Processing `%s'..."
 msgstr "Behandlar \"%s\"..."
 
-#: mup2ly.py:1219
+#: mup2ly.py:1070
 #, c-format
 msgid "Writing `%s'..."
 msgstr "Skriver \"%s\"..."
 
-#: update-lily.py:52
+#: update-lily.py:75
 msgid "Fetch and rebuild from latest source package"
 msgstr "Hämta och bygg om från senaste källkodspaketet"
 
-#: update-lily.py:224
-#, c-format
-msgid "Cleaning `%s'..."
-msgstr "Rensar \"%s\"..."
-
-#: update-lily.py:244
+#: update-lily.py:78
 #, c-format
 msgid "unpack and build in DIR [%s]"
 msgstr "packa upp och bygg i DIR [%s]"
 
-#: update-lily.py:245
+#: update-lily.py:79
 msgid "execute COMMAND, subtitute:"
 msgstr "kör COMMAND, ersätt:"
 
-#: update-lily.py:246
+#: update-lily.py:80
 msgid "%b: build root"
 msgstr "%b: byggrot"
 
-#: update-lily.py:247
+#: update-lily.py:81
 #, c-format
 msgid "%n: package name"
 msgstr "%n: paketnamn"
 
-#: update-lily.py:248
+#: update-lily.py:82
 msgid "%r: release directory"
 msgstr "%r: programsläppskatalog"
 
-#: update-lily.py:249
+#: update-lily.py:83
 msgid "%t: tarball"
 msgstr "%t: tarboll"
 
-#: update-lily.py:250
+#: update-lily.py:84
 msgid "%v: package version"
 msgstr "%v: paketversion"
 
-#: update-lily.py:253
+#: update-lily.py:87
 #, c-format
 msgid "keep all output, and name the directory %s"
 msgstr "behåll all utdata, och döp katalogen till %s"
 
-#: update-lily.py:254
+#: update-lily.py:88
 msgid "upon failure notify EMAIL[,EMAIL]"
 msgstr "vid fel, meddela EMAIL[,EMAIL]"
 
-#: update-lily.py:255
+#: update-lily.py:89
 msgid "remove previous build"
 msgstr "ta bort föregående bygge"
 
-#: update-lily.py:258
+#: update-lily.py:92
 #, c-format
 msgid "fetch and build URL [%s]"
 msgstr "hämta och bygg URL [%s]"
 
-#: update-lily.py:366
+#: update-lily.py:397
 #, c-format
 msgid "Listing `%s'..."
 msgstr "Listar \"%s\"..."
 
-#: update-lily.py:427
+#: update-lily.py:465
 #, c-format
 msgid "latest is: %s"
 msgstr "senaste är: %s"
 
-#: update-lily.py:428
+#: update-lily.py:466
 #, c-format
 msgid "relax, %s is up to date"
 msgstr "lugn, %s är senaste versionen"
 
-#: update-lily.py:436 update-lily.py:449
+#: update-lily.py:474 update-lily.py:487
 #, c-format
 msgid "Fetching `%s'..."
 msgstr "Hämtar \"%s\"..."
 
-#: update-lily.py:458
+#: update-lily.py:496
 #, c-format
 msgid "Building `%s'..."
 msgstr "Bygger \"%s\"..."
@@ -354,8 +399,8 @@ msgstr "okänd position"
 msgid "can't map file"
 msgstr "kan inte göra \"mmap\" på filen"
 
-#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45
-#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
+#: mapped-file-storage.cc:87 scores.cc:48 simple-file-storage.cc:44
+#: streams.cc:37 text-stream.cc:23
 #, c-format
 msgid "can't open file: `%s'"
 msgstr "kan inte öppna fil: \"%s\""
@@ -377,6 +422,16 @@ msgstr "programmeringsfel: "
 msgid " (Continuing; cross thumbs)"
 msgstr " (Fortsätter, håll tummarna)"
 
+#: accidental-engraver.cc:136
+#, fuzzy, c-format
+msgid "unknown accidental typesetting: %s"
+msgstr "okänd \"escaped\" sträng: \"\\%s\""
+
+#: accidental-engraver.cc:139
+#, c-format
+msgid "Accidental typesetting must be pair: %s"
+msgstr ""
+
 #: afm.cc:59
 #, c-format
 msgid "can't find character number: %d"
@@ -438,35 +493,46 @@ msgstr "Ger upp"
 msgid "Can't switch translators, I'm there already"
 msgstr "Kan inte byta översättare, jag är redan där"
 
-#: beam-engraver.cc:91 beam-engraver.cc:124
+#: bar-check-iterator.cc:58
+#, c-format
+msgid "barcheck failed at: %s"
+msgstr "taktkontroll misslyckades vid: %s"
+
+#: beam-engraver.cc:93 beam-engraver.cc:126
 msgid "can't find start of beam"
 msgstr "kan inte hitta start på balk"
 
-#: beam-engraver.cc:158
+#: beam-engraver.cc:150
 msgid "already have a beam"
 msgstr "har redan en balk"
 
-#: beam-engraver.cc:222
+#: beam-engraver.cc:216
 msgid "unterminated beam"
 msgstr "oavslutad balk"
 
-#: beam-engraver.cc:255 chord-tremolo-engraver.cc:195
+#: beam-engraver.cc:249 chord-tremolo-engraver.cc:193
 msgid "stem must have Rhythmic structure"
 msgstr "skaft måste ha en rytmisk struktur"
 
-#: beam-engraver.cc:267
+#: beam-engraver.cc:261
 msgid "stem doesn't fit in beam"
 msgstr "skaftet passar inte i balken"
 
-#: beam-engraver.cc:268
+#: beam-engraver.cc:262
 msgid "beam was started here"
 msgstr "balken startade här"
 
-#: beam.cc:86
-msgid "beam has less than two stems"
+#: beam.cc:93
+#, fuzzy
+msgid "beam has less than two visible stems"
+msgstr "balk har mindre än två skaft"
+
+#: beam.cc:98
+#, fuzzy
+msgid "Beam has less than two stems. Removing beam."
 msgstr "balk har mindre än två skaft"
 
-#: beam.cc:637
+#: beam.cc:660
 msgid "weird beam vertical offset"
 msgstr "underligt vertikalt avstånd för balk"
 
@@ -494,7 +560,7 @@ msgstr "Jag är en själv"
 msgid "none of these in my family"
 msgstr "ingen av dessa i min familj"
 
-#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192
+#: chord-tremolo-engraver.cc:139 percent-repeat-engraver.cc:182
 msgid "unterminated chord tremolo"
 msgstr "icke avslutat ackordtremolo"
 
@@ -513,7 +579,7 @@ msgstr "ogiltig subtraktion: inte del av
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr "ogiltig ton för inversion: inte del av ett ackord: %s"
 
-#: collision.cc:245
+#: collision.cc:281
 msgid "Too many clashing notecolumns.  Ignoring them."
 msgstr "För många krockande notkolumner. Ignorerar dem."
 
@@ -521,27 +587,27 @@ msgstr "För många krockande notkolumner.
 msgid "NaN"
 msgstr "-"
 
-#: dynamic-engraver.cc:197 span-dynamic-performer.cc:86
+#: dynamic-engraver.cc:195 span-dynamic-performer.cc:82
 msgid "can't find start of (de)crescendo"
 msgstr "kan inte hitta start på crescendo/diminuendo"
 
-#: dynamic-engraver.cc:222
+#: dynamic-engraver.cc:220
 msgid "already have a crescendo"
 msgstr "har redan ett crescendo"
 
-#: dynamic-engraver.cc:223
+#: dynamic-engraver.cc:221
 msgid "already have a decrescendo"
 msgstr "har redan ett diminuendo"
 
-#: dynamic-engraver.cc:317
+#: dynamic-engraver.cc:315
 msgid "unterminated (de)crescendo"
 msgstr "oavslutat crescendo/diminuendo"
 
-#: extender-engraver.cc:97
+#: extender-engraver.cc:96
 msgid "unterminated extender"
 msgstr "oavslutad utökare"
 
-#: extender-engraver.cc:109
+#: extender-engraver.cc:108
 msgid "Nothing to connect extender to on the left.  Ignoring extender request."
 msgstr ""
 "Det finns inget att koppla utökaren mot till vänster. Ignorerar "
@@ -555,7 +621,7 @@ msgstr "det finns ingen som kan skriva e
 msgid "couldn't find any font satisfying "
 msgstr "kunde inte hitta något typsnitt som uppfyller "
 
-#: gourlay-breaking.cc:157
+#: gourlay-breaking.cc:168
 msgid "No feasible line breaking found"
 msgstr "Ingen lämplig radbrytning hittades"
 
@@ -567,25 +633,25 @@ msgstr "diminuendo för litet"
 msgid "crescendo too small"
 msgstr "crescendo för litet"
 
-#: hyphen-engraver.cc:90
+#: hyphen-engraver.cc:89
 msgid "unterminated hyphen"
 msgstr "oavslutat bindestreck"
 
-#: hyphen-engraver.cc:102
+#: hyphen-engraver.cc:101
 msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen request."
 msgstr ""
 "Det finns inget att koppla bindestrecket mot till vänster. Ignorerar "
 "bindestrecksförfrågan."
 
-#: key-engraver.cc:99
+#: key-engraver.cc:93
 msgid "Conflicting key signatures found."
 msgstr "Motsägande tonartssignaturer funna."
 
-#: key-engraver.cc:100
+#: key-engraver.cc:94
 msgid "This was the other key definition."
 msgstr "Detta var den andra tonartsdefinitionen."
 
-#: key-performer.cc:77
+#: key-performer.cc:91
 msgid "FIXME: key change merge"
 msgstr "FIXA: tonartsbytessammanslagning"
 
@@ -594,7 +660,7 @@ msgstr "FIXA: tonartsbytessammanslagning
 msgid "Kpathsea couldn't find TFM file `%s'"
 msgstr "kan inte hitta fil: \"%s\""
 
-#: lily-guile.cc:141
+#: lily-guile.cc:136
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(inläsningssökväg: \"%s\""
@@ -604,12 +670,12 @@ msgstr "(inläsningssökväg: \"%s\""
 msgid "Element count %d."
 msgstr "Elementantal %d."
 
-#: line-of-score.cc:313 paper-score.cc:77
+#: line-of-score.cc:325 paper-score.cc:76
 #, c-format
 msgid "Element count %d "
 msgstr "Elementantal %d "
 
-#: line-of-score.cc:327
+#: line-of-score.cc:339
 msgid "Calculating column positions..."
 msgstr "Beräknar kolumnpositioner..."
 
@@ -622,62 +688,62 @@ msgid "Huh? Melismatic note found to hav
 msgstr "Öh? Melismatisk not har tillhörande text."
 
 #. print example usage:  lilypond -e "(set-lily-option 'help 0)" ?
-#: main.cc:105
+#: main.cc:107
 msgid "EXPR"
 msgstr "UTTR"
 
-#: main.cc:105
+#: main.cc:107
 msgid "evalute EXPR as Scheme after .scm init is read"
 msgstr "evaluera UTTR som Scheme efter .scm-init har lästs"
 
 #. another bug in option parser: --output=foe is taken as an abbreviation
 #. for --output-format
-#: main.cc:108
+#: main.cc:110
 msgid "EXT"
 msgstr "FMT"
 
-#: main.cc:108
+#: main.cc:110
 #, fuzzy
 msgid "use output format EXT (tex [default], pdftex, ps, scm or as)"
 msgstr "använd utdataformat FMT (scm, ps, tex eller as)"
 
-#: main.cc:110
+#: main.cc:112
 msgid "FIELD"
 msgstr "FÄLT"
 
-#: main.cc:110
+#: main.cc:112
 msgid "write header field to BASENAME.FIELD"
 msgstr "skriv rubrikfält till BASNAMN.FÄLT"
 
-#: main.cc:111
+#: main.cc:113
 msgid "add DIR to search path"
 msgstr "lägg till KATALOG till sökvägen"
 
-#: main.cc:112
+#: main.cc:114
 msgid "use FILE as init file"
 msgstr "använd FIL som init-fil"
 
-#: main.cc:116
+#: main.cc:118
 msgid "prepend DIR to dependencies"
 msgstr "lägg till KATALOG efter beroenden"
 
-#: main.cc:117
+#: main.cc:119
 msgid "inhibit file output naming and exporting"
 msgstr "hindra namngivning av filutdata och exportering"
 
 #.
 #. No version number or newline here. It confuses help2man
 #.
-#: main.cc:137
+#: main.cc:139
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Användning: %s [FLAGGA]... FIL..."
 
-#: main.cc:139
+#: main.cc:141
 msgid "Typeset music and or play MIDI from FILE"
 msgstr "Typsätt musik och/eller spela MIDI från FIL"
 
-#: main.cc:143
+#: main.cc:145
 msgid ""
 "LilyPond is a music typesetter.  It produces beautiful sheet music\n"
 "using a high level description file as input.  LilyPond is part of \n"
@@ -687,11 +753,11 @@ msgstr ""
 "högnivåbeskrivning av musiken i en fil. LilyPond är en del av\n"
 "GNU-projektet.\n"
 
-#: main.cc:153
+#: main.cc:155
 msgid "This binary was compiled with the following options:"
 msgstr "Detta program kompilerades med följande alternativ:"
 
-#: main.cc:56 main.cc:174
+#: main.cc:176
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -702,16 +768,16 @@ msgstr ""
 "och du får ändra och/eller distribuera kopior av den under vissa\n"
 "villkor. Kör \"%s --warranty\" för mer information.\n"
 
-#: main.cc:63 main.cc:181 main.cc:193
+#: main.cc:183 main.cc:195
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright © %s av"
 
-#: main.cc:191
+#: main.cc:193
 msgid "GNU LilyPond -- The music typesetter"
 msgstr "GNU Lilypond -- Musiktypsättaren"
 
-#: main.cc:72 main.cc:199
+#: main.cc:201
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License version 2\n"
@@ -759,42 +825,42 @@ msgstr "tokig ton"
 msgid "can't find `%s' context"
 msgstr "kan inte hitta omgivningen \"%s\""
 
-#: music.cc:239
+#: music.cc:144
+#, c-format
+msgid "Transposition by %s makes accidental larger than two"
+msgstr "Transponering med %s gör höjning/sänkning större än två"
+
+#: music.cc:249
 msgid "ly_get_mus_property (): Not a Music"
 msgstr "ly_get_mus_property (): Inte en \"Music\""
 
-#: music.cc:253
+#: music.cc:263
 msgid "ly_set_mus_property (): Not a symbol"
 msgstr "ly_set_mus_property (): inte en symbol"
 
-#: music.cc:265
+#: music.cc:275
 msgid "ly_set_mus_property ():  not of type Music"
 msgstr "ly_set_mus_property (): inte av typen \"Music\""
 
-#: music.cc:279
+#: music.cc:289
 msgid "ly_make_music (): Not a string"
 msgstr "ly_make_music (): Inte en sträng"
 
-#: music.cc:299
+#: music.cc:309
 msgid "ly_music_name (): Not a music expression"
 msgstr "ly_music_name (): Inte ett musikuttryck"
 
-#: musical-request.cc:28
-#, c-format
-msgid "Transposition by %s makes accidental larger than two"
-msgstr "Transponering med %s gör höjning/sänkning större än två"
-
-#: my-lily-lexer.cc:140
+#: my-lily-lexer.cc:139
 #, c-format
 msgid "Identifier name is a keyword: `%s'"
 msgstr "Identifierarnamn är ett nyckelord: \"%s\""
 
-#: my-lily-lexer.cc:160
+#: my-lily-lexer.cc:159
 #, c-format
 msgid "error at EOF: %s"
 msgstr "fel vid filslut: %s"
 
-#: midi-score-parser.cc:94 my-lily-parser.cc:47
+#: my-lily-parser.cc:47
 msgid "Parsing..."
 msgstr "Tolkar..."
 
@@ -812,32 +878,18 @@ msgstr "Slänger förfrågan: \"%s\""
 msgid "paper output to `%s'..."
 msgstr "pappersutdata till \"%s\"..."
 
-#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99
+#: paper-outputter.cc:60
 msgid ", at "
 msgstr ", vid "
 
-#: paper-outputter.cc:232
-#, c-format
-msgid "writing header field `%s' to `%s'..."
-msgstr "skriver rubrikfält \"%s\" till \"%s\"..."
-
-#: paper-score.cc:80
+#: paper-score.cc:79
 msgid "Preprocessing elements..."
 msgstr "Förbehandlar element..."
 
-#: paper-score.cc:114
+#: paper-score.cc:113
 msgid "Outputting Score, defined at: "
 msgstr "Matar ut partitur, definierade vid: "
 
-#: paper-stream.cc:41
-#, c-format
-msgid "can't create directory: `%s'"
-msgstr "kan inte skapa katalog: \"%s\""
-
-#: paper-stream.cc:55
-msgid "Error syncing file (disk full?)"
-msgstr "Fel vid synkning av fil (disken full?)"
-
 #.
 #. We could change the current translator's id, but that would make
 #. errors hard to catch
@@ -854,7 +906,7 @@ msgstr "Jag är en själv: \"%s\""
 msgid "none of these in my family: `%s'"
 msgstr "ingen av dessa i min familj: \"%s\""
 
-#: percent-repeat-engraver.cc:117
+#: percent-repeat-engraver.cc:116
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr "Vet inte hur en procentupprepning av denna längd ska hanteras."
 
@@ -870,12 +922,17 @@ msgstr "Spår... "
 msgid "Creator: "
 msgstr "Skapare: "
 
-#: performance.cc:113
+#: performance.cc:103
+#, fuzzy
+msgid "at "
+msgstr ", vid "
+
+#: performance.cc:114
 #, c-format
 msgid "from musical definition: %s"
 msgstr "från musikdefinition: %s"
 
-#: performance.cc:168
+#: performance.cc:169
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "MIDI-utdata till \"%s\"..."
@@ -888,8 +945,8 @@ msgstr "oavslutad fraseringsbåge"
 msgid "can't find start of phrasing slur"
 msgstr "kan inte hitta start på fraseringsbåge"
 
-#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154
-#: piano-pedal-performer.cc:85
+#: piano-pedal-engraver.cc:141 piano-pedal-engraver.cc:153
+#: piano-pedal-performer.cc:82
 #, c-format
 msgid "can't find start of piano pedal: `%s'"
 msgstr "kan inte hitta start på pianopedal: \"%s\""
@@ -898,7 +955,35 @@ msgstr "kan inte hitta start på pianoped
 msgid "Pitch arguments out of range"
 msgstr "Tonargument utanför intervallet"
 
-#: property-engraver.cc:121
+#: porrectus.cc:34
+msgid "(left_head == 0)"
+msgstr ""
+
+#: porrectus.cc:45
+msgid "undefined left_head"
+msgstr ""
+
+#: porrectus.cc:64
+msgid "(right_head == 0)"
+msgstr ""
+
+#: porrectus.cc:75
+msgid "undefined right_head"
+msgstr ""
+
+#: porrectus.cc:164
+msgid "junking lonely porrectus"
+msgstr ""
+
+#: porrectus.cc:174
+msgid "porrectus style undefined; using mensural"
+msgstr ""
+
+#: porrectus.cc:301
+msgid "ascending vaticana style porrectus"
+msgstr ""
+
+#: property-engraver.cc:116
 #, c-format
 msgid ""
 "`%s' is deprecated.  Use\n"
@@ -907,7 +992,7 @@ msgstr ""
 "\"%s\" är föråldrat. Använd\n"
 " \\property %s.%s \\override #'%s = #%s"
 
-#: property-engraver.cc:145
+#: property-engraver.cc:140
 #, c-format
 msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s"
 msgstr "Fel typ för egenskap: %s, typ: %s, värde funnet: %s, typ: %s"
@@ -924,25 +1009,25 @@ msgstr "för många toner för pauskrock"
 msgid "Scheme options:"
 msgstr "Scheme-alternativ:"
 
-#: score-engraver.cc:189
+#: score-engraver.cc:178
 #, c-format
 msgid "unbound spanner `%s'"
 msgstr "obunden bryggare \"%s\""
 
-#: score.cc:78
+#: score.cc:88
 msgid "Interpreting music..."
 msgstr "Tolkar musik..."
 
-#: score.cc:92
+#: score.cc:102
 msgid "Need music in a score"
 msgstr "Behöver musik i partitur"
 
 #. should we? hampers debugging.
-#: score.cc:105
+#: score.cc:115
 msgid "Errors found/*, not processing score*/"
 msgstr "Fel funna/*, behandlar inte partitur*/"
 
-#: score.cc:112
+#: score.cc:122
 #, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr "tidsåtgång: %.2f sekunder"
@@ -956,7 +1041,7 @@ msgstr "Partitur innehåller fel; kommer 
 msgid "Now processing: `%s'"
 msgstr "Behandlar nu: \"%s\""
 
-#: script-engraver.cc:66
+#: script-engraver.cc:65
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr "Kan inte tolka artikulering \"%s\""
@@ -966,18 +1051,18 @@ msgstr "Kan inte tolka artikulering \"%s
 msgid "Separation_item:  I've been drinking too much"
 msgstr "Separation_item: Jag har druckit för mycket"
 
-#: simple-spacer.cc:200
+#: simple-spacer.cc:202
 #, c-format
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:125
+#: slur-engraver.cc:124
 msgid "unterminated slur"
 msgstr "oavslutat båge"
 
 #. How to shut up this warning, when Voice_devnull_engraver has
 #. eaten start request?
-#: slur-engraver.cc:142
+#: slur-engraver.cc:141
 msgid "can't find start of slur"
 msgstr "kan inte hitta start på båge"
 
@@ -985,11 +1070,11 @@ msgstr "kan inte hitta start på båge"
 msgid "Putting slur over rest.  Ignoring."
 msgstr "Sätter båge över paus. Ignorerar."
 
-#: slur.cc:383
+#: slur.cc:393
 msgid "Slur over rest?"
 msgstr "Båge över paus?"
 
-#: stem-engraver.cc:115
+#: stem-engraver.cc:117
 #, c-format
 msgid "Adding note head to incompatible stem (type = %d)"
 msgstr "Lägger till nothuvud till inkompatibel båge (typ = %d)"
@@ -998,15 +1083,24 @@ msgstr "Lägger till nothuvud till inkomp
 msgid "Weird stem size; check for narrow beams"
 msgstr "Konstig skaftstorlek; kolla efter smala balkar"
 
-#: text-spanner-engraver.cc:94
+#: streams.cc:33
+#, c-format
+msgid "can't create directory: `%s'"
+msgstr "kan inte skapa katalog: \"%s\""
+
+#: streams.cc:47
+msgid "Error syncing file (disk full?)"
+msgstr "Fel vid synkning av fil (disken full?)"
+
+#: text-spanner-engraver.cc:92
 msgid "can't find start of text spanner"
 msgstr "kan inte hitta start på textbryggare"
 
-#: text-spanner-engraver.cc:114
+#: text-spanner-engraver.cc:112
 msgid "already have a text spanner"
 msgstr "har redan en textbryggare"
 
-#: text-spanner-engraver.cc:169
+#: text-spanner-engraver.cc:167
 msgid "unterminated text spanner"
 msgstr "oavslutad textbryggare"
 
@@ -1029,60 +1123,53 @@ msgstr "%s: TFM-fil har %u parametrar, v
 msgid "can't find ascii character: %d"
 msgstr "kan inte hitta ASCII-tecken: %d"
 
-#. How to shut up this warning, when no notes appeared because
-#. they were suicided by Thread_devnull_engraver?
-#: tie-engraver.cc:220 tie-performer.cc:173
-msgid "No ties were created!"
-msgstr "Inga bågar skapades!"
-
-#: tie-engraver.cc:240
+#: tie-engraver.cc:220
 msgid "lonely tie"
 msgstr "ensam båge"
 
+#: tie-performer.cc:161
+msgid "No ties were created!"
+msgstr "Inga bågar skapades!"
+
 #: time-scaled-music-iterator.cc:25
 msgid "no one to print a tuplet start bracket"
 msgstr "det finns ingen som kan skriva en starthake för tupel"
 
-#: timing-translator.cc:37
-#, c-format
-msgid "barcheck failed at: %s"
-msgstr "taktkontroll misslyckades vid: %s"
-
-#: translator-ctors.cc:40
+#: translator-ctors.cc:61
 #, c-format
 msgid "unknown translator: `%s'"
 msgstr "okänd översättare: \"%s\""
 
-#: translator-def.cc:99
+#: translator-def.cc:87
 msgid "Program has no such type"
 msgstr "Programmet har ingen sådan typ"
 
-#: translator-def.cc:105
+#: translator-def.cc:93
 #, c-format
 msgid "Already contains: `%s'"
 msgstr "Innehåller redan: \"%s\""
 
-#: translator-def.cc:106
+#: translator-def.cc:94
 #, c-format
 msgid "Not adding translator: `%s'"
 msgstr "Lägger inte till översättare: \"%s\""
 
-#: translator-def.cc:224
+#: translator-def.cc:212
 #, c-format
 msgid "can't find: `%s'"
 msgstr "kan inte hitta: \"%s\""
 
-#: translator-group.cc:145
+#: translator-group.cc:147
 #, c-format
 msgid "can't find or create `%s' called `%s'"
 msgstr "kan inte hitta eller skapa \"%s\" kallad \"%s\""
 
-#: translator-group.cc:230
+#: translator-group.cc:232
 #, c-format
 msgid "can't find or create: `%s'"
 msgstr "kan inte hitta eller skapa: \"%s\""
 
-#: translator-group.cc:413
+#: translator-group.cc:407
 #, c-format
 msgid ""
 "Can't find property type-check for `%s'.  Perhaps you made a typing error? "
@@ -1091,352 +1178,295 @@ msgstr ""
 "Kan inte hitta egenskapstypkontroll för \"%s\". Kanske har du gjort ett "
 "typfel? Gör tilldelning i alla fall."
 
-#: translator-group.cc:427
+#: translator-group.cc:421
 #, c-format
 msgid "Type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 "Typkontroll för \"%s\" misslyckades. Värde \"%s\" måste ha typen \"%s\""
 
 #. programming_error?
-#: translator-group.cc:446
+#: translator-group.cc:440
 msgid "ly-get-trans-property: expecting a Translator_group argument"
 msgstr "ly-get-trans-property: väntade ett Translator_group-argument"
 
-#: volta-engraver.cc:88
+#: volta-engraver.cc:108
 msgid "No volta spanner to end"
 msgstr "Ingen reprisbryggare till slutet"
 
-#: volta-engraver.cc:105
+#: volta-engraver.cc:125
 msgid "Already have a volta spanner.  Stopping that one prematurely."
 msgstr "Har redan en reprisbryggare. Stoppar den tidigare."
 
-#: volta-engraver.cc:109
+#: volta-engraver.cc:129
 msgid "Also have a stopped spanner.  Giving up."
 msgstr "Har också en stoppad bryggare. Ger upp."
 
-#: parser.yy:121
+#: parser.yy:129
 #, c-format
 msgid "Expecting %d arguments"
 msgstr "Väntade %d argument"
 
-#: parser.yy:423
+#: parser.yy:434
 msgid "Identifier should have  alphabetic characters only"
 msgstr "Identifierare får bara innehålla alfabetiska tecken"
 
-#: parser.yy:697
+#: parser.yy:715
 msgid "More alternatives than repeats.  Junking excess alternatives."
 msgstr "Fler alternativ än repriser. Slänger överblivna alternativ."
 
-#: parser.yy:761
+#: parser.yy:767
 msgid "Second argument must be a symbol"
 msgstr "Andra argumentet måste vara en symbol"
 
-#: parser.yy:766
+#: parser.yy:772
 msgid "First argument must be a procedure taking 1 argument"
 msgstr "Första argumentet måste vara en procedur som tar 1 argument"
 
-#: parser.yy:1298
+#: parser.yy:1315
 msgid "Expecting string as script definition"
 msgstr "Väntade sträng som skriptdefinition"
 
-#: parser.yy:1308
+#: parser.yy:1325
 msgid "Can't specify direction for this request"
 msgstr "Kan inte ange riktning för denna förfrågan"
 
-#: parser.yy:1433
+#: parser.yy:1451
 msgid "Expecting musical-pitch value"
 msgstr "Väntade notvärde"
 
-#: parser.yy:1444
+#: parser.yy:1462
 msgid "Must have duration object"
 msgstr "Måste ha längdobjekt"
 
-#: parser.yy:1453 parser.yy:1461
+#: parser.yy:1471 parser.yy:1479
 msgid "Have to be in Lyric mode for lyrics"
 msgstr "Måste vara i textläge (Lyric mode) för text"
 
-#: parser.yy:1614 parser.yy:1671
+#: parser.yy:1638 parser.yy:1691
 #, c-format
 msgid "not a duration: %d"
 msgstr "inte en längd: %d"
 
-#: parser.yy:1682
+#: parser.yy:1752
 msgid "Have to be in Note mode for notes"
 msgstr "Måste vara i notläge (Note mode) för noter"
 
-#: parser.yy:1765
+#: parser.yy:1845
 msgid "Have to be in Chord mode for chords"
 msgstr "Måste vara i ackordläge (Chord mode) för ackord"
 
-#: parser.yy:1945
+#: parser.yy:2025
 msgid "need integer number arg"
 msgstr "behöver heltalsargument"
 
-#: lexer.ll:174
+#: parser.yy:2097
+msgid "Suspect duration found following this beam"
+msgstr ""
+
+#: lexer.ll:175
 msgid "EOF found inside a comment"
 msgstr "filslut hittat inuti en kommentar"
 
-#: lexer.ll:188
+#: lexer.ll:189
 msgid "\\maininput disallowed outside init files"
 msgstr "\\maininput förbjudet utanför init-filer"
 
-#: lexer.ll:212
+#: lexer.ll:213
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "felaktig eller odefinierad identifierare: \"%s\""
 
 #. backup rule
-#: lexer.ll:221
+#: lexer.ll:222
 msgid "Missing end quote"
 msgstr "Saknat slutcitationstecken"
 
 #. backup rule
-#: lexer.ll:243 lexer.ll:247
+#: lexer.ll:244 lexer.ll:248
 msgid "white expected"
 msgstr "väntade tomrum"
 
-#: lexer.ll:256
+#: lexer.ll:257
 msgid "Can't evaluate Scheme in safe mode"
 msgstr "Kan inte evaluera Scheme i säkert läge"
 
-#: lexer.ll:349
+#: lexer.ll:358
 msgid "Brace found at end of lyric. Did you forget a space?"
 msgstr "Krullparentes funnen i slutet på text. Glömde du ett mellanslag?"
 
-#: lexer.ll:457
+#: lexer.ll:468
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "ogiltigt tecken: \"%c\""
 
-#: lexer.ll:538
+#: lexer.ll:554
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "okänd \"escaped\" sträng: \"\\%s\""
 
-#: lexer.ll:617
+#: lexer.ll:639
 #, c-format
 msgid "Oldest supported input version: %s"
 msgstr "Äldsta indataversion som stöds: %s"
 
-#: lexer.ll:629
+#: lexer.ll:651
 #, c-format
 msgid "incorrect lilypond version: %s (%s, %s)"
 msgstr "felaktig lilypond-version: %s (%s, %s)"
 
-#: lexer.ll:630
+#: lexer.ll:652
 msgid "Consider converting the input with the convert-ly script"
 msgstr "Fundera på att konvertera indata med skriptet \"convert-ly\""
 
-#: lilypond-item.cc:161
-#, c-format
-msgid "#32 in quarter: %d"
-msgstr "#32 i fjärdedel: %d"
+# %s är programnamnet (mup2ly)
+#~ msgid "%s is far from completed.  Not all constructs are recognised."
+#~ msgstr "%s är långt ifrån färdig, och kan inte alla konstruktioner."
 
-#: lilypond-score.cc:108
-#, c-format
-msgid "LY output to `%s'..."
-msgstr "LY-utdata till \"%s\"..."
+#~ msgid "Cleaning `%s'..."
+#~ msgstr "Rensar \"%s\"..."
 
-#: lilypond-score.cc:119
-#, c-format
-msgid "track %d:"
-msgstr "spår %d:"
+#~ msgid "writing header field `%s' to `%s'..."
+#~ msgstr "skriver rubrikfält \"%s\" till \"%s\"..."
 
-#: lilypond-score.cc:155
-msgid "Processing..."
-msgstr "Behandlar..."
+#~ msgid "#32 in quarter: %d"
+#~ msgstr "#32 i fjärdedel: %d"
 
-#: lilypond-score.cc:164
-msgid "Creating voices..."
-msgstr "Skapar stämmor..."
+#~ msgid "LY output to `%s'..."
+#~ msgstr "LY-utdata till \"%s\"..."
 
-#: lilypond-score.cc:168
-msgid "track "
-msgstr "spår "
+#~ msgid "track %d:"
+#~ msgstr "spår %d:"
 
-#: lilypond-score.cc:177
-msgid "NOT Filtering tempo..."
-msgstr "Filtrerar INTE tempo..."
+#~ msgid "Processing..."
+#~ msgstr "Behandlar..."
 
-#: lilypond-score.cc:186
-msgid "NOT Quantifying columns..."
-msgstr "Kvantifierar INTE kolumner..."
+#~ msgid "Creating voices..."
+#~ msgstr "Skapar stämmor..."
 
-#: lilypond-score.cc:190
-msgid "Quantifying columns..."
-msgstr "Kvantifierar kolumner..."
+#~ msgid "track "
+#~ msgstr "spår "
 
-#: lilypond-score.cc:223
-msgid "Settling columns..."
-msgstr "Bestämmer kolumner..."
+#~ msgid "NOT Filtering tempo..."
+#~ msgstr "Filtrerar INTE tempo..."
 
-#: lilypond-staff.cc:209
-msgid "% MIDI copyright:"
-msgstr "% MIDI-copyright:"
+#~ msgid "NOT Quantifying columns..."
+#~ msgstr "Kvantifierar INTE kolumner..."
 
-#: lilypond-staff.cc:210
-msgid "% MIDI instrument:"
-msgstr "% MIDI-instrument:"
+#~ msgid "Quantifying columns..."
+#~ msgstr "Kvantifierar kolumner..."
 
-#: lilypond-stream.cc:37
-#, c-format
-msgid "lily indent level: %d"
-msgstr "indenteringsnivå för lily: %d"
+#~ msgid "Settling columns..."
+#~ msgstr "Bestämmer kolumner..."
+
+#~ msgid "% MIDI copyright:"
+#~ msgstr "% MIDI-copyright:"
+
+#~ msgid "% MIDI instrument:"
+#~ msgstr "% MIDI-instrument:"
+
+#~ msgid "lily indent level: %d"
+#~ msgstr "indenteringsnivå för lily: %d"
 
 # Kanske man inte ska översätta, men då får de ta bort _() i stället för
 # att skriva en fånig kommentar
-#. Maybe better not to translate these?
-#: lilypond-stream.cc:83
-msgid "% Creator: "
-msgstr "% Skapare: "
-
-#: lilypond-stream.cc:88
-msgid "% Automatically generated"
-msgstr "% Automatgenererad"
-
-#: lilypond-stream.cc:97
-#, c-format
-msgid "% from input file: "
-msgstr "% från indatafil: "
-
-#: main.cc:94
-msgid "write exact durations, e.g.: a4*385/384"
-msgstr "skriv exakta länger, t.ex: a4*385/384"
-
-#: main.cc:95
-msgid "enable debugging output"
-msgstr "slå på felsökningsutdata"
+#~ msgid "% Creator: "
+#~ msgstr "% Skapare: "
 
-#: main.cc:97
-msgid "ACC[:MINOR]"
-msgstr "TON[:MOLL]"
+#~ msgid "% Automatically generated"
+#~ msgstr "% Automatgenererad"
 
-#: main.cc:97
-msgid "set key: ACC +sharps/-flats; :1 minor"
-msgstr "sätt tonart: TON +höjningar/-sänkningar; :1 moll"
+#~ msgid "% from input file: "
+#~ msgstr "% från indatafil: "
 
-#: main.cc:98
-msgid "don't output tuplets, double dots or rests, smallest is 32"
-msgstr "mata inte ut tupler, dubbelpunkteringar eller pauser, minsta är 32"
-
-#: main.cc:99
-msgid "set FILE as default output"
-msgstr "sätt FIL som standardutdata"
-
-#: main.cc:100
-msgid "don't output tuplets"
-msgstr "mata inte ut tupler"
-
-#: main.cc:101
-msgid "be quiet"
-msgstr "var tyst"
-
-#: main.cc:102
-msgid "don't output rests or skips"
-msgstr "mata inte ut pauser eller hopp"
+#~ msgid "write exact durations, e.g.: a4*385/384"
+#~ msgstr "skriv exakta länger, t.ex: a4*385/384"
 
-#: main.cc:103
-msgid "DUR"
-msgstr "LÄNGD"
+#~ msgid "enable debugging output"
+#~ msgstr "slå på felsökningsutdata"
 
-#: main.cc:103
-msgid "set smallest duration"
-msgstr "ställ in minsta längd"
+#~ msgid "don't output tuplets, double dots or rests, smallest is 32"
+#~ msgstr "mata inte ut tupler, dubbelpunkteringar eller pauser, minsta är 32"
 
-#: main.cc:104
-msgid "don't timestamp the output"
-msgstr "tidsstämpla inte utdata"
+#~ msgid "set FILE as default output"
+#~ msgstr "sätt FIL som standardutdata"
 
-#: main.cc:106
-msgid "be verbose"
-msgstr "var utförlig"
+#~ msgid "don't output tuplets"
+#~ msgstr "mata inte ut tupler"
 
-#: main.cc:108
-msgid "assume no double dotted notes"
-msgstr "anta inga dubbelpunkterade noter"
+#~ msgid "be quiet"
+#~ msgstr "var tyst"
 
-#: main.cc:115
-#, c-format
-msgid "Usage: %s [OPTION]... [FILE]"
-msgstr "Användning: %s [FLAGGA]... [FIL]"
+#~ msgid "don't output rests or skips"
+#~ msgstr "mata inte ut pauser eller hopp"
 
-#: main.cc:117
-msgid "Translate MIDI-file to lilypond"
-msgstr "Översätt MIDI-fil till lilypond"
+#~ msgid "set smallest duration"
+#~ msgstr "ställ in minsta längd"
 
-#: main.cc:131
-#, c-format
-msgid "no_double_dots: %d\n"
-msgstr "no_double_dots: %d\n"
+#~ msgid "don't timestamp the output"
+#~ msgstr "tidsstämpla inte utdata"
 
-#: main.cc:133
-#, c-format
-msgid "no_rests: %d\n"
-msgstr "no_rests: %d\n"
+#~ msgid "be verbose"
+#~ msgstr "var utförlig"
 
-#: main.cc:135
-#, c-format
-msgid "no_quantify_b_s: %d\n"
-msgstr "no_quantify_b_s: %d\n"
+#~ msgid "assume no double dotted notes"
+#~ msgstr "anta inga dubbelpunkterade noter"
 
-#: main.cc:137
-#, c-format
-msgid "no_smaller_than: %d (1/%d)\n"
-msgstr "no_smaller_than: %d (1/%d)\n"
+#~ msgid "Usage: %s [OPTION]... [FILE]"
+#~ msgstr "Användning: %s [FLAGGA]... [FIL]"
 
-#: main.cc:140
-#, c-format
-msgid "no_tuplets: %d\n"
-msgstr "no_tuplets: %d\n"
+#~ msgid "Translate MIDI-file to lilypond"
+#~ msgstr "Översätt MIDI-fil till lilypond"
 
-#: midi-parser.cc:64
-msgid "zero length string encountered"
-msgstr "sträng med längd noll påträffad"
+#~ msgid "no_double_dots: %d\n"
+#~ msgstr "no_double_dots: %d\n"
 
-#: midi-score-parser.cc:44
-msgid "MIDI header expected"
-msgstr "väntade MIDI-rubrik"
+#~ msgid "no_rests: %d\n"
+#~ msgstr "no_rests: %d\n"
 
-#: midi-score-parser.cc:49
-msgid "invalid header length"
-msgstr "felaktig rubriklängd"
+#~ msgid "no_quantify_b_s: %d\n"
+#~ msgstr "no_quantify_b_s: %d\n"
 
-#: midi-score-parser.cc:52
-msgid "invalid MIDI format"
-msgstr "ogiltigt MIDI-format"
+#~ msgid "no_smaller_than: %d (1/%d)\n"
+#~ msgstr "no_smaller_than: %d (1/%d)\n"
 
-#: midi-score-parser.cc:55
-msgid "invalid number of tracks"
-msgstr "ogiltigt antal spår"
+#~ msgid "no_tuplets: %d\n"
+#~ msgstr "no_tuplets: %d\n"
 
-#: midi-score-parser.cc:58
-msgid "can't handle non-metrical time"
-msgstr "kan inte hantera icke-metrisk tid"
+#~ msgid "zero length string encountered"
+#~ msgstr "sträng med längd noll påträffad"
 
-#: midi-track-parser.cc:68
-#, c-format
-msgid "Junking note-end event: channel = %d, pitch = %d"
-msgstr "Slänger notslutshändelse: kanal = %d, ton = %d"
+#~ msgid "MIDI header expected"
+#~ msgstr "väntade MIDI-rubrik"
+
+#~ msgid "invalid header length"
+#~ msgstr "felaktig rubriklängd"
+
+#~ msgid "invalid MIDI format"
+#~ msgstr "ogiltigt MIDI-format"
+
+#~ msgid "invalid number of tracks"
+#~ msgstr "ogiltigt antal spår"
+
+#~ msgid "can't handle non-metrical time"
+#~ msgstr "kan inte hantera icke-metrisk tid"
+
+#~ msgid "Junking note-end event: channel = %d, pitch = %d"
+#~ msgstr "Slänger notslutshändelse: kanal = %d, ton = %d"
 
-#: midi-track-parser.cc:124
-msgid "invalid running status"
-msgstr "ogiltig körstatus"
+#~ msgid "invalid running status"
+#~ msgstr "ogiltig körstatus"
 
-#: midi-track-parser.cc:328
-msgid "unimplemented MIDI meta-event"
-msgstr "oimplementerad MIDI-metahändelse"
+#~ msgid "unimplemented MIDI meta-event"
+#~ msgstr "oimplementerad MIDI-metahändelse"
 
-#: midi-track-parser.cc:333
-msgid "invalid MIDI event"
-msgstr "ogiltig MIDI-händelse"
+#~ msgid "invalid MIDI event"
+#~ msgstr "ogiltig MIDI-händelse"
 
-#: midi-track-parser.cc:348
-msgid "MIDI track expected"
-msgstr "väntade MIDI-spår"
+#~ msgid "MIDI track expected"
+#~ msgstr "väntade MIDI-spår"
 
-#: midi-track-parser.cc:353
-msgid "invalid track length"
-msgstr "ogiltig spårlängd"
+#~ msgid "invalid track length"
+#~ msgstr "ogiltig spårlängd"
 
 #~ msgid "no Grace context available"
 #~ msgstr "ingen prydnadsomgivning tillgänglig"
diff -purN ../lilypond-1.5.28/scm/clef.scm ./scm/clef.scm
--- ../lilypond-1.5.28/scm/clef.scm	Wed Dec  5 18:54:39 2001
+++ ./scm/clef.scm	Fri Feb  1 18:45:09 2002
@@ -66,6 +66,7 @@
     ("clefs-C" . 0)
     ("clefs-F" . 4)
     ("clefs-percussion" . 0)
+    ("clefs-tab" . 0 )
     ("clefs-vaticana_do" . 0)
     ("clefs-vaticana_fa" . 4)
     ("clefs-medicaea_do" . 0)
diff -purN ../lilypond-1.5.28/scm/output-lib.scm ./scm/output-lib.scm
--- ../lilypond-1.5.28/scm/output-lib.scm	Wed Dec  5 18:54:40 2001
+++ ./scm/output-lib.scm	Fri Feb  1 18:45:09 2002
@@ -88,6 +88,7 @@ centered, X==1 is at the right, X == -1 
     ((transparent) '(1.0 . 1.0))
     ((slash) '(1.0 . 1.0))
     ((harmonic) '(1.0 0.0))
+    ((triangle) '(0.75 . 0.15))
     (else
      '(1.0 . 0.0)
      )))
diff -purN ../lilypond-1.5.28/scripts/abc2ly.py ./scripts/abc2ly.py
--- ../lilypond-1.5.28/scripts/abc2ly.py	Thu Nov 22 11:57:34 2001
+++ ./scripts/abc2ly.py	Sat Dec 29 23:54:37 2001
@@ -1271,7 +1271,7 @@ This program converts ABC music files (s
 http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) To LilyPond input.
 
 
-Report bugs to bug-gnu-music@gnu.org
+Report bugs to bug-lilypond@gnu.org
 
 Written by Han-Wen Nienhuys <hanwen@cs.uu.nl>, Laura Conrad
 <lconrad@laymusic.org>, Roy Rankin <Roy.Rankin@@alcatel.com.au>
diff -purN ../lilypond-1.5.28/scripts/etf2ly.py ./scripts/etf2ly.py
--- ../lilypond-1.5.28/scripts/etf2ly.py	Thu Nov 22 11:57:34 2001
+++ ./scripts/etf2ly.py	Sat Dec 29 23:54:37 2001
@@ -1101,7 +1101,7 @@ Enigma Transport Format is a format used
 Finale product. This program will convert a subset of ETF to a
 ready-to-use lilypond file.
 
-Report bugs to bug-gnu-music@gnu.org
+Report bugs to bug-lilypond@gnu.org
 
 Written by  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 """)
diff -purN ../lilypond-1.5.28/scripts/lilypond-book.py ./scripts/lilypond-book.py
--- ../lilypond-1.5.28/scripts/lilypond-book.py	Wed Dec 26 22:11:48 2001
+++ ./scripts/lilypond-book.py	Sat Dec 29 23:54:37 2001
@@ -1157,7 +1157,7 @@ Options:
 
 
 
-Report bugs to bug-gnu-music@gnu.org.
+Report bugs to bug-lilypond@gnu.org.
 
 Written by Tom Cato Amundsen <tca@gnu.org> and
 Han-Wen Nienhuys <hanwen@cs.uu.nl>
diff -purN ../lilypond-1.5.28/scripts/ly2dvi.py ./scripts/ly2dvi.py
--- ../lilypond-1.5.28/scripts/ly2dvi.py	Wed Dec 26 22:11:48 2001
+++ ./scripts/ly2dvi.py	Fri Feb  1 19:20:28 2002
@@ -96,7 +96,7 @@ def identify ():
 def warranty ():
 	identify ()
 	sys.stdout.write ('\n')
-	sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001'))
+	sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001--2002'))
 	sys.stdout.write ('\n')
 	sys.stdout.write ('  Han-Wen Nienhuys')
 	sys.stdout.write ('  Jan Nieuwenhuizen')
diff -purN ../lilypond-1.5.28/scripts/midi2ly.py ./scripts/midi2ly.py
--- ../lilypond-1.5.28/scripts/midi2ly.py	Tue Oct 23 19:18:24 2001
+++ ./scripts/midi2ly.py	Fri Feb  1 19:20:28 2002
@@ -131,7 +131,7 @@ def identify ():
 def warranty ():
 	identify ()
 	sys.stdout.write ('\n')
-	sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001'))
+	sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001--2002'))
 	sys.stdout.write ('\n')
 	sys.stdout.write ('  Han-Wen Nienhuys')
 	sys.stdout.write ('  Jan Nieuwenhuizen')
diff -purN ../lilypond-1.5.28/scripts/musedata2ly.py ./scripts/musedata2ly.py
--- ../lilypond-1.5.28/scripts/musedata2ly.py	Thu Apr  5 00:12:30 2001
+++ ./scripts/musedata2ly.py	Fri Feb  1 19:20:28 2002
@@ -519,7 +519,7 @@ encoded in so-called Musedata format
 musedata2ly converts a set of musedata files to one .ly file, and will
 include a \header field if a .ref file is supplied 
 
-Report bugs to bug-gnu-music@gnu.org.
+Report bugs to bug-lilypond@gnu.org.
 
 Written by Han-Wen Nienhuys <hanwen@cs.uu.nl>
 """)
@@ -532,7 +532,7 @@ This is free software.  It is covered by
 and you are welcome to change it and/or distribute copies of it under
 certain conditions.  Invoke as `midi2ly --warranty' for more information.
 
-Copyright (c) 2000 by Han-Wen Nienhuys <hanwen@cs.uu.nl>
+Copyright (c) 2000--2002 by Han-Wen Nienhuys <hanwen@cs.uu.nl>
 """ % version)
 def identify():
 	sys.stderr.write ("%s from LilyPond %s\n" % (program_name, version))
diff -purN ../lilypond-1.5.28/scripts/pmx2ly.py ./scripts/pmx2ly.py
--- ../lilypond-1.5.28/scripts/pmx2ly.py	Tue Dec  4 01:20:11 2001
+++ ./scripts/pmx2ly.py	Fri Feb  1 19:20:28 2002
@@ -791,7 +791,7 @@ Options:
 PMX is a Musixtex preprocessor written by Don Simons, see
 http://www.gmd.de/Misc/Music/musixtex/software/pmx/
 
-Report bugs to bug-gnu-music@gnu.org.
+Report bugs to bug-lilypond@gnu.org.
 
 Written by Han-Wen Nienhuys <hanwen@cs.uu.nl>
 """)
@@ -804,7 +804,7 @@ This is free software.  It is covered by
 and you are welcome to change it and/or distribute copies of it under
 certain conditions.  Invoke as `midi2ly --warranty' for more information.
 
-Copyright (c) 2000 by Han-Wen Nienhuys <hanwen@cs.uu.nl>
+Copyright (c) 2000--2002 by Han-Wen Nienhuys <hanwen@cs.uu.nl>
 """ % version)
 def identify():
 	sys.stderr.write ("%s from LilyPond %s\n" % (program_name, version))
diff -purN ../lilypond-1.5.28/scripts/update-lily.py ./scripts/update-lily.py
--- ../lilypond-1.5.28/scripts/update-lily.py	Wed Nov 21 18:13:46 2001
+++ ./scripts/update-lily.py	Fri Feb  1 19:20:28 2002
@@ -119,7 +119,7 @@ def identify ():
 def warranty ():
 	identify ()
 	sys.stdout.write ('\n')
-	sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001'))
+	sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001--2002'))
 	sys.stdout.write ('\n')
 	sys.stdout.write ('  Han-Wen Nienhuys')
 	sys.stdout.write ('  Jan Nieuwenhuizen')
