From 7f356a39016d9be47b9668b9821761d9766c182e Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Sun, 16 Aug 2009 02:38:12 -0700 Subject: [PATCH] Revert "Doc: add general.pdf to pdf build." This reverts commit 790824854dee18fcfdeed3a5299af5d69ad426c4. I discovered the real reason: if you have a multi-arg macro, you *must* fill all args when using the TeX backend. This doesn't apply to info and html, growl. Sometimes I maoing hate texinfo. --- Documentation/GNUmakefile | 2 +- Documentation/common-macros.itexi | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 0384e4c64a..36e3d43792 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -53,7 +53,7 @@ OUT_TEXINFO_MANUALS = $(TEXINFO_MANUALS:%=$(outdir)/%.texi) # of the NR TEXI_FILES_FROM_TELY = $(outdir)/internals.texi -PDF_FILES = $(TEXINFO_MANUALS:%=$(outdir)/%.pdf) +PDF_FILES = $(subst $(outdir)/general.pdf,,$(TEXINFO_MANUALS:%=$(outdir)/%.pdf)) UNSPLITTED_HTML_MANUALS = changes SPLITTED_HTML_MANUALS = $(foreach manual, $(TEXINFO_MANUALS),\ diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi index b9113835d8..a852227bcf 100644 --- a/Documentation/common-macros.itexi +++ b/Documentation/common-macros.itexi @@ -46,19 +46,18 @@ @c already generates proper @image commands for images of music; these @c macro definitions do the same for other images. -@c can't scale images in tex @ifnotinfo -@macro sourceimage{FILENAME} -@image{pictures/\FILENAME\} +@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT} +@image{pictures/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\} @end macro @end ifnotinfo @ifinfo -@macro sourceimage{FILENAME} -@image{lilypond/pictures/\FILENAME\} +@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT} +@image{lilypond/pictures/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\} @end macro @end ifinfo -- 2.39.2