* make/mutopia-rules.make ($(outdir)/%.ly): eliminate duplicate recipe.

* tex/texinfo.tex (sectionheading, q.v.): \quoteexpand for
@example

diff --git a/ChangeLog b/ChangeLog
index deee21b0518854feac1bd0808a994efcf828d9ea..f0cc40a4a4099d9af573f0f15d4cc55df286c652 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-02  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * make/mutopia-rules.make ($(outdir)/%.ly): eliminate duplicate recipe.
+
+       * tex/texinfo.tex (sectionheading, q.v.): \quoteexpand for
+       @example
+
 2006-06-01  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * scm/framework-ps.scm (output-framework): start system count at 1.

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index 8a1f0fef85f290e1efb3e68ad5440e04d45b26f9..ef4a483ba0f0d3d6783cd2c8dbfd92be10d8ee9c 100644 (file)
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -1,14 +1,7 @@
 
 
-$(outdir)/%.ly.txt: %.ly
-       ln -f $< $@
-
-$(outdir)/%.ly.txt: $(outdir)/%.ly
-       cp -f $< $@
-
-$(outdir)/%.ly.txt: %.abc
-#which file to show here -- abc seems more cute?
-       ln -f $< $@
+$(outdir)/%.ly: %.ly
+       cp $< $@
 
 $(outdir)/%.ly: %.abc
        $(PYTHON) $(ABC2LY) --strict -o $@ $<
@@ -18,7 +11,4 @@ $(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps: $(outdir)/%.ly
        cd $(outdir); $(LILYPOND_BINARY) --pdf --png -ddump-signatures -danti-alias-factor=2 -ddump-signatures -ddelete-intermediate-files -dno-point-and-click -I $(call absdir,$(src-dir))/ $(notdir $<)
        touch $(outdir)/$(basename $(notdir $<)).png
 
-$(outdir)/%.ly: %.ly
-       cp $< $@
-
 

diff --git a/tex/texinfo.tex b/tex/texinfo.tex
index 6bc9fcdadd7aae26e863558c8dd4aeab57d428b3..7590aeacf13781177df9d5f9c38a61f4cb7ff0f6 100644 (file)
--- a/tex/texinfo.tex
+++ b/tex/texinfo.tex
@@ -5062,7 +5062,7 @@ where each line of input produces a line of output.}
 %
 \maketwodispenvs {lisp}{example}{%
   \nonfillstart
-  \tt
+  \tt\quoteexpand
   \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
   \gobble       % eat return
 }