From: John Mandereau <john.mandereau@gmail.com>
Date: Sat, 10 Jan 2009 12:40:44 +0000 (+0100)
Subject: Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond... 
X-Git-Tag: release/2.12.2-1~32^2~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=412c64d1afc9576b83783b995062083971475db3;p=lilypond.git

Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond/translation
---

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 790b046047..747a8e304e 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -2,7 +2,7 @@ depth = ..
 
 NAME = documentation
 LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py)
-SUBDIRS=user bibliography pictures topdocs misc po $(LANGS)
+SUBDIRS=devel user bibliography pictures topdocs misc po $(LANGS)
 STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"'
@@ -11,7 +11,7 @@ EXTRA_DIST_FILES= TRANSLATION
 
 include $(depth)/make/stepmake.make
 
-HTML_PAGE_NAMES= index devel translations
+HTML_PAGE_NAMES= index translations
 OUT_HTML_FILES= $(HTML_PAGE_NAMES:%=$(outdir)/%.html)
 OUT_CSS_FILES= $(CSS_FILES:%.css=$(outdir)/%.css)
 
diff --git a/Documentation/de/index.html.in b/Documentation/de/index.html.in
index ee95ddede8..5d9bae5359 100644
--- a/Documentation/de/index.html.in
+++ b/Documentation/de/index.html.in
@@ -100,7 +100,7 @@ als <a class="title" href="user/lilypond-snippets.pdf">PDF</a>)
         <tr>
           <td valign="baseline" class="left-column">
        <ul>
-            <li><a class="title"  href="devel.html">Resourcen f&uuml;r Entwickler</a>
+            <li><a class="title"  href="devel/index.html">Resourcen f&uuml;r Entwickler</a>
             <br>(Dokumentation f&uuml;r Entwickler und Mitwirkende.)</li>
        </ul>
     </td><td class="right-column">
diff --git a/Documentation/de/user/editorial.itely b/Documentation/de/user/editorial.itely
index 80fd9506d0..dbc2f1914a 100644
--- a/Documentation/de/user/editorial.itely
+++ b/Documentation/de/user/editorial.itely
@@ -196,7 +196,7 @@ Fingersatzanweisungen können manuell oberhalb des Systems gesetzt werden, siehe
 {allowing-fingerings-to-be-printed-inside-the-staff.ly}
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-{avoiding-collisions-of-chord-fingering-with-beams.ly}
+{avoiding-collisions-with-chord-fingerings.ly}
 
 @seealso
 Notationsreferenz:
diff --git a/Documentation/de/user/input.itely b/Documentation/de/user/input.itely
index 6586a3e9ff..15c0dc43a7 100644
--- a/Documentation/de/user/input.itely
+++ b/Documentation/de/user/input.itely
@@ -1321,7 +1321,7 @@ im Gesangstext und als normaler Text außerhalb der Partitur.
   }
   \addlyrics { O \markup { \concat{ Ph \char ##x0153 be! } } }
 }
-\markup { "Copyright 2008" \char ##x00A9 }
+\markup { "Copyright 2008--2009" \char ##x00A9 }
 @end lilypond
 
 Um das Copyright-Zeichen zu notieren, kann folgender Code eingesetzt werden:
diff --git a/Documentation/de/user/lilypond-learning.tely b/Documentation/de/user/lilypond-learning.tely
index 6515c58de0..794e3beeeb 100644
--- a/Documentation/de/user/lilypond-learning.tely
+++ b/Documentation/de/user/lilypond-learning.tely
@@ -60,7 +60,7 @@ verfügbar.
 @author Das LilyPond-Entwicklerteam
 
 
-Copyright @copyright{} 1999--2008 bei den Autoren
+Copyright @copyright{} 1999--2009 bei den Autoren
 
 @emph{The translation of the following copyright notice is provided
 for courtesy to non-English speakers, but only the notice in English
@@ -94,7 +94,7 @@ Für LilyPond Version @version{}
 @end titlepage
 
 @copying
-Copyright @copyright{} 1999--2008 bei den Autoren
+Copyright @copyright{} 1999--2009 bei den Autoren
 
 @emph{The translation of the following copyright notice is provided
 for courtesy to non-English speakers, but only the notice in English
@@ -126,7 +126,7 @@ Free Documentation License''.
 @ifnottex
 Diese Datei dokumentiert die Erlernung des Programmes GNU LilyPond.
 
-Copyright @copyright{} 1999--2008 bei den Autoren
+Copyright @copyright{} 1999--2009 bei den Autoren
 
 @emph{The translation of the following copyright notice is provided
 for courtesy to non-English speakers, but only the notice in English
diff --git a/Documentation/de/user/lilypond-program.tely b/Documentation/de/user/lilypond-program.tely
index 763930cb5e..7284c65f78 100644
--- a/Documentation/de/user/lilypond-program.tely
+++ b/Documentation/de/user/lilypond-program.tely
@@ -60,7 +60,7 @@ verfügbar.
 @author Das LilyPond-Entwicklerteam
 
 
-Copyright @copyright{} 1999--2008 bei den Autoren
+Copyright @copyright{} 1999--2009 bei den Autoren
 
 @emph{The translation of the following copyright notice is provided
 for courtesy to non-English speakers, but only the notice in English
@@ -95,7 +95,7 @@ Für LilyPond Version @version{}
 @end titlepage
 
 @copying
-Copyright @copyright{} 1999--2008 bei den Autoren
+Copyright @copyright{} 1999--2009 bei den Autoren
 
 @emph{The translation of the following copyright notice is provided
 for courtesy to non-English speakers, but only the notice in English
@@ -128,7 +128,7 @@ Free Documentation License''.
 @ifnottex
 Diese Datei dokumentiert die Programmbenutzung von GNU LilyPond.
 
-Copyright 1999--2008 bei den Autoren
+Copyright 1999--2009 bei den Autoren
 
 @emph{The translation of the following copyright notice is provided
 for courtesy to non-English speakers, but only the notice in English
diff --git a/Documentation/de/user/lilypond.tely b/Documentation/de/user/lilypond.tely
index bbeffc6aaf..48b00a2153 100644
--- a/Documentation/de/user/lilypond.tely
+++ b/Documentation/de/user/lilypond.tely
@@ -95,7 +95,7 @@ verfügbar.
 @titlefont{Benutzerhandbuch}
 @author Das LilyPond-Entwicklerteam
 
-Copyright @copyright{} 1999--2008 bei den Autoren
+Copyright @copyright{} 1999--2009 bei den Autoren
 
 @emph{The translation of the following copyright notice is provided
 for courtesy to non-English speakers, but only the notice in English
@@ -130,7 +130,7 @@ Für LilyPond Version @version{}
 @end titlepage
 
 @copying
-Copyright @copyright{} 1999--2008 bei den Autoren
+Copyright @copyright{} 1999--2009 bei den Autoren
 
 @emph{The translation of the following copyright notice is provided
 for courtesy to non-English speakers, but only the notice in English
@@ -163,7 +163,7 @@ Free Documentation License''.
 @ifnottex
 Diese Datei dokumentiert GNU LilyPond.
 
-Copyright 1999--2008 bei den Autoren.
+Copyright 1999--2009 bei den Autoren.
 
 @emph{The translation of the following copyright notice is provided
 for courtesy to non-English speakers, but only the notice in English
diff --git a/Documentation/devel.html.in b/Documentation/devel.html.in
deleted file mode 100644
index 703a3d776f..0000000000
--- a/Documentation/devel.html.in
+++ /dev/null
@@ -1,84 +0,0 @@
-<html>
-<!--
-    Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
-
-    When revising a translation, copy the HEAD committish of the
-    version that you are working on.  See TRANSLATION for details.
-!-->
-  <head>
-    <title>LilyPond @TOPLEVEL_VERSION@ Developers Resources</title>
-    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-    <meta name="aesop" content="links">
-    <meta name="description"
-          content="Top-level index to developers documentation for
-                   LilyPond @TOPLEVEL_VERSION@">
-  </head>
-  
-  <body>
-
-    <div class="header">
-      <h1>LilyPond developers resources</h1>
-    </div>
-
-    <div class="subheader">
-      <p>
-	<strong>Version @TOPLEVEL_VERSION@</strong>
-	<br>
-	<strong>@DATE@</strong>
-      </p>
-    </div>
-
-    <table id="navigation">
-      <tbody>
-        <tr>
-          <td class="left-column">
-	  <ul>
-      <li><a class="title"
-	  href="../input/regression/collated-files.html">Regression
-	  tests</a> (~ 5 Mb, in <a class="title"
-	  href="../input/regression/collated-files.pdf">PDF</a>)
-        <br>(general tests)</li>
-      <li><a class="title"
-	  href="../input/regression/musicxml/collated-files.html">MusicXML regression
-	  tests</a> (in <a class="title"
-	  href="../input/regression/musicxml/collated-files.pdf">PDF</a>)
-        <br>(musicxml2ly tests)</li>
-          </ul></td>
-	  <td class="right-column">
-          <ul>
-      <li><a class="title" href="http://lilypond.org/test">Regression tests results</a>
-      <br>(for comparison between releases)</li>
-      <li><a class="title" href="bibliography/index.html">Bibliography</a>
-      <br>(on background information)</li>
-          </ul></td>
-        </tr>
-        <tr>
-          <td valign="baseline" class="left-column">
-	<ul>
-	    <li><a class="title" href="http://lilypond.org/web/devel">lilypond.org development page</a>
-            <br>(for all contributors)</li>
-            <li><a class="title" href="http://git.sv.gnu.org/gitweb/?p=lilypond.git">lilypond.git repository</a>
-            <br>(official sources)</li>
-            <li><a class="title" href="http://git.sv.gnu.org/gitweb/?p=lilypond.git;a=blob_plain;f=README;hb=gub">GUB Readme</a>
-            <br>(about Grand Unified Binaries packages)</li>
-	</ul>
-    </td><td class="right-column">
-	<ul>
-	    <li><a class="title" href="http://git.sv.gnu.org/gitweb/?p=lilypond.git;a=blob_plain;f=Documentation%2Fuser%2FREADME.txt;hb=master">Documentation Readme</a>
-            <br>(for documentation editors)</li>
-            <li><a class="title" href="http://git.sv.gnu.org/gitweb/?p=lilypond.git;a=blob_plain;f=README;hb=web">lilypond.org Readme</a>
-and <a class="title" href="http://git.sv.gnu.org/gitweb/?p=lilypond.git;a=blob_plain;f=TRANSLATION;hb=web">Translation</a>
-<br>(how to translate and build lilypond.org website)</li>
-            <li>
-	      <a class="title" href="http://git.sv.gnu.org/gitweb/?p=lilypond.git;a=blob_plain;f=Documentation%2FTRANSLATION;hb=lilypond%2Ftranslation">Documentation translation</a>
-              <br>(how to translate documentation)</li>
-	</ul>
-	</td>
-        </tr>
-     </tbody>
-</table>
-
-<p><a href="index.html">Go back</a> to the Documentation index.</a></p>
-
-</body>
-</html>
diff --git a/Documentation/devel/GNUmakefile b/Documentation/devel/GNUmakefile
new file mode 100644
index 0000000000..526b6f163b
--- /dev/null
+++ b/Documentation/devel/GNUmakefile
@@ -0,0 +1,23 @@
+depth = ../..
+
+STEPMAKE_TEMPLATES = documentation tex texinfo topdocs
+LOCALSTEPMAKE_TEMPLATES = ly
+
+include $(depth)/make/stepmake.make
+
+HTML_PAGE_NAMES = index
+OUT_HTML_FILES = $(HTML_PAGE_NAMES:%=$(outdir)/%.html)
+
+
+MASTER_TEXI_FILES = contrib-guide.texi
+PDF_FILES = $(MASTER_TEXI_FILES:%.texi=$(outdir)/%.pdf)
+HTML_FILES = $(MASTER_TEXI_FILES:%.texi=$(outdir)/%/index.html) \
+  $(MASTER_TEXI_FILES:%.texi=$(outdir)/%-big-page.html)
+
+default: local-doc
+
+local-WWW-1: $(PDF_FILES)
+
+local-WWW-2: $(HTML_FILES) $(OUT_HTML_FILES)
+
+$(PDF_FILES) $(HTML_FILES): $(ITEXI_FILES)
diff --git a/Documentation/devel/compiling.itexi b/Documentation/devel/compiling.itexi
new file mode 100644
index 0000000000..a39e0d85de
--- /dev/null
+++ b/Documentation/devel/compiling.itexi
@@ -0,0 +1,14 @@
+@c -*- coding: us-ascii; mode: texinfo; -*-
+@node Compiling
+@chapter Compiling 
+
+@menu
+* move AU 1 here::
+@end menu
+
+
+@node move AU 1 here
+@section move AU 1 here
+
+
+
diff --git a/Documentation/devel/contrib-guide.texi b/Documentation/devel/contrib-guide.texi
new file mode 100644
index 0000000000..4e3c974368
--- /dev/null
+++ b/Documentation/devel/contrib-guide.texi
@@ -0,0 +1,143 @@
+\input texinfo @c -*- coding: utf-8; mode: texinfo; -*-
+@ignore
+    Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
+
+    When revising a translation, copy the HEAD committish of the
+    version that you are working on.  See TRANSLATION for details.
+@end ignore
+@setfilename contrib-guide.info
+@settitle GNU LilyPond Contributor's Guide
+@documentencoding UTF-8
+@documentlanguage en
+
+@include macros.itexi
+
+@afourpaper
+
+@c  Keep this here, since it pertains to the direntry below.
+@ignore
+Distributions will want to install lilypond.info in postinstall, doing:
+
+    install-info --info-dir=/usr/share/info out[-www]/lilypond.info
+
+  * Prepend GNU for dir, must be unique.
+
+  * Do not list the `lilypond' node at toplevel, so that `info lilypond'
+    goes to Top.
+
+  * List all commands in direntry.
+
+@c  * lilypond: (lilypond/lilypond)Running LilyPond.      Invoking the
+@c    LilyPond  program.
+@end ignore
+
+
+@ifnottex
+@node Top
+@top GNU LilyPond --- Contributor's Guide
+@chapheading The music typesetter
+@c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
+@end ifnottex
+
+
+@ifhtml
+@ifclear bigpage
+This document is also available as a
+@uref{source/Documentation/user/lilypond.pdf,PDF} and as
+@uref{source/Documentation/user/lilypond-big-page.html,one big page}.
+@end ifclear
+@ifset bigpage
+This document is also available as a
+@uref{source/Documentation/user/lilypond.pdf,PDF} and as a
+@uref{source/Documentation/user/lilypond/index.html,HTML indexed multiple pages}.
+@end ifset
+@end ifhtml
+
+
+@finalout
+
+@titlepage
+@title LilyPond
+@subtitle The music typesetter
+@titlefont{Contributor's Guide}
+@author The LilyPond development team
+
+Copyright @copyright{} 1999--2008 by the authors
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1
+or any later version published by the Free Software Foundation;
+with no Invariant Sections.
+A copy of the license is included in the section entitled ``GNU
+Free Documentation License''.
+@end quotation
+
+@vskip 20pt
+
+For LilyPond version 
+@end titlepage
+
+@copying
+Copyright @copyright{} 1999--2008 by the authors
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1
+or any later version published by the Free Software Foundation;
+with no Invariant Sections.
+A copy of the license is included in the section entitled ``GNU
+Free Documentation License''.
+@end quotation
+@end copying
+
+@ifnottex
+This file documents GNU LilyPond.
+
+Copyright 1999--2008 by the authors
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1
+or any later version published by the Free Software Foundation;
+with no Invariant Sections.
+A copy of the license is included in the section entitled ``GNU
+Free Documentation License''.
+@end quotation
+@end ifnottex
+
+@ifnottex
+For more information about how this fits with the other
+
+@cindex web site
+@cindex URL
+
+More information can be found at
+@uref{http://@/www@/.lilypond@/.org/}.  The website contains on-line copies
+of this and other documentation.
+
+@menu
+* Starting with git::
+* Compiling::
+* Documentation work::
+* Website work::
+* LSR work::
+* Issues::
+* Programming work::
+* Release work::
+@end menu
+@end ifnottex
+
+@contents
+
+@include git-starting.itexi
+@include compiling.itexi
+@include doc-work.itexi
+@include website-work.itexi
+@include lsr-work.itexi
+@include issues.itexi
+@include programming-work.itexi
+@include release-work.itexi
+
+@bye
+
diff --git a/Documentation/devel/doc-work.itexi b/Documentation/devel/doc-work.itexi
new file mode 100644
index 0000000000..c3d264f124
--- /dev/null
+++ b/Documentation/devel/doc-work.itexi
@@ -0,0 +1,666 @@
+@c -*- coding: us-ascii; mode: texinfo; -*-
+@node Documentation work
+@chapter Documentation work
+
+@menu
+* Introduction to documentation work::  
+* Texinfo crash course::        
+* Documentation policy::        
+* Tips for writing docs::       
+* Updating docs with convert-ly::  
+* Translating the documentation::  
+@end menu
+
+
+@node Introduction to documentation work
+@section Introduction to documentation work
+
+Our documentation tries to adhere to the @ref{Documentation
+policy} as strictly as possible.  One policy in particular is
+often questioned by potential contributors: we do not repeat
+material in the Notation Reference, and instead provide links to
+the @qq{definitive} presentation of that information.
+
+Some people point out, with good reason, that this makes the
+documentation harder to read.  If we repeated certain information
+in relevant places, readers would be less likely to miss that
+information.
+
+That reasoning is sound, but we have two counter-arguments.
+First, the Notation Reference -- one of @emph{five} manuals for
+users to read -- is already over 500 pages long.  If we repeated
+material, we could easily exceed 1000 pages!  Second, and much
+more importantly, LilyPond is an evolving project.  New features
+are added, bugs are fixed, and bugs are discovered and documented.
+If features are discussed in multiple places, the documentation
+team must find every instance.  Since the manual is so large, it
+is impossible for one person to have the location of every piece
+of information memorized, so any attempt to update the
+documentation will invariably omit a few places.  This second
+concern is not at all theoretical; the documentation used to be
+plagued with inconsistent information.
+
+If the documentation were targeted for a specific version -- say,
+LilyPond 2.10.5 -- and we had unlimited resources to spend on
+documentation, then we could avoid this second problem.  But since
+LilyPond evolves (and that is a very good thing!), and since we
+have quite limited resources, this policy remains in place.
+
+A few other policies (such as not permitting the use of tweaks in
+the main portion of NR 1+2) may also seem counter-intuitive, but
+they also stem from attempting to find the most effective use of
+limited documentation help.
+
+
+
+@node Texinfo crash course
+@section Texinfo crash course
+
+The language is called texinfo; you can see its manual here:
+@uref{http://www.gnu.org/software/texinfo/manual/texinfo/}
+
+However, you don't need to read those docs.  The most important
+thing to notice is that text is text.  If you see a mistake in the
+text, you can fix it.  If you want to change the order of
+something, you can cut-and-paste that stuff into a new location.
+
+@warning{Rule of thumb: follow the examples in the existing docs.
+You can learn most of what you need to know from this; if you want
+to do anything fancy, discuss it on @code{lilypond-devel} first.}
+
+
+@subsection Sectioning commands
+
+Most of the manual operates at the
+	@@node Foo
+	@@subsubsection Foo
+level.  Sections are created with
+	@@node Foo
+	@@subsection Foo
+commands.
+
+* Please leave two blank lines above a @@node; this makes it easier
+  to findw sections in texinfo.
+
+* sectioning commands (@@node and @@section) must not appear inside
+  an @@ignore.  Separate those commands with a space, ie @@n ode.
+
+
+
+@subsection LilyPond formatting
+
+* Use two spaces for indentation in lilypond examples.  (no tabs)
+
+* All text strings should be prefaced with #.  LilyPond does not
+  strictly require this, but it is helpful to get users accustomed
+  to this scheme construct.  ie
+    \set Staff.instrumentName = #"cello"
+
+* All engravers should have double-quotes around them:
+    \consists "Spans_arpeggio_engraver"
+  Again, LilyPond does not strictly require this, but it is a
+  useful standard to follow.
+
+* Examples should end with a complete bar if possible.
+
+* If possible, only write one bar per line.  The notes on each
+  line should be an independent line -- tweaks should occur on
+  their own line if possible.
+  Bad:
+    \override textscript #'padding = #3 c1^"hi"
+  Good:
+    \override textscript #'padding = #3
+    c1^"hi"
+
+* Most LilyPond input should be produced with:
+    @@lilypond[verbatim,quote,relative=2]
+  or
+    @@lilypond[verbatim,quote,relative=1]
+
+  If you want to use \layout@{@} or define variables, use
+    @@lilypond[verbatim,quote]
+
+  In rare cases, other options may be used (or omitted), but ask first.
+
+* Inspirational headwords are produced with
+  @@lilypondfile[quote,ragged-right,line-width=16\cm,staffsize=16]
+  @{pitches-headword.ly@}
+
+* LSR snippets are linked with
+  @@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+  @{filename.ly@}
+  excepted in Templates, where `doctitle' may be omitted.
+
+* Avoid long stretches of input code.  Noone is going to read them
+  in print.  Please create a smaller example.  (the smaller
+  example does not need to be minimal, however)
+
+* Specify durations for at least the first note of every bar.
+
+* If possible, end with a complete bar.
+
+* Comments should go on their own line, and be placed before the
+  line(s) to which they refer.
+
+* Add extra spaces around @{ @} marks; ie
+  not:          \chordmode @{c e g@}
+  but instead:  \chordmode @{ c e g @}
+
+* If you only have one bar per line, omit bar checks.  If you
+  put more than one bar per line (not recommended), then include
+  bar checks.
+
+* If you want to work on an example outside of the manual (for
+  easier/faster processing), use this header:
+
+\paper @{
+  #(define dump-extents #t)
+  indent = 0\mm
+  line-width = 160\mm - 2.0 * 0.4\in
+  ragged-right = ##t
+  force-assignment = #""
+  line-width = #(- line-width (* mm  3.000000))
+@}
+
+\layout @{
+@}
+
+  You may not change any of these values.  If you are making an
+  example demonstrating special \paper@{@} values, contact the
+  Documentation Editor.
+
+
+@subsection Text formatting
+
+* Lines should be less than 72 characters long.  (I personally
+  recommend writing with 66-char lines, but don't bother modifying
+  existing material.)
+
+* Do not use tabs.
+
+* Do not use spaces at the beginning of a line (except in @@example
+  or @@verbatim environments), and do not use more than a single
+  space between words.  `makeinfo' copies the input lines verbatim
+  without removing those spaces.
+
+* Use two spaces after a period.
+
+* In examples of syntax, use @@var@{musicexpr@} for a music
+  expression.
+
+* Don't use @@rinternals@{@} in the main text.  If you're tempted to
+  do so, you're probably getting too close to "talking through the
+  code".  If you really want to refer to a context, use @@code@{@} in
+  the main text and @@rinternals@{@} in the @@seealso.
+
+* Variables or numbers which consist of a single character
+  (probably followed by a punctuation mark) should be tied
+  properly, either to the previous or the next word.  Example:
+
+      The variable@@tie@{@}@@var@{a@} ...
+
+* To get consistent indentation in the DVI output it is better to
+  avoid the @@verbatim environment.  Use the @@example environment
+  instead if possible, but without extraneous indentation.  For
+  example, this
+
+    @@example
+      foo @{
+        bar
+      @}
+    @@end example
+
+  should be replaced with
+
+    @@example
+    foo @{
+      bar
+    @}
+    @@end example
+
+  where `@@example' starts the line (without leading spaces).
+
+* Do not compress the input vertically; this is, do not use
+
+    Beginning of logical unit
+    @@example
+    ...
+    @@end example
+    continuation of logical unit
+
+  but
+
+    Beginning of logical unit
+
+    @@example
+    ...
+    @@end example
+
+    @@noindent
+    continuation of logical unit
+
+  This makes it easier to avoid forgetting the `@@noindent'.  Only
+  use @@noindent if the material is discussing the same material;
+  new material should simply begin without anything special on the
+  line above it.
+
+* in @@itemize use @@item on a separate line like this:
+  @@itemize
+  @@item
+  Foo
+
+  @@item
+  Bar
+
+  Do not use @@itemize @@bullet.
+
+* To get LilyPond version, use @@version@{@} (this does not work inside
+  LilyPond snippets).  If you write "@@version@{@}" (enclosed with
+  quotes), or generally if @@version@{@} is not followed by a space,
+  enclose it with
+
+  @@w@{ ... @}
+
+  e.g.
+
+  @@w@{"@@version@{@}"@}
+
+  to prevent an ugly line break in PDF output.
+
+
+@subsection Syntax survey
+
+@@c - single line comments
+  "@@c NOTE:" is a comment which should remain in the final
+  version.  (gp only command ;)
+@@ignore ... @@end ignore - multi-line comment
+
+@@cindex - General index. Please add as many as you can.  Don't
+  capitalize the first word.
+@@funindex - is for a \lilycommand.
+
+@@example ... @@end ignore - example text that should be set as a
+  blockquote.  Any @{@} must be escaped with @@@{ @}@@
+@@itemize @@item A @@item B ... @@end itemize - for bulleted lists.
+  Do not compress vertically like this.
+
+@@code@{@} - typeset in a tt-font. Use for actual lilypond code or
+  property/context names.  If the name contains a space, wrap
+  the entire thing inside @@w@{@@code@{  @}@}.
+@@notation@{@} - refers to pieces of notation, e.g.
+  "@@notation@{cres.@}".  Also use to specific lyrics ("the
+  @@notation@{A - men@} is centered").  Only use once per subsection
+  per term.
+@@q@{@} - Single quotes. Used for `vague' terms.
+@@qq@{@} - Double quotes.  Used for actual quotes ("he said") or for
+  introducing special input modes.
+
+@@tie@{@} - Variables or numbers which consist of a single character
+  (probably followed by a punctuation mark) should be tied
+  properly, either to the previous or the next word.  Example:
+    "The letter@@tie@{@}@@q@{I@} is skipped"
+
+@@var - Use for variables.
+@@warning@{@} - produces a "Note: " box. Use for important messages.
+
+@@bs - Generates a backslash inside @@warning.
+    Any `\' used inside @@warning (and @@q or @@qq) must be written as `@@bs@{@}' 
+    (texinfo would also allow \\, but this breaks with PDF output).
+
+
+
+@subsection Other text concerns
+
+* References must occur at the end of a sentence, for more
+  information see @@ref@{the texinfo manual@}.  Ideally this should
+  also be the final sentence of a paragraph, but this is not
+  required.  Any link in a doc section must be duplicated in the
+  @@seealso section at the bottom.
+
+* Introducing examples must be done with
+     . (ie finish the previous sentence/paragaph)
+     : (ie `in this example:')
+     , (ie `may add foo with the blah construct,')
+  The old "sentence runs directly into the example" method is not
+  allowed any more.
+
+* Abbrevs in caps, e.g., HTML, DVI, MIDI, etc.
+
+* Colon usage
+
+  1. To introduce lists
+  2. When beginning a quote: "So, he said,..."
+     This usage is rarer.  Americans often just use a comma.
+  3. When adding a defining example at the end of a sentence.
+
+* Non-ASCII characters which are in utf-8 should be directly used;
+  this is, don't say `Ba@@ss@{@}tuba' but `Baßtuba'.  This ensures that
+  all such characters appear in all output formats.
+
+
+
+
+@node Documentation policy
+@section Documentation policy
+
+
+@subsection Books
+
+There are four parts to the documentation: the Learning Manual,
+the Notation Reference, the Program Reference, and the Music
+Glossary.
+
+* Learning Manual:
+  The LM is written in a tutorial style which introduces the most
+  important concepts, structure and syntax of the elements of a
+  LilyPond score in a carefully graded sequence of steps.
+  Explanations of all musical concepts used in the Manual can be
+  found in the Music Glossary, and readers are assumed to have no
+  prior knowledge of LilyPond.  The objective is to take readers to
+  a level where the Notation Reference can be understood and
+  employed to both adapt the templates in the Appendix to their
+  needs and to begin to construct their own scores.  Commonly used
+  tweaks are introduced and explained.  Examples are provided
+  throughout which, while being focussed on the topic being
+  introduced, are long enough to seem real in order to retain the
+  readers' interest.  Each example builds on the previous material,
+  and comments are used liberally.  Every new aspect is thoroughly
+  explained before it is used.
+
+Users are encouraged to read the complete Learning Manual from
+start-to-finish.
+
+
+* Notation Reference: a (hopefully complete) description of
+  LilyPond input notation.  Some material from here may be
+  duplicated in the Learning Manual (for teaching), but consider
+  the NR to be the "definitive" description of each notation
+  element, with the LM being an "extra".  The goal is _not_ to
+  provide a step-by-step learning environment -- do not avoid
+  using notation that has not be introduced previously in the
+  NR  (for example, use \break if appropriate).  This section is
+  written in formal technical writing style.
+
+Avoid duplication.  Although users are not expected to read this
+manual from start to finish, they should be familiar with the
+material in the Learning Manual (particularly ``Fundamental
+Concepts''), so do not repeat that material in each section of
+this book.  Also watch out for common constructs, like ^ - _ for
+directions -- those are explained in NR 3.  In NR 1, you can
+write:
+DYNAMICS may be manually placed above or below the
+staff, see @@ref@{Controlling direction and placement@}.
+
+Most tweaks should be added to LSR and not placed directly in the
+.itely file.  In some cases, tweaks may be placed in the main
+text, but ask about this first.
+
+Finally, you should assume that users know what the notation
+means; explaining musical concepts happens in the Music Glossary.
+
+
+* Application Usage: information about using the program lilypond
+  with other programs (lilypond-book, operating systems, GUIs,
+  convert-ly, etc).  This section is written in formal technical
+  writing style.
+
+Users are not expected to read this manual from start to finish.
+
+
+* Music Glossary: information about the music notation itself.
+  Explanations and translations about notation terms go here.
+
+Users are not expected to read this manual from start to finish.
+
+* Internals Reference: not really a documentation book, since it
+  is automagically generated from the source, but this is its
+  name.
+
+
+@subsection Section organization
+
+The order of headings inside documentation sections should be:
+
+main docs
+@@predefined
+@@endpredefined
+@@snippets
+@@seealso
+@@knownissues
+
+* You _must_ include a @@seealso.  The order of items inside the
+  @@seealso section is
+
+    Music Glossary:
+    @@rglos@{foo@},
+    @@rglos@{bar@}.
+
+    Learning Manual:
+    @@rlearning@{baz@},
+    @@rlearning@{foozle@}.
+
+    Notation Reference:
+    @@ruser@{faazle@},
+    @@ruser@{boo@}.
+
+    Application Usage:
+    @@rprogram@{blah@}.
+
+    Installed Files:
+    @@file@{path/to/dir/blahz@}.
+
+    Snippets: @@rlsr@{section@}.
+
+    Internals Reference:
+    @@rinternals@{fazzle@},
+    @@rinternals@{booar@}.
+
+      If there are multiple entries, separate them by commas
+      but do not include an `and'.
+
+      Always end with a period.
+
+      Place each link on a new line as above; this makes it much
+      easier to add or remove links.  In the output, they
+      appear on a single line.
+
+  ("Snippets" is REQUIRED; the others are optional)
+
+  Any new concepts or links which require an explanation should go
+  as a full sentence(s) in the main text.
+
+  Don't insert an empty line between @@seealso and the first entry!
+  Otherwise there is excessive vertical space in the PDF output.
+
+* To create links, use @@ref@{@} if the link is within the same
+  manual.
+
+* @@predefined ... @@endpredefined is for commands in ly/*-init.ly
+  FIXME?
+
+* Do not include any real info in second-level sections (ie 1.1
+  Pitches).  A first-level section may have introductory material,
+  but other than that all material goes into third-level sections
+  (ie 1.1.1 Writing Pitches).
+
+
+@subsection Checking cross-references
+
+Cross-references between different manuals are heavily used in the
+documentation, but they are not checked during compilation.  However,
+if you compile the documentation, a script called check_texi_refs can
+help you with checking and fixing these cross-references; for
+information on usage, cd into a source tree where documentation has
+been built, cd into Documentation and look for check-xrefs and
+fix-xrefs targets in 'make help' output.  Note that you have to find
+yourself the source files to fix cross-references in the generated
+documentation such as the Internals Reference; e.g. you can grep
+scm/ and lily/.
+
+
+@subsection General writing
+
+* Do not forget to create @@cindex entries for new sections of text.
+  Enter commands with @@funindex, i.e.
+    @@cindex pitches, writing in different octaves
+    @@funindex \relative
+  do not bother with the @@code@{@} (they are added automatically).  These
+  items are added to both the command index and the unified index.
+
+  Both index commands should go in front of the actual material.
+
+  @@cindex entries should not be capitalized, ie
+    @@cindex time signature
+  is preferred.  (instead of `Time signature')   Only use capital
+  letters for musical terms which demand them, like D.S. al Fine.
+
+  For scheme functions, only include the final part, ie
+    @@funindex modern-voice-cautionary
+  and NOT
+    @@funindex #(set-accidental-style modern-voice-cautionary)
+
+* Preferred terms:
+    - in general, use the American spellings.  The internal
+      lilypond property names use this spelling.
+    - list of specific terms:
+canceled
+simultaenous    NOT concurrent
+measure: the unit of music
+bar line: the symbol delimiting a measure   NOT barline
+note head   NOT notehead
+chord construct   NOT chord (when referring to <>)
+
+
+@subsection Technical writing style
+
+* Do not refer to LilyPond in the text.  The reader knows what the
+  manual is about.  If you do, capitalization is LilyPond.
+
+* If you explicitly refer to `lilypond' the program (or any other
+  command to be executed), say `@@command@{lilypond@}'.
+
+* Do not explicitly refer to the reader/user.  There is no one
+  else besides the reader and the writer.
+
+* Do not use abbreviations (don't, won't, etc.).  If you do, use a
+  comma after it:
+
+    blabla blabla, i.e., blabla blabla
+
+* Avoid fluff (``Notice that,'' ``as you can see,''
+  ``Currently,'').
+
+* The use of the word `illegal' is inappropriate in most cases.
+  Say `invalid' instead.
+
+
+@node Tips for writing docs
+@section Tips for writing docs
+
+In the NR, I highly recommend working on one subsection at a time.
+For each subsection,
+
+- check the mundane formatting.  Are the headings (@@predefined,
+  @@seealso, etc) in the right order?
+- add any appropriate index entries.
+- check the links in the @@seealso section -- links to music
+  glossary, internal references, and other NR sections are the
+  main concern.  Check for potential additions.
+- move LSR-worthy material into LSR.  Add the snippet (or
+  just send it to Valentin for adding), delete the material from
+  the .itely file, and add a @@lilypondfile command.
+
+- check the examples and descriptions.  Do they still work?
+  *Do not* assume that the existing text is accurate/complete;
+  some of the manual is highly out of date.
+- is the material in the @@knownissues  still accurate?
+- process anything on the TODO list on the GDP web site.
+- can the examples be improved (made more explanatory), or is
+  there any missing info?  (feel free to ask specific questions
+  on -user; a couple of people claimed to be interesting in being
+  "consultants" who would help with such questions)
+
+In general, I favor short text explanations with good examples --
+"an example is worth a thousand words".  When I worked on the
+docs, I spent about half my time just working on those tiny
+lilypond examples.  Making easily-understandable examples is much
+harder than it looks.
+
+
+TWEAKS
+
+In general, any \set or \override commands should go in the
+"select snippets" section, which means that they should go in LSR
+and not the .itely file.  For some cases, the command obviously
+belongs in the "main text" (ie not inside @@predefined or @@seealso
+or whatever) -- instrument names are a good example of this.
+  \set Staff.instrumentName = #"foo"
+On the other side of this,
+  \override Score.Hairpin #'after-line-breaking = ##t
+clearly belongs in LSR.
+
+I'm quite willing to discuss specific cases if you think that a
+tweaks needs to be in the main text.  But items that can go into
+LSR are easier to maintain, so I'd like to move as much as
+possible into there.
+
+
+It would be "nice" if you spent a lot of time crafting nice tweaks
+for users... but my recommendation is *not* to do this.  There's a
+lot of doc work to do without adding examples of tweaks.  Tweak
+examples are trivial to add later -- they could be made by normal
+users, or by you after GDP is over.
+
+Basically, it's not something that needs to be done while I'm
+around.  Remember that I'm gone in August at the latest; there's a
+*lot* of doc work that should be done before then.  I strongly
+recommend that you save all the tweaks until later.
+
+
+FINAL
+
+- when you think you're finished, let me know.  I'll spend a few
+  minutes and send you a list of mistakes to fix.
+  (there's a *lot* of details to cover; we'll probably spend a
+  week going back and forth like this.  See earlier warning about
+  hating me by the time you're done with a doc section :)
+- I'll ask people on -user to review the Snippet list at this
+  time; correcting things on the Snippet list is much easier than
+  getting comments on the integrated snippets.
+- when we're both satisfied with the section, we'll invite
+  comments from -user.  Judging from my experience with Pitches,
+  it will take between three and five weeks to keep on revising
+  the "final" version.
+
+I personally found it quite frustrating to still be fixing
+problems in a doc section which I thought was "perfect" a whole
+bloody *month* ago.  Don't get me wrong; it's great that we get so
+many comments from -user.  :)   But just be aware that when you
+think you're finally done with a section, you're actually only
+halfway there.
+
+
+
+
+
+
+
+@node Updating docs with convert-ly
+@section Updating doc with convert-ly
+
+cd into Documentation and run
+
+@example
+find . -name '*.itely' | xargs convert-ly -e
+@end example
+
+@noindent
+(This also updates translated docs.)
+
+
+
+
+@node Translating the documentation
+@section Translating the documentation
+
+
diff --git a/Documentation/devel/git-starting.itexi b/Documentation/devel/git-starting.itexi
new file mode 100644
index 0000000000..a009470671
--- /dev/null
+++ b/Documentation/devel/git-starting.itexi
@@ -0,0 +1,280 @@
+@c -*- coding: us-ascii; mode: texinfo; -*-
+@node Starting with git
+@chapter Starting with git
+
+@menu
+* Getting the source code::     
+* Updating the source code::    
+* Sharing your changes::        
+* Other interesting Git commands::  
+* Git on Windows::              
+@end menu
+
+
+@node Getting the source code
+@section Getting the source code
+
+The source code is kept in a git respository.
+
+@warning{These instructions assume that you are using the
+command-line version of git 1.5 or higher.}
+
+
+@menu
+* Main source code::            
+* Website source code::         
+* Documentation translations source code::  
+* Other branches::              
+* Git user configuration::      
+@end menu
+
+@node Main source code
+@subsection Main source code
+
+To get the main source code and documentation,
+
+FIXME: test this!!!
+
+@example
+mkdir lilypond; cd lilypond
+git init-db
+git remote add -f -t master -m master origin git://git.sv.gnu.org/lilypond.git/
+git checkout -b master origin/master
+@end example
+
+
+@node Website source code
+@subsection Website source code
+
+To get the website (including translations),
+
+@example
+mkdir lilyweb ; cd lilyweb
+git init-db
+git remote add -f -t web -m web origin git://git.sv.gnu.org/lilypond.git/
+git checkout -b web origin/web
+@end example
+
+
+@node Documentation translations source code
+@subsection Documentation translations source code
+
+To translate the documentation (@emph{not} the website),
+
+FIXME: change
+
+@example
+mkdir lilytranslate ; cd lilytranslate
+git init-db
+git remote add -f -t web -m web origin git://git.sv.gnu.org/lilypond.git/
+git checkout -b web origin/web
+@end example
+
+
+@menu
+* Other branches::              
+* Git user configuration::      
+@end menu
+
+@node Other branches
+@subsection Other branches
+
+Most contributors will never need to touch the other branches.  If
+you wish to do so, you will need more familiarity with git.
+
+@itemize
+
+@item @code{gub}:
+This stores the Grand Unified Binary, our cross-platform building
+tool.
+
+@example
+FIXME: insert new gub addy
+@end example
+
+@item @code{dev/XYZ}:
+These branches are for individual developers.  They store code
+which is not yet stable enough to be added to the @code{master}
+branch.
+
+@item @code{stable/XYZ}:
+The branches are kept for archival reasons.
+
+@end itemize
+
+
+@node Git user configuration
+@subsection Git user configuration
+
+To configure git to automatically use your name and email address
+for patches,
+
+@example
+git config --global user.name "MYNAME"
+git config --global user.email myemail@@example.net
+@end example
+
+
+@node Updating the source code
+@section Updating the source code
+
+@menu
+* Importance of updating::      
+* Update command::              
+* Resolving conflicts::         
+* Technical notes::             
+@end menu
+
+@node Importance of updating
+@subsection Importance of updating
+
+In a large project like LilyPond, contributors sometimes edit the
+same file at the same time.  As long as everybody updates their
+version of the file with the most recent changes (@qq{pull}ing),
+there are generally no problems with this multiple-person editing.
+However, serious problems can arise if you do not pull before
+attempting commit.
+
+@node Update command
+@subsection Updating command
+
+Whenever you are asked to pull, it means you should update your
+local copy of the repository with the changes made by others on
+the remote @code{git.sv.gnu.org} repository:
+
+@example
+git pull origin
+@end example
+
+@node Resolving conflicts
+@subsection Resolving conflicts
+
+Occasionally an update may result in conflicts -- this happens
+when you and somebody else hae modified the same part of the same
+file and git cannot figure out how to merge the two versions
+together.  When this happens, you must manually merge the two
+versions.
+
+@example
+TODO
+@end example
+
+
+@node Technical notes
+@subsection Technical notes
+
+Let's explain a bit of Git vocabulary.  The @code{git pull
+origin} command is just a shortcut for this command:
+
+@example
+git pull git://git.sv.gnu.org/lilypond.git/ MY-BRANCH:origin/MY-BRANCH
+@end example
+
+A commit is a set of changes made to the sources; it also includes the
+committish of the parent commit, the name and e-mail of the author
+(the person who wrote the changes), the name and e-mail of the
+committer (the person who brings these changes into the git
+repository), and a commit message.
+
+A committish is the SHA1 checksum of a commit, a number made of 40
+hexadecimal digits, which acts as the internal unique identifier for
+this commit.  To refer to a particular revision, don't use vague
+references like the (approximative) date, simply copy'n'paste the
+committish.
+
+A branch is a tree (in the mathematical or computer science sense) of
+commits, and the topmost commit of this branch is called a head.
+
+The "git fetch" command above has created a branch called origin/web
+in your local Git repository.  As this branch is a copy of the remote
+branch web from git.sv.gnu.org LilyPond repository, it is
+called a `remote branch', and is meant to track the changes on the
+branch from git.sv.gnu.org: it will be updated every time you run 'git
+pull' or 'git fetch' with this branch reference as argument, e.g.
+by using .git/remotes/web remote file when running 'git fetch web'.
+
+The 'git checkout' command above has created a branch named 'web'.  At
+the beginning, this branch is identical to 'origin/web', but it will
+differ as soon as you make changes, e.g. adding newly translated
+pages.  Whenever you pull, you merge the changes from origin/web and
+your web branch since the last pulling.  If you do not have push
+(i.e. "write") access on git.sv.gnu.org, your web branch will always
+differ from origin/web.  In this case, remember that other people
+working like you on the remote web branch of
+git://git.sv.gnu.org/lilypond.git/ know nothing about your own web
+branch: this means that whenever you use a committish or make a patch,
+others expect you to take the lastest commit of origin/web branch as a
+reference.
+
+This README tries to explain most of Git commands needed for
+translating the web site.  However, you are invited to read
+further documentation to make git more familiar to you; for
+instance, take a look at @uref{http://git.or.cz/gitwiki/},
+especially GitDocumentation and GitGlossary; a good alternative to
+reading the wiki is reading the first two chapters of Git User's
+Manual at
+@uref{http://www.kernel.org/pub/software/scm/git/docs/user-manual.html}
+
+
+
+
+@node Sharing your changes
+@section Sharing your changes
+
+
+@menu
+* Producing a patch::           
+* Committing directly::         
+@end menu
+
+@node Producing a patch
+@subsection Producing a patch
+
+Once you have finished editing your files, checked that your
+changes meet the @ref{Code style} and/or @ref{Documentation
+policy}, and checked that the entire thing compiles, you may
+
+@example
+git commit -a 
+git-format-patch HEAD
+@end example
+
+Send an email to @email{lilypond-devel@@gnu.org} with the diff as
+an attachment.
+
+
+@node Committing directly
+@subsection Committing directly
+
+Most contributors do not have permission to commit directly.  If
+you do, edit @file{.git/config} to contain
+
+@example
+FIXME?
+@end example
+
+You may then @code{git push}.
+
+
+@node Other interesting Git commands
+@section Other interesting Git commands
+
+The commands above don't only bring you the latest version of the
+sources, but also the full history of revisions (revisons, also
+called commits, are changes made to the sources), stored in the
+.git directory.  You can browse this history with
+
+@example
+git log     # only shows the logs (author, committish and commit message)
+git log -p  # also shows diffs
+gitk        # shows history graphically
+@end example
+
+
+
+
+@node Git on Windows
+@section Git on Windows
+
+
+
diff --git a/Documentation/devel/index.html.in b/Documentation/devel/index.html.in
new file mode 100644
index 0000000000..3cc188d826
--- /dev/null
+++ b/Documentation/devel/index.html.in
@@ -0,0 +1,97 @@
+<html>
+<!--
+    Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
+
+    When revising a translation, copy the HEAD committish of the
+    version that you are working on.  See TRANSLATION for details.
+!-->
+  <head>
+    <title>LilyPond @TOPLEVEL_VERSION@ Developers Resources</title>
+    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
+    <meta name="aesop" content="links">
+    <meta name="description"
+          content="Top-level index to developers documentation for
+                   LilyPond @TOPLEVEL_VERSION@">
+  </head>
+  
+  <body>
+
+    <div class="header">
+      <h1>LilyPond developers resources</h1>
+    </div>
+
+    <div class="subheader">
+      <p>
+	<strong>Version @TOPLEVEL_VERSION@</strong>
+	<br>
+	<strong>@DATE@</strong>
+      </p>
+    </div>
+
+    <table align="center">
+      <tr>
+	<td>
+	  <br>
+	  <a class="title" href="contrib-guide/index.html">Contributors'
+	    Guide</a>
+	  (in <a class="title" href="contrib-guide-big-page.html">one
+	    big page</a>,	in <a class="title" href="contrib-guide.pdf">PDF</a>)
+	  <br>(how to participate in development)
+	</td>
+      <tr>
+    </table>
+
+    <table id="navigation">
+      <tbody>
+        <tr>
+          <td class="left-column">
+	  <ul>
+      <li><a class="title"
+	  href="../../input/regression/collated-files.html">Regression
+	  tests</a> (~ 5 Mb, in <a class="title"
+	  href="../../input/regression/collated-files.pdf">PDF</a>)
+        <br>(general tests)</li>
+      <li><a class="title"
+	  href="../../input/regression/musicxml/collated-files.html">MusicXML regression
+	  tests</a> (in <a class="title"
+	  href="../../input/regression/musicxml/collated-files.pdf">PDF</a>)
+        <br>(musicxml2ly tests)</li>
+          </ul></td>
+	  <td class="right-column">
+          <ul>
+      <li><a class="title" href="http://lilypond.org/test">Regression tests results</a>
+      <br>(for comparison between releases)</li>
+      <li><a class="title" href="../bibliography/index.html">Bibliography</a>
+      <br>(on background information)</li>
+          </ul></td>
+        </tr>
+        <tr>
+          <td valign="baseline" class="left-column">
+	<ul>
+	    <li><a class="title" href="http://lilypond.org/web/devel">lilypond.org development page</a>
+            <br>(for all contributors)</li>
+            <li><a class="title" href="http://git.sv.gnu.org/gitweb/?p=lilypond.git">lilypond.git repository</a>
+            <br>(official sources)</li>
+            <li><a class="title" href="http://git.sv.gnu.org/gitweb/?p=lilypond.git;a=blob_plain;f=README;hb=gub">GUB Readme</a>
+            <br>(about Grand Unified Binaries packages)</li>
+	</ul>
+    </td><td class="right-column">
+	<ul>
+	    <li><a class="title" href="http://git.sv.gnu.org/gitweb/?p=lilypond.git;a=blob_plain;f=Documentation%2Fuser%2FREADME.txt;hb=master">Documentation Readme</a>
+            <br>(for documentation editors)</li>
+            <li><a class="title" href="http://git.sv.gnu.org/gitweb/?p=lilypond.git;a=blob_plain;f=README;hb=web">lilypond.org Readme</a>
+and <a class="title" href="http://git.sv.gnu.org/gitweb/?p=lilypond.git;a=blob_plain;f=TRANSLATION;hb=web">Translation</a>
+<br>(how to translate and build lilypond.org website)</li>
+            <li>
+	      <a class="title" href="http://git.sv.gnu.org/gitweb/?p=lilypond.git;a=blob_plain;f=Documentation%2FTRANSLATION;hb=lilypond%2Ftranslation">Documentation translation</a>
+              <br>(how to translate documentation)</li>
+	</ul>
+	</td>
+        </tr>
+     </tbody>
+</table>
+
+<p><a href="../index.html">Go back</a> to the Documentation index.</a></p>
+
+</body>
+</html>
diff --git a/Documentation/devel/issues.itexi b/Documentation/devel/issues.itexi
new file mode 100644
index 0000000000..f7b5260aa9
--- /dev/null
+++ b/Documentation/devel/issues.itexi
@@ -0,0 +1,38 @@
+@c -*- coding: us-ascii; mode: texinfo; -*-
+@node Issues
+@chapter Issues
+
+@menu
+* Introduction to issues::      
+* Issue classification::        
+* Adding issues to the tracker::  
+@end menu
+
+
+@node Introduction to issues
+@section Introduction to issues
+
+First, @qq{issue} isn't just a politically-correct term for
+@qq{bug}.  We use the same tracker for feature requests and code
+TODOs, so the term @qq{bug} wouldn't be accurate.
+
+Second, the classification of what counts as a bug vs. feature
+request, and the priorities assigned to bugs, are a matter of
+concern @strong{for developers only}.  If you are curious about
+the classification, read on, but don't complain that your
+particular issue is higher priority or counts as a bug rather than
+a feature request.
+
+
+@node Issue classification
+@section Issue classification
+
+
+@node Adding issues to the tracker
+@section Adding issues to the tracker
+
+
+
+
+
+
diff --git a/Documentation/devel/lsr-work.itexi b/Documentation/devel/lsr-work.itexi
new file mode 100644
index 0000000000..9b239ee34a
--- /dev/null
+++ b/Documentation/devel/lsr-work.itexi
@@ -0,0 +1,28 @@
+@c -*- coding: us-ascii; mode: texinfo; -*-
+@node LSR work
+@chapter LSR work
+
+@menu
+* Introduction to LSR::         
+* Adding snippets::             
+* Approving snippets::          
+* LSR to git::                  
+@end menu
+
+
+@node Introduction to LSR
+@section Introduction to LSR
+
+
+@node Adding snippets
+@section Adding snippets
+
+
+@node Approving snippets
+@section Approving snippets
+
+
+@node LSR to git
+@section LSR to git
+
+
diff --git a/Documentation/devel/programming-work.itexi b/Documentation/devel/programming-work.itexi
new file mode 100644
index 0000000000..24741412fa
--- /dev/null
+++ b/Documentation/devel/programming-work.itexi
@@ -0,0 +1,311 @@
+@c -*- coding: us-ascii; mode: texinfo; -*-
+@node Programming work
+@chapter Programming work
+
+@menu
+* Introduction to programming::  
+* Code style::                  
+@end menu
+
+
+@node Introduction to programming
+@section Introduction to programming 
+
+blah blah
+
+
+@node Code style
+@section Code style 
+@c email to wl@gnu.org when I get here.
+
+@menu
+@end menu
+
+@subsection Outputting errors
+
+As a general rule, you should always try to continue computations,
+even if there is some kind of error.  When the program stops, it
+is often very hard for a user to pinpoint what part of the input
+causes an error.  Finding the culprit is much easier if there is
+some viewable output.
+
+So functions and methods do not return errorcodes, they never
+crash, but report a programming_error and try to carry on.
+
+@subsection Languages
+
+C++ and Python are preferred.  Python code should use PEP 8.
+
+@subsection Filenames
+
+Definitions of classes that are only accessed via pointers (*) or
+references (&) shall not be included as include files.
+
+@verbatim
+   filenames
+
+        ".hh"   Include files
+             ".cc"      Implementation files
+             ".icc"     Inline definition files
+             ".tcc"     non inline Template defs
+
+   in emacs:
+
+             (setq auto-mode-alist
+                   (append '(("\\.make$" . makefile-mode)
+                        ("\\.cc$" . c++-mode)
+                        ("\\.icc$" . c++-mode)
+                        ("\\.tcc$" . c++-mode)
+                        ("\\.hh$" . c++-mode)
+                        ("\\.pod$" . text-mode)
+                        )
+                      auto-mode-alist))
+@end verbatim
+
+The class Class_name is coded in @q{class-name.*}
+
+@subsection Indentation
+
+Standard GNU coding style is used. In emacs:
+
+@verbatim
+             (add-hook 'c++-mode-hook
+                  '(lambda() (c-set-style "gnu")
+                     ))
+@end verbatim
+
+If you like using font-lock, you can also add this to your
+@q{.emacs}:
+
+@verbatim
+             (setq font-lock-maximum-decoration t)
+             (setq c++-font-lock-keywords-3
+                   (append
+                    c++-font-lock-keywords-3
+                    '(("\\b\\(a-zA-Z_?+_\\)\\b" 1 font-lock-variable-name-face) ("\\b\\(A-Z?+a-z_?+\\)\\b" 1 font-lock-type-face))
+                    ))
+@end verbatim
+
+
+@subsection Classes and Types
+
+@verbatim
+             This_is_a_class
+@end verbatim
+
+
+@subsection Members
+
+Member variable names end with an underscore:
+
+@verbatim
+     Type Class::member_
+@end verbatim
+
+
+@subsection Macros
+
+Macro names should be written in uppercase completely.
+
+
+@subsection Broken code
+
+Do not write broken code.  This includes hardwired dependencies,
+hardwired constants, slow algorithms and obvious limitations.  If
+you can not avoid it, mark the place clearly, and add a comment
+explaining shortcomings of the code.
+
+We reject broken-in-advance on principle.
+
+@subsection Naming
+
+
+@subsection Messages
+
+Messages need to follow Localization.
+
+
+@subsection Localization
+
+This document provides some guidelines for programmers write user
+messages.  To help translations, user messages must be
+uniformized.  Follow these rules when coding for LilyPond.
+Hopefully, this can be replaced by general GNU guidelines in the
+future.  Even better would be to have an English (en_BR, en_AM)
+helping programmers writing consistent messages for all GNU
+programs.
+
+Not-preferred messages are marked with `+'. By convention,
+ungrammatical examples are marked with `*'.
+
+@itemize
+
+@item
+Every message to the user should be localised (and thus be marked
+for localisation). This includes warning and error messages.
+
+@item
+Don't localise/gettextify:
+
+@itemize
+@item
+`programming_error ()'s
+
+@item
+`programming_warning ()'s
+
+@item
+debug strings
+
+@item
+output strings (PostScript, TeX, etc.)
+
+@end itemize
+
+@item
+Messages to be localised must be encapsulated in `_ (STRING)' or
+`_f (FORMAT, ...)'. Eg:
+
+@verbatim
+      warning (_ ("need music in a score"));
+      error (_f ("cannot open file: `%s'", file_name));
+@end verbatim
+    
+In some rare cases you may need to call `gettext ()' by hand. This
+happens when you pre-define (a list of) string constants for later
+use. In that case, you'll probably also need to mark these string
+constants for translation, using `_i (STRING)'. The `_i' macro is
+a no-op, it only serves as a marker for `xgettext'.
+
+@verbatim
+      char const* messages[] = {
+      _i ("enable debugging output"),
+      _i ("ignore lilypond version"),
+      0
+      };
+
+    
+      void
+      foo (int i)
+      {
+      puts (gettext (messages i));
+      }
+@end verbatim
+    
+See also `flower/getopt-long.cc' and `lily/main.cc'.
+
+@item
+Do not use leading or trailing whitespace in messages. If you need
+whitespace to be printed, prepend or append it to the translated
+message
+
+@verbatim
+      message (Calculating line breaks... + " ");
+@end verbatim
+    
+@item
+Error or warning messages displayed with a file name and line
+number never start with a capital, eg,
+
+@verbatim
+	foo.ly: 12: not a duration: 3
+@end verbatim
+      
+Messages containing a final verb, or a gerund (`-ing'-form) always
+start with a capital. Other (simpler) messages start with a
+lowercase letter
+
+@verbatim
+      Processing foo.ly...
+      `foo': not declared.
+      Not declaring: `foo'.
+@end verbatim
+    
+@item
+Avoid abbreviations or short forms, use `cannot' and `do not'
+rather than `can't' or `don't'
+To avoid having a number of different messages for the same
+situation, we'll use quoting like this `"message: `%s'"' for all
+strings. Numbers are not quoted:
+
+@verbatim
+      _f ("cannot open file: `%s'", name_str)
+      _f ("cannot find character number: %d", i)
+@end verbatim
+    
+@item
+Think about translation issues. In a lot of cases, it is better to
+translate a whole message. The english grammar mustn't be imposed
+on the translator. So, instead of
+
+@verbatim
+      stem at  + moment.str () +  does not fit in beam
+@end verbatim
+    
+have
+
+@verbatim
+      _f ("stem at %s does not fit in beam", moment.str ())
+@end verbatim
+    
+@item
+Split up multi-sentence messages, whenever possible. Instead of
+
+@verbatim
+      warning (_f ("out of tune!  Can't find: `%s'",
+"Key_engraver"));
+      warning (_f ("cannot find font `%s', loading default",
+      font_name));
+@end verbatim
+    
+rather say:
+
+@verbatim
+      warning (out of tune:;
+      warning (_f ("cannot find: `%s', "Key_engraver"));
+      warning (_f ("cannot find font: `%s', font_name));
+      warning (_f ("Loading default font"));
+@end verbatim
+    
+@item
+If you must have multiple-sentence messages, use full punctuation.
+Use two spaces after end of sentence punctuation. No punctuation
+(esp. period) is used at the end of simple messages.
+
+@verbatim
+      _f ("Non-matching braces in text `%s', adding braces", text)
+      Debug output disabled.  Compiled with NPRINT.
+      _f ("Huh?  Not a Request: `%s'.  Ignoring.", request)
+@end verbatim
+    
+@item
+Do not modularise too much; a lot of words cannot be translated
+without context. It's probably safe to treat most occurences of
+words like stem, beam, crescendo as separately translatable words.
+
+@item
+When translating, it is preferable to put interesting information
+at the end of the message, rather than embedded in the middle.
+This especially applies to frequently used messages, even if this
+would mean sacrificing a bit of eloquency. This holds for original
+messages too, of course.
+
+@verbatim
+      en: cannot open: `foo.ly'
+      +   nl: kan `foo.ly' niet openen (1)
+      kan niet openen: `foo.ly'*   (2)
+      niet te openen: `foo.ly'*    (3)
+@end verbatim
+
+    
+The first nl message, although grammatically and stylistically
+correct, is not friendly for parsing by humans (even if they speak
+dutch). I guess we'd prefer something like (2) or (3).
+
+@item
+Do not run make po/po-update with GNU gettext < 0.10.35
+
+@end itemize
+
+
+
diff --git a/Documentation/devel/release-work.itexi b/Documentation/devel/release-work.itexi
new file mode 100644
index 0000000000..4ce6945818
--- /dev/null
+++ b/Documentation/devel/release-work.itexi
@@ -0,0 +1,162 @@
+@c -*- coding: us-ascii; mode: texinfo; -*-
+@node Release work
+@chapter Release work
+
+@menu
+* Development phases::          
+* Minor release checklist::     
+* Major release checklist::     
+@end menu
+
+
+@node Development phases
+@section Development phases
+
+There are 2.5 states of development for LilyPond.
+
+@itemize
+
+@item @strong{Stable phase}:
+Starting from the release of a new major version @code{2.x.0}, the
+following patches @strong{MAY NOT} be merged with master:
+
+@itemize
+@item Any change to the input syntax.  If a file compiled with a
+previous @code{2.x} version, then it must compile in the new
+version.
+
+@item New features with new syntax @emph{may be committed},
+although once committed that syntax cannot change during the
+remainder of the stable phase.
+
+@item Any change to the build dependencies (including programming
+libraries, documentation process programs, or python modules used
+in the buildscripts).  If a contributor could compile a previous
+lilypond @code{2.x}, then he must be able to compile the new
+version.
+
+@end itemize
+
+@item @strong{Development phase}:
+Any commits are fine.  Readers may be familiar with the term
+@qq{merge window} from following Linux kernel news.
+
+
+@item @strong{Release prep phase}:
+FIXME: I don't like that name.
+
+A new git branch @code{stable/2.x} is created, and a major release
+is made in two weeks.
+
+@itemize
+
+@item @code{stable/2.x branch}:
+Only translation updates and important bugfixes are allows.
+
+@item @code{master}:
+Normal @qq{stable phase} development occurs.
+
+@end itemize
+
+If we discover the need to change the syntax or build system, we
+will apply it and re-start the release prep phase.
+
+@end itemize
+
+This marks a radical change from previous practice in LilyPond.
+However, this setup is not intended to slow development -- as a
+rule of thumb, the next development phase will start within a
+month of somebody wanting to commit something which is not
+permitted during the stable phase.
+
+
+
+@node Minor release checklist
+@section Minor release checklist
+
+A @qq{minor release} means an update of @code{y} in @code{2.x.y}.
+
+email brief summary to info-lilypond
+
+
+
+@node Major release checklist
+@section Major release checklist
+
+A @qq{major release} means an update of @code{x} in @code{2.x.0}.
+
+Before release:
+
+* write release notes. note: stringent size requirements for
+ various websites, so be brief.
+
+* write preface section for manual.
+
+* submit pots for translation : send url of tarball to
+translation@@iro.umontreal.ca, mentioning lilypond-VERSION.pot
+
+* Check reg test
+
+* Check all 2ly scripts.
+
+* Run convert-ly on all files, bump parser minimum version.
+
+* Make FTP directories on lilypond.org
+
+* website:
+  - Make new table in download.html
+
+  - add to documentation list
+
+  - revise examples tour.html/howto.html
+
+  - add to front-page quick links
+
+  - change all links to the stable documentation
+
+  - doc auto redirects  to v2.LATEST-STABLE
+
+News:
+
+        comp.music.research
+        comp.os.linux.announce
+
+        comp.text.tex
+        rec.music.compose
+
+Mail:
+
+        info-lilypond@@gnu.org
+
+linux-audio-announce@@lists.linuxaudio.org
+linux-audio-user@@lists.linuxaudio.org
+linux-audio-dev@@lists.linuxaudio.org
+
+        tex-music@@icking-music-archive.org
+
+   --- non-existant?
+        abcusers@@blackmill.net
+
+        rosegarden-user@@lists.sourceforge.net
+        info-gnu@@gnu.org
+        noteedit-user@@berlios.de
+
+        gmane.comp.audio.fomus.devel
+        gmane.linux.audio.users
+        gmane.linux.audio.announce
+        gmane.comp.audio.rosegarden.devel
+
+Web:
+
+        lilypond.org
+        freshmeat.net
+        linuxfr.com
+        http://www.apple.com/downloads
+        harmony-central.com (news@@harmony-central.com)
+        versiontracker.com [auto]
+        hitsquad.com [auto]
+        http://www.svgx.org
+
+
+
+
diff --git a/Documentation/devel/website-work.itexi b/Documentation/devel/website-work.itexi
new file mode 100644
index 0000000000..c452cb2c38
--- /dev/null
+++ b/Documentation/devel/website-work.itexi
@@ -0,0 +1,21 @@
+@c -*- coding: us-ascii; mode: texinfo; -*-
+@node Website work
+@chapter Website work
+
+@menu
+* Introduction to website work::  
+* Translating the website::
+@end menu
+
+
+@node Introduction to website work
+@section Introduction to website work
+
+
+
+
+@node Translating the website
+@section Translating the website
+
+
+
diff --git a/Documentation/es/index.html.in b/Documentation/es/index.html.in
index d5721ba5f4..5c987014e9 100644
--- a/Documentation/es/index.html.in
+++ b/Documentation/es/index.html.in
@@ -93,7 +93,7 @@
           <td valign="baseline" class="left-column">
 	  <ul>
 	    <li>
-	      <a class="title" href="devel.html">Recursos para desarrolladores</a><br>
+	      <a class="title" href="devel/index.html">Recursos para desarrolladores</a><br>
               (documentos de interés para desarrolladores y colaboradores)</li>
 	  </ul>
 	  </td>
diff --git a/Documentation/es/user/editorial.itely b/Documentation/es/user/editorial.itely
index a685c0667c..e444164b31 100644
--- a/Documentation/es/user/editorial.itely
+++ b/Documentation/es/user/editorial.itely
@@ -200,7 +200,7 @@ and placement}.
 {allowing-fingerings-to-be-printed-inside-the-staff.ly}
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-{avoiding-collisions-of-chord-fingering-with-beams.ly}
+{avoiding-collisions-with-chord-fingerings.ly}
 
 
 @seealso
diff --git a/Documentation/es/user/input.itely b/Documentation/es/user/input.itely
index 2b651c0d95..1b4afafb60 100644
--- a/Documentation/es/user/input.itely
+++ b/Documentation/es/user/input.itely
@@ -1290,7 +1290,7 @@ partitura:
   }
   \addlyrics { O \markup { \concat{ Ph \char ##x0153 be! } } }
 }
-\markup { "Copyright 2008" \char ##x00A9 }
+\markup { "Copyright 2008--2009" \char ##x00A9 }
 @end lilypond
 
 Para escribir el símbolo de copyright en la nota de créditos, utilice:
diff --git a/Documentation/es/user/lilypond-learning.tely b/Documentation/es/user/lilypond-learning.tely
index 38a5098017..10863d3db9 100644
--- a/Documentation/es/user/lilypond-learning.tely
+++ b/Documentation/es/user/lilypond-learning.tely
@@ -57,7 +57,7 @@ Este documento también está disponible en formato
 @author El equipo de desarrollo de LilyPond
 
 
-Copyright @copyright{} 1999--2008 por los autores
+Copyright @copyright{} 1999--2009 por los autores
 
 @emph{La traducción de la siguiente nota de copyright se ofrece como
 cortesía para las personas de habla no inglesa, pero únicamente la
@@ -91,7 +91,7 @@ Para LilyPond versión @version{}
 @end titlepage
 
 @copying
-Copyright @copyright{} 1999--2008 por los autores
+Copyright @copyright{} 1999--2009 por los autores
 
 @emph{La traducción de la siguiente nota de copyright se ofrece como
 cortesía para las personas de habla no inglesa, pero únicamente la
@@ -124,7 +124,7 @@ Free Documentation License''.
 @ifnottex
 Este archivo es la documentación de GNU LilyPond orientada a quienes empiezan con el programa.
 
-Copyright @copyright{} 1999--2008 por los autores
+Copyright @copyright{} 1999--2009 por los autores
 
 @emph{La traducción de la siguiente nota de copyright se ofrece como
 cortesía para las personas de habla no inglesa, pero únicamente la
diff --git a/Documentation/es/user/lilypond-program.tely b/Documentation/es/user/lilypond-program.tely
index d4608eca6a..d3cce583ba 100644
--- a/Documentation/es/user/lilypond-program.tely
+++ b/Documentation/es/user/lilypond-program.tely
@@ -60,7 +60,7 @@ Este documento también está disponible en formato
 @author El equipo de desarrollo de LilyPond
 
 
-Copyright @copyright{} 1999--2008 por los autores
+Copyright @copyright{} 1999--2009 por los autores
 
 @emph{La traducción de la siguiente nota de copyright se ofrece como
 cortesía para las personas de habla no inglesa, pero únicamente la
@@ -95,7 +95,7 @@ Para LilyPond versión @version{}
 
 
 @copying
-Copyright @copyright{} 1999--2008 por los autores
+Copyright @copyright{} 1999--2009 por los autores
 
 @emph{La traducción de la siguiente nota de copyright se ofrece como
 cortesía para las personas de habla no inglesa, pero únicamente la
@@ -127,7 +127,7 @@ Free Documentation License''.
 @ifnottex
 Este archivo es la documentación de la utilización del programa GNU LilyPond.
 
-Copyright 1999--2008 por los autores
+Copyright 1999--2009 por los autores
 
 @emph{La traducción de la siguiente nota de copyright se ofrece como
 cortesía para las personas de habla no inglesa, pero únicamente la
diff --git a/Documentation/es/user/lilypond.tely b/Documentation/es/user/lilypond.tely
index e6e58ed965..e47f08d3b7 100644
--- a/Documentation/es/user/lilypond.tely
+++ b/Documentation/es/user/lilypond.tely
@@ -96,7 +96,7 @@ Este documento también está disponible en formato
 @titlefont{Manual de referencia de la notación}
 @author El equipo de desarrollo de LilyPond
 
-Copyright @copyright{} 1999--2008 por los autores
+Copyright @copyright{} 1999--2009 por los autores
 
 @emph{La traducción de la siguiente nota de copyright se ofrece como
 cortesía para las personas de habla no inglesa, pero únicamente la
@@ -130,7 +130,7 @@ Para LilyPond versión @version{}
 @end titlepage
 
 @copying
-Copyright @copyright{} 1999--2008 por los autores
+Copyright @copyright{} 1999--2009 por los autores
 
 @emph{La traducción de la siguiente nota de copyright se ofrece como
 cortesía para las personas de habla no inglesa, pero únicamente la
@@ -162,7 +162,7 @@ Free Documentation License''.
 @ifnottex
 Este archivo es la documentación de GNU LilyPond.
 
-Copyright 1999--2008 por los autores
+Copyright 1999--2009 por los autores
 
 @emph{La traducción de la siguiente nota de copyright se ofrece como
 cortesía para las personas de habla no inglesa, pero únicamente la
diff --git a/Documentation/fr/index.html.in b/Documentation/fr/index.html.in
index f01889be69..da2d55073c 100644
--- a/Documentation/fr/index.html.in
+++ b/Documentation/fr/index.html.in
@@ -91,7 +91,7 @@ au format <a class="title" href="user/lilypond-snippets.pdf">PDF</a>)
         <tr>
           <td valign="baseline" class="left-column">
        <ul>
-            <li><a class="title"  href="devel.html">Ressources de développement</a>
+            <li><a class="title"  href="devel/index.html">Ressources de développement</a>
             <br>&mdash; documentation pour les développeurs et contributeurs</li>
        </ul>
     </td><td class="right-column">
diff --git a/Documentation/fr/user/editorial.itely b/Documentation/fr/user/editorial.itely
index 0440dfeb9a..a473c00e3d 100644
--- a/Documentation/fr/user/editorial.itely
+++ b/Documentation/fr/user/editorial.itely
@@ -156,7 +156,7 @@ d'indiquer des doigtés très proches des têtes de notes.
 @snippets
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-{avoiding-collisions-of-chord-fingering-with-beams.ly}
+{avoiding-collisions-with-chord-fingerings.ly}
 
 
 @seealso
diff --git a/Documentation/fr/user/lilypond-learning.tely b/Documentation/fr/user/lilypond-learning.tely
index 8b30c5f83e..0acb5e735e 100644
--- a/Documentation/fr/user/lilypond-learning.tely
+++ b/Documentation/fr/user/lilypond-learning.tely
@@ -67,7 +67,7 @@ séparées}.
 @author L'équipe de développement de LilyPond
 
 
-Copyright @copyright{} 1999--2008 par les auteurs
+Copyright @copyright{} 1999--2009 par les auteurs
 
 @emph{The translation of the following copyright notice is provided
 for courtesy to non-English speakers, but only the notice in English
@@ -100,7 +100,7 @@ Pour LilyPond version @version{}
 @end titlepage
 
 @copying
-Copyright @copyright{} 1999--2008 par les auteurs
+Copyright @copyright{} 1999--2009 par les auteurs
 
 @emph{The translation of the following copyright notice is provided
 for courtesy to non-English speakers, but only the notice in English
@@ -131,7 +131,7 @@ Free Documentation License''.
 @ifnottex
 Ce fichier documente GNU LilyPond.
 
-Copyright @copyright{} 1999--2008 par les auteurs
+Copyright @copyright{} 1999--2009 par les auteurs
 
 @emph{The translation of the following copyright notice is provided
 for courtesy to non-English speakers, but only the notice in English
diff --git a/Documentation/fr/user/lilypond-program.tely b/Documentation/fr/user/lilypond-program.tely
index a36c8cc8f4..edd4081cc8 100644
--- a/Documentation/fr/user/lilypond-program.tely
+++ b/Documentation/fr/user/lilypond-program.tely
@@ -66,7 +66,7 @@ séparées}.
 @author L'équipe de développement de LilyPond
 
 
-Copyright @copyright{} 1999--2008 par les auteurs
+Copyright @copyright{} 1999--2009 par les auteurs
 
 @emph{The translation of the following copyright notice is provided
 for courtesy to non-English speakers, but only the notice in English
@@ -102,7 +102,7 @@ Pour LilyPond version @version{}
 @ifnottex
 Ce fichier documente GNU LilyPond.
 
-Copyright @copyright{} 1999--2008 par les auteurs
+Copyright @copyright{} 1999--2009 par les auteurs
 
 @emph{The translation of the following copyright notice is provided
 for courtesy to non-English speakers, but only the notice in English
diff --git a/Documentation/fr/user/lilypond.tely b/Documentation/fr/user/lilypond.tely
index 4615ab8c45..6d20b1f6a7 100644
--- a/Documentation/fr/user/lilypond.tely
+++ b/Documentation/fr/user/lilypond.tely
@@ -69,7 +69,7 @@ séparées}.
 @author L'équipe de développement de LilyPond
 
 
-Copyright @copyright{} 1999--2008 par les auteurs
+Copyright @copyright{} 1999--2009 par les auteurs
 
 @emph{The translation of the following copyright notice is provided
 for courtesy to non-English speakers, but only the notice in English
@@ -105,7 +105,7 @@ Pour LilyPond version @version{}
 @ifnottex
 Ce fichier documente GNU LilyPond.
 
-Copyright @copyright{} 1999--2008 par les auteurs
+Copyright @copyright{} 1999--2009 par les auteurs
 
 @emph{The translation of the following copyright notice is provided
 for courtesy to non-English speakers, but only the notice in English
diff --git a/Documentation/index.html.in b/Documentation/index.html.in
index 99ec9d8e0e..9836f53491 100644
--- a/Documentation/index.html.in
+++ b/Documentation/index.html.in
@@ -98,7 +98,7 @@ in <a class="title" href="user/lilypond-snippets.pdf">PDF</a>)
         <tr>
           <td valign="baseline" class="left-column">
 	<ul>
-            <li><a class="title"  href="devel.html">Developers resources</a>
+            <li><a class="title"  href="devel/index.html">Developers resources</a>
               <br>(documentation for developers and contributors)</li>
 	</ul>
     </td><td class="right-column">
diff --git a/Documentation/topdocs/GNUmakefile b/Documentation/topdocs/GNUmakefile
index 537f761b0a..0f81c76f11 100644
--- a/Documentation/topdocs/GNUmakefile
+++ b/Documentation/topdocs/GNUmakefile
@@ -11,10 +11,6 @@ OUTTXT_FILES= $(outdir)/NEWS.txt
 
 include $(depth)/make/stepmake.make
 
-MAKEINFO_FLAGS += -I $(top-src-dir)/Documentation/user
-TEXI2HTML_FLAGS += -I $(top-src-dir)/Documentation/user
-
 local-WWW-1: $(OUT_TEXI_FILES)
 
 .SECONDARY:
-
diff --git a/Documentation/user/editorial.itely b/Documentation/user/editorial.itely
index 1e27735536..ec0748740e 100644
--- a/Documentation/user/editorial.itely
+++ b/Documentation/user/editorial.itely
@@ -195,7 +195,7 @@ staff, see @ref{Direction and placement}.
 {allowing-fingerings-to-be-printed-inside-the-staff.ly}
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-{avoiding-collisions-of-chord-fingering-with-beams.ly}
+{avoiding-collisions-with-chord-fingerings.ly}
 
 
 @seealso
diff --git a/Documentation/user/input.itely b/Documentation/user/input.itely
index a9facc6bb8..f290a3370e 100644
--- a/Documentation/user/input.itely
+++ b/Documentation/user/input.itely
@@ -1240,7 +1240,7 @@ and as stand-alone text below the score:
   }
   \addlyrics { O \markup { \concat{ Ph \char ##x0153 be! } } }
 }
-\markup { "Copyright 2008" \char ##x00A9 }
+\markup { "Copyright 2008--2009" \char ##x00A9 }
 @end lilypond
 
 To enter the copyright sign in the copyright notice use:
@@ -1604,7 +1604,7 @@ The following items of notation are reflected in the MIDI output:
 
 @itemize
 @item Pitches
-@item Quarter tones (See @ref{Accidentals}. Rendering needs a
+@item Microtones (See @ref{Accidentals}. Rendering needs a
 player that supports pitch bend.)
 @item Chords entered as chord names
 @item Rhythms entered as note durations, including tuplets
@@ -1630,6 +1630,7 @@ The following items of notation have no effect on the MIDI output:
 @item Crescendi, decrescendi over a single note
 @item Tremolos entered with @q{@code{:}[@var{number}]}
 @item Figured bass
+@item Microtonal chords
 @end itemize
 
 
diff --git a/Documentation/user/lilypond-learning.tely b/Documentation/user/lilypond-learning.tely
index a5a785ddc1..cb0c89f1fc 100644
--- a/Documentation/user/lilypond-learning.tely
+++ b/Documentation/user/lilypond-learning.tely
@@ -58,7 +58,7 @@ This document is also available as a
 @author The LilyPond development team
 
 
-Copyright @copyright{} 1999--2008 by the authors
+Copyright @copyright{} 1999--2009 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -75,7 +75,7 @@ For LilyPond version @version{}
 @end titlepage
 
 @copying
-Copyright @copyright{} 1999--2008 by the authors
+Copyright @copyright{} 1999--2009 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -90,7 +90,7 @@ Free Documentation License''.
 @ifnottex
 This file documents GNU LilyPond for beginners.
 
-Copyright 1999--2008 by the authors
+Copyright 1999--2009 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/Documentation/user/lilypond-program.tely b/Documentation/user/lilypond-program.tely
index b8ea62bd2b..ba1722c39f 100644
--- a/Documentation/user/lilypond-program.tely
+++ b/Documentation/user/lilypond-program.tely
@@ -60,7 +60,7 @@ This document is also available as a
 @author The LilyPond development team
 
 
-Copyright @copyright{} 1999--2008 by the authors
+Copyright @copyright{} 1999--2009 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -77,7 +77,7 @@ For LilyPond version @version{}
 @end titlepage
 
 @copying
-Copyright @copyright{} 1999--2008 by the authors
+Copyright @copyright{} 1999--2009 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -92,7 +92,7 @@ Free Documentation License''.
 @ifnottex
 This file documents GNU LilyPond program usage.
 
-Copyright 1999--2008 by the authors
+Copyright 1999--2009 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index e7681c56ba..b0fd4ff336 100644
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -94,7 +94,7 @@ This document is also available as a
 @titlefont{Notation Reference}
 @author The LilyPond development team
 
-Copyright @copyright{} 1999--2008 by the authors
+Copyright @copyright{} 1999--2009 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -111,7 +111,7 @@ For LilyPond version @version{}
 @end titlepage
 
 @copying
-Copyright @copyright{} 1999--2008 by the authors
+Copyright @copyright{} 1999--2009 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -126,7 +126,7 @@ Free Documentation License''.
 @ifnottex
 This file documents GNU LilyPond.
 
-Copyright 1999--2008 by the authors
+Copyright 1999--2009 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/GNUmakefile.in b/GNUmakefile.in
index f6389fbe3f..36ade426bd 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -22,7 +22,7 @@ TOPDOC_FILES = AUTHORS INSTALL README NEWS
 TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
 IN_FILES := $(call src-wildcard,*.in)
 
-EXTRA_DIST_FILES = VERSION .gitignore SConstruct lilypond-texi2html.init \
+EXTRA_DIST_FILES = VERSION .gitignore lilypond-texi2html.init \
   $(README_FILES) $(SCRIPTS) $(IN_FILES) 
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
@@ -88,6 +88,7 @@ WEB_TARGETS = offline
 
 WWW-post:
 # need UTF8 setting in case this is hosted on a website.
+	$(MAKE) -C scripts/build out=
 	echo -e 'AddDefaultCharset utf-8\nAddCharset utf-8 .html\nAddCharset utf-8 .en\nAddCharset utf-8 .nl\nAddCharset utf-8 .txt\n' > $(top-build-dir)/.htaccess
 	$(buildscript-dir)/mutopia-index -o $(outdir)/examples.html input/
 	find $(outdir) -name '*-root' | xargs rm -rf
diff --git a/elisp/lilypond-mode.el b/elisp/lilypond-mode.el
index 7c197ce7e0..d8e3a694dd 100644
--- a/elisp/lilypond-mode.el
+++ b/elisp/lilypond-mode.el
@@ -3,7 +3,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;;  
-;;;; (c) 1999--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1999--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;; 
 ;;;; Changed 2001--2003 Heikki Junes <heikki.junes@hut.fi>
 ;;;;    * Add PS-compilation, PS-viewing and MIDI-play (29th Aug 2001)
diff --git a/flower/cpu-timer.cc b/flower/cpu-timer.cc
index 0715589303..9a2fcc4c73 100644
--- a/flower/cpu-timer.cc
+++ b/flower/cpu-timer.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "cpu-timer.hh"
diff --git a/flower/file-name.cc b/flower/file-name.cc
index bb07ebccd0..2d9f1454fb 100644
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/flower/file-path.cc b/flower/file-path.cc
index 0177d40c9f..513a146ad6 100644
--- a/flower/file-path.cc
+++ b/flower/file-path.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc
index 7e1f335335..5d8b4259f3 100644
--- a/flower/getopt-long.cc
+++ b/flower/getopt-long.cc
@@ -1,7 +1,7 @@
 /*
   process command line, GNU style.
 
-  this is Copyleft (c) 1996--2008 Han-Wen Nienhuys, <hanwen@xs4all.nl>
+  this is Copyleft (c) 1996--2009 Han-Wen Nienhuys, <hanwen@xs4all.nl>
 */
 
 #include "getopt-long.hh"
diff --git a/flower/include/arithmetic-operator.hh b/flower/include/arithmetic-operator.hh
index 88eeda35d5..f626aac749 100644
--- a/flower/include/arithmetic-operator.hh
+++ b/flower/include/arithmetic-operator.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef ARITHMETIC_OPERATOR_HH
diff --git a/flower/include/axis.hh b/flower/include/axis.hh
index 667a76749b..46b159b14f 100644
--- a/flower/include/axis.hh
+++ b/flower/include/axis.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef AXES_HH
diff --git a/flower/include/compare.hh b/flower/include/compare.hh
index 855c99eaa0..febadd3d55 100644
--- a/flower/include/compare.hh
+++ b/flower/include/compare.hh
@@ -1,7 +1,7 @@
 /*
   flowerlib
 
-  (c) 1996--2008 Han-Wen Nienhuys
+  (c) 1996--2009 Han-Wen Nienhuys
 */
 #ifndef COMPARE_HH
 #define COMPARE_HH
diff --git a/flower/include/cpu-timer.hh b/flower/include/cpu-timer.hh
index d5be05056c..ff7d5bb0d7 100644
--- a/flower/include/cpu-timer.hh
+++ b/flower/include/cpu-timer.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef CPU_TIMER_HH
diff --git a/flower/include/direction.hh b/flower/include/direction.hh
index ceff68fe55..fab90f19d5 100644
--- a/flower/include/direction.hh
+++ b/flower/include/direction.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef DIRECTION_HH
diff --git a/flower/include/drul-array.hh b/flower/include/drul-array.hh
index a184a89720..b895dc9c64 100644
--- a/flower/include/drul-array.hh
+++ b/flower/include/drul-array.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef DRUL_ARRAY_HH
diff --git a/flower/include/file-name.hh b/flower/include/file-name.hh
index 649521fa71..a840aea74f 100644
--- a/flower/include/file-name.hh
+++ b/flower/include/file-name.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef FILE_NAME_HH
diff --git a/flower/include/file-path.hh b/flower/include/file-path.hh
index e66ddfa0d4..ee62d94b15 100644
--- a/flower/include/file-path.hh
+++ b/flower/include/file-path.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef FILE_PATH_HH
diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh
index 43ca4df689..34e56961a1 100644
--- a/flower/include/flower-proto.hh
+++ b/flower/include/flower-proto.hh
@@ -1,7 +1,7 @@
 /*
   flower-proto.hh -- typenames in flowerlib
 
-  (c) 1996--2008 Han-Wen Nienhuys
+  (c) 1996--2009 Han-Wen Nienhuys
 */
 
 #ifndef FLOWER_PROTO_HH
diff --git a/flower/include/guile-compatibility.hh b/flower/include/guile-compatibility.hh
index 3d1f85a6cc..c40e3b3b35 100644
--- a/flower/include/guile-compatibility.hh
+++ b/flower/include/guile-compatibility.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef GUILE_COMPATIBILITY_HH
diff --git a/flower/include/international.hh b/flower/include/international.hh
index 1e8b3fad21..f4216736a2 100644
--- a/flower/include/international.hh
+++ b/flower/include/international.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef INTERNATIONAL_HH
diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index 9808bfaef6..a38c14b0fc 100644
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -1,7 +1,7 @@
 /*
   interval.hh -- part of flowerlib
 
-  (c) 1996--2008 Han-Wen Nienhuys
+  (c) 1996--2009 Han-Wen Nienhuys
 */
 
 #ifndef INTERVAL_HH
diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc
index 5ff1e41665..faf9f3db02 100644
--- a/flower/include/interval.tcc
+++ b/flower/include/interval.tcc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef INTERVAL_TCC
diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh
index 51e5b20373..4378a11aca 100644
--- a/flower/include/libc-extension.hh
+++ b/flower/include/libc-extension.hh
@@ -3,7 +3,7 @@
 
   source file of the flowerlib
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef LIBC_EXTENSION_HH
diff --git a/flower/include/matrix.hh b/flower/include/matrix.hh
index 6e2c781818..6706c58878 100644
--- a/flower/include/matrix.hh
+++ b/flower/include/matrix.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 2006--2008 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #ifndef MATRIX_HH
diff --git a/flower/include/memory-stream.hh b/flower/include/memory-stream.hh
index ab8a183a6f..438463dc09 100644
--- a/flower/include/memory-stream.hh
+++ b/flower/include/memory-stream.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MEMORY_STREAM_HH
diff --git a/flower/include/offset.hh b/flower/include/offset.hh
index 3b89aa8608..9be837ea74 100644
--- a/flower/include/offset.hh
+++ b/flower/include/offset.hh
@@ -1,7 +1,7 @@
 /*
   offset.hh -- part of GNU LilyPond
 
-  (c) 1996--2008 Han-Wen Nienhuys
+  (c) 1996--2009 Han-Wen Nienhuys
 */
 
 #ifndef OFFSET_HH
diff --git a/flower/include/parray.hh b/flower/include/parray.hh
index 619532bbed..bef32612f0 100644
--- a/flower/include/parray.hh
+++ b/flower/include/parray.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PARRAY_HH
diff --git a/flower/include/polynomial.hh b/flower/include/polynomial.hh
index 144ba3d1d1..54c38a8dbe 100644
--- a/flower/include/polynomial.hh
+++ b/flower/include/polynomial.hh
@@ -2,7 +2,7 @@
 /*
  * poly.h -- routines for manipulation of polynomials in one var
  *
- * (c) 1993--2008 Han-Wen Nienhuys
+ * (c) 1993--2009 Han-Wen Nienhuys
  */
 
 #ifndef POLY_H
diff --git a/flower/include/pqueue.hh b/flower/include/pqueue.hh
index fa28ca011d..6ee7e3a74a 100644
--- a/flower/include/pqueue.hh
+++ b/flower/include/pqueue.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PQUEUE_HH
diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index 0129cea773..ff14900805 100644
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef RATIONAL_HH
diff --git a/flower/include/real.hh b/flower/include/real.hh
index 9ab3540ce4..eba8a50b8e 100644
--- a/flower/include/real.hh
+++ b/flower/include/real.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef REAL_HH
diff --git a/flower/include/std-string.hh b/flower/include/std-string.hh
index 8ae6dfa5af..4cf82d33fd 100644
--- a/flower/include/std-string.hh
+++ b/flower/include/std-string.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2006--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef STD_STRING_HH
diff --git a/flower/include/std-vector.hh b/flower/include/std-vector.hh
index 76a11bb925..1b7ae23856 100644
--- a/flower/include/std-vector.hh
+++ b/flower/include/std-vector.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2006--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef STD_VECTOR_HH
diff --git a/flower/include/tuple.hh b/flower/include/tuple.hh
index e9db6e8436..1b47e14914 100644
--- a/flower/include/tuple.hh
+++ b/flower/include/tuple.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
 
 */
 
diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index 57431f4908..b3b9cf008e 100644
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef VIRTUAL_METHODS_HH
diff --git a/flower/include/warn.hh b/flower/include/warn.hh
index f3f95c8564..eafdccaeca 100644
--- a/flower/include/warn.hh
+++ b/flower/include/warn.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef WARN_HH
diff --git a/flower/international.cc b/flower/international.cc
index 6a493b5e6e..7c27dde6cc 100644
--- a/flower/international.cc
+++ b/flower/international.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "config.hh"
diff --git a/flower/interval.cc b/flower/interval.cc
index fcfa18dbd7..64f431f4f5 100644
--- a/flower/interval.cc
+++ b/flower/interval.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "interval.hh"
diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc
index 697c527c44..cca8771e73 100644
--- a/flower/libc-extension.cc
+++ b/flower/libc-extension.cc
@@ -3,7 +3,7 @@
 
   source file of the flowerlib
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/flower/memory-stream.cc b/flower/memory-stream.cc
index dbf6fd83f2..29917e79b0 100644
--- a/flower/memory-stream.cc
+++ b/flower/memory-stream.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cassert>
diff --git a/flower/offset.cc b/flower/offset.cc
index 67b97865e5..4693c113ef 100644
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "offset.hh"
diff --git a/flower/polynomial.cc b/flower/polynomial.cc
index 56deefb714..b34700b2d0 100644
--- a/flower/polynomial.cc
+++ b/flower/polynomial.cc
@@ -1,7 +1,7 @@
 /*
   poly.cc -- routines for manipulation of polynomials in one var
 
-  (c) 1993--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1993--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "polynomial.hh"
diff --git a/flower/rational.cc b/flower/rational.cc
index a1a87fb29e..f1d661a736 100644
--- a/flower/rational.cc
+++ b/flower/rational.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "rational.hh"
diff --git a/flower/std-string.cc b/flower/std-string.cc
index ec5ddffbd4..285c51883c 100644
--- a/flower/std-string.cc
+++ b/flower/std-string.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008  Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2006--2009  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "std-string.hh"
diff --git a/flower/warn.cc b/flower/warn.cc
index 74be7c2453..8529477cde 100644
--- a/flower/warn.cc
+++ b/flower/warn.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "warn.hh"
diff --git a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly
index 631d4fb6fc..7ab5021104 100644
--- a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly
+++ b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly
@@ -22,7 +22,6 @@ truco se aplique a toda la partitura.
   doctitlees = "Añadir un bajo cifrado encima o debajo de las notas"
   
   doctitlefr = "Ajout d'une basse chiffrée au-dessus ou au-dessous des notes"
-  
 
   texidoc = "
 When writing a figured bass, here's a way to specify if you want your
diff --git a/input/lsr/adding-drum-parts.ly b/input/lsr/adding-drum-parts.ly
index 41127f6e32..80aeac3c94 100644
--- a/input/lsr/adding-drum-parts.ly
+++ b/input/lsr/adding-drum-parts.ly
@@ -17,6 +17,20 @@ de líneas.
 "
   doctitlees = "Escritura de partes de percusión"
 
+  texidocfr = "
+Grâce à la puissance des outils préconfigurés tels que la fonction
+@code{\\drummode} et le contexte @code{DrumStaff}, la saisie de 
+parties pour percussions est extrêmement simplifiée : chaque composant
+d'une batterie trouve sa place sur une portée dédiée (avec une clef 
+spécifique) et les têtes de note sont spécifiques à chaque élément.  
+Il est également possible d'affecter un symbole particulier à chaque 
+élément, tout comme de restreindre le nombre de lignes de la portée.
+
+"
+
+  doctitlefr = "Ajout de parties de batterie"
+
+
   texidoc = "
 Using the powerful pre-configured tools such as the @code{\\drummode}
 function and the @code{DrumStaff} context, inputting drum parts is
diff --git a/input/lsr/adjusting-lyrics-vertical-spacing.ly b/input/lsr/adjusting-lyrics-vertical-spacing.ly
index 83e15bd307..7e2aa72d20 100644
--- a/input/lsr/adjusting-lyrics-vertical-spacing.ly
+++ b/input/lsr/adjusting-lyrics-vertical-spacing.ly
@@ -12,6 +12,14 @@ letra más cerca del pentagrama.
 "
   doctitlees = "Ajuste del especiado vertical de la letra"
 
+  texidocfr = "
+Cet extrait illustre la manière de rapprocher la ligne de paroles 
+de la portée.
+
+"
+  doctitlefr = "Ajustement de l'espacement vertical des paroles"
+
+
   texidoc = "
 This snippet shows how to bring the lyrics line closer to the staff.
 
diff --git a/input/lsr/ancient-fonts.ly b/input/lsr/ancient-fonts.ly
index 2f1f606a5b..a175e5936f 100644
--- a/input/lsr/ancient-fonts.ly
+++ b/input/lsr/ancient-fonts.ly
@@ -13,6 +13,13 @@ antigua.
 
   doctitlees = "Tipografía de música antigua"
 
+  texidocfr ="
+Voici comment graver la plupart, sinon tous les symboles que
+LilyPond prend en charge en matière de musique ancienne.
+
+"
+  doctitlefr = "Gravure de musique ancienne"
+
   texidoc = "
 Shown here are many (all?) of the symbols that are included in
 LilyPond's support for ancient notation.
diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly
index b0462e0b32..d0d09ef503 100644
--- a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly
+++ b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly
@@ -30,6 +30,19 @@ ein Kompromiss werden die Notenlinien nicht auf dem System, sondern
 zwischen den Systemen geschrieben.
 "
 
+  texidocfr = "
+Lorsque l'on transcrit de la musique mensurale, il est d'usage 
+d'indiquer en début de partition,  par un « incipit », les tonalité 
+et tempo originaux.  De nos jours, les musiciens ont l'habitude de 
+voir des barres de mesure qui les aide à appréhender la structure 
+rythmique.  Ces barres n'existaient pas du temps où ces œuvres ont 
+été écrites ; en fait, la métrique évoluait au fil de la pièce.  Un 
+compromis consiste à imprimer des barres de mesure entre les portées 
+plutôt que sur la portée elle-même.
+
+"
+  doctitle = "Exemples de notation ancienne -- transcription moderne de musique mensurale"
+
   texidoc = "
 When transcribing mensural music, an incipit at the beginning of the
 piece is useful to indicate the original key and tempo. While today
diff --git a/input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly b/input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly
deleted file mode 100644
index bdae18ce89..0000000000
--- a/input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly
+++ /dev/null
@@ -1,57 +0,0 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.12.0"
-
-\header {
-  lsrtags = "rhythms, editorial-annotations, chords, tweaks-and-overrides"
-
-  texidoces = "
-Las digitaciones y los números de cuerda aplicados a notas
-individuales evitan a las barras automáticamente, pero de forma
-predeterminada esto no es cierto para las digitaciones y números
-de cuerda que se aplican a notas concretas de acordes.  El ejemplo
-siguiente muestra cómo se puede sobreescribir este comportamiento
-predeterminado:
-
-"
-  doctitlees = "Evitar colisiones entre digitaciones de acordes y barras de corchea"
-
-  texidoc = "
-Fingerings and string numbers applied to individual notes will
-automatically avoid beams, but this is not true by default for
-fingerings and string numbers applied to the individual notes of
-chords.  The following example shows how this default behavior can be
-overridden:   
-
-"
-  doctitle = "Avoiding collisions of chord fingering with beams"
-  texidocfr = "
-Les doigtés et les numéros de cordes attachés à des notes seules
-évitent automatiquement les barres de ligature, mais ce n'est pas le
-cas par défaut pour les doigtés ou numéros de cordes attachés aux
-notes d'un accord. L'exemple qui suit montre comment ce comportement
-par défaut peut être corrigé.
-"
-  doctitlefr = "Éviter les collisions entre les doigtés d'accords et les ligatures"
-} % begin verbatim
-
-\relative c' {
-  \set fingeringOrientations = #'(up)
-  \set stringNumberOrientations = #'(up)
-  \set strokeFingerOrientations = #'(up)
-  
-  % Default behavior
-  r8
-  <f c'-5>8
-  <f c'\5>8
-  <f c'-\rightHandFinger #2 >8
-  
-  % Corrected to avoid collisions
-  r8
-  \override Fingering #'add-stem-support = ##t
-  <f c'-5>8
-  \override StringNumber #'add-stem-support = ##t
-  <f c'\5>8
-  \override StrokeFinger #'add-stem-support = ##t
-  <f c'-\rightHandFinger #2 >8
-}
diff --git a/input/lsr/avoiding-collisions-with-chord-fingerings.ly b/input/lsr/avoiding-collisions-with-chord-fingerings.ly
new file mode 100644
index 0000000000..4ce809423a
--- /dev/null
+++ b/input/lsr/avoiding-collisions-with-chord-fingerings.ly
@@ -0,0 +1,38 @@
+%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% This file is in the public domain.
+\version "2.12.0"
+
+\header {
+  lsrtags = "rhythms, editorial-annotations, chords, tweaks-and-overrides"
+
+  texidoc = "
+Fingerings and string numbers applied to individual notes will
+automatically avoid beams and stems, but this is not true by default
+for fingerings and string numbers applied to the individual notes of
+chords.  The following example shows how this default behavior can be
+overridden.
+
+"
+  doctitle = "Avoiding collisions with chord fingerings"
+} % begin verbatim
+
+\relative c' {
+  \set fingeringOrientations = #'(up)
+  \set stringNumberOrientations = #'(up)
+  \set strokeFingerOrientations = #'(up)
+  
+  % Default behavior
+  r8
+  <f c'-5>8
+  <f c'\5>8
+  <f c'-\rightHandFinger #2 >8
+  
+  % Corrected to avoid collisions
+  r8
+  \override Fingering #'add-stem-support = ##t
+  <f c'-5>8
+  \override StringNumber #'add-stem-support = ##t
+  <f c'\5>8
+  \override StrokeFinger #'add-stem-support = ##t
+  <f c'-\rightHandFinger #2 >8
+}
diff --git a/input/lsr/chords.snippet-list b/input/lsr/chords.snippet-list
index 6d057c9192..5e3faa9387 100644
--- a/input/lsr/chords.snippet-list
+++ b/input/lsr/chords.snippet-list
@@ -1,6 +1,6 @@
 adding-a-figured-bass-above-or-below-the-notes.ly
 adding-bar-lines-to-chordnames-context.ly
-avoiding-collisions-of-chord-fingering-with-beams.ly
+avoiding-collisions-with-chord-fingerings.ly
 changing-chord-separator.ly
 changing-the-chord-names-to-german-or-semi-german-notation.ly
 changing-the-positions-of-figured-bass-alterations.ly
diff --git a/input/lsr/creating-a-delayed-turn.ly b/input/lsr/creating-a-delayed-turn.ly
index b1a6a07f3b..5e667425d3 100644
--- a/input/lsr/creating-a-delayed-turn.ly
+++ b/input/lsr/creating-a-delayed-turn.ly
@@ -3,12 +3,15 @@
 \version "2.12.0"
 
 \header {
-  lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides"
-  texidoc = "Creating a delayed turn, where the lower note of the
-  turn uses the accidental, requires several overrides.  The
-  @code{outside-staff-priority} property must be set to #f, as otherwise
-  this would take precedence over the @code{avoid-slur property}.  The
-  value of @code{halign} is used to position the turn horizontally."
+  lsrtags = "expressive-marks, editorial-annotations,tweaks-and-overrides"
+
+  texidoc = "
+Creating a delayed turn, where the lower note of the
+turn uses the accidental, requires several overrides.  The
+@code{outside-staff-priority} property must be set to @code{#f},
+as otherwise this would take precedence over the
+@code{avoid-slur property}.  The value of @code{halign} is used
+to position the turn horizontally."
 
   doctitle = "Creating a delayed turn"
 } % begin verbatim
diff --git a/input/lsr/editorial-annotations.snippet-list b/input/lsr/editorial-annotations.snippet-list
index c60e130f8f..884345679d 100644
--- a/input/lsr/editorial-annotations.snippet-list
+++ b/input/lsr/editorial-annotations.snippet-list
@@ -2,7 +2,7 @@ adding-fingerings-to-a-score.ly
 allowing-fingerings-to-be-printed-inside-the-staff.ly
 analysis-brackets-above-the-staff.ly
 applying-note-head-styles-depending-on-the-step-of-the-scale.ly
-avoiding-collisions-of-chord-fingering-with-beams.ly
+avoiding-collisions-with-chord-fingerings.ly
 blanking-staff-lines-using-the--whiteout-command.ly
 changing-a-single-notes-size-in-a-chord.ly
 changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
diff --git a/input/lsr/non-traditional-key-signatures.ly b/input/lsr/non-traditional-key-signatures.ly
index cf3999b272..772c4dad1d 100644
--- a/input/lsr/non-traditional-key-signatures.ly
+++ b/input/lsr/non-traditional-key-signatures.ly
@@ -72,6 +72,10 @@ Alternatively, for each item in the list, using the more concise format
 all octaves.
 
 
+For microtonal scales where a \"sharp\" is not 100 cents, @code{alter}
+refers to the alteration as a proportion of a 200-cent whole tone.
+
+
 Here is an example of a possible key signature for generating a
 whole-tone scale: 
 
diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list
index dc88624aee..75d487975c 100644
--- a/input/lsr/rhythms.snippet-list
+++ b/input/lsr/rhythms.snippet-list
@@ -2,7 +2,7 @@ adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
 adding-drum-parts.ly
 automatic-beam-subdivisions.ly
 automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly
-avoiding-collisions-of-chord-fingering-with-beams.ly
+avoiding-collisions-with-chord-fingerings.ly
 beam-endings-in-score-context.ly
 beam-grouping-in-7-8-time.ly
 beams-across-line-breaks.ly
diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list
index e8d93d9e41..0c246b2e14 100644
--- a/input/lsr/tweaks-and-overrides.snippet-list
+++ b/input/lsr/tweaks-and-overrides.snippet-list
@@ -1,5 +1,5 @@
 analysis-brackets-above-the-staff.ly
-avoiding-collisions-of-chord-fingering-with-beams.ly
+avoiding-collisions-with-chord-fingerings.ly
 caesura-railtracks-with-fermata.ly
 changing-a-single-notes-size-in-a-chord.ly
 changing-form-of-multi--measure-rests.ly
diff --git a/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly b/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly
index 4493628a99..28143c8faa 100644
--- a/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly
+++ b/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly
@@ -5,6 +5,15 @@
 \header {
   lsrtags = "editorial-annotations, tweaks-and-overrides"
 
+  texidocfr = "
+Lorsqu'il est impossible d'obtenir facilement une allure particulière
+pour les têtes de note en recourant à la technique du @code{\\markup}, un
+code Postscript peut vous tirer d'embarras.  Voici comment générer des
+têtes ressemblant à des parallélogrammes.
+
+"
+  doctitlefr = "Utilisation de Postscript pour générer des têtes de note à l'allure particulière"
+
   texidoc = "
 When a note head with a special shape cannot easily be generated with
 graphic markup, PostScript code can be used to generate the shape. 
diff --git a/input/new/creating-a-delayed-turn.ly b/input/new/creating-a-delayed-turn.ly
index fe417be0f2..16df65b606 100644
--- a/input/new/creating-a-delayed-turn.ly
+++ b/input/new/creating-a-delayed-turn.ly
@@ -1,8 +1,7 @@
 \version "2.12.0"
 
 \header {
-  lsrtags = "expressive-marks, editorial-annotations, 
-tweaks-and-overrides"
+  lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides"
 
   texidoc = "
 Creating a delayed turn, where the lower note of the
diff --git a/input/new/fret-diagrams-explained-and-developed.ly b/input/new/fret-diagrams-explained-and-developed.ly
index a5b548e497..b37fd5f8ad 100644
--- a/input/new/fret-diagrams-explained-and-developed.ly
+++ b/input/new/fret-diagrams-explained-and-developed.ly
@@ -10,15 +10,17 @@ and tweaking fret diagrams."
 <<
   \chords {
     a2 a
-    c2 c
-    d1
+    \repeat unfold 3 {
+      c c c d d
+    }
   }
   
   \new Voice = "mel" {
     \textLengthOn
     % Set global properties of fret diagram
     \override TextScript #'size = #1.2
-    \override TextScript #'fret-diagram-details #'finger-code = #'below-string
+    \override TextScript 
+      #'fret-diagram-details #'finger-code = #'below-string
     \override TextScript #'fret-diagram-details #'dot-color = #'black
     
     %% A chord for ukelele
@@ -42,6 +44,206 @@ and tweaking fret diagrams."
       }
     }
     
+      %% These chords will be in normal orientation
+
+    %% C major for guitar, barred on third fret
+    %  verbose style
+    %  roman fret label, finger labels below string, straight barre
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \override #'(fret-diagram-details . (
+                     (number-type . roman-lower)
+                     (finger-code . below-string)
+                     (barre-type . straight))) {
+          \fret-diagram-verbose #'((mute 6)
+                                   (place-fret 5 3 1)
+                                   (place-fret 4 5 2)
+                                   (place-fret 3 5 3)
+                                   (place-fret 2 5 4)
+                                   (place-fret 1 3 1)
+                                   (barre 5 1 3))
+        }
+      }
+    }
+    
+    %% C major for guitar, barred on third fret
+    %% Double barre used to test barre function
+    %  verbose style
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \override #'(fret-diagram-details . (
+                     (number-type . arabic)
+                     (dot-label-font-mag . 0.9)
+                     (finger-code . in-dot)
+                     (fret-label-font-mag . 0.6)
+                     (fret-label-vertical-offset . 0)
+                     (label-dir . -1)
+                     (mute-string . "M")
+                     (xo-font-magnification . 0.4)
+                     (xo-padding . 0.3))) {
+          \fret-diagram-verbose #'((mute 6)
+                                   (place-fret 5 3 1)
+                                   (place-fret 4 5 2)
+                                   (place-fret 3 5 3)
+                                   (place-fret 2 5 4)
+                                   (place-fret 1 3 1)
+                                   (barre 4 2 5)
+                                   (barre 5 1 3))
+        }
+      }
+    }
+    
+    %% C major for guitar, with capo on third fret
+    %  verbose style
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \override #'(fret-diagram-details . (
+                     (number-type . roman-upper)
+                     (dot-label-font-mag . 0.9)
+                     (finger-code . none)
+                     (fret-label-vertical-offset . 0.5)
+                     (xo-font-magnification . 0.4)
+                     (xo-padding . 0.3))) {
+          \fret-diagram-verbose #'((mute 6)
+                                   (capo 3)
+                                   (open 5)
+                                   (place-fret 4 5 1)
+                                   (place-fret 3 5 2)
+                                   (place-fret 2 5 3)
+                                   (open 1))
+        }
+      }
+    }
+    
+    %% simple D chord
+    d'2^\markup {
+      \override #'(fret-diagram-details . (
+                   (finger-code . below-string)
+                   (dot-radius . 0.35)
+                   (dot-position . 0.5)
+                   (fret-count . 3))) {
+        \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"
+      }
+    }
+
+    %% simple D chord, large top fret thickness
+    d'2^\markup  {
+      \override #'(fret-diagram-details . (
+                   (finger-code . below-string)
+                   (dot-radius . 0.35)
+                   (dot-position . 0.5)
+                   (top-fret-thickness . 7)
+                   (fret-count . 3))) {
+        \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"
+      }
+    }
+
+      % These chords will be in landscape orientation
+    \override TextScript 
+       #'fret-diagram-details #'orientation = #'landscape
+
+    %% C major for guitar, barred on third fret
+    %  verbose style
+    %  roman fret label, finger labels below string, straight barre
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \override #'(fret-diagram-details . (
+                     (number-type . roman-lower)
+                     (finger-code . below-string)
+                     (barre-type . straight))) {
+          \fret-diagram-verbose #'((mute 6)
+                                   (place-fret 5 3 1)
+                                   (place-fret 4 5 2)
+                                   (place-fret 3 5 3)
+                                   (place-fret 2 5 4)
+                                   (place-fret 1 3 1)
+                                   (barre 5 1 3))
+        }
+      }
+    }
+    
+    %% C major for guitar, barred on third fret
+    %% Double barre used to test barre function
+    %  verbose style
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \override #'(fret-diagram-details . (
+                     (number-type . arabic)
+                     (dot-label-font-mag . 0.9)
+                     (finger-code . in-dot)
+                     (fret-label-font-mag . 0.6)
+                     (fret-label-vertical-offset . 0)
+                     (label-dir . -1)
+                     (mute-string . "M")
+                     (xo-font-magnification . 0.4)
+                     (xo-padding . 0.3))) {
+          \fret-diagram-verbose #'((mute 6)
+                                   (place-fret 5 3 1)
+                                   (place-fret 4 5 2)
+                                   (place-fret 3 5 3)
+                                   (place-fret 2 5 4)
+                                   (place-fret 1 3 1)
+                                   (barre 4 2 5)
+                                   (barre 5 1 3))
+        }
+      }
+    }
+    
+    %% C major for guitar, with capo on third fret
+    %  verbose style
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \override #'(fret-diagram-details . (
+                     (number-type . roman-upper)
+                     (dot-label-font-mag . 0.9)
+                     (finger-code . none)
+                     (fret-label-vertical-offset . 0.5)
+                     (xo-font-magnification . 0.4)
+                     (xo-padding . 0.3))) {
+          \fret-diagram-verbose #'((mute 6)
+                                   (capo 3)
+                                   (open 5)
+                                   (place-fret 4 5 1)
+                                   (place-fret 3 5 2)
+                                   (place-fret 2 5 3)
+                                   (open 1))
+        }
+      }
+    }
+    
+    %% simple D chord
+    d'2^\markup {
+      \override #'(fret-diagram-details . (
+                   (finger-code . below-string)
+                   (dot-radius . 0.35)
+                   (dot-position . 0.5)
+                   (fret-count . 3))) {
+        \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"
+      }
+    }
+
+    %% simple D chord, large top fret thickness
+    d'2^\markup {
+      \override #'(fret-diagram-details . (
+                   (finger-code . below-string)
+                   (dot-radius . 0.35)
+                   (dot-position . 0.5)
+                   (top-fret-thickness . 7)
+                   (fret-count . 3))) {
+        \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"
+      }
+    }
+
+      % These chords will be in opposing-landscape orientation
+    \override TextScript #'fret-diagram-details 
+                           #'orientation = #'opposing-landscape
+
     %% C major for guitar, barred on third fret
     %  verbose style
     %  roman fret label, finger labels below string, straight barre
@@ -64,6 +266,7 @@ and tweaking fret diagrams."
     }
     
     %% C major for guitar, barred on third fret
+    %% Double barre used to test barre function
     %  verbose style
     c'2^\markup {
       % 110% of default size
@@ -76,7 +279,6 @@ and tweaking fret diagrams."
                      (fret-label-vertical-offset . 0)
                      (label-dir . -1)
                      (mute-string . "M")
-                     (orientation . landscape)
                      (xo-font-magnification . 0.4)
                      (xo-padding . 0.3))) {
           \fret-diagram-verbose #'((mute 6)
@@ -85,17 +287,53 @@ and tweaking fret diagrams."
                                    (place-fret 3 5 3)
                                    (place-fret 2 5 4)
                                    (place-fret 1 3 1)
+                                   (barre 4 2 5)
                                    (barre 5 1 3))
         }
       }
     }
     
+    %% C major for guitar, with capo on third fret
+    %  verbose style
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \override #'(fret-diagram-details . (
+                     (number-type . roman-upper)
+                     (dot-label-font-mag . 0.9)
+                     (finger-code . none)
+                     (fret-label-vertical-offset . 0.5)
+                     (xo-font-magnification . 0.4)
+                     (xo-padding . 0.3))) {
+          \fret-diagram-verbose #'((mute 6)
+                                   (capo 3)
+                                   (open 5)
+                                   (place-fret 4 5 1)
+                                   (place-fret 3 5 2)
+                                   (place-fret 2 5 3)
+                                   (open 1))
+        }
+      }
+    }
+    
     %% simple D chord
-    d'1^\markup {
+    d'2^\markup {
+      \override #'(fret-diagram-details . (
+                   (finger-code . below-string)
+                   (dot-radius . 0.35)
+                   (dot-position . 0.5)
+                   (fret-count . 3))) {
+        \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"
+      }
+    }
+
+    %% simple D chord, large top fret thickness
+    d'2^\markup {
       \override #'(fret-diagram-details . (
                    (finger-code . below-string)
                    (dot-radius . 0.35)
                    (dot-position . 0.5)
+                   (top-fret-thickness . 7)
                    (fret-count . 3))) {
         \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"
       }
diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly
index cb7f369840..44e5e529ec 100644
--- a/input/regression/auto-beam.ly
+++ b/input/regression/auto-beam.ly
@@ -1,5 +1,5 @@
 \header {
-  texidoc="Beams are place automatically; the last measure should have a single 
+  texidoc="Beams are placed automatically; the last measure should have a single
 beam."
 }
 
diff --git a/input/regression/beam-auto.ly b/input/regression/beam-auto.ly
index 213031bb4d..8e90e1d325 100644
--- a/input/regression/beam-auto.ly
+++ b/input/regression/beam-auto.ly
@@ -8,11 +8,12 @@ time signatures. " }
 \relative c''{
 
   \time 1/2
+
   c8 c c c
   c16 c c c c c c c
   c32 c c c c c c c c c c c c c c c
   \time 1/4
-  c8 c 
+  c8 c
   c16 c c c
   c32 c c c c c c c
   \time 1/8
@@ -35,6 +36,7 @@ time signatures. " }
   \time 3/2
   c8 c c c c c c c c c c c
   c16 c c c c c c c c c c c c c c c c c c c c c c c
+  c32 c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c
   \time 3/4
   c8 c c c c c
   c16 c c c c c c c c c c c
@@ -51,11 +53,21 @@ time signatures. " }
   c8 c c c
   c16 c c c c c c c
   c32 c c c c c c c c c c c c c c c
+  \time 4/16
+  c8 c
+  c16 c c c
+  c32 c c c c c c c
   \time 6/8
   c8 c c c c c
   c16 c c c c c c c c c c c
+  c32 c c c c c c c c c c c c c c c c c c c c c c c
   \time 9/8
   c8 c c c c c c c c
   c16 c c c c c c c c c c c c c c c c c
+  c32 c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c
+  \time 12/8
+  c8 c c c c c c c c c c c
+  c16 c c c c c c c c c c c c c c c c c c c c c c c
+  c32 c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c
 }
 
diff --git a/input/regression/fret-diagrams-capo.ly b/input/regression/fret-diagrams-capo.ly
new file mode 100644
index 0000000000..82fb21e92b
--- /dev/null
+++ b/input/regression/fret-diagrams-capo.ly
@@ -0,0 +1,50 @@
+\version "2.12.0"
+
+\header {
+  texidoc="
+A capo indicator can be added with a fret-diagram-verbose
+string, and its thickness can be changed.
+
+"
+}
+
+\layout { ragged-right = ##t }
+
+<<
+  \chords {
+    c1 |
+    c1
+  }
+
+  \new Voice {
+    \textLengthOn
+
+     %% C major for guitar, with capo on third fret
+        % verbose style
+    c' ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (capo 3)
+                                     (open 5)
+                                     (place-fret 4 5 1)
+                                     (place-fret 3 5 2)
+                                     (place-fret 2 5 3)
+                                     (open 1))}
+
+     %% C major for guitar, with capo on third fret
+       % thinner capo
+        % verbose style
+    \override TextScript #'fret-diagram-details 
+        #'capo-thickness = #0.2
+    c' ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (capo 3)
+                                     (open 5)
+                                     (place-fret 4 5 1)
+                                     (place-fret 3 5 2)
+                                     (place-fret 2 5 3)
+                                     (open 1)) }
+
+ }
+>>
+
+
diff --git a/input/regression/fret-diagrams-dots.ly b/input/regression/fret-diagrams-dots.ly
new file mode 100644
index 0000000000..cf06e666ea
--- /dev/null
+++ b/input/regression/fret-diagrams-dots.ly
@@ -0,0 +1,74 @@
+\version "2.12.0"
+
+\header {
+  texidoc="
+Dots indicating fingerings can be changed in location,
+size, and coloring.
+
+"
+}
+
+\layout { ragged-right = ##t }
+
+<<
+  \chords {
+    c1 |
+    c1 |
+    c1 |
+    c1
+  }
+
+  \new Voice {
+    \textLengthOn
+
+     %% C major for guitar,  verbose style
+    c'1 ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (place-fret 5 3 1)
+                                     (place-fret 4 5 2)
+                                     (place-fret 3 5 3)
+                                     (place-fret 2 5 4)
+                                     (place-fret 1 3 1)
+                                     (barre 5 1 1))}
+
+     %% C major for guitar, verbose style
+    \override TextScript #'fret-diagram-details 
+        #'dot-radius = #0.3
+    c' ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (place-fret 5 3 1)
+                                     (place-fret 4 5 2)
+                                     (place-fret 3 5 3)
+                                     (place-fret 2 5 4)
+                                     (place-fret 1 3 1)
+                                     (barre 5 1 1))}
+
+     %% C major for guitar, verbose style
+    \revert TextScript #'fret-diagram-details #'dot-radius
+    \once \override TextScript #'fret-diagram-details 
+        #'dot-color = #'white
+    c' ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (place-fret 5 3 1)
+                                     (place-fret 4 5 2)
+                                     (place-fret 3 5 3)
+                                     (place-fret 2 5 4)
+                                     (place-fret 1 3 1)
+                                     (barre 5 1 1))}
+
+     %% C major for guitar,  verbose style
+    \once \override TextScript #'fret-diagram-details 
+        #'dot-position = #0.5
+    c'1 ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (place-fret 5 3 1)
+                                     (place-fret 4 5 2)
+                                     (place-fret 3 5 3)
+                                     (place-fret 2 5 4)
+                                     (place-fret 1 3 1)
+                                     (barre 5 1 1))}
+
+ }
+>>
+
+
diff --git a/input/regression/fret-diagrams-fingering.ly b/input/regression/fret-diagrams-fingering.ly
new file mode 100644
index 0000000000..bebd9a6217
--- /dev/null
+++ b/input/regression/fret-diagrams-fingering.ly
@@ -0,0 +1,88 @@
+\version "2.12.0"
+
+\header {
+  texidoc="
+Finger labels can be added, either in dots or below strings.
+Dot color can be changed, and fingering label font size
+can be adjusted.
+
+"
+}
+
+\layout { ragged-right = ##t }
+
+<<
+  \chords {
+    c1 |
+    c1 |
+    c1 |
+    c1 |
+    c1
+  }
+
+  \new Voice {
+    \textLengthOn
+     %% C major for guitar,  verbose style
+    \override TextScript #'fret-diagram-details
+      #'finger-code = #'below-string
+    c'1 ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (place-fret 5 3 1)
+                                     (place-fret 4 5 2)
+                                     (place-fret 3 5 3)
+                                     (place-fret 2 5 4)
+                                     (place-fret 1 3 1)
+                                     (barre 5 1 1))}
+
+     %% C major for guitar,  verbose style
+    \override TextScript #'fret-diagram-details 
+        #'string-label-font-mag = #0.4
+    c'1 ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (place-fret 5 3 1)
+                                     (place-fret 4 5 2)
+                                     (place-fret 3 5 3)
+                                     (place-fret 2 5 4)
+                                     (place-fret 1 3 1)
+                                     (barre 5 1 1))}
+
+     %% C major for guitar, verbose style
+    \override TextScript #'fret-diagram-details
+      #'finger-code = #'in-dot
+    c' ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (place-fret 5 3 1)
+                                     (place-fret 4 5 2)
+                                     (place-fret 3 5 3)
+                                     (place-fret 2 5 4)
+                                     (place-fret 1 3 1)
+                                     (barre 5 1 1))}
+
+     %% C major for guitar, verbose style
+    \once \override TextScript #'fret-diagram-details 
+        #'dot-color = #'white
+    c' ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (place-fret 5 3 1)
+                                     (place-fret 4 5 2)
+                                     (place-fret 3 5 3)
+                                     (place-fret 2 5 4)
+                                     (place-fret 1 3 1)
+                                     (barre 5 1 1))}
+
+     %% C major for guitar,  verbose style
+    \once \override TextScript #'fret-diagram-details 
+        #'dot-label-font-mag = #0.75
+    c'1 ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (place-fret 5 3 1)
+                                     (place-fret 4 5 2)
+                                     (place-fret 3 5 3)
+                                     (place-fret 2 5 4)
+                                     (place-fret 1 3 1)
+                                     (barre 5 1 1))}
+
+ }
+>>
+
+
diff --git a/input/regression/fret-diagrams-fret-label.ly b/input/regression/fret-diagrams-fret-label.ly
new file mode 100644
index 0000000000..dbe18f27b6
--- /dev/null
+++ b/input/regression/fret-diagrams-fret-label.ly
@@ -0,0 +1,67 @@
+\version "2.12.0"
+
+\header {
+  texidoc="
+The label for the lowest fret can be changed in location,
+size, and number type.
+
+"
+}
+
+\layout { ragged-right = ##t }
+
+<<
+  \chords {
+    c1 |
+    c1 |
+    c1
+  }
+
+  \new Voice {
+    \textLengthOn
+
+     %% C major for guitar,  verbose style
+    c'1 ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (place-fret 5 3 1)
+                                     (place-fret 4 5 2)
+                                     (place-fret 3 5 3)
+                                     (place-fret 2 5 4)
+                                     (place-fret 1 3 1)
+                                     (barre 5 1 1))}
+
+     %% C major for guitar, verbose style
+    \override TextScript #'fret-diagram-details 
+        #'label-dir = #LEFT 
+    \override TextScript #'fret-diagram-details 
+        #'number-type = #'roman-upper 
+    c' ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (place-fret 5 3 1)
+                                     (place-fret 4 5 2)
+                                     (place-fret 3 5 3)
+                                     (place-fret 2 5 4)
+                                     (place-fret 1 3 1)
+                                     (barre 5 1 1))}
+
+     %% C major for guitar, verbose style
+    \revert TextScript #'fret-diagram-details #'label-dir
+    \override TextScript #'fret-diagram-details 
+        #'fret-label-font-mag = #0.4 
+    \override TextScript #'fret-diagram-details 
+        #'number-type = #'arabic 
+    \once \override TextScript #'fret-diagram-details 
+        #'fret-label-vertical-offset = #0.25
+    c' ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (place-fret 5 3 1)
+                                     (place-fret 4 5 2)
+                                     (place-fret 3 5 3)
+                                     (place-fret 2 5 4)
+                                     (place-fret 1 3 1)
+                                     (barre 5 1 1))}
+
+ }
+>>
+
+
diff --git a/input/regression/fret-diagrams-landscape.ly b/input/regression/fret-diagrams-landscape.ly
new file mode 100644
index 0000000000..37ca35e0ac
--- /dev/null
+++ b/input/regression/fret-diagrams-landscape.ly
@@ -0,0 +1,55 @@
+\version "2.12.0"
+
+\header {
+  texidoc="
+Fret diagrams can be presented in landscape mode.
+
+"
+}
+
+\layout { ragged-right = ##t }
+
+<<
+  \chords {
+    c1 |
+    c1 |
+    c1 |
+    c1
+  }
+
+  \new Voice {
+    \textLengthOn
+    \override TextScript #'fret-diagram-details
+       #'orientation = #'landscape
+
+     %% C major for guitar, regular style
+    c'1 ^\markup {
+            \fret-diagram #"6-x;5-3-3;4-2-2;3-o;2-1;1-o;"}
+
+     %% C major for guitar with barre on fret 3, regular style
+    \once \override TextScript #'fret-diagram-details 
+        #'label-dir = #LEFT
+    \once \override TextScript #'fret-diagram-details 
+        #'barre-type = #'straight
+    c' ^\markup {
+            \fret-diagram 
+               #"f:1;s:1.2;6-x;c:5-1-3;5-3-1;4-5-2;3-5-3;2-5-4;1-3-1;"}
+
+     %% C major for guitar with two barres, regular style
+
+    c' ^\markup {
+            \fret-diagram 
+              #"f:2;h:5;6-x;c:5-1-3;5-3-1;c:4-2-5;4-5-4;3-5-4;2-5-4;1-3-1;"}
+   
+     %% C major for guitar, with capo 
+    c' ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (capo 3)
+                                     (place-fret 4 5 1)
+                                     (place-fret 3 5 2)
+                                     (place-fret 2 5 3))}
+
+ }
+>>
+
+
diff --git a/input/regression/fret-diagrams-opposing-landscape.ly b/input/regression/fret-diagrams-opposing-landscape.ly
new file mode 100644
index 0000000000..c3d359c748
--- /dev/null
+++ b/input/regression/fret-diagrams-opposing-landscape.ly
@@ -0,0 +1,55 @@
+\version "2.12.0"
+
+\header {
+  texidoc="
+Fret diagrams can be presented in landscape mode.
+
+"
+}
+
+\layout { ragged-right = ##t }
+
+<<
+  \chords {
+    c1 |
+    c1 |
+    c1 |
+    c1
+  }
+
+  \new Voice {
+    \textLengthOn
+    \override TextScript #'fret-diagram-details
+       #'orientation = #'opposing-landscape
+
+     %% C major for guitar, regular style
+    c'1 ^\markup {
+            \fret-diagram #"6-x;5-3-3;4-2-2;3-o;2-1;1-o;"}
+
+     %% C major for guitar with barre on fret 3, regular style
+    \once \override TextScript #'fret-diagram-details 
+        #'label-dir = #LEFT
+    \once \override TextScript #'fret-diagram-details 
+        #'barre-type = #'straight
+    c' ^\markup {
+            \fret-diagram 
+               #"f:1;s:1.2;6-x;c:5-1-3;5-3-1;4-5-2;3-5-3;2-5-4;1-3-1;"}
+
+     %% C major for guitar with two barres, regular style
+
+    c' ^\markup {
+            \fret-diagram 
+              #"f:2;h:5;6-x;c:5-1-3;5-3-1;c:4-2-5;4-5-4;3-5-4;2-5-4;1-3-1;"}
+   
+     %% C major for guitar, with capo 
+    c' ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (capo 3)
+                                     (place-fret 4 5 1)
+                                     (place-fret 3 5 2)
+                                     (place-fret 2 5 3))}
+
+ }
+>>
+
+
diff --git a/input/regression/fret-diagrams-string-frets.ly b/input/regression/fret-diagrams-string-frets.ly
new file mode 100644
index 0000000000..e4f8ab40b6
--- /dev/null
+++ b/input/regression/fret-diagrams-string-frets.ly
@@ -0,0 +1,35 @@
+\version "2.12.0"
+
+\header {
+  texidoc="
+Number of frets and number of strings can be changed from the 
+defaults.
+
+"
+}
+
+\layout { ragged-right = ##t }
+
+<<
+  \chords {
+    d1 |
+    a1
+  }
+
+  \new Voice {
+    \textLengthOn
+
+    % Simple Guitar D diagram with defaults
+
+    d'1 ^\markup {
+      \fret-diagram #"6-x;5-x;4-o;3-2-1;2-3-2;1-2-3;"
+    } |
+
+    % A chord for ukelele -- change both string and fret count
+    a'1 ^\markup {
+      \fret-diagram #"w:4;h:5;4-2-2;3-1-1;2-o;1-o;"
+    }
+  }
+>>
+
+
diff --git a/input/regression/fret-diagrams-xo-label.ly b/input/regression/fret-diagrams-xo-label.ly
new file mode 100644
index 0000000000..df97be4c49
--- /dev/null
+++ b/input/regression/fret-diagrams-xo-label.ly
@@ -0,0 +1,48 @@
+\version "2.12.0"
+
+\header {
+  texidoc="
+The label for the lowest fret can be changed in location,
+size, and number type.
+
+"
+}
+
+\layout { ragged-right = ##t }
+
+<<
+  \chords {
+    d1 |
+    d1 |
+    d1
+  }
+
+  \new Voice {
+    \textLengthOn
+
+     %% D major for guitar, terse style 
+    d'1 ^\markup {
+            \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"}
+
+     %% D major for guitar, terse style 
+    \once \override TextScript #'fret-diagram-details 
+        #'top-fret-thickness = #5 
+    \once \override TextScript #'fret-diagram-details 
+        #'xo-font-magnification = #0.3
+    d'1 ^\markup {
+            \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"}
+
+     %% D major for guitar, terse style 
+    \override TextScript #'fret-diagram-details 
+        #'mute-string = #"M" 
+    \override TextScript #'fret-diagram-details 
+        #'open-string = #"*"
+    \override TextScript #'fret-diagram-details 
+        #'xo-padding = #0.5
+    d'1 ^\markup {
+            \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"}
+
+ }
+>>
+
+
diff --git a/input/regression/fret-diagrams.ly b/input/regression/fret-diagrams.ly
deleted file mode 100644
index 7e424b5d61..0000000000
--- a/input/regression/fret-diagrams.ly
+++ /dev/null
@@ -1,101 +0,0 @@
-\version "2.12.0"
-
-\paper {
-	ragged-right =  ##t
-}
-
-<<
-  \chords {a2 a c c c d}
-  
-  \new Voice =mel {
-    \textLengthOn
-    % Set global properties of fret diagram
-    \override Voice.TextScript #'size = #'1.2
-    \override Voice.TextScript #'(fret-diagram-details finger-code) = #'below-string
-    \override Voice.TextScript #'(fret-diagram-details dot-color) = #'black
-    
-    %% A chord for ukelele
-    a'2 ^\markup
-    \override #'(fret-diagram-details . (
-                  (string-count . 4)
-		   (dot-color . white)
-		   (finger-code . in-dot))){
-		   \fret-diagram #"4-2-2;3-1-1;2-o;1-o;"}
-   %% A chord for ukelele, with formatting defined in definition string
-   %  1.2 * size, 4 strings, 4 frets, fingerings below string
-   %  dot radius .35 of fret spacing, dot position 0.55 of fret spacing
-    a'2 ^\markup
-    \override #'(fret-diagram-details . (
-                  (dot-color . white)
-		   (open-string . "o"))){
-		   \fret-diagram #"s:1.2;w:4;h:3;f:2;d:0.35;p:0.55;4-2-2;3-1-1;2-o;1-o;"}		   
-     %% C major for guitar, barred on third fret
-     	% verbose style
-	% roman fret label, finger labels below string, straight barre
-    c' ^\markup 
-    \override #'(size . 1.1) { % 110% of default size
-       \override #'(fret-diagram-details . (
-                     (number-type . roman-lower)
-		     (finger-code . below-string)
-		     (barre-type . straight))) {
- 	    \fret-diagram-verbose #'((mute 6) 
-                                     (place-fret 5 3 1) 
-                                     (place-fret 4 5 2)
-                                     (place-fret 3 5 3)
-                                     (place-fret 2 5 4)
-                                     (place-fret 1 3 1)
-                                     (barre 5 1 3)) }}
-				     
-      %% C major for guitar, barred on third fret
-     	% verbose style
-    c' ^\markup 
-    \override #'(size . 1.1) { % 110% of default size
-       \override #'(fret-diagram-details . (
-                     (number-type . arabic)
-		     (dot-label-font-mag . 0.9)
-		     (finger-code . in-dot)
-		     (fret-label-font-mag . 0.6)
-		     (fret-label-vertical-offset . 0)
-		     (label-dir . -1)
-		     (mute-string . "M")
-		     (orientation . landscape)
-		     (xo-font-magnification . 0.4)
-		     (xo-padding . 0.3))) {
- 	    \fret-diagram-verbose #'((mute 6) 
-                                     (place-fret 5 3 1) 
-                                     (place-fret 4 5 2)
-                                     (place-fret 3 5 3)
-                                     (place-fret 2 5 4)
-                                     (place-fret 1 3 1)
-                                     (barre 5 1 3)) }}
-
-      
-      %% C major for guitar, with capo on third fret
-     	% verbose style
-    c' ^\markup 
-    \override #'(size . 1.1) { % 110% of default size
-       \override #'(fret-diagram-details . (
-		     (dot-label-font-mag . 0.9)
-		     (finger-code . in-dot)
-		     (xo-font-magnification . 0.4)
-		     (xo-padding . 0.3))) {
- 	    \fret-diagram-verbose #'((mute 6)
-                                     (capo 3)
-                                     (open 5) 
-                                     (place-fret 4 5 1)
-                                     (place-fret 3 5 2)
-                                     (place-fret 2 5 3)
-                                     (open 1)) }}
-
-      %% simple D chord
-
-    d' ^\markup 
-        \override #'(fret-diagram-details . (
-                     (finger-code . below-string)
-                     (dot-radius . 0.35)
-		     (dot-position . 0.5)
-		     (fret-count . 3)))		     
-		     {
-	    \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" }
-  }
->>
diff --git a/input/texidocs/using-postscript-to-generate-special-note-head-shapes.ly b/input/texidocs/using-postscript-to-generate-special-note-head-shapes.ly
deleted file mode 100644
index a018ea1f12..0000000000
--- a/input/texidocs/using-postscript-to-generate-special-note-head-shapes.ly
+++ /dev/null
@@ -1,9 +0,0 @@
-  texidocfr = "
-Lorsqu'il est impossible d'obtenir facilement une allure particulière 
-pour les têtes de note en recourant à la technique du @code{\\markup}, un
-code Postscript peut vous tirer d'embarras.  Voici comment générer des
-têtes ressemblant à des parallélogrammes.
-
-"
-  doctitlefr = "Utilisation de Postscript pour générer des têtes de note à 
-l'allure particulière"
diff --git a/input/texidocs/using-postscript-to-generate-special-note-head-shapes.texidoc b/input/texidocs/using-postscript-to-generate-special-note-head-shapes.texidoc
new file mode 100644
index 0000000000..8007f8e44c
--- /dev/null
+++ b/input/texidocs/using-postscript-to-generate-special-note-head-shapes.texidoc
@@ -0,0 +1,8 @@
+  texidocfr = "
+Lorsqu'il est impossible d'obtenir facilement une allure particulière
+pour les têtes de note en recourant à la technique du @code{\\markup}, un
+code Postscript peut vous tirer d'embarras.  Voici comment générer des
+têtes ressemblant à des parallélogrammes.
+
+"
+  doctitlefr = "Utilisation de Postscript pour générer des têtes de note à l'allure particulière"
diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 7fcea1ccfe..24340ed70f 100644
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Modified 2001--2002 by Rune Zedeler <rz@daimi.au.dk>
 */
 
diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc
index 3d4b9ef3ac..f383a3ecc7 100644
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 
diff --git a/lily/accidental.cc b/lily/accidental.cc
index 1c2418500d..0e81a6bea2 100644
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "accidental-interface.hh"
diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index 7f7b9c3cf6..27839aca92 100644
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "align-interface.hh"
diff --git a/lily/all-font-metrics-scheme.cc b/lily/all-font-metrics-scheme.cc
index 517b5a8725..1391b1d8ff 100644
--- a/lily/all-font-metrics-scheme.cc
+++ b/lily/all-font-metrics-scheme.cc
@@ -4,7 +4,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2007--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2007--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 96d8667c9d..9721f8e809 100644
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "all-font-metrics.hh"
diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 79605c3b6d..3753249d87 100644
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl
 */
diff --git a/lily/ambitus.cc b/lily/ambitus.cc
index e123538dfa..85fb297886 100644
--- a/lily/ambitus.cc
+++ b/lily/ambitus.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "ambitus.hh"
diff --git a/lily/apply-context-iterator.cc b/lily/apply-context-iterator.cc
index 3ed593be58..7874509da2 100644
--- a/lily/apply-context-iterator.cc
+++ b/lily/apply-context-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index 062d6a816f..f5546ee5c6 100644
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index fcb32debcb..7873b5f39c 100644
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "arpeggio.hh"
diff --git a/lily/audio-column.cc b/lily/audio-column.cc
index 0b60edf6be..4c24351aa4 100644
--- a/lily/audio-column.cc
+++ b/lily/audio-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "audio-column.hh"
diff --git a/lily/audio-element-info.cc b/lily/audio-element-info.cc
index 9846ba5436..c3cda8b40e 100644
--- a/lily/audio-element-info.cc
+++ b/lily/audio-element-info.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "audio-element-info.hh"
diff --git a/lily/audio-element.cc b/lily/audio-element.cc
index d542bc5efc..093724cee1 100644
--- a/lily/audio-element.cc
+++ b/lily/audio-element.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #include <cassert> 
 
diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index b351a57625..33e54d713a 100644
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "audio-item.hh"
diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc
index 73a56d6a62..bde50ae80a 100644
--- a/lily/audio-staff.cc
+++ b/lily/audio-staff.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "audio-staff.hh"
diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index af4f1fc2d9..4c813a7038 100644
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "bar-line.hh"
diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index 04ed126556..8ac1ccf337 100644
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 82b5cfe37b..4f19938ef8 100644
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "axis-group-engraver.hh"
diff --git a/lily/axis-group-interface-scheme.cc b/lily/axis-group-interface-scheme.cc
index 98f42744b1..ff16505c7b 100644
--- a/lily/axis-group-interface-scheme.cc
+++ b/lily/axis-group-interface-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "axis-group-interface.hh"
diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index cc6ff24fc7..639c8b6267 100644
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "axis-group-interface.hh"
diff --git a/lily/balloon-engraver.cc b/lily/balloon-engraver.cc
index 328b4736ce..d13c527ef6 100644
--- a/lily/balloon-engraver.cc
+++ b/lily/balloon-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/balloon.cc b/lily/balloon.cc
index 5409bd52d5..0c82fdca8e 100644
--- a/lily/balloon.cc
+++ b/lily/balloon.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "text-interface.hh"
diff --git a/lily/bar-check-iterator.cc b/lily/bar-check-iterator.cc
index 5b518602ff..8ac67109bf 100644
--- a/lily/bar-check-iterator.cc
+++ b/lily/bar-check-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 3d751ecf12..6bf118ae8b 100644
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index f13d8697c3..c9d9159a4c 100644
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "bar-line.hh"
diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index f5744ff76c..61242297cd 100644
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-column.hh"
diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index c1b9d54c30..43c1264741 100644
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "beam.hh"
diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc
index 907fcc4d1a..bd85a6a1f1 100644
--- a/lily/beam-performer.cc
+++ b/lily/beam-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc
index cf933d500b..ed13214502 100644
--- a/lily/beam-quanting.cc
+++ b/lily/beam-quanting.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/beam.cc b/lily/beam.cc
index b962fde776..83d82e3cca 100644
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/beaming-pattern.cc b/lily/beaming-pattern.cc
index c32666133b..75dfc5a8c0 100644
--- a/lily/beaming-pattern.cc
+++ b/lily/beaming-pattern.cc
@@ -10,7 +10,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "beaming-pattern.hh"
diff --git a/lily/bend-engraver.cc b/lily/bend-engraver.cc
index 4545fb7297..3a08a45532 100644
--- a/lily/bend-engraver.cc
+++ b/lily/bend-engraver.cc
@@ -1,7 +1,7 @@
 /*
   bend-engraver.cc -- implement Bend_engraver
 
-  (c) 2006--2008 Han-Wen Nienhuys
+  (c) 2006--2009 Han-Wen Nienhuys
 
   
 */
diff --git a/lily/bezier-bow.cc b/lily/bezier-bow.cc
index c61d480803..e3707c1390 100644
--- a/lily/bezier-bow.cc
+++ b/lily/bezier-bow.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "misc.hh"
diff --git a/lily/bezier.cc b/lily/bezier.cc
index 18d7836cbf..3712b9213e 100644
--- a/lily/bezier.cc
+++ b/lily/bezier.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "bezier.hh"
diff --git a/lily/book-scheme.cc b/lily/book-scheme.cc
index 7864736463..0c0896668f 100644
--- a/lily/book-scheme.cc
+++ b/lily/book-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "book.hh"
diff --git a/lily/book.cc b/lily/book.cc
index fa961d36f3..001d647215 100644
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "book.hh"
diff --git a/lily/box.cc b/lily/box.cc
index 5c2af4d317..f35f935204 100644
--- a/lily/box.cc
+++ b/lily/box.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "box.hh"
diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 155f34d9bc..922978f2b1 100644
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #include "engraver.hh"
 #include "protected-scm.hh"
diff --git a/lily/break-alignment-interface.cc b/lily/break-alignment-interface.cc
index fdf0afb58a..1d2b5f9447 100644
--- a/lily/break-alignment-interface.cc
+++ b/lily/break-alignment-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 
diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc
index 8326cee5ee..e4d6a9a853 100644
--- a/lily/break-substitution.cc
+++ b/lily/break-substitution.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cstdio>
diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index 0850067b69..b65131579f 100644
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -1,7 +1,7 @@
 /*
   breathing_sign-engraver.cc -- implement Breathing_sign_engraver
 
-  (c) 1999--2008 Michael Krause
+  (c) 1999--2009 Michael Krause
 
   written for the GNU LilyPond music typesetter
 
diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index 517b8f8f1c..58c399bf70 100644
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -1,13 +1,13 @@
 /*
   breathing_sign.cc -- implement Breathing_sign
 
-  (c) 1999--2008 Michael Krause
+  (c) 1999--2009 Michael Krause
 
   written for the GNU LilyPond music typesetter
 
   TODO: --> see breathing-sign-engraver.cc
 
-  Extensions for ancient notation (c) 2003--2008 by Juergen Reuter
+  Extensions for ancient notation (c) 2003--2009 by Juergen Reuter
 */
 
 #include "breathing-sign.hh"
diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index 8b8f191006..698c9e8a4a 100644
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "change-iterator.hh"
diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index a9a2744c9f..f8858998a1 100644
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "chord-name.hh"
diff --git a/lily/chord-name.cc b/lily/chord-name.cc
index 586801c391..6cfe2def10 100644
--- a/lily/chord-name.cc
+++ b/lily/chord-name.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "chord-name.hh"
diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index 82eba5cec1..140ab10237 100644
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   		 Erik Sandberg <mandolaerik@gmail.com>
 */
 
diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index 191e92ac27..c5371a2c4d 100644
--- a/lily/chord-tremolo-iterator.cc
+++ b/lily/chord-tremolo-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   		 Erik Sandberg <mandolaerik@gmail.com>
 */
 
diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index c8e21f2ce8..52d094e243 100644
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>,
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>,
 
   Mats Bengtsson <matsb@s3.kth.se>
 */
diff --git a/lily/clef.cc b/lily/clef.cc
index eacc7335bd..80e480751d 100644
--- a/lily/clef.cc
+++ b/lily/clef.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "clef.hh"
diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index ecf071b918..bf25dce7b5 100644
--- a/lily/cluster-engraver.cc
+++ b/lily/cluster-engraver.cc
@@ -1,7 +1,7 @@
 /*
   cluster-engraver.cc -- implement Cluster_engraver
 
-  (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
diff --git a/lily/cluster.cc b/lily/cluster.cc
index 8ec4a7befd..d872fca6be 100644
--- a/lily/cluster.cc
+++ b/lily/cluster.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc
index df89149f2d..5b1ec9cdc8 100644
--- a/lily/coherent-ligature-engraver.cc
+++ b/lily/coherent-ligature-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2003--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "coherent-ligature-engraver.hh"
diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 52c811b633..a645f36f7e 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/column-x-positions.cc b/lily/column-x-positions.cc
index 40e969e728..134f84b73b 100644
--- a/lily/column-x-positions.cc
+++ b/lily/column-x-positions.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "column-x-positions.hh"
diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc
index 1522dad8b3..b4c4afb087 100644
--- a/lily/completion-note-heads-engraver.cc
+++ b/lily/completion-note-heads-engraver.cc
@@ -1,7 +1,7 @@
 /*
   completion-note-heads-engraver.cc -- Completion_heads_engraver
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cctype>
diff --git a/lily/constrained-breaking.cc b/lily/constrained-breaking.cc
index 1e172fd492..3a56aa4754 100644
--- a/lily/constrained-breaking.cc
+++ b/lily/constrained-breaking.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #include "constrained-breaking.hh"
diff --git a/lily/context-def.cc b/lily/context-def.cc
index 37690fd61a..0b95a8b952 100644
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 /* TODO: should junk this class an replace by
diff --git a/lily/context-handle.cc b/lily/context-handle.cc
index ae613fb86b..42760fa59d 100644
--- a/lily/context-handle.cc
+++ b/lily/context-handle.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context-handle.hh"
diff --git a/lily/context-property.cc b/lily/context-property.cc
index 08ade8f954..4645901b37 100644
--- a/lily/context-property.cc
+++ b/lily/context-property.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
diff --git a/lily/context-scheme.cc b/lily/context-scheme.cc
index 96193f65e7..9ce9a9baa0 100644
--- a/lily/context-scheme.cc
+++ b/lily/context-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
diff --git a/lily/context-specced-music-iterator.cc b/lily/context-specced-music-iterator.cc
index 7d09233496..bb8851f5b2 100644
--- a/lily/context-specced-music-iterator.cc
+++ b/lily/context-specced-music-iterator.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music-wrapper-iterator.hh"
diff --git a/lily/context.cc b/lily/context.cc
index a1456a1bbf..b2ada8fe7f 100644
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 578f57266e..8709c87f0a 100644
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Juergen Reuter <reuter@ipd.uka.de>,
+  (c) 2000--2009 Juergen Reuter <reuter@ipd.uka.de>,
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
diff --git a/lily/custos.cc b/lily/custos.cc
index 5ef96c5868..56259d56a5 100644
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2000--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 /* TODO:
diff --git a/lily/default-bar-line-engraver.cc b/lily/default-bar-line-engraver.cc
index 0b66113451..f36c18f687 100644
--- a/lily/default-bar-line-engraver.cc
+++ b/lily/default-bar-line-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc
index 90acd455ea..3eb0a89cb3 100644
--- a/lily/dimension-cache.cc
+++ b/lily/dimension-cache.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 
diff --git a/lily/dimensions-scheme.cc b/lily/dimensions-scheme.cc
index 0f4b4a6b3b..af20945c73 100644
--- a/lily/dimensions-scheme.cc
+++ b/lily/dimensions-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "lily-guile.hh"
diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc
index c217677606..98ea9b53f4 100644
--- a/lily/directional-element-interface.cc
+++ b/lily/directional-element-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "directional-element-interface.hh"
diff --git a/lily/dispatcher-scheme.cc b/lily/dispatcher-scheme.cc
index 307152e23c..b86232c480 100644
--- a/lily/dispatcher-scheme.cc
+++ b/lily/dispatcher-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Erik Sandberg  <mandolaerik@gmail.com>
+  (c) 2006--2009 Erik Sandberg  <mandolaerik@gmail.com>
 */
 
 #include "dispatcher.hh"
diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 1d6f937e92..7be2bbdc90 100644
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "rhythmic-head.hh"
diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index 91c5f657c3..9536e97f30 100644
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "dot-column.hh"
diff --git a/lily/dot-configuration.cc b/lily/dot-configuration.cc
index e82c17257a..559f83be2e 100644
--- a/lily/dot-configuration.cc
+++ b/lily/dot-configuration.cc
@@ -5,7 +5,7 @@
   terms of the GNU General Public License.  LilyPond comes with NO
   WARRANTY.
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cstdio>
diff --git a/lily/dot-formatting-problem.cc b/lily/dot-formatting-problem.cc
index a3bd78cf2e..cd443a2e6c 100644
--- a/lily/dot-formatting-problem.cc
+++ b/lily/dot-formatting-problem.cc
@@ -4,7 +4,7 @@
 
    file of the GNU LilyPond music typesetter
    
-   (c) 2007--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+   (c) 2007--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/dots-engraver.cc b/lily/dots-engraver.cc
index dba6fe6822..9d1af7779b 100644
--- a/lily/dots-engraver.cc
+++ b/lily/dots-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/dots.cc b/lily/dots.cc
index ff777b926a..f2a88b95e9 100644
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "dots.hh"
diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index 0c9bab76bc..1309f448d3 100644
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -1,7 +1,7 @@
 /*
   drum-note-engraver.cc
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cctype>
diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
index 959d39eb9d..ee445f5ad8 100644
--- a/lily/drum-note-performer.cc
+++ b/lily/drum-note-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
diff --git a/lily/duration-scheme.cc b/lily/duration-scheme.cc
index fe027dcf26..8ac8b2d6e3 100644
--- a/lily/duration-scheme.cc
+++ b/lily/duration-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
diff --git a/lily/duration.cc b/lily/duration.cc
index 755679fd71..af924bb4b1 100644
--- a/lily/duration.cc
+++ b/lily/duration.cc
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
diff --git a/lily/dynamic-align-engraver.cc b/lily/dynamic-align-engraver.cc
index 77feb08628..ac5e0e4c21 100644
--- a/lily/dynamic-align-engraver.cc
+++ b/lily/dynamic-align-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2008--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 488bec75f5..b3da0e04a4 100644
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "axis-group-interface.hh"
diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index c80d64111e..2e0ccc0944 100644
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
diff --git a/lily/easy-notation.cc b/lily/easy-notation.cc
index 8732534230..8838efee2d 100644
--- a/lily/easy-notation.cc
+++ b/lily/easy-notation.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-head.hh"
diff --git a/lily/enclosing-bracket.cc b/lily/enclosing-bracket.cc
index 69c3adcc64..4bb732efdc 100644
--- a/lily/enclosing-bracket.cc
+++ b/lily/enclosing-bracket.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/engraver-group.cc b/lily/engraver-group.cc
index 8c5306f544..44f0f538e5 100644
--- a/lily/engraver-group.cc
+++ b/lily/engraver-group.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
diff --git a/lily/engraver.cc b/lily/engraver.cc
index 9ac54f804e..7724b1c395 100644
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -3,7 +3,7 @@
 
   Sourcefile of GNU LilyPond music type setter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/event-chord-iterator.cc b/lily/event-chord-iterator.cc
index d6c7a26b9c..c678da031e 100644
--- a/lily/event-chord-iterator.cc
+++ b/lily/event-chord-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "event-chord-iterator.hh"
diff --git a/lily/event-iterator.cc b/lily/event-iterator.cc
index a2ec546a25..c29761a5d8 100644
--- a/lily/event-iterator.cc
+++ b/lily/event-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "event-iterator.hh"
diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index af1ae8503e..f3f711de0f 100644
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Glen Prideaux <glenprideaux@iname.com>,
+  (c) 1999--2009 Glen Prideaux <glenprideaux@iname.com>,
   Han-Wen Nienhuys <hanwen@xs4all.nl>,
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
diff --git a/lily/figured-bass-continuation.cc b/lily/figured-bass-continuation.cc
index fcfddb94e6..141bc5cc5d 100644
--- a/lily/figured-bass-continuation.cc
+++ b/lily/figured-bass-continuation.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index 8a06ea3a1b..f9ed3329f1 100644
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/figured-bass-position-engraver.cc b/lily/figured-bass-position-engraver.cc
index 15d1278fbd..705bba24b7 100644
--- a/lily/figured-bass-position-engraver.cc
+++ b/lily/figured-bass-position-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/file-name-map.cc b/lily/file-name-map.cc
index 6adb1e5863..63ae7eced0 100644
--- a/lily/file-name-map.cc
+++ b/lily/file-name-map.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <map>
diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index b48f38924f..235fdd666d 100644
--- a/lily/fingering-engraver.cc
+++ b/lily/fingering-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/font-config-scheme.cc b/lily/font-config-scheme.cc
index 9de2cd112d..65ad68fe43 100644
--- a/lily/font-config-scheme.cc
+++ b/lily/font-config-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/font-config.cc b/lily/font-config.cc
index 96247f6f76..7737068c2e 100644
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "config.hh"
diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index a65a3c14bf..9bd1095458 100644
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "font-interface.hh"
diff --git a/lily/font-metric-scheme.cc b/lily/font-metric-scheme.cc
index 7cdffddfd1..bb4dbd401c 100644
--- a/lily/font-metric-scheme.cc
+++ b/lily/font-metric-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "font-metric.hh"
diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index d9ccecbc91..12d8807831 100644
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
 */
diff --git a/lily/font-select.cc b/lily/font-select.cc
index 5db047fc26..2de54e3955 100644
--- a/lily/font-select.cc
+++ b/lily/font-select.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2003--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 
diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index 9cb0397b7e..b9dfb058ef 100644
--- a/lily/font-size-engraver.cc
+++ b/lily/font-size-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob.hh"
diff --git a/lily/freetype-error.cc b/lily/freetype-error.cc
index ff62bee37f..8e5d435bc6 100644
--- a/lily/freetype-error.cc
+++ b/lily/freetype-error.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2007--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2007--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/freetype.cc b/lily/freetype.cc
index bcf8a3ca5f..08d7733461 100644
--- a/lily/freetype.cc
+++ b/lily/freetype.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "freetype.hh"
diff --git a/lily/function-documentation.cc b/lily/function-documentation.cc
index 77b6133518..87f6cd1019 100644
--- a/lily/function-documentation.cc
+++ b/lily/function-documentation.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cstring>
diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index 94c05ee607..8b5766387e 100644
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc
index da9c0a1156..488d22e2f0 100644
--- a/lily/glissando-engraver.cc
+++ b/lily/glissando-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
diff --git a/lily/global-context-scheme.cc b/lily/global-context-scheme.cc
index 2281d26853..d672178a54 100644
--- a/lily/global-context-scheme.cc
+++ b/lily/global-context-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "cpu-timer.hh"
diff --git a/lily/global-context.cc b/lily/global-context.cc
index d1bd6a4547..13d9738cd0 100644
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "global-context.hh"
diff --git a/lily/global-ctor.cc b/lily/global-ctor.cc
index cfc75fb135..adf15fd614 100644
--- a/lily/global-ctor.cc
+++ b/lily/global-ctor.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "global-ctor.hh"
diff --git a/lily/grace-engraver.cc b/lily/grace-engraver.cc
index 7fd5466895..c377166d63 100644
--- a/lily/grace-engraver.cc
+++ b/lily/grace-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc
index 1974f0d801..3c0e8bb3b4 100644
--- a/lily/grace-iterator.cc
+++ b/lily/grace-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grace-iterator.hh"
diff --git a/lily/grace-music.cc b/lily/grace-music.cc
index 899dae7dcf..3445eab175 100644
--- a/lily/grace-music.cc
+++ b/lily/grace-music.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music.hh"
diff --git a/lily/grace-spacing-engraver.cc b/lily/grace-spacing-engraver.cc
index 3778f05537..a2a333c782 100644
--- a/lily/grace-spacing-engraver.cc
+++ b/lily/grace-spacing-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Han-Wen <hanwen@lilypond.org>
+  (c) 2006--2009 Han-Wen <hanwen@lilypond.org>
 
 */
 
diff --git a/lily/gregorian-ligature-engraver.cc b/lily/gregorian-ligature-engraver.cc
index 049d89d9cf..fc2235bd64 100644
--- a/lily/gregorian-ligature-engraver.cc
+++ b/lily/gregorian-ligature-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2003--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "gregorian-ligature-engraver.hh"
diff --git a/lily/gregorian-ligature.cc b/lily/gregorian-ligature.cc
index bb88967873..4c84c89dee 100644
--- a/lily/gregorian-ligature.cc
+++ b/lily/gregorian-ligature.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2003--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "gregorian-ligature.hh"
diff --git a/lily/grid-line-interface.cc b/lily/grid-line-interface.cc
index 6401f6ef19..fd47291580 100644
--- a/lily/grid-line-interface.cc
+++ b/lily/grid-line-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grid-line-interface.hh"
diff --git a/lily/grid-line-span-engraver.cc b/lily/grid-line-span-engraver.cc
index a8a5906d2b..15ce55a13d 100644
--- a/lily/grid-line-span-engraver.cc
+++ b/lily/grid-line-span-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/grid-point-engraver.cc b/lily/grid-point-engraver.cc
index 32490757f8..95899aa25a 100644
--- a/lily/grid-point-engraver.cc
+++ b/lily/grid-point-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/grob-array-scheme.cc b/lily/grob-array-scheme.cc
index 2f472af3e4..62329e940a 100644
--- a/lily/grob-array-scheme.cc
+++ b/lily/grob-array-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/grob-array.cc b/lily/grob-array.cc
index 281ae61e27..9cf6e39e5f 100644
--- a/lily/grob-array.cc
+++ b/lily/grob-array.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob-array.hh"
diff --git a/lily/grob-info.cc b/lily/grob-info.cc
index be6fd79e17..68ca9f3880 100644
--- a/lily/grob-info.cc
+++ b/lily/grob-info.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
diff --git a/lily/grob-interface-scheme.cc b/lily/grob-interface-scheme.cc
index 1ffa5d0779..0472d5bef6 100644
--- a/lily/grob-interface-scheme.cc
+++ b/lily/grob-interface-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "lily-guile.hh"
diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index 1e968ff421..74cd104d37 100644
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob-interface.hh"
diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index 6e6cead34e..eee3d7d707 100644
--- a/lily/grob-pq-engraver.cc
+++ b/lily/grob-pq-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc
index 4d6ed8f69b..9c6f238895 100644
--- a/lily/grob-scheme.cc
+++ b/lily/grob-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
diff --git a/lily/grob-smob.cc b/lily/grob-smob.cc
index 590d299a50..4cdccf63cf 100644
--- a/lily/grob-smob.cc
+++ b/lily/grob-smob.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob.hh"
diff --git a/lily/grob.cc b/lily/grob.cc
index 56000a0c12..698d40457c 100644
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob.hh"
diff --git a/lily/guile-init.cc b/lily/guile-init.cc
index 4ba2bd7f2c..6c2422e76b 100644
--- a/lily/guile-init.cc
+++ b/lily/guile-init.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 6a98e55bf9..e5dea58244 100644
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "hairpin.hh"
diff --git a/lily/hara-kiri-engraver.cc b/lily/hara-kiri-engraver.cc
index e911db54d9..9724d105fb 100644
--- a/lily/hara-kiri-engraver.cc
+++ b/lily/hara-kiri-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "axis-group-engraver.hh"
diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index 859ae78df4..acd65da2f1 100644
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
diff --git a/lily/horizontal-bracket-engraver.cc b/lily/horizontal-bracket-engraver.cc
index 446c5ba274..52ec11e1d7 100644
--- a/lily/horizontal-bracket-engraver.cc
+++ b/lily/horizontal-bracket-engraver.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/horizontal-bracket.cc b/lily/horizontal-bracket.cc
index 13eec0c3ff..c5594359a1 100644
--- a/lily/horizontal-bracket.cc
+++ b/lily/horizontal-bracket.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "horizontal-bracket.hh"	
diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc
index b4dbcefc8c..3a1684491b 100644
--- a/lily/hyphen-engraver.cc
+++ b/lily/hyphen-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Glen Prideaux <glenprideaux@iname.com>,
+  (c) 1999--2009 Glen Prideaux <glenprideaux@iname.com>,
   Han-Wen Nienhuys <hanwen@xs4all.nl>,
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
diff --git a/lily/identifier-smob.cc b/lily/identifier-smob.cc
index b85d14211f..0b0460c1ff 100644
--- a/lily/identifier-smob.cc
+++ b/lily/identifier-smob.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "identifier-smob.hh"
diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index e241b66230..7d506373f3 100644
--- a/lily/includable-lexer.cc
+++ b/lily/includable-lexer.cc
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "includable-lexer.hh"
diff --git a/lily/include/accidental-interface.hh b/lily/include/accidental-interface.hh
index 440740b407..0764fb7f34 100644
--- a/lily/include/accidental-interface.hh
+++ b/lily/include/accidental-interface.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef ACCIDENTAL_INTERFACE_HH
diff --git a/lily/include/accidental-placement.hh b/lily/include/accidental-placement.hh
index 3147e0d19b..d5dd0c7c82 100644
--- a/lily/include/accidental-placement.hh
+++ b/lily/include/accidental-placement.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef ACCIDENTAL_PLACEMENT_HH
diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh
index 8cec05324b..149ef321c1 100644
--- a/lily/include/align-interface.hh
+++ b/lily/include/align-interface.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef ALIGN_INTERFACE_HH
diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh
index da1437bfac..184e4751d5 100644
--- a/lily/include/all-font-metrics.hh
+++ b/lily/include/all-font-metrics.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef ALL_FONTS_HH
diff --git a/lily/include/ambitus.hh b/lily/include/ambitus.hh
index a72acba8fa..dc8d3c9bfd 100644
--- a/lily/include/ambitus.hh
+++ b/lily/include/ambitus.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2000--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #ifndef AMBITUS_HH
diff --git a/lily/include/arpeggio.hh b/lily/include/arpeggio.hh
index 60313afdbe..a7a01dde6c 100644
--- a/lily/include/arpeggio.hh
+++ b/lily/include/arpeggio.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef ARPEGGIO_HH
diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh
index fa7654d86f..60cc824aa3 100644
--- a/lily/include/audio-column.hh
+++ b/lily/include/audio-column.hh
@@ -1,7 +1,7 @@
 /*
   audio-column.hh -- declare Audio_column
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef AUDIO_COLUMN_HH
diff --git a/lily/include/audio-element-info.hh b/lily/include/audio-element-info.hh
index a9d2107e22..6222db2587 100644
--- a/lily/include/audio-element-info.hh
+++ b/lily/include/audio-element-info.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef AUDIO_ITEM_INFO_HH
diff --git a/lily/include/audio-element.hh b/lily/include/audio-element.hh
index c0dbb3572d..54d6c7db72 100644
--- a/lily/include/audio-element.hh
+++ b/lily/include/audio-element.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef AUDIO_ELEMENT_HH
diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index a277b53a28..0fc59fd960 100644
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -1,7 +1,7 @@
 /*
   audio-item.hh -- declare Audio_items
 
-  (c) 1996--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef AUDIO_ITEM_HH
diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh
index 86e6d4748f..d3e29e80bc 100644
--- a/lily/include/audio-staff.hh
+++ b/lily/include/audio-staff.hh
@@ -1,7 +1,7 @@
 /*
   audio-staff.hh -- declare Audio_staff
 
-  (c) 1996--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef AUDIO_STAFF_HH
diff --git a/lily/include/axis-group-engraver.hh b/lily/include/axis-group-engraver.hh
index 439db8634f..fa9e3c91d9 100644
--- a/lily/include/axis-group-engraver.hh
+++ b/lily/include/axis-group-engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef AXIS_GROUP_ENGRAVER_HH
diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh
index 252059da8e..6dd2e7b95c 100644
--- a/lily/include/axis-group-interface.hh
+++ b/lily/include/axis-group-interface.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef AXIS_GROUP_INTERFACE_HH
diff --git a/lily/include/bar-line.hh b/lily/include/bar-line.hh
index 1ae1b59ae7..51e6f9c005 100644
--- a/lily/include/bar-line.hh
+++ b/lily/include/bar-line.hh
@@ -1,7 +1,7 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996--2008 Han-Wen Nienhuys
+  (c) 1996--2009 Han-Wen Nienhuys
 */
 
 #ifndef BAR_HH
diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index 85d6d016e5..fc62f6525e 100644
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,7 +1,7 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996--2008 Han-Wen Nienhuys
+  (c) 1996--2009 Han-Wen Nienhuys
 */
 
 #ifndef BAR_HH
diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index a9b30b6786..89a11a263b 100644
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/include/beaming-pattern.hh b/lily/include/beaming-pattern.hh
index f22cba2a2d..36c63c7502 100644
--- a/lily/include/beaming-pattern.hh
+++ b/lily/include/beaming-pattern.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef BEAMING_PATTERN_HH
diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh
index c867ef7a1c..a04d449725 100644
--- a/lily/include/bezier.hh
+++ b/lily/include/bezier.hh
@@ -1,7 +1,7 @@
 /*
   bezier.hh -- declare Bezier and Bezier_bow
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef BEZIER_HH
diff --git a/lily/include/book.hh b/lily/include/book.hh
index 3f0c6248fa..d7ae227801 100644
--- a/lily/include/book.hh
+++ b/lily/include/book.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef BOOK_HH
diff --git a/lily/include/break-align-interface.hh b/lily/include/break-align-interface.hh
index c93a5cfe3e..128d4e2b12 100644
--- a/lily/include/break-align-interface.hh
+++ b/lily/include/break-align-interface.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef BREAK_ALIGN_INTERFACE_HH
diff --git a/lily/include/breathing-sign.hh b/lily/include/breathing-sign.hh
index 8104218372..271de504f9 100644
--- a/lily/include/breathing-sign.hh
+++ b/lily/include/breathing-sign.hh
@@ -1,7 +1,7 @@
 /*
   breathing-sign.hh
 
-  Copyright (c) 1999--2008 Michael Krause
+  Copyright (c) 1999--2009 Michael Krause
 
   written for the GNU LilyPond music typesetter
 */
diff --git a/lily/include/change-iterator.hh b/lily/include/change-iterator.hh
index 71aa7cb8d3..c7ecfda15c 100644
--- a/lily/include/change-iterator.hh
+++ b/lily/include/change-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef CHANGE_ITERATOR_HH
diff --git a/lily/include/chord-name.hh b/lily/include/chord-name.hh
index 7f06279902..bf4c6b62bf 100644
--- a/lily/include/chord-name.hh
+++ b/lily/include/chord-name.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef CHORD_NAME_HH
diff --git a/lily/include/chord-tremolo-iterator.hh b/lily/include/chord-tremolo-iterator.hh
index 6dca4c6ef8..fe89ed6616 100644
--- a/lily/include/chord-tremolo-iterator.hh
+++ b/lily/include/chord-tremolo-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef CHORD_TREMOLO_ITERATOR_HH
diff --git a/lily/include/clef.hh b/lily/include/clef.hh
index 4d6f3ea857..038d21f7aa 100644
--- a/lily/include/clef.hh
+++ b/lily/include/clef.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef CLEF_HH
diff --git a/lily/include/cluster.hh b/lily/include/cluster.hh
index 15dfca983f..a116bf0a9e 100644
--- a/lily/include/cluster.hh
+++ b/lily/include/cluster.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #ifndef CLUSTER_HH
diff --git a/lily/include/coherent-ligature-engraver.hh b/lily/include/coherent-ligature-engraver.hh
index 879f6ba5db..bacf575e43 100644
--- a/lily/include/coherent-ligature-engraver.hh
+++ b/lily/include/coherent-ligature-engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2003--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 #ifndef COHERENT_LIGATURE_ENGRAVER_HH
 #define COHERENT_LIGATURE_ENGRAVER_HH
diff --git a/lily/include/column-x-positions.hh b/lily/include/column-x-positions.hh
index 9a254a66f2..f95b865d7b 100644
--- a/lily/include/column-x-positions.hh
+++ b/lily/include/column-x-positions.hh
@@ -1,7 +1,7 @@
 /*
   column-x-positions.hh -- part of GNU LilyPond
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef COLUMN_X_POSITIONS_HH
diff --git a/lily/include/constrained-breaking.hh b/lily/include/constrained-breaking.hh
index ff60adf34c..157411a83c 100644
--- a/lily/include/constrained-breaking.hh
+++ b/lily/include/constrained-breaking.hh
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #ifndef CONSTRAINED_BREAKING_HH
diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh
index bceb123ee2..b5ea240b70 100644
--- a/lily/include/context-def.hh
+++ b/lily/include/context-def.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef CONTEXT_DEF_HH
diff --git a/lily/include/context-handle.hh b/lily/include/context-handle.hh
index 531affd148..91cc722270 100644
--- a/lily/include/context-handle.hh
+++ b/lily/include/context-handle.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef CONTEXT_HANDLE_HH
diff --git a/lily/include/context.hh b/lily/include/context.hh
index be2a4d79b1..31c436a936 100644
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef CONTEXT_HH
diff --git a/lily/include/custos.hh b/lily/include/custos.hh
index 90d35676aa..c6295f6ff1 100644
--- a/lily/include/custos.hh
+++ b/lily/include/custos.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2000--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #ifndef CUSTOS_HH
diff --git a/lily/include/dimension-cache.hh b/lily/include/dimension-cache.hh
index f3b7b88eaa..102139ac9b 100644
--- a/lily/include/dimension-cache.hh
+++ b/lily/include/dimension-cache.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef DIMENSION_CACHE_HH
diff --git a/lily/include/directional-element-interface.hh b/lily/include/directional-element-interface.hh
index d0f351ff30..6e55104c2a 100644
--- a/lily/include/directional-element-interface.hh
+++ b/lily/include/directional-element-interface.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef DIRECTIONAL_ELEMENT_HH
diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh
index 0d94b93594..ade16d2566 100644
--- a/lily/include/dot-column.hh
+++ b/lily/include/dot-column.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef DOT_COLUMN_HH
diff --git a/lily/include/dot-configuration.hh b/lily/include/dot-configuration.hh
index eba99d8c56..3b01eb3c70 100644
--- a/lily/include/dot-configuration.hh
+++ b/lily/include/dot-configuration.hh
@@ -5,7 +5,7 @@
   terms of the GNU General Public License.  LilyPond comes with NO
   WARRANTY.
 
-  (c) 2007--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2007--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef DOT_CONFIGURATION_HH
diff --git a/lily/include/dots.hh b/lily/include/dots.hh
index e9390a6adb..8d02561baf 100644
--- a/lily/include/dots.hh
+++ b/lily/include/dots.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef DOTS_HH
diff --git a/lily/include/duration.hh b/lily/include/duration.hh
index 3376f081c0..69cbba5e9d 100644
--- a/lily/include/duration.hh
+++ b/lily/include/duration.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef DURATION_HH
diff --git a/lily/include/engraver-group.hh b/lily/include/engraver-group.hh
index 2a75741f76..99a59d17ca 100644
--- a/lily/include/engraver-group.hh
+++ b/lily/include/engraver-group.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef ENGRAVER_GROUP_HH
diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index e5b6aef6a0..fe9482c7e0 100644
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef ENGRAVER_HH
diff --git a/lily/include/event-chord-iterator.hh b/lily/include/event-chord-iterator.hh
index 458e152e2f..e7d9bc3374 100644
--- a/lily/include/event-chord-iterator.hh
+++ b/lily/include/event-chord-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef EVENT_CHORD_ITERATOR_HH
diff --git a/lily/include/event-iterator.hh b/lily/include/event-iterator.hh
index fdc995cc9a..9e6570c7be 100644
--- a/lily/include/event-iterator.hh
+++ b/lily/include/event-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   	   Erik Sandberg <mandolaerik@gmail.com>
 */
 
diff --git a/lily/include/file-name-map.hh b/lily/include/file-name-map.hh
index 328b26c11b..78034c785e 100644
--- a/lily/include/file-name-map.hh
+++ b/lily/include/file-name-map.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef FILE_NAME_MAP_HH
diff --git a/lily/include/font-interface.hh b/lily/include/font-interface.hh
index 1fd400a4ce..de502aa2eb 100644
--- a/lily/include/font-interface.hh
+++ b/lily/include/font-interface.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef FONT_INTERFACE_HH
diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index f194dee35e..8346b4378a 100644
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef FONT_METRIC_HH
diff --git a/lily/include/freetype.hh b/lily/include/freetype.hh
index 3b6d830977..310e5893cd 100644
--- a/lily/include/freetype.hh
+++ b/lily/include/freetype.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef FREETYPE_HH
diff --git a/lily/include/global-context.hh b/lily/include/global-context.hh
index 3872ea0f3a..f291284d91 100644
--- a/lily/include/global-context.hh
+++ b/lily/include/global-context.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef GLOBAL_CONTEXT_HH
diff --git a/lily/include/global-ctor.hh b/lily/include/global-ctor.hh
index d15f28e934..1355ad006d 100644
--- a/lily/include/global-ctor.hh
+++ b/lily/include/global-ctor.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef GLOBAL_CTOR_HH
diff --git a/lily/include/grace-fixup.hh b/lily/include/grace-fixup.hh
index f9df29f47a..5f27d3f9d5 100644
--- a/lily/include/grace-fixup.hh
+++ b/lily/include/grace-fixup.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef GRACE_FIXUP_HH
diff --git a/lily/include/grace-iterator.hh b/lily/include/grace-iterator.hh
index 610a15e810..fd31117850 100644
--- a/lily/include/grace-iterator.hh
+++ b/lily/include/grace-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef NEWGRACE_ITERATOR_HH
diff --git a/lily/include/gregorian-ligature-engraver.hh b/lily/include/gregorian-ligature-engraver.hh
index e74c2cff2b..538d5aa17f 100644
--- a/lily/include/gregorian-ligature-engraver.hh
+++ b/lily/include/gregorian-ligature-engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2003--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 #ifndef GREGORIAN_LIGATURE_ENGRAVER_HH
 #define GREGORIAN_LIGATURE_ENGRAVER_HH
diff --git a/lily/include/gregorian-ligature.hh b/lily/include/gregorian-ligature.hh
index 51891ff626..e84ba67409 100644
--- a/lily/include/gregorian-ligature.hh
+++ b/lily/include/gregorian-ligature.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2003--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #ifndef GREGORIAN_LIGATURE_HH
diff --git a/lily/include/grid-line-interface.hh b/lily/include/grid-line-interface.hh
index 4204a874cd..9fd1caddd5 100644
--- a/lily/include/grid-line-interface.hh
+++ b/lily/include/grid-line-interface.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef GRID_LINE_INTERFACE_HH
diff --git a/lily/include/grob-array.hh b/lily/include/grob-array.hh
index 80b6b373cd..f94f2d33cf 100644
--- a/lily/include/grob-array.hh
+++ b/lily/include/grob-array.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef GROB_ARRAY_HH
diff --git a/lily/include/grob-info.hh b/lily/include/grob-info.hh
index e088d72166..30c8f558bf 100644
--- a/lily/include/grob-info.hh
+++ b/lily/include/grob-info.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef STAFFELEMINFO_HH
diff --git a/lily/include/grob-interface.hh b/lily/include/grob-interface.hh
index f9fd7a48fb..fcb67ceeaa 100644
--- a/lily/include/grob-interface.hh
+++ b/lily/include/grob-interface.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef INTERFACE_HH
diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index f8c8a04dae..66cc0530b7 100644
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1996--2008 Han-Wen Nienhuys
+  (c) 1996--2009 Han-Wen Nienhuys
 */
 
 #ifndef GROB_HH
diff --git a/lily/include/group-interface.hh b/lily/include/group-interface.hh
index 2a94f0783a..c3ef881105 100644
--- a/lily/include/group-interface.hh
+++ b/lily/include/group-interface.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef GROUP_INTERFACE_HH
diff --git a/lily/include/hairpin.hh b/lily/include/hairpin.hh
index ede5ab1aef..d59934335c 100644
--- a/lily/include/hairpin.hh
+++ b/lily/include/hairpin.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef HAIRPIN_HH
diff --git a/lily/include/hara-kiri-group-spanner.hh b/lily/include/hara-kiri-group-spanner.hh
index ec02a25b48..968257b4c6 100644
--- a/lily/include/hara-kiri-group-spanner.hh
+++ b/lily/include/hara-kiri-group-spanner.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef HARA_KIRI_VERTICAL_GROUP_SPANNER_HH
diff --git a/lily/include/horizontal-bracket.hh b/lily/include/horizontal-bracket.hh
index 4597c5e83a..eb2a579c40 100644
--- a/lily/include/horizontal-bracket.hh
+++ b/lily/include/horizontal-bracket.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef HORIZONTAL_BRACKET_HH
diff --git a/lily/include/identifier-smob.hh b/lily/include/identifier-smob.hh
index 2802e28102..783025e3e6 100644
--- a/lily/include/identifier-smob.hh
+++ b/lily/include/identifier-smob.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef IDENTIFIER_SMOB_HH
diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh
index f5d0d44a71..150c4d5c62 100644
--- a/lily/include/includable-lexer.hh
+++ b/lily/include/includable-lexer.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef INCLUDABLE_LEXER_HH
diff --git a/lily/include/input.hh b/lily/include/input.hh
index cc9d1bdee3..94e00527a2 100644
--- a/lily/include/input.hh
+++ b/lily/include/input.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef INPUT_HH
diff --git a/lily/include/item.hh b/lily/include/item.hh
index 1895910fb6..bfaa671ed5 100644
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #ifndef ITEM_HH
 #define ITEM_HH
diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh
index 628ac1f595..ca359ead57 100644
--- a/lily/include/keyword.hh
+++ b/lily/include/keyword.hh
@@ -1,7 +1,7 @@
 /*
   keyword.hh -- part of GNU LilyPond
 
-  (c) 1996--2008 Han-Wen Nienhuys
+  (c) 1996--2009 Han-Wen Nienhuys
 */
 
 #ifndef KEYWORD_HH
diff --git a/lily/include/least-squares.hh b/lily/include/least-squares.hh
index 0a2e2d1ffe..aa8bd84e46 100644
--- a/lily/include/least-squares.hh
+++ b/lily/include/least-squares.hh
@@ -1,7 +1,7 @@
 /*
   leastsquare.hh -- part of GNU LilyPond
 
-  (c) 1996--2008 Han-Wen Nienhuys
+  (c) 1996--2009 Han-Wen Nienhuys
 */
 
 #ifndef LEASTSQUARE_HH
diff --git a/lily/include/ligature-engraver.hh b/lily/include/ligature-engraver.hh
index f74cf6b6ce..92cc15940e 100644
--- a/lily/include/ligature-engraver.hh
+++ b/lily/include/ligature-engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #ifndef LIGATURE_ENGRAVER_HH
diff --git a/lily/include/lily-guile-macros.hh b/lily/include/lily-guile-macros.hh
index 495b86144f..fa5b8a08e4 100644
--- a/lily/include/lily-guile-macros.hh
+++ b/lily/include/lily-guile-macros.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef LILY_GUILE_MACROS_HH
diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 8c241aeb61..797d22d0a5 100644
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef LILY_GUILE_HH
diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index 284e5636c6..4062e3410f 100644
--- a/lily/include/lily-lexer.hh
+++ b/lily/include/lily-lexer.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MY_LILY_LEXER_HH
diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh
index c0943ccdba..79d586f1e9 100644
--- a/lily/include/lily-parser.hh
+++ b/lily/include/lily-parser.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef LILY_PARSER_HH
diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh
index bc4f4c4c03..40df1bfab3 100644
--- a/lily/include/lily-proto.hh
+++ b/lily/include/lily-proto.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef LILY_PROTO_HH
diff --git a/lily/include/lily-version.hh b/lily/include/lily-version.hh
index 7373779991..c6c93fce8f 100644
--- a/lily/include/lily-version.hh
+++ b/lily/include/lily-version.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef LILY_VERSION_HH
diff --git a/lily/include/lilypond-version.hh b/lily/include/lilypond-version.hh
index 82399dc436..3fd0f98fed 100644
--- a/lily/include/lilypond-version.hh
+++ b/lily/include/lilypond-version.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef LILYPOND_VERSION_HH
diff --git a/lily/include/line-interface.hh b/lily/include/line-interface.hh
index 04efea0cab..1103a6121e 100644
--- a/lily/include/line-interface.hh
+++ b/lily/include/line-interface.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef LINE_INTERFACE_HH
diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 8de676f262..8f0844df71 100644
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/include/ly-module.hh b/lily/include/ly-module.hh
index 48fe1239cd..8b76533f54 100644
--- a/lily/include/ly-module.hh
+++ b/lily/include/ly-module.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #ifndef LY_MODULE_HH
 #define LY_MODULE_HH
diff --git a/lily/include/ly-smobs.icc b/lily/include/ly-smobs.icc
index efbdb0647b..1cbd6ae389 100644
--- a/lily/include/ly-smobs.icc
+++ b/lily/include/ly-smobs.icc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef LY_SMOBS_ICC
diff --git a/lily/include/lyric-extender.hh b/lily/include/lyric-extender.hh
index b5410bbdb3..121774446e 100644
--- a/lily/include/lyric-extender.hh
+++ b/lily/include/lyric-extender.hh
@@ -2,7 +2,7 @@
 /*
   extender-spanner.hh -- part of GNU LilyPond
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef EXTENDER_SPANNER_HH
diff --git a/lily/include/lyric-hyphen.hh b/lily/include/lyric-hyphen.hh
index 59da2203aa..1551382e66 100644
--- a/lily/include/lyric-hyphen.hh
+++ b/lily/include/lyric-hyphen.hh
@@ -1,7 +1,7 @@
 /*
   hyphen-spanner.hh -- part of GNU LilyPond
 
-  (c) 1999--2008 Glen Prideaux <glenprideaux@iname.com>
+  (c) 1999--2009 Glen Prideaux <glenprideaux@iname.com>
 */
 
 #ifndef HYPHEN_SPANNER_HH
diff --git a/lily/include/main.hh b/lily/include/main.hh
index fbd2aa3da9..8b0df589a4 100644
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #ifndef MAIN_HH
 #define MAIN_HH
diff --git a/lily/include/measure-grouping-spanner.hh b/lily/include/measure-grouping-spanner.hh
index 8413b2eb33..a595ceece4 100644
--- a/lily/include/measure-grouping-spanner.hh
+++ b/lily/include/measure-grouping-spanner.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MEASURE_GROUPING_SPANNER_HH
diff --git a/lily/include/melody-spanner.hh b/lily/include/melody-spanner.hh
index d5cad57743..ba51c486ea 100644
--- a/lily/include/melody-spanner.hh
+++ b/lily/include/melody-spanner.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/include/mensural-ligature.hh b/lily/include/mensural-ligature.hh
index b1dc33e9e9..fdc4e30651 100644
--- a/lily/include/mensural-ligature.hh
+++ b/lily/include/mensural-ligature.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>,
+  (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>,
   Pal Benko <benkop@freestart.hu>
 */
 
diff --git a/lily/include/midi-chunk.hh b/lily/include/midi-chunk.hh
index ecd2fe2606..00cfb15675 100644
--- a/lily/include/midi-chunk.hh
+++ b/lily/include/midi-chunk.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2007--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2007--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index ae5d0998b8..15ca2f0292 100644
--- a/lily/include/midi-item.hh
+++ b/lily/include/midi-item.hh
@@ -1,7 +1,7 @@
 /*
   midi-item.hh -- declare Midi items
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef MIDI_ITEM_HH
diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh
index d5525295e2..6b9bd0c573 100644
--- a/lily/include/midi-stream.hh
+++ b/lily/include/midi-stream.hh
@@ -1,7 +1,7 @@
 /*
   midi-stream.hh -- declare Midi_stream
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef MIDI_STREAM_HH
diff --git a/lily/include/midi-walker.hh b/lily/include/midi-walker.hh
index 86e82a009a..2ee7cc9417 100644
--- a/lily/include/midi-walker.hh
+++ b/lily/include/midi-walker.hh
@@ -1,7 +1,7 @@
 /*
   midi-walker.hh -- declare Midi_walker
 
-  (c) 1996--2008 Han-Wen Nienhuys  <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys  <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/include/mingw-compatibility.hh b/lily/include/mingw-compatibility.hh
index 62d39c8a89..b32d047732 100644
--- a/lily/include/mingw-compatibility.hh
+++ b/lily/include/mingw-compatibility.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2005--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef MINGW_COMPATIBILITY_HH
diff --git a/lily/include/minimal-page-breaking.hh b/lily/include/minimal-page-breaking.hh
index 40c6a49150..35dbae9d14 100644
--- a/lily/include/minimal-page-breaking.hh
+++ b/lily/include/minimal-page-breaking.hh
@@ -5,7 +5,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2007--2008 Nicolas Sceaux <nicolas.sceaux@free.fr>
+  (c) 2007--2009 Nicolas Sceaux <nicolas.sceaux@free.fr>
 */
 
 #ifndef MINIMAL_PAGE_BREAKING_HH
diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index 088feb91c7..e33d836381 100644
--- a/lily/include/misc.hh
+++ b/lily/include/misc.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MISC_HH
diff --git a/lily/include/modified-font-metric.hh b/lily/include/modified-font-metric.hh
index 85882e86e8..101949674c 100644
--- a/lily/include/modified-font-metric.hh
+++ b/lily/include/modified-font-metric.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MODIFIED_FONT_METRIC_HH
diff --git a/lily/include/moment.hh b/lily/include/moment.hh
index ed7c7b0741..87bbdb9b31 100644
--- a/lily/include/moment.hh
+++ b/lily/include/moment.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MOMENT_HH
diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh
index 38b6eba132..ecc82974ac 100644
--- a/lily/include/multi-measure-rest.hh
+++ b/lily/include/multi-measure-rest.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef MULTI_MEASURE_REST_HH
diff --git a/lily/include/music-function.hh b/lily/include/music-function.hh
index cd720a9a49..f5d44ff365 100644
--- a/lily/include/music-function.hh
+++ b/lily/include/music-function.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MUSIC_FUNCTION_HH
diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 86b3bf379a..90d870833e 100644
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MUSIC_ITERATOR_HH
diff --git a/lily/include/music-output.hh b/lily/include/music-output.hh
index 7200e8725a..7ad760eb21 100644
--- a/lily/include/music-output.hh
+++ b/lily/include/music-output.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MUSIC_OUTPUT_HH
diff --git a/lily/include/music-sequence.hh b/lily/include/music-sequence.hh
index 2e54de4e6c..e01058bbfc 100644
--- a/lily/include/music-sequence.hh
+++ b/lily/include/music-sequence.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MUSIC_SEQUENCE_HH
diff --git a/lily/include/music-wrapper-iterator.hh b/lily/include/music-wrapper-iterator.hh
index 69188937c1..b36fd6a97a 100644
--- a/lily/include/music-wrapper-iterator.hh
+++ b/lily/include/music-wrapper-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MUSIC_WRAPPER_ITERATOR_HH
diff --git a/lily/include/music-wrapper.hh b/lily/include/music-wrapper.hh
index 94b2a3165e..4554a1d114 100644
--- a/lily/include/music-wrapper.hh
+++ b/lily/include/music-wrapper.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MUSIC_WRAPPER_HH
diff --git a/lily/include/music.hh b/lily/include/music.hh
index 9f244081d3..00d6f1962c 100644
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MUSIC_HH
diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh
index 0b2f29ebd9..b416f1d153 100644
--- a/lily/include/note-collision.hh
+++ b/lily/include/note-collision.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef COLLISION_HH
diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index edf8b969d1..d745d68613 100644
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef NOTE_COLUMN_HH
diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh
index de2d61a07d..6e759b1e9c 100644
--- a/lily/include/note-head.hh
+++ b/lily/include/note-head.hh
@@ -1,7 +1,7 @@
 /*
   note-head.hh -- part of GNU LilyPond
 
-  (c) 1996--2008 Han-Wen Nienhuys
+  (c) 1996--2009 Han-Wen Nienhuys
 */
 
 #ifndef NOTEHEAD_HH
diff --git a/lily/include/note-spacing.hh b/lily/include/note-spacing.hh
index 2a86ed27d6..f7d5dfb65f 100644
--- a/lily/include/note-spacing.hh
+++ b/lily/include/note-spacing.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef NOTE_SPACING_HH
diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh
index 315113a27f..475cc4c169 100644
--- a/lily/include/open-type-font.hh
+++ b/lily/include/open-type-font.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef OPEN_TYPE_FONT_HH
diff --git a/lily/include/optimal-page-breaking.hh b/lily/include/optimal-page-breaking.hh
index 6dd4433cbc..f47efa9f92 100644
--- a/lily/include/optimal-page-breaking.hh
+++ b/lily/include/optimal-page-breaking.hh
@@ -5,7 +5,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #ifndef OPTIMAL_PAGE_BREAKING_HH
diff --git a/lily/include/output-def.hh b/lily/include/output-def.hh
index c7c4248ea4..b683cc61f1 100644
--- a/lily/include/output-def.hh
+++ b/lily/include/output-def.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MUSIC_OUTPUT_DEF_HH
diff --git a/lily/include/page-breaking.hh b/lily/include/page-breaking.hh
index 249693a05c..0070a980ca 100644
--- a/lily/include/page-breaking.hh
+++ b/lily/include/page-breaking.hh
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #ifndef PAGE_BREAKING_HH
diff --git a/lily/include/page-marker.hh b/lily/include/page-marker.hh
index 08a6b267fe..12ddb8ccdf 100644
--- a/lily/include/page-marker.hh
+++ b/lily/include/page-marker.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2007--2008 Nicolas Sceaux <nicolas.sceaux@free.fr>
+  (c) 2007--2009 Nicolas Sceaux <nicolas.sceaux@free.fr>
 */
 
 #ifndef PAGE_MARKER_HH
diff --git a/lily/include/page-spacing-result.hh b/lily/include/page-spacing-result.hh
index 85c5f054c7..870fbda7e1 100644
--- a/lily/include/page-spacing-result.hh
+++ b/lily/include/page-spacing-result.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2007--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2007--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/include/page-spacing.hh b/lily/include/page-spacing.hh
index 846fe1be3e..96dba0ffa6 100644
--- a/lily/include/page-spacing.hh
+++ b/lily/include/page-spacing.hh
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #ifndef PAGE_SPACING_HH
diff --git a/lily/include/page-turn-page-breaking.hh b/lily/include/page-turn-page-breaking.hh
index 7c7ef8f47b..f5e7ada761 100644
--- a/lily/include/page-turn-page-breaking.hh
+++ b/lily/include/page-turn-page-breaking.hh
@@ -5,7 +5,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #ifndef PAGE_TURN_PAGE_BREAKING_HH
diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index dc93324da8..09f3ff7fad 100644
--- a/lily/include/pango-font.hh
+++ b/lily/include/pango-font.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PANGO_FONT_HH
diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh
index 9087fd7c17..90e816f66d 100644
--- a/lily/include/paper-book.hh
+++ b/lily/include/paper-book.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008  Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2004--2009  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 #ifndef PAPER_BOOK_HH
 #define PAPER_BOOK_HH
diff --git a/lily/include/paper-column-engraver.hh b/lily/include/paper-column-engraver.hh
index d5472175c8..d0b2a97bf1 100644
--- a/lily/include/paper-column-engraver.hh
+++ b/lily/include/paper-column-engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PAPER_COLUMN_ENGRAVER_HH
diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index cc2e2b90f1..719e7d5e49 100644
--- a/lily/include/paper-column.hh
+++ b/lily/include/paper-column.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PAPER_COLUMN_HH
diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index 03c8879a99..6779e1d942 100644
--- a/lily/include/paper-outputter.hh
+++ b/lily/include/paper-outputter.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PAPER_OUTPUTTER_HH
diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh
index 7ec8fe8ce3..b55fd90727 100644
--- a/lily/include/paper-score.hh
+++ b/lily/include/paper-score.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PAPER_SCORE_HH
diff --git a/lily/include/paper-system.hh b/lily/include/paper-system.hh
index 71785b32e5..25af72e025 100644
--- a/lily/include/paper-system.hh
+++ b/lily/include/paper-system.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008  Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2004--2009  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 #ifndef PAPER_SYSTEM_HH
 #define PAPER_SYSTEM_HH
diff --git a/lily/include/parse-scm.hh b/lily/include/parse-scm.hh
index a2b3d64998..f6bff19a65 100644
--- a/lily/include/parse-scm.hh
+++ b/lily/include/parse-scm.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PARSE_SCM_HH
diff --git a/lily/include/percent-repeat-item.hh b/lily/include/percent-repeat-item.hh
index fdc5e0b32f..5f23473745 100644
--- a/lily/include/percent-repeat-item.hh
+++ b/lily/include/percent-repeat-item.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PERCENT_REPEAT_ITEM_HH
diff --git a/lily/include/performance.hh b/lily/include/performance.hh
index 84bb13bdff..2553131f10 100644
--- a/lily/include/performance.hh
+++ b/lily/include/performance.hh
@@ -1,7 +1,7 @@
 /*
   performance.hh -- declare Performance
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef PERFORMANCE_HH
diff --git a/lily/include/performer-group.hh b/lily/include/performer-group.hh
index 55bbf69750..1a7d8087d8 100644
--- a/lily/include/performer-group.hh
+++ b/lily/include/performer-group.hh
@@ -1,7 +1,7 @@
 /*
   performer-group.hh -- declare Performer_group
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/include/performer.hh b/lily/include/performer.hh
index 3e7af70710..a94165a6bd 100644
--- a/lily/include/performer.hh
+++ b/lily/include/performer.hh
@@ -1,7 +1,7 @@
 /*
   performer.hh -- declare Performer
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/include/pitch-interval.hh b/lily/include/pitch-interval.hh
index a10aed5c9c..15df8ee933 100644
--- a/lily/include/pitch-interval.hh
+++ b/lily/include/pitch-interval.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PITCH_INTERVAL_HH
diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh
index 6e5465257c..42a76522f4 100644
--- a/lily/include/pitch.hh
+++ b/lily/include/pitch.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MUSICAL_PITCH_HH
diff --git a/lily/include/pointer-group-interface.hh b/lily/include/pointer-group-interface.hh
index 02799135e1..54b0e5b906 100644
--- a/lily/include/pointer-group-interface.hh
+++ b/lily/include/pointer-group-interface.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef POINTER_GROUP_INTERFACE_HH
diff --git a/lily/include/prob.hh b/lily/include/prob.hh
index 70c8b1abe0..069aa07924 100644
--- a/lily/include/prob.hh
+++ b/lily/include/prob.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008  Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2004--2009  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef PROPERTY_OBJECT_HH
diff --git a/lily/include/profile.hh b/lily/include/profile.hh
index 82c206c09c..53a7175eb7 100644
--- a/lily/include/profile.hh
+++ b/lily/include/profile.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PROFILE_HH
diff --git a/lily/include/program-option.hh b/lily/include/program-option.hh
index e3f42e2667..ec4103619e 100644
--- a/lily/include/program-option.hh
+++ b/lily/include/program-option.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2001--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 #ifndef SCM_OPTION_HH
 #define SCM_OPTION_HH
diff --git a/lily/include/property-iterator.hh b/lily/include/property-iterator.hh
index bd5f28c280..349929b7c5 100644
--- a/lily/include/property-iterator.hh
+++ b/lily/include/property-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PROPERTY_ITERATOR_HH
diff --git a/lily/include/protected-scm.hh b/lily/include/protected-scm.hh
index cb43afa729..d5a6463bc0 100644
--- a/lily/include/protected-scm.hh
+++ b/lily/include/protected-scm.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PROTECTED_SCM_HH
diff --git a/lily/include/relocate.hh b/lily/include/relocate.hh
index 6a76a22e2f..56ab9c5056 100644
--- a/lily/include/relocate.hh
+++ b/lily/include/relocate.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/include/repeated-music.hh b/lily/include/repeated-music.hh
index ee79243e6e..818d1c822f 100644
--- a/lily/include/repeated-music.hh
+++ b/lily/include/repeated-music.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef REPEATED_MUSIC_HH
diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index ce3765e655..1d25a2cda5 100644
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef REST_COLLISION_HH
diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index 138d34af2d..be31f3ae0f 100644
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef REST_HH
diff --git a/lily/include/rhythmic-head.hh b/lily/include/rhythmic-head.hh
index 164760a419..f625bfd6e0 100644
--- a/lily/include/rhythmic-head.hh
+++ b/lily/include/rhythmic-head.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef RHYTHMIC_HEAD_HH
diff --git a/lily/include/rod.hh b/lily/include/rod.hh
index ac00f8bcbb..d89b34f802 100644
--- a/lily/include/rod.hh
+++ b/lily/include/rod.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef ROD_HH
diff --git a/lily/include/scale.hh b/lily/include/scale.hh
index 7984a2d233..14be01b9d2 100644
--- a/lily/include/scale.hh
+++ b/lily/include/scale.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/include/scheme-listener.hh b/lily/include/scheme-listener.hh
index c50f5c42ae..d96c7d779a 100644
--- a/lily/include/scheme-listener.hh
+++ b/lily/include/scheme-listener.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Erik Sandberg  <mandolaerik@gmail.com>
+  (c) 2006--2009 Erik Sandberg  <mandolaerik@gmail.com>
 */
 
 #ifndef SCHEME_LISTENER_HH
diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh
index 976429682b..8bd8245b62 100644
--- a/lily/include/scm-hash.hh
+++ b/lily/include/scm-hash.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SCM_HASH_HH
diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh
index c65c5980bc..6afe354120 100644
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SCORE_ENGRAVER_HH
diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh
index 55f31b1123..b77890c08c 100644
--- a/lily/include/score-performer.hh
+++ b/lily/include/score-performer.hh
@@ -1,7 +1,7 @@
 /*
   score-performer.hh -- declare Score_performer
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/include/score.hh b/lily/include/score.hh
index 7d4fa0142b..ab6fcca3b5 100644
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SCORE_HH
diff --git a/lily/include/script-column.hh b/lily/include/script-column.hh
index e10936dc25..01c1b992a6 100644
--- a/lily/include/script-column.hh
+++ b/lily/include/script-column.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef Script_COLUMN_HH
diff --git a/lily/include/script-interface.hh b/lily/include/script-interface.hh
index 2aab348af5..2032b88296 100644
--- a/lily/include/script-interface.hh
+++ b/lily/include/script-interface.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SCRIPT_INTERFACE_HH
diff --git a/lily/include/self-alignment-interface.hh b/lily/include/self-alignment-interface.hh
index 877998965c..c42f2f4411 100644
--- a/lily/include/self-alignment-interface.hh
+++ b/lily/include/self-alignment-interface.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SELF_ALIGNMENT_INTERFACE_HH
diff --git a/lily/include/semi-tie-column.hh b/lily/include/semi-tie-column.hh
index 09722c8fae..8cc8063dfb 100644
--- a/lily/include/semi-tie-column.hh
+++ b/lily/include/semi-tie-column.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/include/semi-tie.hh b/lily/include/semi-tie.hh
index 106d9e93bc..8b0c936e7d 100644
--- a/lily/include/semi-tie.hh
+++ b/lily/include/semi-tie.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/include/separation-item.hh b/lily/include/separation-item.hh
index c3c99ee501..cba70b751c 100644
--- a/lily/include/separation-item.hh
+++ b/lily/include/separation-item.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SINGLE_MALT_GROUPING_ITEM_HH
diff --git a/lily/include/sequential-iterator.hh b/lily/include/sequential-iterator.hh
index 9cf145a8da..d53cf184c6 100644
--- a/lily/include/sequential-iterator.hh
+++ b/lily/include/sequential-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SEQUENTIAL_ITERATOR_HH
diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh
index a19e278847..0febd15be3 100644
--- a/lily/include/side-position-interface.hh
+++ b/lily/include/side-position-interface.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SIDE_POSITION_INTERFACE_HH
diff --git a/lily/include/simple-closure.hh b/lily/include/simple-closure.hh
index d5f507f455..2d4f83525f 100644
--- a/lily/include/simple-closure.hh
+++ b/lily/include/simple-closure.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/include/simple-music-iterator.hh b/lily/include/simple-music-iterator.hh
index fd6f5a2600..dc453a7505 100644
--- a/lily/include/simple-music-iterator.hh
+++ b/lily/include/simple-music-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SIMPLE_MUSIC_ITERATOR_HH
diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 935cb94c6c..a0d5f0704b 100644
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SIMPLE_SPACER_HH
diff --git a/lily/include/simultaneous-music-iterator.hh b/lily/include/simultaneous-music-iterator.hh
index 376c72ef1e..36698a1bde 100644
--- a/lily/include/simultaneous-music-iterator.hh
+++ b/lily/include/simultaneous-music-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SIMULTANEOUS_MUSIC_ITERATOR_HH
diff --git a/lily/include/skyline-pair.hh b/lily/include/skyline-pair.hh
index 08fe3c769e..c7f9182108 100644
--- a/lily/include/skyline-pair.hh
+++ b/lily/include/skyline-pair.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2008--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh
index b84a5de953..26830b92c9 100644
--- a/lily/include/skyline.hh
+++ b/lily/include/skyline.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #ifndef SKYLINE_HH
diff --git a/lily/include/slur-configuration.hh b/lily/include/slur-configuration.hh
index c798d38bca..850a4c0fa6 100644
--- a/lily/include/slur-configuration.hh
+++ b/lily/include/slur-configuration.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SLUR_CONFIGURATION_HH
diff --git a/lily/include/slur-score-parameters.hh b/lily/include/slur-score-parameters.hh
index 74a583ea01..a1d2b4a5da 100644
--- a/lily/include/slur-score-parameters.hh
+++ b/lily/include/slur-score-parameters.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/include/slur-scoring.hh b/lily/include/slur-scoring.hh
index 9cfa24acec..6c4dd5da2f 100644
--- a/lily/include/slur-scoring.hh
+++ b/lily/include/slur-scoring.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SLUR_SCORING_HH
diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 38bd195f9f..ef7d123090 100644
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SLUR_HH
diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh
index 3c760cf339..12819f28f5 100644
--- a/lily/include/smobs.hh
+++ b/lily/include/smobs.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SMOBS_HH
diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh
index 6b5ccacb04..2fd1bfc073 100644
--- a/lily/include/source-file.hh
+++ b/lily/include/source-file.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef SOURCE_FILE_HH
diff --git a/lily/include/sources.hh b/lily/include/sources.hh
index a964a7bf6a..32dbb2ad45 100644
--- a/lily/include/sources.hh
+++ b/lily/include/sources.hh
@@ -1,7 +1,7 @@
 /*
   sources.hh -- part of LilyPond
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef SOURCES_HH
diff --git a/lily/include/spaceable-grob.hh b/lily/include/spaceable-grob.hh
index 6a039bd833..71768b7cb3 100644
--- a/lily/include/spaceable-grob.hh
+++ b/lily/include/spaceable-grob.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SPACEABLE_GROB_HH
diff --git a/lily/include/spacing-interface.hh b/lily/include/spacing-interface.hh
index 0f62ac9b0f..32df5aeb3a 100644
--- a/lily/include/spacing-interface.hh
+++ b/lily/include/spacing-interface.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #include "grob-interface.hh"
 #include "lily-proto.hh"
diff --git a/lily/include/spacing-options.hh b/lily/include/spacing-options.hh
index 9a64f1c279..7f52d45820 100644
--- a/lily/include/spacing-options.hh
+++ b/lily/include/spacing-options.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh
index a993aae421..72848b898f 100644
--- a/lily/include/spacing-spanner.hh
+++ b/lily/include/spacing-spanner.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SPACING_SPANNER_HH
diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index 780531ac1c..d06b514afc 100644
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SPAN_BAR_HH
diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 94e98760c0..24176326d3 100644
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -1,7 +1,7 @@
 /*
   spanner.hh -- part of GNU LilyPond
 
-  (c) 1996--2008 Han-Wen Nienhuys
+  (c) 1996--2009 Han-Wen Nienhuys
 */
 
 #ifndef SPANNER_HH
diff --git a/lily/include/spring.hh b/lily/include/spring.hh
index f4f943f899..c379889adb 100644
--- a/lily/include/spring.hh
+++ b/lily/include/spring.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SPRING_HH
diff --git a/lily/include/staff-spacing.hh b/lily/include/staff-spacing.hh
index 4e02adc73d..593c59af23 100644
--- a/lily/include/staff-spacing.hh
+++ b/lily/include/staff-spacing.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef STAFF_SPACING_HH
diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh
index 29a46e6d8a..434ff92d80 100644
--- a/lily/include/staff-symbol-referencer.hh
+++ b/lily/include/staff-symbol-referencer.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef STAFF_SYMBOL_REFERENCER_HH
diff --git a/lily/include/staff-symbol.hh b/lily/include/staff-symbol.hh
index 3774ee3dc3..2529c00508 100644
--- a/lily/include/staff-symbol.hh
+++ b/lily/include/staff-symbol.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef STAFF_SYMBOL_HH
diff --git a/lily/include/stem-info.hh b/lily/include/stem-info.hh
index 887c49988d..1a67675d3a 100644
--- a/lily/include/stem-info.hh
+++ b/lily/include/stem-info.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef STEM_INFO_HH
diff --git a/lily/include/stem-tremolo.hh b/lily/include/stem-tremolo.hh
index ff86a83853..9782c753f2 100644
--- a/lily/include/stem-tremolo.hh
+++ b/lily/include/stem-tremolo.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef ABBREV_HH
diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index cbb8f69094..b404862ee9 100644
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -1,7 +1,7 @@
 /*
   stem.hh -- declare Stem
 
-  (c) 1996--2008 Han-Wen Nienhuys
+  (c) 1996--2009 Han-Wen Nienhuys
 */
 
 #ifndef STEM_HH
diff --git a/lily/include/stencil.hh b/lily/include/stencil.hh
index dfc40fc470..538d0acc04 100644
--- a/lily/include/stencil.hh
+++ b/lily/include/stencil.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #ifndef STENCIL_HH
 #define STENCIL_HH
diff --git a/lily/include/stream.hh b/lily/include/stream.hh
index 7e44506787..9c3ab818de 100644
--- a/lily/include/stream.hh
+++ b/lily/include/stream.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef STREAM_HH
diff --git a/lily/include/system-start-delimiter.hh b/lily/include/system-start-delimiter.hh
index 426d733036..0b966e4427 100644
--- a/lily/include/system-start-delimiter.hh
+++ b/lily/include/system-start-delimiter.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SYSTEM_START_DELIMITER_HH
diff --git a/lily/include/system.hh b/lily/include/system.hh
index e44db243cf..3fc805a959 100644
--- a/lily/include/system.hh
+++ b/lily/include/system.hh
@@ -1,7 +1,7 @@
 /*
   system.hh -- part of GNU LilyPond
 
-  (c) 1996--2008 Han-Wen Nienhuys
+  (c) 1996--2009 Han-Wen Nienhuys
 */
 
 #ifndef SYSTEM_HH
diff --git a/lily/include/text-interface.hh b/lily/include/text-interface.hh
index 4aa598cd15..fabcbbc516 100644
--- a/lily/include/text-interface.hh
+++ b/lily/include/text-interface.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/include/tie-column-format.hh b/lily/include/tie-column-format.hh
index 619949f617..48c5c42d8c 100644
--- a/lily/include/tie-column-format.hh
+++ b/lily/include/tie-column-format.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/include/tie-column.hh b/lily/include/tie-column.hh
index b42c7d54da..07afd51859 100644
--- a/lily/include/tie-column.hh
+++ b/lily/include/tie-column.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef TIE_COLUMN_HH
diff --git a/lily/include/tie-configuration.hh b/lily/include/tie-configuration.hh
index 7bc88d2762..01e32b6913 100644
--- a/lily/include/tie-configuration.hh
+++ b/lily/include/tie-configuration.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/include/tie-details.hh b/lily/include/tie-details.hh
index cd14c6cde0..ca24bd4599 100644
--- a/lily/include/tie-details.hh
+++ b/lily/include/tie-details.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/include/tie-formatting-problem.hh b/lily/include/tie-formatting-problem.hh
index 830ced2960..35aa73817c 100644
--- a/lily/include/tie-formatting-problem.hh
+++ b/lily/include/tie-formatting-problem.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/include/tie-specification.hh b/lily/include/tie-specification.hh
index 37e81dca54..68734adc22 100644
--- a/lily/include/tie-specification.hh
+++ b/lily/include/tie-specification.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2007--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2007--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/include/tie.hh b/lily/include/tie.hh
index bcce6c1265..172e02733f 100644
--- a/lily/include/tie.hh
+++ b/lily/include/tie.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef TIE_HH
diff --git a/lily/include/time-scaled-music-iterator.hh b/lily/include/time-scaled-music-iterator.hh
index 3f9982a899..379e202f03 100644
--- a/lily/include/time-scaled-music-iterator.hh
+++ b/lily/include/time-scaled-music-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>,
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>,
                  Erik Sandberg <mandolaerik@gmail.com>
 */
 
diff --git a/lily/include/time-signature.hh b/lily/include/time-signature.hh
index 07c4968b34..ac327d653c 100644
--- a/lily/include/time-signature.hh
+++ b/lily/include/time-signature.hh
@@ -1,7 +1,7 @@
 /*
   time_signature.hh -- declare Time_signature
 
-  (c) 1996--2008 Han-Wen Nienhuys
+  (c) 1996--2009 Han-Wen Nienhuys
 */
 
 #ifndef METER_HH
diff --git a/lily/include/timing-translator.hh b/lily/include/timing-translator.hh
index f30f596b91..8c85bcd1ef 100644
--- a/lily/include/timing-translator.hh
+++ b/lily/include/timing-translator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef TIMING_TRANSLATOR_HH
diff --git a/lily/include/translator-dispatch-list.hh b/lily/include/translator-dispatch-list.hh
index 43d5d13347..ba041f4af6 100644
--- a/lily/include/translator-dispatch-list.hh
+++ b/lily/include/translator-dispatch-list.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef TRANSLATOR_DISPATCH_LIST_HH
diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index b0e46d6f7f..237d0367c2 100644
--- a/lily/include/translator-group.hh
+++ b/lily/include/translator-group.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef TRANSLATOR_GROUP_HH
diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index 67b1e51bb1..f5065f50b2 100644
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef TRANSLATOR_HH
diff --git a/lily/include/translator.icc b/lily/include/translator.icc
index 775f5b9370..f6c815fabc 100644
--- a/lily/include/translator.icc
+++ b/lily/include/translator.icc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef TRANSLATOR_ICC
diff --git a/lily/include/tuplet-bracket.hh b/lily/include/tuplet-bracket.hh
index d3209a5d3a..794ac9524e 100644
--- a/lily/include/tuplet-bracket.hh
+++ b/lily/include/tuplet-bracket.hh
@@ -1,7 +1,7 @@
 /*
   tuplet-bracket.hh -- part of GNU LilyPond
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef Tuplet_bracket_HH
diff --git a/lily/include/type-swallow-translator.hh b/lily/include/type-swallow-translator.hh
index bc1cd21fe7..7e798e043d 100644
--- a/lily/include/type-swallow-translator.hh
+++ b/lily/include/type-swallow-translator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef TYPESWALLOW_TRANSLATOR_HH
diff --git a/lily/include/vaticana-ligature.hh b/lily/include/vaticana-ligature.hh
index 17eb237ee2..70b820f31b 100644
--- a/lily/include/vaticana-ligature.hh
+++ b/lily/include/vaticana-ligature.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2003--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #ifndef VATICANA_LIGATURE_HH
diff --git a/lily/include/volta-bracket.hh b/lily/include/volta-bracket.hh
index 6fc8daf223..413e6f6aa1 100644
--- a/lily/include/volta-bracket.hh
+++ b/lily/include/volta-bracket.hh
@@ -1,7 +1,7 @@
 /*
   volta-spanner.hh -- part of GNU LilyPond
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef VOLTA_SPANNER_HH
diff --git a/lily/input-scheme.cc b/lily/input-scheme.cc
index ad2cdbeaed..f313a3c27e 100644
--- a/lily/input-scheme.cc
+++ b/lily/input-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "std-string.hh"
diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index b6468bcb37..8affedab7c 100644
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "input.hh"
diff --git a/lily/input.cc b/lily/input.cc
index b6378af67f..084b1f3b64 100644
--- a/lily/input.cc
+++ b/lily/input.cc
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "input.hh"
diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index f38216f16e..d3ee12950e 100644
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/instrument-switch-engraver.cc b/lily/instrument-switch-engraver.cc
index 35a670d70e..a2830554ed 100644
--- a/lily/instrument-switch-engraver.cc
+++ b/lily/instrument-switch-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
 
 */
 
diff --git a/lily/item-scheme.cc b/lily/item-scheme.cc
index b8fab02528..6e540a327d 100644
--- a/lily/item-scheme.cc
+++ b/lily/item-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/item.cc b/lily/item.cc
index fc8028e7e4..e559f6abed 100644
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "item.hh"
diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index 45300af686..4ca7a39f2b 100644
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "bar-line.hh"
diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 1f35d780c4..327a53c042 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "audio-item.hh"
diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc
index 621412396f..58f0abd95f 100644
--- a/lily/key-signature-interface.cc
+++ b/lily/key-signature-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   keyplacement by Mats Bengtsson
 */
diff --git a/lily/laissez-vibrer-engraver.cc b/lily/laissez-vibrer-engraver.cc
index d25002b2bb..762d56d980 100644
--- a/lily/laissez-vibrer-engraver.cc
+++ b/lily/laissez-vibrer-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/least-squares.cc b/lily/least-squares.cc
index 492f5ff65d..2e9382f503 100644
--- a/lily/least-squares.cc
+++ b/lily/least-squares.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "least-squares.hh"
diff --git a/lily/ledger-line-engraver.cc b/lily/ledger-line-engraver.cc
index fe769b70bb..d5ba5da8c8 100644
--- a/lily/ledger-line-engraver.cc
+++ b/lily/ledger-line-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "pointer-group-interface.hh"
diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc
index 59ae3e55c9..ff2c4141a1 100644
--- a/lily/ledger-line-spanner.cc
+++ b/lily/ledger-line-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <map>
diff --git a/lily/lexer.ll b/lily/lexer.ll
index 8dd7667145..1ad6b667da 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -4,7 +4,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc
index 98bd944e33..3421896831 100644
--- a/lily/ligature-bracket-engraver.cc
+++ b/lily/ligature-bracket-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "international.hh"
diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index 16b2222ab5..c3830b4b02 100644
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "ligature-engraver.hh"
diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index ccc87807f0..3753a77795 100644
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
diff --git a/lily/lily-lexer-scheme.cc b/lily/lily-lexer-scheme.cc
index 80c7086e7a..fa783bd175 100644
--- a/lily/lily-lexer-scheme.cc
+++ b/lily/lily-lexer-scheme.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index 8b61e6c3cb..25d2c98c25 100644
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "lily-lexer.hh"
diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc
index d6a1c79ea6..7dfeab6057 100644
--- a/lily/lily-parser-scheme.cc
+++ b/lily/lily-parser-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <unistd.h>
diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 21e2946d19..eb59e7bda3 100644
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/lily-version.cc b/lily/lily-version.cc
index 598943c2b3..2163e0b472 100644
--- a/lily/lily-version.cc
+++ b/lily/lily-version.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "lily-version.hh"
diff --git a/lily/lilypond-version.cc b/lily/lilypond-version.cc
index 35c2afb1d2..aa192a30c7 100644
--- a/lily/lilypond-version.cc
+++ b/lily/lilypond-version.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <ctype.h>
diff --git a/lily/lilypond.rc.in b/lily/lilypond.rc.in
index 250d893bdf..e85138e5a1 100644
--- a/lily/lilypond.rc.in
+++ b/lily/lilypond.rc.in
@@ -20,7 +20,7 @@ VS_VERSION_INFO VERSIONINFO
 	VALUE "FileDescription", "LilyPond"
 	VALUE "FileVersion", "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_LEVEL@.@BUILD_VERSION@"
 	VALUE "InternalName", "LilyPond@"
-	VALUE "LegalCopyright ", "Copyright (C) 1995--2008  Han-Wen Nienhuys and Jan Nieuwenhuizen, and others."
+	VALUE "LegalCopyright ", "Copyright (C) 1995--2009  Han-Wen Nienhuys and Jan Nieuwenhuizen, and others."
 	VALUE "OriginalFilename", "lilypond.exe"
 	VALUE "ProductName", "LilyPond"
 	VALUE "ProductVersion", "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_LEVEL@"
diff --git a/lily/line-interface.cc b/lily/line-interface.cc
index 3d1bb02d6f..2fa6d61bb7 100644
--- a/lily/line-interface.cc
+++ b/lily/line-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "line-interface.hh"
diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index bb9b232744..d9c5f56835 100644
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "align-interface.hh"
diff --git a/lily/lookup.cc b/lily/lookup.cc
index 4cef41f061..014d2ec8ab 100644
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index eb73cd68cd..ceb26ad85d 100644
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "lily-guile.hh"
diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index b75d309f2a..8b5a4b4992 100644
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "dispatcher.hh"
diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index c290ee2dd4..c47a6e3a99 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music.hh"
diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 1c206a81fd..22449890d9 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index d543b27ada..5e254b45ee 100644
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -2,7 +2,7 @@
   lyric-extender.cc -- implement Lyric_extender
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys
 */
 
diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc
index 2c3816d1d4..3b2dab06f1 100644
--- a/lily/lyric-hyphen.cc
+++ b/lily/lyric-hyphen.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2003--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "lyric-hyphen.hh"
diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index 32e874ee7e..b318ab90fe 100644
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "audio-item.hh"
diff --git a/lily/main.cc b/lily/main.cc
index ab25e953ce..2d293343c5 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "main.hh"
@@ -219,8 +219,8 @@ dir_info (FILE *out)
 static void
 copyright ()
 {
-  printf (_f ("Copyright (c) %s by\n%s  and others.",
-	      "1996--2008",
+  /* Do not update the copyright years here, run grand-replace.sh.  */
+  printf (_f ("Copyright (c) %s by\n%s  and others.", "1996--2009",
 	      AUTHORS).c_str ());
   printf ("\n");
 }
diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 8cd1b80515..76977f91c6 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <cctype>
diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index addbc5f454..03192a1def 100644
--- a/lily/measure-grouping-engraver.cc
+++ b/lily/measure-grouping-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "warn.hh"
diff --git a/lily/measure-grouping-spanner.cc b/lily/measure-grouping-spanner.cc
index 48d00ded04..1e407d17cc 100644
--- a/lily/measure-grouping-spanner.cc
+++ b/lily/measure-grouping-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "measure-grouping-spanner.hh"
diff --git a/lily/melody-engraver.cc b/lily/melody-engraver.cc
index 9957185f04..3dc1d28448 100644
--- a/lily/melody-engraver.cc
+++ b/lily/melody-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 
diff --git a/lily/melody-spanner.cc b/lily/melody-spanner.cc
index 826364bb7e..2dbcd56cab 100644
--- a/lily/melody-spanner.cc
+++ b/lily/melody-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc
index 906ace106c..249506ed34 100644
--- a/lily/mensural-ligature-engraver.cc
+++ b/lily/mensural-ligature-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>,
+  (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>,
   Pal Benko <benkop@freestart.hu>
 */
 
diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc
index 1670de902b..4f9e64c961 100644
--- a/lily/mensural-ligature.cc
+++ b/lily/mensural-ligature.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>,
+  (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>,
   Pal Benko <benkop@freestart.hu>
 */
 
diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index 6191407a5a..aa75bcb993 100644
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <cctype>
diff --git a/lily/midi-chunk.cc b/lily/midi-chunk.cc
index ffd267425a..d6ad38e315 100644
--- a/lily/midi-chunk.cc
+++ b/lily/midi-chunk.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2007--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2007--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index b2f1231ae1..b6838215f5 100644
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "midi-item.hh"
diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 4c1aa56423..8b84798f62 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "midi-stream.hh"
diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc
index 97a70252b3..70d3e31fd6 100644
--- a/lily/midi-walker.cc
+++ b/lily/midi-walker.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/minimal-page-breaking.cc b/lily/minimal-page-breaking.cc
index f26b4b5886..4588dddc3a 100644
--- a/lily/minimal-page-breaking.cc
+++ b/lily/minimal-page-breaking.cc
@@ -5,7 +5,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2007--2008 Nicolas Sceaux <nicolas.sceaux@free.fr>
+  (c) 2007--2009 Nicolas Sceaux <nicolas.sceaux@free.fr>
 */
 
 #include "international.hh"
diff --git a/lily/misc.cc b/lily/misc.cc
index 856f34038e..ee55a00c7e 100644
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc
index ac2c88c68c..6972b44f92 100644
--- a/lily/modified-font-metric.cc
+++ b/lily/modified-font-metric.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #include <cctype>
 using namespace std;
diff --git a/lily/module-scheme.cc b/lily/module-scheme.cc
index 627504d922..8938229e59 100644
--- a/lily/module-scheme.cc
+++ b/lily/module-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "ly-module.hh"
diff --git a/lily/moment-scheme.cc b/lily/moment-scheme.cc
index f4c5a91e27..591fc38adc 100644
--- a/lily/moment-scheme.cc
+++ b/lily/moment-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "moment.hh"
diff --git a/lily/moment.cc b/lily/moment.cc
index 30941e31d7..3ca7e520db 100644
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "moment.hh"
diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index 9391aac0b8..fa84af9c4b 100644
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -1,7 +1,7 @@
 /*
   multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index d94518db3a..7ce96126f4 100644
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "multi-measure-rest.hh"
diff --git a/lily/music-function.cc b/lily/music-function.cc
index 109f6d019b..d093f25a95 100644
--- a/lily/music-function.cc
+++ b/lily/music-function.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music-function.hh"
diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 99972ab6d6..057d4f01eb 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 
diff --git a/lily/music-output.cc b/lily/music-output.cc
index a8dd05deff..6a613feb5e 100644
--- a/lily/music-output.cc
+++ b/lily/music-output.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music-output.hh"
diff --git a/lily/music-scheme.cc b/lily/music-scheme.cc
index b8b49e0fd2..c90acd5f17 100644
--- a/lily/music-scheme.cc
+++ b/lily/music-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music.hh"
diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index c57e18353a..70a2eaa862 100644
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music-sequence.hh"
diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index c96764a247..304497a489 100644
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music-wrapper-iterator.hh"
diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 7635c731f6..3e6a7d7c0b 100644
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music-wrapper.hh"
diff --git a/lily/music.cc b/lily/music.cc
index 9d87d3bec5..f96d424b21 100644
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music.hh"
diff --git a/lily/new-dynamic-engraver.cc b/lily/new-dynamic-engraver.cc
index be395fa2d1..5258230166 100644
--- a/lily/new-dynamic-engraver.cc
+++ b/lily/new-dynamic-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2008--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index cd9532206d..1cd7cd10e2 100644
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index 7ac359b36f..6946eac2fa 100644
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-collision.hh"
diff --git a/lily/note-column.cc b/lily/note-column.cc
index 76bde1c3d6..bb1cd21df1 100644
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-column.hh"
diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index c14d06fffe..59151f6950 100644
--- a/lily/note-head-line-engraver.cc
+++ b/lily/note-head-line-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
diff --git a/lily/note-head-scheme.cc b/lily/note-head-scheme.cc
index 4fc9314977..f3cd1f3d34 100644
--- a/lily/note-head-scheme.cc
+++ b/lily/note-head-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
 
 */
 
diff --git a/lily/note-head.cc b/lily/note-head.cc
index 17db761f2f..1a9196ecca 100644
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-head.hh"
diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index e3fce707fa..426eb7d844 100644
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,7 +1,7 @@
 /*
   note-heads-engraver.cc -- part of GNU LilyPond
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 7acf90e419..1e1e01acb1 100644
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 7b664fd91e..0a9f79f08a 100644
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
diff --git a/lily/note-spacing-engraver.cc b/lily/note-spacing-engraver.cc
index 8a5f5c7944..1859344b94 100644
--- a/lily/note-spacing-engraver.cc
+++ b/lily/note-spacing-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc
index 2cc5c70ae2..24e79cd313 100644
--- a/lily/note-spacing.cc
+++ b/lily/note-spacing.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-spacing.hh"
diff --git a/lily/open-type-font-scheme.cc b/lily/open-type-font-scheme.cc
index 79fe34dcd6..2d33394fc8 100644
--- a/lily/open-type-font-scheme.cc
+++ b/lily/open-type-font-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "modified-font-metric.hh"
diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index 771a875610..3d007be811 100644
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "open-type-font.hh"
diff --git a/lily/optimal-page-breaking.cc b/lily/optimal-page-breaking.cc
index c5a6133563..44e96602e8 100644
--- a/lily/optimal-page-breaking.cc
+++ b/lily/optimal-page-breaking.cc
@@ -5,7 +5,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #include "international.hh"
diff --git a/lily/ottava-bracket.cc b/lily/ottava-bracket.cc
index 70757d9158..3ea133e483 100644
--- a/lily/ottava-bracket.cc
+++ b/lily/ottava-bracket.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "text-interface.hh"
diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index cfb88a2c3a..f4a8a8b91c 100644
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys
+  (c) 2000--2009 Han-Wen Nienhuys
 */
 
 #include "protected-scm.hh"
diff --git a/lily/output-def-scheme.cc b/lily/output-def-scheme.cc
index 7a44a0d082..f3b7a1cf0a 100644
--- a/lily/output-def-scheme.cc
+++ b/lily/output-def-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "output-def.hh"
diff --git a/lily/output-def.cc b/lily/output-def.cc
index 212731bd5f..f9fbda9fb6 100644
--- a/lily/output-def.cc
+++ b/lily/output-def.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "output-def.hh"
diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index 12a19539b4..d7f075d321 100644
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   
  */
 
diff --git a/lily/page-breaking-scheme.cc b/lily/page-breaking-scheme.cc
index 5e4dc58fa9..e258fe6856 100644
--- a/lily/page-breaking-scheme.cc
+++ b/lily/page-breaking-scheme.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #include "paper-book.hh"
diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index 33d43fda08..a5fe6278d0 100644
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #include "page-breaking.hh"
diff --git a/lily/page-marker-scheme.cc b/lily/page-marker-scheme.cc
index ec5a31d29f..c0563c87d4 100644
--- a/lily/page-marker-scheme.cc
+++ b/lily/page-marker-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2007--2008 Nicolas Sceaux <nicolas.sceaux@free.fr>
+  (c) 2007--2009 Nicolas Sceaux <nicolas.sceaux@free.fr>
 */
 
 #include "page-marker.hh"
diff --git a/lily/page-marker.cc b/lily/page-marker.cc
index 7bf691e295..08d58cd60c 100644
--- a/lily/page-marker.cc
+++ b/lily/page-marker.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2007--2008 Nicolas Sceaux <nicolas.sceaux@free.fr>
+  (c) 2007--2009 Nicolas Sceaux <nicolas.sceaux@free.fr>
 */
 
 #include "page-marker.hh"
diff --git a/lily/page-spacing-result.cc b/lily/page-spacing-result.cc
index 02cb009b43..f3d5b21e22 100644
--- a/lily/page-spacing-result.cc
+++ b/lily/page-spacing-result.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2007--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2007--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/page-spacing.cc b/lily/page-spacing.cc
index 97ff0e45d1..71e51fa685 100644
--- a/lily/page-spacing.cc
+++ b/lily/page-spacing.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #include "page-spacing.hh"
diff --git a/lily/page-turn-engraver.cc b/lily/page-turn-engraver.cc
index e5055f1da2..82cb4dd1a9 100644
--- a/lily/page-turn-engraver.cc
+++ b/lily/page-turn-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #include "engraver.hh"
diff --git a/lily/page-turn-page-breaking.cc b/lily/page-turn-page-breaking.cc
index e239cc2f28..97b58467b6 100644
--- a/lily/page-turn-page-breaking.cc
+++ b/lily/page-turn-page-breaking.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #include "page-turn-page-breaking.hh"
diff --git a/lily/pango-font-scheme.cc b/lily/pango-font-scheme.cc
index 2c6f13cc07..b8772bc4c9 100644
--- a/lily/pango-font-scheme.cc
+++ b/lily/pango-font-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #define PANGO_ENABLE_BACKEND // ugh, why necessary?
diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index f6456dd826..d02b63ae7a 100644
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #define PANGO_ENABLE_BACKEND // ugh, why necessary?
diff --git a/lily/pango-select-scheme.cc b/lily/pango-select-scheme.cc
index a044b1cd2c..e8f97d26a4 100644
--- a/lily/pango-select-scheme.cc
+++ b/lily/pango-select-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "config.hh"
diff --git a/lily/pango-select.cc b/lily/pango-select.cc
index 4637fa26b6..29686d44dd 100644
--- a/lily/pango-select.cc
+++ b/lily/pango-select.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "dimensions.hh"
diff --git a/lily/paper-book-scheme.cc b/lily/paper-book-scheme.cc
index 8c2e493e0e..6714a46239 100644
--- a/lily/paper-book-scheme.cc
+++ b/lily/paper-book-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-book.hh"
diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index 7b43799e99..4307bb03ea 100644
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2004--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "paper-book.hh"
diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index df3723fb79..06dd38d9b5 100644
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-column-engraver.hh"
diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index c6b7c9c85c..a6e7fa6a35 100644
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-column.hh"
diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index d0aa8fa88e..0e6362a4d4 100644
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "dimensions.hh"
diff --git a/lily/paper-outputter-scheme.cc b/lily/paper-outputter-scheme.cc
index bc89a86016..15b9599a4f 100644
--- a/lily/paper-outputter-scheme.cc
+++ b/lily/paper-outputter-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-outputter.hh"
diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index d3b99055e9..6aedacca91 100644
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/paper-score-scheme.cc b/lily/paper-score-scheme.cc
index ab855e320a..6f26769f47 100644
--- a/lily/paper-score-scheme.cc
+++ b/lily/paper-score-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-score.hh"
diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index b4252c8296..7ae0854e98 100644
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-score.hh"
diff --git a/lily/paper-system-scheme.cc b/lily/paper-system-scheme.cc
index 6935110611..137cef0c5c 100644
--- a/lily/paper-system-scheme.cc
+++ b/lily/paper-system-scheme.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2008--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/paper-system.cc b/lily/paper-system.cc
index 06a878d62b..6653b6ddc7 100644
--- a/lily/paper-system.cc
+++ b/lily/paper-system.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2004--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "paper-system.hh"
diff --git a/lily/parenthesis-engraver.cc b/lily/parenthesis-engraver.cc
index e7f83de80c..d3382070e0 100644
--- a/lily/parenthesis-engraver.cc
+++ b/lily/parenthesis-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc
index 409ba88945..d1dad300e3 100644
--- a/lily/parse-scm.cc
+++ b/lily/parse-scm.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "parse-scm.hh"
diff --git a/lily/parser.yy b/lily/parser.yy
index 83eaf89ec2..462a58de40 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc
index be9564685d..23c4bf358d 100644
--- a/lily/part-combine-engraver.cc
+++ b/lily/part-combine-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc
index fdbb0b1b91..5f35a0bba4 100644
--- a/lily/part-combine-iterator.cc
+++ b/lily/part-combine-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys
+  (c) 2004--2009 Han-Wen Nienhuys
 */
 
 #include "context.hh"
diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc
index dff1f5aae4..ea77254cfc 100644
--- a/lily/percent-repeat-engraver.cc
+++ b/lily/percent-repeat-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>, Erik Sandberg <mandolaerik@gmail.com>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>, Erik Sandberg <mandolaerik@gmail.com>
 */
 
 
diff --git a/lily/percent-repeat-item.cc b/lily/percent-repeat-item.cc
index af527a8794..ae8910fca4 100644
--- a/lily/percent-repeat-item.cc
+++ b/lily/percent-repeat-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "percent-repeat-item.hh"
diff --git a/lily/percent-repeat-iterator.cc b/lily/percent-repeat-iterator.cc
index 5573dc7609..7f3115c0a1 100644
--- a/lily/percent-repeat-iterator.cc
+++ b/lily/percent-repeat-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
                   Erik Sandberg <mandolaerik@gmail.com>
 */
 
diff --git a/lily/performance-scheme.cc b/lily/performance-scheme.cc
index fafd1d9db6..f69bb7bb62 100644
--- a/lily/performance-scheme.cc
+++ b/lily/performance-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "performance.hh"
diff --git a/lily/performance.cc b/lily/performance.cc
index 4fa167d826..46180d0e5d 100644
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performance.hh"
diff --git a/lily/performer-group.cc b/lily/performer-group.cc
index d4ead0648a..1f9e9aee12 100644
--- a/lily/performer-group.cc
+++ b/lily/performer-group.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/performer.cc b/lily/performer.cc
index fa85fca91e..357e0df8d1 100644
--- a/lily/performer.cc
+++ b/lily/performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/pfb.cc b/lily/pfb.cc
index e699156fc9..3d66f3e8a9 100644
--- a/lily/pfb.cc
+++ b/lily/pfb.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cstdlib>
diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index ef0b4287df..4cd0c6ee10 100644
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/piano-pedal-align-engraver.cc b/lily/piano-pedal-align-engraver.cc
index 2f1db23648..c82cb7eae1 100644
--- a/lily/piano-pedal-align-engraver.cc
+++ b/lily/piano-pedal-align-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/piano-pedal-bracket.cc b/lily/piano-pedal-bracket.cc
index 75771247ff..a61474e51b 100644
--- a/lily/piano-pedal-bracket.cc
+++ b/lily/piano-pedal-bracket.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2003--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "stencil.hh"
diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index 29ca669ca2..fd141ed371 100644
--- a/lily/piano-pedal-engraver.cc
+++ b/lily/piano-pedal-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>,
+  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>,
                  Erik Sandberg <mandolaerik@gmail.com>
 
   Chris Jackson <chris@fluffhouse.org.uk> - extended to support
diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc
index 2552e6a32f..cb5919cabc 100644
--- a/lily/piano-pedal-performer.cc
+++ b/lily/piano-pedal-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
diff --git a/lily/pitch-interval.cc b/lily/pitch-interval.cc
index 8c70cf4a09..d06d8af713 100644
--- a/lily/pitch-interval.cc
+++ b/lily/pitch-interval.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "pitch-interval.hh"
diff --git a/lily/pitch-scheme.cc b/lily/pitch-scheme.cc
index b059c6f1ab..1ecc247ed1 100644
--- a/lily/pitch-scheme.cc
+++ b/lily/pitch-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "pitch.hh"
@@ -25,10 +25,11 @@ LY_DEFINE (ly_pitch_transpose, "ly:pitch-transpose",
 LY_DEFINE (ly_make_pitch, "ly:make-pitch",
 	   2, 1, 0, (SCM octave, SCM note, SCM alter),
 	   "@var{octave} is specified by an integer, zero for the octave"
-	   " containing middle@tie{}C.  @var{note} is a number from 0"
-	   " to@tie{}6, with 0 corresponding to pitch@tie{}C and 6"
-	   " corresponding to pitch@tie{}B.  @var{alter} is a rational"
-	   " number of whole tones for alteration.")
+	   " containing middle@tie{}C. @var{note} is a number indexing the"
+	   " global default scale, with 0 corresponding to pitch@tie{}C"
+	   " and 6 usually corresponding to pitch@tie{}B. @var{alter} is" 
+	   " a rational number of 200-cent whole tones for alteration.")
+
 {
   LY_ASSERT_TYPE (scm_is_integer, octave, 1);
   LY_ASSERT_TYPE (scm_is_integer, note, 2);
diff --git a/lily/pitch-squash-engraver.cc b/lily/pitch-squash-engraver.cc
index c12f9224a7..764566faab 100644
--- a/lily/pitch-squash-engraver.cc
+++ b/lily/pitch-squash-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/pitch.cc b/lily/pitch.cc
index 90d50d46e2..590d13872f 100644
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "pitch.hh"
diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index 817ae68724..18482faabd 100644
--- a/lily/pitched-trill-engraver.cc
+++ b/lily/pitched-trill-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/pointer-group-interface.cc b/lily/pointer-group-interface.cc
index 537bc4b964..a8ebb09ffc 100644
--- a/lily/pointer-group-interface.cc
+++ b/lily/pointer-group-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "pointer-group-interface.hh"
diff --git a/lily/prob-scheme.cc b/lily/prob-scheme.cc
index be021afa4f..cc74f8ada1 100644
--- a/lily/prob-scheme.cc
+++ b/lily/prob-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "prob.hh"
diff --git a/lily/prob.cc b/lily/prob.cc
index 9d75d744f3..4d11d193f1 100644
--- a/lily/prob.cc
+++ b/lily/prob.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2004--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "prob.hh"
diff --git a/lily/profile.cc b/lily/profile.cc
index 02c7da9e9b..856060e8bf 100644
--- a/lily/profile.cc
+++ b/lily/profile.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "profile.hh"
diff --git a/lily/program-option-scheme.cc b/lily/program-option-scheme.cc
index d68af75ab1..1e03c5f951 100644
--- a/lily/program-option-scheme.cc
+++ b/lily/program-option-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "program-option.hh"
@@ -35,11 +35,14 @@ bool profile_property_accesses = false;
   crash if internally the wrong type is used for a grob property.
 */
 bool do_internal_type_checking_global;
-bool strict_infinity_checking = false; 
+bool strict_infinity_checking = false;
 
 static SCM option_hash;
 
-void internal_set_option (SCM var, SCM val)
+
+void
+internal_set_option (SCM var,
+		     SCM val)
 {
   if (0)
     ;
@@ -76,7 +79,7 @@ void internal_set_option (SCM var, SCM val)
   else if (var == ly_symbol2scm ("old-relative"))
     {
       lily_1_8_relative = to_boolean (val);
-      /*  Needs to be reset for each file that uses this option.  */
+      /* Needs to be reset for each file that uses this option. */
       lily_1_8_compatibility_used = to_boolean (val);
       val = scm_from_bool (to_boolean (val));
     }
@@ -111,14 +114,10 @@ void internal_set_option (SCM var, SCM val)
       val = scm_from_bool (to_boolean (val));
     }
 
-
   scm_hashq_set_x (option_hash, var, val);
-
-
 }
 
 
-
 ssize const HELP_INDENT = 30;
 ssize const INDENT = 2;
 ssize const SEPARATION = 5;
@@ -130,7 +129,7 @@ static string
 get_help_string ()
 {
   SCM alist = ly_hash2alist (option_hash);
-  SCM convertor = ly_lily_module_constant ("scm->string");
+  SCM converter = ly_lily_module_constant ("scm->string");
 
   vector<string> opts;
 
@@ -138,23 +137,21 @@ get_help_string ()
     {
       SCM sym = scm_caar (s);
       SCM val = scm_cdar (s);
-      string opt_spec
-	= String_convert::char_string (' ', INDENT)
-	+ ly_symbol2string (sym)
-	+ " ("
-	+ ly_scm2string (scm_call_1 (convertor, val))
-	+ ")";
+      string opt_spec = String_convert::char_string (' ', INDENT)
+			+ ly_symbol2string (sym)
+			+ " ("
+			+ ly_scm2string (scm_call_1 (converter, val))
+			+ ")";
 
       if (opt_spec.length () + SEPARATION > HELP_INDENT)
-	{
-	  opt_spec += "\n"
-	    + String_convert::char_string (' ', HELP_INDENT);
-	}
+	opt_spec += "\n" + String_convert::char_string (' ', HELP_INDENT);
       else
-	opt_spec += String_convert::char_string (' ', HELP_INDENT - opt_spec.length ());
+	opt_spec += String_convert::char_string (' ', HELP_INDENT
+						      - opt_spec.length ());
 
       SCM opt_help_scm
-	= scm_object_property (sym, ly_symbol2scm ("program-option-documentation"));
+	= scm_object_property (sym,
+			       ly_symbol2scm ("program-option-documentation"));
       string opt_help = ly_scm2string (opt_help_scm);
       replace_all (&opt_help,
 		   string ("\n"),
@@ -164,12 +161,10 @@ get_help_string ()
       opts.push_back (opt_spec + opt_help + "\n");
     }
 
-  string help ("Options supported by ly:set-option\n\n");
+  string help ("Options supported by `ly:set-option':\n\n");
   vector_sort (opts, less<string> ());
   for (vsize i = 0; i < opts.size (); i++)
     help += opts[i];
-
-  help += string ("\n");
   return help;
 }
 
@@ -178,19 +173,18 @@ LY_DEFINE (ly_option_usage, "ly:option-usage", 0, 0, 0, (),
 	   "Print @code{ly:set-option} usage.")
 {
   string help = get_help_string ();
-  progress_indication (help);
+  puts (help.c_str());
 
   return SCM_UNSPECIFIED;
 }
 
+
 LY_DEFINE (ly_add_option, "ly:add-option", 3, 0, 0,
 	   (SCM sym, SCM val, SCM description),
 	   "Add a program option @var{sym} with default @var{val}.")
 {
   if (!option_hash)
-    {
-      option_hash = scm_permanent_object (scm_c_make_hash_table (11));
-    }
+    option_hash = scm_permanent_object (scm_c_make_hash_table (11));
   LY_ASSERT_TYPE (ly_is_symbol, sym, 1);
   LY_ASSERT_TYPE (scm_is_string, description, 3);
 
@@ -202,6 +196,7 @@ LY_DEFINE (ly_add_option, "ly:add-option", 3, 0, 0,
   return SCM_UNSPECIFIED;
 }
 
+
 LY_DEFINE (ly_set_option, "ly:set-option", 1, 1, 0, (SCM var, SCM val),
 	   "Set a program option.")
 {
@@ -213,7 +208,7 @@ LY_DEFINE (ly_set_option, "ly:set-option", 1, 1, 0, (SCM var, SCM val),
   string varstr = ly_scm2string (scm_symbol_to_string (var));
   if (varstr.substr (0, 3) == string ("no-"))
     {
-      var = ly_symbol2scm (varstr.substr (3, varstr.length () -3).c_str ());
+      var = ly_symbol2scm (varstr.substr (3, varstr.length () - 3).c_str ());
       val = scm_from_bool (!to_boolean (val));
     }
 
@@ -225,18 +220,21 @@ LY_DEFINE (ly_set_option, "ly:set-option", 1, 1, 0, (SCM var, SCM val),
   return SCM_UNSPECIFIED;
 }
 
+
 LY_DEFINE (ly_command_line_options, "ly:command-line-options", 0, 0, 0, (),
 	   "The Scheme options specified on command-line with @option{-d}.")
 {
-  return ly_string2scm (init_scheme_variables_global); 
+  return ly_string2scm (init_scheme_variables_global);
 }
 
+
 LY_DEFINE (ly_command_line_code, "ly:command-line-code", 0, 0, 0, (),
 	   "The Scheme code specified on command-line with @option{-e}.")
 {
-  return ly_string2scm (init_scheme_code_global); 
+  return ly_string2scm (init_scheme_code_global);
 }
 
+
 LY_DEFINE (ly_command_line_verbose_p, "ly:command-line-verbose?", 0, 0, 0, (),
 	   "Was @code{be_verbose_global} set?")
 {
@@ -244,7 +242,6 @@ LY_DEFINE (ly_command_line_verbose_p, "ly:command-line-verbose?", 0, 0, 0, (),
 }
 
 
-
 LY_DEFINE (ly_all_options, "ly:all-options",
 	   0, 0, 0, (),
 	   "Get all option settings in an alist.")
@@ -259,5 +256,3 @@ LY_DEFINE (ly_get_option, "ly:get-option", 1, 0, 0, (SCM var),
   LY_ASSERT_TYPE (ly_is_symbol, var, 1);
   return scm_hashq_ref (option_hash, var, SCM_BOOL_F);
 }
-
-
diff --git a/lily/program-option.cc b/lily/program-option.cc
index a176df86da..81f2d5ab6d 100644
--- a/lily/program-option.cc
+++ b/lily/program-option.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2007--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2007--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index 97c76dfd7e..d4fa5749c6 100644
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "property-iterator.hh"
diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc
index 1bcc83fbc9..3a8b19a9d0 100644
--- a/lily/protected-scm.cc
+++ b/lily/protected-scm.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "protected-scm.hh"
diff --git a/lily/quote-iterator.cc b/lily/quote-iterator.cc
index 3eaf002c0b..58d4378d25 100644
--- a/lily/quote-iterator.cc
+++ b/lily/quote-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music-wrapper-iterator.hh"
diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc
index 8f997ee81a..e2ed2e6e04 100644
--- a/lily/relative-octave-check.cc
+++ b/lily/relative-octave-check.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "input.hh"
diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc
index 8d677c425b..cbd7969fed 100644
--- a/lily/relative-octave-music.cc
+++ b/lily/relative-octave-music.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music.hh"
diff --git a/lily/relocate.cc b/lily/relocate.cc
index fd6cf85c45..69b27a8d4b 100644
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index d61ef206ba..4e4b91e3a2 100644
--- a/lily/repeat-acknowledge-engraver.cc
+++ b/lily/repeat-acknowledge-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/repeat-tie-engraver.cc b/lily/repeat-tie-engraver.cc
index 64c9916e87..4766cb8186 100644
--- a/lily/repeat-tie-engraver.cc
+++ b/lily/repeat-tie-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index becbbfcb5b..7a004c8263 100644
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "repeated-music.hh"
diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index df1c486924..d438566c02 100644
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "warn.hh"
diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 29313f1ccb..f18c63a10c 100644
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "rest-collision.hh"
diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index f4e2b08ebf..12d1f84a2e 100644
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/rest.cc b/lily/rest.cc
index 9caae1f5e9..7fd5101d84 100644
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "rest.hh"
diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index 874dad834b..fa45a95ff3 100644
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index 1ea09cce71..5919c9119b 100644
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "rhythmic-head.hh"
diff --git a/lily/rod.cc b/lily/rod.cc
index a94bcb3996..be04a669ab 100644
--- a/lily/rod.cc
+++ b/lily/rod.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "rod.hh"
diff --git a/lily/scale.cc b/lily/scale.cc
index 99cd6d91db..c1f9a81f05 100644
--- a/lily/scale.cc
+++ b/lily/scale.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
       2007--2008 Rune Zedeler
       2008       Joe Neeman <joeneeman@gmail.com>
 */
@@ -20,7 +20,8 @@ LY_DEFINE (ly_make_scale, "ly:make-scale",
 	   1, 0, 0, (SCM steps),
 	   "Create a scale."
 	   "  The argument is a vector of rational numbers, each of which"
-	   " represents the number of tones of a pitch above the tonic.")
+	   " represents the number of 200 cent tones of a pitch above the"
+	   " tonic.")
 {
   bool type_ok = scm_is_vector (steps);
 
@@ -66,7 +67,12 @@ Scale * default_global_scale = 0;
 
 LY_DEFINE (ly_set_default_scale, "ly:set-default-scale",
 	   1, 0, 0, (SCM scale),
-	   "Set the global default scale.")
+	   "Set the global default scale. This determines the tuning of"
+	   " pitches with no accidentals or key signatures.  The first"
+	   " pitch is C. Alterations are calculated relative to this"
+	   " scale.  The number of pitches in this scale determines the"
+	   " number of scale steps that make up an octave.  Usually the"
+	   " 7-note major scale.")
 {
   LY_ASSERT_SMOB (Scale, scale, 1);
 
diff --git a/lily/scheme-listener-scheme.cc b/lily/scheme-listener-scheme.cc
index 0b4d39bd9a..7b4f6991a3 100644
--- a/lily/scheme-listener-scheme.cc
+++ b/lily/scheme-listener-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Erik Sandberg  <mandolaerik@gmail.com>
+  (c) 2006--2009 Erik Sandberg  <mandolaerik@gmail.com>
 */
 
 #include "scheme-listener.hh"
diff --git a/lily/scheme-listener.cc b/lily/scheme-listener.cc
index 80c43dfbc0..15ef78e9d2 100644
--- a/lily/scheme-listener.cc
+++ b/lily/scheme-listener.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Erik Sandberg  <mandolaerik@gmail.com>
+  (c) 2006--2009 Erik Sandberg  <mandolaerik@gmail.com>
 */
 
 #include "scheme-listener.hh"
diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index d3a8d7f9bd..4013af3279 100644
--- a/lily/scm-hash.cc
+++ b/lily/scm-hash.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "scm-hash.hh"
diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index 5fea203210..eff35efed4 100644
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "score-engraver.hh"
diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 4c905446ff..9e5db10e88 100644
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "score-performer.hh"
diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc
index 9881bf3d4a..c3cf122411 100644
--- a/lily/score-scheme.cc
+++ b/lily/score-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "score.hh"
diff --git a/lily/score.cc b/lily/score.cc
index 1681948918..ac79dd103f 100644
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "score.hh"
diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 6821c51733..c7d623185d 100644
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/script-column.cc b/lily/script-column.cc
index ac4e9c72f0..b3371e9fd5 100644
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "script-column.hh"
diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index f460892c13..ceb4a048f8 100644
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/script-interface.cc b/lily/script-interface.cc
index af2b8f934d..59737b5ac4 100644
--- a/lily/script-interface.cc
+++ b/lily/script-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "script-interface.hh"
diff --git a/lily/script-row-engraver.cc b/lily/script-row-engraver.cc
index 91d92f4cd7..21a227228c 100644
--- a/lily/script-row-engraver.cc
+++ b/lily/script-row-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/self-aligment-interface.cc b/lily/self-aligment-interface.cc
index 1459c8c817..71d2e1f96d 100644
--- a/lily/self-aligment-interface.cc
+++ b/lily/self-aligment-interface.cc
@@ -3,7 +3,7 @@
  
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "self-alignment-interface.hh"
diff --git a/lily/semi-tie-column.cc b/lily/semi-tie-column.cc
index 6fe180a8ea..508df73a9f 100644
--- a/lily/semi-tie-column.cc
+++ b/lily/semi-tie-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/semi-tie.cc b/lily/semi-tie.cc
index 996b36a02e..a23ddd40f5 100644
--- a/lily/semi-tie.cc
+++ b/lily/semi-tie.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc
index 60b69dbbc9..38bb5a3b40 100644
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index 4a9eec3ea6..5f8471a600 100644
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "separation-item.hh"
diff --git a/lily/sequential-iterator.cc b/lily/sequential-iterator.cc
index 308be34d0c..3fd7da3839 100644
--- a/lily/sequential-iterator.cc
+++ b/lily/sequential-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "sequential-iterator.hh"
diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index dcd6f237d3..ed3af0577a 100644
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "side-position-interface.hh"
diff --git a/lily/simple-closure.cc b/lily/simple-closure.cc
index 2e81591eb7..34bfd58f1b 100644
--- a/lily/simple-closure.cc
+++ b/lily/simple-closure.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 #include "simple-closure.hh"
diff --git a/lily/simple-music-iterator.cc b/lily/simple-music-iterator.cc
index c89f0f52be..706be56838 100644
--- a/lily/simple-music-iterator.cc
+++ b/lily/simple-music-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "simple-music-iterator.hh"
diff --git a/lily/simple-spacer-scheme.cc b/lily/simple-spacer-scheme.cc
index 04ceef94f6..7308de6584 100644
--- a/lily/simple-spacer-scheme.cc
+++ b/lily/simple-spacer-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cstdio>
diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index 9b0a322b1c..1d38d9a70f 100644
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   TODO:
   - add support for different stretch/shrink constants?
diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index 271ae1dc7d..0631ba9e8d 100644
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "simultaneous-music-iterator.hh"
diff --git a/lily/skyline-pair.cc b/lily/skyline-pair.cc
index 100061a19c..61573ee01d 100644
--- a/lily/skyline-pair.cc
+++ b/lily/skyline-pair.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2008--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/skyline.cc b/lily/skyline.cc
index 78c4e8cde0..8c538e8a50 100644
--- a/lily/skyline.cc
+++ b/lily/skyline.cc
@@ -2,7 +2,7 @@
 
    source file of the GNU LilyPond music typesetter
  
-   (c) 2006--2008 Joe Neeman <joeneeman@gmail.com>
+   (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #include "skyline.hh"
diff --git a/lily/slash-repeat-engraver.cc b/lily/slash-repeat-engraver.cc
index dbb55c1b38..16af23613a 100644
--- a/lily/slash-repeat-engraver.cc
+++ b/lily/slash-repeat-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>, Erik Sandberg
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>, Erik Sandberg
   <mandolaerik@gmail.com>
 */
 
diff --git a/lily/slur-configuration.cc b/lily/slur-configuration.cc
index 3c39b45793..ce368ab9eb 100644
--- a/lily/slur-configuration.cc
+++ b/lily/slur-configuration.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "slur-configuration.hh"
diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 348e9e2014..13ca895e2e 100644
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/slur-performer.cc b/lily/slur-performer.cc
index 815876963f..422f065fd2 100644
--- a/lily/slur-performer.cc
+++ b/lily/slur-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
diff --git a/lily/slur-score-parameters.cc b/lily/slur-score-parameters.cc
index 5cd4b58586..00b8effc0f 100644
--- a/lily/slur-score-parameters.cc
+++ b/lily/slur-score-parameters.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index 1973102650..bb2b1f3b2b 100644
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/slur.cc b/lily/slur.cc
index 2bc0ea072c..b1794ad401 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/smobs.cc b/lily/smobs.cc
index 247489e342..ea2095c3a3 100644
--- a/lily/smobs.cc
+++ b/lily/smobs.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "smobs.hh"
diff --git a/lily/source-file.cc b/lily/source-file.cc
index 49d8eb4f21..fc5b03483d 100644
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
diff --git a/lily/sources.cc b/lily/sources.cc
index 62ee7a1e99..3bedc8cc67 100644
--- a/lily/sources.cc
+++ b/lily/sources.cc
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "sources.hh"
diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index 2088284412..0412edcf02 100644
--- a/lily/spaceable-grob.cc
+++ b/lily/spaceable-grob.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "spaceable-grob.hh"
diff --git a/lily/spacing-basic.cc b/lily/spacing-basic.cc
index 40e0a16b4a..0f81619bed 100644
--- a/lily/spacing-basic.cc
+++ b/lily/spacing-basic.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "spacing-spanner.hh"
diff --git a/lily/spacing-determine-loose-columns.cc b/lily/spacing-determine-loose-columns.cc
index ed706a6575..20771542fb 100644
--- a/lily/spacing-determine-loose-columns.cc
+++ b/lily/spacing-determine-loose-columns.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "staff-spacing.hh"
diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index dffb21d638..7051ae75c4 100644
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/spacing-interface.cc b/lily/spacing-interface.cc
index c5a7e000c1..f7d6b8d31f 100644
--- a/lily/spacing-interface.cc
+++ b/lily/spacing-interface.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2007--2008 Joe Neeman <joeneeman@gmail.com>
+  (c) 2007--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #include "spacing-interface.hh"
diff --git a/lily/spacing-loose-columns.cc b/lily/spacing-loose-columns.cc
index 5aeb357b37..302cccb133 100644
--- a/lily/spacing-loose-columns.cc
+++ b/lily/spacing-loose-columns.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "system.hh"
diff --git a/lily/spacing-options.cc b/lily/spacing-options.cc
index 1dc6991fd0..f78a94a619 100644
--- a/lily/spacing-options.cc
+++ b/lily/spacing-options.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
 
 */
 
diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index be0cd01a45..d5dcb01cc8 100644
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "spacing-spanner.hh"
diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc
index 07958a8a3e..4630bdc07e 100644
--- a/lily/span-arpeggio-engraver.cc
+++ b/lily/span-arpeggio-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index 64f8455513..b3709e7336 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "bar-line.hh"
diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 31d91b1fc7..2c0273ea72 100644
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "span-bar.hh"
diff --git a/lily/spanner-break-forbid-engraver.cc b/lily/spanner-break-forbid-engraver.cc
index fb5fcfdd24..baac8f83a2 100644
--- a/lily/spanner-break-forbid-engraver.cc
+++ b/lily/spanner-break-forbid-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2007--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2007--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
 */
 
 
diff --git a/lily/spanner-scheme.cc b/lily/spanner-scheme.cc
index 097bdf0290..e756d69b0e 100644
--- a/lily/spanner-scheme.cc
+++ b/lily/spanner-scheme.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2007--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2007--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
diff --git a/lily/spanner.cc b/lily/spanner.cc
index 476f75d8c2..8533bc72fc 100644
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "pointer-group-interface.hh"
diff --git a/lily/spring-smob.cc b/lily/spring-smob.cc
index a50c4bf92f..4b20641e95 100644
--- a/lily/spring-smob.cc
+++ b/lily/spring-smob.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "spring.hh"
diff --git a/lily/spring.cc b/lily/spring.cc
index cd63afa670..67d41c9c39 100644
--- a/lily/spring.cc
+++ b/lily/spring.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2007--2008 Joe Neeman <joeneeman@gmail.com>
+  (c) 2007--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #include "spring.hh"
diff --git a/lily/staff-collecting-engraver.cc b/lily/staff-collecting-engraver.cc
index 3ecee7ba23..29b05f4da1 100644
--- a/lily/staff-collecting-engraver.cc
+++ b/lily/staff-collecting-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "staff-symbol.hh"
diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index b2565b1913..756b5e3a81 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "warn.hh"
diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc
index 4e92bfce64..3587f70c63 100644
--- a/lily/staff-spacing.cc
+++ b/lily/staff-spacing.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "staff-spacing.hh"
diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index 12bdfe2446..5d70855273 100644
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/staff-symbol-referencer-scheme.cc b/lily/staff-symbol-referencer-scheme.cc
index d58f5a5043..ebf2686777 100644
--- a/lily/staff-symbol-referencer-scheme.cc
+++ b/lily/staff-symbol-referencer-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob.hh"
diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index 85a6806e21..17bd099fc6 100644
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "staff-symbol-referencer.hh"
diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index c00c2338d4..0f1d60aa62 100644
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "staff-symbol.hh"
diff --git a/lily/stanza-number-align-engraver.cc b/lily/stanza-number-align-engraver.cc
index 9aa4e623ae..494e64842f 100644
--- a/lily/stanza-number-align-engraver.cc
+++ b/lily/stanza-number-align-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index 5baf68a2fc..3434f06167 100644
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>, Glen Prideaux <glenprideaux@iname.com>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>, Glen Prideaux <glenprideaux@iname.com>
 */
 
 #include "engraver.hh"
diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index fdb61219f6..7db456006c 100644
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index 4c722c915d..ce9e3529b6 100644
--- a/lily/stem-tremolo.cc
+++ b/lily/stem-tremolo.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "stem-tremolo.hh"
diff --git a/lily/stem.cc b/lily/stem.cc
index a5d23c3105..8ba6f2b6c9 100644
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   TODO: This is way too hairy
diff --git a/lily/stencil-expression.cc b/lily/stencil-expression.cc
index ea9c088719..b1f47997dd 100644
--- a/lily/stencil-expression.cc
+++ b/lily/stencil-expression.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "stencil.hh"
diff --git a/lily/stencil-interpret.cc b/lily/stencil-interpret.cc
index c1db528423..9b9ed4d6a3 100644
--- a/lily/stencil-interpret.cc
+++ b/lily/stencil-interpret.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "stencil.hh"
diff --git a/lily/stencil-scheme.cc b/lily/stencil-scheme.cc
index 102fe5e6c9..c2d9d8e961 100644
--- a/lily/stencil-scheme.cc
+++ b/lily/stencil-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 
diff --git a/lily/stencil.cc b/lily/stencil.cc
index b550eb4f7f..c241fa18c2 100644
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "stencil.hh"
diff --git a/lily/stream-event-scheme.cc b/lily/stream-event-scheme.cc
index 3b08add66f..6ce5477af3 100644
--- a/lily/stream-event-scheme.cc
+++ b/lily/stream-event-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Erik Sandberg  <mandolaerik@gmail.com>
+  (c) 2006--2009 Erik Sandberg  <mandolaerik@gmail.com>
 */
 
 #include "stream-event.hh"
diff --git a/lily/string-number-engraver.cc b/lily/string-number-engraver.cc
index 0e429a957b..3eb0b538af 100644
--- a/lily/string-number-engraver.cc
+++ b/lily/string-number-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc
index 1479f66365..4e2a8f529c 100644
--- a/lily/sustain-pedal.cc
+++ b/lily/sustain-pedal.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #include "grob.hh"
 #include "stencil.hh"
diff --git a/lily/swallow-engraver.cc b/lily/swallow-engraver.cc
index 0b6a724817..f6cf49cdcb 100644
--- a/lily/swallow-engraver.cc
+++ b/lily/swallow-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/swallow-perf.cc b/lily/swallow-perf.cc
index d24b9339a4..f148699c86 100644
--- a/lily/swallow-perf.cc
+++ b/lily/swallow-perf.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "performer.hh"
diff --git a/lily/system-scheme.cc b/lily/system-scheme.cc
index e5e43ae35e..37ec8b0549 100644
--- a/lily/system-scheme.cc
+++ b/lily/system-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2007--2008 Joe Neeman <joeneeman@gmail.com>
+  (c) 2007--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #include "align-interface.hh"
diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc
index ed7e34a029..ea4fcf38a8 100644
--- a/lily/system-start-delimiter-engraver.cc
+++ b/lily/system-start-delimiter-engraver.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index c2683cb9a2..62c2bb5271 100644
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "system-start-delimiter.hh"
diff --git a/lily/system-start-text.cc b/lily/system-start-text.cc
index ece932bd76..33b0f68f40 100644
--- a/lily/system-start-text.cc
+++ b/lily/system-start-text.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/system.cc b/lily/system.cc
index 9c38c7fa2f..9054988dab 100644
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "system.hh"
diff --git a/lily/tab-harmonic-engraver.cc b/lily/tab-harmonic-engraver.cc
index ba95e01ab9..8c493048bc 100644
--- a/lily/tab-harmonic-engraver.cc
+++ b/lily/tab-harmonic-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc
index ae012d6513..f89dad1100 100644
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -1,7 +1,7 @@
 /*
   tab-note-heads-engraver.cc -- part of GNU LilyPond
 
-  (c) 2002--2008 Han-Wen Nienhuys, Jean-Baptiste Lamy <jiba@tuxfamily.org>,
+  (c) 2002--2009 Han-Wen Nienhuys, Jean-Baptiste Lamy <jiba@tuxfamily.org>,
 */
 
 #include <cctype>
diff --git a/lily/tab-staff-symbol-engraver.cc b/lily/tab-staff-symbol-engraver.cc
index ad700a3ef3..03df300ea2 100644
--- a/lily/tab-staff-symbol-engraver.cc
+++ b/lily/tab-staff-symbol-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/template5.cc b/lily/template5.cc
index 3584173cc6..681812f8ca 100644
--- a/lily/template5.cc
+++ b/lily/template5.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "moment.hh"
diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index 557e03c1aa..5387d49a3a 100644
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index a7d8dfa875..f27a74bf84 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "directional-element-interface.hh"
diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index 480d2726a2..9b28228dab 100644
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 9c1ebdcf0f..e5b9911810 100644
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index 2017a5ce44..c236e55bc1 100644
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "tie-column.hh"
diff --git a/lily/tie-configuration.cc b/lily/tie-configuration.cc
index c455c5ccc4..ba94725dc0 100644
--- a/lily/tie-configuration.cc
+++ b/lily/tie-configuration.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/tie-details.cc b/lily/tie-details.cc
index 2524599ad7..bc43d1cbd6 100644
--- a/lily/tie-details.cc
+++ b/lily/tie-details.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 3d30e77738..1a397b3b74 100644
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc
index ba064bcd3d..7eb20666be 100644
--- a/lily/tie-formatting-problem.cc
+++ b/lily/tie-formatting-problem.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index 9f6ae78669..58bc879ec1 100644
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "performer.hh"
diff --git a/lily/tie.cc b/lily/tie.cc
index f02cddacf8..5c64db6494 100644
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "tie.hh"
diff --git a/lily/time-scaled-music-iterator.cc b/lily/time-scaled-music-iterator.cc
index 8228b60eaa..e70c44a485 100644
--- a/lily/time-scaled-music-iterator.cc
+++ b/lily/time-scaled-music-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>,
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>,
                  Erik Sandberg <mandolaerik@gmail.com>
 */
 
diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index ec4ff28efc..9d43433604 100644
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver-group.hh"
diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc
index 3d348931a4..740aca82d3 100644
--- a/lily/time-signature-performer.cc
+++ b/lily/time-signature-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "audio-item.hh"
diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 6958de57ea..3635a84910 100644
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "time-signature.hh"
diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index 749aa18e47..57998ace96 100644
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "timing-translator.hh"
diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index 147525cea4..5290743e2e 100644
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "translator.hh"
diff --git a/lily/translator-dispatch-list.cc b/lily/translator-dispatch-list.cc
index 5a6ce4a0a6..bf8c70e003 100644
--- a/lily/translator-dispatch-list.cc
+++ b/lily/translator-dispatch-list.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "translator-dispatch-list.hh"
diff --git a/lily/translator-group-ctors.cc b/lily/translator-group-ctors.cc
index f787b94399..d1d03f37f0 100644
--- a/lily/translator-group-ctors.cc
+++ b/lily/translator-group-ctors.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "score-engraver.hh"
diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index fb6d2580ed..64c28ac83d 100644
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>,
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>,
                  Erik Sandberg <mandolaerik@gmail.com>
 */
 
diff --git a/lily/translator-scheme.cc b/lily/translator-scheme.cc
index 4f920c8b1a..775e47da0d 100644
--- a/lily/translator-scheme.cc
+++ b/lily/translator-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context-def.hh"
diff --git a/lily/translator.cc b/lily/translator.cc
index 9ebe2cd4bf..efa375549f 100644
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "translator.hh"
diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index 8288e78ddc..513a2ae605 100644
--- a/lily/trill-spanner-engraver.cc
+++ b/lily/trill-spanner-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 /*
diff --git a/lily/ttf.cc b/lily/ttf.cc
index 41363880c9..62c6d4695e 100644
--- a/lily/ttf.cc
+++ b/lily/ttf.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cstdio>
diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 4edf3f3ba6..4ddb09245e 100644
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 772b8db124..6ee50151d5 100644
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "beam.hh"
diff --git a/lily/tuplet-number.cc b/lily/tuplet-number.cc
index a08c37dd3e..117179eb11 100644
--- a/lily/tuplet-number.cc
+++ b/lily/tuplet-number.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/tweak-engraver.cc b/lily/tweak-engraver.cc
index dfdf5d6d3b..eb3167bd5b 100644
--- a/lily/tweak-engraver.cc
+++ b/lily/tweak-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
diff --git a/lily/type-swallow-translator.cc b/lily/type-swallow-translator.cc
index 9aeae1ee6d..19d26eaa79 100644
--- a/lily/type-swallow-translator.cc
+++ b/lily/type-swallow-translator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "translator.hh"
diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc
index 5bfab328f2..b3247c0c81 100644
--- a/lily/unfolded-repeat-iterator.cc
+++ b/lily/unfolded-repeat-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music.hh"
diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc
index 53bec433d7..0e91f1765a 100644
--- a/lily/vaticana-ligature-engraver.cc
+++ b/lily/vaticana-ligature-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2003--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "gregorian-ligature-engraver.hh"
diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc
index 4995aad2f0..3a37fb5dce 100644
--- a/lily/vaticana-ligature.cc
+++ b/lily/vaticana-ligature.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2008 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2003--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "vaticana-ligature.hh"
diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 0d07a509df..365c35cb48 100644
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
diff --git a/lily/vertically-spaced-context-engraver.cc b/lily/vertically-spaced-context-engraver.cc
index 5c32c0fd88..750f2e3721 100644
--- a/lily/vertically-spaced-context-engraver.cc
+++ b/lily/vertically-spaced-context-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc
index 494cbfb1c3..d5f4bc6daa 100644
--- a/lily/volta-bracket.cc
+++ b/lily/volta-bracket.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <cstring>
diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index d2a45dd6c2..bd8e9e2c39 100644
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
diff --git a/lily/volta-repeat-iterator.cc b/lily/volta-repeat-iterator.cc
index 90cdb0dfd4..e018fe74b1 100644
--- a/lily/volta-repeat-iterator.cc
+++ b/lily/volta-repeat-iterator.cc
@@ -4,7 +4,7 @@
   source file of the GNU LilyPond music typesetter
 
 
-  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music.hh"
diff --git a/ly/predefined-fretboards-init.ly b/ly/predefined-fretboards-init.ly
index df88ee79bf..b4e8ec75f0 100644
--- a/ly/predefined-fretboards-init.ly
+++ b/ly/predefined-fretboards-init.ly
@@ -2,7 +2,7 @@
 %%%%
 %%%% source file of the GNU LilyPond music typesetter
 %%%%
-%%%% (c) 2008 Carl D. Sorensen <c_sorensen@byu.edu>
+%%%% (c) 2008--2009 Carl D. Sorensen <c_sorensen@byu.edu>
 
 \version "2.12.0"
 
diff --git a/ly/predefined-guitar-fretboards.ly b/ly/predefined-guitar-fretboards.ly
index 84244b257c..815b704417 100644
--- a/ly/predefined-guitar-fretboards.ly
+++ b/ly/predefined-guitar-fretboards.ly
@@ -2,7 +2,7 @@
 %%%%
 %%%% source file of the GNU LilyPond music typesetter
 %%%%
-%%%% (c) 2008 Carl D. Sorensen <c_sorensen@byu.edu>
+%%%% (c) 2008--2009 Carl D. Sorensen <c_sorensen@byu.edu>
 
 %%%  Add basic chordshapes
 
diff --git a/ly/predefined-guitar-ninth-fretboards.ly b/ly/predefined-guitar-ninth-fretboards.ly
index fc0530f93b..159ad04c8e 100644
--- a/ly/predefined-guitar-ninth-fretboards.ly
+++ b/ly/predefined-guitar-ninth-fretboards.ly
@@ -4,7 +4,7 @@
 %
 %  This is part of the Lilypond distribution files
 %
-%  Copyright 2008 by Jonathan Kulp
+%  Copyright 2008--2009 by Jonathan Kulp
 %
 
 
diff --git a/make/substitute.make b/make/substitute.make
index fc175ece72..74ba9f67d9 100644
--- a/make/substitute.make
+++ b/make/substitute.make
@@ -36,3 +36,5 @@ ATVARIABLES = \
   program_prefix\
   program_suffix\
   sharedstatedir\
+  src-dir\
+  top-src-dir\
diff --git a/mf/feta-accordion.mf b/mf/feta-accordion.mf
index 749184e4d9..f105800087 100644
--- a/mf/feta-accordion.mf
+++ b/mf/feta-accordion.mf
@@ -3,7 +3,7 @@
 %
 % source file of the GNU LilyPond music typesetter
 %
-% (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 fet_begingroup ("accordion");
 
diff --git a/mf/feta-arrow.mf b/mf/feta-arrow.mf
index 4dc742320d..f0c39c783f 100644
--- a/mf/feta-arrow.mf
+++ b/mf/feta-arrow.mf
@@ -3,7 +3,7 @@
 %
 % source file of the GNU LilyPond music typesetter
 %
-% (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 fet_begingroup ("arrowheads");
 
diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf
index fe7467aca2..24a0e1b9dd 100644
--- a/mf/feta-autometric.mf
+++ b/mf/feta-autometric.mf
@@ -4,7 +4,7 @@
 % source file of the Feta (not an acronym for Font-En-Tja)
 % pretty-but-neat music font
 %
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %          Jan Nieuwenhuizen <janneke@gnu.org>
 %
 % These macros help create ascii logging output
diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf
index f593c6f36f..46b3b0617b 100644
--- a/mf/feta-banier.mf
+++ b/mf/feta-banier.mf
@@ -3,7 +3,7 @@
 %
 % source file of the GNU LilyPond music typesetter
 %
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 fet_begingroup ("flags");
 
diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf
index c3541aaf18..c61f756d38 100644
--- a/mf/feta-beugel.mf
+++ b/mf/feta-beugel.mf
@@ -4,7 +4,7 @@
 % source file of the Feta (not an acronym for Font-En-Tja)
 % pretty-but-neat music font
 %
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %                Jan Nieuwenhuizen <janneke@gnu.org>
 
 
diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index cae8c200a8..fcda600978 100644
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-bolletjes.mf
@@ -3,7 +3,7 @@
 %
 % source file of LilyPond's pretty-but-neat music font
 %
-% (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 % & Han-Wen Nienhuys <hanwen@xs4all.nl>
 % & Juergen Reuter <reuter@ipd.uka.de>
 %
diff --git a/mf/feta-braces-a.mf b/mf/feta-braces-a.mf
index 1d19320d3e..9d8a9d8365 100644
--- a/mf/feta-braces-a.mf
+++ b/mf/feta-braces-a.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 font_count := 0;
diff --git a/mf/feta-braces-b.mf b/mf/feta-braces-b.mf
index 568d639e1f..e74606dcfb 100644
--- a/mf/feta-braces-b.mf
+++ b/mf/feta-braces-b.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 font_count := 1;
diff --git a/mf/feta-braces-c.mf b/mf/feta-braces-c.mf
index 9ffdddfb94..06a273ed67 100644
--- a/mf/feta-braces-c.mf
+++ b/mf/feta-braces-c.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 font_count := 2;
diff --git a/mf/feta-braces-d.mf b/mf/feta-braces-d.mf
index 14b66bab31..d926a595e6 100644
--- a/mf/feta-braces-d.mf
+++ b/mf/feta-braces-d.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 font_count := 3;
diff --git a/mf/feta-braces-e.mf b/mf/feta-braces-e.mf
index 88420858a3..ed89fc5a31 100644
--- a/mf/feta-braces-e.mf
+++ b/mf/feta-braces-e.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 font_count := 4;
diff --git a/mf/feta-braces-f.mf b/mf/feta-braces-f.mf
index 2abf13fc2f..4a96744e3b 100644
--- a/mf/feta-braces-f.mf
+++ b/mf/feta-braces-f.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 font_count := 5;
diff --git a/mf/feta-braces-g.mf b/mf/feta-braces-g.mf
index 1036804aeb..3a12239cc0 100644
--- a/mf/feta-braces-g.mf
+++ b/mf/feta-braces-g.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 font_count := 6;
diff --git a/mf/feta-braces-h.mf b/mf/feta-braces-h.mf
index 98d8686882..9d4988e792 100644
--- a/mf/feta-braces-h.mf
+++ b/mf/feta-braces-h.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 font_count := 7;
diff --git a/mf/feta-braces-i.mf b/mf/feta-braces-i.mf
index bd67f898c0..7089e60c2a 100644
--- a/mf/feta-braces-i.mf
+++ b/mf/feta-braces-i.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 font_count := 8;
diff --git a/mf/feta-din-code.mf b/mf/feta-din-code.mf
index ea6569acda..809227de45 100644
--- a/mf/feta-din-code.mf
+++ b/mf/feta-din-code.mf
@@ -4,7 +4,7 @@
 %
 % source file of the Feta (not the Font-En-Tja) music font
 %
-% (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
 ex# := (dynamic_design_size / 2.4) * pt#;
diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf
index da6630d5ed..de97f18677 100644
--- a/mf/feta-eindelijk.mf
+++ b/mf/feta-eindelijk.mf
@@ -4,7 +4,7 @@
 %
 % source file of the Feta (not the Font-En-Tja) music font
 %
-% (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
 fet_begingroup ("rests");
 
diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index 6f6cb1ae0c..f2c90cdf61 100644
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -5,7 +5,7 @@
 % source file of the Feta (defintively not an abbreviation for Font-En-Tja)
 % music font
 % 
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 
diff --git a/mf/feta-haak.mf b/mf/feta-haak.mf
index 97c88e97d5..ddc01c0847 100644
--- a/mf/feta-haak.mf
+++ b/mf/feta-haak.mf
@@ -4,7 +4,7 @@
 %
 % source file of the Feta (not the Font-En-Tja) music font
 %
-% (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 fet_begingroup ("brackettips");
 
diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf
index 8f80dc553e..15008d848e 100644
--- a/mf/feta-klef.mf
+++ b/mf/feta-klef.mf
@@ -4,7 +4,7 @@
 %
 % source file of the Feta (not the Font-En-Tja) music font
 %
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>,
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>,
 % Jan Nieuwenhuizen <janneke@gnu.org>,
 % Juergen Reuter <reuter@ipd.uka.de>
 
diff --git a/mf/feta-macros.mf b/mf/feta-macros.mf
index 49e61c3592..19cc379a42 100644
--- a/mf/feta-macros.mf
+++ b/mf/feta-macros.mf
@@ -3,7 +3,7 @@
 %
 % source file of the GNU LilyPond music typesetter
 %
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
 %
diff --git a/mf/feta-nummer-code.mf b/mf/feta-nummer-code.mf
index f562c4cad9..ab8fe9f011 100644
--- a/mf/feta-nummer-code.mf
+++ b/mf/feta-nummer-code.mf
@@ -4,7 +4,7 @@
 %
 % source file of the Feta (not the Font-En-Tja) music font
 %
-% (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
 height# := number_design_size;
diff --git a/mf/feta-params.mf b/mf/feta-params.mf
index 544251932c..96d9862897 100644
--- a/mf/feta-params.mf
+++ b/mf/feta-params.mf
@@ -3,7 +3,7 @@
 %
 % source file of the GNU LilyPond music typesetter
 %
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 stafflines := 5;
 
diff --git a/mf/feta-pendaal.mf b/mf/feta-pendaal.mf
index 202a96dea4..fded9ecb3e 100644
--- a/mf/feta-pendaal.mf
+++ b/mf/feta-pendaal.mf
@@ -5,7 +5,7 @@
 %
 % source file of the Feta (not the Font-En-Tja) music font
 %
-% (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 %
 % Voor Cup
 
diff --git a/mf/feta-puntje.mf b/mf/feta-puntje.mf
index 020d432d7c..a24e36938c 100644
--- a/mf/feta-puntje.mf
+++ b/mf/feta-puntje.mf
@@ -3,7 +3,7 @@
 %
 % source file of the GNU LilyPond music typesetter
 %
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 fet_begingroup ("dots");
 
diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index 6c003c4685..5bb7c1abdd 100644
--- a/mf/feta-schrift.mf
+++ b/mf/feta-schrift.mf
@@ -4,7 +4,7 @@
 % source file of the Feta (defintively not an abbreviation for Font-En-Tja)
 % music font
 %
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %	Jan Nieuwenhuizen <janneke@gnu.org>
 %
 
diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf
index 101385cfec..3b054103cd 100644
--- a/mf/feta-slag.mf
+++ b/mf/feta-slag.mf
@@ -4,7 +4,7 @@
 % source file of the Feta (definitely not an abbreviation for Font-En-Tja)
 % music font
 %
-% (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 %
 
 % this file is included by feta-scripts.mf
diff --git a/mf/feta-timesig.mf b/mf/feta-timesig.mf
index 116a6764a4..ffaa1883f9 100644
--- a/mf/feta-timesig.mf
+++ b/mf/feta-timesig.mf
@@ -3,7 +3,7 @@
 %
 % source file of the Feta (not an abbreviation of Font-En-Tja) music font
 %
-% (c) 1998--2008 Mats Bengtsson <matsb@s3.kth.se>,
+% (c) 1998--2009 Mats Bengtsson <matsb@s3.kth.se>,
 %		 Christian Mondrup <scancm@biobase.dk>
 
 fet_begingroup ("timesig");
diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf
index ef536cae82..48061fcd05 100644
--- a/mf/feta-toevallig.mf
+++ b/mf/feta-toevallig.mf
@@ -1,7 +1,7 @@
 %
 % feta-toevallig.mf -- implement Accidentals
 %
-% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %
 
 
diff --git a/mf/parmesan-accidentals.mf b/mf/parmesan-accidentals.mf
index 6d9e7b0ee7..b5fe663061 100644
--- a/mf/parmesan-accidentals.mf
+++ b/mf/parmesan-accidentals.mf
@@ -3,7 +3,7 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 2001--2008 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2001--2009 Juergen Reuter <reuter@ipd.uka.de>
 % 
 
 fet_begingroup ("accidentals");
diff --git a/mf/parmesan-clefs.mf b/mf/parmesan-clefs.mf
index 7a5fbc1dec..afd5058e7d 100644
--- a/mf/parmesan-clefs.mf
+++ b/mf/parmesan-clefs.mf
@@ -3,7 +3,7 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 %
-% (c) 2001--2008 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2001--2009 Juergen Reuter <reuter@ipd.uka.de>
 %
 
 fet_begingroup ("clefs");
diff --git a/mf/parmesan-custodes.mf b/mf/parmesan-custodes.mf
index adc702c279..d1a2d6c758 100644
--- a/mf/parmesan-custodes.mf
+++ b/mf/parmesan-custodes.mf
@@ -3,7 +3,7 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 2000--2008 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2000--2009 Juergen Reuter <reuter@ipd.uka.de>
 % 
 
 save black_notehead_width;
diff --git a/mf/parmesan-dots.mf b/mf/parmesan-dots.mf
index 1a2d951713..826dabe2c8 100644
--- a/mf/parmesan-dots.mf
+++ b/mf/parmesan-dots.mf
@@ -3,7 +3,7 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 2006--2008 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2006--2009 Juergen Reuter <reuter@ipd.uka.de>
 % 
 
 fet_begingroup ("dots");
diff --git a/mf/parmesan-flags.mf b/mf/parmesan-flags.mf
index 6b6343b424..32a55df0e2 100644
--- a/mf/parmesan-flags.mf
+++ b/mf/parmesan-flags.mf
@@ -3,7 +3,7 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 2001--2008 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2001--2009 Juergen Reuter <reuter@ipd.uka.de>
 % 
 
 fet_begingroup ("flags");
diff --git a/mf/parmesan-generic.mf b/mf/parmesan-generic.mf
index 311b75d040..6ffb53aad5 100644
--- a/mf/parmesan-generic.mf
+++ b/mf/parmesan-generic.mf
@@ -4,7 +4,7 @@
 %
 % source file of LilyPond's pretty-but-neat music font
 %
-% (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>
 %
 
 
diff --git a/mf/parmesan-heads.mf b/mf/parmesan-heads.mf
index 6064a66bd6..b897554d88 100644
--- a/mf/parmesan-heads.mf
+++ b/mf/parmesan-heads.mf
@@ -3,7 +3,7 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 2001--2008 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2001--2009 Juergen Reuter <reuter@ipd.uka.de>
 % 
 % Neo-mensural heads originally by
 % Christian Mondrup and Mats Bengtsson
diff --git a/mf/parmesan-macros.mf b/mf/parmesan-macros.mf
index 25d8272177..94d728a3e2 100644
--- a/mf/parmesan-macros.mf
+++ b/mf/parmesan-macros.mf
@@ -3,7 +3,7 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 2001--2008 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2001--2009 Juergen Reuter <reuter@ipd.uka.de>
 % 
 
 
diff --git a/mf/parmesan-rests.mf b/mf/parmesan-rests.mf
index 540b7898de..060307db71 100644
--- a/mf/parmesan-rests.mf
+++ b/mf/parmesan-rests.mf
@@ -3,7 +3,7 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 2001--2008 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2001--2009 Juergen Reuter <reuter@ipd.uka.de>
 % 
 % Neo-mensural rests originally by
 % Christian Mondrup and Mats Bengtsson.
diff --git a/mf/parmesan-scripts.mf b/mf/parmesan-scripts.mf
index fd260768a4..3a43a46aec 100644
--- a/mf/parmesan-scripts.mf
+++ b/mf/parmesan-scripts.mf
@@ -3,7 +3,7 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>
 % 
 
 fet_begingroup ("scripts");
diff --git a/mf/parmesan-timesig.mf b/mf/parmesan-timesig.mf
index da077582e1..8d0ab9d45c 100644
--- a/mf/parmesan-timesig.mf
+++ b/mf/parmesan-timesig.mf
@@ -3,9 +3,9 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 1998--2008 Mats Bengtsson <matsb@s3.kth.se>,
+% (c) 1998--2009 Mats Bengtsson <matsb@s3.kth.se>,
 %		 Christian Mondrup <scancm@biobase.dk>
-% (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>
 % 
 
 fet_begingroup ("timesig");
diff --git a/po/de.po b/po/de.po
index 3121d84f28..efcc72da8e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: lilypond 2.12.0\n"
 "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs\n"
 "POT-Creation-Date: 2008-12-20 11:58+0100\n"
-"PO-Revision-Date: 2008-12-31 17:51+0200\n"
+"PO-Revision-Date: 2009-01-06 20:11+0200\n"
 "Last-Translator: Till Rettig <till.rettig@gmx.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -2492,7 +2492,7 @@ msgstr "Volta-Klammer kann nicht beendet werden"
 
 #: volta-engraver.cc:110
 msgid "already have a volta spanner, ending that one prematurely"
-msgstr "Wiederholungskasten bereits vorhanden, wird vorzeitig beendet"
+msgstr "Wiederholungsklammer bereits vorhanden, wird vorzeitig beendet"
 
 #: volta-engraver.cc:114
 msgid "also already have an ended spanner"
diff --git a/po/es.po b/po/es.po
index 4a6f5d7179..e93b1ddf46 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1075,12 +1075,12 @@ msgstr ""
 
 #: musicxml2ly.py:2576
 msgid ""
-"Copyright (c) 2005--2008 by\n"
+"Copyright (c) 2005--2009 by\n"
 "    Han-Wen Nienhuys <hanwen@xs4all.nl>,\n"
 "    Jan Nieuwenhuizen <janneke@gnu.org> and\n"
 "    Reinhold Kainhofer <reinhold@kainhofer.com>\n"
 msgstr ""
-"Copyright (c) 2005--2008 por\n"
+"Copyright (c) 2005--2009 por\n"
 "    Han-Wen Nienhuys <hanwen@xs4all.nl>,\n"
 "    Jan Nieuwenhuizen <janneke@gnu.org> y\n"
 "    Reinhold Kainhofer <reinhold@kainhofer.com>\n"
diff --git a/po/fr.po b/po/fr.po
index e4711d7e63..c642c85aef 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1101,12 +1101,12 @@ msgstr ""
 
 #: musicxml2ly.py:2576
 msgid ""
-"Copyright (c) 2005--2008 by\n"
+"Copyright (c) 2005--2009 by\n"
 "    Han-Wen Nienhuys <hanwen@xs4all.nl>,\n"
 "    Jan Nieuwenhuizen <janneke@gnu.org> and\n"
 "    Reinhold Kainhofer <reinhold@kainhofer.com>\n"
 msgstr ""
-"Copyright (c) 2005--2008 by\n"
+"Copyright (c) 2005--2009 by\n"
 "    Han-Wen Nienhuys <hanwen@xs4all.nl>,\n"
 "    Jan Nieuwenhuizen <janneke@gnu.org> and\n"
 "    Reinhold Kainhofer <reinhold@kainhofer.com>\n"
diff --git a/po/lilypond.pot b/po/lilypond.pot
index 8a6be7ffcd..3ab8e15a72 100644
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -1,5 +1,5 @@
 # Translation of LilyPond.
-# Copyright (C) 2008 Han-Wen Nienhuys, Jan Nieuwenhuizen
+# Copyright (C) 2008--2009 Han-Wen Nienhuys, Jan Nieuwenhuizen
 # This file is distributed under the same license as lilypond package.
 #
 msgid ""
@@ -1038,7 +1038,7 @@ msgstr ""
 
 #: musicxml2ly.py:2576
 msgid ""
-"Copyright (c) 2005--2008 by\n"
+"Copyright (c) 2005--2009 by\n"
 "    Han-Wen Nienhuys <hanwen@xs4all.nl>,\n"
 "    Jan Nieuwenhuizen <janneke@gnu.org> and\n"
 "    Reinhold Kainhofer <reinhold@kainhofer.com>\n"
diff --git a/po/uk.po b/po/uk.po
index 2f0cbc43c6..4640fa8528 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,6 +1,6 @@
 # Ukrainian translations for lilypond package
 # Переклад українською для пакету lilypond.
-# Copyright (C) 2007--2008 THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2007--2009 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Youri Bulka <jblk@icmail.net>, 2007.
 #
diff --git a/po/vi.po b/po/vi.po
index b2dd24cf71..aa97f34456 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -993,7 +993,7 @@ msgstr ""
 
 #: musicxml2ly.py:2171
 msgid ""
-"Copyright (c) 2005--2008 by\n"
+"Copyright (c) 2005--2009 by\n"
 "    Han-Wen Nienhuys <hanwen@xs4all.nl>,\n"
 "    Jan Nieuwenhuizen <janneke@gnu.org> and\n"
 "    Reinhold Kainhofer <reinhold@kainhofer.com>\n"
diff --git a/python/convertrules.py b/python/convertrules.py
index 8aa8d29553..ad2c0cdd96 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -374,7 +374,7 @@ def conv (str):
     return str
 
 
-# TODO: lots of other syntax change should be done here as well
+# TODO: lots of other syntax changes should be done here as well
 @rule ((1, 3, 92), 'basicXXXProperties -> XXX, Repeat_engraver -> Volta_engraver')
 def conv (str):
     str = re.sub ('basicCollisionProperties', 'NoteCollision', str)
@@ -418,7 +418,7 @@ def conv (str):
     str = re.sub ('\\\\voicefour', '\\\\voiceFour', str)
 
     # I don't know exactly when these happened...
-    # ugh, we loose context setting here...
+    # ugh, we lose context setting here...
     str = re.sub ('\\\\property *[^ ]*verticalDirection[^=]*= *#?"?(1|(\\\\up))"?', '\\\\stemUp\\\\slurUp\\\\tieUp', str)
     str = re.sub ('\\\\property *[^ ]*verticalDirection[^=]*= *#?"?((-1)|(\\\\down))"?', '\\\\stemDown\\\\slurDown\\\\tieDown', str)
     str = re.sub ('\\\\property *[^ ]*verticalDirection[^=]*= *#?"?(0|(\\\\center))"?', '\\\\stemBoth\\\\slurBoth\\\\tieBoth', str)
@@ -431,7 +431,7 @@ def conv (str):
     str = re.sub ('\\\\property *[^ .]*[.]?([a-z]+)VerticalDirection[^=]*= *#?"?((-1)|(\\\\down))"?', '\\\\\\1Down', str)
     str = re.sub ('\\\\property *[^ .]*[.]?([a-z]+)VerticalDirection[^=]*= *#?"?(0|(\\\\center))"?', '\\\\\\1Both', str)
 
-    # (lacks capitalisation slur -> Slur)
+    # (lacks capitalization slur -> Slur)
     str = re.sub ('([a-z]+)VerticalDirection[^=]*= *#?"?(1|(\\\\up))"?', '\\1 \\\\override #\'direction = #1', str)
     str = re.sub ('([a-z]+)VerticalDirection[^=]*= *#?"?((-1)|(\\\\down))"?', '\\1 \\override #\'direction = #-1', str)
     str = re.sub ('([a-z]+)VerticalDirection[^=]*= *#?"?(0|(\\\\center))"?', '\\1 \\\\override #\'direction = #0', str)
@@ -2650,7 +2650,7 @@ def conv (str):
     return str
 
 
-@rule ((2, 11, 15), "#'edge-height -> #'bound-details #'right/left #'text = ...")
+@rule ((2, 11, 15), "TextSpanner #'edge-height -> #'bound-details #'right/left #'text = ...")
 def conv (str):
     def sub_edge_height (m):
         s = ''
@@ -2658,20 +2658,22 @@ def conv (str):
                          ('right', m.group (4))]:
 
             if h and float (h):
-                once = m.group(1)
+                once = m.group (1)
                 if not once:
                     once = ''
+                context = m.group (2)
+                if not context:
+                    context = ''
                     
-                s += (r"%s \override %s #'bound-details #'%s #'text = \markup { \draw-line #'(0 . %s) }"
-                      % (once, m.group (2), var, h))
+                s += (r"%s \override %sTextSpanner #'bound-details #'%s #'text = \markup { \draw-line #'(0 . %s) }"
+                      % (once, context, var, h))
 
                 s += '\n'
             
         return s
     
                   
-    str = re.sub (r"(\\once)?\s*\\override\s*([a-zA-Z.]+)\s*#'edge-height\s*=\s*#'\(([0-9.-]+)\s+[.]\s+([0-9.-]+)\)",
-                  sub_edge_height, str)
+    str = re.sub (r"(\\once)?\s*\\override\s*([a-zA-Z]+\s*[.]\s*)?TextSpanner\s*#'edge-height\s*=\s*#'\(\s*([0-9.-]+)\s+[.]\s+([0-9.-]+)\s*\)", sub_edge_height, str)
     return str
 
 
diff --git a/python/lilylib.py b/python/lilylib.py
index e46141bb68..b34c632f36 100644
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -3,7 +3,7 @@
 # 
 # source file of the GNU LilyPond music typesetter
 #
-# (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+# (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 #                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 import __main__
diff --git a/python/midi.c b/python/midi.c
index 0c698ded70..ec57ef7284 100644
--- a/python/midi.c
+++ b/python/midi.c
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
             Jan Nieuwenhuizen <janneke@gnu.org>
 
 */
diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm
index 5af3af086c..6479969eb8 100644
--- a/scm/auto-beam.scm
+++ b/scm/auto-beam.scm
@@ -1,10 +1,10 @@
 ;;;; auto-beam.scm -- Auto-beam-engraver settings
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
-;;;; 
-;;;; (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;
+;;;; (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
-;;; specify generic beam begin and end times
+;;; specify generic beam end times
 
 ;;; format:
 ;;;
@@ -23,49 +23,68 @@
 
 (define-public default-auto-beam-settings
   `(
-    ;; in 3 2 time:
-    ;;   end beams each 1 2 note
-    ;;   end beams with 16th notes each 1 4 note
-    ;;   end beams with 32nd notes each 1 8 note
+    ;; in 2 2 time:
+    ;;  use beatLength for all except 32nd notes
+    ;;  end beams with 32nd notes each 1 4 beat
 
-    ((end * * 3 2) . ,(ly:make-moment 1 2))
-    ((end * * 3 2) . ,(ly:make-moment 2 2))
+    ((end 1 32 2 2) . ,(ly:make-moment 1 4))
+    ((end 1 32 2 2) . ,(ly:make-moment 2 4))
+    ((end 1 32 2 2) . ,(ly:make-moment 3 4))
+
+    ;; in 3 2 time:
+    ;;   use beatLength for all except 16th and 32nd notes
+    ;;   end beams with 16th notes each 1 4 beat
+    ;;   end beams with 32nd notes each 1 8 beat
 
     ((end 1 16 3 2) . ,(ly:make-moment 1 4))
-    ((end 1 16 3 2) . ,(ly:make-moment 1 2))
+    ((end 1 16 3 2) . ,(ly:make-moment 2 4))
     ((end 1 16 3 2) . ,(ly:make-moment 3 4))
+    ((end 1 16 3 2) . ,(ly:make-moment 4 4))
     ((end 1 16 3 2) . ,(ly:make-moment 5 4))
 
     ((end 1 32 3 2) . ,(ly:make-moment 1 8))
-    ((end 1 32 3 2) . ,(ly:make-moment 1 4))
+    ((end 1 32 3 2) . ,(ly:make-moment 2 8))
     ((end 1 32 3 2) . ,(ly:make-moment 3 8))
-    ((end 1 32 3 2) . ,(ly:make-moment 1 2))
+    ((end 1 32 3 2) . ,(ly:make-moment 4 8))
     ((end 1 32 3 2) . ,(ly:make-moment 5 8))
-    ((end 1 32 3 2) . ,(ly:make-moment 3 4))
+    ((end 1 32 3 2) . ,(ly:make-moment 6 8))
     ((end 1 32 3 2) . ,(ly:make-moment 7 8))
+    ((end 1 32 3 2) . ,(ly:make-moment 8 8))
     ((end 1 32 3 2) . ,(ly:make-moment 9 8))
-    ((end 1 32 3 2) . ,(ly:make-moment 5 4))
+    ((end 1 32 3 2) . ,(ly:make-moment 10 8))
     ((end 1 32 3 2) . ,(ly:make-moment 11 8))
 
-    ((end * * 3 4) . ,(ly:make-moment 3 4))
+    ;; in 2 4 time:
+    ;;   use beatLength for all except 32nd notes
+    ;;   end beams with 32nd notes each 1 8 beat
 
-    ((end 1 16 3 4) . ,(ly:make-moment 1 4))
-    ((end 1 16 3 4) . ,(ly:make-moment 1 2))
+    ((end 1 32 2 4) . ,(ly:make-moment 1 8))
+    ((end 1 32 2 4) . ,(ly:make-moment 2 8))
+    ((end 1 32 2 4) . ,(ly:make-moment 3 8))
+
+    ;; in 3 4 time:
+    ;;   override beatLength which would end beams at 1 4 beats
+    ;;   end beams with 16th notes each 1 4 beat
+    ;;   end beams with 32nd notes each 1 8 beat
 
+    ((end * * 3 4) . ,(ly:make-moment 3 4))
+    ((end 1 16 3 4) . ,(ly:make-moment 1 4))
+    ((end 1 16 3 4) . ,(ly:make-moment 2 4))
     ((end 1 32 3 4) . ,(ly:make-moment 1 8))
-    ((end 1 32 3 4) . ,(ly:make-moment 1 4))
+    ((end 1 32 3 4) . ,(ly:make-moment 2 8))
     ((end 1 32 3 4) . ,(ly:make-moment 3 8))
-    ((end 1 32 3 4) . ,(ly:make-moment 1 2))
+    ((end 1 32 3 4) . ,(ly:make-moment 4 8))
     ((end 1 32 3 4) . ,(ly:make-moment 5 8))
 
-    ((end * * 3 8) . ,(ly:make-moment 3 8))
-
     ;; in common time:
-    ;;   end beams each 1 2 note
-    ;;   end beams with 32nd notes each 1 8 note
-    ;;   end beams with 1 8 triplets each 1 4 note
+    ;;   override beatLength which would end beams at 1 4 beats
+    ;;   end all beams at 1 2 beat
+    ;;   end beams with 8th triplets each 1 4 beat
+    ;;   end beams with 16th notes each 1 4 beat
+    ;;   end beams with 32nd notes each 1 8 beat
 
     ((end * * 4 4) . ,(ly:make-moment 1 2))
+
     ((end 1 12 4 4) . ,(ly:make-moment 1 4))
     ((end 1 12 4 4) . ,(ly:make-moment 3 4))
 
@@ -73,25 +92,29 @@
     ((end 1 16 4 4) . ,(ly:make-moment 3 4))
 
     ((end 1 32 4 4) . ,(ly:make-moment 1 8))
-    ((end 1 32 4 4) . ,(ly:make-moment 1 4))
+    ((end 1 32 4 4) . ,(ly:make-moment 2 8))
     ((end 1 32 4 4) . ,(ly:make-moment 3 8))
     ((end 1 32 4 4) . ,(ly:make-moment 5 8))
-    ((end 1 32 4 4) . ,(ly:make-moment 3 4))
+    ((end 1 32 4 4) . ,(ly:make-moment 6 8))
     ((end 1 32 4 4) . ,(ly:make-moment 7 8))
 
-    ((end * * 2 4) . ,(ly:make-moment 1 4))
-    ((end 1 32 2 4) . ,(ly:make-moment 1 8))
-    ((end 1 32 2 4) . ,(ly:make-moment 3 8))
+    ;; in 3 8 time:
+    ;;   override beatLength which would end beams at 1 8 beats
+
+    ((end * * 3 8) . ,(ly:make-moment 3 8))
+
+    ;; in 4 8 time
+    ;;   override beatLength which would end beams at 1 8 beats
+    ;;   end all beams at 1 4 beat
+    ;;   end beams with 32nd notes each 1 8 beat
 
     ((end * * 4 8) . ,(ly:make-moment 1 4))
     ((end 1 32 4 8) . ,(ly:make-moment 1 8))
     ((end 1 32 4 8) . ,(ly:make-moment 3 8))
 
-    ((end * * 4 16) . ,(ly:make-moment 1 8))
-
     ;; in 6 8, 9 8 and 12 8 time:
-    ;;   use beatGrouping for all except 1 32nd notes
-    ;;   end beams with 32nd notes every 1 8 note
+    ;;   use beatGrouping for all except 32nd notes
+    ;;   end beams with 32nd notes each 1 8 beat
 
     ((end 1 32 6 8) . ,(ly:make-moment 1 8))
     ((end 1 32 6 8) . ,(ly:make-moment 2 8))
@@ -119,6 +142,12 @@
     ((end 1 32 12 8) . ,(ly:make-moment 9 8))
     ((end 1 32 12 8) . ,(ly:make-moment 10 8))
     ((end 1 32 12 8) . ,(ly:make-moment 11 8))
+
+    ;; in 4 16 time
+    ;;   end all beams each 1 8 beat
+
+    ((end * * 4 16) . ,(ly:make-moment 1 8))
+
     ))
 
 (define (override-property-setting context property setting value)
diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index 67f6659830..6be7b13e93 100644
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2005--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2005--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 
diff --git a/scm/c++.scm b/scm/c++.scm
index 8e5fc8d447..b6ec6a4ee7 100644
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;;; Note: this file can't be used without LilyPond executable
diff --git a/scm/chord-entry.scm b/scm/chord-entry.scm
index 243052106a..45c395ba4e 100644
--- a/scm/chord-entry.scm
+++ b/scm/chord-entry.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-public (construct-chord-elements root duration modifications)
   " Build a chord on root using modifiers in MODIFICATIONS. NoteEvents
diff --git a/scm/chord-generic-names.scm b/scm/chord-generic-names.scm
index 9ee26dee58..190ef7d437 100644
--- a/scm/chord-generic-names.scm
+++ b/scm/chord-generic-names.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2003--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2003--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
 ;;;; NOTE: this is experimental code
diff --git a/scm/chord-ignatzek-names.scm b/scm/chord-ignatzek-names.scm
index 25e9c1a07a..0621716d17 100644
--- a/scm/chord-ignatzek-names.scm
+++ b/scm/chord-ignatzek-names.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2000--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
 
diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index 7fd484d897..718a3c9e3b 100644
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define (natural-chord-alteration p)
diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index d45150f10f..9dfef89e2d 100644
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                  Jan Nieuwenhuizen <janneke@gnu.org>
 
 
diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm
index f223f5552e..f62fa8867d 100644
--- a/scm/define-grob-interfaces.scm
+++ b/scm/define-grob-interfaces.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 1998--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 9ed32e95a2..302f26f1a7 100644
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define (define-grob-property symbol type? description)
@@ -275,6 +275,10 @@ multiples of fret-space.  Default value 0.5.
 @code{dot-label-font-mag} -- Magnification for font used to
 label fret dots.  Default value 1.
 @item
+@code{dot-position} -- Location of dot in fret space.  Default
+0.6 for dots without labels, 0.95-@code{dot-radius} for dots with
+labels.
+@item
 @code{dot-radius} -- Radius of dots, in terms of fret spaces.  
 Default value 0.425 for labeled dots, 0.25 for unlabeled dots.
 @item
@@ -288,8 +292,8 @@ Options include @code{none}, @code{in-dot}, and
 @code{fret-label-font-mag} -- The magnification of the font used to label
 the lowest fret number.  Default 0.5
 @item
-@code{fret-label-vertical-offset} -- The vertical offset of the fret label
-from the fret.  Default -0.2
+@code{fret-label-vertical-offset} -- The offset of the fret label
+from the center of the fret in direction parallel to strings.  Default 0.
 @item
 @code{label-dir} -- Side to which the fret label is attached.
 @code{-1}, @code{#LEFT}, or @code{#DOWN} for left or down;
@@ -307,12 +311,15 @@ include @code{roman-lower}, @code{roman-upper}, and @code{arabic}.  Default
 string.  Default \"o\".
 @item
 @code{orientation} -- Orientation of fret-diagram.  Options include
-@code{normal} and @code{landscape}.  Default @code{normal}.
+@code{normal}, @code{landscape}, and @code{opposing-landscape}.
+Default @code{normal}.
 @item
 @code{string-count} -- The number of strings.  Default 6.
 @item
 @code{string-label-font-mag} -- The magnification of the font used to label 
-fingerings at the string, rather than in the dot.  Default value 0.6.
+fingerings at the string, rather than in the dot.  Default value 0.6 for
+@code{normal} orientation, 0.5 for @code{landscape} and 
+@code{opposing-landscape}.
 @item
 @code{top-fret-thickness} -- The thickness of the top fret line, as a multiple
 of the standard thickness.   Default value 3.
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 60e4a3e8fb..d7ed47f363 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; distances are given in line-thickness (thicknesses) and
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 311faf463e..9b5c5c5c82 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2000--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                  Jan Nieuwenhuizen <janneke@gnu.org>
 
 
diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm
index 4133fa6443..f76b335af2 100644
--- a/scm/define-music-display-methods.scm
+++ b/scm/define-music-display-methods.scm
@@ -1,7 +1,7 @@
 ;;; define-music-display-methods.scm -- data for displaying music
 ;;; expressions using LilyPond notation.
 ;;;
-;;; (c) 2005--2008 Nicolas Sceaux  <nicolas.sceaux@free.fr>
+;;; (c) 2005--2009 Nicolas Sceaux  <nicolas.sceaux@free.fr>
 ;;;
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/scm/define-music-properties.scm b/scm/define-music-properties.scm
index 6150a2ad04..c89a519576 100644
--- a/scm/define-music-properties.scm
+++ b/scm/define-music-properties.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 1998--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define (music-property-description symbol type? description)
diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index ba4459b8a3..c454cfd3a6 100644
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;		     Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;; TODO: should link back into user manual.
diff --git a/scm/define-stencil-commands.scm b/scm/define-stencil-commands.scm
index 66659a902d..2e816ccaa2 100644
--- a/scm/define-stencil-commands.scm
+++ b/scm/define-stencil-commands.scm
@@ -3,7 +3,7 @@
 ;;
 ;; source file of the GNU LilyPond music typesetter
 ;;
-;; (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;; (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;
 
 (map ly:register-stencil-expression
diff --git a/scm/display-lily.scm b/scm/display-lily.scm
index e85159059d..21ed3a93f6 100644
--- a/scm/display-lily.scm
+++ b/scm/display-lily.scm
@@ -2,7 +2,7 @@
 ;;;
 ;;;
 ;;;
-;;; (c) 2005--2008 Nicolas Sceaux  <nicolas.sceaux@free.fr>
+;;; (c) 2005--2009 Nicolas Sceaux  <nicolas.sceaux@free.fr>
 ;;;
 
 ;;; - This file defines the procedures used to define display methods for each
diff --git a/scm/document-backend.scm b/scm/document-backend.scm
index b70b1d6969..d77a194d31 100644
--- a/scm/document-backend.scm
+++ b/scm/document-backend.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;; Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define (interface-doc-string interface grob-description)
diff --git a/scm/document-functions.scm b/scm/document-functions.scm
index 585ae13471..34d406f89f 100644
--- a/scm/document-functions.scm
+++ b/scm/document-functions.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (use-modules
diff --git a/scm/document-markup.scm b/scm/document-markup.scm
index e595de1320..af4a65d7c6 100644
--- a/scm/document-markup.scm
+++ b/scm/document-markup.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
diff --git a/scm/document-music.scm b/scm/document-music.scm
index 1491a30cad..b8190d95f4 100644
--- a/scm/document-music.scm
+++ b/scm/document-music.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define (music-props-doc)
diff --git a/scm/document-translation.scm b/scm/document-translation.scm
index 821eea4010..5bfc83a538 100644
--- a/scm/document-translation.scm
+++ b/scm/document-translation.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define (engraver-makes-grob? name-symbol grav)
diff --git a/scm/documentation-generate.scm b/scm/documentation-generate.scm
index 56f86e00d6..04b0a59942 100644
--- a/scm/documentation-generate.scm
+++ b/scm/documentation-generate.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;; Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;; File entry point for generated documentation
@@ -98,7 +98,7 @@
 @titlefont{Internals Reference}
 @author The LilyPond development team
 
-Copyright @copyright{} 1999--2008 by the authors
+Copyright @copyright{} 1999--2009 by the authors
 
 @vskip 20pt
 
diff --git a/scm/documentation-lib.scm b/scm/documentation-lib.scm
index 0c9a1f117b..ba434f1947 100644
--- a/scm/documentation-lib.scm
+++ b/scm/documentation-lib.scm
@@ -3,7 +3,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (use-modules (oop goops)
diff --git a/scm/editor.scm b/scm/editor.scm
index 94bc0ae708..01e9244761 100644
--- a/scm/editor.scm
+++ b/scm/editor.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2005--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2005--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define-module (scm editor))
 
diff --git a/scm/encoding.scm b/scm/encoding.scm
index d500c0c270..9a441ac881 100644
--- a/scm/encoding.scm
+++ b/scm/encoding.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2004--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define-public latin1-coding-vector
   #(.notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef
diff --git a/scm/file-cache.scm b/scm/file-cache.scm
index fda853fa61..7df106891e 100644
--- a/scm/file-cache.scm
+++ b/scm/file-cache.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
 (define cache-hash-tab  (make-hash-table 11))
diff --git a/scm/font.scm b/scm/font.scm
index d05cc2fd78..c29258860c 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;; TODO:
 ;;
diff --git a/scm/framework-eps.scm b/scm/framework-eps.scm
index df0a4d0fa6..7383f3181c 100644
--- a/scm/framework-eps.scm
+++ b/scm/framework-eps.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-module (scm framework-eps))
 
diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index c091a44f47..c183fb0de5 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-module (scm framework-ps))
 
diff --git a/scm/framework-svg.scm b/scm/framework-svg.scm
index 9b74aef9fe..b2e0b5604d 100644
--- a/scm/framework-svg.scm
+++ b/scm/framework-svg.scm
@@ -3,7 +3,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2004--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define-module (scm framework-svg))
 
diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm
index e4da9f08d4..fab6868fd3 100644
--- a/scm/fret-diagrams.scm
+++ b/scm/fret-diagrams.scm
@@ -2,51 +2,40 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2008 Carl D. Sorensen <c_sorensen@byu.edu>
+;;;; (c) 2004--2009 Carl D. Sorensen <c_sorensen@byu.edu>
 
-(define (fret-parse-marking-list marking-list fret-count)
-  (let* ((fret-range (list 1 fret-count))
-         (capo-fret 0)
-         (barre-list '())
-         (dot-list '())
-         (xo-list '())
-         (output-alist '()))
-    (let parse-item ((mylist marking-list))
-      (if (not (null? mylist))
-          (let* ((my-item (car mylist)) (my-code (car my-item)))
-            (cond
-             ((or (eq? my-code 'open)(eq? my-code 'mute))
-              (set! xo-list (cons* my-item xo-list)))
-             ((eq? my-code 'barre)
-              (set! barre-list (cons* (cdr my-item) barre-list)))
-             ((eq? my-code 'capo)
-               (set! capo-fret (cadr my-item)))
-             ((eq? my-code 'place-fret)
-              (set! dot-list (cons* (cdr my-item) dot-list))))
-            (parse-item (cdr mylist)))))
-    ;; calculate fret-range
-    (let ((maxfret 0) 
-          (minfret (if (> capo-fret 0) capo-fret 99)))
-      (let updatemax ((fret-list dot-list))
-        (if (null? fret-list)
-            '()
-            (let ((fretval (second (car fret-list))))
-              (if (> fretval maxfret) (set! maxfret fretval))
-              (if (< fretval minfret) (set! minfret fretval))
-              (updatemax (cdr fret-list)))))
-      (if (> maxfret fret-count)
-          (set! fret-range
-                (list minfret
-                      (let ((upfret (- (+ minfret fret-count) 1)))
-                        (if (> maxfret upfret) maxfret upfret)))))
-      (set! capo-fret (1+ (- capo-fret minfret)))
-      ; subtract fret from dots
-      (set! dot-list (subtract-base-fret (- (car fret-range) 1) dot-list)))
-    (acons 'fret-range fret-range
-           (acons 'barre-list barre-list
-                  (acons 'dot-list dot-list
-                         (acons 'xo-list xo-list 
-                                (acons 'capo-fret capo-fret '())))))))
+;
+;  Utility functions
+;
+;
+    
+(define (cons-fret new-value old-list)
+  "Put together a fret-list in the format desired by parse-string"
+  (if (eq? old-list '())
+      (list new-value)
+      (cons* new-value old-list)))
+
+(define (get-numeric-from-key keystring)
+  "Get the numeric value from a key of the form k:val"
+  (string->number (substring keystring 2 (string-length keystring))))
+
+(define (numerify mylist)
+  "Convert string values to numeric or character"
+  (if (null? mylist)
+      '()
+      (let ((numeric-value (string->number (car mylist))))
+        (if numeric-value
+            (cons* numeric-value (numerify (cdr mylist)))
+            (cons* (car (string->list (car mylist)))
+                   (numerify (cdr mylist)))))))
+
+(define (stepmag mag)
+  "Calculate the font step necessary to get a desired magnification"
+  (* 6 (/ (log mag) (log 2))))
+
+(define (fret-count fret-range)
+ "Calculate the fret count for the diagram given the range of frets in the diagram."
+ (1+ (- (cdr fret-range) (car fret-range))))
 
 (define (subtract-base-fret base-fret dot-list)
   "Subtract @var{base-fret} from every fret in @var{dot-list}"
@@ -59,6 +48,149 @@
                          (third this-list)))
                (subtract-base-fret base-fret (cdr dot-list))))))
 
+(define (make-bezier-sandwich-list start stop base height 
+         half-thickness orientation)
+  "Make the argument list for a bezier sandwich from
+string coordinate @var{start} to string-coordinate @var{stop} with a 
+baseline at fret coordinate @var{base}, a height of
+@var{height}, and a half thickness of @var{half-thickness}."
+  (let* ((width (+ (- stop start) 1))
+         (cp-left-width (+ (* width half-thickness) start))
+         (cp-right-width (- stop (* width half-thickness)))
+         (bottom-control-point-height 
+           (- base (- height half-thickness)))
+         (top-control-point-height
+           (- base height))
+         (left-end-point 
+          (stencil-coordinates base start orientation))
+         (right-end-point
+          (stencil-coordinates base stop orientation))
+         (left-upper-control-point
+          (stencil-coordinates 
+            top-control-point-height cp-left-width orientation))
+         (left-lower-control-point
+          (stencil-coordinates 
+            bottom-control-point-height cp-left-width orientation))
+         (right-upper-control-point
+          (stencil-coordinates 
+            top-control-point-height cp-right-width orientation))
+         (right-lower-control-point
+          (stencil-coordinates 
+            bottom-control-point-height cp-right-width orientation)))
+    ; order of bezier control points is:
+    ;    left cp low, right cp low, right end low, left end low
+    ;    right cp high, left cp high, left end high, right end high.
+    ;
+   (list left-lower-control-point
+         right-lower-control-point
+         right-end-point
+         left-end-point
+         right-upper-control-point
+         left-upper-control-point
+         left-end-point
+         right-end-point)))
+
+(define (drop-paren item-list)
+  "Drop a final parentheses from a fret indication list
+@code{item-list} resulting from a terse string specification of barre."
+  (if (> (length item-list) 0)
+      (let* ((max-index (- (length item-list) 1))
+             (last-element (car (list-tail item-list max-index))))
+        (if (or (equal? last-element ")") (equal? last-element "("))
+            (list-head item-list max-index)
+            item-list))
+      item-list))
+
+(define (get-sub-list value master-list)
+  "Get a sub-list whose cadr is equal to @var{value} from @var{master-list}"
+  (if (eq? master-list '())
+      #f
+      (let ((sublist (car master-list)))
+        (if (equal? (cadr sublist) value)
+            sublist
+            (get-sub-list value (cdr master-list))))))
+
+(define (merge-details key alist-list . default)
+  "Return @code{alist-list} entries for @code{key}, in one combined alist.
+There can be two @code{alist-list} entries for a given key. The first
+comes from the override-markup function, the second comes
+from property settings during a regular override.
+This is necessary because some details can be set in one
+place, while others are set in the other.  Both details
+lists must be merged into a single alist.
+Return @code{default} (optional, else #f) if not
+found."
+
+  (define (helper key alist-list default)
+    (if (null? alist-list)
+        default
+        (let* ((handle (assoc key (car alist-list))))
+          (if (pair? handle)
+              (append (cdr handle) (chain-assoc-get key (cdr alist-list) '()))
+              (helper key (cdr alist-list) default)))))
+
+  (helper key alist-list
+          (if (pair? default) (car default) #f)))
+
+;
+;  Conversions between fret/string coordinate system and x-y coordinate
+;  system.
+;  
+;  Fret coordinates are measured down the fretboard from the nut,
+;   starting at 0.
+;
+; String coordinates are measured from the lowest string, starting at 0.
+;
+; The x-y origin is at the intersection of the nut and the lowest string.
+;
+; X coordinates are positive to the right.
+; Y coordinates are positive up.
+;
+
+(define (negate-extent extent)
+  "Return the extent in an axis opposite to the axis of @code{extent}."
+   (cons (- (cdr extent)) (- (car extent))))
+
+(define (stencil-fretboard-extent stencil fretboard-axis orientation)
+  "Return the extent of @code{stencil} in the @code{fretboard-axis} 
+direction."
+  (if (eq? fretboard-axis 'fret)
+  (cond ((eq? orientation 'landscape)
+         (ly:stencil-extent stencil X))
+        ((eq? orientation 'opposing-landscape)
+         (negate-extent (ly:stencil-extent stencil X)))
+        (else
+         (negate-extent (ly:stencil-extent stencil Y))))
+        ; else -- eq? fretboard-axis 'string
+  (cond ((eq? orientation 'landscape)
+         (ly:stencil-extent stencil Y))
+        ((eq? orientation 'opposing-landscape)
+         (negate-extent (ly:stencil-extent stencil Y)))
+        (else
+         (ly:stencil-extent stencil Y)))))
+
+
+(define (stencil-fretboard-offset stencil fretboard-axis orientation)
+ "Return a the stencil coordinates of the center of @code{stencil}
+in the @code{fretboard-axis} direction."
+  (* 0.5 (interval-length 
+           (stencil-fretboard-extent stencil fretboard-axis orientation))))
+
+(define (stencil-coordinates fret-coordinate string-coordinate orientation)
+ "Return a pair @code{(x-coordinate . y-coordinate)} in stencil coordinate 
+system."
+  (cond
+   ((eq? orientation 'landscape)
+    (cons fret-coordinate string-coordinate))
+   ((eq? orientation 'opposing-landscape)
+    (cons (- fret-coordinate) (- string-coordinate)))
+   (else
+    (cons string-coordinate (- fret-coordinate)))))
+ 
+;
+;  Functions that create stencils used in the fret diagram
+;
+
 (define (sans-serif-stencil layout props mag text)
   "Create a stencil in sans-serif font based on @var{layout} and @var{props}
 with magnification @var{mag} of the string @var{text}."
@@ -68,390 +200,704 @@ with magnification @var{mag} of the string @var{text}."
            (prepend-alist-chain 'font-family 'sans props))))
     (interpret-markup layout my-props text)))
 
-(define (draw-strings string-count fret-range th size orientation)
+
+(define (string-stencil string string-count fret-range
+                        th thickness-factor size orientation)
+ "Make a stencil for @code{string}, given the fret-diagram
+overall parameters."
+  (let* ((string-thickness (* th (expt (1+ thickness-factor) string)))
+         (start-coordinates
+           (stencil-coordinates
+             0
+             (* size (1- string))
+             orientation))
+         (end-coordinates
+           (stencil-coordinates
+            (* size (1+ (fret-count fret-range)))
+            (* size (1- string))
+            orientation)))
+   (make-line-stencil
+      string-thickness
+      (car start-coordinates) (cdr start-coordinates)
+      (car end-coordinates) (cdr end-coordinates))))
+
+(define (fret-stencil fret fret-range string-count th size orientation)
+ "Make a stencil for @code{fret}, given the fret-diagram overall parameters."
+ (let* ((start-coordinates 
+         (stencil-coordinates
+           (* size fret)
+           0
+           orientation))
+        (end-coordinates
+         (stencil-coordinates
+          (* size fret)
+          (* size (1- string-count))
+          orientation)))
+  (make-line-stencil
+   th
+   (car start-coordinates) (cdr start-coordinates)
+   (car end-coordinates) (cdr end-coordinates))))
+
+(define (make-straight-barre-stencil 
+          size half-thickness fret-coordinate
+          start-string-coordinate end-string-coordinate orientation)
+  "Create a straight barre stencil."
+  (let ((start-point 
+         (stencil-coordinates
+          (* size fret-coordinate)
+          (* size start-string-coordinate)
+          orientation))
+        (end-point
+         (stencil-coordinates
+          (* size fret-coordinate)
+          (* size end-string-coordinate)
+          orientation)))
+   (make-line-stencil
+     half-thickness
+     (car start-point)
+     (cdr start-point)
+     (car end-point)
+     (cdr end-point))))
+
+(define (make-curved-barre-stencil 
+          size half-thickness fret-coordinate
+          start-string-coordinate end-string-coordinate orientation)
+  "Create a curved barre stencil."
+  (let* ((bezier-thick 0.1)
+         (bezier-height 0.5)
+         (bezier-list 
+           (make-bezier-sandwich-list
+            (* size start-string-coordinate)
+            (* size end-string-coordinate)
+            (* size fret-coordinate)
+            (* size bezier-height)
+            (* size bezier-thick)
+            orientation))
+         (box-lower-left
+          (stencil-coordinates 
+           (+ (* size fret-coordinate) half-thickness)
+           (- (* size start-string-coordinate) half-thickness)
+           orientation))
+         (box-upper-right
+          (stencil-coordinates
+           (- (* size fret-coordinate) (* size bezier-height) half-thickness)
+           (+ (* size end-string-coordinate) half-thickness)
+           orientation))
+         (x-extent (cons (car box-lower-left) (car box-upper-right)))
+         (y-extent (cons (cdr box-lower-left) (cdr box-upper-right))))
+    (ly:make-stencil
+      (list 'bezier-sandwich
+            `(quote ,bezier-list)
+            (* size bezier-thick))
+      x-extent
+      y-extent)))
+
+
+;
+;
+;  Functions used to draw fret-diagram elements
+;
+;
+
+(define (draw-strings string-count fret-range th 
+                      thickness-factor size orientation)
   "Draw the string lines for a fret diagram with
 @var{string-count} strings and frets as indicated in @var{fret-range}.
 Line thickness is given by @var{th}, fret & string spacing by
 @var{size}.  Orientation is determined by @var{orientation}. "
-  (let* ((fret-count (+ (- (cadr fret-range) (car fret-range)) 1))
-         (sl (* (+ fret-count 1) size))
-         (sth (* size th))
-         (gap (- size sth))
-         (string-stencil
-          (if (eq? orientation 'normal)
-              (make-line-stencil sth 0 0 0 sl)
-              (make-line-stencil sth 0 0 sl 0))))
-    (if (= string-count 1)
-        string-stencil
-        (if (eq? orientation 'normal)
-            (ly:stencil-combine-at-edge
-             (draw-strings (- string-count 1) fret-range th size orientation)
-             X RIGHT
-             string-stencil
-             gap)
-            (ly:stencil-combine-at-edge
-             (draw-strings (- string-count 1) fret-range th size orientation)
-             Y UP
-             string-stencil
-             gap)))))
+
+  (define (helper x)
+     (if (null? (cdr x))
+         (string-stencil 
+          (car x) string-count fret-range th
+          thickness-factor size orientation)
+         (ly:stencil-add 
+           (string-stencil 
+            (car x) string-count fret-range th
+            thickness-factor size orientation)
+           (helper (cdr x)))))
+
+  (let* ( (string-list (map 1+ (iota string-count))))
+   (helper string-list)))
 
 (define (draw-fret-lines fret-count string-count th size orientation)
   "Draw @var{fret-count} fret lines for a fret diagram
 with @var{string-count} strings.  Line thickness is given by @var{th},
 fret & string spacing by @var{size}. Orientation is given by @var{orientation}"
-  (let* ((sth (* size th))
-         (gap (- size sth))
-         (fret-line (draw-fret-line string-count th size orientation)))
-    (if (= fret-count 1)
-        fret-line
-        (if (eq? orientation 'normal)
-            (ly:stencil-combine-at-edge
-             (draw-fret-lines
-              (- fret-count 1) string-count th size orientation)
-             Y UP
-             fret-line
-             gap 0)
-            (ly:stencil-combine-at-edge
-             (draw-fret-lines
-              (- fret-count 1) string-count th size orientation)
-             X RIGHT
-             fret-line
-             gap 0)))))
-
-(define (draw-fret-line string-count th size orientation)
-  "Draw a fret line for a fret diagram."
-  (let* ((fret-length (* (- string-count 1) size))
-         (sth (* size th))
-         (half-thickness (* sth 0.5)))
-    (if (eq? orientation 'normal)
-        (make-line-stencil sth half-thickness size
-               (- fret-length half-thickness) size)
-        (make-line-stencil sth 0 half-thickness
-               0 (- fret-length half-thickness)))))
+  (define (helper x)
+     (if (null? (cdr x))
+         (fret-stencil 
+          (car x) fret-count string-count th
+           size orientation)
+         (ly:stencil-add 
+           (fret-stencil 
+            (car x) fret-count string-count th
+            size orientation)
+           (helper (cdr x)))))
+
+  (let* ((fret-list (iota (1+ fret-count))))
+   (helper fret-list)))
 
 (define (draw-thick-zero-fret details string-count th size orientation)
-  "Draw a thick zeroth fret for a fret diagram whose base fret is not 1."
+  "Draw a thick zeroth fret for a fret diagram whose base fret is 1."
   (let* ((sth (* th size))
+         (half-thick (* 0.5 sth))
          (top-fret-thick
-          (* sth (assoc-get 'top-fret-thickness details 3.0)))
-         (half-thick (* sth 0.5))
-         (x1 half-thick)
-         (x2 (+ half-thick (* size (- string-count 1))))
-         (y1 (- half-thick))
-         (y2 (+ top-fret-thick half-thick))
-         (x-extent (cons (- x1) x2))
-         (y-extent (cons sth top-fret-thick)))
-    (if (eq? orientation 'normal)
-        (ly:make-stencil (list 'round-filled-box x1 x2 y1 y2 sth)
-                         x-extent y-extent)
-        (ly:make-stencil (list 'round-filled-box y1 y2 x1 x2 sth)
-                         y-extent x-extent))))
+           (* sth (assoc-get 'top-fret-thickness details 3.0)))
+         (start-string-coordinate (- half-thick))
+         (end-string-coordinate (+ (* size (1- string-count)) half-thick))
+         (start-fret-coordinate half-thick)
+         (end-fret-coordinate (- half-thick top-fret-thick))
+         (lower-left 
+          (stencil-coordinates 
+            start-fret-coordinate start-string-coordinate orientation))
+         (upper-right 
+          (stencil-coordinates 
+            end-fret-coordinate end-string-coordinate orientation)))
+   (make-filled-box-stencil 
+     (cons (car lower-left) (car upper-right))
+     (cons (cdr lower-left) (cdr upper-right)))))
+  
 
 (define (draw-capo details string-count fret fret-count th size 
                    dot-pos orientation)
   "Draw a capo indicator across the full width of the fret-board
-   at fret capo-fret."
-  (let* ((sth (* th size))
-         (capo-thick
-           (* size (assoc-get 'capo-thickness details 0.5)))
-         (half-thick (* capo-thick 0.5))
-         (last-string-pos 0)
-         (first-string-pos (* size (- string-count 1)))
-         (fret-pos ( * size (if (eq? orientation 'normal)
-                                (+ 2 (- fret-count fret dot-pos))
-                                (1- (+ dot-pos fret))))))
-    (if (eq? orientation 'normal)
-        (make-line-stencil capo-thick 
-         last-string-pos fret-pos first-string-pos fret-pos)
-        (make-line-stencil capo-thick
-         fret-pos last-string-pos fret-pos first-string-pos))))
-
+at @var{fret}."
+(let* (;(sth (* th size))
+       (capo-thick
+         (* size (assoc-get 'capo-thickness details 0.5)))
+       (half-thick (* capo-thick 0.5))
+       (last-string-pos 0)
+       (first-string-pos (* size (- string-count 1)))
+       (fret-pos ( * size (1- (+ dot-pos fret))))
+       (start-point 
+         (stencil-coordinates fret-pos first-string-pos orientation))
+       (end-point 
+         (stencil-coordinates fret-pos last-string-pos orientation)))
+  (make-line-stencil
+     capo-thick 
+     (car start-point) (cdr start-point)
+     (car end-point) (cdr end-point))))
 
 (define (draw-frets fret-range string-count th size orientation)
   "Draw the fret lines for a fret diagram with
 @var{string-count} strings and frets as indicated in @var{fret-range}.
 Line thickness is given by @var{th}, fret & string spacing by
 @var{size}. Orientation is given by @var{orientation}."
-  (let* ((fret-count (+ (- (cadr fret-range) (car fret-range)) 1))
-         (fret-length (* (- string-count 1) size))
-         (half-thickness (* th 0.5))
-         (base-fret (car fret-range))
-         (fret-zero (draw-fret-line string-count th size orientation)))
-    (if (eq? orientation 'normal)
-        (ly:stencil-combine-at-edge
-         (draw-fret-lines fret-count string-count th size orientation)
-         Y UP
-         fret-zero
-         (- size th))
-        (ly:stencil-combine-at-edge
-         fret-zero X RIGHT
-         (draw-fret-lines fret-count string-count th size orientation)
-         (- size th)))))
+  (let* ((my-fret-count (fret-count fret-range)))
+   (draw-fret-lines my-fret-count string-count th size orientation)))
 
 (define (draw-dots layout props string-count fret-count
                    size finger-code
                    dot-position dot-radius dot-thickness dot-list orientation)
   "Make dots for fret diagram."
 
-  (let* ((details (chain-assoc-get 'fret-diagram-details props '()))
+  (let* ((details (merge-details 'fret-diagram-details props '()))
          (scale-dot-radius (* size dot-radius))
          (scale-dot-thick (* size dot-thickness))
          (dot-color (assoc-get 'dot-color details 'black))
-         (finger-xoffset -0.25)
-         (finger-yoffset (* -0.5 size ))
+         (finger-label-padding 0.3)
          (dot-label-font-mag
-          (* scale-dot-radius (assoc-get 'dot-label-font-mag details 1.0)))
+           (* scale-dot-radius (assoc-get 'dot-label-font-mag details 1.0)))
          (string-label-font-mag
-          (* size (assoc-get 'string-label-font-mag details 0.6)))
+           (* size 
+             (assoc-get 'string-label-font-mag details 
+                        (cond ((or (eq? orientation 'landscape)
+                                   (eq? orientation 'opposing-landscape))
+                               0.5)
+                              (else  0.6)))))
          (mypair (car dot-list))
          (restlist (cdr dot-list))
          (string (car mypair))
          (fret (cadr mypair))
-         (xpos (* size (if (eq? orientation 'normal)
-                           (- string-count string)
-                           (+ (- fret 1 ) dot-position))))
-         (ypos (* size (if (eq? orientation 'normal)
-                           (+ 2 (- fret-count fret dot-position ))
-                           (- string-count string))))
+         (fret-coordinate (* size (+ (1- fret) dot-position)))
+         (string-coordinate (* size (- string-count string)))
+         (dot-coordinates 
+          (stencil-coordinates fret-coordinate string-coordinate orientation))
          (extent (cons (- scale-dot-radius) scale-dot-radius))
          (finger (caddr mypair))
          (finger (if (number? finger) (number->string finger) finger))
-         (dotstencil (if (eq? dot-color 'white)
-                         (ly:stencil-add
-                          (make-circle-stencil
+         (dot-stencil (if (eq? dot-color 'white)
+                       (ly:stencil-add
+                         (make-circle-stencil
                            scale-dot-radius scale-dot-thick #t)
-                          (ly:stencil-in-color
+                         (ly:stencil-in-color
                            (make-circle-stencil
-                            (- scale-dot-radius (* 0.5 scale-dot-thick))
-                            0  #t)
+                             (- scale-dot-radius (* 0.5 scale-dot-thick))
+                             0  #t)
                            1 1 1))
-                         (make-circle-stencil
-                          scale-dot-radius scale-dot-thick #t)))
-         (positioned-dot (begin
-                           (ly:stencil-translate-axis
-                            (ly:stencil-translate-axis dotstencil xpos X)
-                            ypos Y)))
-         (labeled-dot-stencil
-          (if (or (eq? finger '())(eq? finger-code 'none))
-              positioned-dot
-              (if (eq? finger-code 'in-dot)
-                  (let* ((finger-label
-                          (centered-stencil
-                           (sans-serif-stencil
-                            layout props dot-label-font-mag finger))))
-                    (ly:stencil-translate-axis
-                     (ly:stencil-translate-axis
-                      (ly:stencil-add
-                       dotstencil
-                       (if (eq? dot-color 'white)
-                           finger-label
-                           (ly:stencil-in-color finger-label 1 1 1)))
-                      xpos X)
-                     ypos Y))
-                  (if (eq? finger-code 'below-string)
-                      (ly:stencil-add
-                       positioned-dot
-                       (if (eq? orientation 'normal)
-                           (ly:stencil-translate-axis
-                            (ly:stencil-translate-axis
-                             (centered-stencil
-                              (sans-serif-stencil
-                               layout props string-label-font-mag finger))
-                             xpos X)
-                            (* size finger-yoffset) Y)
-                           (ly:stencil-translate-axis
-                            (ly:stencil-translate-axis
-                             (centered-stencil
-                              (sans-serif-stencil
-                               layout props string-label-font-mag finger))
-                             (* size (+ 2 fret-count finger-yoffset)) X)
-                            ypos Y)))
-                      ;unknown finger-code
-                      positioned-dot)))))
+                       (make-circle-stencil
+                         scale-dot-radius scale-dot-thick #t)))
+         (positioned-dot (translate-stencil dot-stencil dot-coordinates))
+         (labeled-dot-stencil 
+           (cond 
+             ((or (eq? finger '())(eq? finger-code 'none))
+              positioned-dot)
+             ((eq? finger-code 'in-dot)
+              (let ((finger-label 
+                     (centered-stencil
+                       (sans-serif-stencil
+                         layout props dot-label-font-mag finger))))
+              (translate-stencil
+                (ly:stencil-add
+                  dot-stencil
+                  (if (eq? dot-color 'white)
+                      finger-label
+                      (ly:stencil-in-color finger-label 1 1 1)))
+                dot-coordinates)))
+             ((eq? finger-code 'below-string)
+              (let* ((label-stencil 
+                       (centered-stencil 
+                         (sans-serif-stencil
+                           layout props string-label-font-mag
+                           finger)))
+                     (label-fret-offset
+                       (stencil-fretboard-offset 
+                         label-stencil 'fret orientation))
+                     (label-fret-coordinate 
+                       (+ (* size (+ 1 fret-count finger-label-padding))
+                          label-fret-offset))
+                     (label-string-coordinate string-coordinate)
+                     (label-translation 
+                       (stencil-coordinates 
+                         label-fret-coordinate
+                         label-string-coordinate
+                         orientation)))
+                (ly:stencil-add
+                  positioned-dot
+                  (translate-stencil label-stencil label-translation))))
+             (else ;unknown finger-code
+               positioned-dot))))
     (if (null? restlist)
-        labeled-dot-stencil
-        (ly:stencil-add
-         (draw-dots
+      labeled-dot-stencil
+      (ly:stencil-add
+        (draw-dots
           layout props string-count fret-count size finger-code
           dot-position dot-radius dot-thickness restlist orientation)
-         labeled-dot-stencil))))
+        labeled-dot-stencil))))
 
-(define (draw-xo layout props string-count fret-range size xo-list orientation)
+(define (draw-xo 
+          layout props string-count fret-range size xo-list orientation)
   "Put open and mute string indications on diagram, as contained in
 @var{xo-list}."
-  (let* ((details (chain-assoc-get 'fret-diagram-details props '()))
-         (fret-count (+ (- (cadr fret-range) (car fret-range) 1)))
+  (let* ((details (merge-details 'fret-diagram-details props '()))
          (xo-font-mag
-          (* size (assoc-get 'xo-font-magnification details 0.5)))
-         (xo-horizontal-offset (* size -0.35))
+           (* size (assoc-get 
+                    'xo-font-magnification details 
+                    (cond ((or (eq? orientation 'landscape)
+                            (eq? orientation 'opposing-landscape))
+                           0.4)
+                     (else 0.4)))))
          (mypair (car xo-list))
          (restlist (cdr xo-list))
          (glyph-string (if (eq? (car mypair) 'mute)
-                           (assoc-get 'mute-string details "X")
-                           (assoc-get 'open-string details "O")))
-         (xpos
-          (+ (* (- string-count (cadr mypair)) size) xo-horizontal-offset ))
-         (glyph-stencil (if (eq? orientation 'normal)
-                            (ly:stencil-translate-axis
-                             (sans-serif-stencil
-                              layout props (* size xo-font-mag) glyph-string)
-                             xpos X)
-                            (ly:stencil-translate-axis
-                             (sans-serif-stencil
-                              layout props (* size xo-font-mag) glyph-string)
-                             xpos Y))))
+                         (assoc-get 'mute-string details "X")
+                         (assoc-get 'open-string details "O")))
+         (glyph-string-coordinate (* (- string-count (cadr mypair)) size))
+         (glyph-stencil 
+           (centered-stencil
+             (sans-serif-stencil 
+               layout props (* size xo-font-mag) glyph-string)))
+         (glyph-stencil-coordinates 
+           (stencil-coordinates 0 glyph-string-coordinate orientation))
+         (positioned-glyph
+           (translate-stencil glyph-stencil glyph-stencil-coordinates)))
     (if (null? restlist)
-        glyph-stencil
+        positioned-glyph
         (ly:stencil-add
          (draw-xo
           layout props string-count fret-range size restlist orientation)
-         glyph-stencil))))
-
-(define (make-bezier-sandwich-list start stop base height thickness orientation)
-  "Make the argument list for a bezier sandwich from
-@var{start} to @var{stop} with a baseline at @var{base}, a height of
-@var{height}, and a thickness of @var{thickness}.  If @var{orientation} is
-@var{'normal}, @var{base} is a y coordinate, otherwise it's an x coordinate."
-  (let* ((width (+ (- stop start) 1))
-         (x1 (+ (* width thickness) start))
-         (x2 (- stop (* width thickness)))
-         (bottom-control-point-height
-          (if (eq? orientation 'normal)
-              (+ base (- height thickness))
-              (- base (- height thickness))))
-         (top-control-point-height
-          (if (eq? orientation 'normal)
-	      (+ base height)
-	      (- base height))))
- ; order of bezier control points is:
- ;    left cp low, right cp low, right end low, left end low
- ;    right cp high, left cp high, left end high, right end high.
-    (if (eq? orientation 'normal)
-	(list (cons x1 bottom-control-point-height)
-	      (cons x2 bottom-control-point-height)
-	      (cons stop base)
-	      (cons start base)
-	      (cons x2 top-control-point-height)
-	      (cons x1 top-control-point-height)
-	      (cons start base)
-	      (cons stop base))
-	(list (cons bottom-control-point-height x1)
-	      (cons bottom-control-point-height x2)
-	      (cons base stop)
-	      (cons base start)
-	      (cons top-control-point-height x2)
-	      (cons top-control-point-height x1)
-	      (cons base start)
-	      (cons base stop)))))
+         positioned-glyph))))
 
 (define (draw-barre layout props string-count fret-range
-		    size finger-code dot-position dot-radius
-		    barre-list orientation)
+                    size finger-code dot-position dot-radius
+                    barre-list orientation)
   "Create barre indications for a fret diagram"
   (if (not (null? barre-list))
-      (let* ((details (chain-assoc-get 'fret-diagram-details props '()))
-	     (string1 (caar barre-list))
-	     (string2 (cadar barre-list))
-	     (fret (caddar barre-list))
-	     (top-fret (cadr fret-range))
-	     (low-fret (car fret-range))
-	     (barre-type (assoc-get 'barre-type details 'curved))
-	     (scale-dot-radius (* size dot-radius))
-	     (barre-vertical-offset 0.5)
-	     ;; 2 is 1 for empty fret at bottom of figure + 1 for interval
-	     ;; (top-fret - fret + 1) -- not an arbitrary constant
-	     (dot-center-y
-	      (* size (- (+ 2 (- (cadr fret-range) fret)) dot-position)))
-	     (dot-center-fret-coordinate (+ (- fret low-fret) dot-position))
-	     (barre-fret-coordinate
-	      (+ dot-center-fret-coordinate
-		 (* (- barre-vertical-offset 0.5) dot-radius)))
-	     (barre-start-string-coordinate (- string-count string1))
-	     (barre-end-string-coordinate (- string-count string2))
-	     (bottom
-	      (+ dot-center-y (* barre-vertical-offset scale-dot-radius)))
-	     (left (* size (- string-count string1)))
-	     (right (* size (- string-count string2)))
-	     (bezier-thick 0.1)
-	     (bezier-height 0.5)
-	     (bezier-list
-	      (if (eq? orientation 'normal)
-		  (make-bezier-sandwich-list
-		   (* size barre-start-string-coordinate)
-		   (* size barre-end-string-coordinate)
-                   (* size (+ 2 (- top-fret 
-                                   (+ low-fret barre-fret-coordinate))))
-		   (* size bezier-height)
-		   (* size bezier-thick)
-		   orientation)
-		  (make-bezier-sandwich-list
-		   (* size barre-start-string-coordinate)
-		   (* size barre-end-string-coordinate)
-		   (* size barre-fret-coordinate)
-		   (* size bezier-height)
-		   (* size bezier-thick)
-		   orientation)))
+      (let* ((details (merge-details 'fret-diagram-details props '()))
+             (string1 (caar barre-list))
+             (string2 (cadar barre-list))
+             (barre-fret (caddar barre-list))
+             (top-fret (cdr fret-range))
+             (low-fret (car fret-range))
+             (fret (1+ (- barre-fret low-fret)))
+             (barre-vertical-offset 0.5)
+             (dot-center-fret-coordinate (+ (1- fret) dot-position))
+             (barre-fret-coordinate
+              (+ dot-center-fret-coordinate
+                 (* (- barre-vertical-offset 0.5) dot-radius)))
+             (barre-start-string-coordinate (- string-count string1))
+             (barre-end-string-coordinate (- string-count string2))
+             (scale-dot-radius (* size dot-radius))
+             (barre-type (assoc-get 'barre-type details 'curved))
              (barre-stencil
-              (if (eq? barre-type 'straight)
-                  (if (eq? orientation 'normal)
-                      (make-line-stencil scale-dot-radius left dot-center-y
-                                         right dot-center-y)
-                      (make-line-stencil scale-dot-radius
-                             (* size barre-fret-coordinate)
-                             (* size barre-start-string-coordinate)
-                             (* size barre-fret-coordinate)
-                             (* size barre-end-string-coordinate)))
-                  (if (eq? orientation 'normal)
-                      (ly:make-stencil
-                       (list 'bezier-sandwich
-                             `(quote ,bezier-list)
-                             (* size bezier-thick))
-                       (cons left right)
-                       (cons bottom (+ bottom (* size bezier-height))))
-                      (ly:make-stencil
-                       (list 'bezier-sandwich
-                             `(quote ,bezier-list)
-                             (* size bezier-thick))
-                       (cons bottom (+ bottom (* size bezier-height)))
-                       (cons left right))))))
-        (if (not (null? (cdr barre-list)))
+               (cond 
+                 ((eq? barre-type 'straight)
+                  (make-straight-barre-stencil size scale-dot-radius 
+                     barre-fret-coordinate barre-start-string-coordinate
+                     barre-end-string-coordinate orientation))
+                 ((eq? barre-type 'curved)
+                  (make-curved-barre-stencil size scale-dot-radius
+                     barre-fret-coordinate barre-start-string-coordinate
+                     barre-end-string-coordinate orientation)))))
+(if (not (null? (cdr barre-list)))
             (ly:stencil-add
-	     barre-stencil
-	     (draw-barre layout props string-count fret-range size finger-code
-			 dot-position dot-radius (cdr barre-list)))
+             barre-stencil
+             (draw-barre layout props string-count fret-range size finger-code
+                         dot-position dot-radius (cdr barre-list) orientation))
             barre-stencil ))))
 
-(define (stepmag mag)
-  "Calculate the font step necessary to get a desired magnification"
-  (* 6 (/ (log mag) (log 2))))
-
 (define (label-fret layout props string-count fret-range size orientation)
   "Label the base fret on a fret diagram"
-  (let* ((details (chain-assoc-get 'fret-diagram-details props '()))
-	 (base-fret (car fret-range))
-	 (label-font-mag (assoc-get 'fret-label-font-mag details 0.5))
-	 (label-vertical-offset
-	  (assoc-get 'fret-label-vertical-offset details -0.2))
-	 (number-type (assoc-get 'number-type details 'roman-lower))
-	 (fret-count (+ (- (cadr fret-range) (car fret-range)) 1))
-	 (label-text
-	  (cond
-           ((equal? number-type 'roman-lower)
-	    (fancy-format #f "~(~@r~)" base-fret))
-           ((equal? number-type 'roman-upper)
-	    (fancy-format #f "~@r" base-fret))
-           ((equal? 'arabic number-type)
-	    (fancy-format #f "~d" base-fret))
-           (else (fancy-format #f "~(~@r~)" base-fret)))))
-    (if (eq? orientation 'normal)
-	(ly:stencil-translate-axis
-	 (sans-serif-stencil layout props (* size label-font-mag) label-text)
-	 (* size (+ fret-count label-vertical-offset)) Y)
-	(ly:stencil-translate-axis
-	 (sans-serif-stencil layout props (* size label-font-mag) label-text)
-	 (* size (+ 1 label-vertical-offset)) X))))
-
-(define-builtin-markup-command (fret-diagram-verbose layout props marking-list)
+  (let* ((details (merge-details 'fret-diagram-details props '()))
+         (base-fret (car fret-range))
+         (label-font-mag (assoc-get 'fret-label-font-mag details 0.5))
+         (label-space (* 0.5 size))
+         (label-dir (assoc-get 'label-dir details RIGHT))
+         (label-vertical-offset
+           (assoc-get 'fret-label-vertical-offset details 0))
+         (number-type
+           (assoc-get 'number-type details 'roman-lower))
+         (label-text
+           (cond
+             ((equal? number-type 'roman-lower)
+              (fancy-format #f "~(~@r~)" base-fret))
+             ((equal? number-type 'roman-upper)
+              (fancy-format #f "~@r" base-fret))
+             ((equal? 'arabic number-type)
+              (fancy-format #f "~d" base-fret))
+             (else (fancy-format #f "~(~@r~)" base-fret))))
+         (label-stencil
+           (centered-stencil
+             (sans-serif-stencil 
+               layout props (* size label-font-mag) label-text)))
+         (label-half-width 
+           (stencil-fretboard-offset label-stencil 'string orientation))
+         (label-outside-diagram (+ label-space label-half-width)))
+    (translate-stencil
+      label-stencil
+      (stencil-coordinates 
+        (1+ (* size label-vertical-offset))
+        (if (eq? label-dir LEFT)
+            (- label-outside-diagram)
+            (+ (* size (1- string-count)) label-outside-diagram))
+        orientation))))
+
+;;
+;;
+;;  markup commands and associated functions
+;;
+;;
+;;
+
+(define (fret-parse-marking-list marking-list my-fret-count)
+ "Parse a fret-diagram-verbose marking list into component sublists"
+ (let* ((fret-range (cons 1 my-fret-count))
+         (capo-fret 0)
+         (barre-list '())
+         (dot-list '())
+         (xo-list '())
+         (output-alist '()))
+    (let parse-item ((mylist marking-list))
+      (if (not (null? mylist))
+          (let* ((my-item (car mylist)) (my-code (car my-item)))
+            (cond
+             ((or (eq? my-code 'open)(eq? my-code 'mute))
+              (set! xo-list (cons* my-item xo-list)))
+             ((eq? my-code 'barre)
+              (set! barre-list (cons* (cdr my-item) barre-list)))
+             ((eq? my-code 'capo)
+               (set! capo-fret (cadr my-item)))
+             ((eq? my-code 'place-fret)
+              (set! dot-list (cons* (cdr my-item) dot-list))))
+            (parse-item (cdr mylist)))))
+    ;; calculate fret-range
+    (let ((maxfret 0) 
+          (minfret (if (> capo-fret 0) capo-fret 99)))
+      (let updatemax ((fret-list dot-list))  ;CHANGE THIS TO HELPER FUNCTION?
+        (if (null? fret-list)
+            '()
+            (let ((fretval (second (car fret-list))))
+              (if (> fretval maxfret) (set! maxfret fretval))
+              (if (< fretval minfret) (set! minfret fretval))
+              (updatemax (cdr fret-list)))))
+      (if (> maxfret my-fret-count)
+          (set! fret-range
+                (cons minfret
+                      (let ((upfret (- (+ minfret my-fret-count) 1)))
+                        (if (> maxfret upfret) maxfret upfret)))))
+      (set! capo-fret (1+ (- capo-fret minfret)))
+      ; subtract fret from dots
+      (set! dot-list (subtract-base-fret (- (car fret-range) 1) dot-list)))
+    (acons 'fret-range fret-range
+           (acons 'barre-list barre-list
+                  (acons 'dot-list dot-list
+                         (acons 'xo-list xo-list 
+                                (acons 'capo-fret capo-fret '())))))))
+
+(define (make-fret-diagram layout props marking-list)
+  "Make a fret diagram markup"
+  (let* (
+         ; note: here we get items from props that are needed in this routine,
+         ; or that are needed in more than one of the procedures
+         ; called from this routine.  If they're only used in one of the
+         ; sub-procedure, they're obtained in that procedure
+         (size (chain-assoc-get 'size props 1.0)) ; needed for everything
+;TODO -- get string-count directly from length of stringTunings;
+;         from FretBoard engraver, but not from markup call
+         (details (merge-details 'fret-diagram-details props '()))
+         (string-count
+          (assoc-get 'string-count details 6)) ; needed for everything
+         (my-fret-count
+          (assoc-get 'fret-count details 4)) ; needed for everything
+         (orientation
+          (assoc-get 'orientation details 'normal)) ; needed for everything
+         (finger-code
+          (assoc-get
+           'finger-code details 'none)) ; needed for draw-dots and draw-barre
+         (default-dot-radius
+           (if (eq? finger-code 'in-dot) 0.425 0.25)) ; bigger dots if labeled
+         (default-dot-position
+           (if (eq? finger-code 'in-dot)
+               (- 0.95 default-dot-radius)
+               0.6)) ; move up to make room for bigger if labeled
+         (dot-radius
+          (assoc-get
+           'dot-radius details default-dot-radius))  ; needed for draw-dots
+                                                     ; and draw-barre
+         (dot-position
+          (assoc-get
+           'dot-position details default-dot-position)) ; needed for draw-dots
+                                                        ; and draw-barre
+         (th
+          (* (ly:output-def-lookup layout 'line-thickness)
+             (chain-assoc-get 'thickness props 0.5))) ; needed for draw-frets
+                                                      ; and draw-strings
+         (thickness-factor (assoc-get 'string-thickness-factor details 0))
+         (alignment
+          (chain-assoc-get 'align-dir props -0.4)) ; needed only here
+         (xo-padding
+          (* size (assoc-get 'xo-padding details 0.2))) ; needed only here
+         (parameters (fret-parse-marking-list marking-list my-fret-count))
+         (capo-fret (assoc-get 'capo-fret parameters 0))
+         (dot-list (cdr (assoc 'dot-list parameters)))
+         (xo-list (cdr (assoc 'xo-list parameters)))
+         (fret-range (cdr (assoc 'fret-range parameters)))
+         (my-fret-count (fret-count fret-range))
+         (barre-list (cdr (assoc 'barre-list parameters)))
+         (barre-type
+          (assoc-get 'barre-type details 'curved))
+         (fret-diagram-stencil
+          (ly:stencil-add
+           (draw-strings 
+             string-count fret-range th thickness-factor size orientation)
+           (draw-frets fret-range string-count th size orientation))))
+    (if (and (not (null? barre-list))
+             (not (eq? 'none barre-type)))
+        (set! fret-diagram-stencil
+              (ly:stencil-add
+               (draw-barre layout props string-count fret-range size
+                           finger-code dot-position dot-radius
+                           barre-list orientation)
+               fret-diagram-stencil)))
+    (if (not (null? dot-list))
+        (set! fret-diagram-stencil
+              (ly:stencil-add
+               fret-diagram-stencil
+               (draw-dots layout props string-count my-fret-count 
+                          size finger-code dot-position dot-radius
+                          th dot-list orientation))))
+    (if (= (car fret-range) 1)
+        (set! fret-diagram-stencil
+                  (ly:stencil-add
+                     fret-diagram-stencil 
+                     (draw-thick-zero-fret
+                     details string-count th size orientation))))
+    (if (not (null? xo-list))
+     (let* ((diagram-fret-top 
+              (car (stencil-fretboard-extent
+                     fret-diagram-stencil
+                     'fret
+                     orientation)))
+            (xo-stencil 
+              (draw-xo layout props string-count fret-range
+                       size xo-list orientation))
+            (xo-fret-offset
+              (stencil-fretboard-offset
+                xo-stencil 'fret orientation)))
+      (set! fret-diagram-stencil
+        (ly:stencil-add
+          fret-diagram-stencil
+          (translate-stencil
+            xo-stencil
+            (stencil-coordinates
+             (- diagram-fret-top
+                xo-fret-offset
+                (* size xo-padding))
+             0 ; no string offset
+             orientation))))))
+               
+    (if (> capo-fret 0)
+        (set! fret-diagram-stencil
+              (ly:stencil-add
+                fret-diagram-stencil
+                (draw-capo details string-count capo-fret my-fret-count
+                           th size dot-position orientation))))
+    (if (> (car fret-range) 1)
+      (set! fret-diagram-stencil
+        (ly:stencil-add
+           fret-diagram-stencil
+           (label-fret 
+             layout props string-count fret-range size orientation))))
+    (ly:stencil-aligned-to
+      (ly:stencil-aligned-to fret-diagram-stencil X alignment)
+       Y 0)))
+
+(define (fret-parse-definition-string props definition-string)
+ "Parse a fret diagram string and return a pair containing:
+@var{props}, modified as necessary by the definition-string
+a fret-indication list with the appropriate values"
+ (let* ((fret-count 4)
+        (string-count 6)
+        (fret-range (cons 1 fret-count))
+        (barre-list '())
+        (dot-list '())
+        (xo-list '())
+        (output-list '())
+        (new-props '())
+        (details (merge-details 'fret-diagram-details props '()))
+        (items (string-split definition-string #\;)))
+   (let parse-item ((myitems items))
+     (if (not (null? (cdr myitems)))
+         (let ((test-string (car myitems)))
+           (case (car (string->list (substring test-string 0 1)))
+             ((#\s) (let ((size (get-numeric-from-key test-string)))
+                      (set! props (prepend-alist-chain 'size size props))))
+             ((#\f) (let* ((finger-code (get-numeric-from-key test-string))
+                           (finger-id (case finger-code
+                                        ((0) 'none)
+                                        ((1) 'in-dot)
+                                        ((2) 'below-string))))
+                      (set! details
+                            (acons 'finger-code finger-id details))))
+             ((#\c) (set! output-list
+                          (cons-fret
+                           (cons
+                            'barre
+                            (numerify
+                             (string-split (substring test-string 2) #\-)))
+                           output-list)))
+             ((#\h) (let ((fret-count (get-numeric-from-key test-string)))
+                      (set! details
+                            (acons 'fret-count fret-count details))))
+             ((#\w) (let ((string-count (get-numeric-from-key test-string)))
+                      (set! details
+                            (acons 'string-count string-count details))))
+             ((#\d) (let ((dot-size (get-numeric-from-key test-string)))
+                      (set! details
+                            (acons 'dot-radius dot-size details))))
+             ((#\p) (let ((dot-position (get-numeric-from-key test-string)))
+                      (set! details
+                            (acons 'dot-position dot-position details))))
+             (else
+              (let ((this-list (string-split test-string #\-)))
+                (if (string->number (cadr this-list))
+                    (set! output-list
+                          (cons-fret
+                           (cons 'place-fret (numerify this-list))
+                           output-list))
+                    (if (equal? (cadr this-list) "x" )
+                        (set! output-list
+                              (cons-fret
+                               (list 'mute (string->number (car this-list)))
+                               output-list))
+                        (set! output-list
+                              (cons-fret
+                               (list 'open (string->number (car this-list)))
+                               output-list)))))))
+           (parse-item (cdr myitems)))))
+   ;  add the modified details
+   (set! props
+         (prepend-alist-chain 'fret-diagram-details details props))
+   `(,props . ,output-list))) ;ugh -- hard-coded spell -- procedure better
+
+(define-public 
+  (fret-parse-terse-definition-string props definition-string)
+  "Parse a fret diagram string that uses terse syntax; 
+return a pair containing:
+@var{props}, modified to include the string-count determined by the
+definition-string, and
+a fret-indication list with the appropriate values"
+;TODO -- change syntax to fret\string-finger
+
+  (let* ((details (merge-details 'fret-diagram-details props '()))
+         (barre-start-list '())
+         (output-list '())
+         (new-props '())
+         (items (string-split definition-string #\;))
+         (string-count (- (length items) 1)))
+    (let parse-item ((myitems items))
+      (if (not (null? (cdr myitems)))
+          (let* ((test-string (car myitems))
+                 (current-string (- (length myitems) 1))
+                 (indicators (string-split test-string #\ )))
+            (let parse-indicators ((myindicators indicators))
+              (if (not (eq? '() myindicators))
+                  (let* ((this-list (string-split (car myindicators) #\-))
+                         (max-element-index (- (length this-list) 1))
+                         (last-element
+                          (car (list-tail this-list max-element-index)))
+                         (fret
+                          (if (string->number (car this-list))
+                              (string->number (car this-list))
+                              (car this-list))))
+                    (if (equal? last-element "(")
+                        (begin
+                          (set! barre-start-list
+                                (cons-fret (list current-string fret)
+                                           barre-start-list))
+                          (set! this-list
+                                (list-head this-list max-element-index))))
+                    (if (equal? last-element ")")
+                        (let* ((this-barre
+                                (get-sub-list fret barre-start-list))
+                               (insert-index (- (length this-barre) 1)))
+                          (set! output-list
+                                (cons-fret (cons* 'barre
+                                                  (car this-barre)
+                                                  current-string
+                                                  (cdr this-barre))
+                                           output-list))
+                          (set! this-list
+                                (list-head this-list max-element-index))))
+                    (if (number? fret)
+                        (set!
+                         output-list
+                         (cons-fret (cons*
+                                     'place-fret
+                                     current-string
+                                     (drop-paren (numerify this-list)))
+                                    output-list))
+                        (if (equal? (car this-list) "x" )
+                            (set!
+                             output-list
+                             (cons-fret
+                              (list 'mute current-string)
+                              output-list))
+                            (set!
+                             output-list
+                             (cons-fret
+                              (list 'open current-string)
+                              output-list))))
+                    (parse-indicators (cdr myindicators)))))
+            (parse-item (cdr myitems)))))
+    (set! details (acons 'string-count string-count details))
+    (set! props (prepend-alist-chain 'fret-diagram-details details props))
+    `(,props . ,output-list))) ; ugh -- hard coded; proc is better
+
+
+(define-builtin-markup-command 
+  (fret-diagram-verbose layout props marking-list)
   (pair?) ; argument type (list, but use pair? for speed)
   instrument-specific-markup ; markup type
   ((align-dir -0.4) ; properties and defaults
@@ -502,125 +948,6 @@ indications per string.
 
   (make-fret-diagram layout props marking-list))
 
-(define (make-fret-diagram layout props marking-list)
-  "Make a fret diagram markup"
-  (let* (
-         ; note: here we get items from props that are needed in this routine,
-	 ; or that are needed in more than one of the procedures
-	 ; called from this routine.  If they're only used in one of the
-	 ; sub-procedure, they're obtained in that procedure
-         (size (chain-assoc-get 'size props 1.0)) ; needed for everything
-;TODO -- get string-count directly from length of stringTunings;
-;         from FretBoard engraver, but not from markup call
-;TODO -- adjust padding for fret label?  it appears to be too close to dots
-         (details
-	  (chain-assoc-get
-	   'fret-diagram-details props '())) ; fret diagram details
-         (string-count
-	  (assoc-get 'string-count details 6)) ; needed for everything
-         (fret-count
-	  (assoc-get 'fret-count details 4)) ; needed for everything
-         (orientation
-	  (assoc-get 'orientation details 'normal)) ; needed for everything
-         (finger-code
-	  (assoc-get
-	   'finger-code details 'none)) ; needed for draw-dots and draw-barre
-         (default-dot-radius
-	   (if (eq? finger-code 'in-dot) 0.425 0.25)) ; bigger dots if labeled
-         (default-dot-position
-	   (if (eq? finger-code 'in-dot)
-	       (- 0.95 default-dot-radius)
-	       0.6)) ; move up to make room for bigger if labeled
-         (dot-radius
-	  (assoc-get
-	   'dot-radius details default-dot-radius))  ; needed for draw-dots
-                                                     ; and draw-barre
-         (dot-position
-	  (assoc-get
-	   'dot-position details default-dot-position)) ; needed for draw-dots
-                                                        ; and draw-barre
-         (th
-	  (* (ly:output-def-lookup layout 'line-thickness)
-	     (chain-assoc-get 'thickness props 0.5))) ; needed for draw-frets
-                                                      ; and draw-strings
-         (alignment
-	  (chain-assoc-get 'align-dir props -0.4)) ; needed only here
-         (xo-padding
-	  (* size (assoc-get 'xo-padding details 0.2))) ; needed only here
-         (label-space (* 0.25 size))
-         (label-dir (assoc-get 'label-dir details RIGHT))
-         (parameters (fret-parse-marking-list marking-list fret-count))
-         (capo-fret (assoc-get 'capo-fret parameters 0))
-         (dot-list (cdr (assoc 'dot-list parameters)))
-         (xo-list (cdr (assoc 'xo-list parameters)))
-         (fret-range (cdr (assoc 'fret-range parameters)))
-         (fret-count (1+ (- (cadr fret-range) (car fret-range))))
-         (barre-list (cdr (assoc 'barre-list parameters)))
-         (barre-type
-          (assoc-get 'barre-type details 'curved))
-         (fret-diagram-stencil
-	  (ly:stencil-add
-	   (draw-strings string-count fret-range th size orientation)
-	   (draw-frets fret-range string-count th size orientation))))
-    (if (and (not (null? barre-list))
-             (not (eq? 'none barre-type)))
-	(set! fret-diagram-stencil
-	      (ly:stencil-add
-	       (draw-barre layout props string-count fret-range size
-			   finger-code dot-position dot-radius
-			   barre-list orientation)
-	       fret-diagram-stencil)))
-    (if (not (null? dot-list))
-        (set! fret-diagram-stencil
-	      (ly:stencil-add
-	       fret-diagram-stencil
-	       (draw-dots layout props string-count fret-count 
-			  size finger-code dot-position dot-radius
-			  th dot-list orientation))))
-    (if (= (car fret-range) 1)
-	(set! fret-diagram-stencil
-	      (if (eq? orientation 'normal)
-		  (ly:stencil-combine-at-edge
-		   fret-diagram-stencil Y UP
-		   (draw-thick-zero-fret
-		    props string-count th size orientation))
-		  (ly:stencil-combine-at-edge
-		   fret-diagram-stencil X LEFT
-		   (draw-thick-zero-fret
-		    props string-count th size orientation)))))
-    (if (not (null? xo-list))
-	(set! fret-diagram-stencil
-	      (if (eq? orientation 'normal)
-		  (ly:stencil-combine-at-edge
-		   fret-diagram-stencil Y UP
-		   (draw-xo layout props string-count fret-range
-			    size xo-list orientation)
-		   xo-padding )
-		  (ly:stencil-combine-at-edge
-		   fret-diagram-stencil X LEFT
-		   (draw-xo layout props string-count fret-range
-			    size xo-list orientation)
-		   xo-padding))))
-    (if (> capo-fret 0)
-        (set! fret-diagram-stencil
-              (ly:stencil-add
-                fret-diagram-stencil
-                (draw-capo details string-count capo-fret fret-count
-                           th size dot-position orientation))))
-    (if (> (car fret-range) 1)
-	(set! fret-diagram-stencil
-	      (if (eq? orientation 'normal)
-		  (ly:stencil-combine-at-edge
-		   fret-diagram-stencil X label-dir
-		   (label-fret layout props string-count fret-range
-			       size orientation)
-		   label-space)
-		  (ly:stencil-combine-at-edge
-		   fret-diagram-stencil Y label-dir
-		   (label-fret layout props string-count fret-range
-			       size orientation)
-		   label-space))))
-    (ly:stencil-aligned-to fret-diagram-stencil X alignment)))
 
 (define-builtin-markup-command (fret-diagram layout props definition-string)
   (string?) ; argument type
@@ -695,98 +1022,10 @@ by the @code{f:} code.
 Note: There is no limit to the number of fret indications per string.
 @end itemize"
   (let ((definition-list
-	  (fret-parse-definition-string props definition-string)))
+          (fret-parse-definition-string props definition-string)))
     (fret-diagram-verbose-markup
      layout (car definition-list) (cdr definition-list))))
 
-(define (fret-parse-definition-string props definition-string)
- "Parse a fret diagram string and return a pair containing:
-  props, modified as necessary by the definition-string
-  a fret-indication list with the appropriate values"
- (let* ((fret-count 4)
-	(string-count 6)
-	(fret-range (list 1 fret-count))
-	(barre-list '())
-	(dot-list '())
-	(xo-list '())
-	(output-list '())
-	(new-props '())
-	(details (merge-details 'fret-diagram-details props '()))
-	(items (string-split definition-string #\;)))
-   (let parse-item ((myitems items))
-     (if (not (null? (cdr myitems)))
-	 (let ((test-string (car myitems)))
-	   (case (car (string->list (substring test-string 0 1)))
-	     ((#\s) (let ((size (get-numeric-from-key test-string)))
-		      (set! props (prepend-alist-chain 'size size props))))
-	     ((#\f) (let* ((finger-code (get-numeric-from-key test-string))
-			   (finger-id (case finger-code
-					((0) 'none)
-					((1) 'in-dot)
-					((2) 'below-string))))
-		      (set! details
-			    (acons 'finger-code finger-id details))))
-	     ((#\c) (set! output-list
-			  (cons-fret
-			   (cons
-			    'barre
-			    (numerify
-			     (string-split (substring test-string 2) #\-)))
-			   output-list)))
-	     ((#\h) (let ((fret-count (get-numeric-from-key test-string)))
-		      (set! details
-			    (acons 'fret-count fret-count details))))
-	     ((#\w) (let ((string-count (get-numeric-from-key test-string)))
-		      (set! details
-			    (acons 'string-count string-count details))))
-	     ((#\d) (let ((dot-size (get-numeric-from-key test-string)))
-		      (set! details
-			    (acons 'dot-radius dot-size details))))
-	     ((#\p) (let ((dot-position (get-numeric-from-key test-string)))
-		      (set! details
-			    (acons 'dot-position dot-position details))))
-	     (else
-	      (let ((this-list (string-split test-string #\-)))
-		(if (string->number (cadr this-list))
-		    (set! output-list
-			  (cons-fret
-			   (cons 'place-fret (numerify this-list))
-			   output-list))
-		    (if (equal? (cadr this-list) "x" )
-			(set! output-list
-			      (cons-fret
-			       (list 'mute (string->number (car this-list)))
-			       output-list))
-			(set! output-list
-			      (cons-fret
-			       (list 'open (string->number (car this-list)))
-			       output-list)))))))
-	   (parse-item (cdr myitems)))))
-   ;  add the modified details
-   (set! props
-	 (prepend-alist-chain 'fret-diagram-details details props))
-   `(,props . ,output-list))) ;ugh -- hard-coded spell -- procedure better
-
-(define (cons-fret new-value old-list)
-  "Put together a fret-list in the format desired by parse-string"
-  (if (eq? old-list '())
-      (list new-value)
-      (cons* new-value old-list)))
-
-(define (get-numeric-from-key keystring)
-  "Get the numeric value from a key of the form k:val"
-  (string->number (substring keystring 2 (string-length keystring))))
-
-(define (numerify mylist)
-  "Convert string values to numeric or character"
-  (if (null? mylist)
-      '()
-      (let ((numeric-value (string->number (car mylist))))
-	(if numeric-value
-	    (cons* numeric-value (numerify (cdr mylist)))
-	    (cons* (car (string->list (car mylist)))
-		   (numerify (cdr mylist)))))))
-
 (define-builtin-markup-command
   (fret-diagram-terse layout props definition-string)
   (string?) ; argument type
@@ -836,122 +1075,9 @@ with @code{-(} to start a barre and @code{-)} to end the barre.
 @end itemize"
   ;; TODO -- change syntax to fret\string-finger
   (let ((definition-list
-	  (fret-parse-terse-definition-string props definition-string)))
+          (fret-parse-terse-definition-string props definition-string)))
     (fret-diagram-verbose-markup layout
-				 (car definition-list)
-				 (cdr definition-list))))
+                                 (car definition-list)
+                                 (cdr definition-list))))
 
-(define-public 
-  (fret-parse-terse-definition-string props definition-string)
-  "Parse a fret diagram string that uses terse syntax; return a pair containing:
-    props, modified to include the string-count determined by the
-    definition-string, and
-    a fret-indication list with the appropriate values"
-;TODO -- change syntax to fret\string-finger
-
-  (let* ((details (merge-details 'fret-diagram-details props '()))
-	 (barre-start-list '())
-	 (output-list '())
-	 (new-props '())
-	 (items (string-split definition-string #\;))
-	 (string-count (- (length items) 1)))
-    (let parse-item ((myitems items))
-      (if (not (null? (cdr myitems)))
-	  (let* ((test-string (car myitems))
-		 (current-string (- (length myitems) 1))
-		 (indicators (string-split test-string #\ )))
-	    (let parse-indicators ((myindicators indicators))
-	      (if (not (eq? '() myindicators))
-		  (let* ((this-list (string-split (car myindicators) #\-))
-			 (max-element-index (- (length this-list) 1))
-			 (last-element
-			  (car (list-tail this-list max-element-index)))
-			 (fret
-			  (if (string->number (car this-list))
-			      (string->number (car this-list))
-			      (car this-list))))
-		    (if (equal? last-element "(")
-			(begin
-			  (set! barre-start-list
-				(cons-fret (list current-string fret)
-					   barre-start-list))
-			  (set! this-list
-				(list-head this-list max-element-index))))
-		    (if (equal? last-element ")")
-			(let* ((this-barre
-				(get-sub-list fret barre-start-list))
-			       (insert-index (- (length this-barre) 1)))
-			  (set! output-list
-				(cons-fret (cons* 'barre
-						  (car this-barre)
-						  current-string
-						  (cdr this-barre))
-					   output-list))
-			  (set! this-list
-				(list-head this-list max-element-index))))
-		    (if (number? fret)
-			(set!
-			 output-list
-			 (cons-fret (cons*
-				     'place-fret
-				     current-string
-				     (drop-paren (numerify this-list)))
-				    output-list))
-			(if (equal? (car this-list) "x" )
-			    (set!
-			     output-list
-			     (cons-fret
-			      (list 'mute current-string)
-			      output-list))
-			    (set!
-			     output-list
-			     (cons-fret
-			      (list 'open current-string)
-			      output-list))))
-		    (parse-indicators (cdr myindicators)))))
-	    (parse-item (cdr myitems)))))
-    (set! details (acons 'string-count string-count details))
-    (set! props (prepend-alist-chain 'fret-diagram-details details props))
-    `(,props . ,output-list))) ; ugh -- hard coded; proc is better
 
-(define (drop-paren item-list)
-  "Drop a final parentheses from a fret indication list
-   resulting from a terse string specification of barre."
-  (if (> (length item-list) 0)
-      (let* ((max-index (- (length item-list) 1))
-	     (last-element (car (list-tail item-list max-index))))
-	(if (or (equal? last-element ")") (equal? last-element "("))
-	    (list-head item-list max-index)
-	    item-list))
-      item-list))
-
-(define (get-sub-list value master-list)
-  "Get a sub-list whose cadr is equal to @var{value} from @var{master-list}"
-  (if (eq? master-list '())
-      #f
-      (let ((sublist (car master-list)))
-	(if (equal? (cadr sublist) value)
-	    sublist
-	    (get-sub-list value (cdr master-list))))))
-
-(define (merge-details key alist-list . default)
-  "Return ALIST-LIST entries for key, in one combined alist.
-  There can be two ALIST-LIST entries for a given key. The first
-  comes from the override-markup function, the second comes
-  from property settings during a regular override.
-  This is necessary because some details can be set in one
-  place, while others are set in the other.  Both details
-  lists must be merged into a single alist.
-  Return DEFAULT (optional, else #f) if not
-  found."
-
-  (define (helper key alist-list default)
-    (if (null? alist-list)
-	default
-	(let* ((handle (assoc key (car alist-list))))
-	  (if (pair? handle)
-	      (append (cdr handle) (chain-assoc-get key (cdr alist-list) '()))
-	      (helper key (cdr alist-list) default)))))
-
-  (helper key alist-list
-	  (if (pair? default) (car default) #f)))
diff --git a/scm/graphviz.scm b/scm/graphviz.scm
index bc17f6185e..5144977644 100644
--- a/scm/graphviz.scm
+++ b/scm/graphviz.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2007--2008 Joe Neeman <joeneeman@gmail.com>
+;;;; (c) 2007--2009 Joe Neeman <joeneeman@gmail.com>
 
 
 (define-module (scm graphviz)
diff --git a/scm/harp-pedals.scm b/scm/harp-pedals.scm
index 9af6e04dd2..876e392bf0 100644
--- a/scm/harp-pedals.scm
+++ b/scm/harp-pedals.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2008 Reinhold Kainhofer <reinhold@kainhofer.com>
+;;;; (c) 2008--2009 Reinhold Kainhofer <reinhold@kainhofer.com>
 
 
 
diff --git a/scm/kpathsea.scm b/scm/kpathsea.scm
index d9cb71c87f..5b655f6cb6 100644
--- a/scm/kpathsea.scm
+++ b/scm/kpathsea.scm
@@ -4,7 +4,7 @@
 ;;
 ;; source file of the GNU LilyPond music typesetter
 ;;
-;; (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;; (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;
 
 (define-module (scm kpathsea))
diff --git a/scm/layout-beam.scm b/scm/layout-beam.scm
index 040421a98b..09dc09fd8e 100644
--- a/scm/layout-beam.scm
+++ b/scm/layout-beam.scm
@@ -3,7 +3,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
 
 (define ((check-beam-quant posl posr) beam posns)
diff --git a/scm/layout-page-layout.scm b/scm/layout-page-layout.scm
index 715629c3b3..ffd6d632c4 100644
--- a/scm/layout-page-layout.scm
+++ b/scm/layout-page-layout.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2004--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;	      Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-module (scm layout-page-layout)
diff --git a/scm/layout-slur.scm b/scm/layout-slur.scm
index 6b80a586ec..e153c0cf79 100644
--- a/scm/layout-slur.scm
+++ b/scm/layout-slur.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 				;
 ; this is put into the slur-details property of Slur and PhrasingSlur
 (define default-slur-details
diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index 8176db1d7b..3cc4c5201b 100644
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -3,7 +3,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -586,11 +586,19 @@ possibly turned off."
 ;; don't confuse users with #<procedure .. > syntax. 
 ;; 
 (define-public (scm->string val)
-  (if (and (procedure? val) (symbol? (procedure-name val)))
+  (if (and (procedure? val)
+	   (symbol? (procedure-name val)))
       (symbol->string (procedure-name val))
       (string-append
-       (if (self-evaluating? val) "" "'")
-       (call-with-output-string (lambda (port) (display val port))))))
+       (if (self-evaluating? val)
+	   (if (string? val)
+	       "\""
+	       "")
+	   "'")
+       (call-with-output-string (lambda (port) (display val port)))
+       (if (string? val)
+	   "\""
+	   ""))))
 
 (define-public (!= lst r)
   (not (= lst r)))
diff --git a/scm/lily.scm b/scm/lily.scm
index 086d80f09f..c39b243648 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -1,17 +1,19 @@
-;;;; lily.scm -- toplevel Scheme stuff
+;;;; lily.scm -- top-level Scheme stuff
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
-;;;; 
-;;;; (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;
+;;;; (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;; Internationalisation: (_i "to be translated") gets an entry in the
-;; POT file (gettext ) must be invoked explicitely to do the actual
+;; POT file; (gettext ...) must be invoked explicitly to do the actual
 ;; "translation".
-;;(define-macro (_i x) x)
-;;(define-macro-public _i (x) x)
-;;(define-public-macro _i (x) x)
+;;
+;; (define-macro (_i x) x)
+;; (define-macro-public _i (x) x)
+;; (define-public-macro _i (x) x)
 ;; Abbrv-PWR!
+
 (defmacro-public _i (x) x)
 
 (read-enable 'positions)
@@ -24,88 +26,144 @@
 
 (define scheme-options-definitions
   `(
-
     ;; NAMING: either
 
     ;; - [subject-]object-object-verb +"ing"
     ;; - [subject-]-verb-object-object
 
-    (anti-alias-factor 1 "render at higher resolution and scale down result\nto prevent jaggies in PNG")
-    (backend ps "which backend to use by default; Options: eps, null, ps [default], scm, svg)")
-    (check-internal-types #f "check every property assignment for types")
-    (clip-systems #f "Generate cut-out snippets of a score")
-    (datadir #f "LilyPond prefix for data files (Readonly).")
-    (debug-gc #f "dump memory debugging statistics")
-    (debug-gc-assert-parsed-dead #f "for memory debugging:
-ensure that all refs to parsed objects are dead.  This is an internal option, and is switched on automatically for -ddebug-gc.") 
-    (debug-lexer #f "debug the flex lexer")
-    (debug-page-breaking-scoring #f "dump scores for many different page breaking configurations")
-    (debug-parser #f "debug the bison parser")
-    (debug-property-callbacks #f "debug cyclic callback chains")
-    (debug-skylines #f "debug skylines")
+    ;; Avoid overlong lines in `lilypond -dhelp'!  Strings should not
+    ;; be longer than 48 characters per line.
+
+    (anti-alias-factor 1
+"Render at higher resolution (using given factor)
+and scale down result to prevent jaggies in
+PNG images.")
+    (backend ps
+"Select backend.  Possible values: 'eps, 'null,
+'ps, 'scm, 'svg.")
+    (check-internal-types #f
+"Check every property assignment for types.")
+    (clip-systems #f
+"Generate cut-out snippets of a score.")
+    (datadir #f
+"LilyPond prefix for data files (read-only).")
+    (debug-gc #f
+"Dump memory debugging statistics.")
+    (debug-gc-assert-parsed-dead #f
+"For memory debugging: Ensure that all
+references to parsed objects are dead.  This is
+an internal option, and is switched on
+automatically for `-ddebug-gc'.")
+    (debug-lexer #f
+"Debug the flex lexer.")
+    (debug-page-breaking-scoring #f
+"Dump scores for many different page breaking
+configurations.")
+    (debug-parser #f
+"Debug the bison parser.")
+    (debug-property-callbacks #f
+"Debug cyclic callback chains.")
+    (debug-skylines #f
+"Debug skylines.")
     (delete-intermediate-files #f
-			       "delete unusable PostScript files")
-    (dump-profile #f "dump memory and time information for each file")
-    (dump-cpu-profile #f "dump timing information (system-dependent)")
-    (dump-signatures #f "dump output signatures of each system.  Used for regression testing.")
-    
-    (eps-box-padding #f "Pad EPS bounding box left edge.  Guarantee alignment between systems in LaTeX.")
+"Delete unusable, intermediate PostScript files.")
+    (dump-profile #f
+"Dump memory and time information for each file.")
+    (dump-cpu-profile #f
+"Dump timing information (system-dependent).")
+    (dump-signatures #f
+"Dump output signatures of each system.  Used for
+regression testing.")
+    (eps-box-padding #f
+"Pad left edge of the output EPS bounding box by
+given amount (in mm).")
     (gs-load-fonts #f
-		   "load fonts via Ghostscript.")
+"Load fonts via Ghostscript.")
     (gs-load-lily-fonts #f
-			"load only lilypond fonts via Ghostscript.")
-    (gui #f "running from gui; redirect stderr to log file")
-    (help #f "show this help.") 
-    (include-book-title-preview #t "include book-titles in preview images.")
-    (include-eps-fonts #t "Include fonts in separate-system EPS files.")
-    (job-count #f "Process in parallel") 
-    (log-file #f "redirect output to log FILE.log")
+"Load only LilyPond fonts via Ghostscript.")
+    (gui #f
+"Run LilyPond from a GUI and redirect stderr to
+a log file.")
+    (help #f
+"Show this help.")
+    (include-book-title-preview #t
+"Include book titles in preview images.")
+    (include-eps-fonts #t
+"Include fonts in separate-system EPS files.")
+    (job-count #f
+"Process in parallel, using the given number of
+jobs.")
+    (log-file #f
+"If string FOO is given as argument, redirect
+output to log file `FOO.log'.")
     (midi-extension ,(if (eq? PLATFORM 'windows)
 			 "mid"
 			 "midi")
-		    "set the default file extension for MIDI")
-
+"Set the default file extension for MIDI output
+file to given string.")
     (old-relative #f
-		  "relative for simultaneous music works
-similar to chord syntax")
-    (point-and-click #t "use point & click")
-    (paper-size "a4" "the default paper size")
-    (pixmap-format "png16m" "GS format to use for pixel images")
-    (preview #f "make a incipit image. ")
-    (print-pages #t "print pages normally. ")
-    (protected-scheme-parsing #t "continue when finding errors in inline
-scheme are caught in the parser. If off, halt 
-on errors, and print a stack trace.")
-    (profile-property-accesses #f "keep statistics of get_property() calls.")
-    
-    (resolution 101 "resolution for generating PNG bitmaps")
-    (read-file-list #f "Read files to be processed from command line arguments")
-    (relative-includes #f "When processing an \\include command, look for the included file
-relative to the current file (instead of the root file)")
-
-    (safe #f "Run safely")
-    (strict-infinity-checking #f "If yes, crash on encountering Inf/NaN.")
-    (strip-output-dir #t "If yes, strip directories from input files.")
-    (separate-log-files #f "Output to FILE.log per file.")
-    (trace-memory-frequency #f "Record Scheme cell usage this many times per second, and dump to file.")
-    (trace-scheme-coverage #f "Record coverage of Scheme files") 
+"Make \\relative mode for simultaneous music work
+similar to chord syntax.")
+    (point-and-click #t
+"Add point & click links to PDF output.")
+    (paper-size "a4"
+"Set default paper size.")
+    (pixmap-format "png16m"
+"Set GhostScript's output format for pixel images.")
+    (preview #f
+"Create PNG and EPS preview images also.")
+    (print-pages #t
+"Print pages in the normal way.")
+    (protected-scheme-parsing #t
+"Continue when errors in inline scheme are caught
+in the parser.  If #f, halt on errors and print
+a stack trace.")
+    (profile-property-accesses #f
+"Keep statistics of get_property() calls.")
+    (resolution 101
+"Set resolution for generating PNG pixmaps to
+given value (in dpi).")
+    (read-file-list #f
+"Specify name of a file which contains a list of
+input files to be processed.")
+    (relative-includes #f
+"When processing an \\include command, look for
+the included file relative to the current file
+(instead of the root file)")
+    (safe #f
+"Run in safer mode.")
+    (strict-infinity-checking #f
+"Force a crash on encountering Inf and NaN
+floating point exceptions.")
+    (strip-output-dir #t
+"Don't use directories from input files while
+constructing output file names.")
+    (separate-log-files #f
+"For input files `FILE1.ly', `FILE2.ly', ...
+output log data to files `FILE1.log',
+`FILE2.log', ...")
+    (trace-memory-frequency #f
+"Record Scheme cell usage this many times per
+second.  Dump results to `FILE.stacks' and
+`FILE.graph'.")
+    (trace-scheme-coverage #f
+"Record coverage of Scheme files in `FILE.cov'.")
     (show-available-fonts #f
-			  "List font names available.")
-    (verbose ,(ly:command-line-verbose?) "value for the --verbose flag")
+"List available font names.")
+    (verbose ,(ly:command-line-verbose?)
+"Value of the --verbose flag (read-only).")
     ))
 
-;; need to do this in the beginning. Other parts of the
-;; Scheme init depend on these options.
-;;
-(for-each
- (lambda (x)
-   (ly:add-option (car x) (cadr x) (caddr x)))
- scheme-options-definitions)
+;; Need to do this in the beginning.  Other parts of the Scheme
+;; initialization depend on these options.
 
-(for-each
- (lambda (x)
-   (ly:set-option (car x) (cdr x)))
- (eval-string (ly:command-line-options)))
+(for-each (lambda (x)
+	    (ly:add-option (car x) (cadr x) (caddr x)))
+	  scheme-options-definitions)
+
+(for-each (lambda (x)
+	    (ly:set-option (car x) (cdr x)))
+	  (eval-string (ly:command-line-options)))
 
 (debug-set! stack 0)
 
@@ -125,41 +183,46 @@ relative to the current file (instead of the root file)")
 	     (srfi srfi-14)
 	     (scm clip-region)
 	     (scm memory-trace)
-	     (scm coverage)
-	     )
-(define-public fancy-format format)
+	     (scm coverage))
+
+(define-public fancy-format
+  format)
+
 (define-public (ergonomic-simple-format dest . rest)
   "Like ice-9 format, but without the memory consumption."
-  
   (if (string? dest)
       (apply simple-format (cons #f (cons dest rest)))
       (apply simple-format (cons dest rest))))
 
-(define format ergonomic-simple-format)
+(define format
+  ergonomic-simple-format)
 
 ;; my display
-(define-public (myd k v) (display k) (display ": ") (display v) (display ", ")
+(define-public (myd k v)
+  (display k)
+  (display ": ")
+  (display v)
+  (display ", ")
   v)
 
 (define-public (print . args)
   (apply format (cons (current-output-port) args)))
 
 
-;;; General settings
-;;; debugging evaluator is slower.  This should
-;;; have a more sensible default.
+;;; General settings.
+;;;
+;;; Debugging evaluator is slower.  This should have a more sensible
+;;; default.
 
 (if (or (ly:get-option 'verbose)
 	(ly:get-option 'trace-memory-frequency)
-	(ly:get-option 'trace-scheme-coverage)
-	)
+	(ly:get-option 'trace-scheme-coverage))
     (begin
       (ly:set-option 'protected-scheme-parsing #f)
       (debug-enable 'debug)
       (debug-enable 'backtrace)
       (read-enable 'positions)))
 
-
 (if (ly:get-option 'trace-scheme-coverage)
     (coverage:enable))
 
@@ -189,17 +252,23 @@ relative to the current file (instead of the root file)")
 
 (case PLATFORM
   ((windows)
-   (define native-getcwd getcwd)
+   (define native-getcwd
+     getcwd)
+
    (define (slashify x)
      (if (string-index x #\\)
 	 x
 	 (string-regexp-substitute
 	  "//*" "/"
 	  (string-regexp-substitute "\\\\" "/" x))))
+
    ;; FIXME: this prints a warning.
    (define-public (ly-getcwd)
      (slashify (native-getcwd))))
-  (else (define-public ly-getcwd getcwd)))
+
+  (else
+   (define-public ly-getcwd
+     getcwd)))
 
 (define-public (is-absolute? file-name)
   (let ((file-name-length (string-length file-name)))
@@ -214,13 +283,11 @@ relative to the current file (instead of the root file)")
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define (type-check-list location signature arguments)
-  "Typecheck a list of arguments against a list of type
-predicates. Print a message at LOCATION if any predicate failed."
-
-  (define (recursion-helper signature arguments count) 
-    (define (helper pred? arg count) 
+  "Typecheck a list of arguments against a list of type predicates.
+Print a message at LOCATION if any predicate failed."
+  (define (recursion-helper signature arguments count)
+    (define (helper pred? arg count)
       (if (not (pred? arg))
-
 	  (begin
 	    (ly:input-message
 	     location
@@ -234,14 +301,12 @@ predicates. Print a message at LOCATION if any predicate failed."
 	#t
 	(and (helper (car signature) (car arguments) count)
 	     (recursion-helper (cdr signature) (cdr arguments) (1+ count)))))
-
   (recursion-helper signature arguments 1))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;  output
 
-
-;;(define-public (output-framework) (write "hello\n"))
+;; (define-public (output-framework) (write "hello\n"))
 
 (define output-ps-module
   (make-module 1021 (list (resolve-interface '(scm output-ps)))))
@@ -251,15 +316,18 @@ predicates. Print a message at LOCATION if any predicate failed."
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Safe definitions utility
-(define safe-objects (list))
+
+(define safe-objects
+  (list))
 
 (define-macro (define-safe-public arglist . body)
-  "Define a variable, export it, and mark it as safe, ie usable in LilyPond safe mode.
-The syntax is the same as `define*-public'."
+  "Define a variable, export it, and mark it as safe, i.e. usable in
+LilyPond safe mode.  The syntax is the same as `define*-public'."
   (define (get-symbol arg)
     (if (pair? arg)
         (get-symbol (car arg))
         arg))
+
   (let ((safe-symbol (get-symbol arglist)))
     `(begin
        (define*-public ,arglist
@@ -281,70 +349,63 @@ The syntax is the same as `define*-public'."
 
 (ly:set-default-scale (ly:make-scale #(0 1 2 5/2 7/2 9/2 11/2)))
 
-
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; other files.
 
-
-(define
-  init-scheme-files
+(define init-scheme-files
   '("lily-library.scm"
-	    "file-cache.scm"
-	    "define-event-classes.scm"
-	    "define-music-types.scm"
-	    "output-lib.scm"
-	    "c++.scm"
-	    "chord-ignatzek-names.scm"
-	    "chord-entry.scm"
-	    "chord-generic-names.scm"
-	    "stencil.scm"
-	    "markup.scm"
-	    "music-functions.scm"
-	    "part-combiner.scm"
-	    "autochange.scm"
-	    "define-music-properties.scm"
-	    "auto-beam.scm"
-	    "chord-name.scm"
-
-	    "parser-ly-from-scheme.scm"
-	    "ly-syntax-constructors.scm"
-	    
-	    "define-context-properties.scm"
-	    "translation-functions.scm"
-	    "script.scm"
-	    "midi.scm"
-	    "layout-beam.scm"
-	    "parser-clef.scm"
-	    "layout-slur.scm"
-	    "font.scm"
-	    "encoding.scm"
-	    
-	    "flag-styles.scm"
-	    "fret-diagrams.scm"
-	    "harp-pedals.scm"
-	    "predefined-fretboards.scm"
-            "define-markup-commands.scm"
-	    "define-grob-properties.scm"
-	    "define-grobs.scm"
-	    "define-grob-interfaces.scm"
-	    "define-stencil-commands.scm"
-	    "titling.scm"
-	    
-	    "paper.scm"
-	    "backend-library.scm"
-	    "x11-color.scm"
-
-	    ;; must be after everything has been defined
-	    "safe-lily.scm"))
-
+    "file-cache.scm"
+    "define-event-classes.scm"
+    "define-music-types.scm"
+    "output-lib.scm"
+    "c++.scm"
+    "chord-ignatzek-names.scm"
+    "chord-entry.scm"
+    "chord-generic-names.scm"
+    "stencil.scm"
+    "markup.scm"
+    "music-functions.scm"
+    "part-combiner.scm"
+    "autochange.scm"
+    "define-music-properties.scm"
+    "auto-beam.scm"
+    "chord-name.scm"
+
+    "parser-ly-from-scheme.scm"
+    "ly-syntax-constructors.scm"
+
+    "define-context-properties.scm"
+    "translation-functions.scm"
+    "script.scm"
+    "midi.scm"
+    "layout-beam.scm"
+    "parser-clef.scm"
+    "layout-slur.scm"
+    "font.scm"
+    "encoding.scm"
+
+    "flag-styles.scm"
+    "fret-diagrams.scm"
+    "harp-pedals.scm"
+    "predefined-fretboards.scm"
+    "define-markup-commands.scm"
+    "define-grob-properties.scm"
+    "define-grobs.scm"
+    "define-grob-interfaces.scm"
+    "define-stencil-commands.scm"
+    "titling.scm"
+
+    "paper.scm"
+    "backend-library.scm"
+    "x11-color.scm"
+
+    ;; must be after everything has been defined
+    "safe-lily.scm"))
 
 (for-each ly:load init-scheme-files)
 
-
 (set! type-p-name-alist
-      `(
-	(,boolean-or-symbol? . "boolean or symbol")
+      `((,boolean-or-symbol? . "boolean or symbol")
 	(,boolean? . "boolean")
 	(,char? . "char")
 	(,grob-list? . "list of grobs")
@@ -371,7 +432,7 @@ The syntax is the same as `define*-public'."
 	(,number-or-string? . "number or string")
 	(,number-pair? . "pair of numbers")
 	(,number? . "number")
-	(,output-port? . "output port")   
+	(,output-port? . "output port")
 	(,pair? . "pair")
 	(,procedure? . "procedure")
 	(,rhythmic-location? . "rhythmic location")
@@ -386,77 +447,67 @@ The syntax is the same as `define*-public'."
 (define (profile-measurements)
   (let* ((t (times))
 	 (stats (gc-stats)))
-    
-    (list
-     (- (+ (tms:cutime t)
-	   (tms:utime t))
-	(ly:assoc-get 'gc-time-taken stats))
-     
-     (ly:assoc-get 'total-cells-allocated  stats 0)
-     )))
+    (list (- (+ (tms:cutime t)
+		(tms:utime t))
+	     (ly:assoc-get 'gc-time-taken stats))
+	  (ly:assoc-get 'total-cells-allocated  stats 0))))
 
 (define (dump-profile base last this)
-  (let*
-      ((outname (format "~a.profile" (dir-basename base ".ly")))
-       (diff (map (lambda (y) (apply - y)) (zip this last))))
-    
+  (let* ((outname (format "~a.profile" (dir-basename base ".ly")))
+	 (diff (map (lambda (y) (apply - y)) (zip this last))))
     (ly:progress "\nWriting timing to ~a..." outname)
     (format (open-file outname "w")
 	    "time: ~a\ncells: ~a\n"
 	    (if (ly:get-option 'dump-cpu-profile)
 		(car diff)
 		0)
-	    (cadr diff)
-	    )))
-
+	    (cadr diff))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; debug mem leaks
+;; debug memory leaks
+
+(define gc-dumping
+  #f)
 
-(define gc-dumping #f)
-(define gc-protect-stat-count 0)
+(define gc-protect-stat-count
+  0)
 
 (define-public (dump-live-object-stats outfile)
-  (for-each
-   (lambda (x)
-     (format outfile "~a: ~a\n" (car x) (cdr x)))
-   (sort (gc-live-object-stats)
-	 (lambda (x y)
-	   (string<? (car x) (car y))))))
+  (for-each (lambda (x)
+	      (format outfile "~a: ~a\n" (car x) (cdr x)))
+	    (sort (gc-live-object-stats)
+		  (lambda (x y)
+		    (string<? (car x) (car y))))))
 
 (define-public (dump-gc-protects)
   (set! gc-protect-stat-count (1+ gc-protect-stat-count))
-  (let* ((protects (sort
-		    (hash-table->alist (ly:protects))
-		    (lambda (a b)
-		      (< (object-address (car a))
-			 (object-address (car b))))))
-
+  (let* ((protects (sort (hash-table->alist (ly:protects))
+			 (lambda (a b)
+			   (< (object-address (car a))
+			      (object-address (car b))))))
 	 (out-file-name (string-append
 			 "gcstat-" (number->string gc-protect-stat-count)
 			 ".scm"))
-	 (outfile    (open-file  out-file-name  "w")))
-
+	 (outfile (open-file out-file-name "w")))
     (set! gc-dumping #t)
     (display (format "Dumping GC statistics ~a...\n" out-file-name))
-    (display
-     (map (lambda (y)
-	    (let ((x (car y))
-		  (c (cdr y)))
-	      (display 
-	       (format "~a (~a) = ~a\n" (object-address x) c x)
-	       outfile)))
-	  (filter
-	   (lambda (x)
-	     (not (symbol? (car x))))
-	   protects))
-     outfile)
-
+    (display (map (lambda (y)
+		    (let ((x (car y))
+			  (c (cdr y)))
+		      (display
+		       (format "~a (~a) = ~a\n" (object-address x) c x)
+		       outfile)))
+		  (filter
+		   (lambda (x)
+		     (not (symbol? (car x))))
+		   protects))
+	     outfile)
     (format outfile "\nprotected symbols: ~a\n"
-	    (apply + (map (lambda (obj-count) (if (symbol? (car obj-count))
-						  (cdr obj-count)
-						  0))
-			     protects)))	     
+	    (apply + (map (lambda (obj-count)
+			    (if (symbol? (car obj-count))
+				(cdr obj-count)
+				0))
+			  protects)))
 
     ;; (display (ly:smob-protects))
     (newline outfile)
@@ -470,188 +521,146 @@ The syntax is the same as `define*-public'."
 	  (ly:set-option 'debug-gc-assert-parsed-dead #t)
 	  (gc)
 	  (ly:set-option 'debug-gc-assert-parsed-dead #f)
-
 	  (set! stats (gc-live-object-stats))
 	  (display "Dumping live object statistics.\n")
 	  (dump-live-object-stats outfile)))
-
     (newline outfile)
-    (let*
-	((stats (gc-stats)))
-      
-      (for-each
-       (lambda (sym)
-	 (display
-	  (format "~a ~a ~a\n"
-		  gc-protect-stat-count
-		  sym
-		  (let ((sym-stat (assoc sym stats)))
-		    (if sym-stat 
-			(cdr sym-stat)
-			"?")))
-	  outfile))
-       '(protected-objects bytes-malloced cell-heap-size
-			   
-			   )))
-
+    (let* ((stats (gc-stats)))
+      (for-each (lambda (sym)
+		  (display
+		   (format "~a ~a ~a\n"
+			   gc-protect-stat-count
+			   sym
+			   (let ((sym-stat (assoc sym stats)))
+			     (if sym-stat
+				 (cdr sym-stat)
+				 "?")))
+		   outfile))
+		'(protected-objects bytes-malloced cell-heap-size)))
     (set! gc-dumping #f)
-    (close-port outfile)
-    
-    ))
-
+    (close-port outfile)))
 
 (define (check-memory)
-  "read /proc/self to check up on memory use." 
+  "Read `/proc/self' to check up on memory use."
   (define (gulp-file name)
     (let* ((file (open-input-file name))
 	   (text (read-delimited "" file)))
       (close file)
       text))
-  (let*
-      ((stat (gulp-file "/proc/self/status"))
-       (lines (string-split stat #\newline))
-       (interesting (filter identity
-			    (map
-			     (lambda (l)
-			       (string-match "^VmData:[ \t]*([0-9]*) kB" l))
-			     lines)))
-       (mem (string->number (match:substring (car interesting) 1)))
-       )
-
-    
+
+  (let* ((stat (gulp-file "/proc/self/status"))
+	 (lines (string-split stat #\newline))
+	 (interesting (filter identity
+			      (map
+			       (lambda (l)
+				 (string-match "^VmData:[ \t]*([0-9]*) kB" l))
+			       lines)))
+	 (mem (string->number (match:substring (car interesting) 1))))
     (display (format  "VMDATA: ~a\n" mem))
     (display (gc-stats))
     (if (> mem 100000)
-	(begin
-	  (dump-gc-protects)
-	  (raise 1)))
-    
-    ))
+	(begin (dump-gc-protects)
+	       (raise 1)))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-
 (define (multi-fork count)
-  "Split this process in COUNT helpers. Returns either a list of pids,
-or the number of the process."
+  "Split this process into COUNT helpers.  Returns either a list of
+PIDs or the number of the process."
   (define (helper count acc)
     (if (> count 0)
-      (let*
-	  ((pid  (primitive-fork)))
-	(if (= pid 0)
-	    (1- count)
-	    (helper (1- count) (cons pid acc))))
-      acc))
+	(let* ((pid (primitive-fork)))
+	  (if (= pid 0)
+	      (1- count)
+	      (helper (1- count) (cons pid acc))))
+	acc))
+
   (helper count '()))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-public (lilypond-main files)
   "Entry point for LilyPond."
-
   (eval-string (ly:command-line-code))
-
   (if (ly:get-option 'help)
-      (begin
-	(ly:option-usage)
-	(exit 0)))
-
+      (begin (ly:option-usage)
+	     (exit 0)))
   (if (ly:get-option 'show-available-fonts)
-      (begin
-	(ly:font-config-display-fonts)
-	(exit 0)
-	))
-  
-  
+      (begin (ly:font-config-display-fonts)
+	     (exit 0)))
   (if (ly:get-option 'gui)
       (gui-main files))
-
   (if (null? files)
-      (begin
-	(ly:usage)
-	(exit 2)))
-
+      (begin (ly:usage)
+	     (exit 2)))
   (if (ly:get-option 'read-file-list)
       (set! files
 	    (filter (lambda (s)
 		      (> (string-length s) 0))
 		    (apply append
-			   (map (lambda (f) (string-split (ly:gulp-file f) #\nl))
-				files)))
-	    ))
-  
+			   (map (lambda (f)
+				  (string-split (ly:gulp-file f) #\nl))
+				files)))))
   (if (and (number? (ly:get-option 'job-count))
 	   (>= (length files) (ly:get-option 'job-count)))
-      (let*
-	  ((count (ly:get-option 'job-count))
-	   (split-todo (split-list files count)) 
-	   (joblist (multi-fork count))
-	   (errors '()))
-
+      (let* ((count (ly:get-option 'job-count))
+	     (split-todo (split-list files count))
+	     (joblist (multi-fork count))
+	     (errors '()))
 	(if (not (string-or-symbol? (ly:get-option 'log-file)))
 	    (ly:set-option 'log-file "lilypond-multi-run"))
-	
 	(if (number? joblist)
-	    (begin
-	      (ly:set-option
-	       'log-file (format "~a-~a"
-				 (ly:get-option 'log-file) joblist))
-	      (set! files (vector-ref split-todo joblist)))
-
-	    (begin
-	      (ly:progress "\nForking into jobs:  ~a\n" joblist)
-	      (for-each
-	       (lambda (pid)
-		 (let* ((stat (cdr (waitpid pid))))
-		   
-		   (if (not (= stat 0))
-		       (set! errors
-			     (acons (list-element-index joblist pid)
-				    stat errors)))))
-	       joblist)
-
-	      (for-each
-	       (lambda (x)
-		 (let* ((job (car x))
-			(state (cdr x))
-			(logfile (format "~a-~a.log"
-					  (ly:get-option 'log-file) job))
-			(log (ly:gulp-file logfile))
-			(len (string-length log))
-			(tail (substring  log (max 0 (- len 1024)))))
-
-		   (if (status:term-sig state)
-		       (ly:message
-			"\n\n~a\n"
-			(format (_ "job ~a terminated with signal: ~a")
-				job (status:term-sig state)))
-		       (ly:message
-			(_ "logfile ~a (exit ~a):\n~a")
-			logfile (status:exit-val state) tail))))
-
-	       errors)
-
-	      (if (pair? errors)
-		  (ly:error "Children ~a exited with errors." (map car errors)))
-
-	      ;; must overwrite individual entries
-	      (if (ly:get-option 'dump-profile)
-		  (dump-profile "lily-run-total" '(0 0) (profile-measurements)))
-
-	    (exit (if (null? errors) 0 1))))))
-	   
+	    (begin (ly:set-option
+		    'log-file (format "~a-~a"
+				      (ly:get-option 'log-file) joblist))
+		   (set! files (vector-ref split-todo joblist)))
+	    (begin (ly:progress "\nForking into jobs:  ~a\n" joblist)
+		   (for-each
+		    (lambda (pid)
+		      (let* ((stat (cdr (waitpid pid))))
+			(if (not (= stat 0))
+			    (set! errors
+				  (acons (list-element-index joblist pid)
+					 stat errors)))))
+		    joblist)
+		   (for-each
+		    (lambda (x)
+		      (let* ((job (car x))
+			     (state (cdr x))
+			     (logfile (format "~a-~a.log"
+					      (ly:get-option 'log-file) job))
+			     (log (ly:gulp-file logfile))
+			     (len (string-length log))
+			     (tail (substring  log (max 0 (- len 1024)))))
+			(if (status:term-sig state)
+			    (ly:message
+			     "\n\n~a\n"
+			     (format (_ "job ~a terminated with signal: ~a")
+				     job (status:term-sig state)))
+			    (ly:message
+			     (_ "logfile ~a (exit ~a):\n~a")
+			     logfile (status:exit-val state) tail))))
+		    errors)
+		   (if (pair? errors)
+		       (ly:error "Children ~a exited with errors."
+				 (map car errors)))
+		   ;; must overwrite individual entries
+		   (if (ly:get-option 'dump-profile)
+		       (dump-profile "lily-run-total"
+				     '(0 0) (profile-measurements)))
+		   (exit (if (null? errors)
+			     0
+			     1))))))
   (if (string-or-symbol? (ly:get-option 'log-file))
       (ly:stderr-redirect (format "~a.log" (ly:get-option 'log-file)) "w"))
-  
   (let ((failed (lilypond-all files)))
     (if (ly:get-option 'trace-scheme-coverage)
 	(begin
-	  (coverage:show-all (lambda (f) (string-contains f "lilypond"))
-			     )))
-    
+	  (coverage:show-all (lambda (f)
+			       (string-contains f "lilypond")))))
     (if (pair? failed)
-	(begin
-	  (ly:error (_ "failed files: ~S") (string-join failed))
-	  (exit 1))
+	(begin (ly:error (_ "failed files: ~S") (string-join failed))
+	       (exit 1))
 	(begin
 	  ;; HACK: be sure to exit with single newline
 	  (ly:message "")
@@ -668,59 +677,44 @@ or the number of the process."
 	 (do-measurements (ly:get-option 'dump-profile))
 	 (handler (lambda (key failed-file)
 		    (set! failed (append (list failed-file) failed)))))
-
     (gc)
     (for-each
      (lambda (x)
-       (let*
-	   ((start-measurements (if do-measurements
-				    (profile-measurements)
-				    #f))
-	    (base (dir-basename x ".ly"))
-	    (all-settings (ly:all-options)))
-
+       (let* ((start-measurements (if do-measurements
+				      (profile-measurements)
+				      #f))
+	      (base (dir-basename x ".ly"))
+	      (all-settings (ly:all-options)))
 	 (if separate-logs
 	     (ly:stderr-redirect (format "~a.log" base) "w"))
 	 (if ping-log
 	     (format ping-log "Procesing ~a\n" base))
-	      
-	 (if (ly:get-option 'trace-memory-frequency) 
+	 (if (ly:get-option 'trace-memory-frequency)
 	     (mtrace:start-trace  (ly:get-option 'trace-memory-frequency)))
-	 
 	 (lilypond-file handler x)
 	 (if start-measurements
 	     (dump-profile x start-measurements (profile-measurements)))
-
 	 (if (ly:get-option 'trace-memory-frequency)
-	     (begin
-	       (mtrace:stop-trace)
-	       (mtrace:dump-results base)))
-	  	 
-	 (for-each
-	  (lambda (s)
-	    (ly:set-option (car s) (cdr s)))
-	  all-settings)
-
+	     (begin (mtrace:stop-trace)
+		    (mtrace:dump-results base)))
+	 (for-each (lambda (s)
+		     (ly:set-option (car s) (cdr s)))
+		   all-settings)
 	 (ly:clear-anonymous-modules)
 	 (ly:set-option 'debug-gc-assert-parsed-dead #t)
 	 (gc)
 	 (ly:set-option 'debug-gc-assert-parsed-dead #f)
-
-	 
 	 (if (ly:get-option 'debug-gc)
 	     (dump-gc-protects)
 	     (if (= (random 40) 1)
 		 (ly:reset-all-fonts)))))
-
      files)
 
     ;; we want the failed-files notice in the aggregrate logfile.
     (if ping-log
 	(format ping-log "Failed files: ~a\n" failed))
-	 
     (if (ly:get-option 'dump-profile)
 	(dump-profile "lily-run-total" '(0 0) (profile-measurements)))
-
     failed))
 
 (define (lilypond-file handler file-name)
@@ -733,7 +727,6 @@ or the number of the process."
 (define-public (gui-main files)
   (if (null? files)
       (gui-no-files-handler))
-
   (if (not (string? (ly:get-option 'log-file)))
       (let* ((base (dir-basename (car files) ".ly"))
 	     (log-name (string-append base ".log")))
@@ -741,17 +734,16 @@ or the number of the process."
 	    (ly:message (_ "Redirecting output to ~a...") log-name))
 	(ly:stderr-redirect log-name "w")
 	(ly:message "# -*-compilation-*-"))
-    
-    (let ((failed (lilypond-all files)))
-      (if (pair? failed)
-	  (begin
-	    ;; ugh
-	    (ly:stderr-redirect "foo" "r")
-	    (system (get-editor-command log-name 0 0 0))
-	    (ly:error (_ "failed files: ~S") (string-join failed))
-	    ;; not reached?
-	    (exit 1))
-	  (exit 0)))))
+      (let ((failed (lilypond-all files)))
+	(if (pair? failed)
+	    (begin
+	      ;; ugh
+	      (ly:stderr-redirect "foo" "r")
+	      (system (get-editor-command log-name 0 0 0))
+	      (ly:error (_ "failed files: ~S") (string-join failed))
+	      ;; not reached?
+	      (exit 1))
+	    (exit 0)))))
 
 (define (gui-no-files-handler)
   (let* ((ly (string-append (ly:effective-prefix) "/ly/"))
diff --git a/scm/markup.scm b/scm/markup.scm
index 5987ad2f4b..89eba1a42b 100644
--- a/scm/markup.scm
+++ b/scm/markup.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2003--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2003--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 "
 Internally markup is stored as lists, whose head is a function.
diff --git a/scm/midi.scm b/scm/midi.scm
index 9a7bcb5e68..cb0c0e6262 100644
--- a/scm/midi.scm
+++ b/scm/midi.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
 
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index bc1cadace7..f9599af572 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;; (use-modules (ice-9 optargs)) 
diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 6a547776b5..c33aff028d 100644
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 3766fa6a4e..6b2e3cff6b 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;;;; Note: currently misused as testbed for titles with markup, see
diff --git a/scm/output-svg.scm b/scm/output-svg.scm
index b6bdb2721c..716f0f1355 100644
--- a/scm/output-svg.scm
+++ b/scm/output-svg.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2002--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2002--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; http://www.w3.org/TR/SVG11
 ;;;; http://www.w3.org/TR/SVG12/ -- page, pageSet in draft
diff --git a/scm/paper.scm b/scm/paper.scm
index 81f1fa78ce..d3e299ddd8 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-public (set-paper-dimension-variables mod)
   (module-define! mod 'dimension-variables
diff --git a/scm/parser-clef.scm b/scm/parser-clef.scm
index d733d7c1d2..b3de9fc405 100644
--- a/scm/parser-clef.scm
+++ b/scm/parser-clef.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
 ;; (name . (glyph clef-position octavation))
diff --git a/scm/parser-ly-from-scheme.scm b/scm/parser-ly-from-scheme.scm
index 0bc41722cc..cfbdcd7cff 100644
--- a/scm/parser-ly-from-scheme.scm
+++ b/scm/parser-ly-from-scheme.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2008  Nicolas Sceaux  <nicolas.sceaux@free.fr>
+;;;; (c) 2004--2009  Nicolas Sceaux  <nicolas.sceaux@free.fr>
 ;;;;           Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define gen-lily-sym
diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm
index ddaa17033f..81beaf6ae7 100644
--- a/scm/part-combiner.scm
+++ b/scm/part-combiner.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2008	Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2009	Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;; todo: figure out how to make module,
 ;; without breaking nested ly scopes
diff --git a/scm/predefined-fretboards.scm b/scm/predefined-fretboards.scm
index c08aa07a8e..6db63bd90a 100644
--- a/scm/predefined-fretboards.scm
+++ b/scm/predefined-fretboards.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPOnd music typesetter
 ;;;;
-;;;; (c) 2008 Carl D. Sorensen <c_sorensen@byu.edu>
+;;;; (c) 2008--2009 Carl D. Sorensen <c_sorensen@byu.edu>
 
 
 (define-public (parse-terse-string terse-definition)
diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index c70dbf8628..cb20163c01 100644
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2005--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2005--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define-module (scm ps-to-png))
 
diff --git a/scm/safe-lily.scm b/scm/safe-lily.scm
index 443e8017b2..43442c975f 100644
--- a/scm/safe-lily.scm
+++ b/scm/safe-lily.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (map
  (lambda (sym)
diff --git a/scm/script.scm b/scm/script.scm
index 5e2a2a9ca0..2a7bbd9755 100644
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-public default-script-alist
   '(("thumb" .
diff --git a/scm/standalone.scm b/scm/standalone.scm
index 7ca15f7608..e761781641 100644
--- a/scm/standalone.scm
+++ b/scm/standalone.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
diff --git a/scm/stencil.scm b/scm/stencil.scm
index 047c0d0bb9..8513c6389a 100644
--- a/scm/stencil.scm
+++ b/scm/stencil.scm
@@ -2,7 +2,14 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2003--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2003--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+(define-public (translate-stencil stencil coordinate-pair)
+  "Translate @code{stencil} by the distances specified in
+@code{coordinate-pair}."
+  (ly:stencil-translate-axis
+    (ly:stencil-translate-axis stencil (cdr coordinate-pair) Y)
+    (car coordinate-pair) X))
 
 (define-public (stack-stencils axis dir padding stils)
   "Stack stencils STILS in direction AXIS, DIR, using PADDING."
@@ -81,6 +88,14 @@
       (interval-widen xext (/ width 2))
       (interval-widen yext (/ width 2)))))
 
+(define-public (make-round-filled-box-stencil xext yext blot-diameter)
+  "Make a filled rounded box."
+  
+  (ly:make-stencil
+      (list 'round-filled-box (- (car xext)) (cdr xext)
+                       (- (car yext)) (cdr yext) blot-diameter)
+      xext yext))
+
 (define-public (make-filled-box-stencil xext yext)
   "Make a filled box."
   
diff --git a/scm/titling.scm b/scm/titling.scm
index d34b7113d4..66f45fc8a5 100644
--- a/scm/titling.scm
+++ b/scm/titling.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2004--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;          Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-public (layout-extract-page-properties layout)
diff --git a/scm/to-xml.scm b/scm/to-xml.scm
index e65f48f0cb..82c563da6b 100644
--- a/scm/to-xml.scm
+++ b/scm/to-xml.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2003--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2003--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define-module (scm to-xml))
diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index db39201789..902da1287d 100644
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;		     Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;; metronome marks
diff --git a/scm/x11-color.scm b/scm/x11-color.scm
index 0183384f26..dee58506be 100644
--- a/scm/x11-color.scm
+++ b/scm/x11-color.scm
@@ -3,7 +3,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2005--2008 Bernard Hurley <bernard@fong-hurley.org.uk>
+;;;; (c) 2005--2009 Bernard Hurley <bernard@fong-hurley.org.uk>
 ;;;;
 
 (define x11-color-list 	    
diff --git a/scripts/auxiliar/fixcc.py b/scripts/auxiliar/fixcc.py
index 167994cdab..34e9a89e55 100755
--- a/scripts/auxiliar/fixcc.py
+++ b/scripts/auxiliar/fixcc.py
@@ -532,7 +532,7 @@ typedef struct _t_ligature
 typedef std::map < AFM_Ligature const *, int > Bar;
 
  /**
- (c) 1997--2008 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2009 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
  
 /*      ||
diff --git a/scripts/build/grand-replace.py b/scripts/build/grand-replace.py
new file mode 100644
index 0000000000..dc0697d475
--- /dev/null
+++ b/scripts/build/grand-replace.py
@@ -0,0 +1,69 @@
+#! @PYTHON@
+
+'''
+    Copyright (c) 2009--210    Jan Nieuwenhuizen <janneke@gnu.org>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2, or (at your option)
+    any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+'''
+
+import datetime
+import os
+import re
+import sys
+#
+sys.path.insert (0, '@top-src-dir@/scripts/build')
+import pytt
+
+dry_run = False
+
+def read_pipe (cmd, ignore_errors=False):
+    pipe = os.popen (cmd)
+    val = pipe.read ()
+    if pipe.close () and not ignore_errors:
+        raise SystemFailed ('Pipe failed: %(cmd)s' % locals ())
+    return val
+
+def filter_out (p, lst):
+    return filter (lambda x: not p (x), lst)
+
+copied_files = [
+    'help2man.pl',
+    'mf2pt1.mp',
+    'mf2pt1.pl',
+    'texinfo.tex',
+    'txi-de.tex',
+    'txi-en.tex',
+    'txi-fr.tex',
+    'txi-sf.tex',
+    ]
+
+def main ():
+    files = filter_out (lambda x: (os.path.basename (x) in copied_files
+                                   or 'CHANGES' in x or 'ChangeLog' in x),
+                        read_pipe ('cd @top-src-dir@ && git ls-files').split ())
+    os.chdir ('@top-src-dir@')
+    year = datetime.datetime.now ().year
+    last_year = year - 1
+    last_year_1d = last_year % 10
+    for f in files:
+        pytt.pytt ('(Copyright|\(c\)|\(C\)|@copyright\{\})\s*%(last_year)s([^-]|$)' % locals (),
+                   r'\1 %(last_year)s--%(year)s' % locals (),
+                   f)
+        pytt.pytt ('(Copyright|\(c\)|\(C\)|@copyright\{\})\s*([^-]*)--(20[0-9][0-%(last_year_1d)s])' % locals (),
+                   r'\1 \2--%(year)s' % locals (),
+                   f)
+
+if __name__ == '__main__':
+    main ()
diff --git a/scripts/build/grand-replace.sh b/scripts/build/grand-replace.sh
deleted file mode 100644
index 86d2608b80..0000000000
--- a/scripts/build/grand-replace.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!@BASH@
-# note: dash does not work
-
-pytt '(Copyright|\(c\)|\(C\)|@copyright\{\})\s*2007' '\1 2007--2008' $(find . -mindepth 2 -type f | grep -Ev 'out/|out-scons|out-www/|.git/|.scon|#|~' | grep -iv 'change')
-pytt '(Copyright|\(c\)|\(C\)|@copyright\{\})\s*([^-]*--)(200[0-7])' '\1 \2\062008' $(find . -mindepth 2 -type f | grep -Ev 'out/|out-scons|out-www/|.git/|.scon|#|~' | grep -iv 'change')
diff --git a/scripts/build/mf-to-table.py b/scripts/build/mf-to-table.py
index 2c1df75f7f..2fe43d2c77 100644
--- a/scripts/build/mf-to-table.py
+++ b/scripts/build/mf-to-table.py
@@ -4,7 +4,7 @@
 #
 # source file of the GNU LilyPond music typesetter
 #
-# (c) 1997--2008 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+# (c) 1997--2009 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 import os
 import sys
diff --git a/scripts/build/pytt.py b/scripts/build/pytt.py
old mode 100644
new mode 100755
index 09f5c7b1f6..8aee66b6c3
--- a/scripts/build/pytt.py
+++ b/scripts/build/pytt.py
@@ -1,24 +1,54 @@
-#!@PYTHON@
+#! /usr/bin/python
+
+'''
+    Copyright (c) 2008--2009
+    Jan Nieuwenhuizen <janneke@gnu.org>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2, or (at your option)
+    any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+'''
 
 import os
 import re
+import stat
 import sys
 
-frm = re.compile (sys.argv[1], re.MULTILINE)
-to = sys.argv[2]
-
-if not sys.argv[3:] or sys.argv[3] == '-':
-	sys.stdout.write (re.sub (frm, to, sys.stdin.read ()))
-for file in sys.argv[3:]:
-	s = open (file).read ()
-	name = os.path.basename (file)
-	base, ext = os.path.splitext (name)
-	t = re.sub (frm, to % locals (), s)
-	if s != t:
-		if 1:
-			os.system ('mv %(file)s %(file)s~~' % locals ())
-			h = open (file, "w")
-			h.write (t)
-			h.close ()
-		else:
-			sys.stdout.write (t)
+dry_run = False
+
+def pytt (from_re, to, file_name):
+    s = file (file_name).read ()
+    name = os.path.basename (file_name)
+    base, ext = os.path.splitext (name)
+    t = re.sub (from_re, to % locals (), s)
+    if s != t:
+        if dry_run:
+            sys.stdout.write (t)
+        else:
+            stat_info = os.stat (file_name)
+            mode = stat.S_IMODE (stat_info[stat.ST_MODE])
+            os.system ('mv --backup=t %(file_name)s %(file_name)s~' % locals ())
+            file (file_name, 'w').write (t)
+            os.chmod (file_name, mode)
+
+def main ():
+    from_re = re.compile (sys.argv[1], re.MULTILINE)
+    to = sys.argv[2]
+    if not sys.argv[3:] or sys.argv[3] == '-':
+        sys.stdout.write (re.sub (from_re, to, sys.stdin.read ()))
+    else:
+        for f in sys.argv[3:]:
+            pytt (from_re, to, f)
+    
+if __name__ == '__main__':
+    main ()
diff --git a/scripts/build/www_post.py b/scripts/build/www_post.py
index 29f80cf09f..21ce380ce3 100644
--- a/scripts/build/www_post.py
+++ b/scripts/build/www_post.py
@@ -35,9 +35,13 @@ static_files = {
     }
 
 for l in langdefs.LANGUAGES:
-    static_files[os.path.join ('Documentation', 'user', outdir, l.file_name ('index', '.html'))] = \
-                                  '<META HTTP-EQUIV="refresh" content="0;URL=../' + l.file_name ('index', '.html') + \
-                                  '">\n<html><body>Redirecting to the documentation index...</body></html>\n'
+    static_files[os.path.join (
+            'Documentation',
+            'user',
+            outdir,
+            l.file_name ('index', '.html'))] = \
+            '<META HTTP-EQUIV="refresh" content="0;URL=../' + l.file_name ('index', '.html') + \
+            '">\n<html><body>Redirecting to the documentation index...</body></html>\n'
 
 for f, contents in static_files.items ():
     open (f, 'w').write (contents)
@@ -46,7 +50,9 @@ sys.stderr.write ("Mirrorring...\n")
 dirs, symlinks, files = mirrortree.walk_tree (
     tree_roots = doc_dirs,
     process_dirs = outdir,
-    exclude_dirs = '(^|/)(' + r'|po|out|out-test|.*?[.]t2d|\w*?-root)(/|$)|Documentation/(' + '|'.join ([l.code for l in langdefs.LANGUAGES]) + ')',
+    exclude_dirs = '(^|/)((' + \
+        r'po|out|out-test|out-cov|.*?[.]t2d|\w*?-root)|^Documentation/(' + \
+        '|'.join ([l.code for l in langdefs.LANGUAGES]) + '))(/|$)',
     find_files = r'.*?\.(?:midi|html|pdf|png|txt|i?ly|signature|css)$|VERSION',
     exclude_files = r'lily-[0-9a-f]+.*\.(pdf|txt)')
 
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 93e345f2ae..cffd859ff7 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -4,7 +4,7 @@
 #
 # source file of the GNU LilyPond music typesetter
 #
-# (c) 1998--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+# (c) 1998--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 #                 Jan Nieuwenhuizen <janneke@gnu.org>
 #
 # converting rules are found in python/convertrules.py
@@ -44,6 +44,9 @@ copyright = ('Jan Nieuwenhuizen <janneke@gnu.org>',
 program_name = os.path.basename (sys.argv[0])
 program_version = '@TOPLEVEL_VERSION@'
 
+authors = ('Jan Nieuwenhuizen <janneke@gnu.org>',
+           'Han-Wen Nienhuys <hanwen@xs4all.nl>')
+
 error_file_write = ly.stderr_write
 
 def warning (s):
@@ -58,17 +61,16 @@ def identify (port=sys.stderr):
 def warranty ():
     identify ()
     ly.encoded_write (sys.stdout, '''
-Copyright (c) %s by
+%s
 
-  Han-Wen Nienhuys
-  Jan Nieuwenhuizen
+%s
 
 %s
 %s
-'''  ( '2001--2006',
-       _ ("Distributed under terms of the GNU General Public License."),
-       _ ('It comes with NO WARRANTY.')))
-
+''' % ( _ ('Copyright (c) %s by') % '2001--2009',
+        ' '.join (authors),
+        _ ('Distributed under terms of the GNU General Public License.'),
+        _ ('It comes with NO WARRANTY.')))
 
 def get_option_parser ():
     p = ly.get_option_parser (usage=_ ("%s [OPTION]... FILE") % 'convert-ly',
@@ -117,7 +119,9 @@ def get_option_parser ():
               action='store',
               dest="to_version",
               default='')
-
+    p.add_option ('-w', '--warranty', help=_ ("show warranty and copyright"),
+           action='store_true',
+           ),
     p.add_option_group ('',
                         description=(
             _ ("Report bugs via %s")
@@ -256,6 +260,9 @@ def do_options ():
     opt_parser = get_option_parser()
     (options, args) = opt_parser.parse_args ()
 
+    if options.warranty:
+        warranty ()
+        sys.exit (0)
 
     if options.from_version:
         options.from_version = str_to_tuple (options.from_version)
diff --git a/scripts/etf2ly.py b/scripts/etf2ly.py
index c9f23aa677..54daa94dec 100644
--- a/scripts/etf2ly.py
+++ b/scripts/etf2ly.py
@@ -34,6 +34,9 @@ import os
 
 program_name = sys.argv[0]
 
+authors = ('Jan Nieuwenhuizen <janneke@gnu.org>',
+           'Han-Wen Nienhuys <hanwen@xs4all.nl>')
+
 version = '@TOPLEVEL_VERSION@'
 if version == '@' + 'TOPLEVEL_VERSION' + '@':
     version = '(unknown version)'           # uGUHGUHGHGUGH
@@ -1162,18 +1165,16 @@ def identify():
 def warranty ():
     identify ()
     sys.stdout.write ('''
-Copyright (c) %s by
+%s
 
- Han-Wen Nienhuys
- Jan Nieuwenhuizen
+  %s
 
 %s
 %s
-''' % ( '2001--2006',
-   _('Distributed under terms of the GNU General Public License.'),
-   _('It comes with NO WARRANTY.')))
-
-
+''' % ( _ ('Copyright (c) %s by') % '2001--2009',
+        '\n  '.join (authors),
+        _ ('Distributed under terms of the GNU General Public License.'),
+        _ ('It comes with NO WARRANTY.')))
 
 def get_option_parser ():
     p = ly.get_option_parser (usage=_ ("%s [OPTION]... ETF-FILE") % 'etf2ly',
diff --git a/scripts/lilymidi.py b/scripts/lilymidi.py
index 22eb8e61f4..b8481b3457 100644
--- a/scripts/lilymidi.py
+++ b/scripts/lilymidi.py
@@ -1,6 +1,6 @@
 #!@TARGET_PYTHON@
 
-# Copyright (C) 2006, 2007 Brailcom, o.p.s.
+# Copyright (c) 2006--2009 Brailcom, o.p.s.
 #
 # Author: Milan Zamazal <pdm@brailcom.org>
 #
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index a0ee6fb0ad..c629201c5d 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -108,12 +108,12 @@ def warranty ():
     ly.encoded_write (sys.stdout, '''
 %s
 
-%s
+  %s
 
 %s
 %s
-''' % ( _ ('Copyright (c) %s by') % '2001--2008',
-        ' '.join (authors),
+''' % ( _ ('Copyright (c) %s by') % '2001--2009',
+        '\n  '.join (authors),
         _ ("Distributed under terms of the GNU General Public License."),
         _ ("It comes with NO WARRANTY.")))
 
diff --git a/scripts/lilypond-invoke-editor.scm b/scripts/lilypond-invoke-editor.scm
index 7ff21871fe..2f4f3e84e5 100644
--- a/scripts/lilypond-invoke-editor.scm
+++ b/scripts/lilypond-invoke-editor.scm
@@ -4,7 +4,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2005--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2005--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;; gui debug helper
 ;; (define (exit x) (system "sleep 10"))
diff --git a/scripts/lilysong.py b/scripts/lilysong.py
index adc6f57526..f02aca7903 100644
--- a/scripts/lilysong.py
+++ b/scripts/lilysong.py
@@ -1,6 +1,6 @@
 #!@TARGET_PYTHON@
 
-# Copyright (C) 2006, 2007 Brailcom, o.p.s.
+# Copyright (c) 2006--2009 Brailcom, o.p.s.
 #
 # Author: Milan Zamazal <pdm@brailcom.org>
 #
diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index ace53d3446..c57c788d51 100644
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -4,7 +4,7 @@
 # 
 # source file of the GNU LilyPond music typesetter
 #
-# (c) 1998--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+# (c) 1998--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 #                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
@@ -57,6 +57,9 @@ allowed_tuplet_clocks = []
 program_name = sys.argv[0]
 program_version = '@TOPLEVEL_VERSION@'
 
+authors = ('Jan Nieuwenhuizen <janneke@gnu.org>',
+           'Han-Wen Nienhuys <hanwen@xs4all.nl>')
+
 errorport = sys.stderr
 
 def identify ():
@@ -65,17 +68,16 @@ def identify ():
 def warranty ():
     identify ()
     ly.encoded_write (sys.stdout, '''
-Copyright (c) %s by
+%s
 
- Han-Wen Nienhuys
- Jan Nieuwenhuizen
+  %s
 
 %s
 %s
-'''  ( '2001--2006',
-   _('Distributed under terms of the GNU General Public License.'),
-   _('It comes with NO WARRANTY.')))
-
+''' % ( _ ('Copyright (c) %s by') % '2001--2009',
+        '\n  '.join (authors),
+        _ ('Distributed under terms of the GNU General Public License.'),
+        _ ('It comes with NO WARRANTY.')))
 
 def progress (s):
     ly.encoded_write (errorport, s + '\n')
diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index 0a100d3932..06e7cb7542 100644
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -2573,7 +2573,7 @@ If the given filename is -, musicxml2ly reads from the command line.
 
     p.version = ('''%prog (LilyPond) @TOPLEVEL_VERSION@\n\n'''
 +
-_ ("""Copyright (c) 2005--2008 by
+_ ("""Copyright (c) 2005--2009 by
     Han-Wen Nienhuys <hanwen@xs4all.nl>,
     Jan Nieuwenhuizen <janneke@gnu.org> and
     Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 834a527409..31c81d2018 100644
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -24,6 +24,8 @@ src-dir = $(top-src-dir)$(tree-dir)
 VPATH = $(src-dir)
 endif
 
+abs-src-dir = $(top-src-dir)$(tree-dir)
+
 .UNEXPORT: build-dir src-dir tree-dir
 
 src-wildcard = $(subst $(src-dir)/,,$(wildcard $(src-dir)/$(1)))
diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index ab28ced9a5..3a7b158aea 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -19,7 +19,7 @@ $(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem
 	TMP=`mktemp -d $(outdir)/pfbtemp.XXXXXXXXX` \
 	&& ( cd $$TMP \
 		&& ln -s ../mf2pt1.mem . \
-		&& MFINPUTS=$(top-src-dir)/mf:..:: $(buildscript-dir)/mf2pt1 $(MF2PT1_OPTIONS) $< $(METAFONT_QUIET)) \
+		&& MFINPUTS=$(abs-src-dir):..:: $(buildscript-dir)/mf2pt1 $(MF2PT1_OPTIONS) $< $(METAFONT_QUIET)) \
 	&& mv $$TMP/*pfb $(outdir); \
 	rm -rf $$TMP
 
diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 05627f18da..4722b0a9d0 100644
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -62,18 +62,16 @@ $(outdir)/%.ps.gz.omf: %.texi
 	$(call GENERATE_OMF,ps.gz)
 
 $(outdir)/%.pdf: $(outdir)/%.texi $(outdir)/version.itexi
-	cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) --batch $(TEXINFO_PAPERSIZE_OPTION) $(<F)
+	cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) -I $(abs-src-dir) --batch $(TEXINFO_PAPERSIZE_OPTION) $(<F)
 
 $(outdir)/%.txt: $(outdir)/%.texi $(outdir)/version.itexi
 	$(MAKEINFO) -I$(src-dir) -I$(outdir) --no-split --no-headers --output $@ $<
 
-$(outdir)/%.texi: %.texi
-	rm -f $@
-	cp $< $@
-
 $(XREF_MAPS_DIR)/%.xref-map: $(outdir)/%.texi
 	$(buildscript-dir)/extract_texi_filenames -o $(XREF_MAPS_DIR) $<
 
+$(outdir)/%.texi: %.texi
+	cp -f $< $@
 
 $(outdir)/version.%: $(top-src-dir)/VERSION
 	echo '@macro version'> $@
@@ -81,4 +79,5 @@ $(outdir)/version.%: $(top-src-dir)/VERSION
 	echo '@end macro'>> $@
 
 .SECONDARY: $(outdir)/version.itexi $(outdir)/version.texi \
-  $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep
+  $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep \
+  $(outdir)/*.texi
diff --git a/stepmake/stepmake/texinfo-targets.make b/stepmake/stepmake/texinfo-targets.make
index 492e1f6366..6754b77f5f 100644
--- a/stepmake/stepmake/texinfo-targets.make
+++ b/stepmake/stepmake/texinfo-targets.make
@@ -4,7 +4,7 @@ default: $(INFO_FILES)
 
 local-WWW-1: $(XREF_MAPS_FILES)
 
-local-doc: $(OUTTXT_FILES)
+local-doc:  $(OUTTXT_FILES)
 
 check-info: texinfo-all-menus-update
 
diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index ca567b6868..d3d237843c 100644
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -10,7 +10,7 @@ GENERATE_OMF = $(buildscript-dir)/texi2omf --format $(1) --location $(webdir)/$(
 
 TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
 
-MAKEINFO_FLAGS = --enable-encoding
+MAKEINFO_FLAGS += --enable-encoding $(DOCUMENTATION_INCLUDES)
 MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
 
 # texi2html xref map files
@@ -25,6 +25,8 @@ TEXI2HTML_FLAGS += $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)
 TEXI2HTML_INIT = --init-file=$(top-src-dir)/lilypond-texi2html.init
 TEXI2HTML = $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS) $(TEXI2HTML_LANG)
 
+TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES)
+
 ifdef QUIET_BUILD
 TEXI2PDF_FLAGS += -q
 endif
diff --git a/stepmake/stepmake/topdocs-vars.make b/stepmake/stepmake/topdocs-vars.make
index 73adc87046..89786ea768 100644
--- a/stepmake/stepmake/topdocs-vars.make
+++ b/stepmake/stepmake/topdocs-vars.make
@@ -1,2 +1,3 @@
 TO_TOP_FILES=$(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 
+DOCUMENTATION_INCLUDES = -I $(top-src-dir)/Documentation/user
diff --git a/tex/GNUmakefile b/tex/GNUmakefile
index 9f275d7041..64e2653bd9 100644
--- a/tex/GNUmakefile
+++ b/tex/GNUmakefile
@@ -1,7 +1,7 @@
 depth = ..
 
 TEXINFO_FILES = texinfo.tex $(call src-wildcard,txi-*.tex)
-TEX_FILES = $(filter-out $TEXINFO_FILES,$(call src-wildcard,*.tex))
+TEX_FILES = $(filter-out $(TEXINFO_FILES),$(call src-wildcard,*.tex))
 EXTRA_DIST_FILES = $(TEX_FILES) $(TEXINFO_FILES)
 STEPMAKE_TEMPLATES = install install-out