From: Graham Percival Date: Tue, 3 Jul 2007 06:16:58 +0000 (-0700) Subject: Update dirs for LSR. X-Git-Tag: release/2.11.28-1~48 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=254a50ddc39d92b7068d36b53df65be023ba47eb;p=lilypond.git Update dirs for LSR. --- diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py index cc79192bd8..ab18da2ace 100755 --- 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','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: diff --git a/input/lsr/GNUmakefile b/input/lsr/GNUmakefile index 6cc66a8a50..0aedc718d6 100644 --- a/input/lsr/GNUmakefile +++ b/input/lsr/GNUmakefile @@ -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 index 0000000000..4997892c3c --- /dev/null +++ b/input/lsr/instrument/AAA-intro.ly @@ -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 index 0000000000..43325ab698 --- /dev/null +++ b/input/lsr/instrument/GNUmakefile @@ -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 index 0000000000..f72bfffc28 --- /dev/null +++ b/input/lsr/instrument/SConscript @@ -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 index 0000000000..4997892c3c --- /dev/null +++ b/input/lsr/nonmusic/AAA-intro.ly @@ -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 index 0000000000..43325ab698 --- /dev/null +++ b/input/lsr/nonmusic/GNUmakefile @@ -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 index 0000000000..f72bfffc28 --- /dev/null +++ b/input/lsr/nonmusic/SConscript @@ -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 index 0000000000..66e8e79428 --- /dev/null +++ b/input/lsr/nonmusic/clip-systems.ly @@ -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 index 0000000000..8b988ea4b7 --- /dev/null +++ b/input/lsr/nonmusic/toc.ly @@ -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 diff --git a/input/new/GNUmakefile b/input/new/GNUmakefile index af209b82fe..d212c6cec8 100644 --- a/input/new/GNUmakefile +++ b/input/new/GNUmakefile @@ -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 index 0000000000..93c62a94e3 --- /dev/null +++ b/input/new/instrument/AAA-intro.ly @@ -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 index 0000000000..43325ab698 --- /dev/null +++ b/input/new/instrument/GNUmakefile @@ -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 index 0000000000..f72bfffc28 --- /dev/null +++ b/input/new/instrument/SConscript @@ -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 index 0000000000..93c62a94e3 --- /dev/null +++ b/input/new/nonmusic/AAA-intro.ly @@ -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 index 0000000000..43325ab698 --- /dev/null +++ b/input/new/nonmusic/GNUmakefile @@ -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 index 0000000000..f72bfffc28 --- /dev/null +++ b/input/new/nonmusic/SConscript @@ -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 index 0000000000..06247e76b5 --- /dev/null +++ b/input/new/nonmusic/clip-systems.ly @@ -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 index 0000000000..e6164ea602 --- /dev/null +++ b/input/new/nonmusic/toc.ly @@ -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