Documentation: Add the @bs{} macro for backslashes in warnings

-) @bs{} to produce backslashes in warnings (which are now also
   correctly converted to a single backslash in pdf
-) Update writing-texinfo.txt accordingly
-) Adjust the one place in the tutorial that caused problems

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index c533b5156009e44cc815a58eea6a4c5048602e59..2f236b251a954054aa20c23e6478e30230fd9d58 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -14,8 +14,10 @@
 @c   ***** Displaying text *****
 
 @c we need this since @q{\} doesn't work with makeinfo 4.8 --
-@c say @q{@value{backslash}} instead
-@set backslash \
+@c say @q{@bs{}} instead
+@macro bs
+\\
+@end macro
 
 @c to get decent quotes in `foo' and ``foo''
 @macro q{TEXT}

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index c1f48c0fffebc4ab674822485d79d2c8f9996398..119092e3e4d16f87146dd669c0da9eab3340d039 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1030,10 +1030,9 @@ different amount of space.  LilyPond does not care how much (or
 little) space there is at the beginning of a line, but indenting
 LilyPond code like this makes it much easier for humans to read.
 
-@c FIXME: number of backslashes?!  works in html but not pdf.
 @warning{each note is relative to the previous note in
 the input, not relative to the @code{c''} in the initial
-@code{\\relative} command.}
+@code{@bs{}relative} command.}
 
 
 @subheading Simultaneous music expressions: single staff

diff --git a/Documentation/user/writing-texinfo.txt b/Documentation/user/writing-texinfo.txt
index 6023e22e7ebf99a3afc6c35943b99bb3e2c9a9fd..c6ca460136b35b7b4b379eee066e3d1b43300d8a 100644 (file)
--- a/Documentation/user/writing-texinfo.txt
+++ b/Documentation/user/writing-texinfo.txt
@@ -204,17 +204,17 @@ commands.
 @q{} - Single quotes. Used for `vague' terms.
 @qq{} - Double quotes.  Used for actual quotes ("he said").
 
-@warning{}: produces a "Note: " box.  Use for important
-      messages.
-
 @tie{} - Variables or numbers which consist of a single character
   (probably followed by a punctuation mark) should be tied
   properly, either to the previous or the next word.  Example:
     "The letter@tie{}@q{I} is skipped"
 
 @var - Use for variables.
-@warning{} - produces a "Note: " box.
-  Any `\' used inside this must be written as `\\'.
+@warning{} - produces a "Note: " box. Use for important messages.
+
+@bs - Generates a backslash inside @warning.
+    Any `\' used inside @warning (and @q or @qq) must be written as `@bs{}' 
+    (texinfo would also allow \\, but this breaks with PDF output).