LSR: add new categories.

diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py
index 26ac31aec1ba80012f5e8eb957ef31a3b0a37ce5..e959eef31c2ccacbf77aea0b0ef2a9e603597fff 100755 (executable)
--- a/buildscripts/makelsr.py
+++ b/buildscripts/makelsr.py
@@ -4,7 +4,7 @@ import os
 import os.path
 import shutil
 
-dirs = ['ancient','chords','connecting','contemporary','expressive','guitar','parts','repeats','scheme','spacing','staff','text','vocal']
+dirs = ['ancient','chords','connecting','contemporary','expressive','education','guitar','parts','pitches','repeats','scheme','spacing','staff','text','vocal','other']
 notsafe=[]
 
 try:

diff --git a/input/lsr/GNUmakefile b/input/lsr/GNUmakefile
index 3b0f6f1b933fc86a6bb3f6013cfe9322d8bf61db..999c65ada6f9934b5fe598537572f2284077e6bc 100644 (file)
--- a/input/lsr/GNUmakefile
+++ b/input/lsr/GNUmakefile
@@ -1,6 +1,6 @@
 depth = ../../
 
-SUBDIRS = ancient chords connecting contemporary guitar parts repeats spacing staff text vocal expressive scheme
+SUBDIRS = ancient chords connecting contemporary guitar parts repeats spacing staff text vocal expressive scheme other education pitches
 
 STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc

diff --git a/input/lsr/education/AAA-intro-advanced.ly b/input/lsr/education/AAA-intro-advanced.ly
new file mode 100644 (file)
index 0000000..4f00239
--- /dev/null
+++ b/input/lsr/education/AAA-intro-advanced.ly
@@ -0,0 +1,22 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.10.0"
+%% +.ly: Be the first .ly file for lys-to-tely.py.
+%% Better to make lys-to-tely.py include "introduction.texi" or
+%% other .texi documents too?
+
+\header{
+texidoc = #(string-append "
+@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.
+
+This document is for LilyPond version 
+" (lilypond-version) "." )
+}
+
+% make sure .png  is generated.
+\lyrics {  " " }

diff --git a/input/lsr/education/GNUmakefile b/input/lsr/education/GNUmakefile
new file mode 100644 (file)
index 0000000..3819fda
--- /dev/null
+++ b/input/lsr/education/GNUmakefile
@@ -0,0 +1,15 @@
+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/education/SConscript b/input/lsr/education/SConscript
new file mode 100644 (file)
index 0000000..f72bfff
--- /dev/null
+++ b/input/lsr/education/SConscript
@@ -0,0 +1,4 @@
+# -*-python-*-
+
+Import ('env', 'collate')
+collate (title = 'Advanced snippets')

diff --git a/input/lsr/other/AAA-intro-advanced.ly b/input/lsr/other/AAA-intro-advanced.ly
new file mode 100644 (file)
index 0000000..4f00239
--- /dev/null
+++ b/input/lsr/other/AAA-intro-advanced.ly
@@ -0,0 +1,22 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.10.0"
+%% +.ly: Be the first .ly file for lys-to-tely.py.
+%% Better to make lys-to-tely.py include "introduction.texi" or
+%% other .texi documents too?
+
+\header{
+texidoc = #(string-append "
+@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.
+
+This document is for LilyPond version 
+" (lilypond-version) "." )
+}
+
+% make sure .png  is generated.
+\lyrics {  " " }

diff --git a/input/lsr/other/GNUmakefile b/input/lsr/other/GNUmakefile
new file mode 100644 (file)
index 0000000..3819fda
--- /dev/null
+++ b/input/lsr/other/GNUmakefile
@@ -0,0 +1,15 @@
+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/other/SConscript b/input/lsr/other/SConscript
new file mode 100644 (file)
index 0000000..f72bfff
--- /dev/null
+++ b/input/lsr/other/SConscript
@@ -0,0 +1,4 @@
+# -*-python-*-
+
+Import ('env', 'collate')
+collate (title = 'Advanced snippets')

diff --git a/input/lsr/pitches/AAA-intro-advanced.ly b/input/lsr/pitches/AAA-intro-advanced.ly
new file mode 100644 (file)
index 0000000..4f00239
--- /dev/null
+++ b/input/lsr/pitches/AAA-intro-advanced.ly
@@ -0,0 +1,22 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.10.0"
+%% +.ly: Be the first .ly file for lys-to-tely.py.
+%% Better to make lys-to-tely.py include "introduction.texi" or
+%% other .texi documents too?
+
+\header{
+texidoc = #(string-append "
+@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.
+
+This document is for LilyPond version 
+" (lilypond-version) "." )
+}
+
+% make sure .png  is generated.
+\lyrics {  " " }

diff --git a/input/lsr/pitches/GNUmakefile b/input/lsr/pitches/GNUmakefile
new file mode 100644 (file)
index 0000000..3819fda
--- /dev/null
+++ b/input/lsr/pitches/GNUmakefile
@@ -0,0 +1,15 @@
+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/pitches/SConscript b/input/lsr/pitches/SConscript
new file mode 100644 (file)
index 0000000..f72bfff
--- /dev/null
+++ b/input/lsr/pitches/SConscript
@@ -0,0 +1,4 @@
+# -*-python-*-
+
+Import ('env', 'collate')
+collate (title = 'Advanced snippets')

diff --git a/input/new/GNUmakefile b/input/new/GNUmakefile
index d6dbfbcbe0dfa3ad511a85028e31af58b92414fa..999c65ada6f9934b5fe598537572f2284077e6bc 100644 (file)
--- a/input/new/GNUmakefile
+++ b/input/new/GNUmakefile
@@ -1,6 +1,6 @@
 depth = ../../
 
-SUBDIRS = ancient chords connecting contemporary guitar parts repeats spacing staff text vocal expressive scheme
+SUBDIRS = ancient chords connecting contemporary guitar parts repeats spacing staff text vocal expressive scheme other education pitches
 
 STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
@@ -8,5 +8,5 @@ EXTRA_DIST_FILES=README
 include $(depth)/make/stepmake.make
 
 
-TITLE=Storage for new features -- you should not see these!
+TITLE=LilyPond Examples
 

diff --git a/input/new/SConscript b/input/new/SConscript
index c534e3573ef3b3837b8126a5f1063e707d5eb742..f72bfffc282421faa90bb984dd2c4b38f82961e4 100644 (file)
--- a/input/new/SConscript
+++ b/input/new/SConscript
@@ -1,4 +1,4 @@
 # -*-python-*-
 
 Import ('env', 'collate')
-collate (title = 'LilyPond Examples')
+collate (title = 'Advanced snippets')

diff --git a/input/new/education/AAA-intro-advanced.ly b/input/new/education/AAA-intro-advanced.ly
new file mode 100644 (file)
index 0000000..4f00239
--- /dev/null
+++ b/input/new/education/AAA-intro-advanced.ly
@@ -0,0 +1,22 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.10.0"
+%% +.ly: Be the first .ly file for lys-to-tely.py.
+%% Better to make lys-to-tely.py include "introduction.texi" or
+%% other .texi documents too?
+
+\header{
+texidoc = #(string-append "
+@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.
+
+This document is for LilyPond version 
+" (lilypond-version) "." )
+}
+
+% make sure .png  is generated.
+\lyrics {  " " }

diff --git a/input/new/education/GNUmakefile b/input/new/education/GNUmakefile
new file mode 100644 (file)
index 0000000..3819fda
--- /dev/null
+++ b/input/new/education/GNUmakefile
@@ -0,0 +1,15 @@
+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/education/SConscript b/input/new/education/SConscript
new file mode 100644 (file)
index 0000000..f72bfff
--- /dev/null
+++ b/input/new/education/SConscript
@@ -0,0 +1,4 @@
+# -*-python-*-
+
+Import ('env', 'collate')
+collate (title = 'Advanced snippets')

diff --git a/input/new/other/AAA-intro-advanced.ly b/input/new/other/AAA-intro-advanced.ly
new file mode 100644 (file)
index 0000000..4f00239
--- /dev/null
+++ b/input/new/other/AAA-intro-advanced.ly
@@ -0,0 +1,22 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.10.0"
+%% +.ly: Be the first .ly file for lys-to-tely.py.
+%% Better to make lys-to-tely.py include "introduction.texi" or
+%% other .texi documents too?
+
+\header{
+texidoc = #(string-append "
+@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.
+
+This document is for LilyPond version 
+" (lilypond-version) "." )
+}
+
+% make sure .png  is generated.
+\lyrics {  " " }

diff --git a/input/new/other/GNUmakefile b/input/new/other/GNUmakefile
new file mode 100644 (file)
index 0000000..3819fda
--- /dev/null
+++ b/input/new/other/GNUmakefile
@@ -0,0 +1,15 @@
+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/other/SConscript b/input/new/other/SConscript
new file mode 100644 (file)
index 0000000..f72bfff
--- /dev/null
+++ b/input/new/other/SConscript
@@ -0,0 +1,4 @@
+# -*-python-*-
+
+Import ('env', 'collate')
+collate (title = 'Advanced snippets')

diff --git a/input/new/pitches/AAA-intro-advanced.ly b/input/new/pitches/AAA-intro-advanced.ly
new file mode 100644 (file)
index 0000000..4f00239
--- /dev/null
+++ b/input/new/pitches/AAA-intro-advanced.ly
@@ -0,0 +1,22 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.10.0"
+%% +.ly: Be the first .ly file for lys-to-tely.py.
+%% Better to make lys-to-tely.py include "introduction.texi" or
+%% other .texi documents too?
+
+\header{
+texidoc = #(string-append "
+@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.
+
+This document is for LilyPond version 
+" (lilypond-version) "." )
+}
+
+% make sure .png  is generated.
+\lyrics {  " " }

diff --git a/input/new/pitches/GNUmakefile b/input/new/pitches/GNUmakefile
new file mode 100644 (file)
index 0000000..3819fda
--- /dev/null
+++ b/input/new/pitches/GNUmakefile
@@ -0,0 +1,15 @@
+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/pitches/SConscript b/input/new/pitches/SConscript
new file mode 100644 (file)
index 0000000..f72bfff
--- /dev/null
+++ b/input/new/pitches/SConscript
@@ -0,0 +1,4 @@
+# -*-python-*-
+
+Import ('env', 'collate')
+collate (title = 'Advanced snippets')