From: Graham Percival Date: Thu, 19 Apr 2007 08:31:28 +0000 (-0700) Subject: Update staging area for LSR. X-Git-Tag: release/2.11.23-1~20^2~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=00d79901a6bbaec629c5cf6ecde5ccbc51714b1d;p=lilypond.git Update staging area for LSR. --- diff --git a/input/tolsr/GNUmakefile b/input/tolsr/GNUmakefile index 8ba9f35f1a..32f8da8c45 100644 --- a/input/tolsr/GNUmakefile +++ b/input/tolsr/GNUmakefile @@ -4,6 +4,8 @@ STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc EXTRA_DIST_FILES=README +EXTRA_DIST_FILES+=expressive parts text + include $(depth)/make/stepmake.make TITLE=Stuff waiting for LSR -- you should not see this! diff --git a/input/tolsr/README b/input/tolsr/README index aa37a90705..19d1430c55 100644 --- a/input/tolsr/README +++ b/input/tolsr/README @@ -2,5 +2,6 @@ If you have a snippet that should be added to the official approved LSR snippets, please leave it here. We'll take care of it. Note that LSR is currently 2.10. You can add snippets that require 2.11 -to this directory, but they will not be added until LSR is updated. +to this directory, but they will not be added to LSR until it is updated. +The snippets will still be displayed on the LilyPond website. diff --git a/input/tolsr/expressive/line-arrows.ly b/input/tolsr/expressive/line-arrows.ly new file mode 100644 index 0000000000..19538243e7 --- /dev/null +++ b/input/tolsr/expressive/line-arrows.ly @@ -0,0 +1,30 @@ +% contemporary + +\header { + texidoc = "Arrows can be applied to text-spanners and line-spanners (such as the Glissando)" +} + +\version "2.10.0" + +\paper { + ragged-right = ##t +} + +\relative c'' { + \override TextSpanner #'bound-padding = #1.0 + \override TextSpanner #'dash-fraction = #'() + \override TextSpanner #'bound-details #'right #'arrow = ##t + \override TextSpanner #'bound-details #'left #'text = #"fof" + \override TextSpanner #'bound-details #'right #'text = #"gag" + \override TextSpanner #'bound-details #'right #'padding = #0.6 + + \override TextSpanner #'bound-details #'right #'stencil-align-dir-y = #CENTER + \override TextSpanner #'bound-details #'left #'stencil-align-dir-y = #CENTER + + \override Glissando #'bound-details #'right #'arrow = ##t + \override Glissando #'arrow-length = #0.5 + \override Glissando #'arrow-width = #0.25 + + a8\startTextSpan gis8 a4 b4\glissando + b,4 | g' c\stopTextSpan c +} diff --git a/input/tolsr/line-arrows.ly b/input/tolsr/line-arrows.ly deleted file mode 100644 index 19538243e7..0000000000 --- a/input/tolsr/line-arrows.ly +++ /dev/null @@ -1,30 +0,0 @@ -% contemporary - -\header { - texidoc = "Arrows can be applied to text-spanners and line-spanners (such as the Glissando)" -} - -\version "2.10.0" - -\paper { - ragged-right = ##t -} - -\relative c'' { - \override TextSpanner #'bound-padding = #1.0 - \override TextSpanner #'dash-fraction = #'() - \override TextSpanner #'bound-details #'right #'arrow = ##t - \override TextSpanner #'bound-details #'left #'text = #"fof" - \override TextSpanner #'bound-details #'right #'text = #"gag" - \override TextSpanner #'bound-details #'right #'padding = #0.6 - - \override TextSpanner #'bound-details #'right #'stencil-align-dir-y = #CENTER - \override TextSpanner #'bound-details #'left #'stencil-align-dir-y = #CENTER - - \override Glissando #'bound-details #'right #'arrow = ##t - \override Glissando #'arrow-length = #0.5 - \override Glissando #'arrow-width = #0.25 - - a8\startTextSpan gis8 a4 b4\glissando - b,4 | g' c\stopTextSpan c -} diff --git a/input/tolsr/parts/quote-transposition.ly b/input/tolsr/parts/quote-transposition.ly new file mode 100644 index 0000000000..7611de255d --- /dev/null +++ b/input/tolsr/parts/quote-transposition.ly @@ -0,0 +1,46 @@ +%preparing + +\header +{ + + texidoc = "Quotations take into account the transposition of both +source and target. In this example, all instruments play sounding +central C, the target is a instrument in F. The target part may be +@code{\\transpose}d. In this case, all the pitches (including the +quoted ones) will transposed as well. " + +} + +\version "2.11.10" + +\layout { ragged-right = ##t } + + +\addQuote clarinet { + \transposition bes + d'16 d'16 d'8 + d'16 d'16 d'8 + d'16 d'16 d'8 + d'16 d'16 d'8 +} + +\addQuote sax { + \transposition es' + a8 a a a a a a a +} + +quoteTest = { + \transposition f % french horn + + g'4 + << \quoteDuring #"clarinet" { \skip 4 } s4^"clar" >> + << \quoteDuring #"sax" { \skip 4 } s4^"sax" >> +} + + +<< \quoteTest + \new Staff + << \transpose c' d' \quoteTest + s4_"up 1 tone" + >> +>> diff --git a/input/tolsr/parts/quote.ly b/input/tolsr/parts/quote.ly new file mode 100644 index 0000000000..f3d2e9d02d --- /dev/null +++ b/input/tolsr/parts/quote.ly @@ -0,0 +1,43 @@ +%preparing + +\header +{ + + texidoc = "With @code{\\quote}, fragments of previously entered +music may be quoted. @code{quotedEventTypes} will determines what +things are quoted. In this example, a 16th rests is not quoted, since +@code{rest-event} is not in @code{quotedEventTypes}." + +} +\version "2.11.10" +\layout { + ragged-right = ##t +} + + +quoteMe = \relative c' { fis4 r16 a8.-> b4-\ff c } + +\addQuote quoteMe \quoteMe +original = \relative c'' { c8 d s2 es8 gis8 } + +<< + \new Staff { + \set Staff.instrumentName = "quoteMe" + \quoteMe + } + \new Staff { + \set Staff.instrumentName = "orig" + \original + } + \new Staff \relative c'' << + \set Staff.instrumentName = "orig+quote" + \set Staff.quotedEventTypes = #'(note-event articulation-event) + \original + \new Voice { + s4 + \set fontSize = #-4 + \override Stem #'length-fraction = #(magstep -4) + \quoteDuring #"quoteMe" { \skip 2. } + } + >> +>> diff --git a/input/tolsr/quote-transposition.ly b/input/tolsr/quote-transposition.ly deleted file mode 100644 index 7611de255d..0000000000 --- a/input/tolsr/quote-transposition.ly +++ /dev/null @@ -1,46 +0,0 @@ -%preparing - -\header -{ - - texidoc = "Quotations take into account the transposition of both -source and target. In this example, all instruments play sounding -central C, the target is a instrument in F. The target part may be -@code{\\transpose}d. In this case, all the pitches (including the -quoted ones) will transposed as well. " - -} - -\version "2.11.10" - -\layout { ragged-right = ##t } - - -\addQuote clarinet { - \transposition bes - d'16 d'16 d'8 - d'16 d'16 d'8 - d'16 d'16 d'8 - d'16 d'16 d'8 -} - -\addQuote sax { - \transposition es' - a8 a a a a a a a -} - -quoteTest = { - \transposition f % french horn - - g'4 - << \quoteDuring #"clarinet" { \skip 4 } s4^"clar" >> - << \quoteDuring #"sax" { \skip 4 } s4^"sax" >> -} - - -<< \quoteTest - \new Staff - << \transpose c' d' \quoteTest - s4_"up 1 tone" - >> ->> diff --git a/input/tolsr/quote.ly b/input/tolsr/quote.ly deleted file mode 100644 index f3d2e9d02d..0000000000 --- a/input/tolsr/quote.ly +++ /dev/null @@ -1,43 +0,0 @@ -%preparing - -\header -{ - - texidoc = "With @code{\\quote}, fragments of previously entered -music may be quoted. @code{quotedEventTypes} will determines what -things are quoted. In this example, a 16th rests is not quoted, since -@code{rest-event} is not in @code{quotedEventTypes}." - -} -\version "2.11.10" -\layout { - ragged-right = ##t -} - - -quoteMe = \relative c' { fis4 r16 a8.-> b4-\ff c } - -\addQuote quoteMe \quoteMe -original = \relative c'' { c8 d s2 es8 gis8 } - -<< - \new Staff { - \set Staff.instrumentName = "quoteMe" - \quoteMe - } - \new Staff { - \set Staff.instrumentName = "orig" - \original - } - \new Staff \relative c'' << - \set Staff.instrumentName = "orig+quote" - \set Staff.quotedEventTypes = #'(note-event articulation-event) - \original - \new Voice { - s4 - \set fontSize = #-4 - \override Stem #'length-fraction = #(magstep -4) - \quoteDuring #"quoteMe" { \skip 2. } - } - >> ->> diff --git a/input/tolsr/text/utf-8.ly b/input/tolsr/text/utf-8.ly new file mode 100644 index 0000000000..5f8f98ab16 --- /dev/null +++ b/input/tolsr/text/utf-8.ly @@ -0,0 +1,65 @@ +% text + +\version "2.10.0" + +%% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs + +%{ + +You may have to install additional fonts. + +Red Hat Fedora + + taipeifonts fonts-xorg-truetype ttfonts-ja fonts-arabic \ + ttfonts-zh_CN fonts-ja fonts-hebrew + +Debian GNU/Linux + + apt-get install emacs-intl-fonts xfonts-intl-.* \ + ttf-kochi-gothic ttf-kochi-mincho \ + xfonts-bolkhov-75dpi xfonts-cronyx-100dpi xfonts-cronyx-75dpi +%} + +\header { + + texidoc = "Various scripts may be used for texts (like titles and +lyrics) introduced by entering them in UTF-8 encoding, and using a +Pango based backend. Depending on the fonts installed, this fragment +will render Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese. + +" + +} + +% Cyrillic font +bulgarian = \lyricmode { + Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон. +} + +hebrew = \lyricmode { + זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן. +} + +japanese = \lyricmode { + いろはにほへど ちりぬるを + わがよたれぞ つねならむ + うゐのおくや まけふこえて + あさきゆめみじ ゑひもせず +} + +% "a legal song to you" +portuguese = \lyricmode { + à vo -- cê uma can -- ção legal +} + +\paper { + ragged-right = ##T +} + +\relative { + c2 d e f g f e +} +\addlyrics { \bulgarian } +\addlyrics { \hebrew } +\addlyrics { \japanese } +\addlyrics { \portuguese } diff --git a/input/tolsr/utf-8.ly b/input/tolsr/utf-8.ly deleted file mode 100644 index 5f8f98ab16..0000000000 --- a/input/tolsr/utf-8.ly +++ /dev/null @@ -1,65 +0,0 @@ -% text - -\version "2.10.0" - -%% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs - -%{ - -You may have to install additional fonts. - -Red Hat Fedora - - taipeifonts fonts-xorg-truetype ttfonts-ja fonts-arabic \ - ttfonts-zh_CN fonts-ja fonts-hebrew - -Debian GNU/Linux - - apt-get install emacs-intl-fonts xfonts-intl-.* \ - ttf-kochi-gothic ttf-kochi-mincho \ - xfonts-bolkhov-75dpi xfonts-cronyx-100dpi xfonts-cronyx-75dpi -%} - -\header { - - texidoc = "Various scripts may be used for texts (like titles and -lyrics) introduced by entering them in UTF-8 encoding, and using a -Pango based backend. Depending on the fonts installed, this fragment -will render Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese. - -" - -} - -% Cyrillic font -bulgarian = \lyricmode { - Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон. -} - -hebrew = \lyricmode { - זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן. -} - -japanese = \lyricmode { - いろはにほへど ちりぬるを - わがよたれぞ つねならむ - うゐのおくや まけふこえて - あさきゆめみじ ゑひもせず -} - -% "a legal song to you" -portuguese = \lyricmode { - à vo -- cê uma can -- ção legal -} - -\paper { - ragged-right = ##T -} - -\relative { - c2 d e f g f e -} -\addlyrics { \bulgarian } -\addlyrics { \hebrew } -\addlyrics { \japanese } -\addlyrics { \portuguese }