X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fcommon-macros.itexi;h=9873604a5042399693114958782d33d875a1c875;hb=5f2e79bd78f7c350167e61e38123d7a7db7ce362;hp=b9113835d8ab3d22a3079d51b990473ab65acb06;hpb=91621d62e71a60270a5dec159a2d1f51c9a33f1c;p=lilypond.git
diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi
index b9113835d8..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
@@ -46,19 +50,18 @@
@c already generates proper @image commands for images of music; these
@c macro definitions do the same for other images.
-@c can't scale images in tex
@ifnotinfo
-@macro sourceimage{FILENAME}
-@image{pictures/\FILENAME\}
+@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT}
+@image{pictures/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
@end macro
@end ifnotinfo
@ifinfo
-@macro sourceimage{FILENAME}
-@image{lilypond/pictures/\FILENAME\}
+@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT}
+@image{lilypond/pictures/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
@end macro
@end ifinfo
@@ -131,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}
@@ -161,6 +163,38 @@ 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
+
+@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
@@ -178,44 +212,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
-
![\ALT\](pictures/\IMAGE-FILE\)
+
@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