From d2807e80eff740863552ac51c47f9c3da2baaa11 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 19 Oct 1999 18:17:30 +0200
Subject: [PATCH] patch::: 1.2.15.jcn2

pl 15.jcn2
	- small website fixes
---
 CHANGES                                |  3 ++
 Documentation/GNUmakefile              |  2 +-
 Documentation/bibliography/GNUmakefile | 45 +++-----------------------
 Documentation/index.texi               |  5 +--
 VERSION                                |  2 +-
 5 files changed, 13 insertions(+), 44 deletions(-)

diff --git a/CHANGES b/CHANGES
index f37fcccf7b..e7b8bdb8f3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+pl 15.jcn2
+	- small website fixes
+
 pl 15.jcn1
 	- bfs: initialise members of Column-x-positions and Break_node
 	- bf: Documentation/misc: don't include backups
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 1d6e86f54e..3834700846 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -4,7 +4,7 @@ NAME = documentation
 SUBDIRS= user metadoc bibliography pictures topdocs ntweb misc
 STEPMAKE_TEMPLATES=documentation  texinfo
 
-README_TOP_FILES=NEWS DEDICATION CHANGES
+README_TOP_FILES=NEWS DEDICATION CHANGES TODO
 EXTRA_DIST_FILES = 
 
 include $(depth)/make/stepmake.make 
diff --git a/Documentation/bibliography/GNUmakefile b/Documentation/bibliography/GNUmakefile
index 899251880a..a7862db9ae 100644
--- a/Documentation/bibliography/GNUmakefile
+++ b/Documentation/bibliography/GNUmakefile
@@ -2,23 +2,9 @@
 
 depth=../..
 
-DATA_FILES = $(wildcard *.data)
-datafiles = $(addprefix $(outdir)/,$(DATA_FILES:.data=.html))
-TEX_FILES = $(wildcard *.tex)
-DOC_FILES = $(wildcard *.doc)
-DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi) $(YO_FILES:.yo=.dvi))
 OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES))
-
-# just include me
-YO_URG_FILES = $(wildcard *.yo-urg)
-
-OUTTEX_FILES = $(addprefix $(outdir)/, $(TEX_FILES))
-OUTDOC_FILES = $(addprefix $(outdir)/, $(DOC_FILES))
-EL_FILES = $(wildcard *.el)
 BIB_FILES= $(wildcard *.bib)
-EXTRA_DIST_FILES= $(BIB_FILES) $(DOC_FILES) $(DATA_FILES) $(EL_FILES) $(YO_URG_FILES) $(TEX_FILES) $(wildcard *.sty) 
-HTML_FILES = $(addprefix $(outdir)/, $(YO_FILES:.yo=.html))
-PS_FILES = $(DVI_FILES:.dvi=.ps)
+EXTRA_DIST_FILES= $(BIB_FILES)
 
 STEPMAKE_TEMPLATES=tex documentation
 LOCALSTEPMAKE_TEMPLATES=lilypond mudela
@@ -26,12 +12,7 @@ LOCALSTEPMAKE_TEMPLATES=lilypond mudela
 export BIBINPUTS:=$(shell pwd)//$(PATHSEP)$(BIBINPUTS)
 include $(depth)/make/stepmake.make 
 
-
-
-
-
-
-dvi: $(OUT_BIB_FILES) $(DVI_FILES)
+dvi: $(DVI_FILES) $(OUT_BIB_FILES)
 
 ps: $(PS_FILES)
 
@@ -41,18 +22,7 @@ default:
 GENHTMLS = engraving colorado  computer-notation
 OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html))
 
-#urg should generalise and move Lilypond -> StepMake
-# URG.  Lilypond specific. Move out. 
-$(outdir)/%.html: %.data $(depth)/VERSION
-	$(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='
' -o $@ $<
-	$(PYTHON) $(step-bindir)/add-html-footer.py  $@
-
-$(outdir)/%.tex: %.data $(depth)/VERSION
-	$(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='
'  -o $@ --latex $<
-
-
-
-local-WWW: $(HTML_FILES) $(OUTTEX_FILES:.tex=.ps.gz) $(OUTYO_FILES:.yo=.latex) $(OUTYO_FILES:.yo=.ps.gz) $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html)) $(datafiles)
+local-WWW: $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html))
 	$(PYTHON) $(step-bindir)/ls-latex.py  --title 'References on Music Notation' \
 	  $(YO_FILES) $(OUTYO_FILES:.yo=.latex) $(BIB_FILES) $(DOC_FILES) $(TEX_FILES) \
 	  | sed "s!$(outdir)/!!g" > $(outdir)/index.html
@@ -63,12 +33,7 @@ $(outdir)/%.bib: %.bib
 # ignore result since bib2html is nonstandard. Errors would halt the RPM build.j  
 $(outdir)/%.html: %.bib
 	-bib2html $< $@
+	$(footify) $@
 
-# Yeah right: 
-# make -k out/mudela.dvi => cp -f out/vocabulary.tex out/mudela.dvi
-
-#out/%: $(outdir)/%
-#	cp -f $< $@
-
-locamlclean:
+localclean:
 	rm -f fonts.aux fonts.log feta*.tfm feta*.*pk
diff --git a/Documentation/index.texi b/Documentation/index.texi
index 31afd58918..6f479604f1 100644
--- a/Documentation/index.texi
+++ b/Documentation/index.texi
@@ -22,12 +22,13 @@
 @item @uref{programs.html,`Manual pages'}
 @item @uref{../user/out-www/index.html,User documentation}
 @item @uref{../metadoc/out-www/index.html,Hacker documentation}
-@item @uref{../bibliography/out-www/,Bibliography}
+@item @uref{../bibliography/out-www/index.html,Bibliography}
 @item @uref{../misc/out-www/index.html,Miscellaneous texts}
 @end itemize
 
 
-@unnumberedsubsec{Status}
+@unnumberedsubsec Status
+
 @itemize
 @item @uref{TODO.txt, Thing to do}
 @item @uref{CHANGES.txt, Things recently done}
diff --git a/VERSION b/VERSION
index 3bdc14f000..92af2c6366 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=2
 PATCH_LEVEL=15
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
-- 
2.39.5