From 91621d62e71a60270a5dec159a2d1f51c9a33f1c Mon Sep 17 00:00:00 2001
From: Graham Percival <graham@percival-music.ca>
Date: Sat, 15 Aug 2009 04:45:36 -0700
Subject: [PATCH] Doc: add general.pdf to pdf build.

Texinfo can't scale images in tex, and in any case they weren't
being used in @sourceimage, so I removed the additional arguments.
(they were breaking the pdf build)
---
 Documentation/GNUmakefile         | 2 +-
 Documentation/common-macros.itexi | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 36e3d43792..0384e4c64a 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 = $(subst $(outdir)/general.pdf,,$(TEXINFO_MANUALS:%=$(outdir)/%.pdf))
+PDF_FILES = $(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 a852227bcf..b9113835d8 100644
--- a/Documentation/common-macros.itexi
+++ b/Documentation/common-macros.itexi
@@ -46,18 +46,19 @@
 @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,WIDTH,HEIGHT,ALTTEXT}
-@image{pictures/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
+@macro sourceimage{FILENAME}
+@image{pictures/\FILENAME\}
 @end macro
 
 @end ifnotinfo
 
 @ifinfo
 
-@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT}
-@image{lilypond/pictures/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
+@macro sourceimage{FILENAME}
+@image{lilypond/pictures/\FILENAME\}
 @end macro
 
 @end ifinfo
-- 
2.39.5