lilypond-1.0.9

diff --git a/Documentation/tex/GNUmakefile b/Documentation/tex/GNUmakefile
index f1bf0b4878f21af6a5184dcca9bbc039487e17d1..951d7b4d802ad4ebafc7c7621b0998fbd1de88a8 100644 (file)
--- a/Documentation/tex/GNUmakefile
+++ b/Documentation/tex/GNUmakefile
@@ -6,6 +6,8 @@ DATA_FILES = $(wildcard *.data)
 datafiles = $(addprefix $(outdir)/,$(DATA_FILES:.data=.html))
 DOC_FILES = $(wildcard *.doc)
 DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi) $(YO_FILES:.yo=.dvi))
+OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES))
+
 OUTDOC_FILES = $(addprefix $(outdir)/, $(DOC_FILES))
 EL_FILES = $(wildcard *.el)
 BIB_FILES= $(wildcard *.bib)
@@ -15,11 +17,13 @@ PS_FILES = $(DVI_FILES:.dvi=.ps)
 
 STEPMAKE_TEMPLATES=documentation
 LOCALSTEPMAKE_TEMPLATES=lilypond mudela
+export BIBINPUTS="$(topdir)/Documentation/tex//"#huh?
 
 
 include $(depth)/make/stepmake.make 
 
-dvi: $(DVI_FILES)
+dvi: $(OUT_BIB_FILES) $(DVI_FILES)
+
 
 ps: $(PS_FILES)
 

diff --git a/Documentation/tex/glossary.yo b/Documentation/tex/glossary.yo
index 88cb2ab09d1f0be883f4e182576204b91569d24e..839ed95eca38870000212465ba795d2cdc9f3baf 100644 (file)
--- a/Documentation/tex/glossary.yo
+++ b/Documentation/tex/glossary.yo
@@ -17,12 +17,16 @@ in stead <-> instead
 htmlbodyopt(bgcolor)(white)
 htmlcommand(<font color=black>)
 
-latexpackage()(a4wide) COMMENT(UGH)
 latexlayoutcmds(
-%\usepackage[latin1]{inputenc}
-\input mudela-book
+\setlength{\topmargin}{-0.25in}
+\setlength{\textheight}{9in}
+\setlength{\textwidth}{5.875in} 
+\setlength{\oddsidemargin}{0.25in}   
+\setlength{\evensidemargin}{0.25in}
 )
 
+latexpackage()(a4wide) COMMENT(UGH)
+
 whenlatex(notableofcontents())
 whentexinfo(notableofcontents())
 
@@ -77,18 +81,3 @@ whenhtml(
     includeverbatim(DOEXPAND(outdir)/glossary-table.html)
 )
 
-whenlatex(latexcommand(
-    \bibliographystyle{plain}
-    \bibliography{engraving}
-))
-
-
-COMMENT(The bib stuff is somewhere else on the WWW site)
-COMMENT(
-setchapterstring{}
-
-whenhtml{
-    nchapter{Bibliography}
-    includeverbatim{out-www/engraving.html}
-})
-

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index eb26aaaa23654ab4c5b24bc0e45c4b50f6445043..f912908583963d3ed46219244c41fbd39245a2e6 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -1,5 +1,6 @@
+
 export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH)
 export MFINPUTS:=$(topdir)/mf/$(PATHSEP)$(MFINPUTS)$(PATHSEP)$(PATHSEP)
 export TEXINPUTS:=$(topdir)/tex/$(PATHSEP)$(TEXINPUTS)$(PATHSEP)$(PATHSEP)
-export LILYINCLUDE=$(topdir)/init$(PATHSEP)$(topdir)/mf/out
+export LILYINCLUDE:=$(topdir)/init$(PATHSEP)$(topdir)/mf/out$(PATHSEP)$(LILYINCLUDE)