Finally I've gotten around to send the stuff I've been looking at the
last weeks. I have a slow modem connection at home, so I've had a
hard time keeping up with new releases, and I'm still a couple of
releasesbehind. My patches are against 1.2.16.
This mail contains a number of attachments
1. lilydiff:
This is a diff against lilypond-1.2.16. It fixes the following things:
* hacking.texi: Fixed structure and internal links. No changes to the
text.
* aclocal.m4: I my Debian system mfplain.mp is not in /usr/share, so I
simply use kpsewhich to find it. It should be done like the finding
of fonts, but this was a quick fix that worked better than
hardcoding for me.
* graphical-element.cc: I had a segfault because a call to
common_refpoint returned 0. This is a workaround that stops it from
crashing at least. I guess there is a real bug somewhere else.
* mudela-mode.el: It didn't behave very well, so I made some changes
and fixed some bugs.
* titledefs.tex: the standard metre -> meter patch.
2. lilybug-1
This is the log for a simple "make" when it does it stuff in the
Documentation subdirectory. As you can see, it doesn't do anything
useful.
3. notes.ly partitur.ly
This is what I'm been trying to typeset. I get some kind of "too
large" problem. If I add the clarinet part to partitur.ly it fails,
but if I remove some other part, I can add the clarinet. It seems
that lilypond can only handle so many notes before producing TeX
output that won't render.
The symptoms are that the tex file will contain a line
{\char268 }%
where char 268 is unknown to TeX. The number 268 varies from lilypond
version to lilypond version.
diff -urN lilypond-1.2.16/Documentation/programmer/hacking.texi lilypond-1.2.16-dk1/Documentation/programmer/hacking.texi
--- lilypond-1.2.16/Documentation/programmer/hacking.texi Thu Oct 21 01:56:49 1999
+++ lilypond-1.2.16-dk1/Documentation/programmer/hacking.texi Tue Oct 26 21:39:21 1999
@@ -2,71 +2,50 @@
@setfilename internals.info
@settitle LilyPond internals
-@node Top, LilyPond internals, (dir), (dir)
+@node Top, Help Needed!, (dir), (dir)
@top
-
-@menu
-* LilyPond internals::
-* Overview::
-* mudela::
-* Request_engraver::
-* Graphic elements::
-* Score elements::
-* Items::
-* Spanners::
-* Future work::
-* Coding standards::
-* Making patches::
-
-@end menu
-
-@node LilyPond internals, , Top, Top
@menu
-* Overview:: Overview
-* mudela:: mudela
-* Request_engraver:: Request_engraver
-@end menu
-
-
-@chapter Getting involved
-
-Please help us make LilyPond a better program. You can help LilyPond in
-several ways. Not all tasks requiring programming or understanding the
-full source code. You can write to the mailing list
-(@email{gnu-music-discuss@@gnu.org} for more information)
+* Help Needed!::
+* LilyPond internals::
+* Coding standards::
+* Making patches::
-@unnumberedsubsec Users
+@detailmenu
+ --- The Detailed Node Listing ---
-Mutopia needs your help. The mutopia project is a collection of public
-domain sheet music. You can help the project by entering music and
-submitting. Point your browser to the
-@uref{http://sca.uwaterloo.ca/Mutopia, Mutopia webpage}
+LilyPond internals
-@unnumberedsubsec Font designers
-
-Our set of glyphs (the Feta font) is far from complete. If you know a
-little MetaFont you can contribute a glyph
+* Overview::
+* Requests::
+* Request_engraver::
+* Graphic elements::
+* Score elements::
+* Items::
+* Spanners::
+* Future work::
-@unnumberedsubsec Writers
+@end detailmenu
+@end menu
-The documentation of LilyPond and related utilities needs a lot of work.
+@node Help Needed!, LilyPond internals, Top, Top
+@chapter Help Needed!
-@unnumberedsubsec Translators
+[Call for help]
-LilyPond is completely ready for internationalized messages, but there
-are only three translations so far.
+[List tasks:
-@unnumberedsubsec Hackers
+* Mutopia
+* Doco LilyPond
-There are lots of possibilities of improving the program itself. There are
-both small projects and big ones. Most of them are listed in the TODO
-file. A interesting and very big project is writing a GUI frontend to
-LilyPond.
+* Straightforward extensions
+* GUI editors.
+]
+@node LilyPond internals, Coding standards, Help Needed!, Top
@chapter LilyPond internals
@@ -78,7 +57,18 @@
You should use @code{doc++} to take a peek at the sources.
-@node Overview, mudela, Top, Top
+@menu
+* Overview::
+* Requests::
+* Request_engraver::
+* Graphic elements::
+* Score elements::
+* Items::
+* Spanners::
+* Future work::
+@end menu
+
+@node Overview, Requests, LilyPond internals, LilyPond internals
@section Overview
GNU LilyPond is a "multi-pass" system. The different passes have been
@@ -153,8 +143,8 @@
@end table
-@node mudela, Request_engraver, Overview, Top
-@section mudela
+@node Requests, Request_engraver, Overview, LilyPond internals
+@section Requests
Most information is stored in the form of a request. In music
typesetting, the user might want to cram a lot more symbols on the
@@ -192,7 +182,7 @@
from the start of its note.
@end table
-@node Request_engraver, , mudela, Top
+@node Request_engraver, Graphic elements, Requests, LilyPond internals
@section Request_engraver
In the previous section the idea of Request has been explained, but
@@ -256,7 +246,7 @@
-@node Graphic elements, , , Top
+@node Graphic elements, Score elements, Request_engraver, LilyPond internals
@section Graphic elements
@@ -318,7 +308,8 @@
function as a parent. The size of a Graphical_axis_groups group is the
union of its children.
-@node Score elements, , , Top
+@node Score elements, Items, Graphic elements, LilyPond internals
+@section Score elements
Besides relative positions there are lots of other relations between
elements. Lilypond does not contain other specialized relation
@@ -355,7 +346,7 @@
The major derived classes of Score_element are Item and Spanner.
An item has one horizontal position. A spanner hangs on two items.
-@node Items, , , Top
+@node Items, Spanners, Score elements, LilyPond internals
@section Items
@@ -389,7 +380,7 @@
active items: either they point at the original, or they point at left
and right.
-@node Spanners, , , Top
+@node Spanners, Future work, Items, LilyPond internals
@section Spanners
Spanners are symbols that are of variable shape, eg. Slurs, beams, etc.
@@ -400,7 +391,7 @@
boundary item. The X reference point is the left boundary item.
-@node Future work, , , Top
+@node Future work, , Spanners, LilyPond internals
@section Future work
There are plans to unify Spanner and Item, so there will no longer be
@@ -412,10 +403,8 @@
variables to scheme (GUILE) variables, and no longer use C++ code to
calculate them, but use Scheme functions.
-@node Coding standards, , , Top
-
-@chapter CodingStyle - standards while programming for GNU
-LilyPond
+@node Coding standards, Making patches, LilyPond internals, Top
+@chapter Coding standards
Functions and methods do not return errorcodes.
@@ -743,8 +732,8 @@
Use them.
-@node Making patches, , , Top
-
+@node Making patches, , Coding standards, Top
+@chapter Making patches
@unnumberedsec name
diff -urN lilypond-1.2.16/VERSION lilypond-1.2.16-dk1/VERSION
--- lilypond-1.2.16/VERSION Thu Oct 21 14:09:17 1999
+++ lilypond-1.2.16-dk1/VERSION Tue Oct 26 21:39:41 1999
@@ -2,7 +2,7 @@
MAJOR_VERSION=1
MINOR_VERSION=2
PATCH_LEVEL=16
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=dk1
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
diff -urN lilypond-1.2.16/aclocal.m4 lilypond-1.2.16-dk1/aclocal.m4
--- lilypond-1.2.16/aclocal.m4 Mon Oct 4 11:26:21 1999
+++ lilypond-1.2.16-dk1/aclocal.m4 Tue Oct 26 21:47:35 1999
@@ -565,7 +565,7 @@
#
# For now let people define these in their environments
#
- : ${MFPLAIN_MP='/usr/share/texmf/metapost/base/mfplain.mp'}
+ : ${MFPLAIN_MP=`kpsewhich mfplain.mp`}
: ${INIMETAPOST_FLAGS='-interaction=nonstopmode'}
rm -f mfput.*
diff -urN lilypond-1.2.16/configure lilypond-1.2.16-dk1/configure
--- lilypond-1.2.16/configure Mon Oct 4 11:35:56 1999
+++ lilypond-1.2.16-dk1/configure Thu Oct 28 22:00:12 1999
@@ -2553,7 +2553,7 @@
#
# For now let people define these in their environments
#
- : ${MFPLAIN_MP='/usr/share/texmf/metapost/base/mfplain.mp'}
+ : ${MFPLAIN_MP=`kpsewhich mfplain.mp`}
: ${INIMETAPOST_FLAGS='-interaction=nonstopmode'}
rm -f mfput.*
diff -urN lilypond-1.2.16/debian/out/control lilypond-1.2.16-dk1/debian/out/control
--- lilypond-1.2.16/debian/out/control Mon Oct 18 01:28:56 1999
+++ lilypond-1.2.16-dk1/debian/out/control Thu Jan 1 01:00:00 1970
@@ -1,22 +0,0 @@
-Source: lilypond
-Section: tex
-Priority: optional
-Maintainer: Anthony Fok <[EMAIL PROTECTED]>
-Standards-Version: 3.0.0
-
-Package: lilypond
-Architecture: any
-Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.990310-1)
-Recommends: python-base (>= 1.5.2-4), tetex-base (>= 0.9.990311-1), tetex-extra (>= 0.9.990311-1)
-Conflicts: musixtex-fonts, tetex-base (<< 0.9)
-Description: A program for printing sheet music. LilyPond is a music typesetter. It produces beautiful sheet music
-using a high level description file as input. LilyPond is part of
-the GNU Project.
-
- .
- URLs: http://www.cs.uu.nl/~hanwen/lilypond/
- http://www.xs4all.nl/~jantien/lilypond/
- http://sca.uwaterloo.ca/~praetzel/lilypond/
- http://www.lilypond.org/
- Authors: Han-Wen Nienhuys <[EMAIL PROTECTED]>
- Jan Nieuwenhuizen <[EMAIL PROTECTED]>
diff -urN lilypond-1.2.16/lily/graphical-element.cc lilypond-1.2.16-dk1/lily/graphical-element.cc
--- lilypond-1.2.16/lily/graphical-element.cc Mon Oct 4 13:25:52 1999
+++ lilypond-1.2.16-dk1/lily/graphical-element.cc Tue Oct 26 23:29:43 1999
@@ -50,7 +50,8 @@
Graphical_element *
Graphical_element::common_refpoint (Graphical_element const* s, Axis a) const
{
- return (dim_cache_[a]->common_refpoint (s->dim_cache_[a])) ->element_l ();
+ Dimension_cache *dim = dim_cache_[a]->common_refpoint (s->dim_cache_[a]);
+ return dim ? dim->element_l () : 0;
}
void
diff -urN lilypond-1.2.16/make/out/lilypond.lsm lilypond-1.2.16-dk1/make/out/lilypond.lsm
--- lilypond-1.2.16/make/out/lilypond.lsm Thu Oct 21 14:09:53 1999
+++ lilypond-1.2.16-dk1/make/out/lilypond.lsm Thu Jan 1 01:00:00 1970
@@ -1,15 +0,0 @@
-Begin3
-Title: LilyPond
-Version: 1.2.16
-Entered-date: 21OCT99
-Description:
-Keywords: music notation typesetting midi fonts engraving
-Author: [EMAIL PROTECTED] (Han-Wen Nienhuys)
- [EMAIL PROTECTED] (Jan Nieuwenhuizen)
-Maintained-by: [EMAIL PROTECTED] (Han-Wen Nienhuys)
-Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert
- 1000k lilypond-1.2.16.tar.gz
-Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
- 1000k lilypond-1.2.16.tar.gz
-Copying-policy: GPL
-End
diff -urN lilypond-1.2.16/make/out/lilypond.spec lilypond-1.2.16-dk1/make/out/lilypond.spec
--- lilypond-1.2.16/make/out/lilypond.spec Thu Oct 21 14:09:53 1999
+++ lilypond-1.2.16-dk1/make/out/lilypond.spec Thu Jan 1 01:00:00 1970
@@ -1,100 +0,0 @@
-Name: lilypond
-Version: 1.2.16
-Release: 1
-Copyright: GPL
-Group: Applications/Publishing
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.2.16.tar.gz
-Summary: A program for printing sheet music.
-URL: http://www.cs.uu.nl/~hanwen/lilypond
-Packager: Han-Wen Nienhuys <[EMAIL PROTECTED]>
-# Icon: lilypond-icon.gif
-BuildRoot: /tmp/lilypond-install
-Prereq: tetex
-
-%description
-
-
-%package documentation
-Summary: Prebuilt website containing all LilyPond documentation.
-Group: Applications/Publishing
-# BuildArchitectures: noarch
-
-%description documentation
-
-
-The documentation of LilyPond, both in HTML and PostScript.
-
-%prep
-%setup
-%build
-./configure --disable-checking --disable-debugging --enable-printing --prefix=/usr --disable-optimise --enable-shared
-make all
-ln -s /usr/share/texmf/fonts/tfm/public/cm/ tfm
-
-# urg
-# %build documentation
-# line 42: second %build
-# ok, now make sure that lilypond package will succeed,
-# even if documentation fails to build
-make -C Documentation || true
-make htmldoc || true
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc
-
-strip lily/out/lilypond midi2ly/out/midi2ly
-make prefix="$RPM_BUILD_ROOT/usr" install
-# gzip -9fn $RPM_BUILD_ROOT/usr/info/* || true
-
-mkdir -p $RPM_BUILD_ROOT/etc/profile.d
-cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT/etc/profile.d/lilypond.sh
-cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh
-
-# urg
-#%install documentation
-#line 63: second %install
-# again, make sure that main package installs even if doco fails
-mkdir -p htmldocs/out
-tar -C htmldocs -xzf out/htmldoc.tar.gz || true
-mkdir -p out/examples/
-tar -cf - input/ | tar -C out/examples/ -xf- || true
-
-%post
-
-touch /tmp/.lilypond-install
-rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install
-# /sbin/install-info /usr/info/lilypond.info.gz /usr/info/dir || true
-
-%preun
-if [ $1 = 0 ]; then
- true # /sbin/install-info --delete /usr/info/lilypond.info.gz /usr/info/dir || true
-fi
-
-
-%files
-# hairy to hook it in (possibly non-existing) emacs
-%doc mudela-mode.el
-
-/usr/bin/abc2ly
-/usr/bin/convert-mudela
-/usr/bin/mudela-book
-/usr/bin/ly2dvi
-/usr/bin/lilypond
-/usr/bin/midi2ly
-/usr/man/man1/midi2ly.1
-/usr/man/man1/lilypond.1
-/usr/man/man1/mudela-book.1
-/usr/man/man1/ly2dvi.1
-/usr/man/man1/convert-mudela.1
-/usr/share/lilypond/
-/usr/share/locale/*/LC_MESSAGES/lilypond.mo
-/etc/profile.d/lilypond.*
-
-%files documentation
-# this gets too messy...
-# %doc input/*.ly
-# verbatim include of input: list the directory without issuing a %dir
-%doc htmldocs/
-%doc out/examples/
-%doc mutopia/
Binary files lilypond-1.2.16/mf/feta-braces11.tfm and lilypond-1.2.16-dk1/mf/feta-braces11.tfm differ
Binary files lilypond-1.2.16/mf/feta-braces13.tfm and lilypond-1.2.16-dk1/mf/feta-braces13.tfm differ
Binary files lilypond-1.2.16/mf/feta-braces16.tfm and lilypond-1.2.16-dk1/mf/feta-braces16.tfm differ
Binary files lilypond-1.2.16/mf/feta-braces20.tfm and lilypond-1.2.16-dk1/mf/feta-braces20.tfm differ
Binary files lilypond-1.2.16/mf/feta-braces23.tfm and lilypond-1.2.16-dk1/mf/feta-braces23.tfm differ
Binary files lilypond-1.2.16/mf/feta-braces26.tfm and lilypond-1.2.16-dk1/mf/feta-braces26.tfm differ
Binary files lilypond-1.2.16/mf/feta-din10.tfm and lilypond-1.2.16-dk1/mf/feta-din10.tfm differ
Binary files lilypond-1.2.16/mf/feta-nummer10.tfm and lilypond-1.2.16-dk1/mf/feta-nummer10.tfm differ
Binary files lilypond-1.2.16/mf/feta-nummer12.tfm and lilypond-1.2.16-dk1/mf/feta-nummer12.tfm differ
Binary files lilypond-1.2.16/mf/feta-nummer3.tfm and lilypond-1.2.16-dk1/mf/feta-nummer3.tfm differ
Binary files lilypond-1.2.16/mf/feta-nummer4.tfm and lilypond-1.2.16-dk1/mf/feta-nummer4.tfm differ
Binary files lilypond-1.2.16/mf/feta-nummer5.tfm and lilypond-1.2.16-dk1/mf/feta-nummer5.tfm differ
Binary files lilypond-1.2.16/mf/feta-nummer6.tfm and lilypond-1.2.16-dk1/mf/feta-nummer6.tfm differ
Binary files lilypond-1.2.16/mf/feta-nummer7.tfm and lilypond-1.2.16-dk1/mf/feta-nummer7.tfm differ
Binary files lilypond-1.2.16/mf/feta-nummer8.tfm and lilypond-1.2.16-dk1/mf/feta-nummer8.tfm differ
Binary files lilypond-1.2.16/mf/feta-test11.tfm and lilypond-1.2.16-dk1/mf/feta-test11.tfm differ
Binary files lilypond-1.2.16/mf/feta-test13.tfm and lilypond-1.2.16-dk1/mf/feta-test13.tfm differ
Binary files lilypond-1.2.16/mf/feta-test16.tfm and lilypond-1.2.16-dk1/mf/feta-test16.tfm differ
Binary files lilypond-1.2.16/mf/feta-test20.tfm and lilypond-1.2.16-dk1/mf/feta-test20.tfm differ
Binary files lilypond-1.2.16/mf/feta-test26.tfm and lilypond-1.2.16-dk1/mf/feta-test26.tfm differ
Binary files lilypond-1.2.16/mf/feta11.tfm and lilypond-1.2.16-dk1/mf/feta11.tfm differ
Binary files lilypond-1.2.16/mf/feta13.tfm and lilypond-1.2.16-dk1/mf/feta13.tfm differ
Binary files lilypond-1.2.16/mf/feta16.tfm and lilypond-1.2.16-dk1/mf/feta16.tfm differ
Binary files lilypond-1.2.16/mf/feta19.tfm and lilypond-1.2.16-dk1/mf/feta19.tfm differ
Binary files lilypond-1.2.16/mf/feta20.tfm and lilypond-1.2.16-dk1/mf/feta20.tfm differ
Binary files lilypond-1.2.16/mf/feta23.tfm and lilypond-1.2.16-dk1/mf/feta23.tfm differ
Binary files lilypond-1.2.16/mf/feta26.tfm and lilypond-1.2.16-dk1/mf/feta26.tfm differ
diff -urN lilypond-1.2.16/mudela-mode.el lilypond-1.2.16-dk1/mudela-mode.el
--- lilypond-1.2.16/mudela-mode.el Thu Sep 2 02:17:49 1999
+++ lilypond-1.2.16-dk1/mudela-mode.el Tue Oct 26 23:21:41 1999
@@ -30,6 +30,12 @@
;; * fontlock: \melodic \melodic
;;
+(defconst mu-version "1.2.16-dk1"
+ "`mudela-mode' version number.")
+
+(defconst mu-help-address "[EMAIL PROTECTED]"
+ "Address accepting submission of bug reports.")
+
(defconst mudela-font-lock-keywords
(let* ((keywords '("spanrequest" "simultaneous" "sequential" "accepts"
"alternative" "bar" "breathe"
@@ -66,28 +72,10 @@
(defvar mu-mode-map ()
"Keymap used in `mudela-mode' buffers.")
-(defun mu-newline-and-indent ()
- (interactive)
- (newline)
- (indent-relative-maybe)
- "Newline and copy previous indentation")
-
(if mu-mode-map
()
(setq mu-mode-map (make-sparse-keymap))
-
- (mapcar (function (lambda (key)
- (define-key
- mu-mode-map key 'mu-newline-and-indent)))
- (where-is-internal 'newline-and-indent))
-
- (mapcar (function
- (lambda (x)
- (define-key mu-mode-map (car x) (cdr x))))
- '(("\C-c\C-c" . mu-foo-bar)
- ))
- ;; should do all keybindings this way
- (define-key mu-mode-map [RET] 'mu-newline-and-indent)
+ ;; (define-key mu-mode-map "\C-c\C-c" 'mu-foo-bar)
)
(defvar mu-mode-syntax-table nil
@@ -121,9 +109,6 @@
)
-(defconst mu-blank-or-comment-re "[ \t]*\\($\\|%\\)"
- "Regexp matching blank or comment lines.")
-
(defconst mu-imenu-generic-re "^\\([a-zA-Z_][a-zA-Z0-9_]*\\) *="
"Regexp matching Identifier definitions.")
@@ -140,49 +125,52 @@
(defun mudela-mode ()
"Major mode for editing Mudela files."
-
(interactive)
;; set up local variables
(kill-all-local-variables)
+
(make-local-variable 'font-lock-defaults)
+ (setq font-lock-defaults '(mudela-font-lock-keywords))
+
(make-local-variable 'paragraph-separate)
+ (setq paragraph-separate "^[ \t]*$")
+
(make-local-variable 'paragraph-start)
- (make-local-variable 'require-final-newline)
+ (setq paragraph-start "^[ \t]*$")
+
(make-local-variable 'comment-start)
+ (setq comment-start "%")
+
+ (make-local-variable 'comment-start-skip)
+ (setq comment-start-skip "%{? *")
+
+ (make-local-variable 'comment-end)
+ (setq comment-end "\n")
+
(make-local-variable 'block-comment-start)
+ (setq block-comment-start "%{")
+
(make-local-variable 'block-comment-end)
+ (setq block-comment-end "%}")
+
+ ;; (make-local-variable 'comment-column)
+ ;; (setq comment-column 40)
- (setq comment-end "\n"
- comment-start "%"
- comment-start-skip "%{? *"
- block-comment-start "%{"
- block-comment-end "%}"
- )
- (make-local-variable 'comment-end)
- (make-local-variable 'comment-start-skip)
- (setq comment-start-skip "%{") ;??
- (make-local-variable 'comment-column)
(make-local-variable 'imenu-generic-expression)
(setq imenu-generic-expression mu-imenu-generic-expression)
+
(make-local-variable 'indent-line-function)
+ (setq indent-line-function 'indent-relative-maybe)
;;
(set-syntax-table mu-mode-syntax-table)
- (setq major-mode 'mudela-mode
- mode-name "Mudela"
- local-abbrev-table mudela-mode-abbrev-table
- font-lock-defaults '(mudela-font-lock-keywords)
- paragraph-separate "^[ \t]*$"
- paragraph-start "^[ \t]*$"
- require-final-newline t
- comment-column 40
- indent-line-function 'indent-relative-maybe
- )
+ (setq major-mode 'mudela-mode)
+ (setq mode-name "Mudela")
+ (setq local-abbrev-table mudela-mode-abbrev-table)
(use-local-map mu-mode-map)
;; run the mode hook. mu-mode-hook use is deprecated
- (run-hooks 'mudela-mode-hook)
-)
+ (run-hooks 'mudela-mode-hook))
(defun mu-keep-region-active ()
@@ -194,17 +182,12 @@
(setq zmacs-region-stays t)))
-(defun mu-comment-region (beg end &optional arg)
- "Like `comment-region' but uses double hash (`#') comment starter."
- (interactive "r\nP")
- (let ((comment-start mu-block-comment-prefix))
- (comment-region beg end arg)))
+;;(defun mu-comment-region (beg end &optional arg)
+;; "Like `comment-region' but uses double hash (`#') comment starter."
+;; (interactive "r\nP")
+;; (let ((comment-start mu-block-comment-prefix))
+;; (comment-region beg end arg)))
-(defconst mu-version "0.0.1"
- "`mudela-mode' version number.")
-(defconst mu-help-address "[EMAIL PROTECTED]"
- "Address accepting submission of bug reports.")
-
(defun mu-version ()
"Echo the current version of `mudela-mode' in the minibuffer."
(interactive)
diff -urN lilypond-1.2.16/stepmake/stepmake/aclocal.m4 lilypond-1.2.16-dk1/stepmake/stepmake/aclocal.m4
--- lilypond-1.2.16/stepmake/stepmake/aclocal.m4 Thu Jan 1 01:00:00 1970
+++ lilypond-1.2.16-dk1/stepmake/stepmake/aclocal.m4 Mon Oct 4 11:26:21 1999
@@ -0,0 +1,1077 @@
+dnl WARNING WARNING WARNING WARNING
+dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
+dnl WARNING WARNING WARNING WARNING
+dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
+dnl aclocal.m4 -*-shell-script-*-
+dnl StepMake subroutines for configure.in
+
+AC_DEFUN(AC_STEPMAKE_COMPILE, [
+ # -O is necessary to get inlining
+ OPTIMIZE=""
+ CFLAGS=${CFLAGS:-""}
+ CXXFLAGS=${CXXFLAGS:-$CFLAGS}
+ LDFLAGS=${LDFLAGS:-""}
+ checking_b=yes
+ optimise_b=no
+ profile_b=no
+ debug_b=yes
+
+ AC_ARG_ENABLE(checking,
+ [ enable-checking set runtime checks (assert calls). Default: on],
+ [checking_b=$enableval] )
+
+ # actually, the default is: tja='-O' to get inlining...
+ # off='' --jcn
+
+ #actually, that sucks.
+ # tja looks like a typo. Default is optimisation off. --hwn
+
+ 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])
+
+ 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],
+ [MINGWPREFIX=no])
+
+ if test "$checking_b" = no; then
+ # ugh
+ AC_DEFINE(NDEBUG)
+ DEFINES="$DEFINES -DNDEBUG"
+ fi
+
+ if test "$optimise_b" = yes; then
+ OPTIMIZE="-O2 -finline-functions"
+ fi
+
+ if test "$optimise_b" = no; then
+ OPTIMIZE=""
+ fi
+
+ if test $profile_b = yes; then
+ EXTRA_LIBES="-pg"
+ OPTIMIZE="$OPTIMIZE -pg"
+ fi
+
+ if test $debug_b = yes; then
+ OPTIMIZE="$OPTIMIZE -g"
+ fi
+
+ # however, C++ support in mingw32 v 0.1.4 is still flaky
+ if test x$MINGWPREFIX != xno; then
+ ICFLAGS="-I$MINGWPREFIX/include"
+ ILDFLAGS="-$MINGWPREFIX/lib"
+ fi
+
+ AC_PROG_CC
+ LD='$(CC)'
+ AC_SUBST(LD)
+
+ CFLAGS="$CFLAGS $OPTIMIZE"
+ CPPFLAGS=${CPPFLAGS:-""}
+ AC_SUBST(CFLAGS)
+ AC_SUBST(CPPFLAGS)
+ AC_SUBST(LDFLAGS)
+ AC_SUBST(ICFLAGS)
+ AC_SUBST(ILDFLAGS)
+ AC_SUBST(DEFINES)
+ AC_SUBST(EXTRA_LIBES)
+])
+
+AC_DEFUN(AC_STEPMAKE_CXX, [
+ AC_LANG_CPLUSPLUS
+ AC_PROG_CXX
+
+ AC_CHECK_HEADER(FlexLexer.h, true,
+ AC_STEPMAKE_WARN(can"\'"t find flex header. Please install Flex headers correctly))
+
+ CPPFLAGS="$CPPFLAGS $DEFINES"
+ CXXFLAGS="$CXXFLAGS $OPTIMIZE"
+ LDFLAGS="$LDFLAGS $EXTRA_LIBES"
+
+ AC_SUBST(CXXFLAGS)
+ AC_SUBST(CXX)
+ LD='$(CXX)'
+ AC_SUBST(LD)
+])
+
+AC_DEFUN(AC_STEPMAKE_CXXTEMPLATE, [
+ AC_CACHE_CHECK([whether explicit instantiation is needed],
+ lily_cv_need_explicit_instantiation,
+ AC_TRY_LINK([
+ template <class T> struct foo { static int baz; };
+ template <class T> int foo<T>::baz = 1;
+ ], [ return foo<int>::baz; ],
+ lily_cv_need_explicit_instantiation=no,
+ lily_cv_need_explicit_instantiation=yes))
+ if test x"$lily_cv_need_explicit_instantiation"x = x"yes"x; then
+ AC_DEFINE(NEED_EXPLICIT_INSTANTIATION)
+ fi
+])
+
+AC_DEFUN(AC_STEPMAKE_DATADIR, [
+ if test "$datadir" = "\${prefix}/share"; then
+ datadir='${prefix}/share/'$package
+ fi
+ DIR_DATADIR=${datadir}
+ presome=${prefix}
+ if test "$prefix" = "NONE"; then
+ presome=${ac_default_prefix}
+ fi
+ DIR_DATADIR=`echo ${DIR_DATADIR} | sed "s!\\\${prefix}!$presome!"`
+ AC_SUBST(datadir)
+ AC_SUBST(DIR_DATADIR)
+ AC_DEFINE_UNQUOTED(DIR_DATADIR, "${DIR_DATADIR}")
+])
+
+AC_DEFUN(AC_STEPMAKE_END, [
+ AC_OUTPUT($CONFIGFILE.make:config.make.in)
+
+ rm -f GNUmakefile
+ cp make/toplevel.make.in ./GNUmakefile
+ chmod 444 GNUmakefile
+])
+
+AC_DEFUN(AC_STEPMAKE_GXX, [
+ # ugh autoconf
+ # urg, egcs: how to check for egcs >= 1.1?
+ changequote(<<, >>)dnl
+ if $CXX --version | egrep '2\.[89]' > /dev/null ||
+ $CXX --version | grep 'egcs' > /dev/null
+ changequote([, ])dnl
+ then
+ true
+ else
+ AC_STEPMAKE_WARN(can\'t find g++ 2.8 or egcs 1.1)
+ fi
+])
+
+AC_DEFUN(AC_STEPMAKE_GUILE, [
+ GUILE_FLAGS
+ if guile-config --version 2>&1 | grep -q 'version 1\.[012]'; then
+ AC_STEPMAKE_WARN(Guile version 1.3 or better needed)
+ fi
+])
+
+AC_DEFUN(AC_STEPMAKE_INIT, [
+
+ . $srcdir/VERSION
+ FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
+ if test x$MY_PATCH_LEVEL != x; then
+ FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL
+ fi
+
+ # urg: don't "fix" this: irix doesn't know about [:lower:] and [:upper:]
+ changequote(<<, >>)dnl
+ PACKAGE=`echo $PACKAGE_NAME | tr '[a-z]' '[A-Z]'`
+ package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'`
+ changequote([, ])dnl
+
+ # No versioning on directory names of sub-packages
+ # urg, urg
+ stepmake=${datadir}/stepmake
+ presome=${prefix}
+ if test "$prefix" = "NONE"; then
+ presome=${ac_default_prefix}
+ fi
+ stepmake=`echo ${stepmake} | sed "s!\\\${prefix}!$presome!"`
+
+ AC_MSG_CHECKING(Package)
+ if test "x$PACKAGE" = "xSTEPMAKE"; then
+ AC_MSG_RESULT(Stepmake package!)
+ (cd stepmake; rm -f stepmake; ln -s ../stepmake .)
+ (cd stepmake; rm -f bin; ln -s ../bin .)
+ AC_CONFIG_AUX_DIR(bin)
+ stepmake=stepmake
+ else
+ AC_MSG_RESULT($PACKAGE)
+ AC_MSG_CHECKING(for stepmake)
+ # Check for installed stepmake
+ if test -d $stepmake; then
+ AC_MSG_RESULT($stepmake)
+ else
+ stepmake='$(depth)'/stepmake
+ AC_MSG_RESULT(./stepmake ($datadir/stepmake not found))
+ fi
+ AC_CONFIG_AUX_DIR(\
+ $HOME/usr/local/share/stepmake/bin\
+ $HOME/usr/local/lib/stepmake/bin\
+ $HOME/usr/share/stepmake/bin\
+ $HOME/usr/lib/stepmake/bin\
+ /usr/local/share/stepmake/bin\
+ /usr/local/lib/stepmake/bin\
+ /usr/share/stepmake/bin\
+ /usr/lib/stepmake/bin\
+ stepmake/bin\
+ )
+ fi
+
+ AC_SUBST(stepmake)
+ AC_SUBST(package)
+ AC_SUBST(PACKAGE)
+ AC_SUBST(PACKAGE_NAME)
+ AC_DEFINE_UNQUOTED(PACKAGE, "${PACKAGE_NAME}")
+ AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
+
+ if test "$package_depth" = "" ; then
+ package_depth="."
+ else
+ package_depth="../$package_depth"
+ fi
+ export package_depth
+ AC_SUBST(package_depth)
+
+ AUTOGENERATE="This file was automatically generated by configure"
+ AC_SUBST(AUTOGENERATE)
+ absolute_builddir="`pwd`"
+ AC_SUBST(absolute_builddir)
+
+ STATE_VECTOR=`ls make/STATE-VECTOR 2>/dev/null`
+ if test "x$STATE_VECTOR" != "x"; then
+ STATE_VECTOR="\$(depth)/$STATE_VECTOR"
+ fi
+ AC_SUBST(STATE_VECTOR)
+
+ CONFIGSUFFIX=
+ AC_ARG_ENABLE(config,
+ [ enable-config=FILE put configure settings in config-FILE.make],
+ [CONFIGSUFFIX=$enableval])
+
+ if test "$CONFIGSUFFIX" != "" ; then
+ CONFIGFILE=config-$CONFIGSUFFIX
+ else
+ CONFIGFILE=config
+ fi
+ AC_SUBST(CONFIGSUFFIX)
+
+ AC_CANONICAL_HOST
+ AC_CHECK_PROGS(MAKE, gmake make, error)
+ AC_CHECK_PROGS(FIND, find, error)
+
+dnl system supplied INSTALL is unsafe; use our own install.
+dnl AC_PROG_INSTALL
+dnl if test "$INSTALL" = "bin/install-sh"; then
+dnl export INSTALL="\$\(depth\)/bin/install-sh"
+dnl fi
+
+ AC_CHECK_PROGS(TAR, tar, error)
+
+ if test "x`uname`" = "xHP-UX"; then
+ AC_PATH_PROG(BASH, bash, /bin/sh)
+ AC_STEPMAKE_WARN(avoiding buggy /bin/sh)
+ AC_PATH_PROG(SHELL, bash, /bin/ksh)
+ else
+ AC_PATH_PROG(BASH, bash, /bin/sh)
+ SHELL=/bin/sh
+ AC_SUBST(SHELL)
+ fi
+
+
+ AC_PATH_PROG(PYTHON, ${PYTHON:-python}, -echo no python)
+ AC_SUBST(PYTHON)
+
+ if test $MAKE != "error" ; then
+ $MAKE -v 2> /dev/null | grep GNU > /dev/null
+ if test "$?" = 1
+ then
+ AC_STEPMAKE_WARN(Please install *GNU* make)
+ fi
+ fi
+
+ AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python)
+
+ if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then
+ LN=cp # hard link does not work under cygnus-nt
+ LN_S='cp -r' # symbolic link does not work for native nt
+ ZIP="zip -r -9" #
+ DOTEXE=.exe
+ # urg
+ # DIRSEP='\\'
+ # PATHSEP=';'
+ #
+ # cygwin fixes all these things.
+ # it seems these were used because of dos-style TEXINPUTS and
+ # MFINPUTS needed for miktex.
+ # but this breaks parsing of all other cygwin/unix style paths.
+ #
+ # if your (mik)tex breaks, make a:
+ # /usr/local/bin/tex:
+ # #!/bin/sh
+ # TEXINPUTS=`cygpath -pw $TEXINPUTS` /texmf/miktex/bin/tex $*
+ #
+ # and
+ #
+ # /usr/local/bin/mf:
+ # #!/bin/sh
+ # MFINPUTS=`cygpath -pw $MFINPUTS` /texmf/miktex/bin/mf $*
+ #
+ # this way, you may have buildscripts/out/lilypond-profile
+ # 'automatically' sourced from /usr/etc/profile.d/ too.
+ #
+ DIRSEP='/'
+ PATHSEP=':'
+ INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c"
+ else
+ DIRSEP='/'
+ PATHSEP=':'
+ LN=ln
+ LN_S='ln -s'
+ ZIP="zip -r -9"
+ INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c"
+ fi
+ AC_SUBST(DOTEXE)
+ AC_SUBST(ZIP)
+ AC_SUBST(LN)
+ AC_SUBST(LN_S)
+ AC_SUBST(INSTALL)
+ AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}')
+ AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}')
+ AC_SUBST(PATHSEP)
+ AC_SUBST(DIRSEP)
+
+ AC_STEPMAKE_DATADIR
+])
+
+AC_DEFUN(AC_STEPMAKE_LEXYACC, [
+ # ugh, automake: we want (and check for) bison
+ AC_PROG_YACC
+ # ugh, automake: we want (and check for) flex
+ # AC_PROG_LEX
+ # urg: automake 1.3: hope this doesn't break 1.2 ac_cv_pro_lex_root hack...
+
+ # AC_DECL_YYTEXT
+ # ugh, ugh
+ ac_cv_prog_lex_root=lex.yy
+
+ AC_CHECK_PROGS(BISON, bison, error)
+ AC_CHECK_PROGS(FLEX, flex, error)
+ AC_CHECK_SEARCH_RESULT($BISON, bison, Please install Bison, 1.25 or newer)
+ AC_CHECK_SEARCH_RESULT($FLEX, flex, Please install Flex, 2.5 or newer)
+
+ if test $BISON != "error"; then
+ bison_version=`$BISON --version | sed 's/^.*version 1.//g'`
+ if test `echo $bison_version | sed 's/\..*$//g'` -lt 25; then
+ AC_STEPMAKE_WARN(Your bison is a bit old (1.$bison_version). You might have to install 1.25)
+ fi
+ fi
+
+ AC_SUBST(BISON)
+ AC_SUBST(FLEX)
+])
+
+AC_DEFUN(AC_STEPMAKE_LIB, [
+ AC_CHECK_PROGS(AR, ar, error)
+ AC_PROG_RANLIB
+
+ AC_SUBST(AR)
+ AC_SUBST(RANLIB)
+])
+
+AC_DEFUN(AC_STEPMAKE_LIBTOOL, [
+ # libtool.info ...
+ # **Never** try to set library version numbers so that they correspond
+ # to the release number of your package. This is an abuse that only
+ # fosters misunderstanding of the purpose of library versions.
+
+ REVISION=$PATCH_LEVEL
+ # CURRENT=$MINOR_VERSION
+ CURRENT=`expr $MINOR_VERSION + 1`
+ # AGE=$(expr $MAJOR_VERSION + 1)
+ AGE=$MAJOR_VERSION
+ AC_SUBST(CURRENT)
+ AC_SUBST(REVISION)
+ AC_SUBST(AGE)
+])
+
+AC_DEFUN(AC_STEPMAKE_LOCALE, [
+ lang=English
+ ALL_LINGUAS="en nl"
+
+ # with/enable ??
+ AC_ARG_WITH(localedir,
+ [ with-localedir=LOCALE use LOCALE as locale dir. Default: PREFIX/share/locale ],
+ localedir=$with_localedir,
+ localedir='${prefix}/share/locale')
+
+ AC_ARG_WITH(lang,
+ [ with-lang=LANG use LANG as language to emit messages],
+ language=$with_lang,
+ language=English)
+
+ AC_MSG_CHECKING(language)
+ case "$language" in
+ En* | en* | Am* | am* | US* | us*)
+ lang=English;;
+ NL | nl | Du* | du* | Ned* | ned*)
+ lang=Dutch;;
+ "")
+ lang=English;;
+ *)
+ lang=unknown;;
+ esac
+ AC_MSG_RESULT($lang)
+
+ if test "$lang" = "unknown" ; then
+ AC_STEPMAKE_WARN($language not supported; available are: $ALL_LINGUAS)
+ fi
+
+])
+
+AC_DEFUN(AC_STEPMAKE_GETTEXT, [
+ DIR_LOCALEDIR=${localedir}
+ presome=${prefix}
+ if test "$prefix" = "NONE"; then
+ presome=${ac_default_prefix}
+ fi
+ DIR_LOCALEDIR=`echo ${DIR_LOCALEDIR} | sed "s!\\\${prefix}!$presome!"`
+ AC_SUBST(localedir)
+ AC_SUBST(DIR_LOCALEDIR)
+ AC_DEFINE_UNQUOTED(DIR_LOCALEDIR, "${DIR_LOCALEDIR}")
+
+ AC_CHECK_LIB(intl, gettext)
+ AC_CHECK_FUNCS(gettext)
+])
+
+AC_DEFUN(AC_STEPMAKE_MAN, [
+ AC_CHECK_PROGS(GROFF, groff ditroff, -echo no groff)
+ AC_CHECK_PROGS(TROFF, troff, -echo no troff)
+ AC_CHECK_PROGS(TBL, tbl, cat)
+])
+
+AC_DEFUN(AC_STEPMAKE_MSGFMT, [
+ # AC_CHECK_PROGS(MSGFMT, msgfmt, -echo no msgfmt)
+ AC_CHECK_PROGS(MSGFMT, msgfmt, \$(SHELL) \$(step-bindir)/fake-msgfmt.sh )
+ AC_MSG_CHECKING(whether msgfmt accepts -o)
+ msgfmt_output="`msgfmt -o bla 2>&1 | grep usage`"
+ if test "$msgfmt_output" = ""; then
+ AC_MSG_RESULT(yes)
+ else
+ # urg
+ MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh"
+ AC_MSG_RESULT(no)
+ AC_STEPMAKE_WARN(please install msgfmt from GNU gettext)
+ fi
+ if test ! -n "$MSGFMT"; then
+ AC_STEPMAKE_WARN(please install msgfmt from GNU gettext)
+ fi
+])
+
+#why has this been dropped?
+AC_DEFUN(XXAC_STEPMAKE_TEXMF_DIRS, [
+ AC_ARG_ENABLE(tex-prefix,
+ [ enable-tex-prefix=DIR set the tex-directory to find TeX subdirectories. (default: PREFIX)],
+ [TEXPREFIX=$enableval],
+ [TEXPREFIX=auto] )
+
+ AC_ARG_ENABLE(tex-dir,
+ [ enable-tex-dir=DIR set the directory to put $PACKAGE_NAME TeX files in. ],
+ [TEXDIR=$enableval],
+ [TEXDIR=auto] )
+
+ AC_ARG_ENABLE(mf-dir,
+ [ enable-mf-dir=DIR set the directory to put $PACKAGE_NAME MetaFont files in. ],
+ [MFDIR=$enableval],
+ [MFDIR=auto])
+
+ if test "x$TEXPREFIX" = xauto ; then
+ AC_TEX_PREFIX(TEXPREFIX)
+ else
+ find_texprefix=$TEXPREFIX
+ fi
+
+ if test "x$MFDIR" = xauto; then
+ AC_MF_SUBDIR(MFDIR)
+ fi
+
+ if test "x$TEXDIR" = xauto ; then
+ AC_TEX_SUBDIR(TEXDIR)
+ fi
+ AC_SUBST(TEXPREFIX)
+ AC_SUBST(TEXDIR)
+ AC_SUBST(MFDIR)
+])
+
+AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [
+ AC_ARG_ENABLE(tex-tfmdir,
+ [ enable-tex-tfmdir=DIR set the tex-directory where cmr10.tfm lives (default: use kpsewhich)],
+ [TFMDIR=$enableval],
+ [TFMDIR=auto] )
+
+ AC_CHECK_PROGS(KPSEWHICH, kpsewhich, no)
+ AC_MSG_CHECKING(for TeX TFM directory)
+ if test "x$TFMDIR" = xauto ; then
+ if test "x$TEX_TFMDIR" = "x" ; then
+ if test "x$KPSEWHICH" != "xno" ; then
+ CMR10=`kpsewhich tfm cmr10.tfm`
+ TEX_TFMDIR=`dirname $CMR10`
+ else
+ AC_STEPMAKE_WARN(Please set TEX_TFMDIR (to where cmr10.tfm lives):
+ TEX_TFMDIR=/usr/local/TeX/lib/tex/fonts ./configure)
+ fi
+ fi
+ fi
+ AC_MSG_RESULT($TEX_TFMDIR)
+ AC_SUBST(TEX_TFMDIR)
+])
+
+AC_DEFUN(AC_STEPMAKE_TEXMF, [
+ # urg, never know what names these teTeX guys will think up
+
+ AC_CHECK_PROGS(METAFONT, mf, no)
+ if test "x$METAFONT" = "xno"; then
+ AC_CHECK_PROGS(MFONT, mfont, -echo no mf or mfont)
+ METAFONT=$MFONT
+ fi
+
+ AC_CHECK_PROGS(METAPOST, mp, no)
+ if test "x$METAPOST" = "xno"; then
+ AC_CHECK_PROGS(MPOST, mpost, -echo no mp or mpost)
+
+ METAPOST=$MPOST
+ fi
+
+ AC_CHECK_PROGS(INIMETAFONT, inimf, no)
+ if test "x$INIMETAFONT" = "xno"; then
+ AC_CHECK_PROGS(INIMFONT, inimfont, -echo no inimf or inimfont)
+ INIMETAFONT=$INIMFONT
+ fi
+
+ AC_CHECK_PROGS(INIMETAPOST, inimp, no)
+ if test "x$INIMETAPOST" = "xno"; then
+ AC_CHECK_PROGS(INIMPOST, inimpost, -echo no inimp or inimpost)
+ INIMETAPOST=$INIMPOST
+ fi
+
+ AC_MSG_CHECKING(for working metafont mode)
+ modelist='ljfour lj4 lj3 lj2 ljet laserjet'
+ for MFMODE in $modelist; do
+ $METAFONT "\mode:=$MFMODE; mode_setup; end." > /dev/null 2>&1
+ if test -f mfput.tfm; then
+ break;
+ fi
+ done
+
+ #
+ # For now let people define these in their environments
+ #
+ : ${MFPLAIN_MP='/usr/share/texmf/metapost/base/mfplain.mp'}
+ : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'}
+
+ rm -f mfput.*
+ AC_MSG_RESULT($MFMODE)
+
+ AC_SUBST(METAFONT)
+ AC_SUBST(METAPOST)
+ AC_SUBST(MFMODE)
+ AC_SUBST(INIMETAFONT)
+ AC_SUBST(INIMETAPOST)
+ AC_SUBST(MFPLAIN_MP)
+ AC_SUBST(INIMETAPOST_FLAGS)
+])
+
+AC_DEFUN(AC_STEPMAKE_WARN, [
+ AC_MSG_WARN($1)
+ warn_b=yes
+])
+
+AC_DEFUN(AC_STEPMAKE_YODL, [
+ if test "x$YODL" = "x"; then
+ AC_CHECK_PROGS(STRIPROFF, striproff, -echo no striproff)
+ AC_CHECK_PROGS(YODL, yodl, -echo no yodl)
+ AC_CHECK_PROGS(YODL2HTML, yodl2html, -echo no yodl)
+ AC_CHECK_PROGS(YODL2LATEX, yodl2latex, )
+ AC_CHECK_PROGS(YODL2MAN, yodl2man, -echo no yodl)
+ AC_CHECK_PROGS(YODL2MSLESS, yodl2msless, -echo no yodl)
+ AC_CHECK_PROGS(YODL2TEXINFO, yodl2texinfo, -echo no yodl)
+ AC_CHECK_PROGS(YODL2TXT, yodl2txt, -echo no yodl)
+ YODL2LESS_DIR='$(bindir)/'
+ else
+ AC_SUBST(STRIPROFF)
+ AC_SUBST(YODL)
+ AC_SUBST(YODL2HTML)
+ AC_SUBST(YODL2LATEX)
+ AC_SUBST(YODL2LESS_DIR)
+ AC_SUBST(YODL2MAN)
+ AC_SUBST(YODL2MSLESS)
+ AC_SUBST(YODL2TEXINFO)
+ AC_SUBST(YODL2TXT)
+ export STRIPROFF YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT
+ fi
+ if test "x$YODL" = "-echo no yodl"; then
+ AC_STEPMAKE_WARN(Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl))
+ fi
+])
+
+dnl should cache result.
+dnl should look in $prefix first.
+dnl should probably assume TDS
+
+AC_DEFUN(AC_TEX_PREFIX, [
+
+
+ AC_MSG_CHECKING(TeX/MF root dir directory)
+
+ find_root_prefix="$prefix"
+
+
+ test "x$find_root_prefix" = xNONE && find_root_prefix="$ac_default_prefix"
+ find_texpostfix="";
+ for postfix in "/lib/tex/" "/lib/texmf" "/lib" "/tex" "/texmf"; do
+ find_texprefix="$find_root_prefix$postfix"
+ if test -d $find_texprefix; then
+ find_texpostfix=$postfix
+ break;
+ fi
+ done
+
+ if test "x$find_texpostfix" = x; then
+ find_texpostfix='/lib/texmf/tex'
+ AC_STEPMAKE_WARN(Cannot determine the TeX-directory. Please use --enable-tex-prefix)
+ fi
+
+ find_texprefix="$find_root_prefix/$find_texpostfix"
+
+ # only assign if variablename not empty
+ if test x != "x[$]$1"; then
+ $1='${prefix}'/"$find_texpostfix"
+ fi
+ AC_MSG_RESULT($find_texprefix)
+
+])
+
+
+# find a directory inside a prefix,
+# $1 the prefix (expanded version)
+# $2 variable to assign
+# $3 the directory name
+# $4 description
+AC_DEFUN(AC_FIND_DIR_IN_PREFIX, [
+
+ AC_MSG_CHECKING($4 directory)
+ find_dirdir=`(cd $1;
+ $FIND ./ -type d -a -name $3 -print |sort|head -1|sed 's#^\./##')`
+
+
+ if test "x$find_dirdir" = x; then
+ find_dirdir="/$3";
+ AC_STEPMAKE_WARN(Cannot determine $4 subdirectory. Please set from command-line)
+ true
+ fi
+ $2=$find_dirdir
+ AC_MSG_RESULT($1/$find_dirdir)
+])
+
+# ugh. this is hopeless
+AC_DEFUN(AC_KPSE_TEX_DIR, [
+ kpse_paths=`(kpsepath -n latex tex; kpsepath -n tex tex) | sed 's/:/ /g' | tr ' ' '\012' |sort | uniq -d`
+ kpse_syspaths=`echo $kpse_paths | grep '!'| sed 's/!//g'`
+ echo $kpse_paths
+ if test -w "$kpse_syspaths";
+ then
+ dir=`echo $kpse_syspaths | head -1`
+ else
+ dir=`echo $kpse_paths | grep -v '!'| head -1`
+ fi
+ if test "$prefix" = "NONE"; then
+ local_prefix=$ac_default_prefix
+ local_prefix_quote='${prefix}'
+
+ else
+ local_prefix=$prefix
+ local_prefix_quote=$prefix
+ fi
+ echo $local_prefix_quote = $local_prefix
+ echo $dir
+ echo $dir | sed 's!'$local_prefix'!\$local_prefix_quote!g'
+])
+
+AC_DEFUN(AC_TEX_SUBDIR, [
+dnl AC_REQUIRE([AC_TEX_PREFIX])
+ AC_FIND_DIR_IN_PREFIX($find_texprefix, $1, tex,TeX input)
+ $1="$TEXPREFIX/$$1"
+])
+
+AC_DEFUN(AC_MF_SUBDIR, [
+dnl AC_REQUIRE([AC_TEX_PREFIX])
+ AC_FIND_DIR_IN_PREFIX($find_texprefix, $1, source, MF input)
+ $1="$TEXPREFIX/$$1"
+])
+
+AC_DEFUN(AC_CHECK_SEARCH_RESULT, [
+ result="`echo \"$1\" | grep echo`"
+ if test "x$1" = "xerror" -o "x$result" != "x"; then
+ AC_STEPMAKE_WARN(can\'t find $2. $3)
+ fi
+])
+
+dnl GUILE_FLAGS --- set flags for compiling and linking with Guile
+dnl
+dnl This macro runs the `guile-config' script, installed with Guile,
+dnl to find out where Guile's header files and libraries are
+dnl installed. It sets two variables, marked for substitution, as
+dnl by AC_SUBST.
+dnl
+dnl GUILE_CFLAGS --- flags to pass to a C or C++ compiler to build
+dnl code that uses Guile header files. This is almost
+dnl always just a -I flag.
+dnl
+dnl GUILE_LDFLAGS --- flags to pass to the linker to link a
+dnl program against Guile. This includes `-lguile' for
+dnl the Guile library itself, any libraries that Guile
+dnl itself requires (like -lqthreads), and so on. It may
+dnl also include a -L flag to tell the compiler where to
+dnl find the libraries.
+
+AC_DEFUN([GUILE_FLAGS],[
+## The GUILE_FLAGS macro.
+ ## First, let's just see if we can find Guile at all.
+ AC_MSG_CHECKING(for Guile)
+ guile-config link > /dev/null || {
+ echo "configure: cannot find guile-config; is Guile installed?" 1>&2
+ exit 1
+ }
+ GUILE_CFLAGS="`guile-config compile`"
+ GUILE_LDFLAGS="`guile-config link`"
+ AC_SUBST(GUILE_CFLAGS)
+ AC_SUBST(GUILE_LDFLAGS)
+ AC_MSG_RESULT(yes)
+])
+
+
+# Configure paths for GTK+
+# Owen Taylor 97-11-3
+
+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
+dnl
+AC_DEFUN(AM_PATH_GTK,
+[dnl
+dnl Get the cflags and libraries from the gtk-config script
+dnl
+ AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
+ min_gtk_version=ifelse([$1], ,1.1.1,$1)
+ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
+ no_gtk=""
+ if test "$GTK_CONFIG" != "no" ; then
+ GTK_CFLAGS=`$GTK_CONFIG --cflags`
+ GTK_LIBS=`$GTK_CONFIG --libs`
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
+ LIBS="$LIBS $GTK_LIBS"
+dnl
+dnl Now check if the installed GTK is sufficiently new. (Also sanity
+dnl checks the results of gtk-config to some extent)
+dnl
+ AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+
+int
+main ()
+{
+ int major, minor, micro;
+
+ if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, µ) != 3) {
+ printf("%s, bad version string\n", "$min_gtk_version");
+ exit(1);
+ }
+
+ return !((gtk_major_version > major) ||
+ ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ CFLAGS="$ac_save_CFLAGS"
+ CXXFLAGS="$ac_save_CXXFLAGS"
+ LIBS="$ac_save_LIBS"
+ else
+ no_gtk=yes
+ fi
+ if test "x$no_gtk" = x ; then
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
+ else
+ AC_MSG_RESULT(no)
+ GTK_CFLAGS=""
+ GTK_LIBS=""
+ ifelse([$3], , :, [$3])
+ fi
+ CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
+ AC_SUBST(CXXFLAGS)
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+])
+
+
+# Configure paths for GTK--
+# Erik Andersen 30 May 1998
+# Modified by Tero Pulkkinen (added the compiler checks... I hope they work..)
+
+dnl Test for GTK__, and define GTK___CFLAGS and GTK___LIBS
+dnl to be used as follows:
+dnl AM_PATH_GTKMM([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl
+
+dnl Get the cflags and libraries from the gtkmm-config script
+dnl
+AC_ARG_WITH(gtkmm-prefix,[ --with-gtkmm-prefix=PREFIX
+ Prefix where GTK-- is installed (optional)],
+ gtkmm_config_prefix="$withval", gtkmm_config_prefix="")
+AC_ARG_WITH(gtkmm-exec-prefix,[ --with-gtkmm-exec-prefix=PREFIX
+ Exec prefix where GTK-- is installed (optional)],
+ gtkmm_config_exec_prefix="$withval", gtkmm_config_exec_prefix="")
+AC_ARG_ENABLE(gtkmmtest, [ --disable-gtkmmtest Do not try to compile and run a test GTK-- program],
+ , enable_gtkmmtest=yes)
+
+ if test x$gtkmm_config_exec_prefix != x ; then
+ gtkmm_config_args="$gtkmm_config_args --exec-prefix=$gtkmm_config_exec_prefix"
+ if test x${GTKMM_CONFIG+set} != xset ; then
+ GTKMM_CONFIG=$gtkmm_config_exec_prefix/bin/gtkmm-config
+ fi
+ fi
+ if test x$gtkmm_config_prefix != x ; then
+ gtkmm_config_args="$gtkmm_config_args --prefix=$gtkmm_config_prefix"
+ if test x${GTKMM_CONFIG+set} != xset ; then
+ GTKMM_CONFIG=$gtkmm_config_prefix/bin/gtkmm-config
+ fi
+ fi
+
+
+AC_DEFUN(AM_PATH_GTKMM,
+[dnl
+
+dnl
+dnl Check if the installed GTK-- is sufficiently new.
+dnl
+ AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no)
+ min_gtkmm_version=ifelse([$1], ,0.9.14,$1)
+
+ AC_MSG_CHECKING(for GTK-- - version >= $min_gtkmm_version)
+ no_gtkmm=""
+ if test "$GTKMM_CONFIG" = "no" ; then
+ no_gtkmm=yes
+ else
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+
+ GTK___CFLAGS=`$GTKMM_CONFIG $gtkmm_config_args --cflags`
+ GTK___LIBS=`$GTKMM_CONFIG $gtkmm_config_args --libs`
+ gtkmm_config_major_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ gtkmm_config_minor_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ gtkmm_config_micro_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ if test "x$enable_gtkmmtest" = "xyes" ; then
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ ac_save_LIBS="$LIBS"
+ CXXFLAGS="$CXXFLAGS $GTK___CFLAGS"
+ LIBS="$LIBS $GTK___LIBS"
+dnl
+dnl Now check if the installed GTK-- is sufficiently new. (Also sanity
+dnl checks the results of gtkmm-config to some extent
+dnl
+ rm -f conf.gtkmmtest
+ AC_TRY_RUN([
+#include <gtk--.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+ int major, minor, micro;
+ char *tmp_version;
+
+ system ("touch conf.gtkmmtest");
+
+ /* HP/UX 0 (%@#!) writes to sscanf strings */
+ tmp_version = g_strdup("$min_gtkmm_version");
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
+ printf("%s, bad version string\n", "$min_gtkmm_version");
+ exit(1);
+ }
+
+ if ((gtkmm_major_version != $gtkmm_config_major_version) ||
+ (gtkmm_minor_version != $gtkmm_config_minor_version) ||
+ (gtkmm_micro_version != $gtkmm_config_micro_version))
+ {
+ printf("\n*** 'gtkmm-config --version' returned %d.%d.%d, but GTK-- (%d.%d.%d)\n",
+ $gtkmm_config_major_version, $gtkmm_config_minor_version, $gtkmm_config_micro_version,
+ gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version);
+ printf ("*** was found! If gtkmm-config was correct, then it is best\n");
+ printf ("*** to remove the old version of GTK--. You may also be able to fix the error\n");
+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+ printf("*** required on your system.\n");
+ printf("*** If gtkmm-config was wrong, set the environment variable GTKMM_CONFIG\n");
+ printf("*** to point to the correct copy of gtkmm-config, and remove the file config.cache\n");
+ printf("*** before re-running configure\n");
+ }
+/* GTK-- does not have the GTKMM_*_VERSION constants */
+/*
+ else if ((gtkmm_major_version != GTKMM_MAJOR_VERSION) ||
+ (gtkmm_minor_version != GTKMM_MINOR_VERSION) ||
+ (gtkmm_micro_version != GTKMM_MICRO_VERSION))
+ {
+ printf("*** GTK-- header files (version %d.%d.%d) do not match\n",
+ GTKMM_MAJOR_VERSION, GTKMM_MINOR_VERSION, GTKMM_MICRO_VERSION);
+ printf("*** library (version %d.%d.%d)\n",
+ gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version);
+ }
+*/
+ else
+ {
+ if ((gtkmm_major_version > major) ||
+ ((gtkmm_major_version == major) && (gtkmm_minor_version > minor)) ||
+ ((gtkmm_major_version == major) && (gtkmm_minor_version == minor) && (gtkmm_micro_version >= micro)))
+ {
+ return 0;
+ }
+ else
+ {
+ printf("\n*** An old version of GTK-- (%d.%d.%d) was found.\n",
+ gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version);
+ printf("*** You need a version of GTK-- newer than %d.%d.%d. The latest version of\n",
+ major, minor, micro);
+ printf("*** GTK-- is always available from ftp://ftp.gtk.org.\n");
+ printf("***\n");
+ printf("*** If you have already installed a sufficiently new version, this error\n");
+ printf("*** probably means that the wrong copy of the gtkmm-config shell script is\n");
+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
+ printf("*** of GTK--, but you can also set the GTKMM_CONFIG environment to point to the\n");
+ printf("*** correct copy of gtkmm-config. (In this case, you will have to\n");
+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+ printf("*** so that the correct libraries are found at run-time))\n");
+ }
+ }
+ return 1;
+}
+],, no_gtkmm=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ CXXFLAGS="$ac_save_CXXFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ if test "x$no_gtkmm" = x ; then
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
+ else
+ AC_MSG_RESULT(no)
+ if test "$GTKMM_CONFIG" = "no" ; then
+ echo "*** The gtkmm-config script installed by GTK-- could not be found"
+ echo "*** If GTK-- was installed in PREFIX, make sure PREFIX/bin is in"
+ echo "*** your path, or set the GTK_CONFIG environment variable to the"
+ echo "*** full path to gtk-config."
+ echo "*** The gtkmm-config script was not available in GTK-- versions"
+ echo "*** prior to 0.9.12. Perhaps you need to update your installed"
+ echo "*** version to 0.9.12 or newer"
+ else
+ if test -f conf.gtkmmtest ; then
+ :
+ else
+ echo "*** Could not run GTK-- test program, checking why..."
+ CXXFLAGS="$CFLAGS $GTKMM_CXXFLAGS"
+ LIBS="$LIBS $GTK___LIBS"
+ AC_TRY_LINK([
+#include <gtk--.h>
+#include <stdio.h>
+], [ return ((gtkmm_major_version) || (gtkmm_minor_version) || (gtkmm_micro_version)); ],
+ [ echo "*** The test program compiled, but did not run. This usually means"
+ echo "*** that the run-time linker is not finding GTK-- or finding the wrong"
+ echo "*** version of GTK--. If it is not finding GTK--, you'll need to set your"
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
+ echo "*** is required on your system"
+ echo "***"
+ echo "*** If you have an old version installed, it is best to remove it, although"
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** exact error that occured. This usually means GTK-- was incorrectly installed"
+ echo "*** or that you have moved GTK-- since it was installed. In the latter case, you"
+ echo "*** may want to edit the gtkmm-config script: $GTKMM_CONFIG" ])
+ CXXFLAGS="$ac_save_CXXFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ GTK___CFLAGS=""
+ GTK__LIBS=""
+ ifelse([$3], , :, [$3])
+ AC_LANG_RESTORE
+ fi
+ AC_SUBST(GTK___CFLAGS)
+ AC_SUBST(GTK___LIBS)
+ rm -f conf.gtkmmtest
+])
+
+# Configure paths for GTK--DRAW
+# Derek Quinn Wyatt 98-08-21 (adapted from Jan Nieuwenhuizen's code)
+
+dnl AM_PATH_GTK__DRAW([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for GTK--DRAW, and define GTK___CFLAGS and GTK___LIBS
+dnl
+AC_DEFUN(AM_PATH_GTK__DRAW,
+[dnl
+dnl Get the cflags and libraries from the gtk__-config script
+dnl
+ AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no)
+ min_gtk___version=ifelse([$1], ,0.0.5,$1)
+ AC_MSG_CHECKING(for GTK--DRAW - version >= $min_gtk___version)
+ no_gtk__=""
+ if test "$GTKMM_CONFIG" != "no" ; then
+ GTK___CFLAGS=`$GTKMM_CONFIG --cflags`
+ GTK___LIBS=`$GTKMM_CONFIG --libs`
+ GTK___DLIBS="$GTK___LIBS -lgtkmmdraw"
+ GTK___LIBS="$GTK___DLIBS"
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CFLAGS="$CFLAGS $GTK___CFLAGS"
+ CXXFLAGS="$CXXFLAGS $GTK___CFLAGS"
+ LIBS="$LIBS $GTK___LIBS"
+dnl
+dnl Now check if the installed GTK__ is sufficiently new. (Also sanity
+dnl checks the results of gtk__-config to some extent)
+dnl
+ AC_TRY_RUN([
+#include <gtk--.h>
+#include <stdio.h>
+
+int
+main ()
+{
+ // urg
+ return 0;
+}
+],, no_gtk__=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ CFLAGS="$ac_save_CFLAGS"
+ CXXFLAGS="$ac_save_CXXFLAGS"
+ LIBS="$ac_save_LIBS"
+ else
+ no_gtk__=yes
+ fi
+ if test "x$no_gtk__" = x ; then
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
+ else
+ AC_MSG_RESULT(no)
+ GTK___CFLAGS=""
+ GTK___LIBS=""
+ ifelse([$3], , :, [$3])
+ fi
+ CXXFLAGS="$CXXFLAGS $GTK___CFLAGS"
+ AC_SUBST(CXXFLAGS)
+ AC_SUBST(GTK___CFLAGS)
+ AC_SUBST(GTK___LIBS)
+])
diff -urN lilypond-1.2.16/tex/titledefs.tex lilypond-1.2.16-dk1/tex/titledefs.tex
--- lilypond-1.2.16/tex/titledefs.tex Thu Oct 21 14:08:50 1999
+++ lilypond-1.2.16-dk1/tex/titledefs.tex Tue Oct 26 22:11:30 1999
@@ -14,7 +14,7 @@
\def\theinstrument{}
\def\theopus{}
\def\thepiece{}
-\def\themetre{}
+\def\themeter{}
\def\thepoet{}
%
% duh. LaTeX has a \title too.
This is an extract of the make log when compiling a clean 1.2.16.
make[1]: Entering directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation'
../stepmake/stepmake/generic-targets.make:166: out/dummy.dep: No such file or directory
mkdir out
touch out/dummy.dep
make[1]: Leaving directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation'
make[1]: Entering directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation'
rm -f out/footer.html
cat footer.html.in | sed -e '#' -e '#' -e 's!@BASH@!/bin//sh!g' -e
's!@DATE@!26OCT99!g' -e 's!@date@!26OCT99!g' -e
's!@datadir@!/usr/local/lilypond/share/lilypond!g' -e 's!@PACKAGE@!LILYPOND!g' -e
's!@package@!lilypond!g' -e 's!@PATHSEP@!:!g' -e 's!@PERL@!perl!g' -e
's!@PYTHON@!/usr/bin//python!g' -e 's!@SHELL@!/bin/sh!g' -e
's!@TOPLEVEL_VERSION@!1.2.16.dk1!g' -e 's!@step-bindir@!../stepmake/bin!g' -e
's!@abs-step-bindir@!!g' > out/footer.html
make PACKAGE=LILYPOND -C user all && make PACKAGE=LILYPOND -C programmer all && make
PACKAGE=LILYPOND -C bibliography all && make PACKAGE=LILYPOND -C pictures all &&
make PACKAGE=LILYPOND -C topdocs all && make PACKAGE=LILYPOND -C ntweb all && make
PACKAGE=LILYPOND -C misc all && true
make[2]: Entering directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/user'
../../stepmake/stepmake/generic-targets.make:166: out/dummy.dep: No such file or
directory
GNUmakefile:36: warning: overriding commands for target `local-WWW'
../../stepmake/stepmake/documentation-targets.make:8: warning: ignoring old commands
for target `local-WWW'
mkdir out
touch out/dummy.dep
make[2]: Leaving directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/user'
make[2]: Entering directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/user'
GNUmakefile:36: warning: overriding commands for target `local-WWW'
../../stepmake/stepmake/documentation-targets.make:8: warning: ignoring old commands
for target `local-WWW'
true
make[2]: Leaving directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/user'
make[2]: Entering directory
`/usr/local/src/lilypond-1.2.16-dk1/Documentation/programmer'
../../stepmake/stepmake/generic-targets.make:166: out/dummy.dep: No such file or
directory
GNUmakefile:34: warning: overriding commands for target `local-WWW'
../../stepmake/stepmake/documentation-targets.make:8: warning: ignoring old commands
for target `local-WWW'
mkdir out
touch out/dummy.dep
make[2]: Leaving directory
`/usr/local/src/lilypond-1.2.16-dk1/Documentation/programmer'
make[2]: Entering directory
`/usr/local/src/lilypond-1.2.16-dk1/Documentation/programmer'
GNUmakefile:34: warning: overriding commands for target `local-WWW'
../../stepmake/stepmake/documentation-targets.make:8: warning: ignoring old commands
for target `local-WWW'
true
make[2]: Leaving directory
`/usr/local/src/lilypond-1.2.16-dk1/Documentation/programmer'
make[2]: Entering directory
`/usr/local/src/lilypond-1.2.16-dk1/Documentation/bibliography'
../../stepmake/stepmake/generic-targets.make:166: out/dummy.dep: No such file or
directory
GNUmakefile:26: warning: overriding commands for target `local-WWW'
../../stepmake/stepmake/documentation-targets.make:8: warning: ignoring old commands
for target `local-WWW'
mkdir out
touch out/dummy.dep
make[2]: Leaving directory
`/usr/local/src/lilypond-1.2.16-dk1/Documentation/bibliography'
make[2]: Entering directory
`/usr/local/src/lilypond-1.2.16-dk1/Documentation/bibliography'
GNUmakefile:26: warning: overriding commands for target `local-WWW'
../../stepmake/stepmake/documentation-targets.make:8: warning: ignoring old commands
for target `local-WWW'
true
make[2]: Leaving directory
`/usr/local/src/lilypond-1.2.16-dk1/Documentation/bibliography'
make[2]: Entering directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/pictures'
../../stepmake/stepmake/generic-targets.make:166: out/dummy.dep: No such file or
directory
mkdir out
touch out/dummy.dep
make[2]: Leaving directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/pictures'
make[2]: Entering directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/pictures'
true
make[2]: Leaving directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/pictures'
make[2]: Entering directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/topdocs'
../../stepmake/stepmake/generic-targets.make:166: out/dummy.dep: No such file or
directory
../../stepmake/stepmake/yolily-topdoc-targets.make:12: warning: overriding commands
for target `local-WWW'
../../stepmake/stepmake/documentation-targets.make:8: warning: ignoring old commands
for target `local-WWW'
mkdir out
touch out/dummy.dep
make[2]: Leaving directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/topdocs'
make[2]: Entering directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/topdocs'
../../stepmake/stepmake/yolily-topdoc-targets.make:12: warning: overriding commands
for target `local-WWW'
../../stepmake/stepmake/documentation-targets.make:8: warning: ignoring old commands
for target `local-WWW'
true
make[2]: Leaving directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/topdocs'
make[2]: Entering directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/ntweb'
../../stepmake/stepmake/generic-targets.make:166: out/dummy.dep: No such file or
directory
mkdir out
touch out/dummy.dep
make[2]: Leaving directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/ntweb'
make[2]: Entering directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/ntweb'
cp angels.ly guile.patch out
true
make[2]: Leaving directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/ntweb'
make[2]: Entering directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/misc'
../../stepmake/stepmake/generic-targets.make:166: out/dummy.dep: No such file or
directory
mkdir out
touch out/dummy.dep
make[2]: Leaving directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/misc'
make[2]: Entering directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/misc'
true
make[2]: Leaving directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation/misc'
make[1]: Leaving directory `/usr/local/src/lilypond-1.2.16-dk1/Documentation'
\header{
filename = "strip-polka.ly";
title = "Strip Polka";
composer = "Johnny Mercer";
enteredby = "David K�gedal";
arranger = "David K�gedal";
}
\version "1.2.0";
sect = { \bar "||"; \penalty 5; }
global = \notes {
\tempo 4 = 90;
\partial 4;
s4 |
\mark "slow";
s1 | s1 | s1 |
\tempo 4 = 120;
\mark "faster";
s1 | s1 |
\sect \mark "A";
s1*8
\sect \mark "B";
s1*4
\sect \mark "C";
s1*8
}
harm = \chords {
\property Staff.midiVolume = 0
\partial 4; s4
g2 f g f g f g1 d |
%\sect \mark "A";
g1 c d g
g1 c d g
%\sect \mark "B";
g2 e-m a1-m d e-m
%\sect \mark "C";
e1-m c d4 s2. g1
%\sect \mark "D";
g1 c d g
%\sect \mark "E";
g1 c d g
%\sect \mark "F";
g2 e-m a1-m d e-m
%\sect \mark "G";
e1-m c d4 s2. g1
}
mel = \notes \relative c' {
\property Staff.midiInstrument = "voice"
\key g;
\partial 4;
r4 | R1*5
%\sect \mark "A";
d4 d8. d16 d8 b c d | e4 e8. e16 e4 d8 e |
fis4 fis8. fis16 fis8 d e fis | g4 a8 b ~ b4 b,8 c |
d4 d8. d16 d8 b c d | e4 e8. e16 e4 d8 e |
fis4 fis8. fis16 fis8 d e fis |
g4 r2 \times 2/3 { b8 b g ~ } |
g4 \times 2/3 { g8 g e ~ } e4 e8 e |
c4 \times 2/3 { c8 c c ~ } c4 r4
}
tpI = \notes \relative c' {
\property Staff.midiInstrument = "trumpet"
\key g;
\tempo 4 = 90;
\partial 4;
\times 2/3 { c8 d c } |
g'4 \times 2/3 { r8 g c, } \times 2/3 { es c4 } r4 |
bes'2 \times 2/3 { es,8 c4 } r4 |
r4 a'16 g a g bes2( |
\tempo 4 = 120;
)g8-. r8 r4 r2 | R1
%\sect \mark "A";
R1*7
r2. \times 2/3 { b8 b g ~ } |
%\sect \mark "B";
g4 ~ g2 e8 e | c4 \times 2/3 { c8 c c ~ } c4
\times 2/3 { a'8 a fis } ~ |
fis4 ~ fis2 d8 d | e4 \times 2/3 { e8 e b ~ } b4 r4
%\sect \mark "C";
R1*8
}
tpII = \notes \relative c'' {
\property Staff.midiInstrument = "trumpet"
\key g;
\partial 4; r4 | R1*5
%\sect \mark "A";
R1*8
%\sect \mark "B";
r4 \times 2/3 { g8 g e ~ } e4 b8 b |
a4 \times 2/3 { a8 a a ~ } a4 r4 |
r4 \times 2/3 { fis'8 fis d ~ } d4 a8 a |
b4 \times 2/3 { b8 b g ~ } g4 r4
%\sect \mark "C";
R1*8
}
tbI = \notes \relative c {
\property Staff.midiInstrument = "trombone"
\key g;
\clef bass;
\partial 4; r4 | R1*3 |
r4 e( d b | d c8 b )a4-. r4
%\sect \mark "A";
R1*8
%\sect \mark "B";
g'1 a d, e
%\sect \mark "C";
g2 b | c e | d4-. r8. e16 d8 c b a | g2. r4
}
tbII = \notes \relative c {
\property Staff.midiInstrument = "trombone"
\key g;
\clef bass;
\partial 4; r4 | R1*3 |
% r4 e d b | d c8 b a4-. r4
% %\sect \mark "A";
% R1*8
%
% %\sect \mark "B";
% d1 e a, b
% %\sect \mark "C";
% e2 g | g c | d4-. r8. e16 d8 c b a | g2. r4
}
klI = \notes \relative c' {
\property Staff.midiInstrument = "clarinet"
\key g;
\partial 4; r4 | R1*5
%\sect \mark "A";
R1*8
%\sect \mark "B";
R1*3 | r2. b8 b
%\sect \mark "C";
g4 fis8. g16 [e8 e] [e e] |
c4 \times 2/3 { c8 c c ~ } c4 a'8 a | fis4-. r2. | R1
%\sect \mark "D";
}
asI = \notes \relative c' {
\property Staff.midiInstrument = "alto sax"
\key g;
\partial 4; r4 | R1*4 |
s2. b8^"mel" c
%\sect \mark "A";
d4 d8. d16 d8 b c d | e4 e8. e16 e4 d8 e |
fis4 fis8. fis16 fis8 d e fis | g4 a8 b ~ b4 b,8 c |
d4 d8. d16 d8 b c d | e4 e8. e16 e4 d8 e |
fis4 fis8. fis16 fis8 d e fis | g4 r2. |
%\sect \mark "B";
R1*4
}
asII = \notes \relative c' {
\property Staff.midiInstrument = "alto sax"
\key g;
\partial 4; r4 | R1*4 |
s2. g8 a |
%\sect \mark "A";
b4 b8. b16 b8 g a b | c4 c8. c16 c4 b8 c |
d4 d8. d16 d8 b c d | d4 fis8 g ~ g4 g,8 a |
b4 b8. b16 b8 g a b | c4 c8. c16 c4 b8 c |
d4 d8. d16 d8 b c d | d4 r2. |
%\sect \mark "B";
R1*4
}
bs = \notes \relative c' {
\property Staff.midiInstrument = "baritone sax"
\key g;
\partial 4; r4 | R1*3 |
r4 e( d b | d c8 b )a4-. s4
%\sect \mark "A";
R1*8
%\sect \mark "B";
R1*4
}
bass = \notes \relative c {
\property Staff.midiInstrument = "tuba"
\key g;
\clef bass;
\partial 4; r4 |
g4 g f f | g g f f | g g f d |
e-. e( d b | d c8 b )a4-. r4
%\sect \mark "A";
g' d g d | c c' a a | d, a' d, a' | g fis e d |
g d g d | c c' a a | d, a' d, a' | g e( d b |
%\sect \mark "B";
)g' g e e | a a e e | d d d d | e e b b
%\sect \mark "C";
e e b b | c c g a | d-. r8. d16 d8 dis e fis | g2. r4
}
\include "notes.ly"
\paper {
\translator {
\GrandStaffContext
\consists Bar_number_engraver;
\consists Mark_engraver;
}
\translator {
\StaffContext
\consists Staff_margin_engraver;
}
}
\score {
\context GrandStaff <
% \chords \context ChordNames \harm
%\notes \context Staff=mel {
% \property Staff.instrument = "mel"
% < \mel > }
\global
\notes \context Staff=klI {
\property Staff.instrument = "kl1"
\klI }
\notes \context Staff=asI {
\property Staff.instrument = "as1"
< \asI > }
\notes \context Staff=asII {
\property Staff.instrument = "as2"
< \asII > }
% \notes \context Staff=bs {
% \property Staff.instrument = "bs"
% < \bs > }
\notes \context Staff=tpI {
\property Staff.instrument = "tp1"
< \tpI > }
% \notes \context Staff=tpII {
% \property Staff.instrument = "tp2"
% < \tpII > }
\notes \context Staff=tbI {
\property Staff.instrument = "tb1"
< \tbI > }
\notes \context Staff=tbII {
\property Staff.instrument = "tb2"
< \tbII > }
\notes \context Staff=basses {
\property Staff.instrument = "b"
< \bass > }
>
\paper { }
\midi { }
}
--
David K�gedal
