X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fcommon-macros.itexi;h=ab45cbaf32cbd4fdd1af09c603977dd5b8ede136;hb=a53c0d323f18728b8ab8185de1163f0598b23941;hp=a852227bcfabb64093bf5232803f8000242a0a57;hpb=7f356a39016d9be47b9668b9821761d9766c182e;p=lilypond.git
diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi
index a852227bcf..ab45cbaf32 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
-
-
- Help wanted:
- \TEXT\
-
-@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
+
+@end html
+@end macro
+
+@macro spanEnd
+@c keep the space for proper nesting of
+
+@html
+
+@end html
+@end macro
+
@c not strictly necessary, but it makes things easier for updating news
@macro newsItem
@@ -177,44 +194,49 @@ UNTRANSLATED NODE: IGNORE ME
@end macro
-
-@macro imageClickable{IMAGE-FILE, MORE-TEXT, CLICK-FILE, POSITION}
+@macro imageClickable{IMAGE-FILE, EXT, MORE-TEXT, CLICK-FILE, CLICK-EXT, POSITION}
@html
@end html
-@ifnothtml
-FIXME: broken image
-@c @image{\IMAGE-FILE\}
-@end ifnothtml
+@iftex
+@image{pictures/\IMAGE-FILE\,,,\IMAGE-FILE\}
+@end iftex
+@ifinfo
+@image{lilypond/pictures/\IMAGE-FILE\,,,\IMAGE-FILE\}
+@end ifinfo
@end macro
-@macro imageFloat{IMAGE-FILE, POSITION}
+@macro imageFloat{IMAGE-FILE, EXT, POSITION}
@html
-
+
@end html
-@ifnothtml
-FIXME: broken image
-@c @image{\IMAGE-FILE\}
-@end ifnothtml
+@iftex
+@image{pictures/\IMAGE-FILE\,,,\IMAGE-FILE\,\EXT\}
+@end iftex
+@ifinfo
+@image{lilypond/pictures/\IMAGE-FILE\,,,\EXT\}
+@end ifinfo
@end macro
-@macro imageId{ID, IMAGE-FILE, ALT}
+@macro imageId{ID, IMAGE-FILE, EXT, ALT}
@html
-
+
@end html
-@ifnothtml
-FIXME: broken image
-@c @image{\IMAGE-FILE\}
-@end ifnothtml
+@iftex
+@image{pictures/\IMAGE-FILE\,,,\ALT\}
+@end iftex
+@ifinfo
+@image{lilypond/pictures/\IMAGE-FILE\,,,\ALT\}
+@end ifinfo
@end macro
@end ifset