Merge branch 'master' into lilypond/translation

[lilypond.git] / Documentation / common-macros.itexi

diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi
index db65589dad2de15a7dc21d1abc8e0e48cfad0508..11bae886e4613c31e968b31deb11a3cc2aa51268 100644 (file)
--- 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,6 +163,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,26 +193,6 @@ 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{examples/\IMAGE-FILE\-small,,,\IMAGE-FILE\,png}
-@end iftex
-@ifinfo
-@image{lilypond/examples/\IMAGE-FILE\,,,\IMAGE-FILE\,png}
-@end ifinfo
-@end macro
-
-
 
 @macro imageClickable{IMAGE-FILE, EXT, MORE-TEXT, CLICK-FILE, CLICK-EXT, POSITION}
 @html
@@ -209,7 +206,7 @@ UNTRANSLATED NODE: IGNORE ME
 </div>
 @end html
 @iftex
-@image{../pictures/\IMAGE-FILE\,,,\IMAGE-FILE\}
+@image{pictures/\IMAGE-FILE\,,,\IMAGE-FILE\}
 @end iftex
 @ifinfo
 @image{lilypond/pictures/\IMAGE-FILE\,,,\IMAGE-FILE\}
@@ -221,7 +218,7 @@ UNTRANSLATED NODE: IGNORE ME
 <img class="float-\POSITION\" src="../pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
 @end html
 @iftex
-@image{../pictures/\IMAGE-FILE\,,,\IMAGE-FILE\,\EXT\}
+@image{pictures/\IMAGE-FILE\,,,\IMAGE-FILE\,\EXT\}
 @end iftex
 @ifinfo
 @image{lilypond/pictures/\IMAGE-FILE\,,,\EXT\}
@@ -235,7 +232,7 @@ UNTRANSLATED NODE: IGNORE ME
 </div>
 @end html
 @iftex
-@image{../pictures/\IMAGE-FILE\,,,\ALT\}
+@image{pictures/\IMAGE-FILE\,,,\ALT\}
 @end iftex
 @ifinfo
 @image{lilypond/pictures/\IMAGE-FILE\,,,\ALT\}