patch::: 1.3.119.jcn2

1.3.119.jcn2
============

* Fixed bibtex url (reported David Raleigh Arnold), added support for
bibtex2html, which is in Debian.

* Added direntries to toplevel texi documents, for info files
(reported Thomas Klausner).

* Removed some empty files.

---
Generated by janneke@gnu.org,
From = lilypond-1.3.119.jcn1, To = lilypond-1.3.119.jcn2

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.119.jcn2.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure

diff --git a/CHANGES b/CHANGES
index 4a5226d46e1d307f7405b65d267521be215a03cf..086482e6ab103ce9fa6a9b8542700d3d7a580f3d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,20 @@
-1.3.120.mb1
+--- ../lilypond-1.3.119.jcn1/CHANGES   Wed Dec 27 22:12:36 2000
+++ b/CHANGES   Tue Jan  2 12:29:36 2001
+@@ -1,3 +1,14 @@
+1.3.119.jcn2
+============
+
+* Fixed bibtex url (reported David Raleigh Arnold), added support for
+bibtex2html, which is in Debian.
+
+* Added direntries to toplevel texi documents, for info files
+(reported Thomas Klausner).
+
+* Removed some empty files.
+
+ 1.3.119.jcn1
+ ============
+ 1.3.120.mb1
 ===========
 
 * Increase the size of dynamics, adding new sizes of feta-din

diff --git a/Documentation/bibliography/GNUmakefile b/Documentation/bibliography/GNUmakefile
index 2c193065bed937ef87bf80bc6949871ec57a87f9..b3fd5fc7a139e34b0ddbaa1216115249ec43a4ce 100644 (file)
--- a/Documentation/bibliography/GNUmakefile
+++ b/Documentation/bibliography/GNUmakefile
@@ -32,10 +32,8 @@ $(outdir)/%.bib: %.bib
 # we want footers even if website builds (or is built) partly
        $(MAKE) footify
 
-
-# ignore result since bib2html is nonstandard. Errors would halt the RPM build.j  
 $(outdir)/%.html: %.bib
-       -bib2html $< $@
+       -$(BIBTEX2HTML) $(BIBTEX2HTML_FLAGS)
        $(footify) $@
 
 localclean:

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index e76f50d0eb04fe170ee00f1a7997325e7cb22f11..acf507c80799ff88c045db26f993a260cd92fe73 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -45,11 +45,11 @@ disk-space run configure with @code{--disable-debugging}.
 Although we recommend to use Unix, LilyPond is known to run on Windows
 NT/95/98 as well.  See Section Windows NT/95,es.
 
-@item  EGCS 1.1 or newer. Check out @uref{ftp://ftp.gnu.org/gnu/gcc/}.
+@item A reasonable C++ compiler:  EGCS 1.1, GCC 2.95.2 or newer. Check out @uref{ftp://ftp.gnu.org/gnu/gcc/}.
 
 @item  Python 1.5,
-Check out
-@uref{ftp://ftp.python.org} or @uref{ftp://ftp.cwi.nl/pub/python}.
+Check out @uref{ftp://ftp.python.org} or
+@uref{ftp://ftp.cwi.nl/pub/python}.
 
 @item  GUILE 1.3.4 or newer,  check out
 @uref{http://www.gnu.org/software/guile/guile.html,http://www.gnu.org/software/guile/guile.html}.
@@ -101,7 +101,7 @@ following software
 @item A PostScript printer and/or viewer (such as Ghostscript) is strongly
     recommended.  Xdvi will show all embedded PostScript too if you have
     Ghostscript installed.
-@item  GUILE 1.3.4, check out @uref{http://www.gnu.org/programs/guile.html,http://www.gnu.org/software/guile/}
+@item  GUILE 1.3.4, or newer.  Check out @uref{http://www.gnu.org/programs/guile.html,http://www.gnu.org/software/guile/}
 @end itemize
 
 For running LilyPond successfully you have to help TeX and MetaFont find
@@ -133,12 +133,12 @@ If you want to auto-generate Lily's website, you'll need some additional
 conversion tools.
 
 @itemize @bullet
-@item xpmtoppm (from the Portable Bitmap Utilities) (For RedHat Linux
+@item xpmtoppm (from the netpbm package: the Portable Bitmap Utilities) (For RedHat Linux
             users: it is included within the package libgr-progs).
        the original is at
 @uref{ftp://ftp.x.org/contrib/utilities/netpbm-1mar1994.p1.tar.gz,ftp://ftp.x.org/contrib/utilities/netpbm-1mar1994.p1.tar.gz}
 
-@item pnmtopng, which is also in libgr-progs for RedHat. The original is
+@item pnmtopng (also in libgr-progs for RedHat). The original is
 at
 @uref{ftp://swrinde.nde.swri.edu/pub/png/applications/pnmtopng-2.37.2.tar.gz,ftp://swrinde.nde.swri.edu/pub/png/applications/pnmtopng-2.37.2.tar.gz}.i
 
@@ -146,12 +146,15 @@ The version of @file{pnmtopng} that is distributed with RedHat 5.1 and
 5.2 contains a bug: pnmtopng is dynamically linked to the wrong
 version of libpng.
 
-@item @uref{http://pertsserver.cs.uiuc.edu/~hull/bib2html,Bib2html}.
-    Which, in turn depends on man2html for proper installation.
+@item @uref{http://www.lri.fr/~filliatr/ftp/bibtex2html/, Bibtex2html}, or
+@uref{http://www.uni-koblenz.de/ag-ki/ftp/bib2html/, Bib2html}.
+Bibtex2html is available in debian, while bib2html is in some rpm based
+distributions.
+Bib2html, in turn depends on man2html for proper installation.
 man2html can be had from @uref{http://askdonald.ask.uni-karlsruhe.de/hppd/hpux/Networking/WWW/Man2html-1.05,http://askdonald.ask.uni-karlsruhe.de/hppd/hpux/Networking/WWW/Man2html-1.05}.
 
-The website will build without this utility, but you will not see our
-hypertextified bibliography.
+The website will build without bib converter utility, but you will not
+see our hypertextified bibliography.
 
 @end itemize
 

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index d8d035834e74c555c8e2e22da39f17a726957ec5..6bf16c2d01d17154216881cbd36f1f52169d309a 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -34,6 +34,8 @@ ps: $(PS_FILES)
 # `.nexi', making sure we don't run LilyPond for inline pictures, when
 # generating info.
 $(outdir)/%.info: $(outdir)/%.texi
+# Cancel default dvi rule, we use lilypond-book.
+$(outdir)/%.dvi: $(outdir)/%.texi
 
 default: 
 

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 88b3b59f165ad6952e3c82a70a1bb6c68e2b21fc..e2d9cfbd08702b896520914749cc55094de06a5e 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -3,6 +3,14 @@
 @settitle GNU LilyPond
 
 
+@dircategory GNU music project
+@direntry
+@c    ;; prepend GNU for dir, must be unique
+* GNU LilyPond (lilypond).           The GNU music typesetter.
+@c * install-info: (texinfo)Invoking install-info. Update info/dir entries.
+@c * texi2dvi: (texinfo)Format with texi2dvi.      Print Texinfo documents.
+@end direntry
+
 
 @titlepage
 @title GNU LilyPond

diff --git a/VERSION b/VERSION
index 3e08f80e700287dba57104ebbcd9da5b9b6acc5f..2b9728f50c0837d0ddd2f6915650c2730343d832 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=119
-MY_PATCH_LEVEL=mb1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/aclocal.m4 b/aclocal.m4
index 724a91b40b7265b18cf05aa870ad088ec47310a6..0de4fdda7200549cfcf20dc530986d81423fc5be 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,18 @@
-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_BIBTEX2HTML, [
+    AC_CHECK_PROGS(BIBTEX2HTML, bibtex2html bib2html, error)
+    if test "$BIBTEX2HTML" = "bib2html"; then
+       BIBTEX2HTML_FLAGS='$< $(@)'
+    else
+       BIBTEX2HTML_FLAGS='-o $(@D)/$(*F) $<'
+    fi
+    AC_SUBST(BIBTEX2HTML)
+    AC_SUBST(BIBTEX2HTML_FLAGS)
+])
+
+
 AC_DEFUN(AC_STEPMAKE_COMPILE, [
     # -O is necessary to get inlining
     OPTIMIZE=""

diff --git a/config.make.in b/config.make.in
index 97b7d70045c6695f7511f0f8bb923f058cc753ab..3f2ec353a2deb1c08ca9d2f795da2c5cdce37fcb 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -47,6 +47,8 @@ COMPILEINFO = @COMPILEINFO@
 DOTEXE = @DOTEXE@
 INSTALL = @INSTALL@
 BASH = @BASH@
+BIBTEX2HTML=@BIBTEX2HTML@
+BIBTEX2HTML_FLAGS=@BIBTEX2HTML_FLAGS@
 BISON = @BISON@
 FIND = @FIND@
 FLEX = @FLEX@

diff --git a/configure.in b/configure.in
index c4cf39588c485feaaaab00bb2d2b2ca39a42e1d5..db95517de9f59e32179c05afb94b5af3334eec10 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -36,6 +36,7 @@ AC_STEPMAKE_TEXMF
 AC_STEPMAKE_TEXMF_DIRS
 AC_STEPMAKE_GUILE
 AC_STEPMAKE_KPATHSEA
+AC_STEPMAKE_BIBTEX2HTML
 
 dnl should check out -print
 dnl huh?

diff --git a/flower/include/proto.hh b/flower/include/proto.hh
deleted file mode 100644 (file)
index 65296f8..0000000
--- a/flower/include/proto.hh
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#error

diff --git a/scm/documentation-lib.scm b/scm/documentation-lib.scm
index 0593eac0a9e030743c438374db0e0069a2669b9d..317fc486db79a01e0e907d07942226376a08aed3 100644 (file)
--- a/scm/documentation-lib.scm
+++ b/scm/documentation-lib.scm
@@ -120,6 +120,11 @@ Add a ref if REF is set
    "\\input texinfo @c -*-texinfo-*-"
    "\n@setfilename " file-name ".info"
    "\n@settitle " name
+   "\n@dircategory GNU music project"
+   "\n@direntry"
+   ;; prepend GNU for dir, must be unique
+   "\n* GNU " name " (" file-name ").           " name "."
+   "\n@end direntry"
    (node "Top") top
    "\n@top"
    (texi-section 1 name #f)

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 724a91b40b7265b18cf05aa870ad088ec47310a6..0de4fdda7200549cfcf20dc530986d81423fc5be 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -1,8 +1,18 @@
-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_BIBTEX2HTML, [
+    AC_CHECK_PROGS(BIBTEX2HTML, bibtex2html bib2html, error)
+    if test "$BIBTEX2HTML" = "bib2html"; then
+       BIBTEX2HTML_FLAGS='$< $(@)'
+    else
+       BIBTEX2HTML_FLAGS='-o $(@D)/$(*F) $<'
+    fi
+    AC_SUBST(BIBTEX2HTML)
+    AC_SUBST(BIBTEX2HTML_FLAGS)
+])
+
+
 AC_DEFUN(AC_STEPMAKE_COMPILE, [
     # -O is necessary to get inlining
     OPTIMIZE=""

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index e24d66435a36b6768e59fc617645c0b8dcfe4dbc..0356e3629606091ab3192f8825cf11e7cba33e53 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -16,10 +16,8 @@ $(outdir)/%/%.html: $(outdir)/%.texi
 # we want footers even if website builds (or is built) partly
        $(deep-footify) $(sort $(wildcard $(outdir)/$(*F)/*.html))
 
-$(outdir)/%.dvi:       $(outdir)/%.texi
-# --clean only in >= 3.12s
-# cd $(outdir); texi2dvi --clean ../$< 
-       cd $(outdir); texi2dvi ../$< 
+$(outdir)/%.dvi: $(outdir)/%.texi
+       cd $(outdir); texi2dvi --batch --clean ../$< 
 
 $(outdir)/%.txt: $(outdir)/%.texi
        $(MAKEINFO) -I../ -I $(outdir) --no-split --no-headers --output $@ $<

diff --git a/stepmake/stepmake/texinfo-rules.make.orig b/stepmake/stepmake/texinfo-rules.make.orig
new file mode 100644 (file)
index 0000000..e24d664
--- /dev/null
+++ b/stepmake/stepmake/texinfo-rules.make.orig
@@ -0,0 +1,33 @@
+# Texinfo_rules.make
+
+.SUFFIXES: .html .info .texi .texinfo
+
+$(outdir)/%.info: $(outdir)/%.texi
+       -$(MAKEINFO) --force -I $(outdir) --output=$@ $<
+
+$(outdir)/%.html: $(outdir)/%.texi
+       -$(MAKEINFO) --force -I $(outdir) --output=$@ --html --no-split --no-headers $<
+# we want footers even if website builds (or is built) partly
+       $(footify) $@
+
+# Generic rule not possible?
+$(outdir)/%/%.html: $(outdir)/%.texi
+       -$(MAKEINFO) --force --output=$@ --html $<
+# we want footers even if website builds (or is built) partly
+       $(deep-footify) $(sort $(wildcard $(outdir)/$(*F)/*.html))
+
+$(outdir)/%.dvi:       $(outdir)/%.texi
+# --clean only in >= 3.12s
+# cd $(outdir); texi2dvi --clean ../$< 
+       cd $(outdir); texi2dvi ../$< 
+
+$(outdir)/%.txt: $(outdir)/%.texi
+       $(MAKEINFO) -I../ -I $(outdir) --no-split --no-headers --output $@ $<
+
+$(outdir)/%.texi: %.texi
+       rm -f $@
+       cp $< $@
+       chmod -w $@
+
+
+