patch::: 1.1.31.mb2

[lilypond.git] / lily / template1.cc

diff --git a/lily/template1.cc b/lily/template1.cc
index 875c711482dad64f786ed64ecf779b7f427ed191..2767ed6e5805bff0a131434296e527ebb6f7a25c 100644 (file)
--- a/lily/template1.cc
+++ b/lily/template1.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "proto.hh"
@@ -13,20 +13,13 @@
 #include "item.hh"
 #include "musical-request.hh"
 #include "spanner.hh"
-#include "scoreline.hh" 
-#include "staffline.hh"
-
+#include "cursor.tcc"
 #include "pcursor.tcc"
 #include "plist.tcc"
 
 
-#define IPLC_instantiate(a) IPL_instantiate(a); PL_instantiate(const a)
-
-
-IPLC_instantiate(Line_of_score);
-IPLC_instantiate(Line_of_staff);
-IPLC_instantiate(Score_elem);
-IPLC_instantiate(Spanner);
-IPLC_instantiate(Idealspacing);
-IPLC_instantiate(PCol);
+#define IPLC_INSTANTIATE(a) POINTERLIST_INSTANTIATE(a)
 
+IPLC_INSTANTIATE(Score_element);
+IPLC_INSTANTIATE(Spanner);
+IPLC_INSTANTIATE(Idealspacing);