resolve merge

[lilypond.git] / Documentation / common-macros.itexi

diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi
index a971723ab7ddb013847e780f90731e20b518fe4f..11bae886e4613c31e968b31deb11a3cc2aa51268 100644 (file)
--- a/Documentation/common-macros.itexi
+++ b/Documentation/common-macros.itexi
@@ -1,6 +1,9 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 
 
+@c ***********************************************
+@c SEE MACRO DEFINITION GUIDELINES IN macros.itexi
+@c ***********************************************
 
 @c Don't replace quotes with directed quotes.
 
@@ -50,7 +53,7 @@
 @ifnotinfo
 
 @macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT}
-@image{\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
+@image{pictures/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
 @end macro
 
 @end ifnotinfo
@@ -58,7 +61,7 @@
 @ifinfo
 
 @macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT}
-@image{lilypond/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
+@image{lilypond/pictures/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
 @end macro
 
 @end ifinfo
@@ -66,10 +69,12 @@
 
 @c   ***** Headers *****
 
+@ifclear snippets-sections
 @macro lydoctitle {TEXT}
+@need 600
 @emph{\TEXT\}
 @end macro
-
+@end ifclear
 
 @c   ***** Indexing *****
 
@@ -123,3 +128,115 @@ UNTRANSLATED NODE: IGNORE ME
 @end macro
 
 @end ifnothtml
+
+
+@c  ***** Macros specific to the web site *****
+
+@ifset web
+
+@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}
+@html
+<div id="\ID\">
+@end html
+@end macro
+
+@macro divClass {CLASS}
+@html
+<div class="\CLASS\">
+@end html
+@end macro
+
+@macro divEnd
+@c keep the space for proper nesting of </p>
+
+@html
+</div>
+@end html
+@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
+@html
+<div class="news-item">
+@end html
+@end macro
+
+@macro newsEnd
+@c keep the space for proper nesting of </p>
+
+@html
+</div>
+@end html
+@end macro
+
+
+@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>
+  <p style="text-align: center">
+    \MORE-TEXT\
+  </p>
+</div>
+@end html
+@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, EXT, POSITION}
+@html
+<img class="float-\POSITION\" src="../pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
+@end html
+@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, EXT, ALT}
+@html
+<div id="\ID\">
+  <img src="../pictures/\IMAGE-FILE\.\EXT\" alt="\ALT\">
+</div>
+@end html
+@iftex
+@image{pictures/\IMAGE-FILE\,,,\ALT\}
+@end iftex
+@ifinfo
+@image{lilypond/pictures/\IMAGE-FILE\,,,\ALT\}
+@end ifinfo
+@end macro
+
+@end ifset