From 93f93495fe58267ffd60cba1538a5c85548c6107 Mon Sep 17 00:00:00 2001
From: Graham Percival <graham@percival-music.ca>
Date: Fri, 22 Jan 2010 00:17:03 +0000
Subject: [PATCH] Build: begin bibliography re-integration.

---
 Documentation/essay/GNUmakefile                        |  5 +++++
 Documentation/essay/colorado.bib                       | 10 +++++-----
 .../essay/{engraving.bib => engravingbib.bib}          |  3 +++
 3 files changed, 13 insertions(+), 5 deletions(-)
 rename Documentation/essay/{engraving.bib => engravingbib.bib} (98%)

diff --git a/Documentation/essay/GNUmakefile b/Documentation/essay/GNUmakefile
index e88870f1a1..068109cdcf 100644
--- a/Documentation/essay/GNUmakefile
+++ b/Documentation/essay/GNUmakefile
@@ -9,6 +9,11 @@ BIB_FILES= $(call src-wildcard,*.bib)
 
 include $(depth)/make/stepmake.make
 
+# we no longer create bibliography files in this subdir,
+# since it needs to be done in the main Documentation/ dir.
+# all the below can _probably_ be removed, but I haven't
+# examined it in detail.
+# I think this is just going to wait until we switch to waf.  -gp
 dvi: $(DVI_FILES) $(OUT_BIB_FILES)
 
 ps: $(PS_FILES)
diff --git a/Documentation/essay/colorado.bib b/Documentation/essay/colorado.bib
index f72fa189d8..8b78dde21c 100644
--- a/Documentation/essay/colorado.bib
+++ b/Documentation/essay/colorado.bib
@@ -65,9 +65,9 @@
 
 
 
-@Book{?:_pictor_histor_music_print,
-	author={?},
-	title = {Pictoral History of Music Printing},
+@Book{unknown_author:_pictor_histor_music_print,
+	author={unknown author},
+	title = {Pictorial History of Music Printing},
 	address={Elhardt, Indiana},
 	publisher={H. and A. Selmer, Inc.},
 	note= {subject: history of music printing and engraving},
@@ -306,8 +306,8 @@
 	author = {Gaburo, Virginia},
 	year = 1977,
 	title = {Notation},
-	address={publisher= {Lingua Press},
-	publisher={La Jolla, California}},
+	publisher={Lingua Press},
+	address={La Jolla, California},
 	note = {A Lecture about notation, new ideas about},
 }
 
diff --git a/Documentation/essay/engraving.bib b/Documentation/essay/engravingbib.bib
similarity index 98%
rename from Documentation/essay/engraving.bib
rename to Documentation/essay/engravingbib.bib
index 6d8e0e9e71..73cef3949e 100644
--- a/Documentation/essay/engraving.bib
+++ b/Documentation/essay/engravingbib.bib
@@ -1,3 +1,6 @@
+% This file cannot be named "engraving.bib" due to a conflict
+% with the existing engraving.itely file.  -gp
+
 %
 % TITLE=The engraving bibliography
 % AUTHOR=Han-Wen Nienhuys
-- 
2.39.5