Merge commit 'origin/master' into dev/texi2html

[lilypond.git] / input / lsr / lilypond-snippets.tely

diff --git a/input/lsr/lilypond-snippets.tely b/input/lsr/lilypond-snippets.tely
index 70ca9edf1b8ccc2a85aa959b49288c447692617c..678d93b87cdb4d3f1988411bd904b1e16b89db9f 100644 (file)
--- a/input/lsr/lilypond-snippets.tely
+++ b/input/lsr/lilypond-snippets.tely
@@ -19,27 +19,51 @@
 @unnumberedsec \TEXT\
 @end macro
 
-@ifnottex
+@ifhtml
+
+@ifset bigpage
+
+@macro rlearning{NAME}
+See also Learning Manual, section
+@ref{\NAME\,,,lilypond-learning-big-page,Learning Manual}.
+@end macro
+
 @macro ruser{NAME}
-These snippets illustrate the User Manual,
-section @ref{\NAME\,,,lilypond,Notation Reference}.
+These snippets illustrate the Notation Reference,
+section @ref{\NAME\,,,lilypond-big-page,Notation Reference}.
 @end macro
 
+@end ifset
+
+
+@ifclear bigpage
+
 @macro rlearning{NAME}
 See also Learning Manual, section
 @ref{\NAME\,,,lilypond-learning,Learning Manual}.
 @end macro
-@end ifnottex
 
-@iftex
 @macro ruser{NAME}
-These snippets illustrate @ref{\NAME\,,,lilypond,Notation Reference}.
+These snippets illustrate the Notation Reference,
+section @ref{\NAME\,,,lilypond,Notation Reference}.
 @end macro
 
+@end ifclear
+
+@end ifhtml
+
+
+@ifnothtml
+
 @macro rlearning{NAME}
 See also @ref{\NAME\,,,lilypond-learning,Learning Manual}.
 @end macro
-@end iftex
+
+@macro ruser{NAME}
+These snippets illustrate @ref{\NAME\,,,lilypond,Notation Reference}.
+@end macro
+
+@end ifnothtml
 
 @dircategory GNU LilyPond --- the music typesetter
 @direntry
@@ -124,6 +148,7 @@ Specialist notation
 * Unfretted strings::
 * Winds::
 * Ancient notation::
+* World music::
 
 Other collections
 * Contexts and engravers::
@@ -135,6 +160,8 @@ Other collections
 * Templates::
 @end menu
 
+@contents
+
 
 @c Please take care of naming every .itely
 @c with an existing tag name.
@@ -156,6 +183,7 @@ Other collections
 @include unfretted-strings.itely
 @include winds.itely
 @include ancient-notation.itely
+@include world-music.itely
 
 @include contexts-and-engravers.itely
 @include tweaks-and-overrides.itely