* lily/translator-group.cc (connect_to_context): non const error message.

* Documentation/user/GNUmakefile ($(outdir)/%.pdf): update to use PDF

diff --git a/ChangeLog b/ChangeLog
index fde27e5a72f4cb202bd49fd9e304a10141b2aea9..4c1ffc0c851a913db3bc6ba360d6bda7efb70ec0 100644 (file)
--- 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 71e82b75c30d14df20537e71bda0813aba71b4eb..ac8eb3ffd3c6aa00f9283786fdcc6989d2de942e 100644 (file)
--- 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 701c75ef77ab5deff023f663e0e96b90dd3fcf89..badd1b82e802da140b35901b97a953e4be1b2ecd 100644 (file)
--- 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"));