From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 29 Sep 2002 16:09:40 +0000 (+0000)
Subject: compile fixes while han-wen's so long away
X-Git-Tag: release/1.7.2~21
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4ed643022880d554ff6faaf44389ef24aa7281cf;p=lilypond.git
compile fixes while han-wen's so long away
---
diff --git a/ChangeLog b/ChangeLog
index 2414fa1d4e..58f40e2a7b 100644
--- 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 51dbba8224..8c7e7b2e3f 100644
--- 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 bceef613bb..333b623e49 100644
--- 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 ab1c08488d..54771a6f9c 100644
--- 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 d10c12c26d..08c8a52f4e 100644
--- 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 1eab3ad6ba..0f7227d83d 100644
--- 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 e5f544b706..e2e594c661 100644
--- 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 ebc46be195..c0f2d4af1a 100644
--- 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 7dc33b2df1..e0b160978e 100644
--- 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 19d054df32..7140218fef 100644
--- 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 ae1dc5ddf0..400d1ece34 100644
--- 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 b8065c3788..00cff1fd1c 100644
--- 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
index 43836dfc79..0000000000
--- 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 23cf17cf7c..1ff2f3d6d4 100644
--- 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 c4dde1cd14..727d80e833 100644
--- 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>
*/