X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fcommon-macros.itexi;h=f3dac48c9189431e6ee92208a4d88d236177971d;hb=70cc6f11795ab109dbe39c608be9bbe6ea95ced0;hp=d014af5713a5d3e34b4cdf40f66d195bc8c12762;hpb=f84c055befff90d0627169a34cce891bc79c6aad;p=lilypond.git

diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi
index d014af5713..f3dac48c91 100644
--- a/Documentation/common-macros.itexi
+++ b/Documentation/common-macros.itexi
@@ -10,6 +10,15 @@
 @set txicodequoteundirected
 @set txicodequotebacktick
 
+@c Trick to use with proper font mappings the same NCSB fonts as
+@c LilyPond instead of those provided by TeX distribution
+@tex
+\ifpdf
+  \pdfmapfile{=lilypond.map}
+\fi
+@end tex
+
+@include cyrillic.itexi
 
 @c   ***** Displaying text *****
 
@@ -69,6 +78,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
@@ -134,14 +148,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}
@@ -164,6 +177,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
@@ -184,8 +233,8 @@ UNTRANSLATED NODE: IGNORE ME
 @macro imageClickable{IMAGE-FILE, EXT, MORE-TEXT, CLICK-FILE, CLICK-EXT, POSITION}
 @html
 <div class="float-\POSITION\">
-  <a class="clickable" href="../pictures/\CLICK-FILE\.\CLICK-EXT\">
-    <img src="../pictures/\IMAGE-FILE\.\EXT\" 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\
@@ -202,7 +251,7 @@ UNTRANSLATED NODE: IGNORE ME
 
 @macro imageFloat{IMAGE-FILE, EXT, POSITION}
 @html
-<img class="float-\POSITION\" src="../pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
+<img class="float-\POSITION\" src="pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
 @end html
 @iftex
 @image{pictures/\IMAGE-FILE\,,,\IMAGE-FILE\,\EXT\}
@@ -215,7 +264,7 @@ UNTRANSLATED NODE: IGNORE ME
 @macro imageId{ID, IMAGE-FILE, EXT, ALT}
 @html
 <div id="\ID\">
-  <img src="../pictures/\IMAGE-FILE\.\EXT\" alt="\ALT\">
+  <img src="pictures/\IMAGE-FILE\.\EXT\" alt="\ALT\">
 </div>
 @end html
 @iftex