lilypond-0.0.78

diff --git a/.version b/.version
deleted file mode 100644 (file)
index 623bd9d..0000000
--- a/.version
+++ /dev/null
@@ -1,7 +0,0 @@
-TOPLEVEL_MAJOR_VERSION = 0
-TOPLEVEL_MINOR_VERSION = 0
-TOPLEVEL_PATCH_LEVEL = 77
-# use to send patches, always empty for released version:
-# include separator: ".postfix", "-pl" makes rpm barf
-
-TOPLEVEL_MY_PATCH_LEVEL = .jcn1

diff --git a/Documentation/CodingStyle.pod b/Documentation/CodingStyle.pod
index 8cf64c424dff1a6ab94f9943a8a386a1da20168a..7fe901c18650f84b83b5c696a5360dcdd61e2386 100644 (file)
--- a/Documentation/CodingStyle.pod
+++ b/Documentation/CodingStyle.pod
@@ -97,6 +97,9 @@ If you like using font-lock, you can also add this to your F<.emacs>:
 
 the C<type> is a Hungarian notation postfix for C<Type>. See below
 
+=head2 MACROS
+
+
 
 =head2 BROKEN CODE
 

diff --git a/Documentation/Makefile b/Documentation/Makefile
index a44206b6521230b8fcec28f55b49285cb13161b9..ea4a7be9c09669ea909f1290159030c66e846161 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -32,6 +32,7 @@ DVIFILES = $(addprefix $(outdir)/, $(DOCFILES:.doc=.dvi))
 # list of distribution files:
 #
 EXTRA_DISTFILES = lelie_icon.gif lelie_logo.gif  $(DOCFILES)
+
 default: do-doc
 
 # don't do DVI files. They can only be made if lily is installed
@@ -40,13 +41,14 @@ do-doc: $(TEXTFILES)
 html: $(HTMLFILES)
 
 htmldist: html
-       ./$(lily_bindir)/make_website
+       $(lily_bindir)/make_website
 
+dvi: $(DVIFILES)
 
 # generic targets and rules:
 #
-include ./$(depth)/make/Targets.make
-include ./$(depth)/make/Rules.make
+include $(depth)/make/Targets.make
+include $(depth)/make/Rules.make
 #
 
 localclean:
@@ -56,10 +58,9 @@ localclean:
 MAN1FILES = lilypond convert-mudela mi2mu mudela-book
 MAN1GROFF = $(addprefix $(outdir)/, $(addsuffix .1,$(MAN1FILES)))
 
-localinstall: $(outdir)/lilypond.1 $(outdir)/mudela.5
-       $(INSTALL) -d $(mandir)/man5
+localinstall: $(outdir)/lilypond.1
        $(INSTALL) -d $(mandir)/man1
-       $(INSTALL) -m 755 $(MAN1GROFF) $(mandir)/man1
+       $(INSTALL) -m 644 $(MAN1GROFF) $(mandir)/man1
 
 
 localuninstall:

diff --git a/Documentation/Rules.make b/Documentation/Rules.make
index 9f1be188b4059e1587c0c1adc8537977d0ccd1ff..71388de3c4268114b68c80c12fcc88fc125aece5 100644 (file)
--- a/Documentation/Rules.make
+++ b/Documentation/Rules.make
@@ -15,8 +15,7 @@ $(outdir)/%.dvi: $(outdir)/%.mudtex
        mv $(notdir $@) $(outdir)
 
 $(outdir)/%.mudtex: %.doc
-       $(depth)/bin/mudela-book --outdir=$(outdir)/ --outname=$(notdir $@) $<
-
+       $(binout)/mudela-book --outdir=$(outdir)/ --outname=$(notdir $@) $<
 
 $(outdir)/%.text: $(outdir)/%.1
        groff -man -Tascii $< > $@

diff --git a/Documentation/mudela-man.doc b/Documentation/mudela-man.doc
index c4e9c85398b6e4c0b491507272330af2d4372b9f..afcf5c4c19290d3c9b6cb60ba5faeed878839330 100644 (file)
--- a/Documentation/mudela-man.doc
+++ b/Documentation/mudela-man.doc
@@ -1,4 +1,8 @@
 % -*-latex-*-
+
+% this document should be run through the mudela-book script after lilypond
+% has been installed. 
+
 \documentclass{article}
 \usepackage{a4wide}
 \title{GNU LilyPond input format 0.1}
@@ -232,7 +236,7 @@ signifies that this note is part of a triplet (3 in stead of 2). The
 duration is one and a half quaver (\verb+4.+) times 2/3.
 
 Notenames are just a special kind of identifiers, and can be declared
-for any language appropriate (see \file{dutch.ini}).  The default language
+for any language appropriate (see \file{init/dutch.ly}).  The default language
 for notenames is defined to be dutch. In dutch, the notenames are
 a,b,c,d,e,f and g. Sharps are formed by adding the extension "is",
 flats by adding ``es''
@@ -291,23 +295,22 @@ error for this reason.
 
 Ties connect the noteheads of adjacent notes. They are entered as follows:
 
-\begin[fragment]{mudela}
-a4 ~ a4
+\begin[verbatim,fragment]{mudela}
+a'4 ~ a''4
 \end{mudela}
 
 Slurs connect whole chords, and try to avoid crossing stems. They are
 entered as follows:
-\begin{verbatim}
 
-\begin[fragment]{mudela}
-a4(  )a4
+\begin[verbatim,fragment]{mudela}
+a'4(  )a''4
 \end{mudela}
 
 \subsection{Scripts}
 
 Symbols which can be put at either side (above or below) of a staff
 are entered as follows:
-\begin[fragment]{mudela}
+\begin[verbatim,fragment]{mudela}
 a-^     % marcato, direction: default
         a^-     % portato, direction: above note
         a_.     % staccato, direction: below note
@@ -317,7 +320,7 @@ a-^     % marcato, direction: default
 c-"marcato"
 \end{mudela}
 
-If you want to define your own scripts refer to \file{script.ini} for
+If you want to define your own scripts refer to \file{init/script.ly} for
 details.
 
 
@@ -453,7 +456,7 @@ the same voicegroup share certain characteristics, among others:
         - beams and stems
         - scripts
 
-For the actual list, see the init file \file{register.ini}
+For the actual list, see the init file \file{init/register.ly}
 
 Putting different musical lines in to the same voicegroup effectively
 makes LilyPond try to form chords of all those lines. Putting

diff --git a/lily/template5.cc b/lily/template5.cc
index 05b842473dd92c9d7007424ba4f7048e09be5193..68e30479d9ed68cb6ef1c108f2a69c76f3fea6b7 100644 (file)
--- a/lily/template5.cc
+++ b/lily/template5.cc
@@ -1,3 +1,11 @@
+/*
+  template5.cc -- instantiate Intervals
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
 #include <limits.h>
 #include "proto.hh"
 #include "string.hh"
@@ -18,7 +26,16 @@ const Real INFTY = HUGE_VAL;
 Rational
 Interval_t<Rational>::infinity()
 {
-    return INFTY;
+/*
+  windhoze-suck-suck-suck-suck-suck-thank-you-cygnus
+
+  I get tired of all these incompatibilities. We'll just assume:
+
+  that 2^31 is *Big*
+
+ */
+
+    return Rational(INT_MAX);
 }
 
 int

diff --git a/make/Variables.make b/make/Variables.make
index 337598ff3061eb6c52a7942cbb9dd1bc80ca096c..a3bc6eee5c21725b1b1020bea43d7c98ca38654b 100644 (file)
--- a/make/Variables.make
+++ b/make/Variables.make
@@ -14,41 +14,57 @@
 
 # toplevel version info, might be handy?
 #
-include ./$(depth)/.version
+include $(depth)/VERSION
 #
-include ./$(depth)/make/out/Configure_variables.make
-
 ifeq (0,${MAKELEVEL})
 MAKE:=$(MAKE) --no-builtin-rules
 endif
 
 # directory names:
-#
-outdir = out
-lily_bindir = ./$(depth)/bin
-distdir = ./$(depth)/$(DIST_NAME)
-module-distdir = ./$(depth)/$(MODULE_DIST_NAME)
+
+
+ifdef buildprefix
+top-directory := $(shell  cd $(depth); pwd)
+abs-sub-directory := $(shell pwd)
+relative-sub-directory := $(subst $(top-directory),,$(abs-sub-directory))
+outdir=$(buildprefix)/$(relative-sub-directory)/out/
+else
+buildprefix=$(depth)
+outdir=out
+endif
+
+# derived names
+lily_bindir = $(depth)/bin
+distdir = $(depth)/$(DIST_NAME)
+module-distdir = $(depth)/$(MODULE_DIST_NAME)
 depdir = $(outdir)
-flowerout = ./$(depth)/flower/$(outdir)
-libout = ./$(depth)/lib/$(outdir)
-lilyout = ./$(depth)/lily/$(outdir)
-mi2muout = ./$(depth)/mi2mu/$(outdir)
-makeout = ./$(depth)/make/$(outdir)
-doc-dir = ./$(depth)/Documentation
-flower-dir = ./$(depth)/flower
-lib-dir = ./$(depth)/lib
-lily-dir = ./$(depth)/lily
-mi2mu-dir = ./$(depth)/mi2mu
-make-dir = ./$(depth)/make
-include-lib = ./$(depth)/lib/include
-include-flower = ./$(depth)/flower/include
-#
+
+flowerout = $(buildprefix)/flower/out
+libout = $(buildprefix)/lib/out
+lilyout = $(buildprefix)/lily/out
+mi2muout = $(buildprefix)/mi2mu/out
+makeout = $(buildprefix)/make/out
+docout = $(buildprefix)/Documentation/out
+binout = $(buildprefix)/bin/out
+
+doc-dir = $(depth)/Documentation
+flower-dir = $(depth)/flower
+lib-dir = $(depth)/lib
+lily-dir = $(depth)/lily
+mi2mu-dir = $(depth)/mi2mu
+make-dir = $(depth)/make
+include-lib = $(depth)/lib/include
+include-flower = $(depth)/flower/include
+
+
 rpm-sources = ${HOME}/rpms/SOURCES
 #
 
+include $(makeout)/Configure_variables.make
+
 # user settings:
 #
-include ./$(depth)/make/User.make
+include $(depth)/make/User.make
 #
 #
 # need to be defined in local Makefiles:
@@ -96,11 +112,6 @@ DUMMYDEPS=\
 ERROR_LOG = 2> /dev/null
 SILENT_LOG = 2>&1 >  /dev/null
 date = $(shell date +%x)
-allhh := $(shell $(FIND) ./ -name "*.hh" $(ERROR_LOG))
-allcc := $(shell $(FIND)  ./ -name "*.cc" $(ERROR_LOG))
-allobs := $(shell $(FIND) ./  $(outdir) -name "*.o" $(ERROR_LOG))
-
-alldeps := $(shell $(FIND)  ./ $(outdir) -name "*.dep" $(ERROR_LOG))
 
 # version stuff:
 #
@@ -157,7 +168,7 @@ LD_COMMAND = $(LD) $(LDFLAGS) -o $@
 
 # dependencies:
 #
-depfile = ./$(depdir)/$(subst .o,.dep,$(notdir $@)) 
+depfile = $(depdir)/$(subst .o,.dep,$(notdir $@)) 
 DODEP=rm -f $(depfile); DEPENDENCIES_OUTPUT="$(depfile) $(outdir)/$(notdir $@)"
 #
 
@@ -187,8 +198,8 @@ DISTFILES=$(EXTRA_DISTFILES) Makefile $(ALL_SOURCES)
 DOCDIR=$(depth)/$(outdir)
 
 # .hh should be first. Don't know why
-# take some trouble to vauto ignore sources and obsolete stuff.
-progdocs=$(shell $(FIND) ./ -name '*.hh' |egrep -v 'obsolete/|out/') $(shell $(FIND) ./ -name '*.cc'|egrep -v 'out/|obsolete/')
+# take some trouble to auto ignore sources and obsolete stuff.
+progdocs=$(shell $(FIND) ./ -name '*.hh' |egrep -v 'out/') $(shell $(FIND) ./ -name '*.cc'|egrep -v 'out/')
 
 
 pod2html=pod2html
@@ -201,6 +212,6 @@ ifdef stablecc
  STABLEOBS=$(addprefix $(outdir)/,$(stablecc:.cc=.o))
 endif
 
-# substitute $(STRIP) if you want stripping
+# substitute $(STRIP) in Site.make if you want stripping
 DO_STRIP=true