Merge branch 'master' into philomelos

[lilypond.git] / Documentation / fr / macros.itexi

diff --git a/Documentation/fr/macros.itexi b/Documentation/fr/macros.itexi
index 1070dd893db33cefd3662fa846b9f2023f53d7b3..698fe2084526d9d3bf9cdd04e7c83fe3ac6e5069 100644 (file)
--- a/Documentation/fr/macros.itexi
+++ b/Documentation/fr/macros.itexi
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: cb2cd4b74f545f1d0a25725ffac6ce0c01b45c50
+    Translation of GIT committish: e389a98ed32c929cb091453d9ec2856350cfb300
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  For details, see the Contributors'
@@ -16,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).
 
@@ -84,6 +84,36 @@ translations should be in macros.itexi.
 
 @end ifnothtml
 
+
+@c do not translate the following macro -- it is used in
+@c an untranslated manual.
+
+@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
 Pour connaître la place qu'occupe ce manuel dans la
@@ -750,7 +780,7 @@ Pour LilyPond version @version{}
 </div>
 @end html
 @iftex
-@image{examples/\IMAGE-FILE\-small,,,\IMAGE-FILE\,png}
+@image{ly-examples/\IMAGE-FILE\,6in,,\IMAGE-FILE\,png}
 @end iftex
 @ifinfo
 @image{lilypond/examples/\IMAGE-FILE\,,,\IMAGE-FILE\,png}