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 de8be7a9851d53b2c6642cab7ca6818e0af5149b..ff690e67775963720ae57155928c98c92ce11af0 100644 (file)
--- a/input/lsr/lilypond-snippets.tely
+++ b/input/lsr/lilypond-snippets.tely
@@ -13,6 +13,58 @@
 @end tex
 @end iftex
 
+@include version.itexi
+
+@macro lydoctitle{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
+
+@macro ruser{NAME}
+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
+
+@macro ruser{NAME}
+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
+
+@macro ruser{NAME}
+These snippets illustrate @ref{\NAME\,,,lilypond,Notation Reference}.
+@end macro
+
+@end ifnothtml
+
 @dircategory GNU LilyPond --- the music typesetter
 @direntry
 * LilyPond Snippets: (lilypond-snippets).       Short tricks, tips, and examples.
@@ -56,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}
@@ -65,7 +117,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,18 +136,19 @@ Musical notation
 * Repeats::
 * Simultaneous notes::
 * Staff notation::
-* Editorial and educational use::
+* Editorial annotations::
 * Text::
 
 Specialist notation
 * Vocal music::
 * Chords::
-* Piano::
+* Keyboards::
 * Percussion::
-* Guitar::
-* Strings::
-@c * Bagpipes::
+* Fretted strings::
+* Unfretted strings::
+* Winds::
 * Ancient notation::
+* World music::
 
 Other collections
 * Contexts and engravers::
@@ -119,18 +172,18 @@ 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
 @include chords.itely
-@include piano-music.itely
+@include keyboards.itely
 @include percussion.itely
-@include guitar.itely
-@include strings.itely
-@c ignore empty section
-@c @include bagpipes.itely
+@include fretted-strings.itely
+@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