From ad7defd5f5a3d0151a711555c2d680c56ef559c7 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 15 Mar 2000 12:25:58 +0100
Subject: [PATCH] patch::: 1.3.33.jcn3

1.3.33.jcn3
===========

* Added helpful properties instrumentScriptPadding/instrScriptPadding for
  Staff_margin_engraver.

* Removed some empty files, substituted (c) 1999 occurrences.

* Added \property maximumRestCount.  It will prevent showing (or actually:
  moving in case of a collision) more than maximumRestCount similar rests.
  WIP!
---
 CHANGES                                       | 12 +++
 VERSION                                       |  2 +-
 flower/include/timer.hh                       |  1 -
 input/bugs/updownstem.ly                      |  8 ++
 input/test/coriolan-margin.ly                 | 37 +++------
 input/test/maximum-rest-count.ly              | 21 +++++
 lily/align-note-column-engraver.cc            |  2 +-
 lily/all-font-metrics.cc                      |  2 +-
 lily/atom.cc                                  |  1 -
 lily/auto-beam-engraver.cc                    |  2 +-
 lily/auto-change-iterator.cc                  |  2 +-
 lily/auto-change-music.cc                     |  2 +-
 lily/axis-align-item.cc                       |  2 +-
 lily/axis-align-spanner.cc                    |  2 +-
 lily/axis-group-engraver.cc                   |  2 +-
 lily/bar-engraver.cc                          |  2 +-
 lily/bar-script-engraver.cc                   |  2 +-
 lily/beaming-info.cc                          |  2 +-
 lily/boxes.cc                                 |  2 +-
 lily/break-algorithm.cc                       |  2 +-
 lily/break-align-engraver.cc                  |  2 +-
 lily/chord-name.cc                            |  2 +-
 lily/chord.cc                                 |  2 +-
 lily/context-specced-music.cc                 |  2 +-
 lily/debug.cc                                 |  2 +-
 lily/directional-element.cc                   |  2 +-
 lily/dynamic-engraver.cc                      | 26 +++++-
 lily/extender-spanner.cc                      |  2 +-
 lily/folded-repeat-iterator.cc                |  2 +-
 lily/font-metric.cc                           |  2 +-
 lily/global-ctor.cc                           |  2 +-
 lily/grace-align-item.cc                      |  2 +-
 lily/grace-engraver-group.cc                  |  2 +-
 lily/grace-iterator.cc                        |  2 +-
 lily/grace-music.cc                           |  2 +-
 lily/grace-performer-group.cc                 |  2 +-
 lily/grace-position-engraver.cc               |  2 +-
 lily/grace-position-performer.cc              |  2 +-
 lily/group-interface.cc                       |  2 +-
 lily/hara-kiri-engraver.cc                    |  2 +-
 lily/hara-kiri-line-group-engraver.cc         |  2 +-
 lily/hara-kiri-vertical-group-spanner.cc      |  2 +-
 lily/idealspacing.cc                          |  2 +-
 lily/include/audio-element-info.hh            |  2 +-
 lily/include/audio-item.hh                    |  2 +-
 lily/include/audio-staff.hh                   |  2 +-
 lily/include/auto-beam-engraver.hh            |  2 +-
 lily/include/auto-change-iterator.hh          |  2 +-
 lily/include/auto-change-music.hh             |  2 +-
 lily/include/axis-align-item.hh               |  2 +-
 lily/include/axis-group-engraver.hh           |  2 +-
 lily/include/bar-req-collector-engraver.hh    |  2 +-
 lily/include/bar-script-engraver.hh           |  2 +-
 lily/include/beaming.hh                       |  2 +-
 lily/include/bezier-bow.hh                    |  2 +-
 lily/include/break-algorithm.hh               |  2 +-
 lily/include/chord-name.hh                    |  2 +-
 lily/include/chord.hh                         |  2 +-
 lily/include/context-specced-music.hh         |  2 +-
 lily/include/cross-staff.hh                   |  2 +-
 lily/include/directional-element-interface.hh |  2 +-
 lily/include/directional-spanner.hh           |  2 -
 lily/include/engraver.hh                      |  2 +-
 lily/include/extender-spanner.hh              |  2 +-
 lily/include/folded-repeat-iterator.hh        |  2 +-
 lily/include/font-metric.hh                   |  2 +-
 lily/include/global-ctor.hh                   |  2 +-
 lily/include/grace-align-item.hh              |  2 +-
 lily/include/grace-engraver-group.hh          |  2 +-
 lily/include/grace-iterator.hh                |  2 +-
 lily/include/grace-music.hh                   |  2 +-
 lily/include/grace-performer-group.hh         |  2 +-
 lily/include/group-interface.hh               |  2 +-
 lily/include/hara-kiri-engraver.hh            |  2 +-
 lily/include/hara-kiri-line-group-engraver.hh |  2 +-
 .../hara-kiri-vertical-group-spanner.hh       |  2 +-
 lily/include/interpretation-context-handle.hh |  2 +-
 lily/include/key-def.hh                       |  2 +-
 lily/include/leastsquares.hh                  |  2 -
 lily/include/lily-guile.icc                   |  2 +-
 lily/include/lily-version.hh                  |  2 +-
 lily/include/ly-smobs.icc                     |  2 +-
 lily/include/lyric-combine-music-iterator.hh  |  2 +-
 lily/include/lyric-combine-music.hh           |  2 +-
 lily/include/midi-walker.hh                   |  2 +-
 lily/include/moment.hh                        |  2 +-
 lily/include/note-head-side.hh                |  2 -
 lily/include/note-performer.hh                |  2 +-
 lily/include/paper-def.hh                     |  2 +-
 lily/include/paper-score.hh                   |  2 +-
 lily/include/performer-group-performer.hh     |  2 +-
 lily/include/performer.hh                     |  2 +-
 lily/include/property-inspect.hh              |  2 +-
 lily/include/repeated-music.hh                |  2 +-
 lily/include/scm-hash.hh                      |  2 +-
 lily/include/score-element.hh                 |  2 +-
 lily/include/score-performer.hh               |  2 +-
 lily/include/script-column.hh                 |  2 +-
 lily/include/script.hh                        |  2 +-
 lily/include/side-position-interface.hh       |  2 +-
 lily/include/simple-spacer.hh                 |  2 +-
 lily/include/smobs.hh                         |  2 +-
 lily/include/spacing-engraver.hh              |  2 +-
 lily/include/spacing-spanner.hh               |  2 +-
 lily/include/spring.hh                        |  2 +-
 lily/include/staff-bar.hh                     |  2 +-
 lily/include/staff-performer.hh               |  2 +-
 lily/include/staff-symbol-referencer.hh       |  2 +-
 lily/include/tfm-reader.hh                    |  2 +-
 lily/include/tfm.hh                           |  2 +-
 lily/include/tie-performer.hh                 |  2 +-
 lily/include/unfolded-repeat-iterator.hh      |  2 +-
 lily/interpretation-context-handle.cc         |  2 +-
 lily/key-def.cc                               |  2 +-
 lily/key-item.cc                              |  2 +-
 lily/lexer.ll                                 |  2 +-
 lily/lily-version.cc                          |  2 +-
 lily/line-of-score.cc                         |  2 +-
 lily/lyric-combine-music-iterator.cc          |  2 +-
 lily/lyric-combine-music.cc                   |  2 +-
 lily/melisma-engraver.cc                      |  2 +-
 lily/moment.cc                                |  2 +-
 lily/note-name-engraver.cc                    |  2 +-
 lily/note-performer.cc                        |  2 +-
 lily/paper-score.cc                           |  2 +-
 lily/parser.yy                                |  2 +-
 lily/performer-group-performer.cc             |  2 +-
 lily/performer.cc                             |  2 +-
 lily/property-engraver.cc                     |  2 +-
 lily/property-inspect.cc                      |  2 +-
 lily/repeated-music.cc                        |  2 +-
 lily/request.cc                               |  2 +-
 lily/rest-collision-engraver.cc               |  1 +
 lily/rest-collision.cc                        | 79 ++++++++++++++++++-
 lily/scm-hash.cc                              |  2 +-
 lily/score-performer.cc                       |  2 +-
 lily/script-column-engraver.cc                |  2 +-
 lily/script-column.cc                         |  2 +-
 lily/script.cc                                |  2 +-
 lily/simple-spacer.cc                         |  2 +-
 lily/slur.cc                                  |  2 +-
 lily/spacing-engraver.cc                      |  2 +-
 lily/spacing-spanner.cc                       |  2 +-
 lily/spanner.cc                               |  2 +-
 lily/spring.cc                                |  2 +-
 lily/staff-bar.cc                             |  2 +-
 lily/staff-margin-engraver.cc                 | 17 +++-
 lily/staff-symbol-referencer.cc               |  2 +-
 lily/stem.cc                                  |  2 +-
 lily/tfm-reader.cc                            |  2 +-
 lily/tfm.cc                                   |  2 +-
 lily/tie-performer.cc                         |  2 +-
 lily/unfolded-repeat-iterator.cc              |  2 +-
 mutopia/Coriolan/coriolan-paper.ly            |  3 +-
 mutopia/Coriolan/coriolan-part-paper.ly       |  3 +-
 mutopia/Coriolan/coriolan.ly                  |  4 +-
 scm/generic-property.scm                      |  4 +
 157 files changed, 315 insertions(+), 188 deletions(-)
 create mode 100644 input/bugs/updownstem.ly
 create mode 100644 input/test/maximum-rest-count.ly

diff --git a/CHANGES b/CHANGES
index b12d85721c..143b66cbd5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,15 @@
+1.3.33.jcn3
+===========
+
+* Added helpful properties instrumentScriptPadding/instrScriptPadding for
+  Staff_margin_engraver.
+
+* Removed some empty files, substituted (c) 1999 occurrences.
+
+* Added \property maximumRestCount.  It will prevent showing (or actually:
+  moving in case of a collision) more than maximumRestCount similar rests.
+  WIP!
+
 1.3.33.jcn1
 ===========
 
diff --git a/VERSION b/VERSION
index 9712be5b96..bf5765c717 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=33
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/flower/include/timer.hh b/flower/include/timer.hh
index 8b13789179..e69de29bb2 100644
--- a/flower/include/timer.hh
+++ b/flower/include/timer.hh
@@ -1 +0,0 @@
-
diff --git a/input/bugs/updownstem.ly b/input/bugs/updownstem.ly
new file mode 100644
index 0000000000..8d2cabc3f3
--- /dev/null
+++ b/input/bugs/updownstem.ly
@@ -0,0 +1,8 @@
+% silly short upstem?
+\score{
+\context Staff \notes\relative c''{
+< a4 c e >
+}
+\paper{
+}
+}
diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index 5f8601d498..4d3f289cd9 100644
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -79,47 +79,26 @@ violoncello = \notes \relative c' {
       \context Staff ="oboi" \oboi
       \context Staff ="clarinetti" \clarinetti 
       \context Staff ="fagotti" \fagotti 
-    { %%urg
-      \skip 1; 
-      \context Staff="flauti" \property Staff.marginScriptPadding = #25
-      \context Staff ="oboi" \property Staff.marginScriptPadding = #25
-      \context Staff ="clarinetti" \property Staff.marginScriptPadding = #25
-      \context Staff ="fagotti" \property Staff.marginScriptPadding = #25
-    }
     >
     \context StaffGroup ="ottoni" <
       \context Staff ="corni" \corni
       \context Staff ="trombe" \trombe
-    { %%urg
-      \skip 1; 
-      \context Staff="corni" \property Staff.marginScriptPadding = #25
-      \context Staff ="trome" \property Staff.marginScriptPadding = #25
-    }
     >
     \context StaffGroup ="timpani" <
       \context Staff ="timpani" \timpani
-    { %%urg
-      \skip 1; 
-      \context Staff="timpani" \property Staff.marginScriptPadding = #25
-    }
+     { 
+       \skip 1; 
+       % Hmm: this forces a staff-bracket, that's good!
+       % However, I can't find where is decided on staff-bracket yes/no
+     }
     >
     \context StaffGroup ="archi" <
       \context GrandStaff ="violini" <
         \context Staff ="violino1" \violino1
         \context Staff ="violino2" \violino2
-    { %%urg
-      \skip 1; 
-      \context Staff="violino1" \property Staff.marginScriptPadding = #25
-      \context Staff="violino2" \property Staff.marginScriptPadding = #25
-    }
       >
       \context Staff ="viola" \viola
       \context Staff ="violoncello" \violoncello
-    { %%urg
-      \skip 1; 
-      \context Staff="viola" \property Staff.marginScriptPadding = #25
-      \context Staff="violoncello" \property Staff.marginScriptPadding = #25
-    }
     >
   >
  \header{
@@ -137,7 +116,11 @@ violoncello = \notes \relative c' {
   	linewidth=150.0\mm;
     \translator {
       \HaraKiriStaffContext
-      marginScriptPadding = #55  %% urg, this is in pt
+    }
+    \translator {
+      \ScoreContext
+      instrumentScriptPadding = #55  %% urg, this is in pt
+      instrScriptPadding = #25
     }
   }
 }
diff --git a/input/test/maximum-rest-count.ly b/input/test/maximum-rest-count.ly
new file mode 100644
index 0000000000..cbb02a484b
--- /dev/null
+++ b/input/test/maximum-rest-count.ly
@@ -0,0 +1,21 @@
+\score{
+\context Staff \notes\relative c''{
+< a4 c e >
+< r r r >
+\property Staff.maximumRestCount = #3
+< r r r >
+\property Staff.maximumRestCount = #2
+< r r r >
+\property Staff.maximumRestCount = #1
+< r r r >
+\property Staff.maximumRestCount = #0
+< r r r >
+% urg
+r
+}
+\paper{
+}
+\midi{
+\tempo 1 = 60;
+}
+}
diff --git a/lily/align-note-column-engraver.cc b/lily/align-note-column-engraver.cc
index 9fb7d41b99..42e973765e 100644
--- a/lily/align-note-column-engraver.cc
+++ b/lily/align-note-column-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 0d61907069..450b1b4b70 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/atom.cc b/lily/atom.cc
index 8b13789179..e69de29bb2 100644
--- a/lily/atom.cc
+++ b/lily/atom.cc
@@ -1 +0,0 @@
-
diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 779d0781b0..5ee092ad59 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 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 #include "beaming.hh"
diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index 7b4b7b1450..ef0edb3cbd 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/auto-change-music.cc b/lily/auto-change-music.cc
index 7902d55ced..82871ffd7d 100644
--- a/lily/auto-change-music.cc
+++ b/lily/auto-change-music.cc
@@ -4,7 +4,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/axis-align-item.cc b/lily/axis-align-item.cc
index 8990872b21..d0301c907b 100644
--- a/lily/axis-align-item.cc
+++ b/lily/axis-align-item.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/axis-align-spanner.cc b/lily/axis-align-spanner.cc
index 4eacf9fe8b..b369c85122 100644
--- a/lily/axis-align-spanner.cc
+++ b/lily/axis-align-spanner.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "axis-align-spanner.hh"
diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index e4182d8f5a..f9d813035a 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 #include "axis-group-engraver.hh"
diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 68c8760492..d835edbd09 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, 1998, 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/bar-script-engraver.cc b/lily/bar-script-engraver.cc
index c41d9d1205..521b23f7aa 100644
--- a/lily/bar-script-engraver.cc
+++ b/lily/bar-script-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/beaming-info.cc b/lily/beaming-info.cc
index 8e16c50988..9b92ddeb1a 100644
--- a/lily/beaming-info.cc
+++ b/lily/beaming-info.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/boxes.cc b/lily/boxes.cc
index 6b52a0daee..acc6681d79 100644
--- a/lily/boxes.cc
+++ b/lily/boxes.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "box.hh"
diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc
index 540c6597c8..91916e56ae 100644
--- a/lily/break-algorithm.cc
+++ b/lily/break-algorithm.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "paper-column.hh"
diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 508f7d3c38..c111645eee 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "engraver.hh"
diff --git a/lily/chord-name.cc b/lily/chord-name.cc
index e395663bd1..396909c461 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 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "chord-name.hh"
diff --git a/lily/chord.cc b/lily/chord.cc
index 89d4c4590e..e188062f0e 100644
--- a/lily/chord.cc
+++ b/lily/chord.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "chord.hh"
diff --git a/lily/context-specced-music.cc b/lily/context-specced-music.cc
index 138de63631..eb3005964e 100644
--- a/lily/context-specced-music.cc
+++ b/lily/context-specced-music.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "context-specced-music.hh"
diff --git a/lily/debug.cc b/lily/debug.cc
index 3638dd6c76..76eb7e7117 100644
--- a/lily/debug.cc
+++ b/lily/debug.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1996,98 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/directional-element.cc b/lily/directional-element.cc
index dac91951bd..4cc5ebb52f 100644
--- a/lily/directional-element.cc
+++ b/lily/directional-element.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index e38df9cfbf..b68a2b2788 100644
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -208,8 +208,17 @@ Dynamic_engraver::do_process_music ()
       text_p_->set_elt_property ("self-alignment-Y", gh_int2scm (0));
       text_p_->dim_cache_[Y_AXIS]->off_callbacks_.push
 	(Side_position_interface::aligned_on_self);
-      //text_p_->dim_cache_[Y_AXIS]->off_callbacks_.push
-      //  (Side_position_interface::aligned_side);
+      /*
+	Don't crash into staff
+      */
+#if 0
+      // nogo
+      text_p_->dim_cache_[Y_AXIS]->off_callbacks_.push
+        (Side_position_interface::aligned_side);
+#else
+      // doet't ook niet, maar breekt wel alignment op line-spanner
+      //side_position (text_p_).set_axis (Y_AXIS);
+#endif
       announce_element (Score_element_info (text_p_, text_req_l_));
     }
 
@@ -296,8 +305,17 @@ Dynamic_engraver::do_process_music ()
 	  cresc_p_->set_elt_property ("self-alignment-Y", gh_int2scm (0));
 	  cresc_p_->dim_cache_[Y_AXIS]->off_callbacks_.push
 	    (Side_position_interface::aligned_on_self);
-	  //cresc_p_->dim_cache_[Y_AXIS]->off_callbacks_.push
-	  // (Side_position_interface::aligned_side);
+	  /*
+	    Don't crash into staff
+	  */
+#if 0
+	  // nogo
+	  cresc_p_->dim_cache_[Y_AXIS]->off_callbacks_.push
+	   (Side_position_interface::aligned_side);
+#else
+	  // doet't ook niet, maar breekt wel alignment op line-spanner
+	  //side_position (cresc_p_).set_axis (Y_AXIS);
+#endif
 	  announce_element (Score_element_info (cresc_p_, span_req_l_drul_[START]));
 	}
     }
diff --git a/lily/extender-spanner.cc b/lily/extender-spanner.cc
index 0f5cbfb5d9..dd9e1a9bdd 100644
--- a/lily/extender-spanner.cc
+++ b/lily/extender-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998, 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 /*
diff --git a/lily/folded-repeat-iterator.cc b/lily/folded-repeat-iterator.cc
index 8132ad6dca..1083b8fa69 100644
--- a/lily/folded-repeat-iterator.cc
+++ b/lily/folded-repeat-iterator.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index ef615ae0a9..1f54aa5ead 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/global-ctor.cc b/lily/global-ctor.cc
index e8838acf48..b48a72ff3b 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "global-ctor.hh"
diff --git a/lily/grace-align-item.cc b/lily/grace-align-item.cc
index 2ae9d267e9..e397ba9c56 100644
--- a/lily/grace-align-item.cc
+++ b/lily/grace-align-item.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/grace-engraver-group.cc b/lily/grace-engraver-group.cc
index cb99415a2b..20eb4a63ee 100644
--- a/lily/grace-engraver-group.cc
+++ b/lily/grace-engraver-group.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "grace-engraver-group.hh"
diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc
index ffd57a8976..52ba6f57e0 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/grace-music.cc b/lily/grace-music.cc
index d93d4829b3..50c0f155f6 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/grace-performer-group.cc b/lily/grace-performer-group.cc
index 45c47ca37f..f2c8ef2776 100644
--- a/lily/grace-performer-group.cc
+++ b/lily/grace-performer-group.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music playter
   
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 #include "grace-performer-group.hh"
diff --git a/lily/grace-position-engraver.cc b/lily/grace-position-engraver.cc
index 5024b8c7b8..866b3a2d80 100644
--- a/lily/grace-position-engraver.cc
+++ b/lily/grace-position-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/grace-position-performer.cc b/lily/grace-position-performer.cc
index d932f3900f..c1c4ae8896 100644
--- a/lily/grace-position-performer.cc
+++ b/lily/grace-position-performer.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 
  */
 
diff --git a/lily/group-interface.cc b/lily/group-interface.cc
index 628a9fff58..a24e883da6 100644
--- a/lily/group-interface.cc
+++ b/lily/group-interface.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "group-interface.hh"
diff --git a/lily/hara-kiri-engraver.cc b/lily/hara-kiri-engraver.cc
index 0761b36ce3..a0a2e0cf50 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) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "hara-kiri-vertical-group-spanner.hh"
diff --git a/lily/hara-kiri-line-group-engraver.cc b/lily/hara-kiri-line-group-engraver.cc
index 2d9fe8a916..721a0995a8 100644
--- a/lily/hara-kiri-line-group-engraver.cc
+++ b/lily/hara-kiri-line-group-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998, 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "rhythmic-head.hh"
diff --git a/lily/hara-kiri-vertical-group-spanner.cc b/lily/hara-kiri-vertical-group-spanner.cc
index 3abb6296f2..b6a6416455 100644
--- a/lily/hara-kiri-vertical-group-spanner.cc
+++ b/lily/hara-kiri-vertical-group-spanner.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1998,1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
diff --git a/lily/idealspacing.cc b/lily/idealspacing.cc
index ec5e17d8a9..d7379218f1 100644
--- a/lily/idealspacing.cc
+++ b/lily/idealspacing.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "idealspacing.hh"
diff --git a/lily/include/audio-element-info.hh b/lily/include/audio-element-info.hh
index a247fc9c5e..2d09970ab4 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index 8edd0ef388..fd465f9f4c 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,  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2000 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef AUDIO_ITEM_HH
diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh
index 84cb1172bb..89d701b81f 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,  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2000 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef AUDIO_STAFF_HH
diff --git a/lily/include/auto-beam-engraver.hh b/lily/include/auto-beam-engraver.hh
index 2c7575fde4..b5aec56fb1 100644
--- a/lily/include/auto-beam-engraver.hh
+++ b/lily/include/auto-beam-engraver.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
diff --git a/lily/include/auto-change-iterator.hh b/lily/include/auto-change-iterator.hh
index 4171a9cf84..ff55700bc1 100644
--- a/lily/include/auto-change-iterator.hh
+++ b/lily/include/auto-change-iterator.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/auto-change-music.hh b/lily/include/auto-change-music.hh
index ec698bec82..2295eb2223 100644
--- a/lily/include/auto-change-music.hh
+++ b/lily/include/auto-change-music.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/axis-align-item.hh b/lily/include/axis-align-item.hh
index bcea4e18d9..7a7d4022ec 100644
--- a/lily/include/axis-align-item.hh
+++ b/lily/include/axis-align-item.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/axis-group-engraver.hh b/lily/include/axis-group-engraver.hh
index ee745cc345..f2f99b0411 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) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/bar-req-collector-engraver.hh b/lily/include/bar-req-collector-engraver.hh
index 126d2e0404..e80065e459 100644
--- a/lily/include/bar-req-collector-engraver.hh
+++ b/lily/include/bar-req-collector-engraver.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/bar-script-engraver.hh b/lily/include/bar-script-engraver.hh
index 29110c81fe..2e330e88a4 100644
--- a/lily/include/bar-script-engraver.hh
+++ b/lily/include/bar-script-engraver.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/beaming.hh b/lily/include/beaming.hh
index 3dcf419bf6..cb0b455a5c 100644
--- a/lily/include/beaming.hh
+++ b/lily/include/beaming.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/bezier-bow.hh b/lily/include/bezier-bow.hh
index 4c2ea55fc9..e9b361e8fa 100644
--- a/lily/include/bezier-bow.hh
+++ b/lily/include/bezier-bow.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/break-algorithm.hh b/lily/include/break-algorithm.hh
index 052ad732df..99bba1a2c5 100644
--- a/lily/include/break-algorithm.hh
+++ b/lily/include/break-algorithm.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff --git a/lily/include/chord-name.hh b/lily/include/chord-name.hh
index ae1ddc0500..fa9cba3a87 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 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef CHORD_NAME_HH
diff --git a/lily/include/chord.hh b/lily/include/chord.hh
index 935758ae63..3075bab0ac 100644
--- a/lily/include/chord.hh
+++ b/lily/include/chord.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef CHORD_HH
diff --git a/lily/include/context-specced-music.hh b/lily/include/context-specced-music.hh
index 8aadd3398d..56206a3bdf 100644
--- a/lily/include/context-specced-music.hh
+++ b/lily/include/context-specced-music.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/cross-staff.hh b/lily/include/cross-staff.hh
index 9fdfb97f84..673941a79d 100644
--- a/lily/include/cross-staff.hh
+++ b/lily/include/cross-staff.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/directional-element-interface.hh b/lily/include/directional-element-interface.hh
index c21a89d2ec..9fa0e0692d 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/directional-spanner.hh b/lily/include/directional-spanner.hh
index 65296f8106..e69de29bb2 100644
--- a/lily/include/directional-spanner.hh
+++ b/lily/include/directional-spanner.hh
@@ -1,2 +0,0 @@
-
-#error
diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index c8597b78dd..04a73eaf1b 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,  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff --git a/lily/include/extender-spanner.hh b/lily/include/extender-spanner.hh
index d2d0b021ef..261e758f4d 100644
--- a/lily/include/extender-spanner.hh
+++ b/lily/include/extender-spanner.hh
@@ -1,7 +1,7 @@
 /*
   extender-spanner.hh -- part of GNU LilyPond
 
-  (c) 1998, 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef EXTENDER_SPANNER_HH
diff --git a/lily/include/folded-repeat-iterator.hh b/lily/include/folded-repeat-iterator.hh
index 07e6710d44..499b7b4be8 100644
--- a/lily/include/folded-repeat-iterator.hh
+++ b/lily/include/folded-repeat-iterator.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 3c3c2071ae..9db37fda4e 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/global-ctor.hh b/lily/include/global-ctor.hh
index 53d25a4477..a0cf239349 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/grace-align-item.hh b/lily/include/grace-align-item.hh
index 028ff63255..f3bb2af3c4 100644
--- a/lily/include/grace-align-item.hh
+++ b/lily/include/grace-align-item.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/grace-engraver-group.hh b/lily/include/grace-engraver-group.hh
index 92301686be..5c63b4fd2a 100644
--- a/lily/include/grace-engraver-group.hh
+++ b/lily/include/grace-engraver-group.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/grace-iterator.hh b/lily/include/grace-iterator.hh
index ce7459b974..9743d7ab90 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/grace-music.hh b/lily/include/grace-music.hh
index c7b62786bb..ed9ab73d9f 100644
--- a/lily/include/grace-music.hh
+++ b/lily/include/grace-music.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/grace-performer-group.hh b/lily/include/grace-performer-group.hh
index c7f6db0914..cfeb9884a0 100644
--- a/lily/include/grace-performer-group.hh
+++ b/lily/include/grace-performer-group.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-   (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+   (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
diff --git a/lily/include/group-interface.hh b/lily/include/group-interface.hh
index eb21db6ee6..509fcdf25b 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/hara-kiri-engraver.hh b/lily/include/hara-kiri-engraver.hh
index 0d88b3d847..82992a29a8 100644
--- a/lily/include/hara-kiri-engraver.hh
+++ b/lily/include/hara-kiri-engraver.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/hara-kiri-line-group-engraver.hh b/lily/include/hara-kiri-line-group-engraver.hh
index 43439cadcf..43f71b1787 100644
--- a/lily/include/hara-kiri-line-group-engraver.hh
+++ b/lily/include/hara-kiri-line-group-engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998, 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
diff --git a/lily/include/hara-kiri-vertical-group-spanner.hh b/lily/include/hara-kiri-vertical-group-spanner.hh
index bba2981777..e3e34c2a00 100644
--- a/lily/include/hara-kiri-vertical-group-spanner.hh
+++ b/lily/include/hara-kiri-vertical-group-spanner.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998, 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
diff --git a/lily/include/interpretation-context-handle.hh b/lily/include/interpretation-context-handle.hh
index d990a02f47..a8adf33cb4 100644
--- a/lily/include/interpretation-context-handle.hh
+++ b/lily/include/interpretation-context-handle.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/key-def.hh b/lily/include/key-def.hh
index 84eb0a3d0f..6ed1137895 100644
--- a/lily/include/key-def.hh
+++ b/lily/include/key-def.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
diff --git a/lily/include/leastsquares.hh b/lily/include/leastsquares.hh
index 65296f8106..e69de29bb2 100644
--- a/lily/include/leastsquares.hh
+++ b/lily/include/leastsquares.hh
@@ -1,2 +0,0 @@
-
-#error
diff --git a/lily/include/lily-guile.icc b/lily/include/lily-guile.icc
index 42bc9b772d..aeeefc5338 100644
--- a/lily/include/lily-guile.icc
+++ b/lily/include/lily-guile.icc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef LILY_GUILE_ICC
diff --git a/lily/include/lily-version.hh b/lily/include/lily-version.hh
index e0b69bfe9b..f5d37d3a55 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 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
diff --git a/lily/include/ly-smobs.icc b/lily/include/ly-smobs.icc
index 10e9b03f30..9b54ddc24e 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/lyric-combine-music-iterator.hh b/lily/include/lyric-combine-music-iterator.hh
index b53efd365d..73b7c925a8 100644
--- a/lily/include/lyric-combine-music-iterator.hh
+++ b/lily/include/lyric-combine-music-iterator.hh
@@ -4,7 +4,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/lyric-combine-music.hh b/lily/include/lyric-combine-music.hh
index d3a2a21f43..16a60a60c0 100644
--- a/lily/include/lyric-combine-music.hh
+++ b/lily/include/lyric-combine-music.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/midi-walker.hh b/lily/include/midi-walker.hh
index e899f00572..522660ee45 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,  1997--2000 Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys  <hanwen@cs.uu.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
diff --git a/lily/include/moment.hh b/lily/include/moment.hh
index 3f69637f05..17835b3e95 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/note-head-side.hh b/lily/include/note-head-side.hh
index 65296f8106..e69de29bb2 100644
--- a/lily/include/note-head-side.hh
+++ b/lily/include/note-head-side.hh
@@ -1,2 +0,0 @@
-
-#error
diff --git a/lily/include/note-performer.hh b/lily/include/note-performer.hh
index f9af35188d..6b0f607ade 100644
--- a/lily/include/note-performer.hh
+++ b/lily/include/note-performer.hh
@@ -1,7 +1,7 @@
 /*
   note-performer.hh -- declare Note_performer
 
-  (c) 1996,  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh
index e4f608088d..987c0f25da 100644
--- a/lily/include/paper-def.hh
+++ b/lily/include/paper-def.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh
index 9938895086..e6d757fcfb 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, 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
diff --git a/lily/include/performer-group-performer.hh b/lily/include/performer-group-performer.hh
index e61a3a352b..9764275cc1 100644
--- a/lily/include/performer-group-performer.hh
+++ b/lily/include/performer-group-performer.hh
@@ -1,7 +1,7 @@
 /*
   performer-group-performer.hh -- declare Performer_group_performer
 
-  (c) 1996,  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
diff --git a/lily/include/performer.hh b/lily/include/performer.hh
index 9213f81fb4..1b46084bb0 100644
--- a/lily/include/performer.hh
+++ b/lily/include/performer.hh
@@ -1,7 +1,7 @@
 /*
   performer.hh -- declare Performer
 
-  (c) 1996,  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
diff --git a/lily/include/property-inspect.hh b/lily/include/property-inspect.hh
index 3188ddbfa4..e59125619e 100644
--- a/lily/include/property-inspect.hh
+++ b/lily/include/property-inspect.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/repeated-music.hh b/lily/include/repeated-music.hh
index 25b2bee652..89384b9af7 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh
index 409fc1a3cf..bc5fbafd91 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/score-element.hh b/lily/include/score-element.hh
index 8eb39f509b..886659fe35 100644
--- a/lily/include/score-element.hh
+++ b/lily/include/score-element.hh
@@ -1,7 +1,7 @@
 /*
   score-element.hh -- declare Score_element
 
-  (c) 1996-1999 Han-Wen Nienhuys
+  (c) 1996-1999--2000 Han-Wen Nienhuys
 */
 
 #ifndef STAFFELEM_HH
diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh
index 839d1a456e..4c71b7b8f7 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,  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
diff --git a/lily/include/script-column.hh b/lily/include/script-column.hh
index 9e2b9ded5f..0ba7cb1281 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/script.hh b/lily/include/script.hh
index c6ee25529e..05149c7b93 100644
--- a/lily/include/script.hh
+++ b/lily/include/script.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh
index 2a3ab87457..341b711c67 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index e0c9840924..5a1501347a 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh
index 5c44644c2e..96343a9b95 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/spacing-engraver.hh b/lily/include/spacing-engraver.hh
index 3c1f5f7920..be6c44ff3c 100644
--- a/lily/include/spacing-engraver.hh
+++ b/lily/include/spacing-engraver.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh
index eb3a0eb1a8..46a7d6f025 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) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/spring.hh b/lily/include/spring.hh
index d4e2e94c3a..739df44dd2 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/staff-bar.hh b/lily/include/staff-bar.hh
index 244f36a849..c8f5049293 100644
--- a/lily/include/staff-bar.hh
+++ b/lily/include/staff-bar.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/staff-performer.hh b/lily/include/staff-performer.hh
index 12abd08cfb..2ff3cd276d 100644
--- a/lily/include/staff-performer.hh
+++ b/lily/include/staff-performer.hh
@@ -1,7 +1,7 @@
 /*
   staff-performer.hh -- declare Staff_performer
 
-  (c) 1996,  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh
index 834310db08..edd3263978 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/include/tfm-reader.hh b/lily/include/tfm-reader.hh
index 7d802d09a8..569a2d0614 100644
--- a/lily/include/tfm-reader.hh
+++ b/lily/include/tfm-reader.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
   revamped code from GNU Fontutils-0.6
diff --git a/lily/include/tfm.hh b/lily/include/tfm.hh
index 0ab9037235..bf482a6780 100644
--- a/lily/include/tfm.hh
+++ b/lily/include/tfm.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
   revamped code from GNU Fontutils-0.6
diff --git a/lily/include/tie-performer.hh b/lily/include/tie-performer.hh
index 6b1f924470..54425eb2fa 100644
--- a/lily/include/tie-performer.hh
+++ b/lily/include/tie-performer.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
diff --git a/lily/include/unfolded-repeat-iterator.hh b/lily/include/unfolded-repeat-iterator.hh
index 71adef6598..9008f30420 100644
--- a/lily/include/unfolded-repeat-iterator.hh
+++ b/lily/include/unfolded-repeat-iterator.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/interpretation-context-handle.cc b/lily/interpretation-context-handle.cc
index 185991b748..ca1071ae0f 100644
--- a/lily/interpretation-context-handle.cc
+++ b/lily/interpretation-context-handle.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/key-def.cc b/lily/key-def.cc
index a28f125e34..523c214462 100644
--- a/lily/key-def.cc
+++ b/lily/key-def.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
diff --git a/lily/key-item.cc b/lily/key-item.cc
index 52d76b5769..bd12e97bee 100644
--- a/lily/key-item.cc
+++ b/lily/key-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
   keyplacement by Mats Bengtsson
 */
diff --git a/lily/lexer.ll b/lily/lexer.ll
index 9c0369c424..4cf958de48 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -4,7 +4,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1996--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/lily-version.cc b/lily/lily-version.cc
index 909a9b95a5..6da4880b58 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 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "config.h"
diff --git a/lily/line-of-score.cc b/lily/line-of-score.cc
index cde8965e03..3bba1d479b 100644
--- a/lily/line-of-score.cc
+++ b/lily/line-of-score.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "line-of-score.hh"
diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index 6d4cdc6bee..fe73d4f62e 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) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index 9da40bf778..5676d4cff0 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/melisma-engraver.cc b/lily/melisma-engraver.cc
index a9e1dce2b3..f3b96c7fcf 100644
--- a/lily/melisma-engraver.cc
+++ b/lily/melisma-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/moment.cc b/lily/moment.cc
index 45002d8eed..8495cdc470 100644
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 4c629dd2b7..80e7651b6e 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index c0f8cf48ef..782b4848a2 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,  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2000 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "note-performer.hh"
diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index b062978633..41a4fcd8e0 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,  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "main.hh"
diff --git a/lily/parser.yy b/lily/parser.yy
index db172c5e26..580d7dcee5 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -5,7 +5,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index 52770a3e0b..6bc925a1bd 100644
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
diff --git a/lily/performer.cc b/lily/performer.cc
index 7ccad7dd2a..fe706b01f9 100644
--- a/lily/performer.cc
+++ b/lily/performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc
index ba0c1ee4e1..519ca724b3 100644
--- a/lily/property-engraver.cc
+++ b/lily/property-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/property-inspect.cc b/lily/property-inspect.cc
index 89a97caa09..2ea7282385 100644
--- a/lily/property-inspect.cc
+++ b/lily/property-inspect.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index f7cfefac53..2ff126ea33 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/request.cc b/lily/request.cc
index f5a869b788..14eb23856c 100644
--- a/lily/request.cc
+++ b/lily/request.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "request.hh"
diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index b2fd168d07..c735a03205 100644
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -28,6 +28,7 @@ Rest_collision_engraver::process_acknowledged ()
     return;
 
   rest_collision_p_ = new Rest_collision;
+  
   announce_element (Score_element_info (rest_collision_p_, 0));
   for (int i=0; i< note_column_l_arr_.size (); i++)
     rest_collision_p_->add_column (note_column_l_arr_[i]);
diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 4ef293f8f1..2dd7aa890b 100644
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -18,6 +18,7 @@
 #include "rest.hh"
 #include "group-interface.hh"
 #include "staff-symbol-referencer.hh"
+#include "duration.hh"
 
 void
 Rest_collision::add_column (Note_column *nc_l)
@@ -32,6 +33,30 @@ Rest_collision::add_column (Note_column *nc_l)
   gi.add_element (nc_l);
 }
 
+static Duration
+to_duration (int type, int dots)
+{
+  Duration d;
+  d.durlog_i_ = type;
+  d.dots_i_ = dots;
+  return d;
+}
+
+static Moment
+rhythmic_head2mom (Rhythmic_head* r)
+{
+  return to_duration (r->balltype_i (), r->dot_count ()).length_mom ();
+}
+
+static Rhythmic_head*
+col2rhythmic_head (Note_column* c)
+{
+  SCM s = c->get_elt_property ("rests");
+  assert (gh_pair_p (s));
+  Score_element* e = unsmob_element (gh_car (s));
+  return dynamic_cast<Rhythmic_head*> (e);
+}
+
 void
 Rest_collision::before_line_breaking ()
 {
@@ -61,13 +86,59 @@ Rest_collision::before_line_breaking ()
   // meisjes met meisjes
   if (!ncol_l_arr.size()) 
     {
+
+      /*
+	Oeps, nu zie ik 't pas: colommen met noten.
+	Het commentaar, dat ik ooit geschreven had: meisjes met meisjes,
+	is achterhaald: urg.
+
+       */
+
+      Moment m = rhythmic_head2mom (col2rhythmic_head (rest_l_arr[0]));
+      int i = 1;
+      for (; i < rest_l_arr.size (); i++)
+	{
+	  Moment me = rhythmic_head2mom (col2rhythmic_head (rest_l_arr[i]));
+	  if (me != m)
+	    break;
+	}
+
+      /*
+	If all durations are the same, we'll check if there are more
+	rests than maximum-rest-count.
+	Otherwise (different durations), we'll try to display them all
+	(urg: all 3 of them, currently).
+       */
+      int display_count;
+      SCM s = get_elt_property ("maximum-rest-count");
+      if (i == rest_l_arr.size ()
+	  && gh_number_p (s) && gh_int2scm (s) < rest_l_arr.size ())
+	{
+	  display_count = gh_int2scm (s);
+#if 0
+	  /*
+	    Setting surplus rests to transparent.
+	    Only really necessary for maximum-rest-count == 0,
+	    because rests wil be set at exact the same position
+	    and thus overlap.
+	  */
+	  for (i--;i > display_count; i--)
+	    col2rhythmic_head (rest_l_arr[i-1])
+	      ->set_elt_property ("transparent", SCM_BOOL_T);
+#endif
+	}
+      else
+	display_count = rest_l_arr.size ();
+      
       /*
 	UGH.  Should get dims from table.  Should have minimum dist.
        */
-      int dy = rest_l_arr.size() > 2 ? 6 : 4;
-	
-      rest_l_arr[0]->translate_rests (rest_l_arr[0]->dir () *dy);	
-      rest_l_arr.top()->translate_rests (rest_l_arr.top ()->dir ()* dy);
+      int dy = display_count > 2 ? 6 : 4;
+      if (display_count > 1)
+	{
+	  rest_l_arr[0]->translate_rests (dy);	
+	  rest_l_arr[1]->translate_rests (-dy);
+	}
     }
   // meisjes met jongetjes
   else 
diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index ebef9e278c..90009ffcd7 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include <stdio.h>
diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index b4eba3d00b..4ba1a270fc 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,  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2000 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "score-performer.hh"
diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index c79f0bee93..572fd3f807 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/script-column.cc b/lily/script-column.cc
index a386058d87..35d9d02604 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "script-column.hh"
diff --git a/lily/script.cc b/lily/script.cc
index 6f96f1b7b8..879881583a 100644
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index 4910fd27de..85ec848123 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
   TODO:
   - add support for different stretch/shrink constants?
diff --git a/lily/slur.cc b/lily/slur.cc
index c2166932a0..b5ce992237 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
     Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index 5caefdf72e..83b3ab1337 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index e912cf5d3c..52ff8c05e1 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/spanner.cc b/lily/spanner.cc
index 2bc8b98ab4..222a391496 100644
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <math.h>
 
diff --git a/lily/spring.cc b/lily/spring.cc
index c52b464bc3..b061067833 100644
--- a/lily/spring.cc
+++ b/lily/spring.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/staff-bar.cc b/lily/staff-bar.cc
index 0f37c1cf0c..c1aba6ca96 100644
--- a/lily/staff-bar.cc
+++ b/lily/staff-bar.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/lily/staff-margin-engraver.cc b/lily/staff-margin-engraver.cc
index f3344955e4..fd68c6fb4b 100644
--- a/lily/staff-margin-engraver.cc
+++ b/lily/staff-margin-engraver.cc
@@ -108,7 +108,17 @@ Staff_margin_engraver::create_text (SCM text)
 
       announce_element (Score_element_info (t, 0));
 
-      SCM s = get_property (type_ + "ScriptPadding");
+      /*
+	Hmm.
+	In almost every score that uses "instrument" and "instr"
+	we need two different paddings.
+	Let's try one of those first:
+	   instrumentScriptPadding/instrScriptPadding
+       */
+      SCM s = get_property (String (now_mom () ? "instr" : "instrument")
+			    + "ScriptPadding");
+      if (!gh_number_p (s))
+	s = get_property (type_ + "ScriptPadding");
       if (gh_number_p (s))
 	{
 	  //t->set_elt_property ("padding", s);
@@ -126,6 +136,11 @@ Staff_margin_engraver::do_pre_move_processing ()
 {
   if (text_p_)
     {
+      /*
+	Let's not allow user settings for visibility function (yet).
+	Although end-of-line would work, to some extent, we should
+	make a properly ordered Right_edge_item, if that need arises.
+       */
       text_p_->set_elt_property("visibility-lambda",
       			      ly_eval_str ("begin-of-line-visible"));
       typeset_element (text_p_);
diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index 00172d1985..53adce0e07 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 #include <math.h>
diff --git a/lily/stem.cc b/lily/stem.cc
index 2b9ca36469..8258775abf 100644
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
     Jan Nieuwenhuizen <janneke@gnu.org>
 
   TODO: This is way too hairy
diff --git a/lily/tfm-reader.cc b/lily/tfm-reader.cc
index 31fea32ab2..7bc495b49b 100644
--- a/lily/tfm-reader.cc
+++ b/lily/tfm-reader.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
   
 
   some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c
diff --git a/lily/tfm.cc b/lily/tfm.cc
index af11940191..bbcfaab5b1 100644
--- a/lily/tfm.cc
+++ b/lily/tfm.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
   
 
   some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c
diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index 9b5afbc491..51d1375d84 100644
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc
index 347e929b4a..a51bbca2f6 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) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
diff --git a/mutopia/Coriolan/coriolan-paper.ly b/mutopia/Coriolan/coriolan-paper.ly
index cbaf777245..2b175075fc 100644
--- a/mutopia/Coriolan/coriolan-paper.ly
+++ b/mutopia/Coriolan/coriolan-paper.ly
@@ -30,7 +30,8 @@
 	}
 	\translator { 
 		\HaraKiriStaffContext 
-      		marginScriptPadding = #55  %% urg, this is in pt
+      		instrumentScriptPadding = #55  %% urg, this is in pt
+      		instrScriptPadding = #25 %% urg, this is in pt
 		\accepts "VoiceOne";
 		\accepts "VoiceTwo";
 	}
diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly
index 7d8ad0eba0..0610b3083d 100644
--- a/mutopia/Coriolan/coriolan-part-paper.ly
+++ b/mutopia/Coriolan/coriolan-part-paper.ly
@@ -3,7 +3,8 @@
 	slur_beautiful = 0.0;
 	\translator { 
 		\OrchestralPartStaffContext 
-      		marginScriptPadding = #55  %% urg, this is in pt
+      		instrumentScriptPadding = #55  %% urg, this is in pt
+      		instrScriptPadding = #25  %% urg, this is in pt
 	}
 	\translator {
 		\VoiceContext
diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly
index 9273d71dab..6059c48393 100644
--- a/mutopia/Coriolan/coriolan.ly
+++ b/mutopia/Coriolan/coriolan.ly
@@ -42,8 +42,8 @@ ottoni = \context StaffGroup = otonni_group <
 
 $timpani_g = \context StaffGroup = timpani_group <
 	\$timpani_staff
-	% HaraKiri mustn't work on first page
-	\context Staff = urgtimpany \notes{ \skip 1*34; }
+	% Force a staff bracket (?)
+	\context Staff = timpany { \skip 1; }
 >
 
 violini = \context GrandStaff = violini_group <
diff --git a/scm/generic-property.scm b/scm/generic-property.scm
index b105f31233..ef89bf14ba 100644
--- a/scm/generic-property.scm
+++ b/scm/generic-property.scm
@@ -99,6 +99,9 @@
 (define generic-rest-properties
   (cons "Rest" (list (list 'restStyle string? 'reststyle))))
 
+(define generic-rest-collision-properties
+  (cons "Rest_collision" (list (list 'maximumRestCount number? 'maximum-rest-count))))
+
 (define generic-tie-properties
   (cons "Tie" (list
 	       (list 'tieVerticalDirection dir? 'direction)
@@ -175,6 +178,7 @@
    generic-timesig-properties
    generic-clef-properties
    generic-collision-properties
+   generic-rest-collision-properties
 ;   generic-staff-symbol-properties
    generic-All-properties      
    )
-- 
2.39.5