Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

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

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index ab06cecbb6fe5ba9cddfcb35edc3ecc68abb40d7..55eacec0e36db12f3cffb73aaac25a8afdf52366 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -6,6 +6,11 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
+@c @value{version}
+@macro version
+2.11.41
+@end macro
+
 @c   ***** Displaying text *****
 
 @c we need this since @q{\} doesn't work with makeinfo 4.8 --
@@ -22,6 +27,12 @@
 @end macro
 
 @macro warning{TEXT}
+@ifhtml
+@cartouche
+@b{Note:} \TEXT\
+@end cartouche
+@end ifhtml
+@ifnothtml
 @quotation
 @quotation
 @cartouche
@@ -29,6 +40,7 @@
 @end cartouche
 @end quotation
 @end quotation
+@end ifnothtml
 @end macro
 
 @ifnotinfo
@@ -70,16 +82,14 @@
 
 @c   **** Headings in a doc subsection ****
 
-@c obsolete; being removed.
-@macro refcommands
+@macro predefined
 @noindent
 @subsubheading Predefined commands
 
 @end macro
 
-@macro commonprop
+@macro snippets
 @noindent
-@c @subsubheading Commonly tweaked properties
 @subsubheading Selected Snippets
 
 @end macro
@@ -91,13 +101,12 @@
 @indent
 @end macro
 
-@macro refbugs
+@macro knownissues
 @noindent
 @subsubheading Known issues and warnings
 
 @end macro
 
-
 @macro funindex {TEXT}
 @findex \TEXT\
 @kindex \TEXT\
@@ -107,25 +116,21 @@
 
 @c   **** Links and references ****
 
+@c  Possibly deprecated; under discussion.
 @c usage: @lsr{ancient,Ancient-notation,custodes.ly}
-@ignore
-
-DEPRECATED
-
 @macro lsr{SECTION,DIR,TEXT}
 @ifhtml
-@uref{source/input/lsr/snippets/\DIR\.html#\TEXT\,@file{\SECTION\/\TEXT\}}
+@uref{source/input/lsr/lilypond-snippets/\DIR\.html#\TEXT\,@file{\SECTION\/\TEXT\}}
 @end ifhtml
 @ifnothtml
 @file{\SECTION\/\TEXT\}
 @end ifnothtml
 @end macro
-@end ignore
 
 @c usage: @lsrdir{ancient,Ancient-notation}
 @macro lsrdir{SECTION,DIR}
 @ifhtml
-@uref{source/input/lsr/snippets/\DIR\.html,\SECTION\}
+@uref{source/input/lsr/lilypond-snippets/\DIR\.html,\SECTION\}
 @end ifhtml
 @ifnothtml
 \DIR\
@@ -170,6 +175,10 @@ DEPRECATED
 @ref{\TEXT\,,,lilypond-learning-big-page}
 @end macro
 
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets-big-page}
+@end macro
+
 @end ifset
 
 
@@ -200,6 +209,10 @@ DEPRECATED
 @ref{\TEXT\,,,lilypond-learning}
 @end macro
 
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets}
+@end macro
+
 @end ifclear
 
 @end ifhtml
@@ -233,6 +246,10 @@ DEPRECATED
 @ref{\TEXT\,,,lilypond-learning}
 @end macro
 
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets}
+@end macro
+
 @end ifdocbook
 
 
@@ -264,6 +281,10 @@ DEPRECATED
 @ref{\TEXT\,,,lilypond-learning}
 @end macro
 
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets}
+@end macro
+
 @end ifinfo
 
 
@@ -282,17 +303,18 @@ DEPRECATED
 
 @macro rprogram{TEXT}
 program usage manual, @ref{\TEXT\,,,lilypond-program}
-@c @internalsref{\TEXT\}
 @end macro
 
 @macro ruser{TEXT}
 notation reference, @ref{\TEXT\,,,lilypond}
-@c @internalsref{\TEXT\}
 @end macro
 
 @macro rlearning{TEXT}
 learning manual, @ref{\TEXT\,,,lilypond-learning}
-@c @internalsref{\TEXT\}
+@end macro
+
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets}
 @end macro
 
 @end iftex