Merge master into nested-bookparts

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

diff --git a/input/lsr/lilypond-snippets.tely b/input/lsr/lilypond-snippets.tely
index 797b2e3c618a31b82f36fba64f191a55e434dc4d..ff690e67775963720ae57155928c98c92ce11af0 100644 (file)
--- a/input/lsr/lilypond-snippets.tely
+++ b/input/lsr/lilypond-snippets.tely
@@ -16,27 +16,54 @@
 @include version.itexi
 
 @macro lydoctitle{TEXT}
-@section \TEXT\
+@unnumberedsec \TEXT\
+@end macro
+
+@ifhtml
+
+@ifset bigpage
+
+@macro rlearning{NAME}
+See also Learning Manual, section
+@ref{\NAME\,,,lilypond-learning-big-page,Learning Manual}.
 @end macro
 
-@ifnottex
 @macro ruser{NAME}
-These snippets illustrate the User Manual, section @ref{\NAME\,,lilypond}.
+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}.
+See also Learning Manual, section
+@ref{\NAME\,,,lilypond-learning,Learning Manual}.
 @end macro
-@end ifnottex
 
-@iftex
 @macro ruser{NAME}
-These snippets illustrate @ref{\NAME\,,,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\,,,Learning Manual}.
-@end iftex
+See also @ref{\NAME\,,,lilypond-learning,Learning Manual}.
+@end macro
+
+@macro ruser{NAME}
+These snippets illustrate @ref{\NAME\,,,lilypond,Notation Reference}.
+@end macro
+
+@end ifnothtml
 
 @dircategory GNU LilyPond --- the music typesetter
 @direntry
@@ -81,7 +108,7 @@ or figure for each example to see the corresponding input file.
 
 @ifnottex
 @node Top
-@top LilyPond examples
+@top GNU LilyPond --- Snippets List
 
 This document shows a selected set of LilyPond snippets from the
 @uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}
@@ -121,6 +148,7 @@ Specialist notation
 * Unfretted strings::
 * Winds::
 * Ancient notation::
+* World music::
 
 Other collections
 * Contexts and engravers::
@@ -132,6 +160,8 @@ Other collections
 * Templates::
 @end menu
 
+@contents
+
 
 @c Please take care of naming every .itely
 @c with an existing tag name.
@@ -153,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