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)

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 36e3d437920c15c104a485975b3139ec874da324..0384e4c64a3687aabd3aab90eb13cf655d8ce543 100644 (file)
--- 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 a852227bcfabb64093bf5232803f8000242a0a57..b9113835d8ab3d22a3079d51b990473ab65acb06 100644 (file)
--- 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