X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fcommon-macros.itexi;h=b5c16e8dc0fbcd554b78f5f020dbd03c71ad230a;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=a852227bcfabb64093bf5232803f8000242a0a57;hpb=febe7491f160ea624db77da6842e35a80c0374d6;p=lilypond.git
diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi
index a852227bcf..b5c16e8dc0 100644
--- a/Documentation/common-macros.itexi
+++ b/Documentation/common-macros.itexi
@@ -1,11 +1,17 @@
@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
@set txicodequotebacktick
+@set txiindexbackslashignore
+@include cyrillic.itexi
@c ***** Displaying text *****
@@ -65,6 +71,11 @@
@c ***** Headers *****
+@c For use as the Level 5 header
+@macro subsubsubheading {TEXT}
+@subsubheading @i{\TEXT\}
+@end macro
+
@ifclear snippets-sections
@macro lydoctitle {TEXT}
@need 600
@@ -130,14 +141,13 @@ UNTRANSLATED NODE: IGNORE ME
@ifset web
-@macro help{TEXT}
-@html
-
-
- Help wanted:
- \TEXT\
-
-@end html
+@c make link to bugfixes for news-old.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 +170,42 @@ 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 miscLink{MISC-FILE,MISC-TEXT}
+@uref{http://lilypond.org/website/misc/\MISC-FILE\,\MISC-TEXT\}
+@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 +223,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