Merge master into nested-bookparts

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

diff --git a/Documentation/fr/user/macros.itexi b/Documentation/fr/user/macros.itexi
index 096dcf59cf2e8c446a78875b2199052354453384..6b86871839a63de798f5bcebafb4a93df229308a 100644 (file)
--- a/Documentation/fr/user/macros.itexi
+++ b/Documentation/fr/user/macros.itexi
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: a88c1b861df238ad1c000e6a86926e6f19f2fedd
+    Translation of GIT committish: 8135382760aa0adfac5aed987a272c394e59dbdb
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -17,8 +17,8 @@
 @end macro
 
 @c to get decent quotes in `foo' and ``foo''
-@c  these need to be split up so that "@qq{foo}." looks nice.  :(
-@iftex
+@c FIXME: use thin spaces for @qq
+@ifnotinfo
 @macro q{TEXT}
 @quoteleft{}\TEXT\@quoteright{}
 @end macro
@@ -26,8 +26,7 @@
 @macro qq{TEXT}
 @guillemetleft{}@tie{}\TEXT\@tie{}@guillemetright{}
 @end macro
-@end iftex
-
+@end ifnotinfo
 
 @ifinfo
 @macro q{TEXT}
@@ -40,35 +39,6 @@
 @end ifinfo
 
 
-@ifhtml
-@macro q{TEXT}
-@html
-‘\TEXT\’
-@end html
-@end macro
-
-@macro qq{TEXT}
-@html
-&laquo;<font size="-4">&nbsp;</font>\TEXT\<font size="-4">&nbsp;</font>&raquo;
-@end html
-@end macro
-@end ifhtml
-
-
-@ifdocbook
-@macro q{TEXT}
-@xml
-&lsquo;\TEXT\&rsquo;
-@end xml
-@end macro
-
-@macro qq{TEXT}
-@xml
-&laquo;<font size="-4">&nbsp;</font>\TEXT\<font size="-4">&nbsp;</font>&raquo;
-@end xml
-@end macro
-@end ifdocbook
-
 @ifhtml
 @macro warning{TEXT}
 @cartouche