Merge branch 'master' into lilypond/translation

[lilypond.git] / Documentation / macros.itexi

diff --git a/Documentation/macros.itexi b/Documentation/macros.itexi
index d64c05cd017841c4681c0b0fce0d627ef1ef40d4..c8a8a2c2ce1804fdc1362bbb94dab4840fd9e737 100644 (file)
--- a/Documentation/macros.itexi
+++ b/Documentation/macros.itexi
@@ -1,9 +1,10 @@
-@c -*- coding: us-ascii; mode: texinfo; -*-
+@c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
     When revising a translation, copy the HEAD committish of the
-    version that you are working on.  See TRANSLATION for details.
+    version that you are working on.  For details, see the Contributors'
+    Guide, node Updating translation committishes..
 @end ignore
 
 
@@ -15,7 +16,7 @@
 MACRO DEFINITIONS GUIDELINES
 ****************************
 
-This file should contain macro defintions which are common to all
+This file should contain macro definitions which are common to all
 languages, i.e. all macro definitions which do not contain text that
 should be translated (namely text visible in the output).
 
@@ -66,6 +67,32 @@ translations should be in macros.itexi.
 
 @end ifnothtml
 
+@ifhtml
+
+@macro advanced{TEXT}
+@html
+<div class="advanced">
+@end html
+@strong{Advanced note:} \TEXT\
+@c keep the space for proper nesting of </p>
+
+@html
+</div>
+@end html
+@end macro
+
+@end ifhtml
+
+@ifnothtml
+
+@macro advanced{TEXT}
+@quotation
+@b{Advanced note:} \TEXT\
+@end quotation
+@end macro
+
+@end ifnothtml
+
 
 @macro docMain
 @cartouche