lilypond-1.3.39

diff --git a/Documentation/ntweb/GNUmakefile b/Documentation/ntweb/GNUmakefile
index c6d91915f536e814fa18300b29a99e86f0f6ad6a..fbcdfc7011ef3daba4d1fec22dfc6666fa4d94ea 100644 (file)
--- a/Documentation/ntweb/GNUmakefile
+++ b/Documentation/ntweb/GNUmakefile
@@ -2,7 +2,7 @@ depth = ../..
 
 STEPMAKE_TEMPLATES=documentation texinfo
 TO_TOP_FILES=$(addprefix $(outdir)/, $(README_TOP_FILES))
-PLAIN_FILES=angels.ly guile.patch
+PLAIN_FILES=angels.ly $(wildcard *.patch)
 
 EXTRA_DIST_FILES = $(PLAIN_FILES)
 

diff --git a/Documentation/ntweb/lilypond-manpages.patch b/Documentation/ntweb/lilypond-manpages.patch
new file mode 100644 (file)
index 0000000..9e204a7
--- /dev/null
+++ b/Documentation/ntweb/lilypond-manpages.patch
@@ -0,0 +1,453 @@
+diff --exclude-from=niet -urN ../lilypond-1.3.38/lily/out/lilypond.1 ./lily/out/lilypond.1
+--- ../lilypond-1.3.38/lily/out/lilypond.1     Thu Jan  1 01:00:00 1970
++++ ./lily/out/lilypond.1      Wed Mar 22 15:51:39 2000
+@@ -0,0 +1,88 @@
++.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.012.
++.TH LILYPOND "1" "March 2000" "GNU LilyPond 1.3.38.jcn1" FSF
++.SH NAME
++LilyPond \- manual page for LilyPond 1.3.38.jcn1
++.SH SYNOPSIS
++.B LilyPond
++[\fIOPTION\fR]... [\fIFILE\fR]...
++.SH DESCRIPTION
++GNU LilyPond 1.3.38.jcn1
++.PP
++Typeset music and or play MIDI from FILE
++.PP
++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.
++.SH OPTIONS
++.TP
++\fB\-d\fR,--debug
++enable debugging output
++.TP
++\fB\-f\fR,--output-format=EXT
++use output format EXT
++.TP
++\fB\-h\fR,--help
++this help
++.TP
++\fB\-I\fR,--include=DIR
++add DIR to search path
++.TP
++\fB\-i\fR,--init=FILE
++use FILE as init file
++.TP
++\fB\-M\fR,--dependencies
++write Makefile dependencies for every input file
++.TP
++\fB\-m\fR,--no-paper
++produce MIDI output only
++.TP
++\fB\-o\fR,--output=BASENAME
++write output to BASENAME[-x].extension
++.TP
++\fB\-Q\fR,--find-old-relative
++show all changes in relative syntax
++.TP
++\fB\-s\fR,--safe
++inhibit file output naming and exporting
++.TP
++\fB\-T\fR,--no-timestamps
++don't timestamp the output
++.TP
++\fB\-t\fR,--test
++switch on experimental features
++.TP
++\fB\-V\fR,--ignore-version
++ignore mudela version
++.TP
++\fB\-v\fR,--version
++print version number
++.TP
++\fB\-w\fR,--warranty
++show warranty and copyright
++.PP
++This binary was compiled with the following options: 
++datadir: `/home/fred/usr/share/lilypond'
++localedir: `/home/fred/usr/share/locale'
++.PP
++Oldest supported input version: 1.3.4
++.SH "REPORTING BUGS"
++Report bugs to bug-gnu-music@gnu.org
++.SH "SEE ALSO"
++The full documentation for
++.B LilyPond
++is maintained as a Texinfo manual.  If the
++.B info
++and
++.B LilyPond
++programs are properly installed at your site, the command
++.IP
++.B info LilyPond
++.PP
++should give you access to the complete manual.
++.PP
++This is free software.  It is covered by the GNU General Public License,
++and you are welcome to change it and/or distribute copies of it under
++certain conditions.  Invoke as `lilypond --warranty' for more information.
++.SH COPYRIGHT
++Copyright \(co 1996--2000 byHan-Wen Nienhuys <hanwen@cs.uu.nl>
++Jan Nieuwenhuizen <janneke@gnu.org>
+diff --exclude-from=niet -urN ../lilypond-1.3.38/midi2ly/out/midi2ly.1 ./midi2ly/out/midi2ly.1
+--- ../lilypond-1.3.38/midi2ly/out/midi2ly.1   Thu Jan  1 01:00:00 1970
++++ ./midi2ly/out/midi2ly.1    Wed Mar 22 15:51:45 2000
+@@ -0,0 +1,74 @@
++.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.012.
++.TH MIDI2LY "1" "March 2000" "midi2ly 1.3.38.jcn1" FSF
++.SH NAME
++midi2ly \- manual page for midi2ly 1.3.38.jcn1
++.SH SYNOPSIS
++.B midi2ly
++[\fIOPTION\fR]... [\fIFILE\fR]
++.SH DESCRIPTION
++.PP
++Translate MIDI-file to mudela
++.SH OPTIONS
++.TP
++\fB\-b\fR,--no-quantify
++write exact durations, e.g.: a4*385/384
++.TP
++\fB\-d\fR,--debug
++enable debugging output
++.TP
++\fB\-h\fR,--help
++this help
++.TP
++\fB\-k\fR,--key=ACC[:MINOR]
++set key: ACC +sharps/-flats; :1 minor
++.TP
++\fB\-n\fR,--no-silly
++don't output tuplets or double dots, smallest is 32
++.TP
++\fB\-o\fR,--output=FILE
++set FILE as default output
++.TP
++\fB\-p\fR,--no-tuplets
++don't output tuplets
++.TP
++\fB\-q\fR,--quiet
++be quiet
++.TP
++\fB\-s\fR,--smallest=DUR
++set smallest duration
++.TP
++\fB\-T\fR,--no-timestamps
++don't timestamp the output
++.TP
++\fB\-V\fR,--version
++print version number
++.TP
++\fB\-v\fR,--verbose
++be verbose
++.TP
++\fB\-w\fR,--warranty
++show warranty and copyright
++.TP
++\fB\-x\fR,--no-double-dots
++assume no double dotted notes
++.SH "REPORTING BUGS"
++Report bugs to bug-gnu-music@gnu.org
++.SH "SEE ALSO"
++The full documentation for
++.B midi2ly
++is maintained as a Texinfo manual.  If the
++.B info
++and
++.B midi2ly
++programs are properly installed at your site, the command
++.IP
++.B info midi2ly
++.PP
++should give you access to the complete manual.
++.PP
++This is free software.  It is covered by the GNU General Public License,
++and you are welcome to change it and/or distribute copies of it under
++certain conditions.  Invoke as `midi2ly --warranty' for more information.
++.SH COPYRIGHT
++Copyright \(co 1996--2000 byHan-Wen Nienhuys <hanwen@cs.uu.nl>
++Jan Nieuwenhuizen <janneke@gnu.org>
+diff --exclude-from=niet -urN ../lilypond-1.3.38/midi2ly/out/version.hh ./midi2ly/out/version.hh
+--- ../lilypond-1.3.38/midi2ly/out/version.hh  Thu Jan  1 01:00:00 1970
++++ ./midi2ly/out/version.hh   Wed Mar 22 15:51:41 2000
+@@ -0,0 +1,5 @@
++/* automatically generated */#define PACKAGE_NAME "LilyPond"
++#define MAJOR_VERSION "1"
++#define MINOR_VERSION "3"
++#define PATCH_LEVEL "38"
++#define MY_PATCH_LEVEL "jcn1"
+diff --exclude-from=niet -urN ../lilypond-1.3.38/scripts/out/abc2ly.1 ./scripts/out/abc2ly.1
+--- ../lilypond-1.3.38/scripts/out/abc2ly.1    Thu Jan  1 01:00:00 1970
++++ ./scripts/out/abc2ly.1     Wed Mar 22 15:50:27 2000
+@@ -0,0 +1,32 @@
++.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.012.
++.TH ABC2LY "1" "March 2000" "GNU lilypond 1.3.38" FSF
++.SH NAME
++abc2ly \- manual page for abc2ly 1.3.38
++.SH SYNOPSIS
++.B abc2ly
++[\fIOPTION\fR]...\fI ABC-FILE\fR
++.SH DESCRIPTION
++
++Convert ABC to Mudela.
++.SH OPTIONS
++.TP
++\fB\-h\fR, \fB\-\-help\fR
++this help
++.TP
++\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR
++set output filename to FILE
++.TP
++\fB\-v\fR, \fB\-\-version\fR
++version information
++.SH "SEE ALSO"
++The full documentation for
++.B abc2ly
++is maintained as a Texinfo manual.  If the
++.B info
++and
++.B abc2ly
++programs are properly installed at your site, the command
++.IP
++.B info abc2ly
++.PP
++should give you access to the complete manual.
+diff --exclude-from=niet -urN ../lilypond-1.3.38/scripts/out/as2text.1 ./scripts/out/as2text.1
+--- ../lilypond-1.3.38/scripts/out/as2text.1   Thu Jan  1 01:00:00 1970
++++ ./scripts/out/as2text.1    Wed Mar 22 15:50:31 2000
+@@ -0,0 +1,32 @@
++.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.012.
++.TH AS2TEXT "1" "March 2000" "as2text - LilyPond version 1.3.38" FSF
++.SH NAME
++as2text \- manual page for as2text - LilyPond version 1.3.38
++.SH SYNOPSIS
++.B as2text
++[\fIOPTION\fR]...\fI AS-FILE\fR
++.SH DESCRIPTION
++as2text - LilyPond version 1.3.38
++Convert AsciiScript to text.
++.SH OPTIONS
++.TP
++\fB\-h\fR,--help
++this help
++.TP
++\fB\-o\fR,--output=FILE
++set output file
++.TP
++\fB\-v\fR,--version
++show version
++.SH "SEE ALSO"
++The full documentation for
++.B as2text
++is maintained as a Texinfo manual.  If the
++.B info
++and
++.B as2text
++programs are properly installed at your site, the command
++.IP
++.B info as2text
++.PP
++should give you access to the complete manual.
+diff --exclude-from=niet -urN ../lilypond-1.3.38/scripts/out/convert-mudela.1 ./scripts/out/convert-mudela.1
+--- ../lilypond-1.3.38/scripts/out/convert-mudela.1    Thu Jan  1 01:00:00 1970
++++ ./scripts/out/convert-mudela.1     Wed Mar 22 15:50:23 2000
+@@ -0,0 +1,49 @@
++.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.012.
++.TH CONVERT-MUDELA "1" "March 2000" "GNU LilyPond 1.3.38" FSF
++.SH NAME
++convert-mudela \- manual page for convert-mudela 1.3.38
++.SH SYNOPSIS
++.B convert-mudela
++[\fIOPTION\fR]... [\fIFILE\fR]... 
++.SH DESCRIPTION
++.PP
++Try to convert to newer mudela-versions.  The version number of the
++input is guessed by default from \version directive
++.SH OPTIONS
++.TP
++\fB\-h\fR, \fB\-\-help\fR
++print this help
++.TP
++\fB\-e\fR, \fB\-\-edit\fR
++in place edit
++.TP
++\fB\-f\fR, \fB\-\-from\fR=\fIVERSION\fR
++start from version
++.TP
++\fB\-s\fR, \fB\-\-show\-rules\fR
++print all rules.
++.TP
++\fB\-t\fR, \fB\-\-to\fR=\fIVERSION\fR
++target version
++.TP
++\fB\-\-version\fR
++print program version
++.SH "REPORTING BUGS"
++Report bugs to bugs-gnu-music@gnu.org
++.SH "SEE ALSO"
++The full documentation for
++.B convert-mudela
++is maintained as a Texinfo manual.  If the
++.B info
++and
++.B convert-mudela
++programs are properly installed at your site, the command
++.IP
++.B info convert-mudela
++.PP
++should give you access to the complete manual.
++.PP
++This is free software.  It is covered by the GNU General Public
++License, and you are welcome to change it and/or distribute copies of
++it under certain conditions.  invoke as `convert-mudela --warranty' for more
++information.
+diff --exclude-from=niet -urN ../lilypond-1.3.38/scripts/out/ly2dvi.1 ./scripts/out/ly2dvi.1
+--- ../lilypond-1.3.38/scripts/out/ly2dvi.1    Thu Jan  1 01:00:00 1970
++++ ./scripts/out/ly2dvi.1     Wed Mar 22 15:50:25 2000
+@@ -0,0 +1,76 @@
++.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.012.
++.TH LY2DVI "1" "March 2000" "GNU lilypond 1.3.38" FSF
++.SH NAME
++ly2dvi \- manual page for ly2dvi 1.3.38
++.SH SYNOPSIS
++.B ly2dvi
++[\fIOPTION\fR]... [\fIFILE\fR]...
++.SH DESCRIPTION
++.PP
++Generate dvi file from mudela or lilypond output
++.SH OPTIONS
++.TP
++\fB\-D\fR,--debug
++increase verbosity
++.TP
++\fB\-F\fR,--headers=
++name of additional LaTeX headers file
++.TP
++\fB\-H\fR,--Height=
++set paper height (points) (see manual page)
++.TP
++\fB\-I\fR,--include=DIR
++add DIR to LilyPond's search path
++.TP
++\fB\-K\fR,--keeplilypond
++keep lilypond output files
++.TP
++\fB\-L\fR,--landscape
++set landscape orientation
++.TP
++\fB\-N\fR,--nonumber
++switch off page numbering
++.TP
++\fB\-O\fR,--orientation=
++set orientation (obsolete - use \fB\-L\fR instead)
++.TP
++\fB\-P\fR,--postscript
++generate postscript file
++.TP
++\fB\-W\fR,--Width=
++set paper width (points) (see manual page)
++.TP
++\fB\-M\fR,--dependencies
++tell lilypond make a dependencies file
++.TP
++\fB\-h\fR,--help
++this help text
++.TP
++\fB\-k\fR,--keeply2dvi
++keep ly2dvi output files
++.TP
++\fB\-l\fR,--language=
++give LaTeX language (babel)
++.TP
++\fB\-o\fR,--output=
++set output directory
++.TP
++\fB\-p\fR,--papersize=
++give LaTeX papersize (eg. a4)
++.TP
++\fB\-s\fR,--separate
++run all files separately through LaTeX
++.PP
++files may be (a mix of) input to or output from lilypond(1)
++.SH "SEE ALSO"
++The full documentation for
++.B ly2dvi
++is maintained as a Texinfo manual.  If the
++.B info
++and
++.B ly2dvi
++programs are properly installed at your site, the command
++.IP
++.B info ly2dvi
++.PP
++should give you access to the complete manual.
+diff --exclude-from=niet -urN ../lilypond-1.3.38/scripts/out/mudela-book.1 ./scripts/out/mudela-book.1
+--- ../lilypond-1.3.38/scripts/out/mudela-book.1       Thu Jan  1 01:00:00 1970
++++ ./scripts/out/mudela-book.1        Wed Mar 22 15:50:24 2000
+@@ -0,0 +1,65 @@
++.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.012.
++.TH MUDELA-BOOK "1" "March 2000" "GNU LilyPond 1.3.38" FSF
++.SH NAME
++mudela-book \- manual page for mudela-book 1.3.38
++.SH SYNOPSIS
++.B mudela-book
++[\fIoptions\fR]\fI FILE\fR
++.SH DESCRIPTION
++.PP
++Generate hybrid LaTeX input from Latex + mudela
++Options:
++.TP
++\fB\-\-default\-mudela\-fontsize\fR=\fIDIM\fR
++default fontsize for music.  DIM is assumed to in points
++.TP
++\fB\-f\fR,--format=EXT
++set format.  EXT is one of texi and latex.
++.TP
++\fB\-h\fR,--help
++print help
++.TP
++\fB\-I\fR,--include=DIR
++include path
++.TP
++\fB\-\-init\fR
++mudela-book initfile
++.TP
++\fB\-\-force\-verbatim\fR
++make all mudela verbatim
++.TP
++\fB\-M\fR,--dependencies
++write dependencies
++.TP
++\fB\-n\fR,--no-lily
++don't run lilypond
++.TP
++\fB\-\-no\-pictures\fR
++don't generate pictures
++.TP
++\fB\-o\fR,--outname=FILE
++prefix for filenames
++.TP
++\fB\-v\fR,--version
++print version information
++.TP
++\fB\-\-dep\-prefix\fR=\fIPREF\fR
++prepend PREF before each \fB\-M\fR dependency
++.PP
++Warning all output is written in the CURRENT directory
++.SH "REPORTING BUGS"
++Report bugs to bug-gnu-music@gnu.org.
++Written by Tom Cato Amundsen <tomcato@xoommail.com> and
++Han-Wen Nienhuys <hanwen@cs.uu.nl>
++.SH "SEE ALSO"
++The full documentation for
++.B mudela-book
++is maintained as a Texinfo manual.  If the
++.B info
++and
++.B mudela-book
++programs are properly installed at your site, the command
++.IP
++.B info mudela-book
++.PP
++should give you access to the complete manual.

diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc
index 7903dd230b01ee93429d74d90757f3ab7f47a3c1..a06704b1823d9c7f5dfb3dfc523f747e93b20955 100644 (file)
--- a/flower/libc-extension.cc
+++ b/flower/libc-extension.cc
@@ -76,8 +76,8 @@ void *
 memmem (void const *haystack, int haystack_len,
        void const *needle,int needle_len)
 {
-  Byte const* haystack_byte_c_l = haystack;
-  Byte const* needle_byte_c_l = needle;
+  Byte const* haystack_byte_c_l = (Byte const*)haystack;
+  Byte const* needle_byte_c_l = (Byte const*)needle;
   return _memmem (haystack_byte_c_l, haystack_len, needle_byte_c_l, needle_len);
 }