From 080fd805ad13008b9cda1dd67488cb8b3b91583a Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Thu, 7 Jun 2007 01:07:51 -0700 Subject: [PATCH] LSR: add more files, and remove unnecessary input/test/ files. --- ...ome-staff-lines-thicker-than-the-others.ly | 17 ++ input/lsr/text/rotating-a-text-object.ly | 17 ++ input/test/engraver-one-by-one.ly | 233 ------------------ input/test/hymn.ly | 36 --- input/test/lilypond-testpage.ly | 49 ---- input/test/music-creation.ly | 30 --- input/test/no-bar-lines.ly | 26 -- input/test/rests.ly | 38 --- input/test/staff-container.ly | 66 ----- input/test/staff-size.ly | 23 -- input/test/stem-extend.ly | 26 -- input/test/tablature-hammer.ly | 18 -- 12 files changed, 34 insertions(+), 545 deletions(-) create mode 100644 input/lsr/education/making-some-staff-lines-thicker-than-the-others.ly create mode 100644 input/lsr/text/rotating-a-text-object.ly delete mode 100644 input/test/engraver-one-by-one.ly delete mode 100644 input/test/hymn.ly delete mode 100644 input/test/lilypond-testpage.ly delete mode 100644 input/test/music-creation.ly delete mode 100644 input/test/no-bar-lines.ly delete mode 100644 input/test/rests.ly delete mode 100644 input/test/staff-container.ly delete mode 100644 input/test/staff-size.ly delete mode 100644 input/test/stem-extend.ly delete mode 100644 input/test/tablature-hammer.ly diff --git a/input/lsr/education/making-some-staff-lines-thicker-than-the-others.ly b/input/lsr/education/making-some-staff-lines-thicker-than-the-others.ly new file mode 100644 index 0000000000..0f253f0599 --- /dev/null +++ b/input/lsr/education/making-some-staff-lines-thicker-than-the-others.ly @@ -0,0 +1,17 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.11.23" + +\header { texidoc = " +For pedagogical purposes, you may want to make one staff line thicker +(e.g. the middle line, to emphasize the line of the G clef). This can +be achieved by adding extra lines very close to the line you want to +make thicker, using the #'line-positions property in the StaffSymbol +context. +" } + +\score { + \new Staff{ + \override Staff.StaffSymbol #'line-positions =#'(-4 -2 -0.2 0 0.2 2 4 ) + d'4 e' f' g' + } +} diff --git a/input/lsr/text/rotating-a-text-object.ly b/input/lsr/text/rotating-a-text-object.ly new file mode 100644 index 0000000000..567d41a984 --- /dev/null +++ b/input/lsr/text/rotating-a-text-object.ly @@ -0,0 +1,17 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.11.23" + +\header { texidoc = " +LilyPond gives you the ability to rotate any object you want, +particularly markups as showed here. Alternatively, you can use the +\column function to display your text vertically without rotating the +letters. +" } + +\score { + \relative c' { + c4^\markup {\rotate #45.0 {"hello"}} + c4^\markup {\rotate #90.0 {"hello"}} + c4^\markup {\column {"h" "e" "l" "l" "o"}} + } + } diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly deleted file mode 100644 index 1fdb502d1c..0000000000 --- a/input/test/engraver-one-by-one.ly +++ /dev/null @@ -1,233 +0,0 @@ - -\version "2.10.0" -\header { - - texidoc = "The notation problem, creating a certain symbol, - is handled by plugins. Each plugin is called Engraver. In this example, -engravers are switched on one by one, in the following order: - -@itemize -@item note heads, -@item staff symbol, -@item clef, -@item stem, -@item beams, slurs, accents, -@item accidentals, bar lines, time signature, and key signature. -@end itemize - -Engravers are grouped. For example, note heads, slurs, beams etc. form -a Voice context. Engravers for key, accidental, bar, etc. form a -Staff context. - -" - -} -\layout { ragged-right = ##t } - -\include "engraver-example.ily" - - -% -% setup for Request->Element conversion. Guru-only -% - -MyStaff =\context { - \type "Engraver_group" - \name Staff - - \description "Handles clefs, bar lines, keys, accidentals. It can contain -@code{Voice} contexts." - - - \consists "Output_property_engraver" - - \consists "Font_size_engraver" - - \consists "Volta_engraver" - \consists "Separating_line_group_engraver" - \consists "Dot_column_engraver" - - \consists "Ottava_spanner_engraver" - \consists "Rest_collision_engraver" - \consists "Piano_pedal_engraver" - \consists "Piano_pedal_align_engraver" - \consists "Instrument_name_engraver" - \consists "Grob_pq_engraver" - \consists "Forbid_line_break_engraver" - \consists "Axis_group_engraver" - - \consists "Pitch_squash_engraver" - - \override VerticalAxisGroup #'minimum-Y-extent = #'(-6 . 6) - extraVerticalExtent = ##f - verticalExtent = ##f - localKeySignature = #'() - - % explicitly set instrument, so we don't get - % weird effects when doing instrument names for - % piano staves - - instrumentName = #'() - shortInstrumentName = #'() - - \accepts "Voice" -} - - -MyVoice = \context { - \type "Engraver_group" - \name Voice - - \description " - Corresponds to a voice on a staff. This context handles the - conversion of dynamic signs, stems, beams, super- and subscripts, - slurs, ties, and rests. - - You have to instantiate this explicitly if you want to have - multiple voices on the same staff." - - localKeySignature = #'() - \consists "Font_size_engraver" - - % must come before all - \consists "Output_property_engraver" - \consists "Arpeggio_engraver" - \consists "Multi_measure_rest_engraver" - \consists "Text_spanner_engraver" - \consists "Grob_pq_engraver" - \consists "Note_head_line_engraver" - \consists "Glissando_engraver" - \consists "Ligature_bracket_engraver" - \consists "Breathing_sign_engraver" - % \consists "Rest_engraver" - \consists "Grace_beam_engraver" - \consists "New_fingering_engraver" - \consists "Chord_tremolo_engraver" - \consists "Percent_repeat_engraver" - \consists "Slash_repeat_engraver" - -%{ - Must come before text_engraver, but after note_column engraver. - -%} - \consists "Text_engraver" - \consists "Dynamic_engraver" - \consists "Fingering_engraver" - - \consists "Script_column_engraver" - \consists "Rhythmic_column_engraver" - \consists "Cluster_spanner_engraver" - \consists "Tie_engraver" - \consists "Tie_engraver" - \consists "Tuplet_engraver" - \consists "Note_heads_engraver" - \consists "Rest_engraver" - - \consists "Skip_event_swallow_translator" -} - - -\score { - \topVoice - \layout { - \context { \MyStaff } - \context { \MyVoice } - } -} - - -MyStaff = \context { - \MyStaff - \consists "Staff_symbol_engraver" -} - -\score { - \topVoice - \layout { - \context { \MyStaff } - \context { \MyVoice } - } -} - -MyStaff = \context { - \MyStaff - \consists "Clef_engraver" - \remove "Pitch_squash_engraver" -} - -\score { - \topVoice - \layout { - \context { \MyStaff } - \context { \MyVoice } - } -} - -MyVoice = \context { - \MyVoice - \consists "Stem_engraver" -} - -\score { - \topVoice - \layout { - \context { \MyStaff } - \context { \MyVoice } - } -} - -MyVoice = \context { - \MyVoice - \consists "Beam_engraver" -} - -\score { - \topVoice - \layout { - \context { \MyStaff } - \context { \MyVoice } - } -} - -MyVoice= \context { - \MyVoice - \consists "Phrasing_slur_engraver" - \consists "Slur_engraver" - \consists "Script_engraver" -} - - -\score { - \topVoice - \layout { - \context { \MyStaff } - \context { \MyVoice } - } -} - -MyStaff = \context { - \MyStaff - \consists "Bar_engraver" - \consists "Time_signature_engraver" -} - -\score { - \topVoice - \layout { - \context { \MyStaff } - \context { \MyVoice } - } -} - -MyStaff = \context { - \MyStaff - \consists "Accidental_engraver" - \consists "Key_engraver" -} -\score { - \topVoice - \layout { - \context { \MyStaff } - \context { \MyVoice } - } -} diff --git a/input/test/hymn.ly b/input/test/hymn.ly deleted file mode 100644 index a16739b846..0000000000 --- a/input/test/hymn.ly +++ /dev/null @@ -1,36 +0,0 @@ - -\version "2.10.0" - -\header { texidoc = " - -You can combine two parts on the same staff using the part -combiner. For vocal scores (hymns), there is no need to add solo/a2 -texts, so they should be switched off. - -" } - -\score{ - \context Staff << - \time 4/4 - \partcombine - \relative c'' { - a4 c4.(g8) a4 | - g4 e' g(f) | - b, a c2 - } - \relative c'' { - g4 e4.(d8) c4 | - g'4 c, e(f) | - d2 a - } - >> - \layout{ - line-width=140.\mm - \context { - \Voice - printPartCombineTexts = ##f - } - } -} - - diff --git a/input/test/lilypond-testpage.ly b/input/test/lilypond-testpage.ly deleted file mode 100644 index 0476737ebd..0000000000 --- a/input/test/lilypond-testpage.ly +++ /dev/null @@ -1,49 +0,0 @@ - -\version "2.10.0" -% MERGE with title.ly -gp - -%{ - Test lilypond features. -%} - -\header { -copyright = "copyright" -title = "title" -subtitle = "subtitle" -composer = "composer" -arranger = "arranger" -instrument = "instrument" -metre = "metre" -opus = "opus" -piece = "piece" -poet = "poet" -texidoc = "All header fields with special meanings." - copyright = "public domain" - enteredby = "jcn" - source = "urtext" - -} - - -\score { - \relative c'' { c1 c1 c1 c1 } -} - -\score { - \relative c'' { c1 c1 c1 c1 } - - \header { - - title = "localtitle" - subtitle = "localsubtitle" - composer = "localcomposer" - arranger = "localarranger" - instrument = "localinstrument" - metre = "localmetre" - opus = "localopus" - piece = "localpiece" - poet = "localpoet" - copyright = "localcopyright" - } -} - diff --git a/input/test/music-creation.ly b/input/test/music-creation.ly deleted file mode 100644 index c0740aa521..0000000000 --- a/input/test/music-creation.ly +++ /dev/null @@ -1,30 +0,0 @@ -\version "2.10.0" - -% possible rename to scheme- something. -gp -\header { texidoc = "@cindex Scheme Music Creation -You can engrave music using just Scheme expressions. Although those -expressions reflect the inner mechanism of LilyPond, they are rather -clumsy to use, so avoid them, if possible. " -} - -#(define (make-note-req p d) - (make-music 'NoteEvent - 'duration d - 'pitch p)) - -#(define (make-note elts) - (make-music 'EventChord - 'elements elts)) - -#(define (seq-music-list elts) - (make-music 'SequentialMusic - 'elements elts)) - -fooMusic = #(seq-music-list - (list (make-note (list (make-note-req (ly:make-pitch 1 0 0) (ly:make-duration 2 0)))) - (make-note (list (make-note-req (ly:make-pitch 1 1 0) (ly:make-duration 2 0)))))) - -\score { \fooMusic -\layout { ragged-right = ##t } -} - diff --git a/input/test/no-bar-lines.ly b/input/test/no-bar-lines.ly deleted file mode 100644 index f114743e36..0000000000 --- a/input/test/no-bar-lines.ly +++ /dev/null @@ -1,26 +0,0 @@ - -\version "2.10.0" -% possible rename to bar-lines-foo. -gp - -\header{ texidoc = "@cindex Bar Lines Remove -Engravers can be removed one by one. Here, the time signature and bar lines -have been removed. -" -} - -\score { - \relative c'' { - a b c d - d c b a - } - \layout { - ragged-right = ##t - \context { - \Staff - whichBar = #"" - \remove "Time_signature_engraver" - } - } -} - - diff --git a/input/test/rests.ly b/input/test/rests.ly deleted file mode 100644 index 852c0ea93b..0000000000 --- a/input/test/rests.ly +++ /dev/null @@ -1,38 +0,0 @@ - -\version "2.10.0" -\header { - texidoc = "@cindex Rests - -Rests may be used in various styles. - -" -} - -\layout { - indent = 0.0 - ragged-right = ##t -} - -\context Staff \relative c { - \set Score.timing = ##f - \override Staff.Rest #'style = #'mensural - r\maxima^\markup \typewriter { mensural } - r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 - \bar "" - - \override Staff.Rest #'style = #'neomensural - r\maxima^\markup \typewriter { neomensural } - r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 - \bar "" - - \override Staff.Rest #'style = #'classical - r\maxima^\markup \typewriter { classical } - r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 - \bar "" - - \override Staff.Rest #'style = #'default - r\maxima^\markup \typewriter { default } - r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 - -} - diff --git a/input/test/staff-container.ly b/input/test/staff-container.ly deleted file mode 100644 index 81791cf134..0000000000 --- a/input/test/staff-container.ly +++ /dev/null @@ -1,66 +0,0 @@ -\version "2.10.0" - -\header { - - texidoc = " - -In this preliminary test of a modern score, the staff lines are washed -out temporarily. This is done by making a tuned @code{StaffContainer}, -which @code{\skip}s some notes without printing lines either and -creates a @code{\\new Staff} then in order to create the lines again. -(Be careful if you use this; it has been done by splitting the -grouping @code{Axis_group_engraver} and creating functionality into -separate contexts, but the clefs and time signatures may not do -what you would expect.) - - " - - } - - - -\score { - \relative c'' << - \new StaffContainer { - - %% need << >>, otherwise we descend to the voice inside SA - << \new Staff { c4 c4 } >> - \skip 4 % s4 would create staff. - - << \new Staff { b4 b4 } >> - } - \new StaffContainer { - \skip 4 - << \context Staff { e d f \bar ":|" } >> - \skip 4 - } - >> - - \layout { - \context { - \Score - \accepts StaffContainer - \denies Staff - } - \context { - \type Engraver_group - \consists Clef_engraver - \consists Time_signature_engraver - \consists Separating_line_group_engraver - \consists "Axis_group_engraver" - \accepts "Staff" - - \name StaffContainer - } - \context { - \Staff - \remove Axis_group_engraver - \remove Separating_line_group_engraver - \remove Clef_engraver - \remove Time_signature_engraver - } - ragged-right=##t - } -} - - diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly deleted file mode 100644 index 6abe3d17d8..0000000000 --- a/input/test/staff-size.ly +++ /dev/null @@ -1,23 +0,0 @@ -\version "2.10.0" - -\header { texidoc = "@cindex Staff Size - -In order to change staff sizes, both @code{staff-space} and @code{fontSize} -must be scaled." - -} - -\layout { ragged-right = ##t} - -\relative c' << -% \new Staff \relative c'' { \dynamicDown c4 \ff c c c } - \new Staff \with { - fontSize = #-3 - \override StaffSymbol #'staff-space = #(magstep -3) - } { - \clef bass - c8 c c c c c c c - } ->> - - diff --git a/input/test/stem-extend.ly b/input/test/stem-extend.ly deleted file mode 100644 index ab3864b2f6..0000000000 --- a/input/test/stem-extend.ly +++ /dev/null @@ -1,26 +0,0 @@ -\version "2.10.0" - -\header { texidoc = "@cindex Stem Extend -Extending stems to the center line may be prevented using @code{no-stem-extend}. -" -} - -\score { - \context Voice \relative c { - \context Staff << - \new Voice { - f2 f8 g a b - \override Stem #'no-stem-extend = ##t - f2 f8 g a b - } - \new Voice { - c''2 c8 b a g - \override Stem #'no-stem-extend = ##t - c2 c8 b a g - } - >> - - } - \layout { ragged-right = ##t} -} - diff --git a/input/test/tablature-hammer.ly b/input/test/tablature-hammer.ly deleted file mode 100644 index f70949ccd9..0000000000 --- a/input/test/tablature-hammer.ly +++ /dev/null @@ -1,18 +0,0 @@ - -\version "2.10.0" -\header {texidoc = "@cindex Tablature hammer -A hammer in tablature can be faked with slurs. " -} - -\score{ - %BROKEN \context TabStaff - << - \relative c''{ - c(d) - d(d) - d(c) - } - >> - \layout{ ragged-right = ##t} -} - -- 2.39.2