From 8ba4e8e8152da323642c403a961d1ecff4a0d8f2 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 17 Jul 2006 17:09:13 +0000
Subject: [PATCH] * lily/translator-group.cc (connect_to_context): non const
 error message.

* Documentation/user/GNUmakefile ($(outdir)/%.pdf): update to use PDF
---
 ChangeLog                      |  4 ++++
 Documentation/user/GNUmakefile | 24 ++++++++++++------------
 lily/translator-group.cc       |  6 +++++-
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fde27e5a72..4c1ffc0c85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-07-17  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+	* lily/translator-group.cc (connect_to_context): non const error message.
+
+	* Documentation/user/GNUmakefile ($(outdir)/%.pdf): update to use PDF
+
 	* scm/paper.scm (internal-set-paper-size): define landscape to #f
 	if unset.
 
diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 71e82b75c3..ac8eb3ffd3 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -2,15 +2,14 @@ depth=../..
 
 LATEX_FILES =$(call src-wildcard,*.latex)
 
-# todo: add latex.
-DVI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.dvi)
 
 EXTRA_DIST_FILES= $(LATEX_FILES) $(IMAGES) README.txt $(EPS_ILLUSTRATIONS)
 
 IMAGES=$(call src-wildcard,*.png)
 EPS_ILLUSTRATIONS=context-example.eps
+PDF_ILLUSTRATIONS=context-example.pdf
 
-OUT_EPS_IMAGES=$(IMAGES:%.png=$(outdir)/%.eps) $(addprefix $(outdir)/,$(EPS_ILLUSTRATIONS))
+OUT_PDF_IMAGES=$(IMAGES:%.png=$(outdir)/%.pdf) $(addprefix $(outdir)/,$(PDF_ILLUSTRATIONS))
 OUT_PNG_IMAGES=$(OUT_EPS_IMAGES:%.eps=%.png)
 
 OUT_TEXI_FILES=$(ITEXI_FILES:%.itexi=$(outdir)/%.texi)\
@@ -18,10 +17,8 @@ OUT_TEXI_FILES=$(ITEXI_FILES:%.itexi=$(outdir)/%.texi)\
 HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%.html)\
  $(outdir)/lilypond-internals.html
 
-PS_FILES = $(DVI_FILES:.dvi=.ps)
-PDF_FILES = $(DVI_FILES:.dvi=.pdf)
-
-PS_GZ_FILES= $(addsuffix .gz, $(PS_FILES))
+# todo: add latex.
+PDF_FILES = $(TELY_FILES:%.tely=$(outdir)/%.pdf)
 
 INFO_DOCS = lilypond lilypond-internals music-glossary
 INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
@@ -38,10 +35,6 @@ export TEXINPUTS
 
 include $(depth)/make/stepmake.make
 
-dvi: $(DVI_FILES)
-
-ps: $(PS_FILES)
-
 info: $(INFO_FILES)
 
 pathsettings:
@@ -195,7 +188,7 @@ $(outdir)/lilypond-internals/lilypond-internals.xml: $(outdir)/lilypond-internal
 	mkdir -p $(dir $@)
 	$(MAKEINFO) --output=$(outdir)/lilypond-internals --docbook $<
 
-$(outdir)/lilypond.dvi: $(OUT_EPS_IMAGES) $(OUT_PNG_IMAGES)
+$(outdir)/lilypond.pdf: $(OUT_PDF_IMAGES) $(OUT_PNG_IMAGES)
 
 $(outdir)/%.png: %.png
 	convert -geometry 50x50% $< $@
@@ -209,6 +202,13 @@ $(outdir)/%.eps: %.png
 $(outdir)/%.eps: %.eps
 	cp $< $@
 
+$(outdir)/%.pdf: %.png
+	convert $< $@
+
+$(outdir)/%.pdf: %.eps
+	convert $< $@
+
+
 DEEP_HTML_FILES =\
  $(outdir)/lilypond/index.html\
  $(outdir)/lilypond-internals/index.html\
diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 701c75ef77..badd1b82e8 100644
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -45,7 +45,11 @@ void
 Translator_group::connect_to_context (Context *c)
 {
   if (context_)
-    programming_error ("translator group is already connected to a context");
+    {
+      programming_error ("translator group is already connected to context "
+			 +  context_->context_name ());
+    }
+  
   context_ = c;
   c->event_source ()->add_listener (GET_LISTENER (eat_event),
 				    ly_symbol2scm ("OldMusicEvent"));
-- 
2.39.5