Merge branch '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 98d5eb1da120723db2ff76e5113b42ea33c42719..564e33a8188d5b213daa3144390010b27dc4e636 100644 (file)
--- a/input/lsr/lilypond-snippets.tely
+++ b/input/lsr/lilypond-snippets.tely
@@ -13,6 +13,34 @@
 @end tex
 @end iftex
 
+@include version.itexi
+
+@macro lydoctitle{TEXT}
+@unnumberedsec \TEXT\
+@end macro
+
+@ifnottex
+@macro ruser{NAME}
+These snippets illustrate the User Manual,
+section @ref{\NAME\,,,lilypond,Notation Reference}.
+@end macro
+
+@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}.
+@end macro
+
+@macro rlearning{NAME}
+See also @ref{\NAME\,,,lilypond-learning,Learning Manual}.
+@end macro
+@end iftex
+
 @dircategory GNU LilyPond --- the music typesetter
 @direntry
 * LilyPond Snippets: (lilypond-snippets).       Short tricks, tips, and examples.
@@ -56,7 +84,7 @@ or figure for each example to see the corresponding input file.
 
 @ifnottex
 @node Top
-@top LilyPond examples
+@top LilyPond Snippet List
 
 This document shows a selected set of LilyPond snippets from the
 @uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}
@@ -65,7 +93,7 @@ This document shows a selected set of LilyPond snippets from the
 Please note that it is not an exact subset of LSR: some snippets come
 from @file{input/new} LilyPond sources directory, and snippets from LSR
 are converted through @command{convert-ly}, as LSR is based on a stable
-LilyPond version, and this document is for version @value{version}.
+LilyPond version, and this document is for version @version{}.
 
 Snippets are grouped by tags; tags listed in the table of contents match
 a section of LilyPond notation manual.  Snippets may have several tags,
@@ -84,7 +112,7 @@ Musical notation
 * Repeats::
 * Simultaneous notes::
 * Staff notation::
-* Editorial and educational use::
+* Editorial annotations::
 * Text::
 
 Specialist notation
@@ -94,7 +122,9 @@ Specialist notation
 * Percussion::
 * Fretted strings::
 * Unfretted strings::
+* Winds::
 * Ancient notation::
+* World music::
 
 Other collections
 * Contexts and engravers::
@@ -106,6 +136,8 @@ Other collections
 * Templates::
 @end menu
 
+@contents
+
 
 @c Please take care of naming every .itely
 @c with an existing tag name.
@@ -116,7 +148,7 @@ Other collections
 @include repeats.itely
 @include simultaneous-notes.itely
 @include staff-notation.itely
-@include editorial-and-educational-use.itely
+@include editorial-annotations.itely
 @include text.itely
 
 @include vocal-music.itely
@@ -125,8 +157,9 @@ Other collections
 @include percussion.itely
 @include fretted-strings.itely
 @include unfretted-strings.itely
-@c @include winds.itely
+@include winds.itely
 @include ancient-notation.itely
+@include world-music.itely
 
 @include contexts-and-engravers.itely
 @include tweaks-and-overrides.itely