Merge branch 'master' into lilypond/translation

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

diff --git a/Documentation/fr/macros.itexi b/Documentation/fr/macros.itexi
index a09fb7e3782595e8ecf4e73fbbb4edaa45c8d54b..e7408d1e6d8d330e32e0ae12a0604b0b82160258 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: 092f85605dcea69efff5ef31de4ff100346d6ef8
+    Translation of GIT committish: 1edbbc7f5a6ad81f24421470f81786fc614d1c96
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  For details, see the Contributors'
@@ -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}