From 74e3d72f8f2dd0e49b21c5a66c3c1dcf821912a0 Mon Sep 17 00:00:00 2001
From: John Mandereau <john.mandereau@gmail.com>
Date: Sun, 30 Dec 2007 17:04:32 +0100
Subject: [PATCH] Clean up input/new
- delete unused directories
- delete all AAA-intro.ly files (these files are deprecated in favor
of input/lsr/*.itely.in)
- clean up makefiles (no more generate collated-files and run lilypond-book)
- rename directories to match tags
- also begin cleaning up input/lsr (continued in next commits)
---
input/lsr/LSR.ly | 57 -------------------
input/lsr/null/GNUmakefile | 12 ----
input/lsr/other/AAA-intro.ly | 17 ------
input/new/ancient-notation/GNUmakefile | 7 +++
.../{ancient => ancient-notation}/SConscript | 0
input/new/ancient/GNUmakefile | 16 ------
input/new/bagpipes/GNUmakefile | 9 +--
input/new/chords/GNUmakefile | 13 +----
input/new/connecting/AAA-intro.ly | 16 ------
input/new/connecting/GNUmakefile | 16 ------
input/new/contemporary/AAA-intro.ly | 16 ------
input/new/contemporary/GNUmakefile | 16 ------
.../AAA-intro.ly | 0
.../editorial-and-educational-use/GNUmakefile | 7 +++
.../editorial-and-educational-use}/SConscript | 0
input/new/editorial/AAA-intro.ly | 16 ------
input/new/editorial/GNUmakefile | 12 ----
input/new/education/AAA-intro.ly | 16 ------
input/new/education/GNUmakefile | 15 -----
input/new/engravers/AAA-intro.ly | 16 ------
input/new/engravers/GNUmakefile | 16 ------
input/new/expressive-marks/GNUmakefile | 7 +++
.../SConscript | 0
input/new/expressive-marks/line-arrows.ly | 28 +++++++++
input/new/guitar/GNUmakefile | 13 +----
input/new/instrument/AAA-intro.ly | 16 ------
input/new/instrument/GNUmakefile | 16 ------
input/new/nonmusic/AAA-intro.ly | 16 ------
input/new/nonmusic/GNUmakefile | 16 ------
input/new/nonmusic/SConscript | 4 --
input/new/null.ly | 2 -
input/new/null/AAA-intro.ly | 16 ------
input/new/null/GNUmakefile | 12 ----
input/new/other/GNUmakefile | 12 +---
input/new/other/SConscript | 3 +-
...yles-depending-on-the-step-of-the-scale.ly | 47 +++++++++++++++
input/new/other/drawing-boxes-around-grobs.ly | 28 +++++++++
.../drawing-circles-around-various-objects.ly | 24 ++++++++
...nvisibile-with-the-transparent-property.ly | 24 ++++++++
.../other/outputting-the-version-number.ly | 20 +++++++
...tweak-command-to-tweak-individual-grobs.ly | 23 ++++++++
.../AAA-intro.ly | 0
input/new/paper-and-layout/GNUmakefile | 7 +++
.../SConscript | 0
.../clip-systems.ly | 0
.../new/{nonmusic => paper-and-layout}/toc.ly | 0
input/new/parts/GNUmakefile | 12 +---
input/new/percussion/GNUmakefile | 12 +---
input/new/piano-music/GNUmakefile | 7 +++
.../new/{editorial => piano-music}/SConscript | 0
input/new/piano/AAA-intro.ly | 16 ------
input/new/piano/GNUmakefile | 12 ----
input/new/piano/SConscript | 5 --
input/new/pitches/GNUmakefile | 12 +---
input/new/real-music/GNUmakefile | 12 +---
input/new/repeats/GNUmakefile | 13 +----
input/new/rhythms/GNUmakefile | 12 +---
input/new/scheme/AAA-intro.ly | 16 ------
input/new/scheme/GNUmakefile | 16 ------
input/new/scheme/SConscript | 4 --
input/new/schemelanguage/GNUmakefile | 7 +++
.../{education => schemelanguage}/SConscript | 0
.../move-specific-text.ly | 0
input/new/simultaneous-notes/GNUmakefile | 7 +++
.../{null => simultaneous-notes}/SConscript | 0
input/new/simultaneous/AAA-intro.ly | 16 ------
input/new/simultaneous/GNUmakefile | 12 ----
input/new/simultaneous/SConscript | 5 --
input/new/spacing/GNUmakefile | 13 +----
input/new/staff-notation/GNUmakefile | 7 +++
.../{engravers => staff-notation}/SConscript | 0
input/new/staff/AAA-intro.ly | 16 ------
input/new/staff/GNUmakefile | 16 ------
input/new/staff/SConscript | 4 --
input/new/strings/GNUmakefile | 9 +--
input/new/text/GNUmakefile | 12 +---
input/new/vocal-music/GNUmakefile | 7 +++
.../{instrument => vocal-music}/SConscript | 0
input/new/vocal/AAA-intro.ly | 16 ------
input/new/vocal/GNUmakefile | 16 ------
input/new/vocal/SConscript | 4 --
81 files changed, 285 insertions(+), 658 deletions(-)
delete mode 100644 input/lsr/LSR.ly
delete mode 100644 input/lsr/null/GNUmakefile
delete mode 100644 input/lsr/other/AAA-intro.ly
create mode 100644 input/new/ancient-notation/GNUmakefile
rename input/new/{ancient => ancient-notation}/SConscript (100%)
delete mode 100644 input/new/ancient/GNUmakefile
delete mode 100644 input/new/connecting/AAA-intro.ly
delete mode 100644 input/new/connecting/GNUmakefile
delete mode 100644 input/new/contemporary/AAA-intro.ly
delete mode 100644 input/new/contemporary/GNUmakefile
rename input/{lsr/null => new/editorial-and-educational-use}/AAA-intro.ly (100%)
create mode 100644 input/new/editorial-and-educational-use/GNUmakefile
rename input/{lsr/null => new/editorial-and-educational-use}/SConscript (100%)
delete mode 100644 input/new/editorial/AAA-intro.ly
delete mode 100644 input/new/editorial/GNUmakefile
delete mode 100644 input/new/education/AAA-intro.ly
delete mode 100644 input/new/education/GNUmakefile
delete mode 100644 input/new/engravers/AAA-intro.ly
delete mode 100644 input/new/engravers/GNUmakefile
create mode 100644 input/new/expressive-marks/GNUmakefile
rename input/new/{connecting => expressive-marks}/SConscript (100%)
create mode 100644 input/new/expressive-marks/line-arrows.ly
delete mode 100644 input/new/instrument/AAA-intro.ly
delete mode 100644 input/new/instrument/GNUmakefile
delete mode 100644 input/new/nonmusic/AAA-intro.ly
delete mode 100644 input/new/nonmusic/GNUmakefile
delete mode 100644 input/new/nonmusic/SConscript
delete mode 100644 input/new/null.ly
delete mode 100644 input/new/null/AAA-intro.ly
delete mode 100644 input/new/null/GNUmakefile
create mode 100644 input/new/other/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly
create mode 100644 input/new/other/drawing-boxes-around-grobs.ly
create mode 100644 input/new/other/drawing-circles-around-various-objects.ly
create mode 100644 input/new/other/making-an-object-invisibile-with-the-transparent-property.ly
create mode 100644 input/new/other/outputting-the-version-number.ly
create mode 100644 input/new/other/using-the--tweak-command-to-tweak-individual-grobs.ly
rename input/new/{ancient => paper-and-layout}/AAA-intro.ly (100%)
create mode 100644 input/new/paper-and-layout/GNUmakefile
rename input/new/{contemporary => paper-and-layout}/SConscript (100%)
rename input/new/{nonmusic => paper-and-layout}/clip-systems.ly (100%)
rename input/new/{nonmusic => paper-and-layout}/toc.ly (100%)
create mode 100644 input/new/piano-music/GNUmakefile
rename input/new/{editorial => piano-music}/SConscript (100%)
delete mode 100644 input/new/piano/AAA-intro.ly
delete mode 100644 input/new/piano/GNUmakefile
delete mode 100644 input/new/piano/SConscript
delete mode 100644 input/new/scheme/AAA-intro.ly
delete mode 100644 input/new/scheme/GNUmakefile
delete mode 100644 input/new/scheme/SConscript
create mode 100644 input/new/schemelanguage/GNUmakefile
rename input/new/{education => schemelanguage}/SConscript (100%)
rename input/new/{scheme => schemelanguage}/move-specific-text.ly (100%)
create mode 100644 input/new/simultaneous-notes/GNUmakefile
rename input/new/{null => simultaneous-notes}/SConscript (100%)
delete mode 100644 input/new/simultaneous/AAA-intro.ly
delete mode 100644 input/new/simultaneous/GNUmakefile
delete mode 100644 input/new/simultaneous/SConscript
create mode 100644 input/new/staff-notation/GNUmakefile
rename input/new/{engravers => staff-notation}/SConscript (100%)
delete mode 100644 input/new/staff/AAA-intro.ly
delete mode 100644 input/new/staff/GNUmakefile
delete mode 100644 input/new/staff/SConscript
create mode 100644 input/new/vocal-music/GNUmakefile
rename input/new/{instrument => vocal-music}/SConscript (100%)
delete mode 100644 input/new/vocal/AAA-intro.ly
delete mode 100644 input/new/vocal/GNUmakefile
delete mode 100644 input/new/vocal/SConscript
diff --git a/input/lsr/LSR.ly b/input/lsr/LSR.ly
deleted file mode 100644
index c65f746a02..0000000000
--- a/input/lsr/LSR.ly
+++ /dev/null
@@ -1,57 +0,0 @@
-\version "2.11.33"
-\header{
-texidoc = "@unnumbered LilyPond Examples
-
-These pages show LilyPond examples (snippets) from the
-@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}.
-
-@subheading 1 Musical notation
-
-@uref{pitches/collated-files.html,Pitches}
-(@uref{pitches/collated-files.pdf,pdf link})
-
-@uref{rhythms/collated-files.html,Rhythms}
-(@uref{rhythms/collated-files.pdf,pdf link})
-
-@uref{expressive/collated-files.html,Expressive}
-
-@uref{simultaneous/collated-files.html,Simultaneous}
-
-@uref{staff/collated-files.html,Staff}
-
-@uref{editorial/collated-files.html,Editorial}
-
-@uref{text/collated-files.html,Text}
-
-
-@subheading 1 Specialist notation
-
-@uref{vocal/collated-files.html,Vocal}
-
-@uref{chords/collated-files.html,Chords}
-
-@uref{piano/collated-files.html,Piano}
-
-@uref{percussion/collated-files.html,Percussion}
-
-@uref{guitar/collated-files.html,Guitar}
-
-@uref{strings/collated-files.html,Strings}
-
-@uref{bagpipes/collated-files.html,Bagpipes}
-
-@uref{ancient/collated-files.html,Ancient}
-
-
-
-@subheading Special collections
-
-@uref{other/collated-files.html,other}
-
-
-"
-}
-
-% make sure .png is generated.
-\lyrics { " " }
-% \lyrics { "(left blank intentionally)" }
diff --git a/input/lsr/null/GNUmakefile b/input/lsr/null/GNUmakefile
deleted file mode 100644
index a3f0b2bfde..0000000000
--- a/input/lsr/null/GNUmakefile
+++ /dev/null
@@ -1,12 +0,0 @@
-
-depth = ../../../
-
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-EXTRA_DIST_FILES=
-
-include $(depth)/make/stepmake.make
-
-TITLE=Sample snippets from LSR
-
diff --git a/input/lsr/other/AAA-intro.ly b/input/lsr/other/AAA-intro.ly
deleted file mode 100644
index 4997892c3c..0000000000
--- a/input/lsr/other/AAA-intro.ly
+++ /dev/null
@@ -1,17 +0,0 @@
-%% Do not edit this file; it is auto-generated from LSR!
-\version "2.11.23"
-
-\header{
-texidoc = "
-@unnumbered Introduction
-
-This document shows examples from the
-@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}.
-
-In the web version of this document, you can click on the file name
-or figure for each example to see the corresponding input file."
-}
-
-% make sure .png is generated.
-\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) }
-
diff --git a/input/new/ancient-notation/GNUmakefile b/input/new/ancient-notation/GNUmakefile
new file mode 100644
index 0000000000..b83142b2e5
--- /dev/null
+++ b/input/new/ancient-notation/GNUmakefile
@@ -0,0 +1,7 @@
+depth = ../../../
+
+STEPMAKE_TEMPLATES=documentation
+
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
+
+include $(depth)/make/stepmake.make
diff --git a/input/new/ancient/SConscript b/input/new/ancient-notation/SConscript
similarity index 100%
rename from input/new/ancient/SConscript
rename to input/new/ancient-notation/SConscript
diff --git a/input/new/ancient/GNUmakefile b/input/new/ancient/GNUmakefile
deleted file mode 100644
index 43325ab698..0000000000
--- a/input/new/ancient/GNUmakefile
+++ /dev/null
@@ -1,16 +0,0 @@
-
-depth = ../../../
-
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
-
-EXTRA_DIST_FILES=
-
-include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/bagpipes/GNUmakefile b/input/new/bagpipes/GNUmakefile
index a3f0b2bfde..b83142b2e5 100644
--- a/input/new/bagpipes/GNUmakefile
+++ b/input/new/bagpipes/GNUmakefile
@@ -1,12 +1,7 @@
-
depth = ../../../
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
+STEPMAKE_TEMPLATES=documentation
-EXTRA_DIST_FILES=
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
include $(depth)/make/stepmake.make
-
-TITLE=Sample snippets from LSR
-
diff --git a/input/new/chords/GNUmakefile b/input/new/chords/GNUmakefile
index 43325ab698..b83142b2e5 100644
--- a/input/new/chords/GNUmakefile
+++ b/input/new/chords/GNUmakefile
@@ -1,16 +1,7 @@
-
depth = ../../../
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
+STEPMAKE_TEMPLATES=documentation
-EXTRA_DIST_FILES=
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/connecting/AAA-intro.ly b/input/new/connecting/AAA-intro.ly
deleted file mode 100644
index 93c62a94e3..0000000000
--- a/input/new/connecting/AAA-intro.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-\version "2.10.0"
-
-\header{
-texidoc = "
-@unnumbered Introduction
-
-This document shows examples from the
-@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}.
-
-In the web version of this document, you can click on the file name
-or figure for each example to see the corresponding input file."
-}
-
-% make sure .png is generated.
-\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) }
-
diff --git a/input/new/connecting/GNUmakefile b/input/new/connecting/GNUmakefile
deleted file mode 100644
index 43325ab698..0000000000
--- a/input/new/connecting/GNUmakefile
+++ /dev/null
@@ -1,16 +0,0 @@
-
-depth = ../../../
-
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
-
-EXTRA_DIST_FILES=
-
-include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/contemporary/AAA-intro.ly b/input/new/contemporary/AAA-intro.ly
deleted file mode 100644
index 93c62a94e3..0000000000
--- a/input/new/contemporary/AAA-intro.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-\version "2.10.0"
-
-\header{
-texidoc = "
-@unnumbered Introduction
-
-This document shows examples from the
-@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}.
-
-In the web version of this document, you can click on the file name
-or figure for each example to see the corresponding input file."
-}
-
-% make sure .png is generated.
-\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) }
-
diff --git a/input/new/contemporary/GNUmakefile b/input/new/contemporary/GNUmakefile
deleted file mode 100644
index 43325ab698..0000000000
--- a/input/new/contemporary/GNUmakefile
+++ /dev/null
@@ -1,16 +0,0 @@
-
-depth = ../../../
-
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
-
-EXTRA_DIST_FILES=
-
-include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/lsr/null/AAA-intro.ly b/input/new/editorial-and-educational-use/AAA-intro.ly
similarity index 100%
rename from input/lsr/null/AAA-intro.ly
rename to input/new/editorial-and-educational-use/AAA-intro.ly
diff --git a/input/new/editorial-and-educational-use/GNUmakefile b/input/new/editorial-and-educational-use/GNUmakefile
new file mode 100644
index 0000000000..b83142b2e5
--- /dev/null
+++ b/input/new/editorial-and-educational-use/GNUmakefile
@@ -0,0 +1,7 @@
+depth = ../../../
+
+STEPMAKE_TEMPLATES=documentation
+
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
+
+include $(depth)/make/stepmake.make
diff --git a/input/lsr/null/SConscript b/input/new/editorial-and-educational-use/SConscript
similarity index 100%
rename from input/lsr/null/SConscript
rename to input/new/editorial-and-educational-use/SConscript
diff --git a/input/new/editorial/AAA-intro.ly b/input/new/editorial/AAA-intro.ly
deleted file mode 100644
index 93c62a94e3..0000000000
--- a/input/new/editorial/AAA-intro.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-\version "2.10.0"
-
-\header{
-texidoc = "
-@unnumbered Introduction
-
-This document shows examples from the
-@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}.
-
-In the web version of this document, you can click on the file name
-or figure for each example to see the corresponding input file."
-}
-
-% make sure .png is generated.
-\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) }
-
diff --git a/input/new/editorial/GNUmakefile b/input/new/editorial/GNUmakefile
deleted file mode 100644
index a3f0b2bfde..0000000000
--- a/input/new/editorial/GNUmakefile
+++ /dev/null
@@ -1,12 +0,0 @@
-
-depth = ../../../
-
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-EXTRA_DIST_FILES=
-
-include $(depth)/make/stepmake.make
-
-TITLE=Sample snippets from LSR
-
diff --git a/input/new/education/AAA-intro.ly b/input/new/education/AAA-intro.ly
deleted file mode 100644
index 93c62a94e3..0000000000
--- a/input/new/education/AAA-intro.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-\version "2.10.0"
-
-\header{
-texidoc = "
-@unnumbered Introduction
-
-This document shows examples from the
-@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}.
-
-In the web version of this document, you can click on the file name
-or figure for each example to see the corresponding input file."
-}
-
-% make sure .png is generated.
-\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) }
-
diff --git a/input/new/education/GNUmakefile b/input/new/education/GNUmakefile
deleted file mode 100644
index 3819fda13a..0000000000
--- a/input/new/education/GNUmakefile
+++ /dev/null
@@ -1,15 +0,0 @@
-depth = ../../../
-
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
-
-EXTRA_DIST_FILES=
-
-include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/engravers/AAA-intro.ly b/input/new/engravers/AAA-intro.ly
deleted file mode 100644
index 93c62a94e3..0000000000
--- a/input/new/engravers/AAA-intro.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-\version "2.10.0"
-
-\header{
-texidoc = "
-@unnumbered Introduction
-
-This document shows examples from the
-@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}.
-
-In the web version of this document, you can click on the file name
-or figure for each example to see the corresponding input file."
-}
-
-% make sure .png is generated.
-\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) }
-
diff --git a/input/new/engravers/GNUmakefile b/input/new/engravers/GNUmakefile
deleted file mode 100644
index 43325ab698..0000000000
--- a/input/new/engravers/GNUmakefile
+++ /dev/null
@@ -1,16 +0,0 @@
-
-depth = ../../../
-
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
-
-EXTRA_DIST_FILES=
-
-include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/expressive-marks/GNUmakefile b/input/new/expressive-marks/GNUmakefile
new file mode 100644
index 0000000000..b83142b2e5
--- /dev/null
+++ b/input/new/expressive-marks/GNUmakefile
@@ -0,0 +1,7 @@
+depth = ../../../
+
+STEPMAKE_TEMPLATES=documentation
+
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
+
+include $(depth)/make/stepmake.make
diff --git a/input/new/connecting/SConscript b/input/new/expressive-marks/SConscript
similarity index 100%
rename from input/new/connecting/SConscript
rename to input/new/expressive-marks/SConscript
diff --git a/input/new/expressive-marks/line-arrows.ly b/input/new/expressive-marks/line-arrows.ly
new file mode 100644
index 0000000000..7512711cb1
--- /dev/null
+++ b/input/new/expressive-marks/line-arrows.ly
@@ -0,0 +1,28 @@
+\header {
+ texidoc = "Arrows can be applied to text-spanners and line-spanners (such as the Glissando)"
+}
+
+\version "2.10.0"
+
+\paper {
+ ragged-right = ##t
+}
+
+\relative c'' {
+ \override TextSpanner #'bound-padding = #1.0
+ \override TextSpanner #'dash-fraction = #'()
+ \override TextSpanner #'bound-details #'right #'arrow = ##t
+ \override TextSpanner #'bound-details #'left #'text = #"fof"
+ \override TextSpanner #'bound-details #'right #'text = #"gag"
+ \override TextSpanner #'bound-details #'right #'padding = #0.6
+
+ \override TextSpanner #'bound-details #'right #'stencil-align-dir-y = #CENTER
+ \override TextSpanner #'bound-details #'left #'stencil-align-dir-y = #CENTER
+
+ \override Glissando #'bound-details #'right #'arrow = ##t
+ \override Glissando #'arrow-length = #0.5
+ \override Glissando #'arrow-width = #0.25
+
+ a8\startTextSpan gis8 a4 b4\glissando
+ b,4 | g' c\stopTextSpan c
+}
diff --git a/input/new/guitar/GNUmakefile b/input/new/guitar/GNUmakefile
index 43325ab698..b83142b2e5 100644
--- a/input/new/guitar/GNUmakefile
+++ b/input/new/guitar/GNUmakefile
@@ -1,16 +1,7 @@
-
depth = ../../../
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
+STEPMAKE_TEMPLATES=documentation
-EXTRA_DIST_FILES=
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/instrument/AAA-intro.ly b/input/new/instrument/AAA-intro.ly
deleted file mode 100644
index 93c62a94e3..0000000000
--- a/input/new/instrument/AAA-intro.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-\version "2.10.0"
-
-\header{
-texidoc = "
-@unnumbered Introduction
-
-This document shows examples from the
-@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}.
-
-In the web version of this document, you can click on the file name
-or figure for each example to see the corresponding input file."
-}
-
-% make sure .png is generated.
-\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) }
-
diff --git a/input/new/instrument/GNUmakefile b/input/new/instrument/GNUmakefile
deleted file mode 100644
index 43325ab698..0000000000
--- a/input/new/instrument/GNUmakefile
+++ /dev/null
@@ -1,16 +0,0 @@
-
-depth = ../../../
-
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
-
-EXTRA_DIST_FILES=
-
-include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/nonmusic/AAA-intro.ly b/input/new/nonmusic/AAA-intro.ly
deleted file mode 100644
index 93c62a94e3..0000000000
--- a/input/new/nonmusic/AAA-intro.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-\version "2.10.0"
-
-\header{
-texidoc = "
-@unnumbered Introduction
-
-This document shows examples from the
-@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}.
-
-In the web version of this document, you can click on the file name
-or figure for each example to see the corresponding input file."
-}
-
-% make sure .png is generated.
-\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) }
-
diff --git a/input/new/nonmusic/GNUmakefile b/input/new/nonmusic/GNUmakefile
deleted file mode 100644
index 43325ab698..0000000000
--- a/input/new/nonmusic/GNUmakefile
+++ /dev/null
@@ -1,16 +0,0 @@
-
-depth = ../../../
-
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
-
-EXTRA_DIST_FILES=
-
-include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/nonmusic/SConscript b/input/new/nonmusic/SConscript
deleted file mode 100644
index f72bfffc28..0000000000
--- a/input/new/nonmusic/SConscript
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*-python-*-
-
-Import ('env', 'collate')
-collate (title = 'Advanced snippets')
diff --git a/input/new/null.ly b/input/new/null.ly
deleted file mode 100644
index 9b4a4d71a0..0000000000
--- a/input/new/null.ly
+++ /dev/null
@@ -1,2 +0,0 @@
-% the build system is unhappy without this file here. (?)
-\version "2.11.21"
diff --git a/input/new/null/AAA-intro.ly b/input/new/null/AAA-intro.ly
deleted file mode 100644
index 93c62a94e3..0000000000
--- a/input/new/null/AAA-intro.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-\version "2.10.0"
-
-\header{
-texidoc = "
-@unnumbered Introduction
-
-This document shows examples from the
-@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}.
-
-In the web version of this document, you can click on the file name
-or figure for each example to see the corresponding input file."
-}
-
-% make sure .png is generated.
-\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) }
-
diff --git a/input/new/null/GNUmakefile b/input/new/null/GNUmakefile
deleted file mode 100644
index a3f0b2bfde..0000000000
--- a/input/new/null/GNUmakefile
+++ /dev/null
@@ -1,12 +0,0 @@
-
-depth = ../../../
-
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-EXTRA_DIST_FILES=
-
-include $(depth)/make/stepmake.make
-
-TITLE=Sample snippets from LSR
-
diff --git a/input/new/other/GNUmakefile b/input/new/other/GNUmakefile
index 3819fda13a..b83142b2e5 100644
--- a/input/new/other/GNUmakefile
+++ b/input/new/other/GNUmakefile
@@ -1,15 +1,7 @@
depth = ../../../
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
+STEPMAKE_TEMPLATES=documentation
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
-
-EXTRA_DIST_FILES=
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/other/SConscript b/input/new/other/SConscript
index f72bfffc28..cb39d4eab0 100644
--- a/input/new/other/SConscript
+++ b/input/new/other/SConscript
@@ -1,4 +1,5 @@
# -*-python-*-
Import ('env', 'collate')
-collate (title = 'Advanced snippets')
+collate (title = 'Sample snippets from LSR')
+
diff --git a/input/new/other/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly b/input/new/other/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly
new file mode 100644
index 0000000000..8ce0c479e6
--- /dev/null
+++ b/input/new/other/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly
@@ -0,0 +1,47 @@
+%% Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+The shapeNoteStyles property gives you the ability to define various
+note heads styles for each step of the scale (as defined by the key
+signature or the \"tonic\" property).
+
+This property requires a set of symbols, which can be purely arbitrary
+(geometrical expressions such as triangle, cross, xcircle etc. are
+allowed) or based on old American engraving tradition (you can use some
+latin note names as well).
+
+That said, if you're trying to imitate old American song books, you may
+also want to try LilyPond's predefined note heads styles, through
+shortcut commands such as \aikenHeads or \sacredHarpHeads.
+
+This exemple shows different ways to obtain shape note heads, and
+demonstrates the ability to transpose a melody without losing the
+correspondance between harmonic functions and note heads styles.
+" }
+
+fragment = {
+ \key c \major
+ c1 d e f g a b c
+ \break
+}
+
+\relative {
+ \set shapeNoteStyles = ##(do re mi fa #f la ti)
+ \fragment
+}
+
+% temporary change help LSR integration -gp
+%{
+\transpose c d
+ \relative {
+ \set shapeNoteStyles = ##(do re mi fa #f la ti)
+ \fragment
+}
+
+\relative {
+ \set shapeNoteStyles = ##(cross triangle fa #f mensural xcircle diamond)
+ \fragment
+}
+%}
+
diff --git a/input/new/other/drawing-boxes-around-grobs.ly b/input/new/other/drawing-boxes-around-grobs.ly
new file mode 100644
index 0000000000..2c8d1e9483
--- /dev/null
+++ b/input/new/other/drawing-boxes-around-grobs.ly
@@ -0,0 +1,28 @@
+%% Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+The @code{print-function} can be overridden to draw a box around an
+arbitrary grob.
+" }
+
+\relative c'' {
+
+ \override TextScript #'stencil =
+ #(make-stencil-boxer 0.1 0.3 ly:text-interface::print)
+
+ c'4^"foo"
+
+ \override Stem #'stencil =
+ #(make-stencil-boxer 0.05 0.25 ly:stem::print)
+
+ \override Score.RehearsalMark #'stencil =
+ #(make-stencil-boxer 0.15 0.3 ly:text-interface::print)
+ b8
+ \revert Stem #'stencil
+
+
+ c4. c4 \mark "F" c1
+}
+
+
diff --git a/input/new/other/drawing-circles-around-various-objects.ly b/input/new/other/drawing-circles-around-various-objects.ly
new file mode 100644
index 0000000000..8409531e81
--- /dev/null
+++ b/input/new/other/drawing-circles-around-various-objects.ly
@@ -0,0 +1,24 @@
+%% Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+The \circle command allows you to draw circles around various objects
+(for example fingering indications). However, some objects require
+specific tweaks: rehearsal marks depend on the Score.markFormatter
+context, bar numbers on the Score.BarNumber context, and so on.
+
+You can tweak the printing of your circles by setting some properties
+such as #'thickness, #'circle-padding or #'font-size.
+" }
+
+\relative c'{
+c1
+\set Score.markFormatter
+ = #(lambda (mark context)
+ (make-circle-markup (format-mark-numbers mark context)))
+\mark \default
+c2 d^\markup{\circle \finger "2"}
+\override Score.BarNumber #'break-visibility = #all-visible
+\override Score.BarNumber #'stencil
+ = #(make-stencil-circler 0.1 0.25 ly:text-interface::print)
+}
diff --git a/input/new/other/making-an-object-invisibile-with-the-transparent-property.ly b/input/new/other/making-an-object-invisibile-with-the-transparent-property.ly
new file mode 100644
index 0000000000..e38331e2c3
--- /dev/null
+++ b/input/new/other/making-an-object-invisibile-with-the-transparent-property.ly
@@ -0,0 +1,24 @@
+%% Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+Setting the @code{transparent} property will cause an object to be
+printed in `invisible ink': the object is not printed, but all its
+other behavior is retained. The object still takes up space, it takes
+part in collisions, and slurs, and ties and beams can be attached to it.
+
+
+The snippet demonstrates how to connect different voices using ties.
+Normally, ties only connect two notes in the same voice. By
+introducing a tie in a different voice, and blanking the first up-stem
+in that voice, the tie appears to cross voices.
+" }
+
+\relative c'' {
+<< {
+ \once \override Stem #'transparent = ##t
+ b8~ b8\noBeam
+} \\ {
+ b[ g8]
+} >>
+}
diff --git a/input/new/other/outputting-the-version-number.ly b/input/new/other/outputting-the-version-number.ly
new file mode 100644
index 0000000000..4d4ec62ddc
--- /dev/null
+++ b/input/new/other/outputting-the-version-number.ly
@@ -0,0 +1,20 @@
+%% Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+By putting the output of
+ @code{lilypond-version} into a lyric, it is possible to print the
+ version number of LilyPond in a score, or in a document generated
+ with @code{lilypond-book}. Another possibility is to append the
+ version number to the doc-string, in this manner:
+" }
+
+\score { \context Lyrics {
+ \override Score.RehearsalMark #'self-alignment-X = #LEFT
+ \mark #(ly:export (string-append "Processed with LilyPond version " (lilypond-version)))
+ s2
+ }
+}
+
+
+
diff --git a/input/new/other/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/new/other/using-the--tweak-command-to-tweak-individual-grobs.ly
new file mode 100644
index 0000000000..ac7e06ef8d
--- /dev/null
+++ b/input/new/other/using-the--tweak-command-to-tweak-individual-grobs.ly
@@ -0,0 +1,23 @@
+%% Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+With the @code{\tweak} command, you can tune every grob directly. Here
+are some examples of available tweaks.
+
+
+" }
+
+\paper {
+ ragged-right = ##t
+}
+
+{
+ \set fingeringOrientations = #'(right)
+ <
+ \tweak #'font-size #3 c
+ \tweak #'color #red d-\tweak #'font-size #8 -4
+ \tweak #'style #'cross g
+ \tweak #'duration-log #1 a
+ >4
+}
diff --git a/input/new/ancient/AAA-intro.ly b/input/new/paper-and-layout/AAA-intro.ly
similarity index 100%
rename from input/new/ancient/AAA-intro.ly
rename to input/new/paper-and-layout/AAA-intro.ly
diff --git a/input/new/paper-and-layout/GNUmakefile b/input/new/paper-and-layout/GNUmakefile
new file mode 100644
index 0000000000..b83142b2e5
--- /dev/null
+++ b/input/new/paper-and-layout/GNUmakefile
@@ -0,0 +1,7 @@
+depth = ../../../
+
+STEPMAKE_TEMPLATES=documentation
+
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
+
+include $(depth)/make/stepmake.make
diff --git a/input/new/contemporary/SConscript b/input/new/paper-and-layout/SConscript
similarity index 100%
rename from input/new/contemporary/SConscript
rename to input/new/paper-and-layout/SConscript
diff --git a/input/new/nonmusic/clip-systems.ly b/input/new/paper-and-layout/clip-systems.ly
similarity index 100%
rename from input/new/nonmusic/clip-systems.ly
rename to input/new/paper-and-layout/clip-systems.ly
diff --git a/input/new/nonmusic/toc.ly b/input/new/paper-and-layout/toc.ly
similarity index 100%
rename from input/new/nonmusic/toc.ly
rename to input/new/paper-and-layout/toc.ly
diff --git a/input/new/parts/GNUmakefile b/input/new/parts/GNUmakefile
index 3819fda13a..b83142b2e5 100644
--- a/input/new/parts/GNUmakefile
+++ b/input/new/parts/GNUmakefile
@@ -1,15 +1,7 @@
depth = ../../../
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
+STEPMAKE_TEMPLATES=documentation
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
-
-EXTRA_DIST_FILES=
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/percussion/GNUmakefile b/input/new/percussion/GNUmakefile
index 3819fda13a..b83142b2e5 100644
--- a/input/new/percussion/GNUmakefile
+++ b/input/new/percussion/GNUmakefile
@@ -1,15 +1,7 @@
depth = ../../../
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
+STEPMAKE_TEMPLATES=documentation
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
-
-EXTRA_DIST_FILES=
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/piano-music/GNUmakefile b/input/new/piano-music/GNUmakefile
new file mode 100644
index 0000000000..b83142b2e5
--- /dev/null
+++ b/input/new/piano-music/GNUmakefile
@@ -0,0 +1,7 @@
+depth = ../../../
+
+STEPMAKE_TEMPLATES=documentation
+
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
+
+include $(depth)/make/stepmake.make
diff --git a/input/new/editorial/SConscript b/input/new/piano-music/SConscript
similarity index 100%
rename from input/new/editorial/SConscript
rename to input/new/piano-music/SConscript
diff --git a/input/new/piano/AAA-intro.ly b/input/new/piano/AAA-intro.ly
deleted file mode 100644
index 93c62a94e3..0000000000
--- a/input/new/piano/AAA-intro.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-\version "2.10.0"
-
-\header{
-texidoc = "
-@unnumbered Introduction
-
-This document shows examples from the
-@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}.
-
-In the web version of this document, you can click on the file name
-or figure for each example to see the corresponding input file."
-}
-
-% make sure .png is generated.
-\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) }
-
diff --git a/input/new/piano/GNUmakefile b/input/new/piano/GNUmakefile
deleted file mode 100644
index a3f0b2bfde..0000000000
--- a/input/new/piano/GNUmakefile
+++ /dev/null
@@ -1,12 +0,0 @@
-
-depth = ../../../
-
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-EXTRA_DIST_FILES=
-
-include $(depth)/make/stepmake.make
-
-TITLE=Sample snippets from LSR
-
diff --git a/input/new/piano/SConscript b/input/new/piano/SConscript
deleted file mode 100644
index cb39d4eab0..0000000000
--- a/input/new/piano/SConscript
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*-python-*-
-
-Import ('env', 'collate')
-collate (title = 'Sample snippets from LSR')
-
diff --git a/input/new/pitches/GNUmakefile b/input/new/pitches/GNUmakefile
index 3819fda13a..b83142b2e5 100644
--- a/input/new/pitches/GNUmakefile
+++ b/input/new/pitches/GNUmakefile
@@ -1,15 +1,7 @@
depth = ../../../
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
+STEPMAKE_TEMPLATES=documentation
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
-
-EXTRA_DIST_FILES=
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/real-music/GNUmakefile b/input/new/real-music/GNUmakefile
index 3819fda13a..b83142b2e5 100644
--- a/input/new/real-music/GNUmakefile
+++ b/input/new/real-music/GNUmakefile
@@ -1,15 +1,7 @@
depth = ../../../
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
+STEPMAKE_TEMPLATES=documentation
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
-
-EXTRA_DIST_FILES=
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/repeats/GNUmakefile b/input/new/repeats/GNUmakefile
index 43325ab698..b83142b2e5 100644
--- a/input/new/repeats/GNUmakefile
+++ b/input/new/repeats/GNUmakefile
@@ -1,16 +1,7 @@
-
depth = ../../../
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
+STEPMAKE_TEMPLATES=documentation
-EXTRA_DIST_FILES=
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/rhythms/GNUmakefile b/input/new/rhythms/GNUmakefile
index 3819fda13a..b83142b2e5 100644
--- a/input/new/rhythms/GNUmakefile
+++ b/input/new/rhythms/GNUmakefile
@@ -1,15 +1,7 @@
depth = ../../../
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
+STEPMAKE_TEMPLATES=documentation
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
-
-EXTRA_DIST_FILES=
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/scheme/AAA-intro.ly b/input/new/scheme/AAA-intro.ly
deleted file mode 100644
index 93c62a94e3..0000000000
--- a/input/new/scheme/AAA-intro.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-\version "2.10.0"
-
-\header{
-texidoc = "
-@unnumbered Introduction
-
-This document shows examples from the
-@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}.
-
-In the web version of this document, you can click on the file name
-or figure for each example to see the corresponding input file."
-}
-
-% make sure .png is generated.
-\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) }
-
diff --git a/input/new/scheme/GNUmakefile b/input/new/scheme/GNUmakefile
deleted file mode 100644
index 43325ab698..0000000000
--- a/input/new/scheme/GNUmakefile
+++ /dev/null
@@ -1,16 +0,0 @@
-
-depth = ../../../
-
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
-
-EXTRA_DIST_FILES=
-
-include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/scheme/SConscript b/input/new/scheme/SConscript
deleted file mode 100644
index f72bfffc28..0000000000
--- a/input/new/scheme/SConscript
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*-python-*-
-
-Import ('env', 'collate')
-collate (title = 'Advanced snippets')
diff --git a/input/new/schemelanguage/GNUmakefile b/input/new/schemelanguage/GNUmakefile
new file mode 100644
index 0000000000..b83142b2e5
--- /dev/null
+++ b/input/new/schemelanguage/GNUmakefile
@@ -0,0 +1,7 @@
+depth = ../../../
+
+STEPMAKE_TEMPLATES=documentation
+
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
+
+include $(depth)/make/stepmake.make
diff --git a/input/new/education/SConscript b/input/new/schemelanguage/SConscript
similarity index 100%
rename from input/new/education/SConscript
rename to input/new/schemelanguage/SConscript
diff --git a/input/new/scheme/move-specific-text.ly b/input/new/schemelanguage/move-specific-text.ly
similarity index 100%
rename from input/new/scheme/move-specific-text.ly
rename to input/new/schemelanguage/move-specific-text.ly
diff --git a/input/new/simultaneous-notes/GNUmakefile b/input/new/simultaneous-notes/GNUmakefile
new file mode 100644
index 0000000000..b83142b2e5
--- /dev/null
+++ b/input/new/simultaneous-notes/GNUmakefile
@@ -0,0 +1,7 @@
+depth = ../../../
+
+STEPMAKE_TEMPLATES=documentation
+
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
+
+include $(depth)/make/stepmake.make
diff --git a/input/new/null/SConscript b/input/new/simultaneous-notes/SConscript
similarity index 100%
rename from input/new/null/SConscript
rename to input/new/simultaneous-notes/SConscript
diff --git a/input/new/simultaneous/AAA-intro.ly b/input/new/simultaneous/AAA-intro.ly
deleted file mode 100644
index 93c62a94e3..0000000000
--- a/input/new/simultaneous/AAA-intro.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-\version "2.10.0"
-
-\header{
-texidoc = "
-@unnumbered Introduction
-
-This document shows examples from the
-@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}.
-
-In the web version of this document, you can click on the file name
-or figure for each example to see the corresponding input file."
-}
-
-% make sure .png is generated.
-\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) }
-
diff --git a/input/new/simultaneous/GNUmakefile b/input/new/simultaneous/GNUmakefile
deleted file mode 100644
index a3f0b2bfde..0000000000
--- a/input/new/simultaneous/GNUmakefile
+++ /dev/null
@@ -1,12 +0,0 @@
-
-depth = ../../../
-
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-EXTRA_DIST_FILES=
-
-include $(depth)/make/stepmake.make
-
-TITLE=Sample snippets from LSR
-
diff --git a/input/new/simultaneous/SConscript b/input/new/simultaneous/SConscript
deleted file mode 100644
index cb39d4eab0..0000000000
--- a/input/new/simultaneous/SConscript
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*-python-*-
-
-Import ('env', 'collate')
-collate (title = 'Sample snippets from LSR')
-
diff --git a/input/new/spacing/GNUmakefile b/input/new/spacing/GNUmakefile
index 43325ab698..b83142b2e5 100644
--- a/input/new/spacing/GNUmakefile
+++ b/input/new/spacing/GNUmakefile
@@ -1,16 +1,7 @@
-
depth = ../../../
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
+STEPMAKE_TEMPLATES=documentation
-EXTRA_DIST_FILES=
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/staff-notation/GNUmakefile b/input/new/staff-notation/GNUmakefile
new file mode 100644
index 0000000000..b83142b2e5
--- /dev/null
+++ b/input/new/staff-notation/GNUmakefile
@@ -0,0 +1,7 @@
+depth = ../../../
+
+STEPMAKE_TEMPLATES=documentation
+
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
+
+include $(depth)/make/stepmake.make
diff --git a/input/new/engravers/SConscript b/input/new/staff-notation/SConscript
similarity index 100%
rename from input/new/engravers/SConscript
rename to input/new/staff-notation/SConscript
diff --git a/input/new/staff/AAA-intro.ly b/input/new/staff/AAA-intro.ly
deleted file mode 100644
index 93c62a94e3..0000000000
--- a/input/new/staff/AAA-intro.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-\version "2.10.0"
-
-\header{
-texidoc = "
-@unnumbered Introduction
-
-This document shows examples from the
-@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}.
-
-In the web version of this document, you can click on the file name
-or figure for each example to see the corresponding input file."
-}
-
-% make sure .png is generated.
-\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) }
-
diff --git a/input/new/staff/GNUmakefile b/input/new/staff/GNUmakefile
deleted file mode 100644
index 43325ab698..0000000000
--- a/input/new/staff/GNUmakefile
+++ /dev/null
@@ -1,16 +0,0 @@
-
-depth = ../../../
-
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
-
-EXTRA_DIST_FILES=
-
-include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/staff/SConscript b/input/new/staff/SConscript
deleted file mode 100644
index f72bfffc28..0000000000
--- a/input/new/staff/SConscript
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*-python-*-
-
-Import ('env', 'collate')
-collate (title = 'Advanced snippets')
diff --git a/input/new/strings/GNUmakefile b/input/new/strings/GNUmakefile
index a3f0b2bfde..b83142b2e5 100644
--- a/input/new/strings/GNUmakefile
+++ b/input/new/strings/GNUmakefile
@@ -1,12 +1,7 @@
-
depth = ../../../
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
+STEPMAKE_TEMPLATES=documentation
-EXTRA_DIST_FILES=
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
include $(depth)/make/stepmake.make
-
-TITLE=Sample snippets from LSR
-
diff --git a/input/new/text/GNUmakefile b/input/new/text/GNUmakefile
index 3819fda13a..b83142b2e5 100644
--- a/input/new/text/GNUmakefile
+++ b/input/new/text/GNUmakefile
@@ -1,15 +1,7 @@
depth = ../../../
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
+STEPMAKE_TEMPLATES=documentation
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
-
-EXTRA_DIST_FILES=
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/vocal-music/GNUmakefile b/input/new/vocal-music/GNUmakefile
new file mode 100644
index 0000000000..b83142b2e5
--- /dev/null
+++ b/input/new/vocal-music/GNUmakefile
@@ -0,0 +1,7 @@
+depth = ../../../
+
+STEPMAKE_TEMPLATES=documentation
+
+EXTRA_DIST_FILES=$(call src-wildcard,*.ly)
+
+include $(depth)/make/stepmake.make
diff --git a/input/new/instrument/SConscript b/input/new/vocal-music/SConscript
similarity index 100%
rename from input/new/instrument/SConscript
rename to input/new/vocal-music/SConscript
diff --git a/input/new/vocal/AAA-intro.ly b/input/new/vocal/AAA-intro.ly
deleted file mode 100644
index 93c62a94e3..0000000000
--- a/input/new/vocal/AAA-intro.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-\version "2.10.0"
-
-\header{
-texidoc = "
-@unnumbered Introduction
-
-This document shows examples from the
-@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}.
-
-In the web version of this document, you can click on the file name
-or figure for each example to see the corresponding input file."
-}
-
-% make sure .png is generated.
-\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) }
-
diff --git a/input/new/vocal/GNUmakefile b/input/new/vocal/GNUmakefile
deleted file mode 100644
index 43325ab698..0000000000
--- a/input/new/vocal/GNUmakefile
+++ /dev/null
@@ -1,16 +0,0 @@
-
-depth = ../../../
-
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
-## Hmm, would this work? No -- if we really want examples, move
-## to other dir (input/) comes to mind.
-## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia
-
-EXTRA_DIST_FILES=
-
-include $(depth)/make/stepmake.make
-
-TITLE=Advanced snippets
diff --git a/input/new/vocal/SConscript b/input/new/vocal/SConscript
deleted file mode 100644
index f72bfffc28..0000000000
--- a/input/new/vocal/SConscript
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*-python-*-
-
-Import ('env', 'collate')
-collate (title = 'Advanced snippets')
--
2.39.5