lilypond-book robustness: ensure EOL at the end of @verbatim

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

diff --git a/Documentation/fr/user/macros.itexi b/Documentation/fr/user/macros.itexi
index ce01f63c3b3bf013186fdcaf552e0d74756ddde1..1e4e7c74083716c7703cf2b1cc538be06e499467 100644 (file)
--- a/Documentation/fr/user/macros.itexi
+++ b/Documentation/fr/user/macros.itexi
@@ -8,24 +8,11 @@
 
 
 @include version.itexi
-
-
-@c Don't replace quotes with directed quotes.
-
-@set txicodequoteundirected
-@set txicodequotebacktick
-
+@include common-macros.itexi
 
 
 @c   ***** Displaying text *****
 
-@c We need this since @q{\} doesn't work with makeinfo 4.11 --
-@c say @q{@bs{}} instead.
-
-@macro bs
-\\
-@end macro
-
 @c To get decent quotes in `foo' and ``foo''.
 @c FIXME: Use thin spaces for @qq.
 
@@ -79,53 +66,6 @@
 @end ifnothtml
 
 
-@ifnotinfo
-
-@macro notation{TEXT}
-@var{\TEXT\}
-@end macro
-
-@end ifnotinfo
-
-@ifinfo
-
-@macro notation{TEXT}
-\TEXT\
-@end macro
-
-@end ifinfo
-
-
-@macro smallspace
-@sp 1
-@end macro
-
-
-
-@c   ***** Displaying images not generated by lilypond-book *****
-
-@c Current installation setup of Info docs requires that all images are
-@c expected to be found in the `lilypond/' subdirectory.  `lilypond-book'
-@c already generates proper @image commands for images of music; these
-@c macro definitions do the same for other images.
-
-@ifnotinfo
-
-@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT}
-@image{\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
-@end macro
-
-@end ifnotinfo
-
-@ifinfo
-
-@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT}
-@image{lilypond/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
-@end macro
-
-@end ifinfo
-
-
 
 @c   ***** Headings in a doc subsection *****
 
@@ -178,20 +118,6 @@
 @end macro
 
 
-@macro lydoctitle {TEXT}
-@emph{\TEXT\}
-@end macro
-
-
-@c Don't remove the `@c' within the macro definition!  See section 19.3,
-@c `Macro Details and Caveats', in the texinfo info file for explanation.
-
-@macro funindex {TEXT}
-@findex \TEXT\
-@kindex \TEXT\
-@c
-@end macro
-
 
 
 @c   ***** Links and references *****
@@ -354,115 +280,82 @@
 
 @iftex
 
+@c All commands below should work in the middle of the line;
+@c we thus must not use @vindex directly since it works only if placed
+@c on a line of its own.  To overcome this problem, we define a
+@c replacement macro using the internal definition of @vindex which
+@c delimits arguments in the standard way (i.e., with braces).
+
+@tex
+\gdef\lilyvindex#1{\doind{vr}{\code #1}\ignorespaces}
+@end tex
+
 @macro rglos{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
 @ref{\TEXT\,,,music-glossary,Glossaire}
 @end macro
 
 @macro rglosnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
 @ref{\TEXT\,,\DISPLAY\,music-glossary,Glossaire}
 @end macro
 
 @macro rlearning{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
 @ref{\TEXT\,,,lilypond-learning.fr,Manuel d'initiation}
 @end macro
 
 @macro rlearningnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
 @ref{\TEXT\,,\DISPLAY\,lilypond-learning.fr,Manuel d'initiation}
 @end macro
 
 @macro ruser{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
 @ref{\TEXT\,,,lilypond.fr,Manuel de notation}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
 @ref{\TEXT\,,\DISPLAY\,lilypond.fr,Manuel de notation}
 @end macro
 
 @macro rprogram{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
 @ref{\TEXT\,,,lilypond-program.fr,Manuel d'utilisation du programme}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
 @ref{\TEXT\,,\DISPLAY\,lilypond-program.fr,Manuel d'utilisation du programme}
 @end macro
 
 @macro rlsr{TEXT}
+@lilyvindex{\TEXT\}
 @ref{\TEXT\,,,lilypond-snippets,Exemples de code}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
+@lilyvindex{\TEXT\}
 @ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Exemples de code}
 @end macro
 
 @macro rinternals{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
 @ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
 @ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
 @end macro
 
 @end iftex
 
 
-
 @c   ***** Macros specific to translated docs *****
 
-@c ugh, cannot set/define global variable 'translationof' in some way?
-
-@iftex
-
-@macro translationof{TEXT}
-@end macro
-
-@end iftex
-
-@ifinfo
-
-@macro translationof{TEXT}
-@set translationof \TEXT\
-@end macro
-
-@end ifinfo
-
-
-@c TODO: If @translationof is used in translated docs
-@c see whether it is feasible to say @value{translationof}.
-
 @macro englishref
 Cette section n'est pas encore encore traduite, veuillez
 vous reporter à la documentation correspondante en anglais.
 @end macro
-
-
-@ifhtml
-
-@ifset bigpage
-@macro untranslated
-@end macro
-@end ifset
-
-@ifclear bigpage
-@macro untranslated
-UNTRANSLATED NODE: IGNORE ME
-@end macro
-@end ifclear
-
-@end ifhtml
-
-@ifnothtml
-
-@macro untranslated
-@end macro
-
-@end ifnothtml