From 225321e89171aef2dff339a5dca921b874cba40e Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:07:22 +0000 Subject: [PATCH] lilypond-0.1.52 --- init/lily-init.ly | 2 +- init/simple-init.ly | 2 +- mi2mu/mudela-score.cc | 5 +++++ mi2mu/template9.cc | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 mi2mu/template9.cc diff --git a/init/lily-init.ly b/init/lily-init.ly index c609918c57..1fb4992c05 100644 --- a/init/lily-init.ly +++ b/init/lily-init.ly @@ -6,7 +6,7 @@ breve = \duration { -1 0 } longa = \duration { -2 0 } \include "dynamic.ly" -\include "dutch.ly" +\include "nederlands.ly" % dutch \include "script.ly" diff --git a/init/simple-init.ly b/init/simple-init.ly index 13c7ce38ba..9d878ca7bb 100644 --- a/init/simple-init.ly +++ b/init/simple-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. Gourlay = 1.0 -\include "dutch.ly" +\include "nederlands.ly" \include "paper16.ly" diff --git a/mi2mu/mudela-score.cc b/mi2mu/mudela-score.cc index bf025d7ca0..3f8573c96f 100644 --- a/mi2mu/mudela-score.cc +++ b/mi2mu/mudela-score.cc @@ -14,6 +14,10 @@ #include "mudela-staff.hh" #include "mudela-stream.hh" +// ugh, cygnus' b19 gcc +#include "list.tcc" +#include "cursor.tcc" + //static Mudela_key key_c (0, 0); static Mudela_meter meter_4 (4, 2, 24, 8); // useconds per 4: 250000 === 60 4 per minute @@ -258,3 +262,4 @@ Mudela_score::settle_columns() start_i = end_i = 0; } } + diff --git a/mi2mu/template9.cc b/mi2mu/template9.cc new file mode 100644 index 0000000000..4e7ee3faad --- /dev/null +++ b/mi2mu/template9.cc @@ -0,0 +1,33 @@ +// +// template.cc -- implementemplate +// ugh: must have unique name for Cygnus' gcc: +// liblily.a(template.o): In function `GLOBAL_$I$template.cc': +// template.cc:28: multiple definition of `global constructors keyed to template.cc' +// +// copyright 1997 Jan Nieuwenhuizen + +#include "proto.hh" +#include "list.hh" +#include "list.tcc" +#include "cursor.tcc" + +class istream; +class ostream; + +#include "mudela-item.hh" +#include "mudela-column.hh" +#include "mudela-staff.hh" +#include "mudela-voice.hh" +#include "mudela-staff.hh" +#include "mudela-score.hh" +#include "pcursor.hh" +#include "plist.hh" +#include "pcursor.tcc" +#include "plist.tcc" + +POINTERLIST_INSTANTIATE(Mudela_item); +POINTERLIST_INSTANTIATE(Mudela_staff); +POINTERLIST_INSTANTIATE(Mudela_voice); +POINTERLIST_INSTANTIATE(Mudela_column); +POINTERLIST_INSTANTIATE(Mudela_score); + -- 2.39.5