From df064ce0eaa11e1e8d81aeb25279cb8acc8c7b49 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 14 May 2001 10:36:53 +0200 Subject: [PATCH] patch::: 1.4.0.jcn6 1.4.0.jcn6 ========== * Bugfix for configure. * text2html: use python script, use
 instead of .

* Fixed pa.ly.

* Bugfix: lilypond mode: make view messages scroll by.
---
 CHANGES                            | 11 ++++++++
 Documentation/GNUmakefile          |  9 +++---
 Documentation/index.texi           | 44 ++++++++++++++++++++++++++----
 Documentation/misc/GNUmakefile     |  9 ++----
 Documentation/topdocs/INSTALL.texi |  3 +-
 Documentation/user/GNUmakefile     |  2 +-
 Documentation/user/refman.itely    |  2 +-
 VERSION                            |  2 +-
 aclocal.m4                         | 25 ++++++++++-------
 lilypond-mode.el                   | 11 ++------
 mutopia/J.S.Bach/pa.ly             | 17 +++---------
 stepmake/aclocal.m4                | 23 +++++++++-------
 stepmake/bin/text2html.py          | 13 +++++----
 13 files changed, 103 insertions(+), 68 deletions(-)

diff --git a/CHANGES b/CHANGES
index df9b08e1a7..55024df593 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,14 @@
+1.4.0.jcn6
+==========
+
+* Bugfix for configure.
+
+* text2html: use python script, use <pre> instead of <xmp>.
+
+* Fixed pa.ly.
+
+* Bugfix: lilypond mode: make view messages scroll by.
+
 1.4.0.jcn5
 ==========
 
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 46149c1f5f..0dd22f2f2e 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -21,10 +21,9 @@ local-WWW: copy-for-me txt-to-html $(outdir)/regression-test.ps.gz $(outdir)/reg
 copy-for-me:
 	$(foreach a, $(README_TOP_FILES), cp ../$(a) $(outdir)/$(a).txt && ) true
 
+OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
+
+# cd $(outdir) rule gets bit hairy for --srcdir configure builds
 txt-to-html:
-	$(foreach a, $(README_TOP_FILES), \
-		echo "<html><body><xmp>" > $(outdir)/$(a).html;\
-		cat $(outdir)/$(a).txt >> $(outdir)/$(a).html;\
-		echo "" >> $(outdir)/$(a).html\
-	&& ) true
+	$(PYTHON) $(step-bindir)/text2html.py $(OUT_TXT_FILES)
 	$(footify) $(addprefix $(outdir)/, $(addsuffix .html, $(README_TOP_FILES)))
diff --git a/Documentation/index.texi b/Documentation/index.texi
index 932ced707e..162669fd88 100644
--- a/Documentation/index.texi
+++ b/Documentation/index.texi
@@ -26,8 +26,19 @@
 @end html
 
 
+@c Flat lists of links are not so handy
+@c the links themselves (basename of filename) do not make for
+@c intuitive clicking.
+
+
 @unnumberedsubsec Information for new users
 
+@c Hmm, this looks a bit better; maybe for users/developers too?
+
+@quotation
+
+@unnumberedsubsubsec Installation
+
 @itemize @bullet
 @item @uref{../../index.html,index} What is Lilypond?
 @item @uref{../topdocs/out-www/README.html, README} General information.
@@ -35,14 +46,28 @@
   How install on Unix.
 @item @uref{../windows/out-www/installing.html, WINDOWS}
 How to install on Windows.
-@item @uref{http://www.lilypond.org/wiki?LilyPondFaqs,FAQ} Frequently
-asked questions, with answers.
+@end itemize
+
+@c also for users...
+@unnumberedsubsubsec Support
+
+@itemize @bullet
+@item @uref{../topdocs/out-www/FAQ.html,mini-FAQ} Mini FAQ -- very
+frequently asked questions, with answers.
+@item @uref{http://www.lilypond.org/wiki?LilyPondFaqs,FAQs} Frequently
+Asked Questions, with answers.
 @item @uref{http://www.lilypond.org/wiki?MailingLists,MailingLists} Subscribe to
 the mailing lists.
-@item @uref{../user/out-www/lilypond/Tutorial.html,Tutorial} Learn how to use LilyPond.
 @end itemize
 
+@unnumberedsubsubsec Documents
+
+@c direct links into first steps and running lily?
+@itemize @bullet
+@item @uref{../user/out-www/lilypond/Tutorial.html,Tutorial} Learn how to use LilyPond.
+@end itemize
 
+@end quotation
 
 @html
 
@@ -58,11 +83,18 @@ the mailing lists.
 
 @c archives?
 
+@c tutorial?
+
+@item
+@uref{../user/out-www/lilypond/Reference-Manual.html,Reference-Manual}
+The Reference Manual.
 @item @uref{../user/out-www/lilypond-internals/lilypond-internals.html,lilypond-internals}
-Documentation of internals, generated from the sources. If you want to
-fine-tune output, you need the information in this document.
+Full documentation of internals, generated from the sources.  If you
+want to fine-tune output, you need the information in this document.
 @item @uref{../user/out-www/lilypond/lilypond.html,lilypond}
-  The user manual, (in @uref{../user/out-www/lilypond.ps.gz,PostScript}).
+  The complete user manual, (in
+  @uref{../user/out-www/lilypond.ps.gz,PostScript}).
+@c glossary maybe for new users?
 @item @uref{../user/out-www/glossary.html,glossary} A glossary of musical
 terms, including translations.  (in
 @uref{../user/out-www/glossary.ps.gz,Postscript})
diff --git a/Documentation/misc/GNUmakefile b/Documentation/misc/GNUmakefile
index f02cd2c461..183762facc 100644
--- a/Documentation/misc/GNUmakefile
+++ b/Documentation/misc/GNUmakefile
@@ -13,7 +13,8 @@ default: local-doc
 
 #urg default local-WWW target uses footify before its time; 
 # must add footify with txt-to-html target
-local-WWW: $(addprefix $(outdir)/, $(addsuffix .txt, $(TEXTS))) $(OUT_HTMLFILES) txt-to-html
+OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(TEXTS)))
+local-WWW: $(OUT_TXT_FILES) $(OUT_HTMLFILES) txt-to-html
 
 copy-for-me:
 	$(foreach a, $(README_TOP_FILES), cp ../$(a) $(outdir)/$(a).txt && ) true
@@ -22,9 +23,5 @@ $(outdir)/%.txt: %
 	cp $< $@
 
 txt-to-html:
-	$(foreach a, $(TEXTS),\
-		echo "" > $(outdir)/$(a).html;\
-		cat $(outdir)/$(a).txt >> $(outdir)/$(a).html;\
-		echo "" >> $(outdir)/$(a).html\
-	&& ) true
+	$(PYTHON) $(step-bindir)/text2html.py $(OUT_TXT_FILES)
 	$(footify) $(addprefix $(outdir)/, $(addsuffix .html, $(TEXTS)))
diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index e3a24669aa..186ae7507b 100644
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -13,8 +13,7 @@
 This document describes how to build LilyPond on Unix platforms.  It is
 also known to run and compile on Windows NT/95/98 as well.  More
 information on this topic can be found at the
-@uref{ftp://ftp.lilypond.org/pub/LilyPond/gnu-windows/, LilyPond on Windows
-page}.
+@uref{http://www.lilypond.org/gnu-windows/, LilyPond on Windows page}.
 
 
 @html
diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 8626014169..2e0cf50d2c 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -72,7 +72,7 @@ DEEP_HTML_FILES = $(outdir)/lilypond/lilypond.html $(outdir)/lilypond-internals/
 local-WWW: rm-deep-symlinks
 
 rm-deep-symlinks:
-	cd $(outdir) && rm -f lilypond lilypond-internals
+	cd $(outdir) && rm -f lilypond lilypond-internals; true
 
 else
 
diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 9315ae245c..cfff6a0574 100644
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -3219,7 +3219,7 @@ The most important output definition is the @code{\paper} block, for
 music notation.  The syntax is
 
 @example
-  @code{\paper @{} @var{[paperidentifier]} @var{items} @code{@}}
+  @code{\paper @{} [@var{paperidentifier}] @var{items} @code{@}}
 @end example
 
 where each of the items is one of
diff --git a/VERSION b/VERSION
index 21514da0c9..cdf5bf1632 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=4
 PATCH_LEVEL=0
-MY_PATCH_LEVEL=jcn5
+MY_PATCH_LEVEL=jcn6
 
 # 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 d313deb9c8..f363f48a1c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,3 +1,5 @@
+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
 
@@ -537,22 +539,25 @@ AC_DEFUN(AC_STEPMAKE_GETTEXT, [
 
 AC_DEFUN(AC_STEPMAKE_MAKEINFO, [
     AC_CHECK_PROGS(MAKEINFO, makeinfo, error)
-    AC_MSG_CHECKING(whether makeinfo can split html by @node)
-    makeinfo --html --output=out/split < out/foe.html,
+	# -o is a bit overkill?
+	# outfile = os.path.basename (os.path.splitext(a)[0]) + '.html'
+	outfile = os.path.splitext(a)[0] + '.html'
 	
 	try:
 	    os.unlink(outfile)
@@ -12,10 +15,10 @@ for a in sys.argv[1:]:
 	    pass
 
 	s = r"""
-
-%s
-
-""" % open (a).read ()
++%s
+
+""" % open (a).read ()
 	open (outfile, 'w').write (s)
 
 
-- 
2.39.5