lilypond-0.1.51

diff --git a/NEWS b/NEWS
index 22e3ed57cbaf36820aa2f252180bb41fb277a4be..e528ecb8eeece459247cde05f5b41dc513516629 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+**********
+march 27
+pl 51
+       - changed dutch -> nederlands, german -> deutsch etc.
+       - norwegian (AG)
+
+pl 50.jcn4
+       - fixes for cygnus' gnu-windows32  beta19
+         be sure to compile with -fno-rtti
+       - proof of concept for automated updating of Makefile.am
+         see mi2mu/GNUmakefile (still somewhat clumsy)
+       - mv'd both config.hh.in to acconfig.h
+       - copied printing/debugging/optimising options to flower conf
+       - (some modified) fixes from AO
+       - beginnetje los-toros-oboe
+       - bf: DIR_DATADIR
+       - bf: trills
+
+
+               
+************
 pl 50
        - deprecate autowild
        - --srcdir fixes
@@ -7,8 +28,6 @@ pl 49jcn2
        - static (default) and/or shared libs flower and lily
        - patch from AO 'libtool 1.1.1'
        - mf: trill-symbols: feta-slag.mf
-
-pl 49.jcn1
        - shared libs (ugh: hardcoded switch in configure set to static)
        - some fixes: denneboom.ly, standje.ly/standchen.ly
        

diff --git a/VERSION b/VERSION
index 470aa1e14ba7de55b0527c291dd33061639a68c2..909a5a0daff23f3d6205858085f636ba5abc67a4 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 MAJOR_VERSION=0
 MINOR_VERSION=1
-PATCH_LEVEL=50
+PATCH_LEVEL=51
 MY_PATCH_LEVEL=
 
 # now used as shell script in configure too

diff --git a/flower/diagonal-storage.cc b/flower/diagonal-storage.cc
index 7fd6227d8f131d7f0d863b39fa38ac10d55c15ac..069ea8294d9d667147f335c9fb6c364bfbb6cfa5 100644 (file)
--- a/flower/diagonal-storage.cc
+++ b/flower/diagonal-storage.cc
@@ -14,9 +14,9 @@
 #undef INLINE
 #endif
 
-#define INLINE inline
+//#define INLINE inline
 
-#include "full-storage.icc"
+// #include "full-storage.icc"
 
 int
 Diagonal_storage::dim() const

diff --git a/flower/full-storage.cc b/flower/full-storage.cc
index 2b1ff48a54218fc6ad288ca125be07da583187b6..5e05c1bb4bd99a9ce8a667664fb862ea51219a10 100644 (file)
--- a/flower/full-storage.cc
+++ b/flower/full-storage.cc
@@ -43,7 +43,6 @@ Full_storage::~Full_storage()
 }
 
 void
-
 Full_storage::resize (int rows, int cols)
 {
   OK();
@@ -51,8 +50,6 @@ Full_storage::resize (int rows, int cols)
   resize_rows (cols);
 }
 
-
-
 bool
 Full_storage::mult_ok (int i, int) const
 {
@@ -213,4 +210,7 @@ Full_storage::resize_rows (int neww)
 #endif
 #define INLINE
 
+INLINE
+IMPLEMENT_VIRTUAL_COPY_CONS(Full_storage,Matrix_storage);
+
 #include "full-storage.icc"

diff --git a/flower/include/full-storage.icc b/flower/include/full-storage.icc
index 359edb6b4ceca3d4780ef7cad25d397b190be7a4..9401ff245facd3dc303fca518ea171a39a6d6ace 100644 (file)
--- a/flower/include/full-storage.icc
+++ b/flower/include/full-storage.icc
@@ -89,7 +89,7 @@ Full_storage::Full_storage (int i)
   set_size (i);
 }
  
-INLINE
-IMPLEMENT_VIRTUAL_COPY_CONS(Full_storage,Matrix_storage);
+//INLINE
+//IMPLEMENT_VIRTUAL_COPY_CONS(Full_storage,Matrix_storage);
 
 #endif // FULL_STORAGE_ICC

diff --git a/flower/include/list.tcc b/flower/include/list.tcc
index db4f0fc964e918a61aea48f2fbc3989b9b27cf11..c5084dce05fbc47920481f1358cd9378b20ea50f 100644 (file)
--- a/flower/include/list.tcc
+++ b/flower/include/list.tcc
@@ -9,10 +9,6 @@
 #define LIST_CC
 
 
-// instantiate a template:  explicit instantiation.
-#define LIST_INSTANTIATE(a)   class List<a>; template class Cursor<a>; \
-  template class Link<a>
-
 #include "list.hh"
 
 template<class T>
@@ -134,4 +130,22 @@ List<T>::concatenate (List<T> const&s)
        b++;
     }
 }
+
+#ifndef __CYGWIN32__ // ugh should check for some gcc/egcs version
+
+// instantiate a template:  explicit instantiation.
+#define LIST_INSTANTIATE(a)  template class List<a>; \
+  template class Cursor<a>; template class Link<a>
+
+#else
+
+#define LIST_INSTANTIATE(T)\
+    static void force_list_members ()\
+    {\
+    List<T> bla;\
+    bla.top().add ((void*)0);\
+    }
 #endif
+
+#endif
+

diff --git a/flower/include/plist.tcc b/flower/include/plist.tcc
index 5ce6c2446c29b6921036d14e442eaa4b5dccc3db..ee6889faef313c15d492e52c30c165356df55243 100644 (file)
--- a/flower/include/plist.tcc
+++ b/flower/include/plist.tcc
@@ -12,9 +12,6 @@
 
 #include "plist.hh"
 
-#define POINTERLIST_INSTANTIATE(a) class Pointer_list<a*>;\
-       template class PCursor<a*>;
-       
 template<class T>
 void
 Pointer_list<T>::junk()
@@ -26,4 +23,20 @@ Pointer_list<T>::junk()
     }
 }
 
+#ifndef __CYGWIN32__ // ugh should check for some gcc/egcs version
+
+#define POINTERLIST_INSTANTIATE(a) template class Pointer_list<a*>;\
+       template class PCursor<a*>;
+
+#else
+
+#define POINTERLIST_INSTANTIATE(T)\
+    static void force_junk##T ()\
+    {\
+    Pointer_list<T*> bla;\
+    bla.junk ();\
+    }
+
+#endif
+
 #endif // PLIST_TCC

diff --git a/lib/template.cc b/lib/template.cc
index 36cb118232e0a20c714b6bcbf7f940e9c3212122..781a53d2798f66a75cf87324c1fcc4b9b793d8df 100644 (file)
--- a/lib/template.cc
+++ b/lib/template.cc
@@ -12,5 +12,17 @@
 #include "cursor.tcc"
 #include "list.tcc"
 
-template LIST_INSTANTIATE (void *);
-template POINTERLIST_INSTANTIATE (Source_file);
+#if 0
+LIST_INSTANTIATE (void *);
+
+#else
+
+    static void force_list_members ()
+    {
+    List<void*> bla;
+    bla.top().add ((void*)0);
+    }
+
+#endif
+
+POINTERLIST_INSTANTIATE (Source_file);

diff --git a/lily/include/p-score.hh b/lily/include/p-score.hh
index 0bce434619111e54c0dad3942a37899349baa28e..f8c87557a03d71ac3220cd89725a131c4cbe4ee8 100644 (file)
--- a/lily/include/p-score.hh
+++ b/lily/include/p-score.hh
@@ -65,10 +65,12 @@ public:
   void typeset_unbroken_spanner (Spanner*);
  
     
+  virtual ~Paper_score();
 protected:
     /* MAIN ROUTINES */
   virtual void process();
-  virtual ~Paper_score();
+// can't instantiate template with cygnus' gcc...
+//  virtual ~Paper_score();
 
 private:
   /// before calc_breaking

diff --git a/lily/p-score.cc b/lily/p-score.cc
index d38fb8f2c0a5151c67d448db22d8365224931272..437efdc694073b51358dc32fb31db12b47e56fca 100644 (file)
--- a/lily/p-score.cc
+++ b/lily/p-score.cc
@@ -13,6 +13,9 @@
 #include "spanner.hh"
 #include "paper-def.hh"
 #include "scoreline.hh"
+#include "pcursor.hh"
+#include "plist.hh"
+#include "p-col.hh"
 #include "p-score.hh"
 #include "tex-stream.hh"
 #include "p-col.hh"
@@ -21,6 +24,10 @@
 #include "gourlay-breaking.hh"
 #include "outputter.hh"
 
+// sucking Cygnus egcs - w32
+#include "plist.tcc"
+#include "pcursor.tcc"
+
 Paper_score::Paper_score ()
 {
   outputter_l_ =0;

diff --git a/lily/template1.cc b/lily/template1.cc
index d22b1e11a3d4726a3cf1a0004268328537f71923..857b1367d6c842309aa97b3cd7436e8049e02224 100644 (file)
--- a/lily/template1.cc
+++ b/lily/template1.cc
@@ -19,8 +19,6 @@
 
 #define IPLC_INSTANTIATE(a) POINTERLIST_INSTANTIATE(a)
 
-
-template IPLC_INSTANTIATE(Score_elem);
-template IPLC_INSTANTIATE(Spanner);
-template IPLC_INSTANTIATE(Idealspacing);
-
+IPLC_INSTANTIATE(Score_elem);
+IPLC_INSTANTIATE(Spanner);
+IPLC_INSTANTIATE(Idealspacing);

diff --git a/lily/template2.cc b/lily/template2.cc
index e6961b4ac721e50f89e10d74c65c0b261806c35e..c3432de3c388aabd0c8a683991dcbe680b64266d 100644 (file)
--- a/lily/template2.cc
+++ b/lily/template2.cc
@@ -7,7 +7,7 @@
 */
 
 #include "line-spacer.hh"
-#include "plist.tcc"
 #include "pcursor.tcc"
+#include "plist.tcc"
 
-template POINTERLIST_INSTANTIATE(Line_spacer);
+POINTERLIST_INSTANTIATE(Line_spacer);

diff --git a/lily/template3.cc b/lily/template3.cc
index e1e1b4d5f23e5361fd0a4733ea31b9260d306f0a..676f4b98d75d4dd5c9d2fc6c54fc4683f591bb7d 100644 (file)
--- a/lily/template3.cc
+++ b/lily/template3.cc
@@ -8,7 +8,7 @@
 
 #include "atom.hh"
 #include "molecule.hh"
-#include "plist.tcc"
 #include "pcursor.tcc"
+#include "plist.tcc"
 
-template POINTERLIST_INSTANTIATE(Atom);
+POINTERLIST_INSTANTIATE(Atom);

diff --git a/lily/template4.cc b/lily/template4.cc
index 63b5cad9ad32fbfdb20cd0e23ae6e54a80a00cc6..8975172e83fd9065e116b50cf0ce8cbe53931b27 100644 (file)
--- a/lily/template4.cc
+++ b/lily/template4.cc
@@ -6,4 +6,21 @@
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
-// empty. Yes I know.
+#include "proto.hh"
+#include "pcursor.hh"
+#include "plist.hh"
+#include "audio-item.hh"
+#include "audio-staff.hh"
+#include "p-col.hh"
+#include "p-score.hh"
+#include "cursor.tcc"
+#include "list.tcc"
+#include "pcursor.tcc"
+#include "plist.tcc"
+
+/*
+POINTERLIST_INSTANTIATE(Audio_item);
+POINTERLIST_INSTANTIATE(Audio_staff);
+POINTERLIST_INSTANTIATE(Paper_column);
+POINTERLIST_INSTANTIATE(Paper_score);
+*/

diff --git a/lily/template5.cc b/lily/template5.cc
index 4cfa4f0b70b798afd673b2c75a5d0e93b9a3deb0..29bb496ff4aae017b578621880444650889f85d8 100644 (file)
--- a/lily/template5.cc
+++ b/lily/template5.cc
@@ -17,6 +17,8 @@
 template INTERVAL__INSTANTIATE(Rational);
 template INTERVAL__INSTANTIATE(int);
 
+#include "compare.hh"
+
 Rational
 Interval_t<Rational>::infinity()
 {

diff --git a/lily/template6.cc b/lily/template6.cc
index eff2467ad5b77eccadc10143e2b12758655f6b4c..4f7a1ed1ab8c9bd0ea6abbc907b1d5f0c6888ed2 100644 (file)
--- a/lily/template6.cc
+++ b/lily/template6.cc
@@ -2,6 +2,5 @@
 #include "plist.tcc"
 #include "translator.hh"
 
-
-template POINTERLIST_INSTANTIATE(Translator);
+POINTERLIST_INSTANTIATE(Translator);
 

diff --git a/lily/template7.cc b/lily/template7.cc
index b288b4c289974001e8474bd754036f97ae07f3c2..7b5d8142ed67fbf1a02505f9b1353504023d0a4a 100644 (file)
--- a/lily/template7.cc
+++ b/lily/template7.cc
@@ -8,11 +8,11 @@
 
 #include "proto.hh"
 #include "plist.hh"
-#include "plist.tcc"
 #include "pcursor.tcc"
+#include "plist.tcc"
 
 #include "music-list.hh"
 #include "music-iterator.hh"
 
-template POINTERLIST_INSTANTIATE(Music);
-template POINTERLIST_INSTANTIATE(Music_iterator);
+POINTERLIST_INSTANTIATE(Music);
+POINTERLIST_INSTANTIATE(Music_iterator);

diff --git a/lily/template8.cc b/lily/template8.cc
index 4ce5596d28d166cbe0be551f2e6713c1ef3b7cf6..18d45e3b5e8ed50e5f54eeee853bc35364b3d0af 100644 (file)
--- a/lily/template8.cc
+++ b/lily/template8.cc
@@ -8,14 +8,12 @@
 
 #include "proto.hh"
 #include "plist.hh"
-#include "audio-column.hh"
 #include "audio-item.hh"
-#include "audio-staff.hh"
+#include "audio-column.hh"
 #include "midi-item.hh"
 #include "pcursor.tcc"
 #include "plist.tcc"
 
-
-template POINTERLIST_INSTANTIATE(Audio_element);
-template POINTERLIST_INSTANTIATE(Audio_column);
-template POINTERLIST_INSTANTIATE(Midi_event);
+POINTERLIST_INSTANTIATE(Audio_element);
+POINTERLIST_INSTANTIATE(Audio_column);
+POINTERLIST_INSTANTIATE(Midi_event);