Merge branch 'lilypond/translation' of ssh://trettig@git.sv.gnu.org/srv/git/lilypond...

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

diff --git a/Documentation/fr/user/macros.itexi b/Documentation/fr/user/macros.itexi
index 77ec3accfb2298a2efc916320c41b0ace7b69ba1..8c60d92155d9e8a43184304e31341fbfbcc33c0e 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: d30aabb4adc9e13c7a5a99a22230e97a0f164255
+    Translation of GIT committish: 1440fffdf8579046cc2033b9c697a190b34b91e5
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -151,7 +151,7 @@
 @c obsolete, remove when translation is fully updated
 @macro context{TEXT}
 @vindex \TEXT\
-@code{\TEXT\}@c should use internalsref
+@code{\TEXT\}@c should use rinternals
 @end macro
 
 @c obsolete, remove when translation is fully updated
@@ -174,46 +174,20 @@
 
 @c   **** Links and references ****
 
-@c WARNING: new @lsr macro in English docs takes 3 arguments
-@c and new @lsrdir takes two arguments
-
-@c obsolete
-@c usage: @lsr{ancient,custodes.ly}
-@macro lsr{DIR,TEXT}
-@ifhtml
-@uref{source/input/lsr/\DIR\/collated-files.html#\TEXT\,@file{\DIR\/\TEXT\}}
-@end ifhtml
-@ifnothtml
-@file{\DIR\/\TEXT\}
-@end ifnothtml
-@end macro
-
-@c don't update until this macro is correctly set up in English docs
-@macro lsrdir{DIR}
-@ifhtml
-@uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/}
-@end ifhtml
-@ifnothtml
-@file{\DIR\}
-@end ifnothtml
-@end macro
-
-
-
-
 @c  Definitions for references:
-@c     @internalsref
+@c     @rinternals
 @c     @rglos
 @c     @rprogram
 @c     @ruser
 @c     @rlearning
+@c     @rlsr
 
 @ifhtml
 @c ***** HTML *****
 
 @ifset bigpage
 
-@macro internalsref{TEXT}
+@macro rinternals{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,lilypond-internals-big-page,Référence des propriétés internes}
 @end macro
@@ -238,12 +212,17 @@
 @ref{\TEXT\,,,lilypond-learning-big-page,Manuel d'initiation}
 @end macro
 
+@macro rlsr{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-snippets-big-page,Exemples de code}
+@end macro
+
 @end ifset
 
 
 @ifclear bigpage
 
-@macro internalsref{TEXT}
+@macro rinternals{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
 @end macro
@@ -268,6 +247,11 @@
 @ref{\TEXT\,,,lilypond-learning,Manuel d'initiation}
 @end macro
 
+@macro rlsr{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-snippets,Exemples de code}
+@end macro
+
 @end ifclear
 
 @end ifhtml
@@ -276,7 +260,7 @@
 @ifdocbook
 @c ***** DOCBOOK-XML *****
 
-@macro internalsref{TEXT}
+@macro rinternals{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
 @end macro
@@ -301,13 +285,18 @@
 @ref{\TEXT\,,,lilypond-learning,Manuel d'initiation}
 @end macro
 
+@macro rlsr{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-snippets,Exemples de code}
+@end macro
+
 @end ifdocbook
 
 
 @ifinfo
 @c **** INFO ****
 
-@macro internalsref{NAME}
+@macro rinternals{NAME}
 @vindex \NAME\
 @inforef{\NAME\,,lilypond-internals,Référence des propriétés internes}
 @end macro
@@ -332,13 +321,17 @@
 @ref{\TEXT\,,,lilypond-learning,Manuel d'initiation}
 @end macro
 
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets,Exemples de code}
+@end macro
+
 @end ifinfo
 
 
 @c **** TEX ****
 @iftex
 
-@macro internalsref{TEXT}
+@macro rinternals{TEXT}
 @vindex \TEXT\
 @code{\TEXT\}
 @end macro
@@ -360,6 +353,10 @@
 @ref{\TEXT\,,,lilypond-learning.fr,Manuel d'initiation}
 @end macro
 
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets,Exemples de code}
+@end macro
+
 @end iftex