X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fcommon-macros.itexi;h=6d47ad9cf3a21f04a7435ee6d4d828db2ddf871f;hb=b7088489f91c805f2260d2efecc01f26519c5352;hp=985bce595d218e5fb9cd744e829223d5124f31a6;hpb=a060fc94b65dbc25a7e1ec20f2f79a58036a2546;p=lilypond.git

diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi
index 985bce595d..6d47ad9cf3 100644
--- a/Documentation/common-macros.itexi
+++ b/Documentation/common-macros.itexi
@@ -1,11 +1,16 @@
 @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
 
+@include cyrillic.itexi
 
 @c   ***** Displaying text *****
 
@@ -65,8 +70,14 @@
 
 @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
 @emph{\TEXT\}
 @end macro
 @end ifclear
@@ -129,14 +140,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}
@@ -159,6 +169,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
+<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,44 +222,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
 <div class="float-\POSITION\">
-  <a class="clickable" href="\CLICK-FILE\">
-    <img src="\IMAGE-FILE\" 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\
   </p>
 </div>
 @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
-<img class="float-\POSITION\" src="pictures/\IMAGE-FILE\" alt="\IMAGE-FILE\">
+<img class="float-\POSITION\" src="pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
 @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
 <div id="\ID\">
-  <img src="pictures/\IMAGE-FILE\" alt="\ALT\">
+  <img src="pictures/\IMAGE-FILE\.\EXT\" alt="\ALT\">
 </div>
 @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