From 087027a0a6128fe72b30475c83a9017345bba3e7 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Sun, 13 May 2007 01:05:13 -0700 Subject: [PATCH] Remove input/test/ examples that have been moved to LSR. --- input/lsr/GNUmakefile | 3 +- input/new/ancient/AAA-intro.ly | 16 +++ input/test/README | 21 ---- input/test/circle.ly | 23 ----- input/test/compound-time.ly | 28 ------ input/test/coriolan-margin.ly | 160 ------------------------------ input/test/embedded-postscript.ly | 28 ------ input/test/ligature-vaticana.ly | 47 --------- input/test/spacing-optical.ly | 46 --------- input/test/temporary-stave.ly | 44 -------- 10 files changed, 18 insertions(+), 398 deletions(-) create mode 100644 input/new/ancient/AAA-intro.ly delete mode 100644 input/test/README delete mode 100644 input/test/circle.ly delete mode 100644 input/test/compound-time.ly delete mode 100644 input/test/coriolan-margin.ly delete mode 100644 input/test/embedded-postscript.ly delete mode 100644 input/test/ligature-vaticana.ly delete mode 100644 input/test/spacing-optical.ly delete mode 100644 input/test/temporary-stave.ly diff --git a/input/lsr/GNUmakefile b/input/lsr/GNUmakefile index 39eff0e469..4a706f8bc7 100644 --- a/input/lsr/GNUmakefile +++ b/input/lsr/GNUmakefile @@ -1,6 +1,7 @@ depth = ../../ -SUBDIRS = ancient chords connecting contemporary education expressive guitar parts pitches repeats spacing staff text vocal scheme other +SUBDIRS = ancient chords connecting contemporary education expressive +SUBDIRS += guitar parts pitches repeats spacing staff text vocal scheme other STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc diff --git a/input/new/ancient/AAA-intro.ly b/input/new/ancient/AAA-intro.ly new file mode 100644 index 0000000000..93c62a94e3 --- /dev/null +++ b/input/new/ancient/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/test/README b/input/test/README deleted file mode 100644 index 3e5aeb5e7e..0000000000 --- a/input/test/README +++ /dev/null @@ -1,21 +0,0 @@ - -This directory has a two-fold purpose - -* storing big examples referenced from the manual - -* temporary storage place for experimental test files. Over time, -when features become stable, the examples are to be moved in the -manual. - - -It is NOT a dumping ground for assorted trick and hacks. - -If you have trick that is neat hack, and think it should be in the -manual, then post it to lilypond-user@gnu.org, noting that you -propose to submit it to the manual. - -If you have CVS write access for this directory, then consult Jan & -Han-Wen before adding your file. Files should generally not be added -here but to the manual. If you want to add to the manual it's wise to -check The Documentation Meister (at the moment: Jan & Han-Wen), to be -sure that the example really adds value to the manual. diff --git a/input/test/circle.ly b/input/test/circle.ly deleted file mode 100644 index bbca5245c5..0000000000 --- a/input/test/circle.ly +++ /dev/null @@ -1,23 +0,0 @@ - -\version "2.10.0" -\header { -texidoc = "@cindex Circle - -Circles can be drawn around various objects. - -" -} - -\layout{ragged-right = ##t} - -\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) -} \ No newline at end of file diff --git a/input/test/compound-time.ly b/input/test/compound-time.ly deleted file mode 100644 index a74b0baa8b..0000000000 --- a/input/test/compound-time.ly +++ /dev/null @@ -1,28 +0,0 @@ - -\version "2.10.0" -\header { -texidoc = "@cindex compound time -@cindex plus - -Compound time signatures can be printed. Automatic beaming works in -compound time. - -" -} - -\layout{ragged-right = ##t} - -#(define (compound-time one two num) - (markup #:override '(baseline-skip . 0) #:number - (#:line ((#:column (one num)) #:vcenter "+" (#:column (two num)))))) - - -\relative { - %% compound time signature hack - \time 5/8 - \override Staff.TimeSignature #'stencil = #ly:text-interface::print - \override Staff.TimeSignature #'text = #(compound-time "2" "3" "8" ) - #(override-auto-beam-setting '(end 1 8 5 8) 1 4) - c8 c c8 c c -} - diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly deleted file mode 100644 index f29f41090f..0000000000 --- a/input/test/coriolan-margin.ly +++ /dev/null @@ -1,160 +0,0 @@ - -\version "2.10.0" - - -% Ugh, we need to override some LaTeX titling stuff -\header { - title = "Ouvertüre" - subtitle = "Zu Heinrich Joseph v. Collins Trauerspiel" - subsubtitle = \markup { \large \bold "Coriolan" } - opus = "Op. 62" - piece = \markup { \large Allegro con brio } - composer = "Ludwig van Beethoven (1770-1827)" - -texidoc = "@cindex Orchestra Score -@cindex Coriolan Score -In an orchestral score (Beethoven's Coriolan overture), there are -different instrument groups, and some of the instruments may be -transposed. Instruments are indicated either with a long or short name. -" } - -#(set-global-staff-size 16) - -raisedFlat = \markup { \raise #0.4 \smaller \smaller \flat } - - - -flauti = \relative c' { - \set Staff.instrumentName = #"2 Flauti" - \set Staff.shortInstrumentName = #"Fl." - \time 4/4 - c1 - \break c -% \break c -% \break c - \bar"|." -} - -oboi = \relative c' { - \set Staff.instrumentName = #"2 Oboi" - \set Staff.shortInstrumentName = #"Ob." - c1 c -} - -clarinetti = \relative c' { - \set Staff.instrumentName = \markup { \column { "Clarinetti" \line { "in B" \raisedFlat } } } - \set Staff.shortInstrumentName = \markup { \smaller { "Cl(B" \raisedFlat ")" } } - - c1 c -} - -fagotti = \relative c' { - \set Staff.instrumentName = #"2 Fagotti" - \set Staff.shortInstrumentName = #"Fg." - c1 c -} - -corni = \relative c' { - \set Staff.instrumentName = \markup { \column { "Corni" \line { "in E" \raisedFlat } } } - \set Staff.shortInstrumentName = \markup { \smaller { "Cor(E" \raisedFlat ")" } } - - c1 c -} - -trombe = \relative c' { - \set Staff.instrumentName = \markup \column { "2 Trombe" "(C)" } - \set Staff.shortInstrumentName = \markup \column { "Tbe." "(C)" } - - c1 c -} - -timpani = \relative c' { - \set Staff.instrumentName = \markup \column { "Timpani" "(C-G)" } - \set Staff.shortInstrumentName = #"Timp." - - c1 c -} - -violinoI = \relative c' { - \set Staff.instrumentName = #"Violino I " - \set Staff.shortInstrumentName = #"Vl. I " - c1 c -} - -violinoII = \relative c' { - \set Staff.instrumentName = #"Violino II " - \set Staff.shortInstrumentName = #"Vl. II " - c1 c -} - -viola = \relative c' { - \set Staff.instrumentName = #"Viola" - \set Staff.shortInstrumentName = #"Vla." - c1 c - %c -} - -violoncello = \relative c' { - \set Staff.instrumentName = \markup \column { "Violoncello" "e" "Contrabasso" } - \set Staff.shortInstrumentName = \markup \column { "Vc." "Cb." } - c1 c -} - - -\paper { - indent=10.0\mm - line-width=150.0\mm - ragged-bottom = ##t -} - -#(set-global-staff-size 16) -\book { - \score { - << - \new StaffGroup = "legni" << - \new Staff = "flauti" \flauti - \new Staff = "oboi" \oboi - \new Staff = "clarinetti" \clarinetti - \new Staff = "fagotti" \fagotti - >> - \new StaffGroup = "ottoni" << - \new Staff = "corni" \corni - \new Staff = "trombe" \trombe - >> - \new StaffGroup = "timpani" << - \new Staff = "timpani" \timpani - { - \skip 1 - % Hmm: this forces a staff-bracket, that's good! - % However, I can't find where is decided on staff-bracket yes/no - } - >> - \new StaffGroup = "archi" << - \new GrandStaff = "violini" << - \new Staff = "violinoI" \violinoI - \new Staff = "violinoII" \violinoII - >> - \new Staff = "viola" \viola - \new Staff = "violoncello" \violoncello - >> - >> - \layout { - \context { - \RemoveEmptyStaffContext - } - \context { - \Score - \override TimeSignature #'style = #'C - } - } - } - % this is ignored? - \paper { - indent=10.0\mm - line-width=150.0\mm - } -} - -%% Local Variables: -%% coding: utf-8 -%% End: diff --git a/input/test/embedded-postscript.ly b/input/test/embedded-postscript.ly deleted file mode 100644 index 8240c4baa7..0000000000 --- a/input/test/embedded-postscript.ly +++ /dev/null @@ -1,28 +0,0 @@ - -\version "2.10.0" - - -\header { - - texidoc = " - -@cindex Embedded Postscript - -The markup command @code{\postscript} inserts postscript directly into -the output." - -} - -\layout { - line-width = 70 * 5 \pt -} - -\relative c'' { - a-\markup { \postscript #"3 4 moveto 5 3 rlineto stroke" } - -\markup { \postscript #"[ 0 1 ] 0 setdash 3 5 moveto 5 -3 rlineto stroke " } - - b-\markup { \postscript #"3 4 moveto 0 0 1 2 8 4 20 3.5 rcurveto stroke" } - s2 - a'1 -} - diff --git a/input/test/ligature-vaticana.ly b/input/test/ligature-vaticana.ly deleted file mode 100644 index 72b482191c..0000000000 --- a/input/test/ligature-vaticana.ly +++ /dev/null @@ -1,47 +0,0 @@ -\version "2.10.0" - -\header { texidoc = "@cindex Ancient Vaticana -Vaticana ligature uses four staff lines, special clef, and -calligraphic notes. Augmentum dots are collected behind -ligatures. " -} - -\include "gregorian-init.ly" - -cantus = \new VaticanaVoice = "cantus" { - \clef "vaticana-fa2" - \[ f\melisma \quilisma g \auctum \descendens a\melismaEnd \] - \[ \virga a\melisma g \pes a \inclinatum f \inclinatum d - c \pes d \quilisma e \pes f \virga g - a \flexa f \pes g \inclinatum f \inclinatum e\melismaEnd \] - \[ d\melisma \quilisma e f \flexa e \pes f\melismaEnd \] - \[ \augmentum e\melisma \flexa \augmentum d\melismaEnd \] -} - -verba = \new Lyrics = "verba" \lyricmode { - Al- le- lu- ia. -} - -\paper { - line-thickness = \staff-space / 7.0 -} - -\score { - << - \cantus - \lyricsto "cantus" \verba - >> - \layout { - line-width = 137.0 \mm - width = 137.0 \mm - indent = 0.0 - ragged-right = ##t - packed = ##t - \context { - \Score - \remove Bar_number_engraver - timing = ##f - barAlways = ##t - } - } -} diff --git a/input/test/spacing-optical.ly b/input/test/spacing-optical.ly deleted file mode 100644 index 5cf195eb3a..0000000000 --- a/input/test/spacing-optical.ly +++ /dev/null @@ -1,46 +0,0 @@ - -\header { -texidoc = "Stem directions and head positions are taken into account for spacing " - -} - -\version "2.10.0" - -\paper { - ragged-right = ##t - indent = #0.0 -} - -music = { - c'4 e''4 e'4 b'4 | - \stemDown - b'8[ e'' a' e''] - \stemNeutral - e'8[ e'8 e'8 e'8] -} - - - -\score -{ - \music - \layout { - \context { - \Staff - \override NoteSpacing #'stem-spacing-correction = #0.6 - } - } -} - -\score -{ - \music - \layout { - \context { - \Staff - \override NoteSpacing #'stem-spacing-correction = #0.0 - \override NoteSpacing #'same-direction-correction = #0.0 - \override StaffSpacing #'stem-spacing-correction = #0.0 - } - } -} diff --git a/input/test/temporary-stave.ly b/input/test/temporary-stave.ly deleted file mode 100644 index 84c1c8acd3..0000000000 --- a/input/test/temporary-stave.ly +++ /dev/null @@ -1,44 +0,0 @@ - -\version "2.10.0" - -\header { - -texidoc= " -An additional stave can be typeset in the middle of a score line. -A new context type is created for the temporary staff to avoid printing -time and key signatures and clef at the beginning of the extra stave. -" -} - -\score { - { - \relative c' { - \new Staff = One { c4 d e f } - << - {c d e f | c d e f | c c c c | c c c c } - \new TemporaryStaff = Two { c4 c8 d e4 f | c d e f | - c c c c | c c c8 b c b |} - >> - c4 d e f | - } - } - \layout { - \context { - \Score - \consists Span_bar_engraver - % Avoid a vertical line at the beginning of the system: - \remove System_start_delimiter_engraver - % Incorporate the new context in the hierarchy - \accepts "TemporaryStaff" - } - \context { - \Staff - \name "TemporaryStaff" - \alias "Staff" - \remove "Clef_engraver" - \remove "Time_signature_engraver" - \remove "Key_engraver" - } - } -} - -- 2.39.2