From dca4b1239692830572c0e5a7dac01eb93e82deed Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 2 Jan 2001 12:29:36 +0100 Subject: [PATCH] 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 --- CHANGES | 18 ++++++++++++- Documentation/bibliography/GNUmakefile | 4 +-- Documentation/topdocs/INSTALL.texi | 23 +++++++++------- Documentation/user/GNUmakefile | 2 ++ Documentation/user/lilypond.tely | 8 ++++++ VERSION | 2 +- aclocal.m4 | 14 ++++++++-- config.make.in | 2 ++ configure.in | 1 + flower/include/proto.hh | 2 -- scm/documentation-lib.scm | 5 ++++ stepmake/aclocal.m4 | 14 ++++++++-- stepmake/stepmake/texinfo-rules.make | 6 ++--- stepmake/stepmake/texinfo-rules.make.orig | 33 +++++++++++++++++++++++ 14 files changed, 109 insertions(+), 25 deletions(-) delete mode 100644 flower/include/proto.hh create mode 100644 stepmake/stepmake/texinfo-rules.make.orig diff --git a/CHANGES b/CHANGES index 4a5226d46e..086482e6ab 100644 --- 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 2c193065be..b3fd5fc7a1 100644 --- 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 e76f50d0eb..acf507c807 100644 --- 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 d8d035834e..6bf16c2d01 100644 --- 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 88b3b59f16..e2d9cfbd08 100644 --- 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 3e08f80e70..2b9728f50c 100644 --- 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 724a91b40b..0de4fdda72 100644 --- 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 97b7d70045..3f2ec353a2 100644 --- 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 c4cf39588c..db95517de9 100644 --- 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 index 65296f8106..0000000000 --- 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 0593eac0a9..317fc486db 100644 --- 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 724a91b40b..0de4fdda72 100644 --- 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 e24d66435a..0356e36296 100644 --- 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 index 0000000000..e24d66435a --- /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 $@ + + + -- 2.39.2