compile fixes while han-wen's so long away

diff --git a/ChangeLog b/ChangeLog
index 2414fa1d4e8d78a802a086a0e7243099f23c3b64..58f40e2a7be4ea3f6ac383eebb2ca5723bebec64 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2002-09-29  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+
+       * lily/: some (c) header fixes.
+       
+       * lily/request-chord.cc: Remove.
+       
+       * lily/include/event-chord-iterator.hh:
+       * lily/include/event.hh:
+       * lily/event-chord.cc: New file.
+       
        * lily/stem-engraver.cc (acknowledge_grob): rename evented back to
        requested.
 

diff --git a/lily/afm.cc b/lily/afm.cc
index 51dbba8224532f0429ba718f4383a88cff7d54ad..8c7e7b2e3f489613e5953750b869e4be6f6dfd2e 100644 (file)
--- a/lily/afm.cc
+++ b/lily/afm.cc
@@ -1,7 +1,7 @@
 /*   
   afm.cc --  implement Adobe_font_metric
   
-  source file of the Flower Library
+  source file of the GNU LilyPond music typesetter
   
   (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   

diff --git a/lily/beam.cc b/lily/beam.cc
index bceef613bbd8978c7b977803a3ed177d9628df6c..333b623e49cd12bc2e4889fda428958f78933f2b 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -5,7 +5,6 @@
   
   (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
-  
 */
 
 /*

diff --git a/lily/binary-source-file.cc b/lily/binary-source-file.cc
index ab1c08488da3974c2cec8c75f4ae2a86f637132f..54771a6f9cbee93d9e3f3bcb8169a7dccaaf4f40 100644 (file)
--- a/lily/binary-source-file.cc
+++ b/lily/binary-source-file.cc
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen
+  (c)  1997--2002 Jan Nieuwenhuizen
 */
 
 

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index d10c12c26d6223fa71d470742754373c87cf5c2c..08c8a52f4ed65184a4fedcaeab84218812f14ee6 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -1,7 +1,9 @@
 /*
   extender-engraver.cc -- implement Extender_engraver
 
-  (c) 1999 Glen Prideaux <glenprideaux@iname.com>,
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1999-2002 Glen Prideaux <glenprideaux@iname.com>,
   Han-Wen Nienhuys, Jan Nieuwenhuizen.
   
 */

diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc
index 1eab3ad6baba1d96d8741c690661c5a9323eefe1..0f7227d83dc12932bcc91a3fe694a3c0d287fa8c 100644 (file)
--- a/lily/hyphen-engraver.cc
+++ b/lily/hyphen-engraver.cc
@@ -1,7 +1,9 @@
 /*
   hyphen-engraver.cc -- implement Hyphen_engraver
 
-  (c) 1999 Glen Prideaux <glenprideaux@iname.com>
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1999-2002 Glen Prideaux <glenprideaux@iname.com>
 */
 
 #include "flower-proto.hh"

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index e5f544b706613994c3500fa3dafcf444b665b111..e2e594c6612b48dd0d66a520a675631fe7544731 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -1,7 +1,10 @@
 /*
   beam.hh -- part of GNU LilyPond
 
-  (c) 1996--2002 Han-Wen Nienhuys
+  source file of the LilyPond music typesetter
+
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef BEAM_HH

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index ebc46be195440b6c121cf60668dd789d96b68e12..c0f2d4af1a53b419c652d2cae5a73fc3cab8bf5f 100644 (file)
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -1,11 +1,13 @@
 /*
   grob.hh -- declare Grob
 
-  (c) 1996-1999--2002 Han-Wen Nienhuys
+  source file of the LilyPond music typesetter
+  
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
-#ifndef STAFFELEM_HH
-#define STAFFELEM_HH
+#ifndef GROB_HH
+#define GROB_HH
 
 #include "parray.hh"
 #include "virtual-methods.hh"
@@ -168,5 +170,5 @@ SCM substitute_mutable_property_alist (SCM alist);
 Link_array<Grob> ly_scm2grobs (SCM l);
 SCM ly_grobs2scm (Link_array<Grob> a);
 
-#endif // STAFFELEM_HH
+#endif /* GROB_HH */
 

diff --git a/lily/include/input.hh b/lily/include/input.hh
index 7dc33b2df1778ecc5986074ef5e3d03378991dee..e0b160978eb830fb07bad14037a2e5695396ef3e 100644 (file)
--- a/lily/include/input.hh
+++ b/lily/include/input.hh
@@ -3,10 +3,9 @@
 
   source file of the LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #ifndef INPUT_HH
 #define INPUT_HH
 

diff --git a/lily/include/ly-smobs.icc b/lily/include/ly-smobs.icc
index 19d054df3249fb28366fb8f406c6e80e843a28e3..7140218fef7908e4d8342554d5c0bee55cd7e5cd 100644 (file)
--- a/lily/include/ly-smobs.icc
+++ b/lily/include/ly-smobs.icc
@@ -3,8 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 #ifndef LY_SMOBS_ICC

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index ae1dc5ddf01cca882c76cceb16707c4e9ee3c97e..400d1ece34cb7e420e78024cd789a82b73151da5 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -84,14 +84,15 @@ Key_engraver::create_key (bool def)
 bool
 Key_engraver::try_music (Music * req)
 {
-  if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req))
+  //  if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req))
+  if (req->is_mus_type ("key-change-event"))
     {
       if (!keyreq_)
        {
          /*
            do this only once, just to be on the safe side.
            */      
-         keyreq_ = kc;
+         keyreq_ = req;
          read_req (keyreq_);
        }
       

diff --git a/lily/lexer.ll b/lily/lexer.ll
index b8065c3788014b675742b8c5abce9aa7a5a6a950..00cff1fd1c95b8e6c1484ede359a84b3155a089a 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -4,7 +4,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
 */
 

diff --git a/lily/request-chord.cc b/lily/request-chord.cc
deleted file mode 100644 (file)
index 43836df..0000000
--- a/lily/request-chord.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "pitch.hh" 
-#include "event-chord-iterator.hh"
-#include "music-list.hh"
-#include "event.hh"
-
-Event_chord::Event_chord ()
-{
-}
-
-Moment
-Event_chord::start_mom () const
-{
-  return Music::start_mom ();
-}
-
-ADD_MUSIC (Event_chord);

diff --git a/lily/source-file.cc b/lily/source-file.cc
index 23cf17cf7c0e6f514912fbae7d33f2a6b9a322d4..1ff2f3d6d4965d819e3be6f3953363b62fb39350 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -3,8 +3,8 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
-  & Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "config.h"

diff --git a/lily/source.cc b/lily/source.cc
index c4dde1cd141882ed606d342084d7d31cfe1dcbdb..727d80e83393965331c7d38706445ee369ebdf65 100644 (file)
--- a/lily/source.cc
+++ b/lily/source.cc
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */