From 8e290e90bbecbfab635b9de8874d14df43a5e634 Mon Sep 17 00:00:00 2001
From: Graham Percival <graham@percival-music.ca>
Date: Mon, 10 Aug 2009 02:34:39 -0700
Subject: [PATCH] Doc: move material from bibliography/ to essay/.
---
Documentation/GNUmakefile | 2 +-
Documentation/bibliography/GNUmakefile | 34 -------------------
Documentation/essay/GNUmakefile | 30 +++++++++++++++-
.../{bibliography => essay}/colorado.bib | 0
.../computer-notation.bib | 0
.../{bibliography => essay}/engraving.bib | 0
.../{bibliography => essay}/html-long.bst | 0
.../{bibliography => essay}/index.html.in | 0
ROADMAP | 3 +-
9 files changed, 32 insertions(+), 37 deletions(-)
delete mode 100644 Documentation/bibliography/GNUmakefile
rename Documentation/{bibliography => essay}/colorado.bib (100%)
rename Documentation/{bibliography => essay}/computer-notation.bib (100%)
rename Documentation/{bibliography => essay}/engraving.bib (100%)
rename Documentation/{bibliography => essay}/html-long.bst (100%)
rename Documentation/{bibliography => essay}/index.html.in (100%)
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 12829682d2..7b9c52fc8d 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -10,7 +10,7 @@ depth = ..
NAME = documentation
LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py)
MANUALS_SUBDIRS = application contributor essay general learning notation
-SUBDIRS = $(MANUALS_SUBDIRS) snippets bibliography logo pictures misc po css $(LANGS)
+SUBDIRS = $(MANUALS_SUBDIRS) snippets logo pictures misc po css $(LANGS)
STEPMAKE_TEMPLATES = documentation texinfo tex omf
LOCALSTEPMAKE_TEMPLATES = lilypond ly
diff --git a/Documentation/bibliography/GNUmakefile b/Documentation/bibliography/GNUmakefile
deleted file mode 100644
index 06055b5808..0000000000
--- a/Documentation/bibliography/GNUmakefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Documentation/bibliography/Makefile
-
-depth=../..
-
-OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES))
-EXTRA_DIST_FILES= $(BIB_FILES) $(call src-wildcard,*.bst)
-BIB_FILES= $(call src-wildcard,*.bib)
-
-STEPMAKE_TEMPLATES=tex documentation
-LOCALSTEPMAKE_TEMPLATES=lilypond ly
-
-include $(depth)/make/stepmake.make
-
-dvi: $(DVI_FILES) $(OUT_BIB_FILES)
-
-ps: $(PS_FILES)
-
-default:
-
-GENHTMLS = engraving colorado computer-notation
-OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html))
-
-ifeq ($(out),www)
-local-WWW-2: $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html) index.html)
-endif
-
-$(outdir)/%.bib: %.bib
- ln -f $< $@
-
-$(outdir)/%.html: %.bib
- BSTINPUTS=$(src-dir) $(buildscript-dir)/bib2html -o $@ $<
-
-local-clean:
- rm -f fonts.aux fonts.log feta*.tfm feta*.*pk
diff --git a/Documentation/essay/GNUmakefile b/Documentation/essay/GNUmakefile
index c93c9e0624..ef207fed8e 100644
--- a/Documentation/essay/GNUmakefile
+++ b/Documentation/essay/GNUmakefile
@@ -1,5 +1,33 @@
depth = ../..
-LOCALSTEPMAKE_TEMPLATES = ly
+STEPMAKE_TEMPLATES=tex documentation
+LOCALSTEPMAKE_TEMPLATES = lilypond ly
+
+OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES))
+EXTRA_DIST_FILES= $(BIB_FILES) $(call src-wildcard,*.bst)
+BIB_FILES= $(call src-wildcard,*.bib)
include $(depth)/make/stepmake.make
+
+dvi: $(DVI_FILES) $(OUT_BIB_FILES)
+
+ps: $(PS_FILES)
+
+default:
+
+GENHTMLS = engraving colorado computer-notation
+OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html))
+
+ifeq ($(out),www)
+local-WWW-2: $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html) index.html)
+endif
+
+$(outdir)/%.bib: %.bib
+ ln -f $< $@
+
+$(outdir)/%.html: %.bib
+ BSTINPUTS=$(src-dir) $(buildscript-dir)/bib2html -o $@ $<
+
+local-clean:
+ rm -f fonts.aux fonts.log feta*.tfm feta*.*pk
+
diff --git a/Documentation/bibliography/colorado.bib b/Documentation/essay/colorado.bib
similarity index 100%
rename from Documentation/bibliography/colorado.bib
rename to Documentation/essay/colorado.bib
diff --git a/Documentation/bibliography/computer-notation.bib b/Documentation/essay/computer-notation.bib
similarity index 100%
rename from Documentation/bibliography/computer-notation.bib
rename to Documentation/essay/computer-notation.bib
diff --git a/Documentation/bibliography/engraving.bib b/Documentation/essay/engraving.bib
similarity index 100%
rename from Documentation/bibliography/engraving.bib
rename to Documentation/essay/engraving.bib
diff --git a/Documentation/bibliography/html-long.bst b/Documentation/essay/html-long.bst
similarity index 100%
rename from Documentation/bibliography/html-long.bst
rename to Documentation/essay/html-long.bst
diff --git a/Documentation/bibliography/index.html.in b/Documentation/essay/index.html.in
similarity index 100%
rename from Documentation/bibliography/index.html.in
rename to Documentation/essay/index.html.in
diff --git a/ROADMAP b/ROADMAP
index 050360d63d..25425e862b 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -13,7 +13,8 @@ source files.
patches for third party programs
Documentation/
application/ Source files for Application Usage manual
- bibliography/ .bib files with references to books and articles
+ essay/ Academic material and .bib files with references
+ to books and articles
contributor/ Source files for the Contribotor's Guide
learning/ Source files for the Learning Manual
misc/ Old announcements, ChangeLogs and NEWS
--
2.39.5