From: Graham Percival Date: Fri, 9 Feb 2007 23:57:51 +0000 (-0800) Subject: Compile / dist-check fix. X-Git-Tag: release/2.11.18-1~5^2~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bc901fc6725b0b91be026f03a933d493a017e3af;p=lilypond.git Compile / dist-check fix. --- diff --git a/input/GNUmakefile b/input/GNUmakefile index cc24efc8ad..a0d454b716 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -1,12 +1,10 @@ depth = .. -SUBDIRS = test regression tutorial mutopia manual lsr +SUBDIRS = test regression tutorial mutopia manual lsr tolsr examples = typography-demo les-nereides wilhelmus proportional bach-schenker cary LOCALSTEPMAKE_TEMPLATES=ly mutopia EXTRA_DIST_FILES=paddy.abc -EXTRA_DIST_DIR = tolsr - include $(depth)/make/stepmake.make diff --git a/input/lsr/README b/input/lsr/README new file mode 100644 index 0000000000..2229537323 --- /dev/null +++ b/input/lsr/README @@ -0,0 +1,7 @@ +This directory contains examples generated automatically from LSR: +http://lsr.dsi.unimi.it/ + +Any changes made to .ly files (other than AAA-intro-*.ly) will be +lost. Please make updates to the LSR database directly. You must +be an editor to change "approved" snippets in LSR. + diff --git a/input/tolsr/GNUmakefile b/input/tolsr/GNUmakefile new file mode 100644 index 0000000000..a573e72312 --- /dev/null +++ b/input/tolsr/GNUmakefile @@ -0,0 +1,9 @@ +depth = ../../ + +STEPMAKE_TEMPLATES=documentation texinfo tex +LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc + +include $(depth)/make/stepmake.make + +TITLE=Stuff waiting for LSR -- you should not see this! + diff --git a/input/tolsr/SConscript b/input/tolsr/SConscript new file mode 100644 index 0000000000..d5d0cb95ad --- /dev/null +++ b/input/tolsr/SConscript @@ -0,0 +1,4 @@ +# -*-python-*- + +Import ('env', 'collate') +collate (title = 'Stuff waiting for LSR -- you should not see this!') diff --git a/input/tolsr/contemporary/line-arrows.ly b/input/tolsr/contemporary/line-arrows.ly deleted file mode 100644 index 7512711cb1..0000000000 --- a/input/tolsr/contemporary/line-arrows.ly +++ /dev/null @@ -1,28 +0,0 @@ -\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 new file mode 100644 index 0000000000..19538243e7 --- /dev/null +++ b/input/tolsr/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/preparing/quote-transposition.ly b/input/tolsr/preparing/quote-transposition.ly deleted file mode 100644 index ceecc579d4..0000000000 --- a/input/tolsr/preparing/quote-transposition.ly +++ /dev/null @@ -1,45 +0,0 @@ - -\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/preparing/quote.ly b/input/tolsr/preparing/quote.ly deleted file mode 100644 index 1f29585f3c..0000000000 --- a/input/tolsr/preparing/quote.ly +++ /dev/null @@ -1,41 +0,0 @@ -\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 new file mode 100644 index 0000000000..7611de255d --- /dev/null +++ b/input/tolsr/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/quote.ly b/input/tolsr/quote.ly new file mode 100644 index 0000000000..f3d2e9d02d --- /dev/null +++ b/input/tolsr/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/text/utf-8.ly b/input/tolsr/text/utf-8.ly deleted file mode 100644 index abd4227671..0000000000 --- a/input/tolsr/text/utf-8.ly +++ /dev/null @@ -1,63 +0,0 @@ -\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 new file mode 100644 index 0000000000..5f8f98ab16 --- /dev/null +++ b/input/tolsr/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 }