* stepmake/stepmake/generic-vars.make (LOOP): Add PLUS to keep -j

[lilypond.git] / lily / include / lily-proto.hh

diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh
index d7ea27aa7c39c2140eda6ee2d101fa6a01d2d15f..30603aff77c20c5dba3c43d8105c6f026ff2d3ae 100644 (file)
--- a/lily/include/lily-proto.hh
+++ b/lily/include/lily-proto.hh
@@ -3,14 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef LILY_PROTO_HH
 #define LILY_PROTO_HH
 #include "flower-proto.hh"
 
-class Adobe_font_metric;
 class All_font_metrics;
 class Audio_column;
 class Audio_dynamic;
@@ -73,6 +72,7 @@ class Keyword_table;
 class Ligature_bracket_engraver;
 class Ligature_engraver;
 class Lily_lexer;
+class Lily_parser;
 class Lilypond_context_key;
 class Lilypond_grob_key;
 class Line_group_engraver_group;
@@ -121,7 +121,6 @@ class Paper_book;
 class Paper_column;
 class Paper_outputter;
 class Paper_score;
-class Paper_system;
 class Performance;
 class Performer;
 class Performer_group;
@@ -179,4 +178,48 @@ typedef void (*Engraver_void_function_engraver_grob_info) (Engraver *, Grob_info
 typedef void (*Translator_void_method_ptr) (Translator *);
 
 
+/* FIXME: when Link_array is dropped, do grand s/r to vector<TYPE*>.  */
+#if STD_VECTOR
+#define Link_array__char_ std::vector<char*>
+#define Link_array__Grob_ std::vector<Grob*>
+#define Link_array__Accidental_placement_entry_ std::vector<Accidental_placement_entry*>
+#define Link_array__Audio_item_ std::vector<Audio_item*>
+#define Link_array__Audio_note_ std::vector<Audio_note*>
+#define Link_array__Audio_piano_pedal_ std::vector<Audio_piano_pedal*>
+#define Link_array__Audio_staff_ std::vector<Audio_staff*>
+#define Link_array__Bracket_nesting_node_ std::vector<Bracket_nesting_node*>
+#define Link_array__Context_ std::vector<Context*>
+#define Link_array__Context_def_ std::vector<Context_def*>
+#define Link_array__Grob_ std::vector<Grob*>
+#define Link_array__Item_ std::vector<Item*>
+#define Link_array__Music_ std::vector<Music*>
+#define Link_array__Note_column_ std::vector<Note_column*>
+#define Link_array__Output_def_ std::vector<Output_def*>
+#define Link_array__Slur_configuration_ std::vector<Slur_configuration*>
+#define Link_array__Source_file_ std::vector<Source_file*>
+#define Link_array__Spanner_ std::vector<Spanner*>
+#define Link_array__Tie_configuration_ std::vector<Tie_configuration*>
+#else /* !STD_VECTOR */
+#define Link_array__char_ Link_array<char>
+#define Link_array__Grob_ Link_array<Grob>
+#define Link_array__Accidental_placement_entry_ Link_array<Accidental_placement_entry>
+#define Link_array__Audio_item_ Link_array<Audio_item>
+#define Link_array__Audio_note_ Link_array<Audio_note>
+#define Link_array__Audio_piano_pedal_ Link_array<Audio_piano_pedal>
+#define Link_array__Audio_staff_ Link_array<Audio_staff>
+#define Link_array__Bracket_nesting_node_ Link_array<Bracket_nesting_node>
+#define Link_array__Context_ Link_array<Context>
+#define Link_array__Context_def_ Link_array<Context_def>
+#define Link_array__Grob_ Link_array<Grob>
+#define Link_array__Item_ Link_array<Item>
+#define Link_array__Music_ Link_array<Music>
+#define Link_array__Note_column_ Link_array<Note_column>
+#define Link_array__Output_def_ Link_array<Output_def>
+#define Link_array__Slur_configuration_ Link_array<Slur_configuration>
+#define Link_array__Source_file_ Link_array<Source_file>
+#define Link_array__Spanner_ Link_array<Spanner>
+#define Link_array__Tie_configuration_ Link_array<Tie_configuration>
+#endif /* !STD_VECTOR */
+
+
 #endif /* LILY_PROTO_HH */