From: Han-Wen Nienhuys Date: Tue, 17 Mar 1998 08:53:34 +0000 (+0100) Subject: release: 0.1.51 X-Git-Tag: release/0.1.51 X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=dbe2d4d495590abfa3829f93c99c2ae3a71841f3 release: 0.1.51 --- diff --git a/Documentation/Makefile.am b/Documentation/Makefile.am index 1e2fa6472b..b19f90a2ea 100644 --- a/Documentation/Makefile.am +++ b/Documentation/Makefile.am @@ -1,4 +1,7 @@ -# Generated automatically by wild-perl 0.1# Documentation/Makefile.am.wild +# Automatically generated from ./Documentation/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# Documentation/Makefile.am.wild DOCFILES = introduction.doc mudela-course.doc mudela-man.doc PODFILES = AUTHORS.pod CodingStyle.pod INSTALL.pod MANIFESTO.pod PATCHES.pod convert-mudela.pod faq.pod gnu-music.pod index.pod internals.pod language.pod lilypond.pod links.pod literature.pod ly2dvi.pod mi2mu.pod mudela-book.pod mutopia.pod other-packages.pod @@ -18,6 +21,9 @@ MAN1GROFF = $(addsuffix .1,$(MAN1FILES)) default: all $(TEXTFILES) +%.1: %.pod + $(POD2MAN) --section=1 $*.pod > $@ + outdir = . install-data-hook: $(MAN1GROFF) @@ -32,5 +38,6 @@ html: $(HTMLFILES) clean-hook: rm $(TEXTFILES) $(MAN1GROFF) +include $(top_srcdir)/Documentation/Rules.make $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild - $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ + $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/Documentation/Makefile.am.wild b/Documentation/Makefile.am.wild index c7549e1c49..aa2476c53b 100644 --- a/Documentation/Makefile.am.wild +++ b/Documentation/Makefile.am.wild @@ -18,6 +18,9 @@ MAN1GROFF = $(addsuffix .1,$(MAN1FILES)) default: all $(TEXTFILES) +%.1: %.pod + $(POD2MAN) --section=1 $*.pod > $@ + outdir = . install-data-hook: $(MAN1GROFF) @@ -32,3 +35,4 @@ html: $(HTMLFILES) clean-hook: rm $(TEXTFILES) $(MAN1GROFF) +include $(top_srcdir)/Documentation/Rules.make diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in index 0c9c750b93..7e3d369fd4 100644 --- a/Documentation/Makefile.in +++ b/Documentation/Makefile.in @@ -10,7 +10,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Generated automatically by wild-perl 0.1# Documentation/Makefile.am.wild +# Automatically generated from ./Documentation/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# Documentation/Makefile.am.wild SHELL = /bin/sh @@ -59,7 +62,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AUTOHEADER = @AUTOHEADER@ +AUTOGENERATE = @AUTOGENERATE@ BISON = @BISON@ CC = @CC@ COMPILEINFO = @COMPILEINFO@ @@ -94,6 +97,7 @@ TEXPREFIX = @TEXPREFIX@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ DOCFILES = introduction.doc mudela-course.doc mudela-man.doc PODFILES = AUTHORS.pod CodingStyle.pod INSTALL.pod MANIFESTO.pod PATCHES.pod convert-mudela.pod faq.pod gnu-music.pod index.pod internals.pod language.pod lilypond.pod links.pod literature.pod ly2dvi.pod mi2mu.pod mudela-book.pod mutopia.pod other-packages.pod @@ -204,6 +208,9 @@ mostlyclean distclean maintainer-clean default: all $(TEXTFILES) +%.1: %.pod + $(POD2MAN) --section=1 $*.pod > $@ + install-data-hook: $(MAN1GROFF) $(INSTALL) -d $(mandir)/man1 $(INSTALL) -m 644 $(MAN1GROFF) $(mandir)/man1 @@ -216,6 +223,7 @@ html: $(HTMLFILES) clean-hook: rm $(TEXTFILES) $(MAN1GROFF) +include $(top_srcdir)/Documentation/Rules.make $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/Documentation/faq.pod b/Documentation/faq.pod index a78f05e809..f3805e91ef 100644 --- a/Documentation/faq.pod +++ b/Documentation/faq.pod @@ -357,6 +357,12 @@ LD_LIBRARY_PATH to a directory containing F =head2 DOZE +Q: I downloaded the W95 port, and it doesn't match the website! + +A: The website is usually made from the latest snapshots. The W95 +binaries are only made every once in a while. They can lag several +versions behind the latest version. + Q: I want a DOS/NT/W95 port. A.0: Reconsider. Try Linux. It's fun! diff --git a/Makefile.am b/Makefile.am index 9705f3e659..ddcfd50c6c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +# Automatically generated from ./Makefile.am.wild by autowild +# Do not edit # Generated automatically by wild-perl 0.1 # title top level makefile for LilyPond # file Makefile.am.wild @@ -24,7 +26,5 @@ PATCHES: rm -f PATCHES ln `$(FIND) ./ -name PATCHES.txt -print | head -1` $@ - - $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/Makefile.am.wild b/Makefile.am.wild index 3013ee87f6..885dcb8c12 100644 --- a/Makefile.am.wild +++ b/Makefile.am.wild @@ -23,5 +23,3 @@ PATCHES: rm -f PATCHES ln `$(FIND) ./ -name PATCHES.txt -print | head -1` $@ - - diff --git a/Makefile.in b/Makefile.in index bcf8a0234a..4e1bdbe490 100644 --- a/Makefile.in +++ b/Makefile.in @@ -10,6 +10,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +# Automatically generated from ./Makefile.am.wild by autowild +# Do not edit # Generated automatically by wild-perl 0.1 # title top level makefile for LilyPond # file Makefile.am.wild @@ -59,7 +61,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AUTOHEADER = @AUTOHEADER@ +AUTOGENERATE = @AUTOGENERATE@ BISON = @BISON@ CC = @CC@ COMPILEINFO = @COMPILEINFO@ @@ -94,6 +96,7 @@ TEXPREFIX = @TEXPREFIX@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ SUBDIRS = bin flower lib lily mf mi2mu debian\ Documentation init input tex make mutopia @@ -108,9 +111,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ./lib/config.hh CONFIG_CLEAN_FILES = DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ -Makefile.in NEWS TODO acinclude.m4 aclocal.m4 config.guess config.sub \ -configure configure.in install-sh ltconfig ltmain.sh missing \ -mkinstalldirs +Makefile.in NEWS TODO acconfig.h acinclude.m4 aclocal.m4 config.guess \ +config.hh.in config.sub configure configure.in install-sh ltconfig \ +ltmain.sh missing mkinstalldirs stamp-h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -134,6 +137,27 @@ config.status: $(srcdir)/configure $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) +config.hh: stamp-h + @: +stamp-h: $(srcdir)/config.hh.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES= CONFIG_HEADERS=lib/config.hh:config.hh.in \ + $(SHELL) ./config.status + @echo timestamp > stamp-h +$(srcdir)/config.hh.in: $(srcdir)/stamp-h.in +$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h + cd $(top_srcdir) && $(AUTOHEADER) + @echo timestamp > $(srcdir)/stamp-h.in + +mostlyclean-hdr: + +clean-hdr: + +distclean-hdr: + -rm -f config.hh + +maintainer-clean-hdr: + # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -177,7 +201,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) here=`pwd` && cd $(srcdir) \ && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -187,8 +211,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) unique=`for i in $$list; do echo $$i; done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + test -z "$(ETAGS_ARGS)config.hh.in$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hh.in $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: @@ -288,14 +312,14 @@ distclean-generic: maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean-am: mostlyclean-tags mostlyclean-generic +mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic -clean-am: clean-tags clean-generic mostlyclean-am +clean-am: clean-hdr clean-tags clean-generic mostlyclean-am -distclean-am: distclean-tags distclean-generic clean-am +distclean-am: distclean-hdr distclean-tags distclean-generic clean-am -maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ - distclean-am +maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ + maintainer-clean-generic distclean-am mostlyclean: mostlyclean-recursive mostlyclean-am @@ -310,7 +334,8 @@ maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "it deletes files that may require special tools to rebuild." -rm -f config.status -.PHONY: default install-data-recursive uninstall-data-recursive \ +.PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \ +maintainer-clean-hdr install-data-recursive uninstall-data-recursive \ install-exec-recursive uninstall-exec-recursive installdirs-recursive \ uninstalldirs-recursive all-recursive check-recursive \ installcheck-recursive info-recursive dvi-recursive \ diff --git a/NEWS b/NEWS index 22e3ed57cb..e528ecb8ee 100644 --- 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 470aa1e14b..909a5a0daf 100644 --- 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/acconfig.h b/acconfig.h new file mode 100644 index 0000000000..2991969007 --- /dev/null +++ b/acconfig.h @@ -0,0 +1,23 @@ +/* @configure_input@ */ +#ifndef CONFIG_HH +#define CONFIG_HH + +/* autoheader really wants this */ +#define PACKAGE + +/* undef to get lots of debugging stuff (see .dstream) */ +#define NPRINT + +/* undef to do checking */ +#undef NDEBUG + +/* define to inline string funcs */ +#undef STRINGS_UTILS_INLINED + +/* default lilypond init and input dir */ +#define DIR_DATADIR "/home/fred/lelie/current" + +/* the toplevel version string */ +#define TOPLEVEL_VERSION "0" + +#endif diff --git a/bin/Makefile.am b/bin/Makefile.am index 1ddb8a8dc9..c7904427ee 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,11 +1,14 @@ +# Automatically generated from ./bin/Makefile.am.wild by autowild +# Do not edit # Generated automatically by wild-perl 0.1 # bin/Makefile -# bin_SCRIPTS = +# bin_SCRIPTS = Makefile.in add-URLs.in clean-diaper.in clean-embeds.in clean-fonts.in clien.in conflily.in convert-mudela.in cvm.in find-typenames.in foo.in genheader.in ly2dvi.in make-docxx.in make-examples.in make-patch.in make-version.in make-website.in meek.in mf-deps.in mf-to-table.in mudela-book.in ps-to-gifs.in release.in show-latest.in +SLANG_SCHRIFTEN = flower.py lilypython.py PAREL_SCHRIFTEN = -IN_SCHRIFTEN = -EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) wild-perl +IN_SCHRIFTEN = flower.py lilypython.py +EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) $(SLANG_SCHRIFTEN) wild-perl $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/bin/Makefile.am.wild b/bin/Makefile.am.wild index 29e882ac19..fb04a37aeb 100755 --- a/bin/Makefile.am.wild +++ b/bin/Makefile.am.wild @@ -2,7 +2,8 @@ # bin_SCRIPTS = $(wildcard *.in) +SLANG_SCHRIFTEN = $(wildcard *.py) PAREL_SCHRIFTEN = $(wildcard *.pl) IN_SCHRIFTEN = $(wildcard *.py) -EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) wild-perl +EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) $(SLANG_SCHRIFTEN) wild-perl diff --git a/bin/Makefile.in b/bin/Makefile.in index 775180c1d2..2a45668f86 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -10,10 +10,12 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +# Automatically generated from ./bin/Makefile.am.wild by autowild +# Do not edit # Generated automatically by wild-perl 0.1 # bin/Makefile -# bin_SCRIPTS = +# bin_SCRIPTS = Makefile.in add-URLs.in clean-diaper.in clean-embeds.in clean-fonts.in clien.in conflily.in convert-mudela.in cvm.in find-typenames.in foo.in genheader.in ly2dvi.in make-docxx.in make-examples.in make-patch.in make-version.in make-website.in meek.in mf-deps.in mf-to-table.in mudela-book.in ps-to-gifs.in release.in show-latest.in SHELL = /bin/sh @@ -62,7 +64,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AUTOHEADER = @AUTOHEADER@ +AUTOGENERATE = @AUTOGENERATE@ BISON = @BISON@ CC = @CC@ COMPILEINFO = @COMPILEINFO@ @@ -97,10 +99,12 @@ TEXPREFIX = @TEXPREFIX@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ +SLANG_SCHRIFTEN = flower.py lilypython.py PAREL_SCHRIFTEN = -IN_SCHRIFTEN = -EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) wild-perl +IN_SCHRIFTEN = flower.py lilypython.py +EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) $(SLANG_SCHRIFTEN) wild-perl mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../lib/config.hh CONFIG_CLEAN_FILES = add-URLs clean-diaper clean-embeds clean-fonts \ diff --git a/bin/flower.py b/bin/flower.py new file mode 100755 index 0000000000..e88631d1a2 --- /dev/null +++ b/bin/flower.py @@ -0,0 +1,151 @@ +#!@PYTHON@ + +# +# flower.py -- python flower lib +# +# source file of the GNU LilyPond music typesetter +# +# (c) 1997 Han-Wen Nienhuys +# + +class File: + """silly wrapper for Python file object.""" + def __init__ (self,nm, mode='r'): + if nm: + self.file_ = open (nm, mode); + elif mode == 'w': + self.file_ = sys.stdout + else: + self.file_ = sys.stdin + + self.eof_ = 0; + def readline (self): + l= self.file_.readline (); + if not l: + self.eof_ = 1; + return l; + def write (self, str): + self.file_.write (str) + def eof (self): + return self.eof_ + def close (self): + self.file_.close () + def __del__ (self): + self.close (); + + + +import fnmatch +import os + +_debug = 0 + +_prune = ['(*)'] + + +def my_find(patterns, dir = os.curdir): + list = [] + names = os.listdir(dir) + names.sort() + for name in names: + if name in (os.curdir, os.pardir): + continue + fullname = os.path.join(dir, name) + for pat in patterns: + if fnmatch.fnmatch(name, pat): + list.append(fullname) + if os.path.isdir(fullname) and not os.path.islink(fullname): + for p in _prune: + if fnmatch.fnmatch(name, p): + if _debug: print "skip", `fullname` + break + else: + if _debug: print "descend into", `fullname` + found = my_find(patterns, fullname) + if found: + list = list + found + return list + +def multiple_find(pats, dirnames): + from find import find + l = [] + for d in dirnames: + l = l + my_find(pats, d) + return l +#!@PYTHON@ + +# +# flower.py -- python flower lib +# +# source file of the GNU LilyPond music typesetter +# +# (c) 1997 Han-Wen Nienhuys +# + +class File: + """silly wrapper for Python file object.""" + def __init__ (self,nm, mode='r'): + if nm: + self.file_ = open (nm, mode); + elif mode == 'w': + self.file_ = sys.stdout + else: + self.file_ = sys.stdin + + self.eof_ = 0; + def readline (self): + l= self.file_.readline (); + if not l: + self.eof_ = 1; + return l; + def write (self, str): + self.file_.write (str) + def eof (self): + return self.eof_ + def close (self): + self.file_.close () + def __del__ (self): + self.close (); + + + +import fnmatch +import os + +_debug = 0 + +_prune = ['(*)'] + + +def my_find(patterns, dir = os.curdir): + list = [] + try: + names = os.listdir(dir) + except os.error: + names = [] + names.sort() + for name in names: + if name in (os.curdir, os.pardir): + continue + fullname = os.path.join(dir, name) + for pat in patterns: + if fnmatch.fnmatch(name, pat): + list.append(fullname) + if os.path.isdir(fullname) and not os.path.islink(fullname): + for p in _prune: + if fnmatch.fnmatch(name, p): + if _debug: print "skip", `fullname` + break + else: + if _debug: print "descend into", `fullname` + found = my_find(patterns, fullname) + if found: + list = list + found + return list + +def multiple_find(pats, dirnames): + from find import find + l = [] + for d in dirnames: + l = l + my_find(pats, d) + return l diff --git a/bin/lilypython.py b/bin/lilypython.py new file mode 100755 index 0000000000..19b8c26db2 --- /dev/null +++ b/bin/lilypython.py @@ -0,0 +1,394 @@ +#!/usr/bin/python + +# +# lily-python.py -- implement general LilyPond-wide python stuff +# +# source file of the GNU LilyPond music typesetter +# +# (c) 1997 Han-Wen Nienhuys +# + +import posix +import pwd +import regex +import regsub +from string import * +from flower import * +import sys +import os +import getopt + + + + +version_re = regex.compile('\\version *\"\(.*\)\"') +# now used as shell script in configure too! +# make_assign_re = regex.compile('^\([A-Z_]*\) *= *\(.*\)$') +make_assign_re = regex.compile('^\([A-Z_]*\)=\(.*\)$') + +def version_tuple(file): + lines = file.readlines() + + mi = pa = mj = 0 + mp = '' + + for l in lines: + if make_assign_re.search(l) <> -1: + nm = make_assign_re.group(1) + val = make_assign_re.group(2) +# if nm == 'TOPLEVEL_MAJOR_VERSION': + if nm == 'MAJOR_VERSION': + mj = atoi(val) +# elif nm == 'TOPLEVEL_MINOR_VERSION': + elif nm == 'MINOR_VERSION': + mi = atoi(val) +# elif nm == 'TOPLEVEL_PATCH_LEVEL': + elif nm == 'PATCH_LEVEL': + pa = atoi(val) +# elif nm == 'TOPLEVEL_MY_PATCH_LEVEL': + elif nm == 'MY_PATCH_LEVEL': + mp = val + return (mj,mi,pa,mp) + +def next_version(tup): + return (tup[0], tup[1], tup[2] + 1, tup[3]); + +def prev_version(tup): + t = tup + if t[3]: + return (tup[0], tup[1], tup[2], ''); + elif t[2] == 0 : + return (tup[0], tup[1] -1, tup[2], ''); + else: + return (tup[0], tup[1], tup[2] - 1, ''); + + +def dirname(v): + return 'lilypond-' + version_tuple_to_str(v) + +def tarball(v): + return dirname(v) + '.tar.gz' + +def released_tarball(v): + return lilydirs.release_dir + tarball(v) + + +def tuple_to_list(tup): + l=[] + for x in tup: + l.append[x] + return l + +def version_str_to_tuple(str): + t = split(str, '.') + try: + mypatch = t[3] + except IndexError: + mypatch = '' + + return (atoi(t[0]), atoi(t[1]), atoi(t[2]), mypatch) + + + +def guess_mudela_version(filename): + f = open (filename) + lines = f.readlines() + f.close() + for l in lines: + if version_re.search(l) <> -1: + return version_re.group(1) + + return '' + +def version_tuple_to_str(tup): + mypatch ='' + if tup[3]: + mypatch = '.' + tup[3] + + return ('%d.%d.%d' % tup[0:3]) + mypatch + +class Lilydirs: + def __init__(self): + try: + self.topdir = os.environ['LILYPOND_SOURCEDIR'] + '/' + + except KeyError: + print 'Please set LILYPOND_SOURCEDIR to the toplevel source, eg LILYPOND_SOURCEDIR=/home/foobar/lilypond-1.2.3/' + sys.exit(1) + + try: + self.groupdir = os.environ['LILYPOND_GROUPDIR'] + '/' + except KeyError: + self.groupdir = self.topdir + '../' + + self.release_dir = self.groupdir + '/releases/' + self.patch_dir = self.groupdir + '/patches/' + + def version_tuple(self): + f = open (self.topdir + 'VERSION') + v = version_tuple(f) + f.close () + return v + + + +lilydirs = Lilydirs() + +if __name__ == '__main__': + v= lilydirs.version_tuple() + print v, prev_version(v), next_version(v) + mv = guess_mudela_version(lilydirs.topdir + 'init/symbol.ly') + pv=(0,1,1,'jcn4') + print version_tuple_to_str(pv), prev_version(pv), next_version(pv) + print version_tuple_to_str((0,1,1,'')) + print mv, version_str_to_tuple(mv) + + + +def dump_file(f, s): + i = open(f, 'w') + i.write(s) + i.close () + +def gulp_file(f): + i = open(f) + i.seek (0, 2) + len = i.tell () + i.seek (0,0) + return i.read (len) + + +header_regex = regex.compile('\\header[ \t\n]*{\([^}]*\)}') +header_entry_regex = regex.compile('[\n\t ]*\([^\n\t ]+\)[\n\t ]*=[\n \t]*\([^;]+\)[\n \t]*;') + +# +# FIXME breaks on multiple strings. +# +def read_mudela_header (fn): + s = gulp_file(fn) + s = regsub.gsub('%.*$', '', s) + s = regsub.gsub('\n', ' ', s) + + dict = {} + if header_regex.search(s) <> -1: + h = header_regex.group(1) + else: + return dict + + while regex.search('=', h) <> -1: + + if header_entry_regex.search (h) == -1: + + raise 'format error' + + h = regsub.sub(header_entry_regex, '', h) + left = header_entry_regex.group(1) + right = header_entry_regex.group(2) + + right = regsub.gsub('\([^\\]\)\"', '\\1', right) + right = regsub.gsub('^"', '', right) + left = regsub.gsub('\([^\\]\)\"', '', left) + left = regsub.gsub('^"', '', left) + + dict[left] = right + + return dict + + +#!/usr/bin/python + +# +# lily-python.py -- implement general LilyPond-wide python stuff +# +# source file of the GNU LilyPond music typesetter +# +# (c) 1997 Han-Wen Nienhuys +# + +import posix +import pwd +import regex +import regsub +from string import * +from flower import * +import sys +import os +import getopt + + + + +version_re = regex.compile('\\version *\"\(.*\)\"') +# now used as shell script in configure too! +# make_assign_re = regex.compile('^\([A-Z_]*\) *= *\(.*\)$') +make_assign_re = regex.compile('^\([A-Z_]*\)=\(.*\)$') + +def version_tuple(file): + lines = file.readlines() + + mi = pa = mj = 0 + mp = '' + + for l in lines: + if make_assign_re.search(l) <> -1: + nm = make_assign_re.group(1) + val = make_assign_re.group(2) +# if nm == 'TOPLEVEL_MAJOR_VERSION': + if nm == 'MAJOR_VERSION': + mj = atoi(val) +# elif nm == 'TOPLEVEL_MINOR_VERSION': + elif nm == 'MINOR_VERSION': + mi = atoi(val) +# elif nm == 'TOPLEVEL_PATCH_LEVEL': + elif nm == 'PATCH_LEVEL': + pa = atoi(val) +# elif nm == 'TOPLEVEL_MY_PATCH_LEVEL': + elif nm == 'MY_PATCH_LEVEL': + mp = val + return (mj,mi,pa,mp) + +def next_version(tup): + return (tup[0], tup[1], tup[2] + 1, tup[3]); + +def prev_version(tup): + t = tup + if t[3]: + return (tup[0], tup[1], tup[2], ''); + elif t[2] == 0 : + return (tup[0], tup[1] -1, tup[2], ''); + else: + return (tup[0], tup[1], tup[2] - 1, ''); + + +def dirname(v): + return 'lilypond-' + version_tuple_to_str(v) + +def tarball(v): + return dirname(v) + '.tar.gz' + +def released_tarball(v): + return lilydirs.release_dir + tarball(v) + + +def tuple_to_list(tup): + l=[] + for x in tup: + l.append[x] + return l + +def version_str_to_tuple(str): + t = split(str, '.') + try: + mypatch = t[3] + except IndexError: + mypatch = '' + + return (atoi(t[0]), atoi(t[1]), atoi(t[2]), mypatch) + + + +def guess_mudela_version(filename): + f = open (filename) + lines = f.readlines() + f.close() + for l in lines: + if version_re.search(l) <> -1: + return version_re.group(1) + + return '' + +def version_tuple_to_str(tup): + mypatch ='' + if tup[3]: + mypatch = '.' + tup[3] + + return ('%d.%d.%d' % tup[0:3]) + mypatch + +class Lilydirs: + def __init__(self): + try: + self.topdir = os.environ['LILYPOND_SOURCEDIR'] + '/' + + except KeyError: + print 'Please set LILYPOND_SOURCEDIR to the toplevel source, eg LILYPOND_SOURCEDIR=/home/foobar/lilypond-1.2.3/' + sys.exit(1) + + try: + self.groupdir = os.environ['LILYPOND_GROUPDIR'] + '/' + except KeyError: + self.groupdir = self.topdir + '../' + + self.release_dir = self.groupdir + '/releases/' + self.patch_dir = self.groupdir + '/patches/' + + def version_tuple(self): + f = open (self.topdir + 'VERSION') + v = version_tuple(f) + f.close () + return v + + + +lilydirs = Lilydirs() + +if __name__ == '__main__': + v= lilydirs.version_tuple() + print v, prev_version(v), next_version(v) + mv = guess_mudela_version(lilydirs.topdir + 'init/symbol.ly') + pv=(0,1,1,'jcn4') + print version_tuple_to_str(pv), prev_version(pv), next_version(pv) + print version_tuple_to_str((0,1,1,'')) + print mv, version_str_to_tuple(mv) + + + +def dump_file(f, s): + i = open(f, 'w') + i.write(s) + i.close () + +def gulp_file(f): + i = open(f) + i.seek (0, 2) + len = i.tell () + i.seek (0,0) + return i.read (len) + + +header_regex = regex.compile('\\header[ \t\n]*{\([^}]*\)}') +header_entry_regex = regex.compile('[\n\t ]*\([^\n\t ]+\)[\n\t ]*=[\n \t]*\([^;]+\)[\n \t]*;') + +# +# FIXME breaks on multiple strings. +# +def read_mudela_header (fn): + s = gulp_file(fn) + s = regsub.gsub('%.*$', '', s) + s = regsub.gsub('\n', ' ', s) + + dict = {} + if header_regex.search(s) <> -1: + h = header_regex.group(1) + else: + return dict + + while regex.search('=', h) <> -1: + + if header_entry_regex.search (h) == -1: + + raise 'format error' + + h = regsub.sub(header_entry_regex, '', h) + left = header_entry_regex.group(1) + right = header_entry_regex.group(2) + + right = regsub.gsub('\([^\\]\)\"', '\\1', right) + right = regsub.gsub('^"', '', right) + left = regsub.gsub('\([^\\]\)\"', '', left) + left = regsub.gsub('^"', '', left) + + dict[left] = right + + return dict + + diff --git a/config.hh.in b/config.hh.in new file mode 100644 index 0000000000..ba57f5ead2 --- /dev/null +++ b/config.hh.in @@ -0,0 +1,22 @@ +/* config.hh.in. Generated automatically from configure.in by autoheader. */ + +/* Define if lex declares yytext as a char * by default, not a char[]. */ +#undef YYTEXT_POINTER + +/* autoheader really wants this */ +#define PACKAGE + +/* undef to get lots of debugging stuff (see .dstream) */ +#define NPRINT + +/* undef to do checking */ +#undef NDEBUG + +/* define to inline string funcs */ +#undef STRINGS_UTILS_INLINED + +/* default lilypond init and input dir */ +#define DIR_DATADIR "/home/fred/lelie/current" + +/* the toplevel version string */ +#define TOPLEVEL_VERSION "0" diff --git a/configure b/configure index 6ee28b6287..0a936113ae 100755 --- a/configure +++ b/configure @@ -25,12 +25,12 @@ ac_help="$ac_help enable-printing turn on debug printing. Default: off" ac_help="$ac_help enable-checking set runtime checks (assert calls). Default: on" -ac_help="$ac_help - enable-debugging set debug info. Default: on" ac_help="$ac_help enable-optimise use maximal speed optimisations. Default: off" ac_help="$ac_help enable-profiling compile with gprof support. Default: off" +ac_help="$ac_help + enable-debugging set debug info. Default: on" ac_help="$ac_help enable-mingw-prefix=DIR set the mingw32 directory (standalone windows32 exes)" ac_help="$ac_help @@ -1641,81 +1641,13 @@ fi # ugh, ugh ac_cv_prog_lex_root=lex.yy -missing_dir=`cd $ac_aux_dir && pwd` - -echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1648: checking for working aclocal" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (aclocal --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL=aclocal - echo "$ac_t""found" 1>&6 -else - ACLOCAL="$missing_dir/missing aclocal" - echo "$ac_t""missing" 1>&6 -fi - -echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1661: checking for working autoconf" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (autoconf --version) < /dev/null > /dev/null 2>&1; then - AUTOCONF=autoconf - echo "$ac_t""found" 1>&6 -else - AUTOCONF="$missing_dir/missing autoconf" - echo "$ac_t""missing" 1>&6 -fi - -echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1674: checking for working automake" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (automake --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake - echo "$ac_t""found" 1>&6 -else - AUTOMAKE="$missing_dir/missing automake" - echo "$ac_t""missing" 1>&6 -fi - -echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1687: checking for working autoheader" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (autoheader --version) < /dev/null > /dev/null 2>&1; then - AUTOHEADER=autoheader - echo "$ac_t""found" 1>&6 -else - AUTOHEADER="$missing_dir/missing autoheader" - echo "$ac_t""missing" 1>&6 -fi - -echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1700: checking for working makeinfo" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (makeinfo --version) < /dev/null > /dev/null 2>&1; then - MAKEINFO=makeinfo - echo "$ac_t""found" 1>&6 -else - MAKEINFO="$missing_dir/missing makeinfo" - echo "$ac_t""missing" 1>&6 -fi - - - printing_b=no checking_b=yes -debug_b=yes optimise_b=no profile_b=no +debug_b=yes + ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1731,7 +1663,6 @@ if test "${enable_printing+set}" = set; then fi - # Check whether --enable-checking or --disable-checking was given. if test "${enable_checking+set}" = set; then enableval="$enable_checking" @@ -1739,13 +1670,6 @@ if test "${enable_checking+set}" = set; then fi -# Check whether --enable-debugging or --disable-debugging was given. -if test "${enable_debugging+set}" = set; then - enableval="$enable_debugging" - debug_b=$enableval -fi - - # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then enableval="$enable_optimise" @@ -1760,6 +1684,13 @@ if test "${enable_profiling+set}" = set; then fi +# Check whether --enable-debugging or --disable-debugging was given. +if test "${enable_debugging+set}" = set; then + enableval="$enable_debugging" + debug_b=$enableval +fi + + # Check whether --enable-mingw-prefix or --disable-mingw-prefix was given. if test "${enable_mingw_prefix+set}" = set; then enableval="$enable_mingw_prefix" @@ -1796,21 +1727,37 @@ else fi +if test "$printing_b" = no; then + cat >> confdefs.h <<\EOF +#define NPRINT 1 +EOF + +fi + +if test "$checking_b" = no; then + cat >> confdefs.h <<\EOF +#define NDEBUG 1 +EOF + +fi + +if test "$optimise_b" = yes; then +# DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED" + cat >> confdefs.h <<\EOF +#define STRINGS_UTILS_INLINED 1 +EOF + +fi + +# oeps, broken for now if test $profile_b = yes; then EXTRA_LIBES="-pg" DEFINES="$DEFINES -pg" fi - -if test $printing_b = no; then - DEFINES="$DEFINES -DNPRINT=1" -fi - + if test $debug_b = yes; then DEFINES="$DEFINES -g" fi -if test $checking_b = no; then - DEFINES="$DEFINES -DNDEBUG=1" -fi # however, C++ support in mingw32 v 0.1.4 is still flaky if test x$MINGWPREFIX != xno; then @@ -1818,10 +1765,6 @@ if test x$MINGWPREFIX != xno; then ILDFLAGS="-$MINGWPREFIX/lib" fi -if test $optimise_b = yes; then - DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED" -fi - if test "x$OSTYPE" = "xWindows_NT"; then LN=cp # hard link does not work under cygnus-nt (yet?) ZIP="zip -r -9" # @@ -1830,7 +1773,7 @@ else ZIP="zip -r -9" fi -AUTOHEADER="This file was automatically generated by configure" +AUTOGENERATE="This file was automatically generated by configure" CPPFLAGS=${CPPFLAGS:-""} # we don't want -g -O junk CXXFLAGS=${CXXFLAGS:-""} # we don't want -g -O junk @@ -1839,7 +1782,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1843: checking for $ac_word" >&5 +echo "configure:1786: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1870,7 +1813,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1874: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1817: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1880,11 +1823,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1904,12 +1847,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1908: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1851: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1913: checking whether we are using GNU C++" >&5 +echo "configure:1856: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1918,7 +1861,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1933,7 +1876,7 @@ if test $ac_cv_prog_gxx = yes; then ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1937: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1880: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1972,7 +1915,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1976: checking for a BSD compatible install" >&5 +echo "configure:1919: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2026,7 +1969,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2030: checking for $ac_word" >&5 +echo "configure:1973: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2060,7 +2003,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2064: checking for $ac_word" >&5 +echo "configure:2007: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2100,6 +2043,26 @@ test -n "$FIND" || FIND="error" fi + +cat >> confdefs.h <> confdefs.h <&6 -echo "configure:2130: checking for $ac_word" >&5 +echo "configure:2094: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2160,7 +2124,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2164: checking for $ac_word" >&5 +echo "configure:2128: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2194,7 +2158,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2198: checking for $ac_word" >&5 +echo "configure:2162: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2226,7 +2190,7 @@ test -n "$MAKE" || MAKE="error" # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2230: checking for $ac_word" >&5 +echo "configure:2194: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2258,7 +2222,7 @@ fi # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2262: checking for $ac_word" >&5 +echo "configure:2226: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2292,7 +2256,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2296: checking for $ac_word" >&5 +echo "configure:2260: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_POD2HTML'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2326,7 +2290,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2330: checking for $ac_word" >&5 +echo "configure:2294: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_POD2MAN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2362,7 +2326,7 @@ if test "x$TEXPREFIX" = xauto ; then echo $ac_n "checking TeX/MF root dir directory""... $ac_c" 1>&6 -echo "configure:2366: checking TeX/MF root dir directory" >&5 +echo "configure:2330: checking TeX/MF root dir directory" >&5 find_root_prefix="$prefix" @@ -2407,7 +2371,7 @@ if test "x$TEXDIR" = xauto ; then echo $ac_n "checking TeX input directory""... $ac_c" 1>&6 -echo "configure:2411: checking TeX input directory" >&5 +echo "configure:2375: checking TeX input directory" >&5 find_dirdir=`(cd $find_texprefix; $FIND ./ -type d -a -name tex -print |sort|head -1|sed 's#^\./##')` @@ -2523,7 +2487,7 @@ else fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2527: checking how to run the C++ preprocessor" >&5 +echo "configure:2491: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2536,12 +2500,12 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2545: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2509: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -2561,17 +2525,17 @@ echo "$ac_t""$CXXCPP" 1>&6 ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6 -echo "configure:2565: checking for FlexLexer.h" >&5 +echo "configure:2529: checking for FlexLexer.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2600,16 +2564,11 @@ fi subdirs="flower" -cat >> confdefs.h <> lib/config.hh # first do Foobar/Makefile then Foobar/include/Makefile trap '' 1 2 15 @@ -2722,7 +2681,7 @@ trap 'rm -fr `echo "bin/Makefile lib/Makefile lib/include/Makefile lily/Makefile bin/convert-mudela bin/cvm bin/find-typenames bin/foo bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples bin/make-patch bin/make-version bin/make-website bin/mf-deps bin/mf-to-table - bin/mudela-book bin/ps-to-gifs bin/release bin/show-latest lib/config.hh:lib/config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 + bin/mudela-book bin/ps-to-gifs bin/release bin/show-latest lib/config.hh:config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF fi diff --git a/configure.in b/configure.in index 34ca2af321..56567a0a0d 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,7 @@ dnl -*-shell-script-*- dnl Process this file with autoconf to produce a configure script. + AC_INIT(flower/choleski.cc) . $srcdir/VERSION @@ -27,36 +28,23 @@ AC_DECL_YYTEXT # ugh, ugh ac_cv_prog_lex_root=lex.yy -missing_dir=`cd $ac_aux_dir && pwd` - -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) -AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) - - printing_b=no checking_b=yes -debug_b=yes optimise_b=no profile_b=no +debug_b=yes + AC_LANG_CPLUSPLUS AC_ARG_ENABLE(printing, [ enable-printing turn on debug printing. Default: off], [printing_b=$enableval]) - AC_ARG_ENABLE(checking, [ enable-checking set runtime checks (assert calls). Default: on], [checking_b=$enableval] ) -AC_ARG_ENABLE(debugging, - [ enable-debugging set debug info. Default: on], - [debug_b=$enableval]) - AC_ARG_ENABLE(optimise, [ enable-optimise use maximal speed optimisations. Default: off], [optimise_b=$enableval]) @@ -65,6 +53,10 @@ AC_ARG_ENABLE(profiling, [ enable-profiling compile with gprof support. Default: off], [profile_b=$enableval]) +AC_ARG_ENABLE(debugging, + [ enable-debugging set debug info. Default: on], + [debug_b=$enableval]) + AC_ARG_ENABLE(mingw-prefix, [ enable-mingw-prefix=DIR set the mingw32 directory (standalone windows32 exes)], [MINGWPREFIX=$enableval], @@ -85,21 +77,28 @@ AC_ARG_ENABLE(mf-dir, [MFDIR=$enableval], [MFDIR=auto]) +if test "$printing_b" = no; then + AC_DEFINE(NPRINT) +fi + +if test "$checking_b" = no; then + AC_DEFINE(NDEBUG) +fi + +if test "$optimise_b" = yes; then +# DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED" + AC_DEFINE(STRINGS_UTILS_INLINED) +fi + +# oeps, broken for now if test $profile_b = yes; then EXTRA_LIBES="-pg" DEFINES="$DEFINES -pg" fi - -if test $printing_b = no; then - DEFINES="$DEFINES -DNPRINT=1" -fi - + if test $debug_b = yes; then DEFINES="$DEFINES -g" fi -if test $checking_b = no; then - DEFINES="$DEFINES -DNDEBUG=1" -fi # however, C++ support in mingw32 v 0.1.4 is still flaky if test x$MINGWPREFIX != xno; then @@ -107,10 +106,6 @@ if test x$MINGWPREFIX != xno; then ILDFLAGS="-$MINGWPREFIX/lib" fi -if test $optimise_b = yes; then - DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED" -fi - if test "x$OSTYPE" = "xWindows_NT"; then LN=cp # hard link does not work under cygnus-nt (yet?) ZIP="zip -r -9" # @@ -120,7 +115,7 @@ else fi dnl COMPILEINFO="$HOST $host $TARGET $target" -AUTOHEADER="This file was automatically generated by configure" +AUTOGENERATE="This file was automatically generated by configure" CPPFLAGS=${CPPFLAGS:-""} # we don't want -g -O junk CXXFLAGS=${CXXFLAGS:-""} # we don't want -g -O junk @@ -133,6 +128,20 @@ AC_CHECK_PROGS(FIND, find, error) dnl should check out -print AC_CHECK_SEARCH_RESULT($FIND, \`find\'. Please use --enable-tex-dir) + +AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}") +# ugh: produces "${prefix}/share/lilypond" +# DIR_DATADIR=$datadir/lilypond +# ugh: produces "NONE/share/lilypond" +# DIR_DATADIR=$prefix/share/lilypond + +DIR_DATADIR=$prefix/share/lilypond +if test x$prefix = xNONE; then + DIR_DATADIR=/usr/local/share/lilypond +fi +AC_DEFINE_UNQUOTED(DIR_DATADIR, "${DIR_DATADIR}") + +absolute_builddir="`pwd`" AC_SUBST(CXXFLAGS) AC_SUBST(CPPFLAGS) @@ -141,7 +150,7 @@ AC_SUBST(ICFLAGS) AC_SUBST(ILDFLAGS) AC_SUBST(DEFINES) AC_SUBST(COMPILEINFO) -AC_SUBST(AUTOHEADER) +AC_SUBST(AUTOGENERATE) AC_SUBST(BISON) AC_SUBST(FLEX) AC_SUBST(LN) @@ -152,6 +161,7 @@ AC_SUBST(TEXPREFIX) AC_SUBST(TEXDIR) AC_SUBST(MFDIR) AC_SUBST(DIR_DATADIR) +AC_SUBST(absolute_builddir) AC_SUBST(EXTRA_LIBES) AC_CHECK_PROGS(BISON, bison, error) @@ -222,11 +232,9 @@ AC_CHECK_HEADER(FlexLexer.h, true, AC_CONFIG_SUBDIRS(flower) -AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}") - touch lib/stamp-h.in -AM_CONFIG_HEADER(lib/config.hh:lib/config.hh.in) -echo \#define TOPLEVEL_VERSION \"$FULL_VERSION\" >> lib/config.hh +# AM_CONFIG_HEADER(lib/config.hh:lib/config.hh.in) +AM_CONFIG_HEADER(lib/config.hh:config.hh.in) # first do Foobar/Makefile then Foobar/include/Makefile AC_OUTPUT(bin/Makefile lib/Makefile lib/include/Makefile lily/Makefile diff --git a/debian/Makefile.am b/debian/Makefile.am index 214e6f4638..0268436a1c 100644 --- a/debian/Makefile.am +++ b/debian/Makefile.am @@ -1,4 +1,7 @@ -# Generated automatically by wild-perl 0.1# debian/Makefile.am.wild +# Automatically generated from ./debian/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# debian/Makefile.am.wild EXTRA_DIST = Makefile.am.wild README.Debian TODO changelog control copyright \ postinst postinst.old.sh postrm preinst rules watch diff --git a/debian/Makefile.in b/debian/Makefile.in index 42ec05cfb8..b466cc2be9 100644 --- a/debian/Makefile.in +++ b/debian/Makefile.in @@ -10,7 +10,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Generated automatically by wild-perl 0.1# debian/Makefile.am.wild +# Automatically generated from ./debian/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# debian/Makefile.am.wild SHELL = /bin/sh @@ -59,7 +62,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AUTOHEADER = @AUTOHEADER@ +AUTOGENERATE = @AUTOGENERATE@ BISON = @BISON@ CC = @CC@ COMPILEINFO = @COMPILEINFO@ @@ -94,6 +97,7 @@ TEXPREFIX = @TEXPREFIX@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ EXTRA_DIST = Makefile.am.wild README.Debian TODO changelog control copyright \ postinst postinst.old.sh postrm preinst rules watch diff --git a/flower/Makefile.am b/flower/Makefile.am index c91e9337ab..d62df54f9d 100644 --- a/flower/Makefile.am +++ b/flower/Makefile.am @@ -1,3 +1,5 @@ +# Automatically generated from ./flower/Makefile.am.wild by autowild +# Do not edit # Generated automatically by wild-perl 0.1 # project FlowerSoft C++ library # title top level makefile for FlowerLib @@ -13,7 +15,7 @@ SUBDIRS = include test lib_LTLIBRARIES = libflower.la README_FILES = ONEWS NEWS README TODO VERSION -EXTRA_DIST = Makefile.am.wild aclocal.m4 configure config.hh.in configure.in $(README_FILES) +EXTRA_DIST = Makefile.am.wild aclocal.m4 configure configure.in $(README_FILES) libflower_la_SOURCES = choleski.cc cpu-timer.cc data-file.cc diagonal-storage.cc dictionary.cc directed-graph.cc dstream.cc flower-debug.cc flower-version.cc full-storage.cc interval.cc lgetopt.cc libc-extension.cc matrix-debug.cc matrix-storage.cc matrix.cc nscalar.cc path.cc rational.cc scalar.cc string-convert.cc string.cc stringutil.cc text-db.cc text-stream.cc unionfind.cc vector.cc diff --git a/flower/Makefile.am.wild b/flower/Makefile.am.wild index 8a4af49009..87639fc1d0 100644 --- a/flower/Makefile.am.wild +++ b/flower/Makefile.am.wild @@ -12,7 +12,7 @@ SUBDIRS = include test lib_LTLIBRARIES = libflower.la README_FILES = ONEWS NEWS README TODO VERSION -EXTRA_DIST = Makefile.am.wild aclocal.m4 configure config.hh.in configure.in $(README_FILES) +EXTRA_DIST = Makefile.am.wild aclocal.m4 configure configure.in $(README_FILES) libflower_la_SOURCES = $(wildcard *.cc) diff --git a/flower/Makefile.in b/flower/Makefile.in index d3d3612e89..27bd4a909b 100644 --- a/flower/Makefile.in +++ b/flower/Makefile.in @@ -10,6 +10,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +# Automatically generated from ./flower/Makefile.am.wild by autowild +# Do not edit # Generated automatically by wild-perl 0.1 # project FlowerSoft C++ library # title top level makefile for FlowerLib @@ -90,7 +92,7 @@ SUBDIRS = include test lib_LTLIBRARIES = libflower.la README_FILES = ONEWS NEWS README TODO VERSION -EXTRA_DIST = Makefile.am.wild aclocal.m4 configure config.hh.in configure.in $(README_FILES) +EXTRA_DIST = Makefile.am.wild aclocal.m4 configure configure.in $(README_FILES) libflower_la_SOURCES = choleski.cc cpu-timer.cc data-file.cc diagonal-storage.cc dictionary.cc directed-graph.cc dstream.cc flower-debug.cc flower-version.cc full-storage.cc interval.cc lgetopt.cc libc-extension.cc matrix-debug.cc matrix-storage.cc matrix.cc nscalar.cc path.cc rational.cc scalar.cc string-convert.cc string.cc stringutil.cc text-db.cc text-stream.cc unionfind.cc vector.cc @@ -121,8 +123,8 @@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ -Makefile.in NEWS TODO aclocal.m4 config.hh.in configure configure.in \ -missing mkinstalldirs stamp-h.in +Makefile.in NEWS TODO acconfig.h aclocal.m4 config.hh.in configure \ +configure.in missing mkinstalldirs stamp-h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -159,7 +161,7 @@ stamp-h: $(srcdir)/config.hh.in $(top_builddir)/config.status $(SHELL) ./config.status @echo timestamp > stamp-h $(srcdir)/config.hh.in: $(srcdir)/stamp-h.in -$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h cd $(top_srcdir) && $(AUTOHEADER) @echo timestamp > $(srcdir)/stamp-h.in @@ -370,7 +372,7 @@ data-file.lo data-file.o: data-file.cc include/international.hh \ diagonal-storage.lo diagonal-storage.o: diagonal-storage.cc \ include/diagonal-storage.hh include/full-storage.hh \ include/varray.hh include/matrix-storage.hh include/real.hh \ - include/virtual-methods.hh include/full-storage.icc + include/virtual-methods.hh dictionary.lo dictionary.o: dictionary.cc directed-graph.lo directed-graph.o: directed-graph.cc \ include/directed-graph.hh include/parray.hh include/varray.hh diff --git a/flower/acconfig.h b/flower/acconfig.h new file mode 100644 index 0000000000..444f2a1e56 --- /dev/null +++ b/flower/acconfig.h @@ -0,0 +1,21 @@ +/* autoheader really wants this */ +#define PACKAGE + +/* define if you have memmem */ +#define HAVE_MEMMEM 0 + +/* define if you have snprintf */ +#define HAVE_SNPRINTF 0 + +/* the version string of the flower lib */ +#define MODULE_VERSION "0.0.0" + +/* undef to get lots of debugging stuff (see .dstream) */ +#define NPRINT + +/* undef to do checking */ +#undef NDEBUG + +/* define to inline string funcs */ +#undef STRINGS_UTILS_INLINED + diff --git a/flower/config.hh.in b/flower/config.hh.in index 80c688b06b..ddd891dcad 100644 --- a/flower/config.hh.in +++ b/flower/config.hh.in @@ -1,9 +1,28 @@ -/* define if you have memmem */ -#define HAVE_MEMMEM 0 +/* config.hh.in. Generated automatically from configure.in by autoheader. */ -/* define if you have snprintf */ -#define HAVE_SNPRINTF 0 +/* Define if you don't have vprintf but do have _doprnt. */ +#undef HAVE_DOPRNT + +/* Define if you have the vprintf function. */ +#undef HAVE_VPRINTF + +/* autoheader really wants this */ +#define PACKAGE /* the version string of the flower lib */ #define MODULE_VERSION "0.0.0" +/* undef to get lots of debugging stuff (see .dstream) */ +#define NPRINT + +/* undef to do checking */ +#undef NDEBUG + +/* define to inline string funcs */ +#undef STRINGS_UTILS_INLINED + +/* Define if you have the memmem function. */ +#undef HAVE_MEMMEM + +/* Define if you have the snprintf function. */ +#undef HAVE_SNPRINTF diff --git a/flower/configure b/flower/configure index c0a704a5d7..e9c9cd70dd 100755 --- a/flower/configure +++ b/flower/configure @@ -21,6 +21,14 @@ ac_help="$ac_help appears as an element in the PKGS list" ac_help="$ac_help --with-gnu-ld assume the C compiler uses GNU ld [default=no]" +ac_help="$ac_help + enable-printing turn on debug printing. Default: off" +ac_help="$ac_help + enable-checking set runtime checks (assert calls). Default: on" +ac_help="$ac_help + enable-optimise use maximal speed optimisations. Default: off" +ac_help="$ac_help + enable-profiling compile with gprof support. Default: off" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -564,7 +572,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:568: checking for a BSD compatible install" >&5 +echo "configure:576: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -617,7 +625,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:621: checking whether build environment is sane" >&5 +echo "configure:629: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -674,7 +682,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:678: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:686: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -720,7 +728,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:724: checking for working aclocal" >&5 +echo "configure:732: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -733,7 +741,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:737: checking for working autoconf" >&5 +echo "configure:745: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -746,7 +754,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:750: checking for working automake" >&5 +echo "configure:758: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -759,7 +767,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:763: checking for working autoheader" >&5 +echo "configure:771: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -772,7 +780,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:776: checking for working makeinfo" >&5 +echo "configure:784: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -789,7 +797,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:793: checking for $ac_word" >&5 +echo "configure:801: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -818,7 +826,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:822: checking for $ac_word" >&5 +echo "configure:830: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -866,7 +874,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:870: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:878: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -876,11 +884,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -900,12 +908,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:904: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:912: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:909: checking whether we are using GNU C" >&5 +echo "configure:917: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -914,7 +922,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -929,7 +937,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:933: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:941: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -961,7 +969,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:965: checking for $ac_word" >&5 +echo "configure:973: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -992,7 +1000,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:996: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1004: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1002,11 +1010,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1032,12 +1040,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1036: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1044: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1041: checking whether we are using GNU C++" >&5 +echo "configure:1049: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1046,7 +1054,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1061,7 +1069,7 @@ if test $ac_cv_prog_gxx = yes; then ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1065: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1073: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1089,6 +1097,7 @@ else fi + # turn off shared libraries by default (may be enabled using --enable-shared) # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then @@ -1143,7 +1152,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1147: checking host system type" >&5 +echo "configure:1156: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1166,7 +1175,7 @@ echo "$ac_t""$host" 1>&6 # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1170: checking for $ac_word" >&5 +echo "configure:1179: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1205,7 +1214,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1209: checking for ld used by GCC" >&5 +echo "configure:1218: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1223,10 +1232,10 @@ echo "configure:1209: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1227: checking for GNU ld" >&5 +echo "configure:1236: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1230: checking for non-GNU ld" >&5 +echo "configure:1239: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1262,7 +1271,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1266: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1275: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1278,7 +1287,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1282: checking for BSD-compatible nm" >&5 +echo "configure:1291: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1315,7 +1324,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1319: checking whether ln -s works" >&5 +echo "configure:1328: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1351,8 +1360,8 @@ test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1355 "configure"' > conftest.$ac_ext - if { (eval echo configure:1356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1364 "configure"' > conftest.$ac_ext + if { (eval echo configure:1365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1382,95 +1391,66 @@ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } +printing_b=no +checking_b=yes +optimise_b=no +profile_b=no -missing_dir=`cd $ac_aux_dir && pwd` - -echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1390: checking for working aclocal" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (aclocal --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL=aclocal - echo "$ac_t""found" 1>&6 -else - ACLOCAL="$missing_dir/missing aclocal" - echo "$ac_t""missing" 1>&6 +# Check whether --enable-printing or --disable-printing was given. +if test "${enable_printing+set}" = set; then + enableval="$enable_printing" + printing_b=$enableval fi -echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1403: checking for working autoconf" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (autoconf --version) < /dev/null > /dev/null 2>&1; then - AUTOCONF=autoconf - echo "$ac_t""found" 1>&6 -else - AUTOCONF="$missing_dir/missing autoconf" - echo "$ac_t""missing" 1>&6 + +# Check whether --enable-checking or --disable-checking was given. +if test "${enable_checking+set}" = set; then + enableval="$enable_checking" + checking_b=$enableval fi -echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1416: checking for working automake" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (automake --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake - echo "$ac_t""found" 1>&6 -else - AUTOMAKE="$missing_dir/missing automake" - echo "$ac_t""missing" 1>&6 + +# Check whether --enable-optimise or --disable-optimise was given. +if test "${enable_optimise+set}" = set; then + enableval="$enable_optimise" + optimise_b=$enableval fi -echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1429: checking for working autoheader" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (autoheader --version) < /dev/null > /dev/null 2>&1; then - AUTOHEADER=autoheader - echo "$ac_t""found" 1>&6 -else - AUTOHEADER="$missing_dir/missing autoheader" - echo "$ac_t""missing" 1>&6 + +# Check whether --enable-profiling or --disable-profiling was given. +if test "${enable_profiling+set}" = set; then + enableval="$enable_profiling" + profile_b=$enableval fi -# AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -# Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1445: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$PERL" in - /*) - ac_cv_path_PERL="$PERL" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PERL="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="error" - ;; -esac + +if test $printing_b = no; then + cat >> confdefs.h <<\EOF +#define NPRINT 1 +EOF + fi -PERL="$ac_cv_path_PERL" -if test -n "$PERL"; then - echo "$ac_t""$PERL" 1>&6 -else - echo "$ac_t""no" 1>&6 + +if test $checking_b = no; then + cat >> confdefs.h <<\EOF +#define NDEBUG 1 +EOF + fi +if test $optimise_b = yes; then +# DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED" + cat >> confdefs.h <<\EOF +#define STRINGS_UTILS_INLINED 1 +EOF +fi + +# oeps, broken for now +if test $profile_b = yes; then + EXTRA_LIBES="-pg" + DEFINES="$DEFINES -pg" +fi ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1480,15 +1460,9 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross -# optimise_b=yes -# shared_b=no LIB_SUFFIX=.a MODULE_CXXFLAGS="$MODULE_CXXFLAGS -D_REENTRANT" -if test $optimise_b = yes; then - MODULE_CXXFLAGS="$MODULE_CXXFLAGS -O2 -DSTRING_UTILS_INLINED" -fi - @@ -1506,7 +1480,7 @@ fi REVISION=$PATCH_LEVEL # CURRENT=$MINOR_VERSION -CURRENT=$(expr $MINOR_VERSION + 1) +CURRENT=`expr $MINOR_VERSION + 1` # AGE=$(expr $MAJOR_VERSION + 1) AGE=$MAJOR_VERSION @@ -1515,7 +1489,7 @@ AGE=$MAJOR_VERSION echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:1519: checking for 8-bit clean memcmp" >&5 +echo "configure:1493: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1523,7 +1497,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -1554,12 +1528,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o" echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:1558: checking for vprintf" >&5 +echo "configure:1532: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -1609,12 +1583,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:1613: checking for _doprnt" >&5 +echo "configure:1587: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -1667,12 +1641,12 @@ fi for ac_func in memmem snprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1671: checking for $ac_func" >&5 +echo "configure:1645: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1886,13 +1860,13 @@ s%@LD@%$LD%g s%@NM@%$NM%g s%@LN_S@%$LN_S%g s%@LIBTOOL@%$LIBTOOL%g -s%@PERL@%$PERL%g s%@MODULE_CXXFLAGS@%$MODULE_CXXFLAGS%g s%@MODULE_LDFLAGS@%$MODULE_LDFLAGS%g s%@LIB_SUFFIX@%$LIB_SUFFIX%g s%@CURRENT@%$CURRENT%g s%@REVISION@%$REVISION%g s%@AGE@%$AGE%g +s%@PERL@%$PERL%g s%@LIBOBJS@%$LIBOBJS%g CEOF diff --git a/flower/configure.in b/flower/configure.in index 6680ebd9f0..25bb9392bc 100644 --- a/flower/configure.in +++ b/flower/configure.in @@ -13,32 +13,56 @@ AM_INIT_AUTOMAKE(flower, $FULL_VERSION) AC_PROG_CC AC_PROG_CXX + # turn off shared libraries by default (may be enabled using --enable-shared) AM_DISABLE_SHARED AM_PROG_LIBTOOL +printing_b=no +checking_b=yes +optimise_b=no +profile_b=no + +AC_ARG_ENABLE(printing, + [ enable-printing turn on debug printing. Default: off], + [printing_b=$enableval]) + +AC_ARG_ENABLE(checking, + [ enable-checking set runtime checks (assert calls). Default: on], + [checking_b=$enableval] ) + +AC_ARG_ENABLE(optimise, + [ enable-optimise use maximal speed optimisations. Default: off], + [optimise_b=$enableval]) + +AC_ARG_ENABLE(profiling, + [ enable-profiling compile with gprof support. Default: off], + [profile_b=$enableval]) + +if test $printing_b = no; then + AC_DEFINE(NPRINT) +fi + +if test $checking_b = no; then + AC_DEFINE(NDEBUG) +fi -missing_dir=`cd $ac_aux_dir && pwd` - -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) -AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -# AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -AC_PATH_PROG(PERL, perl, error) +if test $optimise_b = yes; then +# DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED" + AC_DEFINE(STRINGS_UTILS_INLINED) +fi +# oeps, broken for now +if test $profile_b = yes; then + EXTRA_LIBES="-pg" + DEFINES="$DEFINES -pg" +fi AC_LANG_CPLUSPLUS -# optimise_b=yes -# shared_b=no LIB_SUFFIX=.a MODULE_CXXFLAGS="$MODULE_CXXFLAGS -D_REENTRANT" -if test $optimise_b = yes; then - MODULE_CXXFLAGS="$MODULE_CXXFLAGS -O2 -DSTRING_UTILS_INLINED" -fi - AC_SUBST(MODULE_CXXFLAGS) AC_SUBST(MODULE_LDFLAGS) AC_SUBST(LIB_SUFFIX) @@ -56,7 +80,7 @@ AC_SUBST(LIB_SUFFIX) REVISION=$PATCH_LEVEL # CURRENT=$MINOR_VERSION -CURRENT=$(expr $MINOR_VERSION + 1) +CURRENT=`expr $MINOR_VERSION + 1` # AGE=$(expr $MAJOR_VERSION + 1) AGE=$MAJOR_VERSION AC_SUBST(CURRENT) diff --git a/flower/diagonal-storage.cc b/flower/diagonal-storage.cc index 7fd6227d8f..069ea8294d 100644 --- 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 2b1ff48a54..5e05c1bb4b 100644 --- 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/Makefile.am b/flower/include/Makefile.am index 2b9ef33c21..fbbb194712 100644 --- a/flower/include/Makefile.am +++ b/flower/include/Makefile.am @@ -1,4 +1,7 @@ -# Generated automatically by wild-perl 0.1# flower/lib/include/Makefile.am.wild +# Automatically generated from ./flower/include/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# flower/lib/include/Makefile.am.wild noinst_HEADERS = acursor.hh arithmetic-operator.hh assoc-iter.hh assoc.hh choleski.hh compare.hh cpu-timer.hh cursor.hh data-file.hh diagonal-storage.hh dictionary-iter.hh dictionary.hh directed-graph.hh dstream.hh flower-debug.hh fproto.hh full-storage.hh handle.hh international.hh interval.hh iterate.hh lgetopt.hh libc-extension.hh link.hh list.hh matrix-storage.hh matrix.hh nscalar.hh parray.hh path.hh pcursor.hh plist.hh pointer.hh pqueue.hh priorities.hh rational.hh real.hh scalar.hh string-convert.hh string-data.hh string-handle.hh string.hh text-db.hh text-stream.hh timer.hh unionfind.hh varray.hh vector.hh virtual-methods.hh cursor.icc full-storage.icc link.icc list.icc plist.icc string-data.icc string-handle.icc string.icc cursor.tcc interval.tcc list.tcc pcursor.tcc plist.tcc pointer.tcc diff --git a/flower/include/Makefile.in b/flower/include/Makefile.in index b52fb14ab9..2dfc1914be 100644 --- a/flower/include/Makefile.in +++ b/flower/include/Makefile.in @@ -10,7 +10,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Generated automatically by wild-perl 0.1# flower/lib/include/Makefile.am.wild +# Automatically generated from ./flower/include/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# flower/lib/include/Makefile.am.wild SHELL = /bin/sh diff --git a/flower/include/full-storage.icc b/flower/include/full-storage.icc index 359edb6b4c..9401ff245f 100644 --- 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 db4f0fc964..c5084dce05 100644 --- 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; template class Cursor; \ - template class Link - #include "list.hh" template @@ -134,4 +130,22 @@ List::concatenate (List 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; \ + template class Cursor; template class Link + +#else + +#define LIST_INSTANTIATE(T)\ + static void force_list_members ()\ + {\ + List bla;\ + bla.top().add ((void*)0);\ + } #endif + +#endif + diff --git a/flower/include/plist.tcc b/flower/include/plist.tcc index 5ce6c2446c..ee6889faef 100644 --- a/flower/include/plist.tcc +++ b/flower/include/plist.tcc @@ -12,9 +12,6 @@ #include "plist.hh" -#define POINTERLIST_INSTANTIATE(a) class Pointer_list;\ - template class PCursor; - template void Pointer_list::junk() @@ -26,4 +23,20 @@ Pointer_list::junk() } } +#ifndef __CYGWIN32__ // ugh should check for some gcc/egcs version + +#define POINTERLIST_INSTANTIATE(a) template class Pointer_list;\ + template class PCursor; + +#else + +#define POINTERLIST_INSTANTIATE(T)\ + static void force_junk##T ()\ + {\ + Pointer_list bla;\ + bla.junk ();\ + } + +#endif + #endif // PLIST_TCC diff --git a/flower/test/Makefile.am b/flower/test/Makefile.am index df20634f35..1aa34af387 100644 --- a/flower/test/Makefile.am +++ b/flower/test/Makefile.am @@ -1,4 +1,7 @@ -# Generated automatically by wild-perl 0.1# +# Automatically generated from ./flower/test/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# # project LilyPond -- the musical typesetter # title makefile for flowertest # file flower/test/Makefile.am.wild diff --git a/flower/test/Makefile.in b/flower/test/Makefile.in index 55bbf89ace..9aa4333249 100644 --- a/flower/test/Makefile.in +++ b/flower/test/Makefile.in @@ -10,7 +10,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Generated automatically by wild-perl 0.1# +# Automatically generated from ./flower/test/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# # project LilyPond -- the musical typesetter # title makefile for flowertest # file flower/test/Makefile.am.wild diff --git a/init/Makefile.am b/init/Makefile.am index 02e8dea88b..31291ae66c 100644 --- a/init/Makefile.am +++ b/init/Makefile.am @@ -1,6 +1,9 @@ -# Generated automatically by wild-perl 0.1# init/Makefile.am.wild +# Automatically generated from ./init/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# init/Makefile.am.wild -INIFILES = dutch.ly dynamic.ly engraver.ly german.ly italian.ly lily-init.ly midi.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly swedish.ly table11.ly table13.ly table16.ly table20.ly table26.ly +INIFILES = deutsch.ly dynamic.ly engraver.ly italiano.ly lily-init.ly midi.ly nederlands.ly norsk.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly svenska.ly table11.ly table13.ly table16.ly table20.ly table26.ly EXTRA_DIST = Makefile.am.wild $(INIFILES) CLEANFILES = diff --git a/init/Makefile.in b/init/Makefile.in index 65368541a2..b8347b24bc 100644 --- a/init/Makefile.in +++ b/init/Makefile.in @@ -10,7 +10,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Generated automatically by wild-perl 0.1# init/Makefile.am.wild +# Automatically generated from ./init/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# init/Makefile.am.wild SHELL = /bin/sh @@ -59,7 +62,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AUTOHEADER = @AUTOHEADER@ +AUTOGENERATE = @AUTOGENERATE@ BISON = @BISON@ CC = @CC@ COMPILEINFO = @COMPILEINFO@ @@ -94,8 +97,9 @@ TEXPREFIX = @TEXPREFIX@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ -INIFILES = dutch.ly dynamic.ly engraver.ly german.ly italian.ly lily-init.ly midi.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly swedish.ly table11.ly table13.ly table16.ly table20.ly table26.ly +INIFILES = deutsch.ly dynamic.ly engraver.ly italiano.ly lily-init.ly midi.ly nederlands.ly norsk.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly svenska.ly table11.ly table13.ly table16.ly table20.ly table26.ly EXTRA_DIST = Makefile.am.wild $(INIFILES) CLEANFILES = diff --git a/init/deutsch.ly b/init/deutsch.ly new file mode 100644 index 0000000000..7defccdd64 --- /dev/null +++ b/init/deutsch.ly @@ -0,0 +1,93 @@ +% +% common german names for notes. "es" means flat, "is" means sharp +% +% by Roland Meier +% based on swedish.ly by Mats Bengtsson. + + +% +% Please note that, while these names are used to enter *notes*, they +% actually are *melodic*s, i.e. they represent a pitch solely. Notes +% have a rhythmic part too. This is the reason that we don't write 'note { .. }' +% +\notenames { + ceses = \melodic_request { -1 0 -2 } + ces = \melodic_request { -1 0 -1 } + c = \melodic_request { -1 0 0 } + cis = \melodic_request { -1 0 1 } + cisis = \melodic_request { -1 0 2 } + deses = \melodic_request { -1 1 -2 } + des = \melodic_request { -1 1 -1 } + d = \melodic_request { -1 1 0 } + dis = \melodic_request { -1 1 1 } + disis = \melodic_request { -1 1 2 } + eses = \melodic_request { -1 2 -2 } + es = \melodic_request { -1 2 -1 } + e = \melodic_request { -1 2 0 } + eis = \melodic_request { -1 2 1 } + eisis = \melodic_request { -1 2 2 } + feses = \melodic_request { -1 3 -2 } + fes = \melodic_request { -1 3 -1 } + f = \melodic_request { -1 3 0 } + fis = \melodic_request { -1 3 1 } + fisis = \melodic_request { -1 3 2 } + geses = \melodic_request { -1 4 -2 } + ges = \melodic_request { -1 4 -1 } + g = \melodic_request { -1 4 0 } + gis = \melodic_request { -1 4 1 } + gisis = \melodic_request { -1 4 2 } + ases = \melodic_request { -1 5 -2 } + as = \melodic_request { -1 5 -1 } + a = \melodic_request { -1 5 0 } + ais = \melodic_request { -1 5 1 } + aisis = \melodic_request { -1 5 2 } + heses = \melodic_request { -1 6 -2 } + b = \melodic_request { -1 6 -1 } + h = \melodic_request { -1 6 0 } + his = \melodic_request { -1 6 1 } + hisis = \melodic_request { -1 6 2 } + + + % + % upper case: 1 octave lower. + % + + + Ceses = \melodic_request { -2 0 -2 } + Ces = \melodic_request { -2 0 -1 } + C = \melodic_request { -2 0 0 } + Cis = \melodic_request { -2 0 1 } + Cisis = \melodic_request { -2 0 2 } + Deses = \melodic_request { -2 1 -2 } + Des = \melodic_request { -2 1 -1 } + D = \melodic_request { -2 1 0 } + Dis = \melodic_request { -2 1 1 } + Disis = \melodic_request { -2 1 2 } + Eses = \melodic_request { -2 2 -2 } + Es = \melodic_request { -2 2 -1 } + E = \melodic_request { -2 2 0 } + Eis = \melodic_request { -2 2 1 } + Eisis = \melodic_request { -2 2 2 } + Feses = \melodic_request { -2 3 -2 } + Fes = \melodic_request { -2 3 -1 } + F = \melodic_request { -2 3 0 } + Fis = \melodic_request { -2 3 1 } + Fisis = \melodic_request { -2 3 2 } + Geses = \melodic_request { -2 4 -2 } + Ges = \melodic_request { -2 4 -1 } + G = \melodic_request { -2 4 0 } + Gis = \melodic_request { -2 4 1 } + Gisis = \melodic_request { -2 4 2 } + Ases = \melodic_request { -2 5 -2 } + As = \melodic_request { -2 5 -1 } + A = \melodic_request { -2 5 0 } + Ais = \melodic_request { -2 5 1 } + Aisis = \melodic_request { -2 5 2 } + Heses = \melodic_request { -2 6 -2 } + B = \melodic_request { -2 6 -1 } + H = \melodic_request { -2 6 0 } + His = \melodic_request { -2 6 1 } + Hisis = \melodic_request { -2 6 2 } + + +} diff --git a/init/dutch.ly b/init/dutch.ly deleted file mode 100644 index 12d4b4c111..0000000000 --- a/init/dutch.ly +++ /dev/null @@ -1,99 +0,0 @@ -%{ - common dutch names for notes. "es" means flat, "is" means sharp - - - - - Please note that, while these names are used to enter *notes*, they - actually are *melodic*s, i.e. they represent a pitch solely. Notes - have a rhythmic part too. This is the reason that we don't write 'note { .. }' - -%} - -\notenames { - ceses = \melodic_request { -1 0 -2 } - ces = \melodic_request { -1 0 -1 } - c = \melodic_request { -1 0 0 } - cis = \melodic_request { -1 0 1 } - cisis = \melodic_request { -1 0 2 } - deses = \melodic_request { -1 1 -2 } - des = \melodic_request { -1 1 -1 } - d = \melodic_request { -1 1 0 } - dis = \melodic_request { -1 1 1 } - disis = \melodic_request { -1 1 2 } - eeses = \melodic_request { -1 2 -2 } - eses = \melodic_request { -1 2 -2 } - ees = \melodic_request { -1 2 -1 } - es = \melodic_request { -1 2 -1 } - e = \melodic_request { -1 2 0 } - eis = \melodic_request { -1 2 1 } - eisis = \melodic_request { -1 2 2 } - feses = \melodic_request { -1 3 -2 } - fes = \melodic_request { -1 3 -1 } - f = \melodic_request { -1 3 0 } - fis = \melodic_request { -1 3 1 } - fisis = \melodic_request { -1 3 2 } - geses = \melodic_request { -1 4 -2 } - ges = \melodic_request { -1 4 -1 } - g = \melodic_request { -1 4 0 } - gis = \melodic_request { -1 4 1 } - gisis = \melodic_request { -1 4 2 } - aeses = \melodic_request { -1 5 -2 } - ases = \melodic_request { -1 5 -2 } - aes = \melodic_request { -1 5 -1 } - as = \melodic_request { -1 5 -1 } - a = \melodic_request { -1 5 0 } - ais = \melodic_request { -1 5 1 } - aisis = \melodic_request { -1 5 2 } - beses = \melodic_request { -1 6 -2 } - bes = \melodic_request { -1 6 -1 } - b = \melodic_request { -1 6 0 } - bis = \melodic_request { -1 6 1 } - bisis = \melodic_request { -1 6 2 } - - - % - % upper case: 1 octave lower. - % - - - Ceses = \melodic_request { -2 0 -2 } - Ces = \melodic_request { -2 0 -1 } - C = \melodic_request { -2 0 0 } - Cis = \melodic_request { -2 0 1 } - Cisis = \melodic_request { -2 0 2 } - Deses = \melodic_request { -2 1 -2 } - Des = \melodic_request { -2 1 -1 } - D = \melodic_request { -2 1 0 } - Dis = \melodic_request { -2 1 1 } - Disis = \melodic_request { -2 1 2 } - Eses = \melodic_request { -2 2 -2 } - Es = \melodic_request { -2 2 -1 } - E = \melodic_request { -2 2 0 } - Eis = \melodic_request { -2 2 1 } - Eisis = \melodic_request { -2 2 2 } - Feses = \melodic_request { -2 3 -2 } - Fes = \melodic_request { -2 3 -1 } - F = \melodic_request { -2 3 0 } - Fis = \melodic_request { -2 3 1 } - Fisis = \melodic_request { -2 3 2 } - Geses = \melodic_request { -2 4 -2 } - Ges = \melodic_request { -2 4 -1 } - G = \melodic_request { -2 4 0 } - Gis = \melodic_request { -2 4 1 } - Gisis = \melodic_request { -2 4 2 } - Aeses = \melodic_request { -2 5 -2 } - Ases = \melodic_request { -2 5 -2 } - Aes = \melodic_request { -2 5 -1 } - As = \melodic_request { -2 5 -1 } - A = \melodic_request { -2 5 0 } - Ais = \melodic_request { -2 5 1 } - Aisis = \melodic_request { -2 5 2 } - Beses = \melodic_request { -2 6 -2 } - Bes = \melodic_request { -2 6 -1 } - B = \melodic_request { -2 6 0 } - Bis = \melodic_request { -2 6 1 } - Bisis = \melodic_request { -2 6 2 } - - -} diff --git a/init/german.ly b/init/german.ly deleted file mode 100644 index 7defccdd64..0000000000 --- a/init/german.ly +++ /dev/null @@ -1,93 +0,0 @@ -% -% common german names for notes. "es" means flat, "is" means sharp -% -% by Roland Meier -% based on swedish.ly by Mats Bengtsson. - - -% -% Please note that, while these names are used to enter *notes*, they -% actually are *melodic*s, i.e. they represent a pitch solely. Notes -% have a rhythmic part too. This is the reason that we don't write 'note { .. }' -% -\notenames { - ceses = \melodic_request { -1 0 -2 } - ces = \melodic_request { -1 0 -1 } - c = \melodic_request { -1 0 0 } - cis = \melodic_request { -1 0 1 } - cisis = \melodic_request { -1 0 2 } - deses = \melodic_request { -1 1 -2 } - des = \melodic_request { -1 1 -1 } - d = \melodic_request { -1 1 0 } - dis = \melodic_request { -1 1 1 } - disis = \melodic_request { -1 1 2 } - eses = \melodic_request { -1 2 -2 } - es = \melodic_request { -1 2 -1 } - e = \melodic_request { -1 2 0 } - eis = \melodic_request { -1 2 1 } - eisis = \melodic_request { -1 2 2 } - feses = \melodic_request { -1 3 -2 } - fes = \melodic_request { -1 3 -1 } - f = \melodic_request { -1 3 0 } - fis = \melodic_request { -1 3 1 } - fisis = \melodic_request { -1 3 2 } - geses = \melodic_request { -1 4 -2 } - ges = \melodic_request { -1 4 -1 } - g = \melodic_request { -1 4 0 } - gis = \melodic_request { -1 4 1 } - gisis = \melodic_request { -1 4 2 } - ases = \melodic_request { -1 5 -2 } - as = \melodic_request { -1 5 -1 } - a = \melodic_request { -1 5 0 } - ais = \melodic_request { -1 5 1 } - aisis = \melodic_request { -1 5 2 } - heses = \melodic_request { -1 6 -2 } - b = \melodic_request { -1 6 -1 } - h = \melodic_request { -1 6 0 } - his = \melodic_request { -1 6 1 } - hisis = \melodic_request { -1 6 2 } - - - % - % upper case: 1 octave lower. - % - - - Ceses = \melodic_request { -2 0 -2 } - Ces = \melodic_request { -2 0 -1 } - C = \melodic_request { -2 0 0 } - Cis = \melodic_request { -2 0 1 } - Cisis = \melodic_request { -2 0 2 } - Deses = \melodic_request { -2 1 -2 } - Des = \melodic_request { -2 1 -1 } - D = \melodic_request { -2 1 0 } - Dis = \melodic_request { -2 1 1 } - Disis = \melodic_request { -2 1 2 } - Eses = \melodic_request { -2 2 -2 } - Es = \melodic_request { -2 2 -1 } - E = \melodic_request { -2 2 0 } - Eis = \melodic_request { -2 2 1 } - Eisis = \melodic_request { -2 2 2 } - Feses = \melodic_request { -2 3 -2 } - Fes = \melodic_request { -2 3 -1 } - F = \melodic_request { -2 3 0 } - Fis = \melodic_request { -2 3 1 } - Fisis = \melodic_request { -2 3 2 } - Geses = \melodic_request { -2 4 -2 } - Ges = \melodic_request { -2 4 -1 } - G = \melodic_request { -2 4 0 } - Gis = \melodic_request { -2 4 1 } - Gisis = \melodic_request { -2 4 2 } - Ases = \melodic_request { -2 5 -2 } - As = \melodic_request { -2 5 -1 } - A = \melodic_request { -2 5 0 } - Ais = \melodic_request { -2 5 1 } - Aisis = \melodic_request { -2 5 2 } - Heses = \melodic_request { -2 6 -2 } - B = \melodic_request { -2 6 -1 } - H = \melodic_request { -2 6 0 } - His = \melodic_request { -2 6 1 } - Hisis = \melodic_request { -2 6 2 } - - -} diff --git a/init/italian.ly b/init/italian.ly deleted file mode 100644 index dd807abf22..0000000000 --- a/init/italian.ly +++ /dev/null @@ -1,49 +0,0 @@ -%{ - Common italian names for notes. "b" means flat (bemolle), "d" means sharp (diesis) - Adapted from dutch.ly. - - English: a b c d e f g - Italian: la si do re mi fa sol - - For french naming just change 'do' in 'ut'. -%} - -% contributed by Paolo Zuliani - -\notenames { - dobb = \melodic_request { -1 0 -2 } - dob = \melodic_request { -1 0 -1 } - do = \melodic_request { -1 0 0 } - dod = \melodic_request { -1 0 1 } - dodd = \melodic_request { -1 0 2 } - rebb = \melodic_request { -1 1 -2 } - reb = \melodic_request { -1 1 -1 } - re = \melodic_request { -1 1 0 } - red = \melodic_request { -1 1 1 } - redd = \melodic_request { -1 1 2 } - mibb = \melodic_request { -1 2 -2 } - mib = \melodic_request { -1 2 -1 } - mi = \melodic_request { -1 2 0 } - mid = \melodic_request { -1 2 1 } - midd = \melodic_request { -1 2 2 } - fabb = \melodic_request { -1 3 -2 } - fab = \melodic_request { -1 3 -1 } - fa = \melodic_request { -1 3 0 } - fad = \melodic_request { -1 3 1 } - fadd = \melodic_request { -1 3 2 } - solbb = \melodic_request { -1 4 -2 } - solb = \melodic_request { -1 4 -1 } - sol = \melodic_request { -1 4 0 } - sold = \melodic_request { -1 4 1 } - soldd = \melodic_request { -1 4 2 } - labb = \melodic_request { -1 5 -2 } - lab = \melodic_request { -1 5 -1 } - la = \melodic_request { -1 5 0 } - lad = \melodic_request { -1 5 1 } - ladd = \melodic_request { -1 5 2 } - sibb = \melodic_request { -1 6 -2 } - sib = \melodic_request { -1 6 -1 } - si = \melodic_request { -1 6 0 } - sid = \melodic_request { -1 6 1 } - sidd = \melodic_request { -1 6 2 } -} diff --git a/init/italiano.ly b/init/italiano.ly new file mode 100644 index 0000000000..dd807abf22 --- /dev/null +++ b/init/italiano.ly @@ -0,0 +1,49 @@ +%{ + Common italian names for notes. "b" means flat (bemolle), "d" means sharp (diesis) + Adapted from dutch.ly. + + English: a b c d e f g + Italian: la si do re mi fa sol + + For french naming just change 'do' in 'ut'. +%} + +% contributed by Paolo Zuliani + +\notenames { + dobb = \melodic_request { -1 0 -2 } + dob = \melodic_request { -1 0 -1 } + do = \melodic_request { -1 0 0 } + dod = \melodic_request { -1 0 1 } + dodd = \melodic_request { -1 0 2 } + rebb = \melodic_request { -1 1 -2 } + reb = \melodic_request { -1 1 -1 } + re = \melodic_request { -1 1 0 } + red = \melodic_request { -1 1 1 } + redd = \melodic_request { -1 1 2 } + mibb = \melodic_request { -1 2 -2 } + mib = \melodic_request { -1 2 -1 } + mi = \melodic_request { -1 2 0 } + mid = \melodic_request { -1 2 1 } + midd = \melodic_request { -1 2 2 } + fabb = \melodic_request { -1 3 -2 } + fab = \melodic_request { -1 3 -1 } + fa = \melodic_request { -1 3 0 } + fad = \melodic_request { -1 3 1 } + fadd = \melodic_request { -1 3 2 } + solbb = \melodic_request { -1 4 -2 } + solb = \melodic_request { -1 4 -1 } + sol = \melodic_request { -1 4 0 } + sold = \melodic_request { -1 4 1 } + soldd = \melodic_request { -1 4 2 } + labb = \melodic_request { -1 5 -2 } + lab = \melodic_request { -1 5 -1 } + la = \melodic_request { -1 5 0 } + lad = \melodic_request { -1 5 1 } + ladd = \melodic_request { -1 5 2 } + sibb = \melodic_request { -1 6 -2 } + sib = \melodic_request { -1 6 -1 } + si = \melodic_request { -1 6 0 } + sid = \melodic_request { -1 6 1 } + sidd = \melodic_request { -1 6 2 } +} diff --git a/init/nederlands.ly b/init/nederlands.ly new file mode 100644 index 0000000000..12d4b4c111 --- /dev/null +++ b/init/nederlands.ly @@ -0,0 +1,99 @@ +%{ + common dutch names for notes. "es" means flat, "is" means sharp + + + + + Please note that, while these names are used to enter *notes*, they + actually are *melodic*s, i.e. they represent a pitch solely. Notes + have a rhythmic part too. This is the reason that we don't write 'note { .. }' + +%} + +\notenames { + ceses = \melodic_request { -1 0 -2 } + ces = \melodic_request { -1 0 -1 } + c = \melodic_request { -1 0 0 } + cis = \melodic_request { -1 0 1 } + cisis = \melodic_request { -1 0 2 } + deses = \melodic_request { -1 1 -2 } + des = \melodic_request { -1 1 -1 } + d = \melodic_request { -1 1 0 } + dis = \melodic_request { -1 1 1 } + disis = \melodic_request { -1 1 2 } + eeses = \melodic_request { -1 2 -2 } + eses = \melodic_request { -1 2 -2 } + ees = \melodic_request { -1 2 -1 } + es = \melodic_request { -1 2 -1 } + e = \melodic_request { -1 2 0 } + eis = \melodic_request { -1 2 1 } + eisis = \melodic_request { -1 2 2 } + feses = \melodic_request { -1 3 -2 } + fes = \melodic_request { -1 3 -1 } + f = \melodic_request { -1 3 0 } + fis = \melodic_request { -1 3 1 } + fisis = \melodic_request { -1 3 2 } + geses = \melodic_request { -1 4 -2 } + ges = \melodic_request { -1 4 -1 } + g = \melodic_request { -1 4 0 } + gis = \melodic_request { -1 4 1 } + gisis = \melodic_request { -1 4 2 } + aeses = \melodic_request { -1 5 -2 } + ases = \melodic_request { -1 5 -2 } + aes = \melodic_request { -1 5 -1 } + as = \melodic_request { -1 5 -1 } + a = \melodic_request { -1 5 0 } + ais = \melodic_request { -1 5 1 } + aisis = \melodic_request { -1 5 2 } + beses = \melodic_request { -1 6 -2 } + bes = \melodic_request { -1 6 -1 } + b = \melodic_request { -1 6 0 } + bis = \melodic_request { -1 6 1 } + bisis = \melodic_request { -1 6 2 } + + + % + % upper case: 1 octave lower. + % + + + Ceses = \melodic_request { -2 0 -2 } + Ces = \melodic_request { -2 0 -1 } + C = \melodic_request { -2 0 0 } + Cis = \melodic_request { -2 0 1 } + Cisis = \melodic_request { -2 0 2 } + Deses = \melodic_request { -2 1 -2 } + Des = \melodic_request { -2 1 -1 } + D = \melodic_request { -2 1 0 } + Dis = \melodic_request { -2 1 1 } + Disis = \melodic_request { -2 1 2 } + Eses = \melodic_request { -2 2 -2 } + Es = \melodic_request { -2 2 -1 } + E = \melodic_request { -2 2 0 } + Eis = \melodic_request { -2 2 1 } + Eisis = \melodic_request { -2 2 2 } + Feses = \melodic_request { -2 3 -2 } + Fes = \melodic_request { -2 3 -1 } + F = \melodic_request { -2 3 0 } + Fis = \melodic_request { -2 3 1 } + Fisis = \melodic_request { -2 3 2 } + Geses = \melodic_request { -2 4 -2 } + Ges = \melodic_request { -2 4 -1 } + G = \melodic_request { -2 4 0 } + Gis = \melodic_request { -2 4 1 } + Gisis = \melodic_request { -2 4 2 } + Aeses = \melodic_request { -2 5 -2 } + Ases = \melodic_request { -2 5 -2 } + Aes = \melodic_request { -2 5 -1 } + As = \melodic_request { -2 5 -1 } + A = \melodic_request { -2 5 0 } + Ais = \melodic_request { -2 5 1 } + Aisis = \melodic_request { -2 5 2 } + Beses = \melodic_request { -2 6 -2 } + Bes = \melodic_request { -2 6 -1 } + B = \melodic_request { -2 6 0 } + Bis = \melodic_request { -2 6 1 } + Bisis = \melodic_request { -2 6 2 } + + +} diff --git a/init/norsk.ly b/init/norsk.ly new file mode 100644 index 0000000000..071df0612a --- /dev/null +++ b/init/norsk.ly @@ -0,0 +1,183 @@ + +% $Id: norsk.ly,v 1.1 1998/03/25 11:38:28 arvidg Exp arvidg $ + +%{ + + Common norwegian names for notes, including versions without the + double s-es to save typing, as well as the traditional names with + them not to confuse musicians. "es" or "ess" means flat, "is" or + "iss" means sharp. + + Otherwise, the main difference from the dutch names is the that the + "b" is called "h" in norwegian, while the dutch "bes" is a norwegian + "b". + + Staying within the (proud?) naming convention for norwegian language + setup used in LaTeX, this file is called "norsk.ly" instead of + "norwegian.ly", even if all other languages' files use the english + name. + + This file is based on "dutch.ly". Basically, I copied "dutch.ly", + duplicated all lines containing at least one "is" or "es", changed + every other "is" into an "iss" and every other "es" into an "ess", + added "ass" et al, and made some b->h-related changes. There may be + bugs in here; please tell me (or send patches) if you find any. + + Arvid Gr=F8tting + +%} + +\notenames { + ceses = \melodic_request { -1 0 -2 } + cessess = \melodic_request { -1 0 -2 } + ces = \melodic_request { -1 0 -1 } + cess = \melodic_request { -1 0 -1 } + c = \melodic_request { -1 0 0 } + cis = \melodic_request { -1 0 1 } + ciss = \melodic_request { -1 0 1 } + cisis = \melodic_request { -1 0 2 } + cississ = \melodic_request { -1 0 2 } + deses = \melodic_request { -1 1 -2 } + dessess = \melodic_request { -1 1 -2 } + des = \melodic_request { -1 1 -1 } + dess = \melodic_request { -1 1 -1 } + d = \melodic_request { -1 1 0 } + dis = \melodic_request { -1 1 1 } + diss = \melodic_request { -1 1 1 } + disis = \melodic_request { -1 1 2 } + dississ = \melodic_request { -1 1 2 } + eeses = \melodic_request { -1 2 -2 } + eessess = \melodic_request { -1 2 -2 } + eses = \melodic_request { -1 2 -2 } + essess = \melodic_request { -1 2 -2 } + ees = \melodic_request { -1 2 -1 } + eess = \melodic_request { -1 2 -1 } + es = \melodic_request { -1 2 -1 } + ess = \melodic_request { -1 2 -1 } + e = \melodic_request { -1 2 0 } + eis = \melodic_request { -1 2 1 } + eiss = \melodic_request { -1 2 1 } + eisis = \melodic_request { -1 2 2 } + eississ = \melodic_request { -1 2 2 } + feses = \melodic_request { -1 3 -2 } + fessess = \melodic_request { -1 3 -2 } + fes = \melodic_request { -1 3 -1 } + fess = \melodic_request { -1 3 -1 } + f = \melodic_request { -1 3 0 } + fis = \melodic_request { -1 3 1 } + fiss = \melodic_request { -1 3 1 } + fisis = \melodic_request { -1 3 2 } + fississ = \melodic_request { -1 3 2 } + geses = \melodic_request { -1 4 -2 } + gessess = \melodic_request { -1 4 -2 } + ges = \melodic_request { -1 4 -1 } + gess = \melodic_request { -1 4 -1 } + g = \melodic_request { -1 4 0 } + g = \melodic_request { -1 4 0 } + gis = \melodic_request { -1 4 1 } + giss = \melodic_request { -1 4 1 } + gisis = \melodic_request { -1 4 2 } + gississ = \melodic_request { -1 4 2 } + aeses = \melodic_request { -1 5 -2 } + aessess = \melodic_request { -1 5 -2 } + ases = \melodic_request { -1 5 -2 } + assess = \melodic_request { -1 5 -2 } + aes = \melodic_request { -1 5 -1 } + aess = \melodic_request { -1 5 -1 } + as = \melodic_request { -1 5 -1 } + ass = \melodic_request { -1 5 -1 } + a = \melodic_request { -1 5 0 } + ais = \melodic_request { -1 5 1 } + aiss = \melodic_request { -1 5 1 } + aisis = \melodic_request { -1 5 2 } + aississ = \melodic_request { -1 5 2 } + bes = \melodic_request { -1 6 -2 } + bess = \melodic_request { -1 6 -2 } + b = \melodic_request { -1 6 -1 } + b = \melodic_request { -1 6 -1 } + h = \melodic_request { -1 6 0 } + his = \melodic_request { -1 6 1 } + hiss = \melodic_request { -1 6 1 } + hisis = \melodic_request { -1 6 2 } + hississ = \melodic_request { -1 6 2 } + + + % + % upper case: 1 octave lower, as usual. + % + + + Ceses = \melodic_request { -2 0 -2 } + Cessess = \melodic_request { -2 0 -2 } + Ces = \melodic_request { -2 0 -1 } + Cess = \melodic_request { -2 0 -1 } + C = \melodic_request { -2 0 0 } + Cis = \melodic_request { -2 0 1 } + Ciss = \melodic_request { -2 0 1 } + Cisis = \melodic_request { -2 0 2 } + Cississ = \melodic_request { -2 0 2 } + Deses = \melodic_request { -2 1 -2 } + Dessess = \melodic_request { -2 1 -2 } + Des = \melodic_request { -2 1 -1 } + Dess = \melodic_request { -2 1 -1 } + D = \melodic_request { -2 1 0 } + D = \melodic_request { -2 1 0 } + Dis = \melodic_request { -2 1 1 } + Diss = \melodic_request { -2 1 1 } + Disis = \melodic_request { -2 1 2 } + Dississ = \melodic_request { -2 1 2 } + Eses = \melodic_request { -2 2 -2 } + Essess = \melodic_request { -2 2 -2 } + Es = \melodic_request { -2 2 -1 } + Ess = \melodic_request { -2 2 -1 } + E = \melodic_request { -2 2 0 } + E = \melodic_request { -2 2 0 } + Eis = \melodic_request { -2 2 1 } + Eiss = \melodic_request { -2 2 1 } + Eisis = \melodic_request { -2 2 2 } + Eississ = \melodic_request { -2 2 2 } + Feses = \melodic_request { -2 3 -2 } + Fessess = \melodic_request { -2 3 -2 } + Fes = \melodic_request { -2 3 -1 } + Fess = \melodic_request { -2 3 -1 } + F = \melodic_request { -2 3 0 } + Fis = \melodic_request { -2 3 1 } + Fiss = \melodic_request { -2 3 1 } + Fisis = \melodic_request { -2 3 2 } + Fississ = \melodic_request { -2 3 2 } + Geses = \melodic_request { -2 4 -2 } + Gessess = \melodic_request { -2 4 -2 } + Ges = \melodic_request { -2 4 -1 } + Gess = \melodic_request { -2 4 -1 } + G = \melodic_request { -2 4 0 } + Gis = \melodic_request { -2 4 1 } + Giss = \melodic_request { -2 4 1 } + Gisis = \melodic_request { -2 4 2 } + Gississ = \melodic_request { -2 4 2 } + Aeses = \melodic_request { -2 5 -2 } + Aessess = \melodic_request { -2 5 -2 } + Ases = \melodic_request { -2 5 -2 } + Assess = \melodic_request { -2 5 -2 } + Aes = \melodic_request { -2 5 -1 } + Aess = \melodic_request { -2 5 -1 } + As = \melodic_request { -2 5 -1 } + Ass = \melodic_request { -2 5 -1 } + A = \melodic_request { -2 5 0 } + A = \melodic_request { -2 5 0 } + Ais = \melodic_request { -2 5 1 } + Aiss = \melodic_request { -2 5 1 } + Aisis = \melodic_request { -2 5 2 } + Aississ = \melodic_request { -2 5 2 } + Bes = \melodic_request { -2 6 -2 } + Bess = \melodic_request { -2 6 -2 } + B = \melodic_request { -2 6 -1 } + H = \melodic_request { -2 6 0 } + His = \melodic_request { -2 6 1 } + Hiss = \melodic_request { -2 6 1 } + Hisis = \melodic_request { -2 6 2 } + Hississ = \melodic_request { -2 6 2 } + +} + + + diff --git a/init/svenska.ly b/init/svenska.ly new file mode 100644 index 0000000000..f679da1195 --- /dev/null +++ b/init/svenska.ly @@ -0,0 +1,92 @@ +% +% common Swedish names for notes. "ess" means flat, "iss" means sharp +% +% by Mats Bengtsson. + + +% +% Please note that, while these names are used to enter *notes*, they +% actually are *melodic*s, i.e. they represent a pitch solely. Notes +% have a rhythmic part too. This is the reason that we don't write 'note { .. }' +% +\notenames { + cessess = \melodic_request { -1 0 -2 } + cess = \melodic_request { -1 0 -1 } + c = \melodic_request { -1 0 0 } + ciss = \melodic_request { -1 0 1 } + cississ = \melodic_request { -1 0 2 } + dessess = \melodic_request { -1 1 -2 } + dess = \melodic_request { -1 1 -1 } + d = \melodic_request { -1 1 0 } + diss = \melodic_request { -1 1 1 } + dississ = \melodic_request { -1 1 2 } + essess = \melodic_request { -1 2 -2 } + ess = \melodic_request { -1 2 -1 } + e = \melodic_request { -1 2 0 } + eiss = \melodic_request { -1 2 1 } + eississ = \melodic_request { -1 2 2 } + fessess = \melodic_request { -1 3 -2 } + fess = \melodic_request { -1 3 -1 } + f = \melodic_request { -1 3 0 } + fiss = \melodic_request { -1 3 1 } + fississ = \melodic_request { -1 3 2 } + gessess = \melodic_request { -1 4 -2 } + gess = \melodic_request { -1 4 -1 } + g = \melodic_request { -1 4 0 } + giss = \melodic_request { -1 4 1 } + gississ = \melodic_request { -1 4 2 } + assess = \melodic_request { -1 5 -2 } + ass = \melodic_request { -1 5 -1 } + a = \melodic_request { -1 5 0 } + aiss = \melodic_request { -1 5 1 } + aississ = \melodic_request { -1 5 2 } + hessess = \melodic_request { -1 6 -2 } + b = \melodic_request { -1 6 -1 } + h = \melodic_request { -1 6 0 } + hiss = \melodic_request { -1 6 1 } + hississ = \melodic_request { -1 6 2 } + + + % + % upper case: 1 octave lower. + % + + + Cessess = \melodic_request { -2 0 -2 } + Cess = \melodic_request { -2 0 -1 } + C = \melodic_request { -2 0 0 } + Ciss = \melodic_request { -2 0 1 } + Cississ = \melodic_request { -2 0 2 } + Dessess = \melodic_request { -2 1 -2 } + Dess = \melodic_request { -2 1 -1 } + D = \melodic_request { -2 1 0 } + Diss = \melodic_request { -2 1 1 } + Dississ = \melodic_request { -2 1 2 } + Essess = \melodic_request { -2 2 -2 } + Ess = \melodic_request { -2 2 -1 } + E = \melodic_request { -2 2 0 } + Eiss = \melodic_request { -2 2 1 } + Eississ = \melodic_request { -2 2 2 } + Fessess = \melodic_request { -2 3 -2 } + Fess = \melodic_request { -2 3 -1 } + F = \melodic_request { -2 3 0 } + Fiss = \melodic_request { -2 3 1 } + Fississ = \melodic_request { -2 3 2 } + Gessess = \melodic_request { -2 4 -2 } + Gess = \melodic_request { -2 4 -1 } + G = \melodic_request { -2 4 0 } + Giss = \melodic_request { -2 4 1 } + Gississ = \melodic_request { -2 4 2 } + Assess = \melodic_request { -2 5 -2 } + Ass = \melodic_request { -2 5 -1 } + A = \melodic_request { -2 5 0 } + Aiss = \melodic_request { -2 5 1 } + Aississ = \melodic_request { -2 5 2 } + Hessess = \melodic_request { -2 6 -2 } + B = \melodic_request { -2 6 -1 } + H = \melodic_request { -2 6 0 } + Hiss = \melodic_request { -2 6 1 } + Hississ = \melodic_request { -2 6 2 } + + +} diff --git a/init/swedish.ly b/init/swedish.ly deleted file mode 100644 index f679da1195..0000000000 --- a/init/swedish.ly +++ /dev/null @@ -1,92 +0,0 @@ -% -% common Swedish names for notes. "ess" means flat, "iss" means sharp -% -% by Mats Bengtsson. - - -% -% Please note that, while these names are used to enter *notes*, they -% actually are *melodic*s, i.e. they represent a pitch solely. Notes -% have a rhythmic part too. This is the reason that we don't write 'note { .. }' -% -\notenames { - cessess = \melodic_request { -1 0 -2 } - cess = \melodic_request { -1 0 -1 } - c = \melodic_request { -1 0 0 } - ciss = \melodic_request { -1 0 1 } - cississ = \melodic_request { -1 0 2 } - dessess = \melodic_request { -1 1 -2 } - dess = \melodic_request { -1 1 -1 } - d = \melodic_request { -1 1 0 } - diss = \melodic_request { -1 1 1 } - dississ = \melodic_request { -1 1 2 } - essess = \melodic_request { -1 2 -2 } - ess = \melodic_request { -1 2 -1 } - e = \melodic_request { -1 2 0 } - eiss = \melodic_request { -1 2 1 } - eississ = \melodic_request { -1 2 2 } - fessess = \melodic_request { -1 3 -2 } - fess = \melodic_request { -1 3 -1 } - f = \melodic_request { -1 3 0 } - fiss = \melodic_request { -1 3 1 } - fississ = \melodic_request { -1 3 2 } - gessess = \melodic_request { -1 4 -2 } - gess = \melodic_request { -1 4 -1 } - g = \melodic_request { -1 4 0 } - giss = \melodic_request { -1 4 1 } - gississ = \melodic_request { -1 4 2 } - assess = \melodic_request { -1 5 -2 } - ass = \melodic_request { -1 5 -1 } - a = \melodic_request { -1 5 0 } - aiss = \melodic_request { -1 5 1 } - aississ = \melodic_request { -1 5 2 } - hessess = \melodic_request { -1 6 -2 } - b = \melodic_request { -1 6 -1 } - h = \melodic_request { -1 6 0 } - hiss = \melodic_request { -1 6 1 } - hississ = \melodic_request { -1 6 2 } - - - % - % upper case: 1 octave lower. - % - - - Cessess = \melodic_request { -2 0 -2 } - Cess = \melodic_request { -2 0 -1 } - C = \melodic_request { -2 0 0 } - Ciss = \melodic_request { -2 0 1 } - Cississ = \melodic_request { -2 0 2 } - Dessess = \melodic_request { -2 1 -2 } - Dess = \melodic_request { -2 1 -1 } - D = \melodic_request { -2 1 0 } - Diss = \melodic_request { -2 1 1 } - Dississ = \melodic_request { -2 1 2 } - Essess = \melodic_request { -2 2 -2 } - Ess = \melodic_request { -2 2 -1 } - E = \melodic_request { -2 2 0 } - Eiss = \melodic_request { -2 2 1 } - Eississ = \melodic_request { -2 2 2 } - Fessess = \melodic_request { -2 3 -2 } - Fess = \melodic_request { -2 3 -1 } - F = \melodic_request { -2 3 0 } - Fiss = \melodic_request { -2 3 1 } - Fississ = \melodic_request { -2 3 2 } - Gessess = \melodic_request { -2 4 -2 } - Gess = \melodic_request { -2 4 -1 } - G = \melodic_request { -2 4 0 } - Giss = \melodic_request { -2 4 1 } - Gississ = \melodic_request { -2 4 2 } - Assess = \melodic_request { -2 5 -2 } - Ass = \melodic_request { -2 5 -1 } - A = \melodic_request { -2 5 0 } - Aiss = \melodic_request { -2 5 1 } - Aississ = \melodic_request { -2 5 2 } - Hessess = \melodic_request { -2 6 -2 } - B = \melodic_request { -2 6 -1 } - H = \melodic_request { -2 6 0 } - Hiss = \melodic_request { -2 6 1 } - Hississ = \melodic_request { -2 6 2 } - - -} diff --git a/input/Makefile.am b/input/Makefile.am index 9e4b430c1f..169a97dc68 100644 --- a/input/Makefile.am +++ b/input/Makefile.am @@ -1,6 +1,9 @@ -# Generated automatically by wild-perl 0.1# input/Makefile.am.wild +# Automatically generated from ./input/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# input/Makefile.am.wild -LYFILES = beam-bug.ly beams.ly cadenza.ly collisions.ly coriolan-alto.ly denneboom.ly font-body.ly font.ly font11.ly font13.ly font16.ly font20.ly font26.ly gourlay.ly keys.ly kortjakje.ly multi.ly pedal.ly praeludium-fuga-E.ly rhythm.ly scales.ly scripts.ly sleur.ly slurs.ly spacing.ly stem.ly twinkle-pop.ly twinkle.ly +LYFILES = beam-bug.ly beams.ly cadenza.ly collisions.ly coriolan-alto.ly denneboom.ly font-body.ly font.ly font11.ly font13.ly font16.ly font20.ly font26.ly gourlay.ly keys.ly kortjakje.ly multi.ly pedal.ly praeludium-fuga-E.ly rhythm.ly scales.ly scripts.ly sleur.ly slurs.ly spacing.ly stem.ly tril.ly twinkle-pop.ly twinkle.ly TEXFILES = dummy.tex M4FILES = dummy.m4 EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES) diff --git a/input/Makefile.in b/input/Makefile.in index 588a8d7dc4..e5e3228abd 100644 --- a/input/Makefile.in +++ b/input/Makefile.in @@ -10,7 +10,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Generated automatically by wild-perl 0.1# input/Makefile.am.wild +# Automatically generated from ./input/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# input/Makefile.am.wild SHELL = /bin/sh @@ -59,7 +62,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AUTOHEADER = @AUTOHEADER@ +AUTOGENERATE = @AUTOGENERATE@ BISON = @BISON@ CC = @CC@ COMPILEINFO = @COMPILEINFO@ @@ -94,8 +97,9 @@ TEXPREFIX = @TEXPREFIX@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ -LYFILES = beam-bug.ly beams.ly cadenza.ly collisions.ly coriolan-alto.ly denneboom.ly font-body.ly font.ly font11.ly font13.ly font16.ly font20.ly font26.ly gourlay.ly keys.ly kortjakje.ly multi.ly pedal.ly praeludium-fuga-E.ly rhythm.ly scales.ly scripts.ly sleur.ly slurs.ly spacing.ly stem.ly twinkle-pop.ly twinkle.ly +LYFILES = beam-bug.ly beams.ly cadenza.ly collisions.ly coriolan-alto.ly denneboom.ly font-body.ly font.ly font11.ly font13.ly font16.ly font20.ly font26.ly gourlay.ly keys.ly kortjakje.ly multi.ly pedal.ly praeludium-fuga-E.ly rhythm.ly scales.ly scripts.ly sleur.ly slurs.ly spacing.ly stem.ly tril.ly twinkle-pop.ly twinkle.ly TEXFILES = dummy.tex M4FILES = dummy.m4 EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES) diff --git a/input/tril.ly b/input/tril.ly new file mode 100644 index 0000000000..6f2639d8b3 --- /dev/null +++ b/input/tril.ly @@ -0,0 +1,17 @@ +\header{ +enteredby = "jcn"; +copyright = "PD"; +TestedFeatures = "This file tests trills" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; +} + +\version "0.1.9"; + +\score{ + \melodic{ + c-\prall c-\mordent c-\prallprall c-\prallmordent + c-\upprall c-\downprall + } + \paper{ } +} + diff --git a/lib/Makefile.am b/lib/Makefile.am index dd6493aaa3..527470b7dd 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,3 +1,5 @@ +# Automatically generated from ./lib/Makefile.am.wild by autowild +# Do not edit # Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter # title makefile for micro-lily-lib @@ -17,7 +19,7 @@ liblily_la_SOURCES = binary-source-file.cc duration-convert.cc duration.cc inclu INCLUDES = -Iinclude -I../flower/include MODULE_CXXFLAGS += -D_REENTRANT -EXTRA_DIST = Makefile.am.wild config.hh.in +EXTRA_DIST = Makefile.am.wild $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/lib/Makefile.am.wild b/lib/Makefile.am.wild index 90e461ccb1..1bd40b765f 100644 --- a/lib/Makefile.am.wild +++ b/lib/Makefile.am.wild @@ -16,5 +16,5 @@ liblily_la_SOURCES = $(wildcard *.cc) INCLUDES = -Iinclude -I../flower/include MODULE_CXXFLAGS += -D_REENTRANT -EXTRA_DIST = Makefile.am.wild config.hh.in +EXTRA_DIST = Makefile.am.wild diff --git a/lib/Makefile.in b/lib/Makefile.in index 9c1e1f6ced..76b5a65adf 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -10,6 +10,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +# Automatically generated from ./lib/Makefile.am.wild by autowild +# Do not edit # Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter # title makefile for micro-lily-lib @@ -67,7 +69,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AUTOHEADER = @AUTOHEADER@ +AUTOGENERATE = @AUTOGENERATE@ BISON = @BISON@ CC = @CC@ COMPILEINFO = @COMPILEINFO@ @@ -102,6 +104,7 @@ TEXPREFIX = @TEXPREFIX@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ SUBDIRS = include @@ -111,7 +114,7 @@ liblily_la_SOURCES = binary-source-file.cc duration-convert.cc duration.cc inclu INCLUDES = -Iinclude -I../flower/include -EXTRA_DIST = Makefile.am.wild config.hh.in +EXTRA_DIST = Makefile.am.wild mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.hh CONFIG_CLEAN_FILES = @@ -130,7 +133,7 @@ template.lo warn.lo windhoos-suck-suck-suck-thank-you-cygnus.lo CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = Makefile.am Makefile.in config.hh.in stamp-h.in +DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -151,27 +154,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -config.hh: stamp-h - @: -stamp-h: $(srcdir)/config.hh.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=lib/config.hh:lib/config.hh.in \ - $(SHELL) ./config.status - @echo timestamp > stamp-h -$(srcdir)/config.hh.in: $(srcdir)/stamp-h.in -$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/stamp-h.in - -mostlyclean-hdr: - -clean-hdr: - -distclean-hdr: - -rm -f config.hh - -maintainer-clean-hdr: - mostlyclean-libLTLIBRARIES: clean-libLTLIBRARIES: @@ -285,7 +267,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) here=`pwd` && cd $(srcdir) \ && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -295,8 +277,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) $(L unique=`for i in $$list; do echo $$i; done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)config.hh.in$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hh.in $$unique $(LISP) -o $$here/TAGS) + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: @@ -505,19 +487,18 @@ distclean-generic: maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean-am: mostlyclean-hdr mostlyclean-libLTLIBRARIES \ - mostlyclean-compile mostlyclean-libtool \ - mostlyclean-tags mostlyclean-generic +mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ + mostlyclean-libtool mostlyclean-tags \ + mostlyclean-generic -clean-am: clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \ - clean-tags clean-generic mostlyclean-am +clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ + clean-generic mostlyclean-am -distclean-am: distclean-hdr distclean-libLTLIBRARIES distclean-compile \ +distclean-am: distclean-libLTLIBRARIES distclean-compile \ distclean-libtool distclean-tags distclean-generic \ clean-am -maintainer-clean-am: maintainer-clean-hdr \ - maintainer-clean-libLTLIBRARIES \ +maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ distclean-am @@ -534,14 +515,13 @@ maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \ -maintainer-clean-hdr mostlyclean-libLTLIBRARIES \ -distclean-libLTLIBRARIES clean-libLTLIBRARIES \ -maintainer-clean-libLTLIBRARIES uninstall-libLTLIBRARIES \ -install-libLTLIBRARIES mostlyclean-compile distclean-compile \ -clean-compile maintainer-clean-compile mostlyclean-libtool \ -distclean-libtool clean-libtool maintainer-clean-libtool \ -install-data-recursive uninstall-data-recursive install-exec-recursive \ +.PHONY: default mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ +clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ +uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ +distclean-compile clean-compile maintainer-clean-compile \ +mostlyclean-libtool distclean-libtool clean-libtool \ +maintainer-clean-libtool install-data-recursive \ +uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ all-recursive check-recursive installcheck-recursive info-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ diff --git a/lib/config.hh.in b/lib/config.hh.in deleted file mode 100644 index b10c27a7c1..0000000000 --- a/lib/config.hh.in +++ /dev/null @@ -1,11 +0,0 @@ -/* @configure_input@ */ -#ifndef CONFIG_HH -#define CONFIG_HH - -/* default lilypond init and input dir */ -#define DIR_DATADIR "@datadir@/lilypond" - -/* the toplevel version string */ -#define TOPLEVEL_VERSION "0" - -#endif diff --git a/lib/include/Makefile.am b/lib/include/Makefile.am index f13c29905a..caad0633b5 100644 --- a/lib/include/Makefile.am +++ b/lib/include/Makefile.am @@ -1,4 +1,7 @@ -# Generated automatically by wild-perl 0.1# lib/include/Makefile +# Automatically generated from ./lib/include/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# lib/include/Makefile noinst_HEADERS = binary-source-file.hh duration-convert.hh duration.hh file-storage.hh includable-lexer.hh input.hh mapped-file-storage.hh moment.hh plet.hh proto.hh simple-file-storage.hh source-file.hh source.hh warn.hh windhoos-suck-suck-suck-thank-you-cygnus.hh diff --git a/lib/include/Makefile.in b/lib/include/Makefile.in index f6294abc31..d265d91c2d 100644 --- a/lib/include/Makefile.in +++ b/lib/include/Makefile.in @@ -10,7 +10,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Generated automatically by wild-perl 0.1# lib/include/Makefile +# Automatically generated from ./lib/include/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# lib/include/Makefile SHELL = /bin/sh @@ -59,7 +62,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AUTOHEADER = @AUTOHEADER@ +AUTOGENERATE = @AUTOGENERATE@ BISON = @BISON@ CC = @CC@ COMPILEINFO = @COMPILEINFO@ @@ -94,6 +97,7 @@ TEXPREFIX = @TEXPREFIX@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ noinst_HEADERS = binary-source-file.hh duration-convert.hh duration.hh file-storage.hh includable-lexer.hh input.hh mapped-file-storage.hh moment.hh plet.hh proto.hh simple-file-storage.hh source-file.hh source.hh warn.hh windhoos-suck-suck-suck-thank-you-cygnus.hh diff --git a/lib/stamp-h.in b/lib/stamp-h.in deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/lib/template.cc b/lib/template.cc index 36cb118232..781a53d279 100644 --- 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 bla; + bla.top().add ((void*)0); + } + +#endif + +POINTERLIST_INSTANTIATE (Source_file); diff --git a/lily/GNUmakefile b/lily/GNUmakefile new file mode 100644 index 0000000000..0fe59e0fe1 --- /dev/null +++ b/lily/GNUmakefile @@ -0,0 +1,31 @@ +# lilypond/GNUmakefile +# +# This file helps maintainers to keep their Makefile.am automatically +# up to date using GNU make features. +# If you don't have (or run) GNU make, Makefile.am will not be updated +# automatically when source files are added/removed. + +# automake/wild-make should generate this file from Makefile.am.wild + +include Makefile + +# Makefile.am.wild: lilypond_SOURCES = $(wildcard *.cc) +CURRENT_lilypond_SOURCES = $(wildcard *.cc) + +# ugh: there is a dummy file 'wild-check' to satisfy the wild-check target +# for non-GNU makes in Makefile(.test) +# but we'll ignore that +# .PHONY: wild-check + +# ugh: stupid lexer.cc/parser.cc cluttering sourcedir! +# but it works fine in other dirs (see ../mi2mu) +# wild-check: check-lilypond-sources + +check-lilypond-sources: +ifneq ($(lilypond_SOURCES),$(CURRENT_mi2mu_SOURCES)) + @echo \"$(lilypond_SOURCES)\" + @echo \"$(CURRENT_lilypond_SOURCES)\" + @echo lilypond_SOURCES changed: NOT yet rerunning make-wild. Please type: + @echo "$(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am" +endif + diff --git a/lily/Makefile.am b/lily/Makefile.am index b069632500..b245e5a9c6 100644 --- a/lily/Makefile.am +++ b/lily/Makefile.am @@ -1,3 +1,5 @@ +# Automatically generated from ./lily/Makefile.am.wild by autowild +# Do not edit # Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter # title makefile for lilypond # file lily/Makefile.am.wild @@ -17,13 +19,17 @@ bin_PROGRAMS = lilypond lilypond_SOURCES = abbrev.cc abbreviation-beam-engraver.cc abbreviation-beam.cc atom.cc audio-column.cc audio-element.cc audio-item.cc audio-staff.cc axis-group-administration.cc axis-group-element.cc axis-group-item.cc axis-group-spanner.cc axis.cc bar-column-grav.cc bar-column.cc bar-grav.cc bar-number-grav.cc bar.cc beam-grav.cc beam-swallow-trans.cc beam.cc bow.cc boxes.cc break-align-item.cc break.cc change-iterator.cc change-translator.cc chord-iterator.cc clef-grav.cc clef-item.cc col-info.cc colhpos.cc collision-grav.cc collision.cc command-request.cc crescendo.cc debug.cc dimen.cc directional-spanner.cc dot-column-grav.cc dot-column.cc dots.cc dynamic-grav.cc elem-group.cc engraver-group.cc engraver.cc general-script-def.cc global-translator.cc gourlay-breaking.cc graphical-element.cc grouping.cc head-grav.cc header.cc horizontal-align-item.cc horizontal-group-item.cc horizontal-vertical-group-item.cc idealspacing.cc identifier.cc ineq-constrained-qp.cc item.cc key-grav.cc key-item.cc key-performer.cc key.cc keyword.cc leastsquares.cc lexerinit.cc lily-version.cc line-group-grav.cc line-spacer.cc linear-programming.cc local-key-grav.cc local-key-item.cc lookup.cc lyric-grav.cc lyric-performer.cc main.cc meter-grav.cc meter-performer.cc meter.cc midi-def.cc midi-item.cc midi-stream.cc midi-walker.cc misc.cc molecule.cc music-iterator.cc music-list.cc music-output-def.cc music.cc musical-request.cc my-lily-lexer.cc my-lily-parser.cc note-column.cc note-head.cc note-performer.cc note.cc notename-table.cc offset.cc outputter.cc p-col.cc p-score.cc paper-def.cc performance.cc performer-group-performer.cc performer.cc pitch-squash-grav.cc plet-engraver.cc plet-spanner.cc plet-swallow-engraver.cc priority-halign-grav.cc property-iterator.cc ps-plet.cc qlp.cc qlpsolve.cc request-iterator.cc request.cc rest-collision-grav.cc rest-collision.cc rest-grav.cc rest.cc rhythmic-column-grav.cc rhythmic-head.cc score-bar.cc score-column.cc score-elem-info.cc score-elem.cc score-grav.cc score-performer.cc score-priority-grav.cc score.cc scoreline.cc scores.cc script-column.cc script-def.cc script-grav.cc script.cc slur-grav.cc slur.cc span-bar-grav.cc span-bar.cc span-score-bar-grav.cc span-score-bar.cc spanner.cc spring-spacer.cc staff-info.cc staff-performer.cc staff-side.cc staff-sym-grav.cc staff-sym.cc stem-grav.cc stem-info.cc stem.cc super-elem.cc swallow-grav.cc swallow-perf.cc symtable.cc template1.cc template2.cc template3.cc template4.cc template5.cc template6.cc template7.cc template8.cc tex-beam.cc tex-slur.cc tex-stream.cc tex.cc text-def.cc text-item.cc text-spanner.cc tie-grav.cc tie.cc time-description.cc timing-grav.cc timing-translator.cc translation-property.cc translator-ctors.cc translator-group.cc translator.cc type-swallow-trans.cc version.cc vertical-align-elem.cc vertical-align-grav.cc vertical-align-spanner.cc vertical-group-spanner.cc voice-iterator.cc warn.cc word-wrap.cc lexer.ll parser.yy noinst_HEADERS = parser.hh -lilypond_LDADD = -llily -lflower @LEXLIB@ +#lilypond_LDADD = -llily -lflower @LEXLIB@ +lilypond_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@ -lilypond_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs +lilypond_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs + + + INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include -EXTRA_DIST = Makefile.am.wild Stable.make VERSION +EXTRA_DIST = Makefile.am.wild GNUmakefile Stable.make VERSION # force these: Make can't know these have to be generated in advance my-lily-lexer.cc: parser.hh @@ -38,17 +44,12 @@ parser.hh: parser.yy $(BISON) -d $< mv $<.tab.h $@ mv $<.tab.c $(shell basename $@ .hh).cc -# .ll.cc: -# ugh, stupid automake -# now set output root by hand... -# touch lex.yy.cc - -# .yy.cc: -# $(BISON) $< -# mv $(shell basename $@ .cc ).tab.c $@ -# $(FLEX) -Cfe -p -p -t $< > $@ -# # could be faster: -# # $(FLEX) -8 -Cf -t $< > $@ + +# override default target for all-am: to get an extra dependency +all-am: Makefile $(PROGRAMS) wild-check + +# dummy target for non-GNU makes; is overridden in GNUmakefile +wild-check: $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/lily/Makefile.am.wild b/lily/Makefile.am.wild index 10a242b8df..b7584ca7bf 100644 --- a/lily/Makefile.am.wild +++ b/lily/Makefile.am.wild @@ -15,13 +15,17 @@ nowildcard: lexer.cc parser.cc lilypond_SOURCES = $(wildcard *.cc *.ll *.yy) noinst_HEADERS = parser.hh -lilypond_LDADD = -llily -lflower @LEXLIB@ +#lilypond_LDADD = -llily -lflower @LEXLIB@ +lilypond_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@ -lilypond_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs +lilypond_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs + + + INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include -EXTRA_DIST = Makefile.am.wild Stable.make VERSION +EXTRA_DIST = Makefile.am.wild GNUmakefile Stable.make VERSION # force these: Make can't know these have to be generated in advance my-lily-lexer.cc: parser.hh @@ -36,15 +40,10 @@ parser.hh: parser.yy $(BISON) -d $< mv $<.tab.h $@ mv $<.tab.c $(shell basename $@ .hh).cc -# .ll.cc: -# ugh, stupid automake -# now set output root by hand... -# touch lex.yy.cc - -# .yy.cc: -# $(BISON) $< -# mv $(shell basename $@ .cc ).tab.c $@ -# $(FLEX) -Cfe -p -p -t $< > $@ -# # could be faster: -# # $(FLEX) -8 -Cf -t $< > $@ + +# override default target for all-am: to get an extra dependency +all-am: Makefile $(PROGRAMS) wild-check + +# dummy target for non-GNU makes; is overridden in GNUmakefile +wild-check: diff --git a/lily/Makefile.in b/lily/Makefile.in index adc2cd8229..7440c2f3e8 100644 --- a/lily/Makefile.in +++ b/lily/Makefile.in @@ -10,6 +10,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +# Automatically generated from ./lily/Makefile.am.wild by autowild +# Do not edit # Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter # title makefile for lilypond # file lily/Makefile.am.wild @@ -66,7 +68,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AUTOHEADER = @AUTOHEADER@ +AUTOGENERATE = @AUTOGENERATE@ BISON = @BISON@ CC = @CC@ COMPILEINFO = @COMPILEINFO@ @@ -101,6 +103,7 @@ TEXPREFIX = @TEXPREFIX@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ SUBDIRS = include @@ -112,13 +115,14 @@ bin_PROGRAMS = lilypond lilypond_SOURCES = abbrev.cc abbreviation-beam-engraver.cc abbreviation-beam.cc atom.cc audio-column.cc audio-element.cc audio-item.cc audio-staff.cc axis-group-administration.cc axis-group-element.cc axis-group-item.cc axis-group-spanner.cc axis.cc bar-column-grav.cc bar-column.cc bar-grav.cc bar-number-grav.cc bar.cc beam-grav.cc beam-swallow-trans.cc beam.cc bow.cc boxes.cc break-align-item.cc break.cc change-iterator.cc change-translator.cc chord-iterator.cc clef-grav.cc clef-item.cc col-info.cc colhpos.cc collision-grav.cc collision.cc command-request.cc crescendo.cc debug.cc dimen.cc directional-spanner.cc dot-column-grav.cc dot-column.cc dots.cc dynamic-grav.cc elem-group.cc engraver-group.cc engraver.cc general-script-def.cc global-translator.cc gourlay-breaking.cc graphical-element.cc grouping.cc head-grav.cc header.cc horizontal-align-item.cc horizontal-group-item.cc horizontal-vertical-group-item.cc idealspacing.cc identifier.cc ineq-constrained-qp.cc item.cc key-grav.cc key-item.cc key-performer.cc key.cc keyword.cc leastsquares.cc lexerinit.cc lily-version.cc line-group-grav.cc line-spacer.cc linear-programming.cc local-key-grav.cc local-key-item.cc lookup.cc lyric-grav.cc lyric-performer.cc main.cc meter-grav.cc meter-performer.cc meter.cc midi-def.cc midi-item.cc midi-stream.cc midi-walker.cc misc.cc molecule.cc music-iterator.cc music-list.cc music-output-def.cc music.cc musical-request.cc my-lily-lexer.cc my-lily-parser.cc note-column.cc note-head.cc note-performer.cc note.cc notename-table.cc offset.cc outputter.cc p-col.cc p-score.cc paper-def.cc performance.cc performer-group-performer.cc performer.cc pitch-squash-grav.cc plet-engraver.cc plet-spanner.cc plet-swallow-engraver.cc priority-halign-grav.cc property-iterator.cc ps-plet.cc qlp.cc qlpsolve.cc request-iterator.cc request.cc rest-collision-grav.cc rest-collision.cc rest-grav.cc rest.cc rhythmic-column-grav.cc rhythmic-head.cc score-bar.cc score-column.cc score-elem-info.cc score-elem.cc score-grav.cc score-performer.cc score-priority-grav.cc score.cc scoreline.cc scores.cc script-column.cc script-def.cc script-grav.cc script.cc slur-grav.cc slur.cc span-bar-grav.cc span-bar.cc span-score-bar-grav.cc span-score-bar.cc spanner.cc spring-spacer.cc staff-info.cc staff-performer.cc staff-side.cc staff-sym-grav.cc staff-sym.cc stem-grav.cc stem-info.cc stem.cc super-elem.cc swallow-grav.cc swallow-perf.cc symtable.cc template1.cc template2.cc template3.cc template4.cc template5.cc template6.cc template7.cc template8.cc tex-beam.cc tex-slur.cc tex-stream.cc tex.cc text-def.cc text-item.cc text-spanner.cc tie-grav.cc tie.cc time-description.cc timing-grav.cc timing-translator.cc translation-property.cc translator-ctors.cc translator-group.cc translator.cc type-swallow-trans.cc version.cc vertical-align-elem.cc vertical-align-grav.cc vertical-align-spanner.cc vertical-group-spanner.cc voice-iterator.cc warn.cc word-wrap.cc lexer.ll parser.yy noinst_HEADERS = parser.hh -lilypond_LDADD = -llily -lflower @LEXLIB@ +#lilypond_LDADD = -llily -lflower @LEXLIB@ +lilypond_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@ -lilypond_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs +lilypond_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include -EXTRA_DIST = Makefile.am.wild Stable.make VERSION +EXTRA_DIST = Makefile.am.wild GNUmakefile Stable.make VERSION mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../lib/config.hh CONFIG_CLEAN_FILES = @@ -172,7 +176,8 @@ translator-ctors.o translator-group.o translator.o type-swallow-trans.o \ version.o vertical-align-elem.o vertical-align-grav.o \ vertical-align-spanner.o vertical-group-spanner.o voice-iterator.o \ warn.o word-wrap.o lexer.o parser.o -lilypond_DEPENDENCIES = +lilypond_DEPENDENCIES = $(top_builddir)/lib/liblily.la \ +$(top_builddir)/flower/libflower.la LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LEXLIB = @LEXLIB@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) @@ -2388,14 +2393,15 @@ p-score.o: p-score.cc include/main.hh include/lily-proto.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc ../flower/include/dictionary.hh \ ../flower/include/assoc.hh include/scoreline.hh \ - include/colhpos.hh include/p-score.hh include/music-output.hh \ - include/tex-stream.hh include/p-col.hh \ + include/colhpos.hh include/p-col.hh \ include/horizontal-group-item.hh include/elem-group.hh \ include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ - include/item.hh include/header.hh include/word-wrap.hh \ + include/item.hh include/p-score.hh include/music-output.hh \ + include/tex-stream.hh include/header.hh include/word-wrap.hh \ include/break.hh include/gourlay-breaking.hh \ - include/outputter.hh + include/outputter.hh ../flower/include/plist.tcc \ + ../flower/include/pcursor.tcc paper-def.o: paper-def.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -3803,13 +3809,13 @@ template2.o: template2.cc include/line-spacer.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/varray.hh \ ../flower/include/vector.hh ../flower/include/interval.hh \ - ../flower/include/compare.hh ../flower/include/plist.tcc \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.tcc \ + ../flower/include/pcursor.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ - ../flower/include/pcursor.tcc + ../flower/include/plist.tcc template3.o: template3.cc include/atom.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -3823,9 +3829,33 @@ template3.o: template3.cc include/atom.hh ../flower/include/string.hh \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ - include/direction.hh ../flower/include/plist.tcc \ - ../flower/include/pcursor.tcc -template4.o: template4.cc + include/direction.hh ../flower/include/pcursor.tcc \ + ../flower/include/plist.tcc +template4.o: template4.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/pcursor.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/audio-item.hh \ + include/lily-proto.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ + ../flower/include/international.hh include/audio-element.hh \ + ../flower/include/virtual-methods.hh include/audio-staff.hh \ + include/p-col.hh include/horizontal-group-item.hh \ + include/elem-group.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/directed-graph.hh \ + include/graphical-element.hh include/offset.hh include/axes.hh \ + ../flower/include/interval.hh include/axis-group-element.hh \ + include/axis-group-administration.hh include/axis-group-item.hh \ + include/item.hh include/boxes.hh include/drul-array.hh \ + include/direction.hh include/p-score.hh include/colhpos.hh \ + include/music-output.hh ../flower/include/cursor.tcc \ + ../flower/include/list.tcc ../flower/include/pcursor.tcc \ + ../flower/include/plist.tcc template5.o: template5.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string.hh \ @@ -3858,8 +3888,8 @@ template7.o: template7.cc ../lib/include/proto.hh \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/compare.hh ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc ../flower/include/plist.tcc \ - ../flower/include/pcursor.tcc include/music-list.hh \ + ../flower/include/plist.icc ../flower/include/pcursor.tcc \ + ../flower/include/plist.tcc include/music-list.hh \ include/music.hh ../flower/include/virtual-methods.hh \ ../lib/include/input.hh include/minterval.hh \ ../flower/include/interval.hh ../lib/include/moment.hh \ @@ -3875,13 +3905,13 @@ template8.o: template8.cc ../lib/include/proto.hh \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/compare.hh ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/audio-column.hh \ - include/lily-proto.hh ../lib/include/moment.hh \ - ../flower/include/rational.hh \ - ../flower/include/arithmetic-operator.hh include/audio-item.hh \ - ../flower/include/string.hh ../flower/include/string-handle.hh \ + ../flower/include/plist.icc include/audio-item.hh \ + include/lily-proto.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ ../flower/include/international.hh include/audio-element.hh \ - ../flower/include/virtual-methods.hh include/audio-staff.hh \ + ../flower/include/virtual-methods.hh include/audio-column.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ include/midi-item.hh ../flower/include/pcursor.tcc \ ../flower/include/plist.tcc tex-beam.o: tex-beam.cc include/atom.hh ../flower/include/string.hh \ @@ -4492,17 +4522,12 @@ parser.hh: parser.yy $(BISON) -d $< mv $<.tab.h $@ mv $<.tab.c $(shell basename $@ .hh).cc -# .ll.cc: -# ugh, stupid automake -# now set output root by hand... -# touch lex.yy.cc -# .yy.cc: -# $(BISON) $< -# mv $(shell basename $@ .cc ).tab.c $@ -# $(FLEX) -Cfe -p -p -t $< > $@ -# # could be faster: -# # $(FLEX) -8 -Cf -t $< > $@ +# override default target for all-am: to get an extra dependency +all-am: Makefile $(PROGRAMS) wild-check + +# dummy target for non-GNU makes; is overridden in GNUmakefile +wild-check: $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/lily/include/Makefile.am b/lily/include/Makefile.am index afaa8bf39c..33cc6f410a 100644 --- a/lily/include/Makefile.am +++ b/lily/include/Makefile.am @@ -1,4 +1,7 @@ -# Generated automatically by wild-perl 0.1# lily/include/Makefile.am.wild +# Automatically generated from ./lily/include/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# lily/include/Makefile.am.wild noinst_HEADERS = abbrev.hh abbreviation-beam-engraver.hh abbreviation-beam.hh atom.hh audio-column.hh audio-element.hh audio-item.hh audio-staff.hh axes.hh axis-group-administration.hh axis-group-element.hh axis-group-item.hh axis-group-spanner.hh bar-align-grav.hh bar-column-grav.hh bar-column.hh bar-grav.hh bar-number-grav.hh bar.hh beam-grav.hh beam-swallow-trans.hh beam.hh bow.hh boxes.hh break-align-item.hh break-caching.hh break.hh change-iterator.hh change-translator.hh chord-iterator.hh clef-grav.hh clef-item.hh col-info.hh colhpos.hh collision-grav.hh collision.hh command-request.hh const.hh crescendo.hh debug.hh dimen.hh direction.hh directional-spanner.hh dot-column-grav.hh dot-column.hh dots.hh drul-array.hh dynamic-grav.hh elem-group.hh engraver-group.hh engraver.hh general-script-def.hh glob.hh global-translator.hh gourlay-breaking.hh graphical-element.hh grouping.hh head-column.hh head-grav.hh header.hh horizontal-align-item.hh horizontal-group-item.hh horizontal-vertical-group-item.hh idealspacing.hh identifier.hh ineq-constrained-qp.hh item.hh key-grav.hh key-item.hh key-performer.hh key.hh keyword.hh leastsquares.hh lily-proto.hh line-group-grav.hh line-spacer.hh linear-programming.hh linespace.hh local-key-grav.hh local-key-item.hh lookup.hh lyric-engraver.hh lyric-performer.hh main.hh meter-grav.hh meter-performer.hh meter.hh midi-def.hh midi-item.hh midi-stream.hh midi-walker.hh minterval.hh misc.hh molecule.hh music-iterator.hh music-list.hh music-output-def.hh music-output.hh music.hh musical-request.hh my-lily-lexer.hh my-lily-parser.hh note-column.hh note-head.hh note-performer.hh notename-table.hh notename.hh offset.hh outputter.hh p-col.hh p-score.hh paper-def.hh parseconstruct.hh performance.hh performer-group-performer.hh performer.hh pitch-squash-grav.hh plet-engraver.hh plet-spanner.hh plet-swallow-engraver.hh priority-halign-grav.hh property-iterator.hh qlp.hh qlpsolve.hh request-iterator.hh request.hh rest-collision-grav.hh rest-collision.hh rest-column-grav.hh rest-column.hh rest-grav.hh rest.hh rhythmic-column-grav.hh rhythmic-head.hh score-bar.hh score-column.hh score-elem-info.hh score-elem.hh score-grav.hh score-performer.hh score-priority-grav.hh score.hh scoreline.hh script-column.hh script-def.hh script-grav.hh script.hh slur-grav.hh slur.hh span-bar-grav.hh span-bar.hh span-score-bar-grav.hh span-score-bar.hh spanner.hh spring-spacer.hh staff-info.hh staff-performer.hh staff-side.hh staff-sym-grav.hh staff-sym.hh stem-grav.hh stem-info.hh stem.hh super-elem.hh swallow-grav.hh swallow-perf.hh symtable.hh tex-stream.hh tex.hh text-def.hh text-item.hh text-spanner.hh tie-grav.hh tie.hh time-description.hh timing-grav.hh timing-translator.hh todo-performer.hh translation-property.hh translator-change.hh translator-group.hh translator.hh type-swallow-trans.hh vertical-align-elem.hh vertical-align-grav.hh vertical-align-spanner.hh vertical-group-spanner.hh voice-iterator.hh word-wrap.hh dummy.icc minmax.tcc diff --git a/lily/include/Makefile.in b/lily/include/Makefile.in index 7171e5dd95..7da93c0656 100644 --- a/lily/include/Makefile.in +++ b/lily/include/Makefile.in @@ -10,7 +10,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Generated automatically by wild-perl 0.1# lily/include/Makefile.am.wild +# Automatically generated from ./lily/include/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# lily/include/Makefile.am.wild SHELL = /bin/sh @@ -59,7 +62,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AUTOHEADER = @AUTOHEADER@ +AUTOGENERATE = @AUTOGENERATE@ BISON = @BISON@ CC = @CC@ COMPILEINFO = @COMPILEINFO@ @@ -94,6 +97,7 @@ TEXPREFIX = @TEXPREFIX@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ noinst_HEADERS = abbrev.hh abbreviation-beam-engraver.hh abbreviation-beam.hh atom.hh audio-column.hh audio-element.hh audio-item.hh audio-staff.hh axes.hh axis-group-administration.hh axis-group-element.hh axis-group-item.hh axis-group-spanner.hh bar-align-grav.hh bar-column-grav.hh bar-column.hh bar-grav.hh bar-number-grav.hh bar.hh beam-grav.hh beam-swallow-trans.hh beam.hh bow.hh boxes.hh break-align-item.hh break-caching.hh break.hh change-iterator.hh change-translator.hh chord-iterator.hh clef-grav.hh clef-item.hh col-info.hh colhpos.hh collision-grav.hh collision.hh command-request.hh const.hh crescendo.hh debug.hh dimen.hh direction.hh directional-spanner.hh dot-column-grav.hh dot-column.hh dots.hh drul-array.hh dynamic-grav.hh elem-group.hh engraver-group.hh engraver.hh general-script-def.hh glob.hh global-translator.hh gourlay-breaking.hh graphical-element.hh grouping.hh head-column.hh head-grav.hh header.hh horizontal-align-item.hh horizontal-group-item.hh horizontal-vertical-group-item.hh idealspacing.hh identifier.hh ineq-constrained-qp.hh item.hh key-grav.hh key-item.hh key-performer.hh key.hh keyword.hh leastsquares.hh lily-proto.hh line-group-grav.hh line-spacer.hh linear-programming.hh linespace.hh local-key-grav.hh local-key-item.hh lookup.hh lyric-engraver.hh lyric-performer.hh main.hh meter-grav.hh meter-performer.hh meter.hh midi-def.hh midi-item.hh midi-stream.hh midi-walker.hh minterval.hh misc.hh molecule.hh music-iterator.hh music-list.hh music-output-def.hh music-output.hh music.hh musical-request.hh my-lily-lexer.hh my-lily-parser.hh note-column.hh note-head.hh note-performer.hh notename-table.hh notename.hh offset.hh outputter.hh p-col.hh p-score.hh paper-def.hh parseconstruct.hh performance.hh performer-group-performer.hh performer.hh pitch-squash-grav.hh plet-engraver.hh plet-spanner.hh plet-swallow-engraver.hh priority-halign-grav.hh property-iterator.hh qlp.hh qlpsolve.hh request-iterator.hh request.hh rest-collision-grav.hh rest-collision.hh rest-column-grav.hh rest-column.hh rest-grav.hh rest.hh rhythmic-column-grav.hh rhythmic-head.hh score-bar.hh score-column.hh score-elem-info.hh score-elem.hh score-grav.hh score-performer.hh score-priority-grav.hh score.hh scoreline.hh script-column.hh script-def.hh script-grav.hh script.hh slur-grav.hh slur.hh span-bar-grav.hh span-bar.hh span-score-bar-grav.hh span-score-bar.hh spanner.hh spring-spacer.hh staff-info.hh staff-performer.hh staff-side.hh staff-sym-grav.hh staff-sym.hh stem-grav.hh stem-info.hh stem.hh super-elem.hh swallow-grav.hh swallow-perf.hh symtable.hh tex-stream.hh tex.hh text-def.hh text-item.hh text-spanner.hh tie-grav.hh tie.hh time-description.hh timing-grav.hh timing-translator.hh todo-performer.hh translation-property.hh translator-change.hh translator-group.hh translator.hh type-swallow-trans.hh vertical-align-elem.hh vertical-align-grav.hh vertical-align-spanner.hh vertical-group-spanner.hh voice-iterator.hh word-wrap.hh dummy.icc minmax.tcc diff --git a/lily/include/p-score.hh b/lily/include/p-score.hh index 0bce434619..f8c87557a0 100644 --- 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 d38fb8f2c0..437efdc694 100644 --- 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 d22b1e11a3..857b1367d6 100644 --- 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 e6961b4ac7..c3432de3c3 100644 --- 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 e1e1b4d5f2..676f4b98d7 100644 --- 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 63b5cad9ad..8975172e83 100644 --- a/lily/template4.cc +++ b/lily/template4.cc @@ -6,4 +6,21 @@ (c) 1997 Han-Wen Nienhuys */ -// 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 4cfa4f0b70..29bb496ff4 100644 --- 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::infinity() { diff --git a/lily/template6.cc b/lily/template6.cc index eff2467ad5..4f7a1ed1ab 100644 --- 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 b288b4c289..7b5d8142ed 100644 --- 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 4ce5596d28..18d45e3b5e 100644 --- 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); diff --git a/ltconfig b/ltconfig index 3c1b8d42ff..2347e69439 100644 --- a/ltconfig +++ b/ltconfig @@ -66,7 +66,7 @@ progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'` # Constants: PROGRAM=ltconfig PACKAGE=libtool -VERSION=1.1.1 +VERSION=1.2 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' rm="rm -f" @@ -466,15 +466,7 @@ if test "$with_gcc" = yes; then pic_flag='-m68020 -resident32 -malways-restore-a4' ;; *) - case $host_cpu in - m68*) - # This generates more efficient code. - pic_flag=-fpic - ;; - *) - pic_flag='-fPIC' - ;; - esac + pic_flag='-fPIC' ;; esac else @@ -552,8 +544,8 @@ if test -n "$pic_flag"; then echo > conftest.c save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $pic_flag -DPIC" - echo "$progname:555: checking if $compiler PIC flag $pic_flag works" >&5 - if { (eval echo $progname:556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then + echo "$progname:547: checking if $compiler PIC flag $pic_flag works" >&5 + if { (eval echo $progname:548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then # Append any warnings to the config.log. cat conftest.err 1>&5 @@ -596,8 +588,8 @@ $rm conftest* echo 'main(){return(0);}' > conftest.c save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $link_static_flag" -echo "$progname:599: checking if $compiler static flag $link_static_flag works" >&5 -if { (eval echo $progname:600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +echo "$progname:591: checking if $compiler static flag $link_static_flag works" >&5 +if { (eval echo $progname:592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then echo "$ac_t$link_static_flag" 1>&6 else echo "$ac_t"none 1>&6 @@ -629,7 +621,7 @@ if test -z "$LD"; then if test "$with_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6 - echo "$progname:632: checking for ld used by GCC" >&5 + echo "$progname:624: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -647,10 +639,10 @@ if test -z "$LD"; then esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld... $ac_c" 1>&6 - echo "$progname:650: checking for GNU ld" >&5 + echo "$progname:642: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 - echo "$progname:653: checking for non-GNU ld" >&5 + echo "$progname:645: checking for non-GNU ld" >&5 fi if test -z "$LD"; then @@ -976,11 +968,11 @@ void nm_test_func(){} main(){nm_test_var='a';nm_test_func();return(0);} EOF -echo "$progname:979: checking if global_symbol_pipe works" >&5 -if { (eval echo $progname:980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then +echo "$progname:971: checking if global_symbol_pipe works" >&5 +if { (eval echo $progname:972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then # Now try to grab the symbols. nlist=conftest.nm - if { echo "$progname:983: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then + if { echo "$progname:975: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -1038,7 +1030,7 @@ EOF save_CFLAGS="$CFLAGS" LIBS='conftestm.o' CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo $progname:1041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + if { (eval echo $progname:1033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then pipe_works=yes else echo "$progname: failed program was:" >&5 diff --git a/ltmain.sh b/ltmain.sh index 707d87c0d6..e9350b3fab 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -30,7 +30,7 @@ modename="$progname" # Constants. PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.1.1 +VERSION=1.2 default_mode= help="Try \`$progname --help' for more information." @@ -1254,8 +1254,8 @@ if test -z "$show_help"; then case "$dlsyms" in "") ;; *.c) - $echo > "$objdir/$dlsyms" \ -"/* $dlsyms - symbol resolution table for \`$output' dlsym emulation. */ + $echo > "$objdir/$dlsyms" "\ +/* $dlsyms - symbol resolution table for \`$output' dlsym emulation. */ /* Generated by $PROGRAM - GNU $PACKAGE $VERSION */ #ifdef __cplusplus @@ -1266,7 +1266,8 @@ extern \"C\" { #define dld_preloaded_symbol_count some_other_symbol #define dld_preloaded_symbols some_other_symbol -/* External symbol declarations for the compiler. */" +/* External symbol declarations for the compiler. */\ +" if test -f "$nlist"; then sed -e 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> "$objdir/$dlsyms" @@ -1274,8 +1275,8 @@ extern \"C\" { echo '/* NONE */' >> "$objdir/$dlsyms" fi - $echo >> "$objdir/$dlsyms" \ -" + $echo >> "$objdir/$dlsyms" "\ + #undef dld_preloaded_symbol_count #undef dld_preloaded_symbols @@ -1294,19 +1295,21 @@ struct { __ptr_t address; } dld_preloaded_symbols[] = -{" +{\ +" if test -f "$nlist"; then sed 's/^\(.*\) \(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$nlist" >> "$objdir/$dlsyms" fi - $echo >> "$objdir/$dlsyms" \ -" {0, (__ptr_t) 0} + $echo >> "$objdir/$dlsyms" "\ + {0, (__ptr_t) 0} }; #ifdef __cplusplus } -#endif" +#endif\ +" ;; *) @@ -1426,8 +1429,8 @@ dld_preloaded_symbols[] = $rm $output trap "$rm $output; exit 1" 1 2 15 - $echo > $output \ -"#! /bin/sh + $echo > $output "\ +#! /bin/sh # $output - temporary wrapper script for $objdir/$output # Generated by ltmain.sh - GNU $PACKAGE $VERSION @@ -1458,7 +1461,9 @@ else else echo=\"$qecho\" file=\"\$0\" - fi + fi\ +" + $echo >> $output "\ # Find the directory that this script lives in. thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` @@ -1492,8 +1497,8 @@ else # Export our shlibpath_var if we have one. if test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $echo >> $output \ -" # Add our own library path to $shlibpath_var + $echo >> $output "\ + # Add our own library path to $shlibpath_var $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" # Some systems cannot cope with colon-terminated $shlibpath_var @@ -1503,8 +1508,8 @@ else " fi - echo >> $output \ -" if test \"\$libtool_execute_magic\" != \"$magic\"; then + $echo >> $output "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then # Run the actual program with our arguments. # Export the path to the program. @@ -1513,7 +1518,7 @@ else exec \$program \${1+\"\$@\"} - \$echo \"\$0: cannot exec \$program \$@\" + \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" exit 1 fi else @@ -1523,7 +1528,8 @@ else echo \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 fi -fi" +fi\ +" chmod +x $output fi exit 0 @@ -1560,8 +1566,8 @@ fi" # Only create the output if not a dry run. if test -z "$run"; then - echo > $output \ -"# $output - a libtool library file + $echo > $output "\ +# $output - a libtool library file # Generated by ltmain.sh - GNU $PACKAGE $VERSION # The name that we can dlopen(3). @@ -1582,7 +1588,8 @@ age=$age revision=$revision # Directory that this library needs to be installed in: -libdir='$install_libdir'" +libdir='$install_libdir'\ +" fi # Do a symbolic link so that the libtool archive can be found in diff --git a/make/Makefile.am b/make/Makefile.am index a494692720..ec0a09f422 100644 --- a/make/Makefile.am +++ b/make/Makefile.am @@ -1,4 +1,7 @@ -# Generated automatically by wild-perl 0.1# project LilyPond -- the musical typesetter +# Automatically generated from ./make/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# project LilyPond -- the musical typesetter # title zucht # file make/Makefile.am.dist # diff --git a/make/Makefile.in b/make/Makefile.in index fd0d1e7536..cbd578ad79 100644 --- a/make/Makefile.in +++ b/make/Makefile.in @@ -10,7 +10,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Generated automatically by wild-perl 0.1# project LilyPond -- the musical typesetter +# Automatically generated from ./make/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# project LilyPond -- the musical typesetter # title zucht # file make/Makefile.am.dist # @@ -66,7 +69,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AUTOHEADER = @AUTOHEADER@ +AUTOGENERATE = @AUTOGENERATE@ BISON = @BISON@ CC = @CC@ COMPILEINFO = @COMPILEINFO@ @@ -101,6 +104,7 @@ TEXPREFIX = @TEXPREFIX@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ IN_FILES = Configure_variables.make.in Makefile.in Toplevel.make.in lelievijver.lsm.in lilypond.lsm.in lilypond.spec.in MAKE_FILES = Files.make Include.make Initial.make Rules.make Targets.make Template.make User.make Variables.make Version.make diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm index 868e8f293c..4718bdc78e 100644 --- a/make/lelievijver.lsm +++ b/make/lelievijver.lsm @@ -1,7 +1,7 @@ Begin3 Titel: LilyPond Versie: -Inschrijf datum: 24MAR98 +Inschrijf datum: 27MAR98 Beschrijving: LilyPond is de muziek typesetter van het GNU Project. Het programma genereert muziek in zichtbare of hoorbare vorm uit uit een muzikale definitie file: diff --git a/make/lilypond.lsm b/make/lilypond.lsm index 241eb8b49e..0b8664a06b 100644 --- a/make/lilypond.lsm +++ b/make/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond Version: -Entered-date: 24MAR98 +Entered-date: 27MAR98 Description: LilyPond is the GNU Project music typesetter. The program generates visual or auditive output from a music definition file: it can typeset formatted sheet music diff --git a/mf/Makefile.am b/mf/Makefile.am index 49b93e3e3b..91a0273e89 100644 --- a/mf/Makefile.am +++ b/mf/Makefile.am @@ -1,3 +1,5 @@ +# Automatically generated from ./mf/Makefile.am.wild by autowild +# Do not edit # Generated automatically by wild-perl 0.1 # mf/Makefile.am.wild diff --git a/mf/Makefile.in b/mf/Makefile.in index fd41683281..c107b24b5d 100644 --- a/mf/Makefile.in +++ b/mf/Makefile.in @@ -10,6 +10,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +# Automatically generated from ./mf/Makefile.am.wild by autowild +# Do not edit # Generated automatically by wild-perl 0.1 # mf/Makefile.am.wild @@ -63,7 +65,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AUTOHEADER = @AUTOHEADER@ +AUTOGENERATE = @AUTOGENERATE@ BISON = @BISON@ CC = @CC@ COMPILEINFO = @COMPILEINFO@ @@ -98,6 +100,7 @@ TEXPREFIX = @TEXPREFIX@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ depth = .. # diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf index 7f0dae4fbe..7d9ea0b295 100644 --- a/mf/feta-slag.mf +++ b/mf/feta-slag.mf @@ -9,11 +9,16 @@ % this file is included by feta-scripts.mf -tfat := 0.3; +% tfat := 0.3; +tfat := 1/3; twidth# := 0.5interline#; theight# := 0.55interline#; -tthin# := stafflinethickness#; -toverlap# := tfat*twidth#+tthin#; +% tthin# := stafflinethickness#; +tthin# := 1.6stafflinethickness#; + +% uhg/ uhuh? +% toverlap# := tfat*twidth#+tthin#; +toverlap# := tfat*twidth#+0.45tthin#; define_pixels(twidth,theight,tthin,toverlap); def draw_trillelement = @@ -100,14 +105,14 @@ fet_beginchar("prallprall", "prallprall", "prallprall") trills := 3; set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#); draw_trill_three; - draw_mordent(twidth); + draw_mordent(twidth-0.5toverlap); fet_endchar; fet_beginchar("prallmordent", "prallmordent", "prallmordent") trills := 3; set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#); draw_trill_three; - draw_mordent(twidth-toverlap); + draw_mordent(twidth-0.5toverlap); fet_endchar; input feta-sleur; @@ -117,7 +122,7 @@ fet_beginchar("upprall", "upprall", "upprall") trills := 3; set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#); draw_slur(-2twidth#,-2theight#,-1); - currentpicture := currentpicture shifted (-0.5w+1.5tthin,-tfat*theight); + currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.5tthin); % draw_trill_four; draw_trill_three; fet_endchar; @@ -126,7 +131,7 @@ fet_beginchar("downprall", "downprall", "downprall") trills := 3; set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#); draw_slur(-2twidth#,2theight#,1); - currentpicture := currentpicture shifted (-0.5w+1.5tthin,-tfat*theight); + currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.5tthin); draw_trill_three; fet_endchar; diff --git a/mi2mu/GNUmakefile b/mi2mu/GNUmakefile new file mode 100644 index 0000000000..de251bbe42 --- /dev/null +++ b/mi2mu/GNUmakefile @@ -0,0 +1,29 @@ +# mi2mu/GNUmakefile +# +# This file helps maintainers to keep their Makefile.am automatically +# up to date using GNU make features. +# If you don't have (or run) GNU make, Makefile.am will not be updated +# automatically when source files are added/removed. + +# automake/wild-make should generate this file from Makefile.am.wild + +include Makefile + +# Makefile.am.wild: mi2mu_SOURCES = $(wildcard *.cc) +CURRENT_mi2mu_SOURCES = $(wildcard *.cc) + +# ugh: there is a dummy file 'wild-check' to satisfy the wild-check target +# for non-GNU makes in Makefile(.test) +# but we'll ignore that +# .PHONY: wild-check + +wild-check: check-mi2mu-sources + +check-mi2mu-sources: +ifneq ($(mi2mu_SOURCES),$(CURRENT_mi2mu_SOURCES)) + @echo \"$(mi2mu_SOURCES)\" + @echo \"$(CURRENT_mi2mu_SOURCES)\" + @echo mi2mu_SOURCES changed: NOT yet rerunning make-wild. Please type: + @echo "$(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am" +endif + diff --git a/mi2mu/Makefile.am b/mi2mu/Makefile.am index 54b91154cd..2b98699c08 100644 --- a/mi2mu/Makefile.am +++ b/mi2mu/Makefile.am @@ -1,3 +1,5 @@ +# Automatically generated from ./mi2mu/Makefile.am.wild by autowild +# Do not edit # Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter # title makefile for mi2mu @@ -14,13 +16,20 @@ bin_PROGRAMS = mi2mu mi2mu_SOURCES = main.cc mi2mu-version.cc midi-parser.cc midi-score-parser.cc midi-track-parser.cc mudela-column.cc mudela-item.cc mudela-score.cc mudela-staff.cc mudela-stream.cc mudela-voice.cc template.cc version.cc # ugh -lfl bo lib/FlexLexer stuff -mi2mu_LDADD = -llily -lflower -lfl +#mi2mu_LDADD = -llily -lflower -lfl -mi2mu_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs +# mi2mu_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs +mi2mu_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@ + INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include -EXTRA_DIST = Makefile.am.wild VERSION TODO +EXTRA_DIST = Makefile.am.wild GNUmakefile VERSION TODO +# override default target for all-am: to get an extra dependency +all-am: Makefile $(PROGRAMS) wild-check + +# dummy target for non-GNU makes; is overridden in GNUmakefile +wild-check: $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ \ No newline at end of file diff --git a/mi2mu/Makefile.am.wild b/mi2mu/Makefile.am.wild index b4494f9436..4607947121 100644 --- a/mi2mu/Makefile.am.wild +++ b/mi2mu/Makefile.am.wild @@ -13,11 +13,18 @@ bin_PROGRAMS = mi2mu mi2mu_SOURCES = $(wildcard *.cc) # ugh -lfl bo lib/FlexLexer stuff -mi2mu_LDADD = -llily -lflower -lfl +#mi2mu_LDADD = -llily -lflower -lfl -mi2mu_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs +# mi2mu_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs +mi2mu_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@ + INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include -EXTRA_DIST = Makefile.am.wild VERSION TODO +EXTRA_DIST = Makefile.am.wild GNUmakefile VERSION TODO +# override default target for all-am: to get an extra dependency +all-am: Makefile $(PROGRAMS) wild-check + +# dummy target for non-GNU makes; is overridden in GNUmakefile +wild-check: diff --git a/mi2mu/Makefile.in b/mi2mu/Makefile.in index cf4257fcca..4401cee22f 100644 --- a/mi2mu/Makefile.in +++ b/mi2mu/Makefile.in @@ -10,6 +10,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +# Automatically generated from ./mi2mu/Makefile.am.wild by autowild +# Do not edit # Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter # title makefile for mi2mu @@ -66,7 +68,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AUTOHEADER = @AUTOHEADER@ +AUTOGENERATE = @AUTOGENERATE@ BISON = @BISON@ CC = @CC@ COMPILEINFO = @COMPILEINFO@ @@ -101,6 +103,7 @@ TEXPREFIX = @TEXPREFIX@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ SUBDIRS = include @@ -109,13 +112,14 @@ bin_PROGRAMS = mi2mu mi2mu_SOURCES = main.cc mi2mu-version.cc midi-parser.cc midi-score-parser.cc midi-track-parser.cc mudela-column.cc mudela-item.cc mudela-score.cc mudela-staff.cc mudela-stream.cc mudela-voice.cc template.cc version.cc # ugh -lfl bo lib/FlexLexer stuff -mi2mu_LDADD = -llily -lflower -lfl +#mi2mu_LDADD = -llily -lflower -lfl -mi2mu_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs +# mi2mu_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs +mi2mu_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@ INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include -EXTRA_DIST = Makefile.am.wild VERSION TODO +EXTRA_DIST = Makefile.am.wild GNUmakefile VERSION TODO mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../lib/config.hh CONFIG_CLEAN_FILES = @@ -129,7 +133,9 @@ mi2mu_OBJECTS = main.o mi2mu-version.o midi-parser.o \ midi-score-parser.o midi-track-parser.o mudela-column.o mudela-item.o \ mudela-score.o mudela-staff.o mudela-stream.o mudela-voice.o template.o \ version.o -mi2mu_DEPENDENCIES = +mi2mu_DEPENDENCIES = $(top_builddir)/lib/liblily.la \ +$(top_builddir)/flower/libflower.la +mi2mu_LDFLAGS = CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ @@ -582,6 +588,11 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean +# override default target for all-am: to get an extra dependency +all-am: Makefile $(PROGRAMS) wild-check + +# dummy target for non-GNU makes; is overridden in GNUmakefile +wild-check: $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@ diff --git a/mi2mu/include/Makefile.am b/mi2mu/include/Makefile.am index d1e752c9ea..63032f9bbf 100644 --- a/mi2mu/include/Makefile.am +++ b/mi2mu/include/Makefile.am @@ -1,4 +1,7 @@ -# Generated automatically by wild-perl 0.1# lib/include/Makefile.am.wild +# Automatically generated from ./mi2mu/include/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# lib/include/Makefile.am.wild noinst_HEADERS = mi2mu-global.hh mi2mu-proto.hh midi-parser.hh midi-score-parser.hh midi-track-parser.hh mudela-column.hh mudela-item.hh mudela-score.hh mudela-staff.hh mudela-stream.hh mudela-voice.hh dummy.icc dummy.tcc diff --git a/mi2mu/include/Makefile.in b/mi2mu/include/Makefile.in index b9f1ba775b..10a1bfd137 100644 --- a/mi2mu/include/Makefile.in +++ b/mi2mu/include/Makefile.in @@ -10,7 +10,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Generated automatically by wild-perl 0.1# lib/include/Makefile.am.wild +# Automatically generated from ./mi2mu/include/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# lib/include/Makefile.am.wild SHELL = /bin/sh @@ -59,7 +62,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AUTOHEADER = @AUTOHEADER@ +AUTOGENERATE = @AUTOGENERATE@ BISON = @BISON@ CC = @CC@ COMPILEINFO = @COMPILEINFO@ @@ -94,6 +97,7 @@ TEXPREFIX = @TEXPREFIX@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ noinst_HEADERS = mi2mu-global.hh mi2mu-proto.hh midi-parser.hh midi-score-parser.hh midi-track-parser.hh mudela-column.hh mudela-item.hh mudela-score.hh mudela-staff.hh mudela-stream.hh mudela-voice.hh dummy.icc dummy.tcc diff --git a/mi2mu/template.cc b/mi2mu/template.cc index 6b2f4fc8fc..856ff12464 100644 --- a/mi2mu/template.cc +++ b/mi2mu/template.cc @@ -18,9 +18,9 @@ class ostream; #include "plist.hh" #include "plist.tcc" -template POINTERLIST_INSTANTIATE(Mudela_item); -template POINTERLIST_INSTANTIATE(Mudela_staff); -template POINTERLIST_INSTANTIATE(Mudela_voice); -template POINTERLIST_INSTANTIATE(Mudela_voice); -template POINTERLIST_INSTANTIATE(Mudela_column); +POINTERLIST_INSTANTIATE(Mudela_item); +POINTERLIST_INSTANTIATE(Mudela_staff); +POINTERLIST_INSTANTIATE(Mudela_voice); +POINTERLIST_INSTANTIATE(Mudela_voice); +POINTERLIST_INSTANTIATE(Mudela_column); diff --git a/mutopia/J.S.Bach/Makefile.am b/mutopia/J.S.Bach/Makefile.am index 32de637184..bf2a5e5cd6 100644 --- a/mutopia/J.S.Bach/Makefile.am +++ b/mutopia/J.S.Bach/Makefile.am @@ -1,4 +1,7 @@ -# Generated automatically by wild-perl 0.1# mutopia/J.S.Bach/Makefile.am.wild +# Automatically generated from ./mutopia/J.S.Bach/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# mutopia/J.S.Bach/Makefile.am.wild LYFILES = preludes-1.ly preludes-2.ly preludes-4.ly preludes-5.ly preludes-6.ly scsii-menuetto.ly wtk1-fugue1.ly wtk1-fugue2.ly wtk1-prelude1.ly TEXFILES = preludes.tex diff --git a/mutopia/J.S.Bach/Makefile.in b/mutopia/J.S.Bach/Makefile.in index e5f001379a..8e8f9f535c 100644 --- a/mutopia/J.S.Bach/Makefile.in +++ b/mutopia/J.S.Bach/Makefile.in @@ -10,7 +10,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Generated automatically by wild-perl 0.1# mutopia/J.S.Bach/Makefile.am.wild +# Automatically generated from ./mutopia/J.S.Bach/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# mutopia/J.S.Bach/Makefile.am.wild SHELL = /bin/sh @@ -59,7 +62,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AUTOHEADER = @AUTOHEADER@ +AUTOGENERATE = @AUTOGENERATE@ BISON = @BISON@ CC = @CC@ COMPILEINFO = @COMPILEINFO@ @@ -94,6 +97,7 @@ TEXPREFIX = @TEXPREFIX@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ LYFILES = preludes-1.ly preludes-2.ly preludes-4.ly preludes-5.ly preludes-6.ly scsii-menuetto.ly wtk1-fugue1.ly wtk1-fugue2.ly wtk1-prelude1.ly TEXFILES = preludes.tex diff --git a/mutopia/Makefile.am b/mutopia/Makefile.am index f28215335e..836601b477 100644 --- a/mutopia/Makefile.am +++ b/mutopia/Makefile.am @@ -1,8 +1,11 @@ -# Generated automatically by wild-perl 0.1# mutopia/Makefile.am.wild +# Automatically generated from ./mutopia/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# mutopia/Makefile.am.wild SUBDIRS = J.S.Bach -LYFILES = gallina.ly standchen-16.ly standchen-20.ly standchen.ly standje.ly +LYFILES = gallina.ly los-toros-oboe.ly standchen-16.ly standchen-20.ly standchen.ly standje.ly TEXFILES = gallina.tex standchen-16.tex standchen-20.tex M4FILES = dummy.m4 EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES) diff --git a/mutopia/Makefile.in b/mutopia/Makefile.in index d217c71a80..dc925d97cd 100644 --- a/mutopia/Makefile.in +++ b/mutopia/Makefile.in @@ -10,7 +10,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Generated automatically by wild-perl 0.1# mutopia/Makefile.am.wild +# Automatically generated from ./mutopia/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# mutopia/Makefile.am.wild SHELL = /bin/sh @@ -59,7 +62,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AUTOHEADER = @AUTOHEADER@ +AUTOGENERATE = @AUTOGENERATE@ BISON = @BISON@ CC = @CC@ COMPILEINFO = @COMPILEINFO@ @@ -94,10 +97,11 @@ TEXPREFIX = @TEXPREFIX@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ SUBDIRS = J.S.Bach -LYFILES = gallina.ly standchen-16.ly standchen-20.ly standchen.ly standje.ly +LYFILES = gallina.ly los-toros-oboe.ly standchen-16.ly standchen-20.ly standchen.ly standje.ly TEXFILES = gallina.tex standchen-16.tex standchen-20.tex M4FILES = dummy.m4 EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES) diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly new file mode 100644 index 0000000000..04c6d9b80d --- /dev/null +++ b/mutopia/los-toros-oboe.ly @@ -0,0 +1,78 @@ +\header{ +filename = "los-toros-oboe.ly"; +title = "Los Toros"; +opus = ""; +composer = "Paul Lac\^ome d'Estalenx (1838-1920)"; +enteredby = "jcn"; +copyright = "public domain"; +} + + +hobo1 = \melodic{ + \octave c'; + [es'16-. es'-. es'-. es'-.] [es'8-. d'-.] | + [f'8.-> es'16(] [)d'8 c'-.] | + [bes16( c' d' es'] [)d'8 c'-.] | + [bes-. as->~] [as16( g f g] | + [as bes c' d'] [)es'8 c'-.] | + [d'8-. c'16( bes] )a4 ~ | + [as16 g f g] [as c' bes as] | +% [)g8 as16(] [)f8 g16( f] | + [)g8. as16(] [)f8 g16( f] | + [)es8 f16-. g-.] [as-. bes-. c'-. d'-.] | + [es'-. es'-. es'-. es'-.] [es'8-. d'-.] | + [f'8.-> es'16(] [)d'8 c'-.] | + [bes16( c' d' es'] [)d'8 c'-.] | + [bes8 a->~] [a16 g( fis g] | + [a bes c' d'] [)es'8 d'16()c'] | + [bes-. g-. bes-. d'-.] g'4-> ~ | + [g'16 f'( es' d'] [c' es' d' c'] | + [)bes8 c'16( bes] [)a8 bes16( a] | + [)g8 r d'] r | + [g16-. g-. g-. g-.] [g8-. f-.] | + as2-> | + [as16-. as-. as-. as-.] [as8-. g-.] | + bes2-> | + [bes16-. bes-. bes-. bes-.] [bes8-. c'] | + r-"cresc." [d'8-. r c'-.] | + r\f [d'-. es'-. f'-.] | + [g'8.-> es'16] [bes8 g] | + [g16-.\p g-. g-. g-.] [g8-. f-.] | + as2-> | + [as16-. as-. as-. as-.] [as8-. g-.] | + bes2-> | + [b16-. b-. b-. b-.] [b8-. c'-.] | + [b16-. b-. b-. b-.] [b8-. c'-.] | + [b8-.-"cresc." c'-. b-. c'-.] | + [d'-. es'-. d'-. es'-.] | + [f'\f-. g'-. f'-. g'-.] | + [as'-.\< g'-. as'-. bes'-.] | + [\!g'16\ff-. g'-. g'-. g'-.] [g'8-. g'-.] | + [g'8.-> g'16] [g'8 g'] | + [g'8.-> g'16] [g'8 g'] | + [f'8.-> f'16] [f'8 f'] | + [f'8.-> f'16] [f'8 f'] | + [bes'8-. as'16( g'] )f'4 ~ | + [f'16 es'( d' es'] [f' as' g' )f'] | + [es'( g' f' es'] [d' g' es' d'] | + [c' es' d' c'] [b d' c' b] | + [a c' bes a] [g bes a g] | + [fis a g fis] [e g fis )e] | + % a 2 +} + +global = \melodic{ + \key bes es as; + \meter 2/4; +} + +$staff_hobo1 = \type Staff = hobo1 < + \global + \hobo1 +> + +\score{ + \$staff_hobo1 + \paper{} + \midi{} +} diff --git a/stamp-h.in b/stamp-h.in new file mode 100644 index 0000000000..9788f70238 --- /dev/null +++ b/stamp-h.in @@ -0,0 +1 @@ +timestamp diff --git a/tex/Makefile.am b/tex/Makefile.am index ecad911115..c8167ad27b 100644 --- a/tex/Makefile.am +++ b/tex/Makefile.am @@ -1,4 +1,7 @@ -# Generated automatically by wild-perl 0.1# tex/Makefile.am.wild +# Automatically generated from ./tex/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# tex/Makefile.am.wild TEXFILES = dyndefs.tex eglerdefs.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex EXTRA_DIST = Makefile.am.wild $(TEXFILES) diff --git a/tex/Makefile.in b/tex/Makefile.in index 209dac96d5..09c27e4382 100644 --- a/tex/Makefile.in +++ b/tex/Makefile.in @@ -10,7 +10,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Generated automatically by wild-perl 0.1# tex/Makefile.am.wild +# Automatically generated from ./tex/Makefile.am.wild by autowild +# Do not edit +# Generated automatically by wild-perl 0.1 +# tex/Makefile.am.wild SHELL = /bin/sh @@ -59,7 +62,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AUTOHEADER = @AUTOHEADER@ +AUTOGENERATE = @AUTOGENERATE@ BISON = @BISON@ CC = @CC@ COMPILEINFO = @COMPILEINFO@ @@ -94,6 +97,7 @@ TEXPREFIX = @TEXPREFIX@ VERSION = @VERSION@ YACC = @YACC@ ZIP = @ZIP@ +absolute_builddir = @absolute_builddir@ TEXFILES = dyndefs.tex eglerdefs.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex EXTRA_DIST = Makefile.am.wild $(TEXFILES)