]> git.donarmstrong.com Git - lilypond.git/commitdiff
Update dirs for LSR.
authorGraham Percival <graham@percival-music.ca>
Tue, 3 Jul 2007 06:16:58 +0000 (23:16 -0700)
committerGraham Percival <graham@percival-music.ca>
Tue, 3 Jul 2007 06:16:58 +0000 (23:16 -0700)
19 files changed:
buildscripts/makelsr.py
input/lsr/GNUmakefile
input/lsr/instrument/AAA-intro.ly [new file with mode: 0644]
input/lsr/instrument/GNUmakefile [new file with mode: 0644]
input/lsr/instrument/SConscript [new file with mode: 0644]
input/lsr/nonmusic/AAA-intro.ly [new file with mode: 0644]
input/lsr/nonmusic/GNUmakefile [new file with mode: 0644]
input/lsr/nonmusic/SConscript [new file with mode: 0644]
input/lsr/nonmusic/clip-systems.ly [new file with mode: 0644]
input/lsr/nonmusic/toc.ly [new file with mode: 0644]
input/new/GNUmakefile
input/new/instrument/AAA-intro.ly [new file with mode: 0644]
input/new/instrument/GNUmakefile [new file with mode: 0644]
input/new/instrument/SConscript [new file with mode: 0644]
input/new/nonmusic/AAA-intro.ly [new file with mode: 0644]
input/new/nonmusic/GNUmakefile [new file with mode: 0644]
input/new/nonmusic/SConscript [new file with mode: 0644]
input/new/nonmusic/clip-systems.ly [new file with mode: 0644]
input/new/nonmusic/toc.ly [new file with mode: 0644]

index cc79192bd85572e8398e44ff8b07c1a431c33d14..ab18da2ace687264a5fd2e9a9b7f1ae16d6467ed 100755 (executable)
@@ -4,7 +4,7 @@ import os
 import os.path
 import shutil
 
-dirs = ['ancient','chords','connecting','contemporary','expressive','education','guitar','parts','pitch','repeats','scheme','spacing','staff','text','vocal','other','non-music','engravers','instrument-specific']
+dirs = ['ancient','chords','connecting','contemporary','expressive','education','guitar','parts','pitch','repeats','scheme','spacing','staff','text','vocal','other','nonmusic','engravers','instrument']
 notsafe=[]
 
 try:
index 6cc66a8a50caff3f6205640a6270ada58bf0c0ca..0aedc718d6ea388218033e2dd4834e8998ea91e6 100644 (file)
@@ -2,7 +2,7 @@ depth = ../../
 
 SUBDIRS = ancient chords connecting contemporary education expressive
 SUBDIRS += guitar parts pitch repeats spacing staff text vocal scheme other 
-SUBDIRS += engravers non-music instrument-specific
+SUBDIRS += engravers nonmusic instrument
 
 STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
diff --git a/input/lsr/instrument/AAA-intro.ly b/input/lsr/instrument/AAA-intro.ly
new file mode 100644 (file)
index 0000000..4997892
--- /dev/null
@@ -0,0 +1,17 @@
+%%  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/lsr/instrument/GNUmakefile b/input/lsr/instrument/GNUmakefile
new file mode 100644 (file)
index 0000000..43325ab
--- /dev/null
@@ -0,0 +1,16 @@
+
+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/instrument/SConscript b/input/lsr/instrument/SConscript
new file mode 100644 (file)
index 0000000..f72bfff
--- /dev/null
@@ -0,0 +1,4 @@
+# -*-python-*-
+
+Import ('env', 'collate')
+collate (title = 'Advanced snippets')
diff --git a/input/lsr/nonmusic/AAA-intro.ly b/input/lsr/nonmusic/AAA-intro.ly
new file mode 100644 (file)
index 0000000..4997892
--- /dev/null
@@ -0,0 +1,17 @@
+%%  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/lsr/nonmusic/GNUmakefile b/input/lsr/nonmusic/GNUmakefile
new file mode 100644 (file)
index 0000000..43325ab
--- /dev/null
@@ -0,0 +1,16 @@
+
+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/nonmusic/SConscript b/input/lsr/nonmusic/SConscript
new file mode 100644 (file)
index 0000000..f72bfff
--- /dev/null
@@ -0,0 +1,4 @@
+# -*-python-*-
+
+Import ('env', 'collate')
+collate (title = 'Advanced snippets')
diff --git a/input/lsr/nonmusic/clip-systems.ly b/input/lsr/nonmusic/clip-systems.ly
new file mode 100644 (file)
index 0000000..66e8e79
--- /dev/null
@@ -0,0 +1,86 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\header {
+  texidoc = "Clipping snippets from a finished score
+
+Notes:
+
+@itemize @bullet
+@item If system starts and ends are included, they include extents of the System grob, eg. instrument names.
+@item Grace notes  at the end point of the region are not included
+@item Regions can span multiple systems. In this case, multiple EPS files are generated.
+@end itemize
+
+This file needs to be run separately with @code{-dclip-systems}; the
+collated-files.html of the regression test does not adequately show
+the results.
+
+The result will be files named
+@file{@var{base}-from-@var{start}-to-@var{end}[-@var{count}].eps}.
+"
+
+}
+
+\version "2.11.23"
+
+#(ly:set-option 'clip-systems)
+
+#(set! output-count 1)
+
+origScore = \score{
+    \relative {
+      \set Staff.instrumentName = #"bla"
+      c1
+      d
+      \grace c16
+      e1
+      \key d\major
+      
+      f
+      \break  \clef bass
+      g,
+      fis
+    }  
+}
+
+\book { 
+  \score {
+    \origScore
+    \layout {
+
+      %% each clip-region is a (START . END) pair
+      %% where both are rhythmic-locations.
+      
+      %% (make-rhythmic-locations BAR-NUMBER NUM DEN)
+      %% means NUM/DEN whole-notes into bar numbered BAR-NUMBER
+
+      clip-regions
+      = #(list
+         (cons
+          (make-rhythmic-location 2 0 1)
+          (make-rhythmic-location 4 0 1))
+
+         (cons
+          (make-rhythmic-location 0 0 1)
+          (make-rhythmic-location 4 0 1))
+         
+         (cons
+          (make-rhythmic-location 0 0 1)
+          (make-rhythmic-location 6 0 1))
+       )
+    }
+  }
+}
+
+#(set! output-count 0)
+#(ly:set-option 'clip-systems #f)
+
+\book {
+  \score { \origScore }
+  \markup { \bold \fontsize #6 clips }
+  \score {
+    \lyrics {
+      \markup { from-2.0.1-to-4.0.1-clip.eps }
+      \markup { \epsfile #X #30.0 #(format #f "~a-1-from-2.0.1-to-4.0.1-clip.eps" (ly:parser-output-name parser)) }
+    }
+  }
+}
diff --git a/input/lsr/nonmusic/toc.ly b/input/lsr/nonmusic/toc.ly
new file mode 100644 (file)
index 0000000..8b988ea
--- /dev/null
@@ -0,0 +1,30 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.26"
+
+\header {
+  texidoc = "A table of contents is included using
+@code{\\markuplines \\table-of-contents}. The toc items are added with
+the @code{\\tocItem} command."
+}
+
+#(set-default-paper-size "a6")
+
+\book {
+  \markuplines \table-of-contents
+  \pageBreak
+
+  \tocItem \markup "The first score"
+  \score {
+    { 
+      c'1 \pageBreak
+      \mark "A" \tocItem \markup "Mark A"
+      d'
+    }
+  }
+  \pageBreak
+  \tocItem \markup "The second score"
+  \score {
+    { e' }
+    \header { piece = "Second score" }
+  }
+}
\ No newline at end of file
index af209b82fe43f57eb8edbd4d94d37fb88b2b4421..d212c6cec87abe681d75dd0cf11adeb4804c8d36 100644 (file)
@@ -1,6 +1,9 @@
 depth = ../../
 
-SUBDIRS = ancient chords connecting contemporary guitar parts repeats spacing staff text vocal expressive scheme other education pitch
+SUBDIRS = ancient chords connecting contemporary education expressive
+SUBDIRS += guitar parts pitch repeats spacing staff text vocal scheme other 
+SUBDIRS += engravers nonmusic instrument
+
 
 STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
diff --git a/input/new/instrument/AAA-intro.ly b/input/new/instrument/AAA-intro.ly
new file mode 100644 (file)
index 0000000..93c62a9
--- /dev/null
@@ -0,0 +1,16 @@
+\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
new file mode 100644 (file)
index 0000000..43325ab
--- /dev/null
@@ -0,0 +1,16 @@
+
+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/instrument/SConscript b/input/new/instrument/SConscript
new file mode 100644 (file)
index 0000000..f72bfff
--- /dev/null
@@ -0,0 +1,4 @@
+# -*-python-*-
+
+Import ('env', 'collate')
+collate (title = 'Advanced snippets')
diff --git a/input/new/nonmusic/AAA-intro.ly b/input/new/nonmusic/AAA-intro.ly
new file mode 100644 (file)
index 0000000..93c62a9
--- /dev/null
@@ -0,0 +1,16 @@
+\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
new file mode 100644 (file)
index 0000000..43325ab
--- /dev/null
@@ -0,0 +1,16 @@
+
+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
new file mode 100644 (file)
index 0000000..f72bfff
--- /dev/null
@@ -0,0 +1,4 @@
+# -*-python-*-
+
+Import ('env', 'collate')
+collate (title = 'Advanced snippets')
diff --git a/input/new/nonmusic/clip-systems.ly b/input/new/nonmusic/clip-systems.ly
new file mode 100644 (file)
index 0000000..06247e7
--- /dev/null
@@ -0,0 +1,85 @@
+\header {
+  texidoc = "Clipping snippets from a finished score
+
+Notes:
+
+@itemize @bullet
+@item If system starts and ends are included, they include extents of the System grob, eg. instrument names.
+@item Grace notes  at the end point of the region are not included
+@item Regions can span multiple systems. In this case, multiple EPS files are generated.
+@end itemize
+
+This file needs to be run separately with @code{-dclip-systems}; the
+collated-files.html of the regression test does not adequately show
+the results.
+
+The result will be files named
+@file{@var{base}-from-@var{start}-to-@var{end}[-@var{count}].eps}.
+"
+
+}
+
+\version "2.10.0"
+
+#(ly:set-option 'clip-systems)
+
+#(set! output-count 1)
+
+origScore = \score{
+    \relative {
+      \set Staff.instrumentName = #"bla"
+      c1
+      d
+      \grace c16
+      e1
+      \key d\major
+      
+      f
+      \break  \clef bass
+      g,
+      fis
+    }  
+}
+
+\book { 
+  \score {
+    \origScore
+    \layout {
+
+      %% each clip-region is a (START . END) pair
+      %% where both are rhythmic-locations.
+      
+      %% (make-rhythmic-locations BAR-NUMBER NUM DEN)
+      %% means NUM/DEN whole-notes into bar numbered BAR-NUMBER
+
+      clip-regions
+      = #(list
+         (cons
+          (make-rhythmic-location 2 0 1)
+          (make-rhythmic-location 4 0 1))
+
+         (cons
+          (make-rhythmic-location 0 0 1)
+          (make-rhythmic-location 4 0 1))
+         
+         (cons
+          (make-rhythmic-location 0 0 1)
+          (make-rhythmic-location 6 0 1))
+       )
+    }
+  }
+}
+
+#(set! output-count 0)
+#(ly:set-option 'clip-systems #f)
+
+\book {
+  \score { \origScore }
+  \markup { \bold \fontsize #6 clips }
+  \score {
+    \lyrics {
+      \markup { from-2.0.1-to-4.0.1-clip.eps }
+      \markup { \epsfile #X #30.0 #(format #f "~a-1-from-2.0.1-to-4.0.1-clip.eps" (ly:parser-output-name parser)) }
+    }
+  }
+}
diff --git a/input/new/nonmusic/toc.ly b/input/new/nonmusic/toc.ly
new file mode 100644 (file)
index 0000000..e6164ea
--- /dev/null
@@ -0,0 +1,29 @@
+\version "2.11.26"
+
+\header {
+  texidoc = "A table of contents is included using
+@code{\\markuplines \\table-of-contents}. The toc items are added with
+the @code{\\tocItem} command."
+}
+
+#(set-default-paper-size "a6")
+
+\book {
+  \markuplines \table-of-contents
+  \pageBreak
+
+  \tocItem \markup "The first score"
+  \score {
+    { 
+      c'1 \pageBreak
+      \mark "A" \tocItem \markup "Mark A"
+      d'
+    }
+  }
+  \pageBreak
+  \tocItem \markup "The second score"
+  \score {
+    { e' }
+    \header { piece = "Second score" }
+  }
+}
\ No newline at end of file