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!

diff --git a/CHANGES b/CHANGES
index b12d85721c50b9a4780d2c23e7735855cc7aa47f..143b66cbd57acfd291545461e963a24d7284e92a 100644 (file)
--- 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 9712be5b96e0456a004cd6d988a96ad7d2511b31..bf5765c717076ff56739d5e72fc6dbbbd30e6364 100644 (file)
--- 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 8b137891791fe96927ad78e64b0aad7bded08bdc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 (file)
index 0000000..8d2cabc
--- /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 5f8601d498dd982fdcb5f18740dffbd493e82f35..4d3f289cd9f96048b1cd528f3934b74ae7ccaed3 100644 (file)
--- 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 (file)
index 0000000..cbb02a4
--- /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 9fb7d41b99e78fdd7d6e4048c3397e080d4e59cc..42e973765e66751eaa882caf292a45723c47a450 100644 (file)
--- 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 0d6190706975248020e739127faadf070a4fd309..450b1b4b70017afeea614ccca6f77eaea534f3d0 100644 (file)
--- 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 8b137891791fe96927ad78e64b0aad7bded08bdc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 779d0781b0c196e0964dd18e59922438425d881f..5ee092ad594b908a67d592af1128f1761a447cd2 100644 (file)
--- 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 7b4b7b1450181cec69dc4cad18591e24c553a840..ef0edb3cbd127caf02fe7454baaad79822545b11 100644 (file)
--- 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 7902d55ced44b0968dc49d9a7ea7a8d324c26e58..82871ffd7d02ee8f27622eaa60435255b3a8946f 100644 (file)
--- 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 8990872b212ad9c655ee723770917d00b4cb5ac4..d0301c907bf1ca25731da499d17da6e38e655f38 100644 (file)
--- 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 4eacf9fe8b84cbb72807cafa6791e414262ce7e2..b369c85122cd299b113540b5162374a5ecc9664f 100644 (file)
--- 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 e4182d8f5a071e8a8fa5da28a445165782790b33..f9d813035ad3211b6fec84172869d397ca7a97ec 100644 (file)
--- 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 68c8760492952f82f607cd4806943128e87b4bcd..d835edbd09765ef3a809ab807ad9338f494218f9 100644 (file)
--- 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 c41d9d12050f80cc2531cb6cdc03b7e72b4de681..521b23f7aa0223c3c9afd251f65576be89efc6c8 100644 (file)
--- 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 8e16c509884c3b7d36d69d4581cd0ba32f78ad19..9b92ddeb1a37987158be625144dba824685f06e7 100644 (file)
--- 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 6b52a0daeecea5b5ad1e7cf8f5d2681321ee6dcb..acc6681d79b5dcfeddd294bf6edec6f9b91c471e 100644 (file)
--- 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 540c6597c83671e329f39c7aaa9bc2753c2bd1f6..91916e56aeb7fdfe897bdd62b6eb8295301a75df 100644 (file)
--- 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 508f7d3c38b56e31f0e165584cc0f7dcaedcd0b4..c111645eee452692c112815e21d62e1be4f259f5 100644 (file)
--- 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 e395663bd1f54b6d1d7a64952a19dccc3cd6c1c2..396909c4614ffe1fe6f4214f625a4330ad41f8ee 100644 (file)
--- 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 89d4c4590ede0f1299db3c0a6be06477a4806cbd..e188062f0e06870cc18a29a689af662443b4b93d 100644 (file)
--- 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 138de6363103e7d05662be63a5be0faa02a2b170..eb3005964eac7609867e9167eba0a2d13588ab22 100644 (file)
--- 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 3638dd6c764ac0d74bc20b6ad144dc09fed16767..76eb7e7117130440f06ade74e08e6180c10489c6 100644 (file)
--- 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 dac91951bd0fd7a78f39ffbc9134f53208274824..4cc5ebb52f1ae2a3b416ab01fd7e72ece015df41 100644 (file)
--- 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 e38df9cfbfac1524d147307db125301ef5fa5305..b68a2b2788d912fd222ce45d339c83388044628d 100644 (file)
--- 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 0f5cbfb5d937a7243fedf4ba8454f6cffa560633..dd9e1a9bdda7adddec0bfeb55f083233940c8cb2 100644 (file)
--- 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 8132ad6dcadb78dc1097c237ff16aee0fcfa9ce3..1083b8fa692cbb1f29c8e5e69324d5b601aae628 100644 (file)
--- 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 ef615ae0a9f7e73f3b813b3816a195f71a9be66a..1f54aa5eada1193fd11041769dc006bcfcd35cfe 100644 (file)
--- 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 e8838acf4816a12c546768e327873882733aa9e9..b48a72ff3b4485e2eceda863adeaf6819c5dfda8 100644 (file)
--- 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 2ae9d267e9146c6cbdd3e0861664b689defdf512..e397ba9c56535af32e1370093e5381db5077ef68 100644 (file)
--- 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 cb99415a2bcf3ba4219f1651b09400aff90238ab..20eb4a63ee8ef6d267085ded4766d695b7cd4a84 100644 (file)
--- 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 ffd57a89768df7d6bca650a891d6434de4ef6666..52ba6f57e06c233a8f1d8ce9384fb485b059a69c 100644 (file)
--- 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 d93d4829b30f902f2646fde2fa3820d3b7c76825..50c0f155f64f45c8b4d459d0974535778cd3995e 100644 (file)
--- 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 45c47ca37f38aaf007657235e1263d967ddfe0e0..f2c8ef277651edbfa1a4f1e4f5dc321466bf7279 100644 (file)
--- 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 5024b8c7b8470cbee58a3d70f16e84d28e989f8a..866b3a2d80fb8a99698103407b7aaf411dc17f30 100644 (file)
--- 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 d932f3900f6af537e80a3a2823e5a062070c0453..c1c4ae88960b0a88b992c52d053ad25ae4147272 100644 (file)
--- 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 628a9fff582087f40b18fa3ca8fc7f7a81968e41..a24e883da67cf83019269d52e87ad63e01c01e71 100644 (file)
--- 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 0761b36ce3c412c7312437894e7c1390fea5e1c7..a0a2e0cf509326f7d2eff9925bd5b783eeb5f699 100644 (file)
--- 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 2d9fe8a91603d09771f724ac64a80ca2024852da..721a0995a8dd69a6a7ad52219e4e5288b4120e30 100644 (file)
--- 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 3abb6296f2ab93d92c4a5831a7420d6f5169d60c..b6a6416455f916245eb170d377120d1576c20545 100644 (file)
--- 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 ec5e17d8a96e885e95330137e672d1e8fe1468b6..d7379218f162c57b43c29b8d84ecd083d8bb2198 100644 (file)
--- 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 a247fc9c5e203a0558af1d88d11250a7411e65c9..2d09970ab4bc268546fd77d435a8d24104c13fe6 100644 (file)
--- 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 8edd0ef388ca9692a0b67c17543c3a311548e3d4..fd465f9f4cb286e7b177483909fa6a0d1e7ec7a4 100644 (file)
--- 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 84cb1172bb0df6aa43a64ff3f54cea4923a694ee..89d701b81f526b950357991d86274eca60dcb656 100644 (file)
--- 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 2c7575fde4e46934a004f9729e002167c0a80f56..b5aec56fb1fed328fcdd67369de6cc9a980e5e85 100644 (file)
--- 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 4171a9cf846e17bf7aad4bff9f1b71f74593679e..ff55700bc10bf1f4530687c2541649c19ce70a38 100644 (file)
--- 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 ec698bec82ef8bee4aed6836debdaa60a5401f9e..2295eb2223b09a720f54c0ceec5ec8b734415085 100644 (file)
--- 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 bcea4e18d9b1f7201759c0403ac784cf3e6a2cc8..7a7d4022ec1ce716f337dff9ce501e9e3166e94c 100644 (file)
--- 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 ee745cc3454c836d8226e7476d3b06b53a1eaa87..f2f99b0411b684bdac74c18934c4581952473da2 100644 (file)
--- 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 126d2e04045c722f92b2aec4332fb7da6d2d4f77..e80065e459fc76a21236b41b9e43aa80120adfb4 100644 (file)
--- 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 29110c81fea12e71da8c6346edf8d6ea93cd015a..2e330e88a4d70d820df2d9ea03d22dddd20309db 100644 (file)
--- 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 3dcf419bf62d78c541737b96541a1047a1df70cb..cb0b455a5cd9009e559f3463bccedf7b7beee40e 100644 (file)
--- 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 4c2ea55fc9a15e729b6112d2fd2ab01a1deffdad..e9b361e8fae4d9f56f31bebf63a7783e023f7477 100644 (file)
--- 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 052ad732df86e05cae71ae1e663a50a55935eaba..99bba1a2c5ba0de0c0d1210fb05c9bbdeff332b0 100644 (file)
--- 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 ae1ddc0500a030fc3d084d1b75ffaec2dc3229a0..fa9cba3a871cbb67d5b683ff3ad6e581e98b0c0e 100644 (file)
--- 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 935758ae636ce93a7039afd59d4222cc74e710da..3075bab0acab28d12b05dc59726361e8a0a75e2d 100644 (file)
--- 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 8aadd3398d697f097480453eef1faaa6a8eca028..56206a3bdf09be9a92a129e53ac4d0975149d89e 100644 (file)
--- 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 9fdfb97f847f0ef16a8bb26af63310c74b9c389f..673941a79d5e3b772053fe850050b6d05de8e6eb 100644 (file)
--- 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 c21a89d2ec3db7b95ffe898dc6592116b0baef9d..9fa0e0692dbe365b6b59abf17f0849cb681d8551 100644 (file)
--- 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 65296f81060baccd891380179b283fc7515acef0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 c8597b78dd47689f06451aecad1eceae3555f139..04a73eaf1bff2ed11444d0b8142bb6fa9564a137 100644 (file)
--- 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 d2d0b021ef19e2dae63cf2b1937a0020bd114b24..261e758f4d9de022ba95aa6bd48ebaa572fcfb25 100644 (file)
--- 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 07e6710d443817052437f0e06877413ccf004e72..499b7b4be88d292049f483a7b5ac1f451e2b145d 100644 (file)
--- 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 3c3c2071aeec08156fce5efbaa48a5d06f9ffdcf..9db37fda4e8dbadc05ac993ee50b615e5299a760 100644 (file)
--- 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 53d25a44776d06513bceff60a0a8a79ff6674c90..a0cf2393497855afd58f15388d6f53d5a231cdfe 100644 (file)
--- 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 028ff632552069f8ea6a9b4266e534f565034219..f3bb2af3c476ae724f5509fe23cde1a20a4889c2 100644 (file)
--- 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 92301686be368d2a6bf7c3cc8217ba196533a219..5c63b4fd2ad371313ccfd410d8d78d68af3c64a2 100644 (file)
--- 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 ce7459b974291854dcf8bc6d7189721c9a4f06d8..9743d7ab901ddd2f5826c101e60ddae5d53c7fe8 100644 (file)
--- 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 c7b62786bb8f06b96aa09e3bf14d9fa1ef8d14c9..ed9ab73d9f7b498efaaca12fc673d1f5491c0e72 100644 (file)
--- 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 c7f6db09148c2ef7fa75093f7b467d363b561c57..cfeb9884a00e2fe3d1491f02770a91a5560b28cd 100644 (file)
--- 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 eb21db6ee6ec4baced96048e55781ca1993b54d1..509fcdf25b8783cf98acb5499a6a57e4c907f56a 100644 (file)
--- 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 0d88b3d8474697b3ef4038e95bc53ce33bce6e0f..82992a29a87f071e3cf352caa2d06a42159bab41 100644 (file)
--- 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 43439cadcff69c487aa4b74bd825369dd42898fc..43f71b17878a94196bef09b6684edbae916b4320 100644 (file)
--- 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 bba2981777b7b2dee617fa2524750cadd59603fa..e3e34c2a00d6c686a4ce174044484a8570430054 100644 (file)
--- 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 d990a02f47dd23bccb96c64fd19bab79c34153a1..a8adf33cb4a1057bdc405ebf451db43dcef95b98 100644 (file)
--- 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 84eb0a3d0fb770a072aa8de5bfda477431dccce2..6ed11378957b0e17edf784c94cb443a3b76ad62b 100644 (file)
--- 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 65296f81060baccd891380179b283fc7515acef0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 42bc9b772dc0af77a08c0d169956e080bfa9a492..aeeefc5338c515a23f046691945886f17600c991 100644 (file)
--- 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 e0b69bfe9b1a9d970cbce61929c6f2dae38dd2fd..f5d37d3a5557c1c80bd3e626de98cd6bb0cbd08b 100644 (file)
--- 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 10e9b03f30e68f5df77dae402906b2f72285081d..9b54ddc24e5e23165a83c5a11cad3aa251ed40b3 100644 (file)
--- 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 b53efd365df4a847653630170a7b3fbb8fce298c..73b7c925a8b31c3100429b281c81877d10128c5a 100644 (file)
--- 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 d3a2a21f430a437d3c375c14cb1f637b39000f57..16a60a60c00cfc5d422532384c499b557f9ccb84 100644 (file)
--- 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 e899f0057280e74925c022668fee84593ed8e8b1..522660ee452bd97e7bfdf32801f2f10dbee59021 100644 (file)
--- 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 3f69637f05b3d937b6b8ec0ee35f358ce4afa649..17835b3e95cd2f6a2f9517d48adcf3153ac4961b 100644 (file)
--- 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 65296f81060baccd891380179b283fc7515acef0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 f9af35188d72bc03909eb72e5464ba56c695057d..6b0f607ade41087c1525f9da63b095d678abaa35 100644 (file)
--- 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 e4f608088d9d2a7906d8f16462f2ddb295166588..987c0f25da3d3f3345915d2c8114f471c71887d6 100644 (file)
--- 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 9938895086d0ef2d71dc1dea726c11f0faae8433..e6d757fcfbebce8e7833e9e0bfd34a1c92a44b6f 100644 (file)
--- 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 e61a3a352b36710758363d45af3e2b5558854d7b..9764275cc186d075d42375cf5230bdd587864878 100644 (file)
--- 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 9213f81fb4870c1e5fef2a6b06b0032420b5cc1c..1b46084bb024c79b1beeb70421bf808afe6cb1d7 100644 (file)
--- 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 3188ddbfa418320a84de1e515f8a00ab65905247..e59125619e921c5bf259ec00c8097dd6ebf7bbb3 100644 (file)
--- 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 25b2bee652a1e4d7db462b9f5b326e32e91b0fe8..89384b9af7f1758452d08ef05267d526245a3044 100644 (file)
--- 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 409fc1a3cf050e14e498d47cbd5654df71d28d5f..bc5fbafd9178f73761260a2ce2c5de46e5a0e91d 100644 (file)
--- 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 8eb39f509bb0adc799303eda1e109c215a8f20c9..886659fe35e601a04e5bf59e8c096099ad381541 100644 (file)
--- 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 839d1a456ea0fa84840fdb7615c1582bee1e26e6..4c71b7b8f797a3ffc748ecafae9384f65ce54a66 100644 (file)
--- 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 9e2b9ded5f23a2a16547cc7b671319e9f5fb6012..0ba7cb1281a9f7ae5e4c0226fb5a97b574b7cbe0 100644 (file)
--- 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 c6ee25529ec0bf1dc6f2c5d326a0f8b955782e22..05149c7b93104214ea90386e7e69c2c339487bd7 100644 (file)
--- 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 2a3ab874575652ba705455ca418e8fcb2681a151..341b711c6779deeb0b24d0452957f563e27fe245 100644 (file)
--- 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 e0c9840924f8f3d01d88a2ec12252829a8ce4778..5a1501347a125b443d21c8b7ea4e86095efbff1e 100644 (file)
--- 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 5c44644c2ec22e8542fb697d390a7b063b066121..96343a9b95d179b3a06bc12792fbb7fd7dd380ac 100644 (file)
--- 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 3c1f5f7920ab534829f10a10a4099a299af35119..be6c44ff3c168d2ed3c4b9fa29d76f0a40463830 100644 (file)
--- 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 eb3a0eb1a81dc2f422a486eda35027a415d2eea1..46a7d6f025cdb6e76ff19fbf639b804c258c50cb 100644 (file)
--- 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 d4e2e94c3a8cc6a82480d1d754004c5dad45facb..739df44dd26cd2d9e70c86da9ec93e32344078e4 100644 (file)
--- 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 244f36a849b0283d7aceefe79f2dabdffa7161ca..c8f5049293571403f032ed0331938a6a91352873 100644 (file)
--- 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 12abd08cfbff14a6e8dd9df91c19936d64f68d4f..2ff3cd276d02442218983e2e11843acdb5ed4aff 100644 (file)
--- 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 834310db0815057bc4e499986fc4d25245b8c134..edd3263978b2610ce1eb83c0702149d8c970d6b9 100644 (file)
--- 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 7d802d09a80f2c24dc9020bcc9f7e28cbe0443c8..569a2d06143f60058d0a0651475bd629d2f990a1 100644 (file)
--- 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 0ab90372352bdd6c1c6b979e88000a372243672b..bf482a6780e898fee72fe91fd32098a9c88ad1fe 100644 (file)
--- 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 6b1f9244702947d4bb3301d76aed5dd66227cd58..54425eb2fa3f5458b6f60982c1a54594e845fcbd 100644 (file)
--- 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 71adef65984724689a3e354442d2171b9a07a464..9008f3042098f35581f1f6cd053622ae6bcbfd1b 100644 (file)
--- 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 185991b74807f18199b359fb3af017174d4a6116..ca1071ae0f11a2540c2854954fbfa8c9c2f53f52 100644 (file)
--- 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 a28f125e34356d96aebdd8c85cd228c4bbc63627..523c2144623e764c5df9ce22dd6a1fee099219eb 100644 (file)
--- 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 52d76b5769a477ddaeedb8402cb848c7daa74bc8..bd12e97bee401c59444e44a9f9d69c89ce5c4b85 100644 (file)
--- 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 9c0369c424216404511c30fb000af494266f3498..4cf958de48afa7cc69aee42e93b28ba2c90cfc3c 100644 (file)
--- 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 909a9b95a5481dbbde04f2764bb5f28fb084d16e..6da4880b58d744d929429f19edf05378ffc72031 100644 (file)
--- 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 cde8965e03456c9c9a4a84d46d3937c066d1306e..3bba1d479bd35869be7f12f57e8ef71404326c94 100644 (file)
--- 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 6d4cdc6bee322b6f0d84151f0f8a6a86ee352af4..fe73d4f62e35156920eb8fbedb96536bc64f4a5f 100644 (file)
--- 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 9da40bf778bad96baa56c9eae3ac68177d6746b5..5676d4cff0d48cf30d456650b98d3ca350da7ddd 100644 (file)
--- 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 a9e1dce2b3b98b48a41ad9110b97af53e374f45d..f3b96c7fcfac665d0768aaebe22fd6be3b0d7d4b 100644 (file)
--- 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 45002d8eed960afa0f791885a3d2f9632f1d3795..8495cdc47068a08230cd20bcaae09b78a9895bb8 100644 (file)
--- 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 4c629dd2b787025007c31612c626914d67ee9dad..80e7651b6e2bb46e873bced56c3039df9e4d1bca 100644 (file)
--- 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 c0f8cf48ef87b070b879cd111d428c0f3cf33afc..782b4848a2b5f393dc8a32341f970f68e8f444e6 100644 (file)
--- 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 b062978633db4145e2fd065be927685bceafaee2..41a4fcd8e0e18c8f79d423bdedb4e982b5d25fcc 100644 (file)
--- 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 db172c5e2637aed600150165a28c9a94452bb2b3..580d7dcee51c14e1d55b997a6982b3efa399d709 100644 (file)
--- 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 52770a3e0b586c9cf6af80b6c6a033fe6f2eeb68..6bc925a1bd18d5aeefc877672e67ca419529863d 100644 (file)
--- 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 7ccad7dd2a3678ab9289f14f6f3296fdf2c1870a..fe706b01f9528740a5a02b68085f3e3ad34590e8 100644 (file)
--- 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 ba0c1ee4e1a4f9663ae181ebc14c313c878a04b4..519ca724b3415c0221e7ac656f138d30b15c21d3 100644 (file)
--- 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 89a97caa09899b8eed4e09e217d5e9046da5ba8b..2ea72823858413cf375fa21b4877f0aad32ef3c6 100644 (file)
--- 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 f7cfefac53022388397f8d5d04ab4cfa55d0dfe0..2ff126ea3334abbdcec3ef7f9514bc5123c0bd9a 100644 (file)
--- 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 f5a869b7889950a41110c9f887a33fd0086a3b51..14eb23856c8ccec738065fcdbf60bb4cf0bd9650 100644 (file)
--- 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 b2fd168d0741c161c3e2c9aa802fd5a528927305..c735a0320512bf5081034329491dd3aa40f043ad 100644 (file)
--- 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 4ef293f8f15a73b5e64903d3f2d883ae24c75aea..2dd7aa890b6219a6530fe4ca384875664a88455c 100644 (file)
--- 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 ebef9e278c4df024ce9db0c61471c3fe752ca9a4..90009ffcd74905d5f4e382ae387c3de789fd9d82 100644 (file)
--- 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 b4eba3d00bd2c143bbed874a130ee463b1c10f48..4ba1a270fc3c29b596204d32f9aeb13bbd1b9eef 100644 (file)
--- 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 c79f0bee93f5cd6c624521975814af97467aa6bf..572fd3f807b9698c24cac35f0be832c15979f00f 100644 (file)
--- 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 a386058d87bdb9fb0b04f833c665536b90efcccc..35d9d0260492782d30aa9654e7924327ebe82692 100644 (file)
--- 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 6f96f1b7b8638042f2f69128b76534925fc3a396..879881583ae31df92013fd54425a57245ba0ec5d 100644 (file)
--- 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 4910fd27de868d60814da505a9dc28a9c47e1c3a..85ec8481234be6b98c6379917507f3df9d6e4721 100644 (file)
--- 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 c2166932a04d16eccfbedfb28ca7bdca4813936c..b5ce992237ae0ea3ac85db8fa3b88ae13fa73043 100644 (file)
--- 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 5caefdf72ed4adaf9749f66d74a5ad9aaf556700..83b3ab1337ab343124bdc2b1c46f839b06d0c745 100644 (file)
--- 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 e912cf5d3c9900cf0ae8a9f27461471c4205eb84..52ff8c05e19da738def546c1c2606ec518ec6339 100644 (file)
--- 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 2bc8b98ab4f2339455216a157c00898796411884..222a39149674456a2206d50d42e0da2ab62ae59a 100644 (file)
--- 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 c52b464bc36f2294ca7e9b95a861915c59c010b7..b061067833e1d9a06b7b5ec4e3529c18b032f98c 100644 (file)
--- 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 0f37c1cf0c8f289fb38928c3cd0a0e6bcd3486a5..c1aba6ca96f8effbb13c929ce192dc440be28fee 100644 (file)
--- 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 f3344955e429068361effaaba8b3fa4987194d70..fd68c6fb4bbfff5311a6c4536de46db012065620 100644 (file)
--- 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 00172d198547f3665f7dca7ce29c3cd3f956323c..53adce0e0766f4e44fce75203a70161984fa98e9 100644 (file)
--- 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 2b9ca36469099d4f356de946bfe135b7e6f7d08b..8258775abf4b9edd65e6831311428ee9b5f4dc58 100644 (file)
--- 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 31fea32ab275276ee93c52511bbc324390ca2c4b..7bc495b49bd29340133da4c8844633b1a0eb9e86 100644 (file)
--- 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 af11940191f1475b67292ac1a1482748c9d0c163..bbcfaab5b1c91c9207e44a4d2fa114aacb21a1e4 100644 (file)
--- 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 9b5afbc4918fc293e5500cb55599bb83075c79df..51d1375d849d376995eea6dd56a834c9b8a12d56 100644 (file)
--- 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 347e929b4afacca896b04f6635ae203154981f6a..a51bbca2f602a9f656a3fd02cd376e413af97820 100644 (file)
--- 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 cbaf7772452ab9602a57ab8398e13a9a97b5c097..2b175075fc5aa9266300802ea23179b7cec66f2b 100644 (file)
--- 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 7d8ad0eba0ddc90021b5d88398c22af8ce8b3b65..0610b3083d4d69fa29cf29fdb900d41eed22dc48 100644 (file)
--- 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 9273d71dab88e8b6fcdfd4c04f793f58dc8cbc81..6059c4839348bbb10403a8940b214ccb7cebb3ea 100644 (file)
--- 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 b105f312332a0bfc325f2a53ac795bd9028a28fe..ef89bf14baaa0f92d35bfe76058fa427dea0683e 100644 (file)
--- 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      
    )