From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 19 Jul 2006 00:38:25 +0000 (+0000)
Subject: (OUT_PNG_IMAGES): pdf iso. eps as
X-Git-Tag: release/2.10.0-2~458
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ec46c9287daa9de74f09ccaac1a698ea49415b9e;p=lilypond.git

(OUT_PNG_IMAGES): pdf iso. eps as
base.
---

diff --git a/ChangeLog b/ChangeLog
index b3bfce73ec..9bf46101d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2006-07-19  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+	* Documentation/user/GNUmakefile (OUT_PNG_IMAGES): pdf iso. eps as
+	base.
+
 2006-07-17  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
-	* VERSION (PATCH_LEVEL): bump version.
+	* VERSION (PATCH_LEVEL): bump version. Release 2.9.12
 
 	* Documentation/user/lilypond-book.itely (Invoking lilypond-book):
 	doc pdftex usage.
diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index ac8eb3ffd3..c93cf4a217 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -10,7 +10,8 @@ EPS_ILLUSTRATIONS=context-example.eps
 PDF_ILLUSTRATIONS=context-example.pdf
 
 OUT_PDF_IMAGES=$(IMAGES:%.png=$(outdir)/%.pdf) $(addprefix $(outdir)/,$(PDF_ILLUSTRATIONS))
-OUT_PNG_IMAGES=$(OUT_EPS_IMAGES:%.eps=%.png)
+
+OUT_PNG_IMAGES=$(OUT_PDF_IMAGES:%.pdf=%.png)
 
 OUT_TEXI_FILES=$(ITEXI_FILES:%.itexi=$(outdir)/%.texi)\
  $(ITELY_FILES:%.itely=$(outdir)/%.texi)
@@ -206,7 +207,7 @@ $(outdir)/%.pdf: %.png
 	convert $< $@
 
 $(outdir)/%.pdf: %.eps
-	convert $< $@
+	epstopdf $< $@
 
 
 DEEP_HTML_FILES =\
diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index dc94a8d2f9..b9929ca391 100644
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -58,9 +58,11 @@ Copyright @copyright{} 1999--2006 by the authors
 @top Music glossary
 @end ifnottex
 
-This glossary was brought you by
 
 @ifnottex
+
+This glossary was brought you by
+
 @table @code
 @item Adrian Mariano
 Italian glossary,