Doc build: enable general.pdf, simplify macro for Intro->Examples.

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..1b9cb1e64ed3942ad0c61b83f4dbc421f28c5799 100644 (file)
--- a/Documentation/common-macros.itexi
+++ b/Documentation/common-macros.itexi
@@ -176,45 +176,74 @@ UNTRANSLATED NODE: IGNORE ME
 @end html
 @end macro
 
+@macro exampleImage{IMAGE-FILE}
+@html
+<div class="float-center">
+  <a class="clickable" href="\IMAGE-FILE\.png">
+    <img src="\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
+  </a>
+  <p style="text-align: center">
+    (click to enlarge)
+  </p>
+</div>
+@end html
+@iftex
+@image{general/examples/out-www/\IMAGE-FILE\,,,\IMAGE-FILE\,png}
+@end iftex
+@ifinfo
+FIXME: images broken in info
+@c @sourceimage{lilypond/general/examples/out-www/\IMAGE-FILE\,,,\IMAGE-FILE\,png}
+@end ifinfo
+@end macro
+
 
 
-@macro imageClickable{IMAGE-FILE, MORE-TEXT, CLICK-FILE, POSITION}
+@macro imageClickable{IMAGE-FILE, EXT, MORE-TEXT, CLICK-FILE, CLICK-EXT, POSITION}
 @html
 <div class="float-\POSITION\">
-  <a class="clickable" href="\CLICK-FILE\">
-    <img src="\IMAGE-FILE\" alt="\IMAGE-FILE\">
+  <a class="clickable" href="\CLICK-FILE\.\CLICK-EXT\">
+    <img src="\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
   </a>
   <p style="text-align: center">
     \MORE-TEXT\
   </p>
 </div>
 @end html
-@ifnothtml
-FIXME: broken image
-@c @image{\IMAGE-FILE\}
-@end ifnothtml
+@iftex
+@image{\IMAGE-FILE\,,,\IMAGE-FILE\}
+@end iftex
+@ifinfo
+FIXME: images broken in info
+@c @sourceimage{lilypond/\IMAGE-FILE\,,,\IMAGE-FILE\}
+@end ifinfo
 @end macro
 
-@macro imageFloat{IMAGE-FILE, POSITION}
+@macro imageFloat{IMAGE-FILE, EXT, POSITION}
 @html
-<img class="float-\POSITION\" src="pictures/\IMAGE-FILE\" alt="\IMAGE-FILE\">
+<img class="float-\POSITION\" src="pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
 @end html
-@ifnothtml
-FIXME: broken image
-@c @image{\IMAGE-FILE\}
-@end ifnothtml
+@iftex
+@image{\IMAGE-FILE\,,,\IMAGE-FILE\,\EXT\}
+@end iftex
+@ifinfo
+FIXME: images broken in info
+@c @sourceimage{lilypond/\IMAGE-FILE\,,,\EXT\}
+@end ifinfo
 @end macro
 
-@macro imageId{ID, IMAGE-FILE, ALT}
+@macro imageId{ID, IMAGE-FILE, EXT, ALT}
 @html
 <div id="\ID\">
-  <img src="pictures/\IMAGE-FILE\" alt="\ALT\">
+  <img src="pictures/\IMAGE-FILE\.\EXT\" alt="\ALT\">
 </div>
 @end html
-@ifnothtml
-FIXME: broken image
-@c @image{\IMAGE-FILE\}
-@end ifnothtml
+@iftex
+@image{\IMAGE-FILE\,,,\ALT\}
+@end iftex
+@ifinfo
+FIXME: images broken in info
+@c @sourceimage{lilypond/\IMAGE-FILE\,,,\ALT\}
+@end ifinfo
 @end macro
 
 @end ifset