CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/10/15 01:10:11
Modified files:
. : ChangeLog
lily : midi-item.cc output-property-music-iterator.cc
paper-book.cc
lily/include : change-iterator.hh chord-tremolo-iterator.hh
event-chord-iterator.hh
folded-repeat-iterator.hh grace-iterator.hh
midi-item.hh music-iterator.hh music-output.hh
music-wrapper-iterator.hh paper-score.hh
percent-repeat-iterator.hh performance.hh
property-iterator.hh sequential-iterator.hh
sequential-music-iterator.hh
simple-music-iterator.hh
simultaneous-music-iterator.hh
time-scaled-music-iterator.hh
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4175&tr2=1.4176&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/midi-item.cc.diff?tr1=1.88&tr2=1.89&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/output-property-music-iterator.cc.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-book.cc.diff?tr1=1.119&tr2=1.120&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/change-iterator.hh.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/chord-tremolo-iterator.hh.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/event-chord-iterator.hh.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/folded-repeat-iterator.hh.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/grace-iterator.hh.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/midi-item.hh.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/music-iterator.hh.diff?tr1=1.68&tr2=1.69&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/music-output.hh.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/music-wrapper-iterator.hh.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/paper-score.hh.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/percent-repeat-iterator.hh.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/performance.hh.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/property-iterator.hh.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/sequential-iterator.hh.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/sequential-music-iterator.hh.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/simple-music-iterator.hh.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/simultaneous-music-iterator.hh.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/time-scaled-music-iterator.hh.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4175 lilypond/ChangeLog:1.4176
--- lilypond/ChangeLog:1.4175 Fri Oct 14 12:35:23 2005
+++ lilypond/ChangeLog Sat Oct 15 01:10:10 2005
@@ -1,3 +1,7 @@
+2005-10-15 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/include/*.hh (Module): lots of compile fixes.
+
2005-10-14 Heikki Junes <[EMAIL PROTECTED]>
* elisp/lilypond-font-lock.el, elisp/lilypond-indent.el: Avoid nil
Index: lilypond/lily/include/change-iterator.hh
diff -u lilypond/lily/include/change-iterator.hh:1.21
lilypond/lily/include/change-iterator.hh:1.22
--- lilypond/lily/include/change-iterator.hh:1.21 Thu Mar 10 14:36:12 2005
+++ lilypond/lily/include/change-iterator.hh Sat Oct 15 01:10:11 2005
@@ -17,6 +17,7 @@
/* constructor is public */
virtual void process (Moment);
DECLARE_SCHEME_CALLBACK (constructor, ());
+ DECLARE_CLASSNAME(Change_iterator);
private:
void error (String);
Index: lilypond/lily/include/chord-tremolo-iterator.hh
diff -u lilypond/lily/include/chord-tremolo-iterator.hh:1.17
lilypond/lily/include/chord-tremolo-iterator.hh:1.18
--- lilypond/lily/include/chord-tremolo-iterator.hh:1.17 Thu Mar 10
14:36:12 2005
+++ lilypond/lily/include/chord-tremolo-iterator.hh Sat Oct 15 01:10:11 2005
@@ -14,6 +14,7 @@
class Chord_tremolo_iterator : public Music_iterator
{
public:
+ DECLARE_CLASSNAME(Chord_tremolo_iterator);
DECLARE_SCHEME_CALLBACK (constructor, ());
Chord_tremolo_iterator ();
Chord_tremolo_iterator (Chord_tremolo_iterator const &);
Index: lilypond/lily/include/event-chord-iterator.hh
diff -u lilypond/lily/include/event-chord-iterator.hh:1.10
lilypond/lily/include/event-chord-iterator.hh:1.11
--- lilypond/lily/include/event-chord-iterator.hh:1.10 Wed Jul 13 18:22:34 2005
+++ lilypond/lily/include/event-chord-iterator.hh Sat Oct 15 01:10:11 2005
@@ -20,6 +20,7 @@
Find a bottom notation context to deliver events to.
*/
virtual Context *get_bottom_context ();
+ DECLARE_CLASSNAME(Event_chord_iterator);
/*
Since Event_chord_iterator has no list-cursor internally, we
Index: lilypond/lily/include/folded-repeat-iterator.hh
diff -u lilypond/lily/include/folded-repeat-iterator.hh:1.18
lilypond/lily/include/folded-repeat-iterator.hh:1.19
--- lilypond/lily/include/folded-repeat-iterator.hh:1.18 Thu Mar 10
14:36:12 2005
+++ lilypond/lily/include/folded-repeat-iterator.hh Sat Oct 15 01:10:11 2005
@@ -19,6 +19,7 @@
{
public:
DECLARE_SCHEME_CALLBACK (constructor, ());
+ DECLARE_CLASSNAME(Folded_repeat_iterator);
Folded_repeat_iterator (Folded_repeat_iterator const &src);
Folded_repeat_iterator ();
Index: lilypond/lily/include/grace-iterator.hh
diff -u lilypond/lily/include/grace-iterator.hh:1.16
lilypond/lily/include/grace-iterator.hh:1.17
--- lilypond/lily/include/grace-iterator.hh:1.16 Thu Mar 10 14:36:12 2005
+++ lilypond/lily/include/grace-iterator.hh Sat Oct 15 01:10:11 2005
@@ -16,6 +16,7 @@
public:
virtual void process (Moment);
DECLARE_SCHEME_CALLBACK (constructor, ());
+ DECLARE_CLASSNAME(Grace_iterator);
Moment pending_moment () const;
};
Index: lilypond/lily/include/midi-item.hh
diff -u lilypond/lily/include/midi-item.hh:1.38
lilypond/lily/include/midi-item.hh:1.39
--- lilypond/lily/include/midi-item.hh:1.38 Sat Aug 20 23:56:02 2005
+++ lilypond/lily/include/midi-item.hh Sat Oct 15 01:10:11 2005
@@ -18,6 +18,7 @@
class Midi_item
{
public:
+ DECLARE_CLASSNAME(Midi_item);
Midi_item ();
virtual ~Midi_item ();
virtual char const *name () const;
@@ -54,6 +55,7 @@
void set (String header_string, String data_string, String footer_string);
virtual String to_string () const;
virtual String data_string () const;
+ DECLARE_CLASSNAME(Midi_chunk);
private:
String data_string_;
@@ -73,6 +75,8 @@
class Midi_header : public Midi_chunk
{
public:
+ DECLARE_CLASSNAME(Midi_header);
+
Midi_header (int format_i, int tracks_i, int clocks_per_4_i);
};
@@ -84,6 +88,7 @@
public:
Midi_instrument (Audio_instrument *);
+ DECLARE_CLASSNAME(Midi_instrument);
virtual String to_string () const;
Audio_instrument *audio_;
@@ -93,6 +98,7 @@
{
public:
Midi_key (Audio_key *);
+ DECLARE_CLASSNAME(Midi_key);
virtual String to_string () const;
@@ -103,6 +109,7 @@
{
public:
Midi_time_signature (Audio_time_signature *);
+ DECLARE_CLASSNAME(Midi_time_signature);
virtual String to_string () const;
@@ -117,6 +124,7 @@
{
public:
Midi_note (Audio_note *);
+ DECLARE_CLASSNAME(Midi_note);
Moment get_length () const;
int get_pitch () const;
@@ -136,6 +144,7 @@
{
public:
Midi_note_off (Midi_note *);
+ DECLARE_CLASSNAME(Midi_note_off);
virtual String to_string () const;
@@ -151,6 +160,7 @@
TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC,
MARKER, CUE_POINT
};
+ DECLARE_CLASSNAME(Midi_text);
Midi_text (Audio_text *);
@@ -163,6 +173,7 @@
{
public:
Midi_dynamic (Audio_dynamic *);
+ DECLARE_CLASSNAME(Midi_dynamic);
virtual String to_string () const;
@@ -173,6 +184,7 @@
{
public:
Midi_piano_pedal (Audio_piano_pedal *);
+ DECLARE_CLASSNAME(Midi_piano_pedal);
virtual String to_string () const;
@@ -183,6 +195,7 @@
{
public:
Midi_tempo (Audio_tempo *);
+ DECLARE_CLASSNAME(Midi_tempo);
virtual String to_string () const;
@@ -193,6 +206,7 @@
{
public:
int number_;
+ DECLARE_CLASSNAME(Midi_track);
/*
Compensate for starting grace notes.
Index: lilypond/lily/include/music-iterator.hh
diff -u lilypond/lily/include/music-iterator.hh:1.68
lilypond/lily/include/music-iterator.hh:1.69
--- lilypond/lily/include/music-iterator.hh:1.68 Fri Aug 12 00:04:45 2005
+++ lilypond/lily/include/music-iterator.hh Sat Oct 15 01:10:11 2005
@@ -53,6 +53,7 @@
Moment music_length_;
Moment start_mom_;
+ DECLARE_CLASSNAME(Music_iterator);
DECLARE_SMOBS (Music_iterator, dummy);
Music_iterator (Music_iterator const &);
Index: lilypond/lily/include/music-output.hh
diff -u lilypond/lily/include/music-output.hh:1.23
lilypond/lily/include/music-output.hh:1.24
--- lilypond/lily/include/music-output.hh:1.23 Fri Aug 12 00:04:45 2005
+++ lilypond/lily/include/music-output.hh Sat Oct 15 01:10:11 2005
@@ -13,11 +13,12 @@
#include "lily-proto.hh"
#include "protected-scm.hh"
#include "smobs.hh"
+#include "virtual-methods.hh"
class Music_output
{
DECLARE_SMOBS (Music_output, foo);
-
+ DECLARE_CLASSNAME(Music_output);
protected:
Music_output ();
Index: lilypond/lily/include/music-wrapper-iterator.hh
diff -u lilypond/lily/include/music-wrapper-iterator.hh:1.31
lilypond/lily/include/music-wrapper-iterator.hh:1.32
--- lilypond/lily/include/music-wrapper-iterator.hh:1.31 Thu Mar 10
14:36:12 2005
+++ lilypond/lily/include/music-wrapper-iterator.hh Sat Oct 15 01:10:11 2005
@@ -22,6 +22,7 @@
public:
DECLARE_SCHEME_CALLBACK (constructor, ());
Music_wrapper_iterator ();
+ DECLARE_CLASSNAME(Music_wrapper_iterator);
virtual void derived_substitute (Context *f, Context *t);
virtual void derived_mark () const;
Index: lilypond/lily/include/paper-score.hh
diff -u lilypond/lily/include/paper-score.hh:1.33
lilypond/lily/include/paper-score.hh:1.34
--- lilypond/lily/include/paper-score.hh:1.33 Fri Aug 12 00:04:45 2005
+++ lilypond/lily/include/paper-score.hh Sat Oct 15 01:10:11 2005
@@ -23,6 +23,8 @@
public:
Paper_score (Output_def *);
+ DECLARE_CLASSNAME(Paper_score);
+
Output_def *layout () const;
System *root_system () const;
Index: lilypond/lily/include/percent-repeat-iterator.hh
diff -u lilypond/lily/include/percent-repeat-iterator.hh:1.10
lilypond/lily/include/percent-repeat-iterator.hh:1.11
--- lilypond/lily/include/percent-repeat-iterator.hh:1.10 Thu Mar 10
14:36:12 2005
+++ lilypond/lily/include/percent-repeat-iterator.hh Sat Oct 15 01:10:11 2005
@@ -14,6 +14,7 @@
class Percent_repeat_iterator : public Music_iterator
{
public:
+ DECLARE_CLASSNAME(Percent_repeat_iterator);
DECLARE_SCHEME_CALLBACK (constructor, ());
Percent_repeat_iterator ();
protected:
Index: lilypond/lily/include/performance.hh
diff -u lilypond/lily/include/performance.hh:1.22
lilypond/lily/include/performance.hh:1.23
--- lilypond/lily/include/performance.hh:1.22 Mon Apr 18 00:36:45 2005
+++ lilypond/lily/include/performance.hh Sat Oct 15 01:10:11 2005
@@ -17,6 +17,7 @@
public:
Performance ();
~Performance ();
+ DECLARE_CLASSNAME(Performance);
void add_element (Audio_element *p);
Index: lilypond/lily/include/property-iterator.hh
diff -u lilypond/lily/include/property-iterator.hh:1.21
lilypond/lily/include/property-iterator.hh:1.22
--- lilypond/lily/include/property-iterator.hh:1.21 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/include/property-iterator.hh Sat Oct 15 01:10:11 2005
@@ -19,6 +19,7 @@
public:
DECLARE_SCHEME_CALLBACK (constructor, ());
DECLARE_SCHEME_CALLBACK (once_finalization, (SCM, SCM));
+ DECLARE_CLASSNAME(Property_iterator);
protected:
virtual void do_quit ();
@@ -32,6 +33,7 @@
{
public:
DECLARE_SCHEME_CALLBACK (constructor, ());
+ DECLARE_CLASSNAME(Property_unset_iterator);
protected:
virtual void process (Moment);
};
@@ -41,6 +43,7 @@
public:
DECLARE_SCHEME_CALLBACK (constructor, ());
DECLARE_SCHEME_CALLBACK (once_finalization, (SCM, SCM));
+ DECLARE_CLASSNAME(Push_property_iterator);
protected:
virtual void process (Moment);
virtual void do_quit ();
@@ -50,6 +53,7 @@
{
public:
DECLARE_SCHEME_CALLBACK (constructor, ());
+ DECLARE_CLASSNAME(Pop_property_iterator);
protected:
virtual void process (Moment);
};
Index: lilypond/lily/include/sequential-iterator.hh
diff -u lilypond/lily/include/sequential-iterator.hh:1.18
lilypond/lily/include/sequential-iterator.hh:1.19
--- lilypond/lily/include/sequential-iterator.hh:1.18 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/include/sequential-iterator.hh Sat Oct 15 01:10:11 2005
@@ -19,6 +19,7 @@
{
public:
DECLARE_SCHEME_CALLBACK (constructor, ());
+ DECLARE_CLASSNAME(Sequential_iterator);
Sequential_iterator ();
Sequential_iterator (Sequential_iterator const &);
virtual void derived_substitute (Context *f, Context *t);
@@ -34,9 +35,11 @@
virtual void process (Moment);
virtual Music_iterator *try_music_in_children (Music *) const;
virtual bool run_always () const;
+
protected:
Music_iterator *iter_;
- virtual SCM get_music_list ()const;
+
+ virtual SCM get_music_list () const;
virtual void next_element (bool side_effect);
Grace_fixup *get_grace_fixup () const;
Index: lilypond/lily/include/sequential-music-iterator.hh
diff -u lilypond/lily/include/sequential-music-iterator.hh:1.28
lilypond/lily/include/sequential-music-iterator.hh:1.29
--- lilypond/lily/include/sequential-music-iterator.hh:1.28 Thu Mar 10
14:36:12 2005
+++ lilypond/lily/include/sequential-music-iterator.hh Sat Oct 15 01:10:11 2005
@@ -18,6 +18,7 @@
{
public:
DECLARE_SCHEME_CALLBACK (constructor, ());
+ DECLARE_CLASSNAME(Sequential_music_iterator);
private:
virtual SCM get_music_list ()const;
};
Index: lilypond/lily/include/simple-music-iterator.hh
diff -u lilypond/lily/include/simple-music-iterator.hh:1.13
lilypond/lily/include/simple-music-iterator.hh:1.14
--- lilypond/lily/include/simple-music-iterator.hh:1.13 Thu Mar 10 14:36:12 2005
+++ lilypond/lily/include/simple-music-iterator.hh Sat Oct 15 01:10:11 2005
@@ -18,6 +18,7 @@
class Simple_music_iterator : public Music_iterator
{
protected:
+ DECLARE_CLASSNAME(Simple_music_iterator);
Moment last_processed_mom_;
public:
Index: lilypond/lily/include/simultaneous-music-iterator.hh
diff -u lilypond/lily/include/simultaneous-music-iterator.hh:1.26
lilypond/lily/include/simultaneous-music-iterator.hh:1.27
--- lilypond/lily/include/simultaneous-music-iterator.hh:1.26 Thu Mar 10
14:36:12 2005
+++ lilypond/lily/include/simultaneous-music-iterator.hh Sat Oct 15
01:10:11 2005
@@ -19,6 +19,7 @@
virtual void derived_substitute (Context *f, Context *t);
virtual void derived_mark () const;
DECLARE_SCHEME_CALLBACK (constructor, ());
+ DECLARE_CLASSNAME(Simultaneous_music_iterator);
/// make a new context for every child.
bool create_separate_contexts_;
Index: lilypond/lily/include/time-scaled-music-iterator.hh
diff -u lilypond/lily/include/time-scaled-music-iterator.hh:1.12
lilypond/lily/include/time-scaled-music-iterator.hh:1.13
--- lilypond/lily/include/time-scaled-music-iterator.hh:1.12 Thu Mar 10
14:36:12 2005
+++ lilypond/lily/include/time-scaled-music-iterator.hh Sat Oct 15 01:10:11 2005
@@ -16,6 +16,7 @@
public:
DECLARE_SCHEME_CALLBACK (constructor, ());
/* construction */
+ DECLARE_CLASSNAME(Time_scaled_music_iterator);
protected:
virtual void process (Moment);
};
Index: lilypond/lily/midi-item.cc
diff -u lilypond/lily/midi-item.cc:1.88 lilypond/lily/midi-item.cc:1.89
--- lilypond/lily/midi-item.cc:1.88 Thu Oct 13 23:25:14 2005
+++ lilypond/lily/midi-item.cc Sat Oct 15 01:10:10 2005
@@ -473,5 +473,5 @@
char const *
Midi_item::name () const
{
- return this->class_name ();
+ return this->class_name ();
}
Index: lilypond/lily/output-property-music-iterator.cc
diff -u lilypond/lily/output-property-music-iterator.cc:1.19
lilypond/lily/output-property-music-iterator.cc:1.20
--- lilypond/lily/output-property-music-iterator.cc:1.19 Thu Oct 13
23:25:14 2005
+++ lilypond/lily/output-property-music-iterator.cc Sat Oct 15 01:10:10 2005
@@ -27,7 +27,7 @@
bool accepted = try_music (get_music ());
if (!accepted)
get_music ()->origin ()->warning (_f ("junking event: `%s'",
- get_music (->class_name ())));
+ get_music ()->class_name ()));
}
Simple_music_iterator::process (m);
}
Index: lilypond/lily/paper-book.cc
diff -u lilypond/lily/paper-book.cc:1.119 lilypond/lily/paper-book.cc:1.120
--- lilypond/lily/paper-book.cc:1.119 Thu Oct 13 23:25:14 2005
+++ lilypond/lily/paper-book.cc Sat Oct 15 01:10:10 2005
@@ -57,10 +57,7 @@
{
Paper_book *b = (Paper_book *) SCM_CELL_WORD_1 (smob);
- scm_puts ("#<", port);
- scm_puts (b->class_name (), port);
- scm_puts (" ", port);
- scm_puts (">", port);
+ scm_puts ("#<Paper_book>", port);
return 1;
}
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
