X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fcommon-macros.itexi;h=2c42b5185ebc9f0273793c2e33a20d9bcdbf51fd;hb=4c1b05d4d94f84248cce5a8a4c7ae58c2e04bf54;hp=f8bb25fa193fb1743f2403bc536c8bde4c0bc161;hpb=a1f9375c70400bc4820921bd2ebbbb387a7dcf98;p=lilypond.git

diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi
index f8bb25fa19..2c42b5185e 100644
--- a/Documentation/common-macros.itexi
+++ b/Documentation/common-macros.itexi
@@ -1,6 +1,10 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 
 
+@c ***********************************************
+@c SEE MACRO DEFINITION GUIDELINES IN macros.itexi
+@c ***********************************************
+
 @c Don't replace quotes with directed quotes.
 
 @set txicodequoteundirected
@@ -130,16 +134,6 @@ UNTRANSLATED NODE: IGNORE ME
 
 @ifset web
 
-@macro help{TEXT}
-@html
-<div class="help">
-<strong>
-  <span style="text-decoration:blink">Help wanted:</span>
-</strong> \TEXT\
-</div>
-@end html
-@end macro
-
 @macro divId {ID}
 @html
 <div id="\ID\">
@@ -160,6 +154,20 @@ UNTRANSLATED NODE: IGNORE ME
 @end html
 @end macro
 
+@macro spanClass {CLASS}
+@html
+<span class="\CLASS\">
+@end html
+@end macro
+
+@macro spanEnd
+@c keep the space for proper nesting of </p>
+
+@html
+</span>
+@end html
+@end macro
+
 
 @c not strictly necessary, but it makes things easier for updating news
 @macro newsItem
@@ -176,33 +184,12 @@ UNTRANSLATED NODE: IGNORE ME
 @end html
 @end macro
 
-@macro exampleImage{IMAGE-FILE}
-@html
-<div class="float-center">
-  <a class="clickable" href="examples/\IMAGE-FILE\.png">
-    <img src="examples/\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\-small,,,\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, EXT, MORE-TEXT, CLICK-FILE, CLICK-EXT, POSITION}
 @html
 <div class="float-\POSITION\">
-  <a class="clickable" href="\CLICK-FILE\.\CLICK-EXT\">
-    <img src="\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
+  <a class="clickable" href="../pictures/\CLICK-FILE\.\CLICK-EXT\">
+    <img src="../pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
   </a>
   <p style="text-align: center">
     \MORE-TEXT\
@@ -213,36 +200,33 @@ FIXME: images broken in info
 @image{pictures/\IMAGE-FILE\,,,\IMAGE-FILE\}
 @end iftex
 @ifinfo
-FIXME: images broken in info
-@c @sourceimage{lilypond/\IMAGE-FILE\,,,\IMAGE-FILE\}
+@image{lilypond/pictures/\IMAGE-FILE\,,,\IMAGE-FILE\}
 @end ifinfo
 @end macro
 
 @macro imageFloat{IMAGE-FILE, EXT, POSITION}
 @html
-<img class="float-\POSITION\" src="pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
+<img class="float-\POSITION\" src="../pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
 @end html
 @iftex
 @image{pictures/\IMAGE-FILE\,,,\IMAGE-FILE\,\EXT\}
 @end iftex
 @ifinfo
-FIXME: images broken in info
-@c @sourceimage{lilypond/\IMAGE-FILE\,,,\EXT\}
+@image{lilypond/pictures/\IMAGE-FILE\,,,\EXT\}
 @end ifinfo
 @end macro
 
 @macro imageId{ID, IMAGE-FILE, EXT, ALT}
 @html
 <div id="\ID\">
-  <img src="pictures/\IMAGE-FILE\.\EXT\" alt="\ALT\">
+  <img src="../pictures/\IMAGE-FILE\.\EXT\" alt="\ALT\">
 </div>
 @end html
 @iftex
 @image{pictures/\IMAGE-FILE\,,,\ALT\}
 @end iftex
 @ifinfo
-FIXME: images broken in info
-@c @sourceimage{lilypond/\IMAGE-FILE\,,,\ALT\}
+@image{lilypond/pictures/\IMAGE-FILE\,,,\ALT\}
 @end ifinfo
 @end macro