X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fcommon-macros.itexi;h=9873604a5042399693114958782d33d875a1c875;hb=a17624f0068b92ac91f199496cad59849b038eaa;hp=1b9cb1e64ed3942ad0c61b83f4dbc421f28c5799;hpb=0d312acf40ed873754224fd8ea96696fd535bebf;p=lilypond.git

diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi
index 1b9cb1e64e..9873604a50 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,14 +134,13 @@ 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
+@c make link to bugfixes for news.itexi
+@c use underscores for version: @bugfixes{2_13_13,}
+@c use specifier arg when listing multiple versions
+@c (see September 20, 2007 post for an example)
+@macro bugfixes{version,specifier}
+@uref{http://code.google.com/p/lilypond/issues/list?can=1&q=fixed_\version\&colspec=ID+Type+Status+Priority+Milestone+Owner+Summary,Bugfixes
+\specifier\}
 @end macro
 
 @macro divId {ID}
@@ -160,49 +163,60 @@ UNTRANSLATED NODE: IGNORE ME
 @end html
 @end macro
 
+@ifclear web_version
+  @ifclear bigpage
+    @macro docLink{name,target,webLink}
+      @uref{../\target\, \name\}
+    @end macro
+  @end ifclear
+  @ifset bigpage
+    @macro docLink{name,target,webLink}
+      @uref{\target\, \name\}
+    @end macro
+  @end ifset
+@end ifclear
+@ifset web_version
+  @macro docLink{name,target,webLink}
+    \webLink\
+  @end macro
+@end ifset
 
-@c not strictly necessary, but it makes things easier for updating news
-@macro newsItem
+@macro spanClass {CLASS}
 @html
-<div class="news-item">
+<span class="\CLASS\">
 @end html
 @end macro
 
-@macro newsEnd
+@macro spanEnd
 @c keep the space for proper nesting of </p>
 
 @html
-</div>
+</span>
 @end html
 @end macro
 
-@macro exampleImage{IMAGE-FILE}
+
+@c not strictly necessary, but it makes things easier for updating news
+@macro newsItem
 @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>
+<div class="news-item">
 @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 newsEnd
+@c keep the space for proper nesting of </p>
+
+@html
+</div>
+@end html
+@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\
@@ -210,11 +224,10 @@ FIXME: images broken in info
 </div>
 @end html
 @iftex
-@image{\IMAGE-FILE\,,,\IMAGE-FILE\}
+@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
 
@@ -223,11 +236,10 @@ FIXME: images broken in info
 <img class="float-\POSITION\" src="pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
 @end html
 @iftex
-@image{\IMAGE-FILE\,,,\IMAGE-FILE\,\EXT\}
+@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
 
@@ -238,11 +250,10 @@ FIXME: images broken in info
 </div>
 @end html
 @iftex
-@image{\IMAGE-FILE\,,,\ALT\}
+@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