From: Graham Percival Date: Sun, 4 Oct 2009 12:08:09 +0000 (+0100) Subject: Doc: move input/manual/ to Documentation/included/ X-Git-Tag: release/2.13.6-1~60 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=38a32411fecdac3d15b12fe912f38c698a42ee66;p=lilypond.git Doc: move input/manual/ to Documentation/included/ --- diff --git a/Documentation/included/GNUmakefile b/Documentation/included/GNUmakefile new file mode 100644 index 0000000000..6ba37af6fc --- /dev/null +++ b/Documentation/included/GNUmakefile @@ -0,0 +1,9 @@ +depth = ../.. + +STEPMAKE_TEMPLATES=documentation + +EXTRA_DIST_FILES= README +EXTRA_DIST_FILES+=$(call src-wildcard,*.ly) +EXTRA_DIST_FILES+=$(call src-wildcard,*.ily) + +include $(depth)/make/stepmake.make diff --git a/Documentation/included/README b/Documentation/included/README new file mode 100644 index 0000000000..f6e3131efb --- /dev/null +++ b/Documentation/included/README @@ -0,0 +1,5 @@ +This is for large examples that are included in the manual. Most of these +examples are distinct snippets; files that are also included in the +regression tests should be copied from input/regression/ into this +direction and listed here. + diff --git a/Documentation/included/ancient-headword.ly b/Documentation/included/ancient-headword.ly new file mode 100644 index 0000000000..3b1136e989 --- /dev/null +++ b/Documentation/included/ancient-headword.ly @@ -0,0 +1,135 @@ +\version "2.12.0" + +#(set-global-staff-size 15) +\paper{ + ragged-right=##t + line-width=17\cm + indent=0\cm +} + +\layout { + \context { \Score + \override PaperColumn #'keep-inside-line = ##t + \override NonMusicalPaperColumn #'keep-inside-line = ##t + } +} + +\include "gregorian.ly" + +\score { + << + \new VaticanaVoice = "cantus" { + \clef "vaticana-do3" + % Verse 1 — Salve, Regína + a\melisma \[ a \flexa g \pes a\melismaEnd \] d + \divisioMinima + \[ a\melisma \flexa g\melismaEnd \] + \[ f\melisma \flexa e f \pes g \flexa f\melismaEnd \] + \[ e\melisma \flexa d\melismaEnd \] + \divisioMaior + c d \[d\melisma \flexa c\melismaEnd \] d + \[ e\melisma \pes f\melismaEnd\] g + \[d\melisma \pes e \flexa c\melismaEnd \] d + \finalis + % Verse 2 — Vita, dulcédo + % a\melisma \[ a \flexa g \pes a\melismaEnd \] d + % \divisioMinima + % \[ a\melisma \flexa g\melismaEnd \] + % \[ f\melisma \flexa e f \pes g \flexa f\melismaEnd \] + % \[ e\melisma \flexa d\melismaEnd \] + % \divisioMaior + % c d \[e\melisma \pes f\melismaEnd \] g + % \[d\melisma \pes e \flexa c\melismaEnd \] d + % \finalis + % Verse 3 — Ad te clamámus + \[ d\melisma \pes f\melismaEnd\] a g + \[ g\melisma \flexa f \pes a\melismaEnd\] e + \divisioMaior + g f \[ e\melisma \flexa d \pes g\melismaEnd \] + \divisioMinima + c d \[ e\melisma \flexa d \pes g\melismaEnd \] + \[ f\melisma \flexa e\melismaEnd \] d + \finalis + % Verse 4 — Ad te suspirámus + \[ d\melisma \pes f\melismaEnd \] a c' g + \[ g\melisma \flexa f \pes g\melismaEnd \] a + \divisioMaior + d \[ f\melisma \pes \deminutum g\melismaEnd \] g d + \[ \virga f\melisma \inclinatum e \inclinatum d\melismaEnd \] + c \divisioMaior + d \[ d\melisma \flexa c \pes f\melismaEnd \] + \[ g\melisma \pes a\melismaEnd \] + g \[ f\melisma \flexa e\melismaEnd \] g + \[ f\melisma \flexa \deminutum e\melismaEnd \] + \[ d\melisma \flexa c \pes d\melismaEnd \] + \finalis + % Verse 5 — Eia ergo, Advocáta nostra + f\melisma \[ f \pes g\melismaEnd \] f + \[ g\melisma \pes \deminutum a\melismaEnd \] a + \divisioMinima + c' g \[ \virga a\melisma \inclinatum g \inclinatum f\melismaEnd \] d g a + \divisioMaior + d' d' \[ c'\melisma \flexa b c' \pes d'\melismaEnd \] a + \divisioMinima + d' c' a \[ g\melisma \flexa f \pes a\melismaEnd \] g + \[ d\melisma \pes e\melismaEnd \] f + \[ \virga e\melisma \inclinatum d \inclinatum c\melismaEnd \] + \divisioMaior + \[ c\melisma \pes d\melismaEnd \] + f \[ g\melisma \flexa \deminutum f\melismaEnd \] + \[ d\melisma \flexa c \pes d\melismaEnd \] d + \finalis + % Verse 6 — Et Jesum + d a, \[ c\melisma \pes d\melismaEnd \] + \divisioMinima + d \[ d\melisma \pes e\melismaEnd \] \[ e\melisma \flexa d d\melismaEnd \] + c g f \[ e\melisma \flexa \deminutum d\melismaEnd \] g + \[ f\melisma \flexa e\melismaEnd \] + \[ d\melisma \flexa c \pes d\melismaEnd \] + \[ d\melisma \pes a \] \virga bes\melismaEnd a + \divisioMinima + \[ \virga a\melisma \inclinatum g \inclinatum f\melismaEnd \] g d f + \[ f\melisma \flexa e\melismaEnd \] \[ d\melisma \flexa c\melismaEnd \] + \divisioMinima + \[ e\melisma \pes f \flexa e\melismaEnd \] d d + \finalis + % Verse 7 ad finem — O clemens: O pia: O dulcis Virgo María + a\melisma \[a \flexa g a \quilisma b \pes c'\melismaEnd \] + \[ \virga b\melisma \inclinatum a \inclinatum g\melismaEnd \] a + \finalis + \[ g\melisma \pes a \quilisma b \pes c' \] \[ c' \flexa b\melismaEnd \] + \[ a\melisma \flexa g\melismaEnd \] \[ g\melisma \pes a\melismaEnd \] + \finalis + \[ a\melisma \flexa d \virga f \inclinatum e \inclinatum d \inclinatum c d \] + \divisioMinima + \[ d \pes e f \pes g\melismaEnd \] + \[ g\melisma \flexa \deminutum f\melismaEnd \] + \[ g\melisma \pes a\melismaEnd \] + d c d \[ d\melisma \pes g \flexa f f\melismaEnd \] + \[ e\melisma \flexa d\melismaEnd \] + \finalis + } + \new Lyrics \lyricsto "cantus" { + Sal- ve, Re- gí- na, ma- ter mi- se- ri- cór- di- ae: + % Vi- ta, dul- cé- do, et spes no- stra, sal- ve. + Ad te cla- má- mus, éx- su- les, fi- li- i He- vae. + Ad te su- spi- rá- mus, ge- mén- tes et flen- tes in hac la- cri- má- rum + val- le. + E- ia er- go, Ad- vo- cá- ta no- stra, il- los tu- os mi- se- ri- cór- des + ó- cu- los ad nos con- vér- te. + Et Je- sum, be- ne- díc- tum fruc- tum ven- tris tu- i, no- bis post hoc + ex- sí- li- um os- tén- de. + O cle- mens: + O pi- a: + O dul- cis Vir- go Ma- rí- a. + } + >> +} + +\layout { + \context { + \Staff + \consists Custos_engraver + } +} + diff --git a/Documentation/included/chord-names-jazz.ly b/Documentation/included/chord-names-jazz.ly new file mode 100644 index 0000000000..ccd42c54b7 --- /dev/null +++ b/Documentation/included/chord-names-jazz.ly @@ -0,0 +1,152 @@ +\version "2.12.0" +\header { + +texidoc = " Chord names are generated from a list pitches. The +functions which construct these names can be customised. Here are shown +Jazz chords, following Ignatzek (pp. 17-18, 1995) and +an alternative Jazz chord notation. + +Chords following Banter (1987) can also be printed from this file, but +are turned off for brevity. + +" + +} + +chs = \transpose c' c' +{ + 1 + % m = minor triad + + \break + + + % triangle = maj + + \break + + + + \break + % 6 = major triad with added sixth + % m6 = minor triad with added sixth + + \break + + + + \break + + + + \break + + + + \break + + + + \break + + + + \break + + + + \break + + % add9 + +} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% alternate Jazz notation + +efullmusicJazzAlt = +{ + 1-\markup { "+" } + -\markup { \normal-size-super + % \override #'(font-family . math) "N" } + \override #'(font-family . math) "M" } + %%c:3.5.7 = \markup { \override #'(font-family . math) "M" } + %%c:3.5.7 = \markup { \normal-size-super "maj7" } + + -\markup { \super "o" } % should be $\circ$ ? + -\markup { \super \combine "o" "/" } + -\markup { \super "o7" } +} + +efullJazzAlt = #(sequential-music-to-chord-exceptions efullmusicJazzAlt #f) + +epartialmusicJazzAlt = { + 1-\markup { \normal-size-super "2" } + -\markup { "m" } + -\markup { \normal-size-super "sus4" } + -\markup { \normal-size-super "5" } + + %% TODO, partial exceptions + -\markup { "m" }-\markup { \normal-size-super "sus4" } + -\markup { "m" }-\markup { \normal-size-super "sus2" } +} + +epartialJazzAlt = #(sequential-music-to-chord-exceptions epartialmusicJazzAlt #f) + +jazzAltProperties = \sequential { + \set majorSevenSymbol = #whiteTriangleMarkup + \set chordNameSeparator = #(make-simple-markup "/") + \set chordNameExceptionsFull = #efullJazzAlt + \set chordNameExceptionsPartial = #epartialJazzAlt + \set chordNameFunction = #jazz-chord-names +} + +banterProperties = \sequential { + \set chordNameFunction = #banter-chord-names +} + +\score{ + << + \new ChordNames { + \set instrumentName = #"Ignatzek (default)" + \set shortInstrumentName = #"Def" + \chs + } + + \new ChordNames { + \jazzAltProperties + \set instrumentName = #"Alternative" + \set shortInstrumentName = #"Alt" + \chs + } + +%{ + + %% This is the Banter (1987) style. It gives exceedingly + %% verbose (wide) names, making the output file take up to 4 pages. + %% (FIXME: how big is is now?) + %% Turned off by default. + + %% FIXME: use smaller font for Banter (or remove some esoteric + %% chords). + + \new ChordNames { + \banterProperties + \set instrumentName = #"Banter" + \set shortInstrumentName = #"Ban" + \chs + } +%} + + \new Staff \transpose c c' { \chs } + >> + \layout { + indent = 3.\cm + \context { + \ChordNames + \consists Instrument_name_engraver + } + } +} + diff --git a/Documentation/included/chord-names-languages.ly b/Documentation/included/chord-names-languages.ly new file mode 100644 index 0000000000..e446afa4fb --- /dev/null +++ b/Documentation/included/chord-names-languages.ly @@ -0,0 +1,47 @@ +\version "2.12.0" +\header { + texidoc = "@cindex Chord Names German +The english naming of chords (default) can be changed to german +(@code{\germanChords} replaces B and Bes to H and B), semi-german +(@code{\semiGermanChords} replaces B and Bes to H and Bb), italian +(@code{\italianChords} uses Do Re Mi Fa Sol La Si), or french +(@code{\frenchChords} replaces Re to Ré). + +" } + +scm = \chordmode { + e1/d c:m + % c/c cis/cis + % yeah, we get the idea. -hwn + + % cisis/cisis ces/ces ceses/ceses + b/b bis/bis bes/bes + % beses/beses +} + + +\layout { + ragged-right = ##t + \context {\ChordNames \consists Instrument_name_engraver } +} + +<< + \new ChordNames { + \set instrumentName = #"default" + \scm + } + \new ChordNames { + \set instrumentName = #"german" + \germanChords \scm } + \new ChordNames { + \set instrumentName = #"semi-german" + \semiGermanChords \scm } + \new ChordNames { + \set instrumentName = #"italian" + \italianChords \scm } + \new ChordNames { + \set instrumentName = #"french" + \frenchChords \scm } + + \context Voice { \scm } +>> diff --git a/Documentation/included/chords-headword.ly b/Documentation/included/chords-headword.ly new file mode 100644 index 0000000000..f8a661fd71 --- /dev/null +++ b/Documentation/included/chords-headword.ly @@ -0,0 +1,101 @@ +\version "2.12.0" +#(set-global-staff-size 15) +\paper{ + ragged-right=##f + line-width=15\cm + indent=0\cm +} + +\layout { + \context { \Score + \override PaperColumn #'keep-inside-line = ##t + \override NonMusicalPaperColumn #'keep-inside-line = ##t + } +} + +theChords = \chordmode { + \time 2/2 + f1 | c2 f2 | f1 | c2 f2| %\break + f2 bes2 | f1 | c2:7 f | c1 | \break +} + +verseOne = \lyricmode{ + \set stanza = "1. " + Fair is the sun - shine, + Fair - er the moon - light + And all the stars __ _ in heav'n a -- bove; +} + +verseTwo = \lyricmode{ + \set stanza = "2. " + Fair are the mead - ows, + Fair - er the wood - land, + Robed in the flow -- ers of bloom -- ing spring; +} + +Soprano = { + \time 2/2 + \key f \major + \stemUp + f'2 f'4 f' | g'4 e' f'2 | a'4. a'8 a'4 a' | bes'4 g' a'2 | +c''2 f''4 d'' | c''2 bes'4 a' | bes'2 a' | g'1 | +} + +Alto = { + \key f \major + c'2 c'4 c' | d'4 c' c'2 | f'4. f'8 f'4 fis' | g'4 e' f'2 | + f'2 f'4 f' | f'2 g'4 f' | e'2 f' | e'1 | +} + +Tenor = { + \key f \major + \stemDown + a2 a4 a | bes4 g a2 | c'4. c'8 d'4 d' | d'4 c' c'2 | + a2 d'4 bes | a2 c'4 c' | c'2 c' | c'1 | +} + +Bass = { + \key f \major + f2 f4 f | bes,4 c f2 | f4. e8 d4 c | bes,4 c f2 | + f2 bes,4 d | f2 e4 f | g2 f | c1 | +} + + +\score { + << + \new ChordNames { \theChords } + \context Staff = upper { + \context Voice = sop { + << + \Soprano + \Alto + >> + } + } + \context Lyrics="LyrOne" \lyricsto "sop" {\verseOne} + \context Lyrics="LyrTwo" \lyricsto "sop" {\verseTwo} + \context Staff = lower { + \new Voice { + \clef bass + #(set-accidental-style 'modern-cautionary) + << + \Tenor + \Bass + >> + } + } + >> + +\layout { + %between-system-space = 1\mm + indent = 0 + \context { + \Score + \remove "Bar_number_engraver" + } + \context { \Staff + \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1) + } + } +} +\paper { } diff --git a/Documentation/included/display-predefined-fretboards.ly b/Documentation/included/display-predefined-fretboards.ly new file mode 100644 index 0000000000..bf2283db3c --- /dev/null +++ b/Documentation/included/display-predefined-fretboards.ly @@ -0,0 +1,69 @@ +\include "predefined-guitar-fretboards.ly" +\version "2.12.0" + + +mychords = \chordmode {c1 c:m c:aug c:dim c:7 c:maj7 c:m7 \break } + +chordsline = { + \mychords + \transpose c cis { + \mychords + } + \transpose c des { + \mychords + } + \transpose c d { + \mychords + } + \transpose c dis { + \mychords + } + \transpose c ees { + \mychords + } + \transpose c e { + \mychords + } + \transpose c f { + \mychords + } + \transpose c fis { + \mychords + } + \transpose c ges { + \mychords + } + \transpose c g { + \mychords + } + \transpose c gis { + \mychords + } + \transpose c aes { + \mychords + } + \transpose c a { + \mychords + } + \transpose c ais { + \mychords + } + \transpose c bes { + \mychords + } + \transpose c b { + \mychords + } +} + +<< + \context ChordNames { + \chordsline + } + \context FretBoards { + \chordsline + } + \context Staff { + \chordsline + } +>> diff --git a/Documentation/included/divisiones.ly b/Documentation/included/divisiones.ly new file mode 100644 index 0000000000..6307c9ac8c --- /dev/null +++ b/Documentation/included/divisiones.ly @@ -0,0 +1,42 @@ +% possible rename to ancient- or gregorian- ? +\header { + texidoc = "@cindex Divisiones + +Divisiones are ancient variants of breathing signs. +Choices are @code{divisioMinima}, @code{divisioMaior}, +@code{divisioMaxima} and @code{finalis}, @code{virgula} and +@code{caesura}. + +" } + +\version "2.12.0" + +\include "gregorian.ly" + +\score { + << + \context VaticanaVoice { + \override TextScript #'padding = #3 + g a g + s^\markup { "divisio minima" } + \divisioMinima + g a g + s^\markup { "divisio maior" } + \divisioMaior + g a g + s^\markup { "divisio maxima" } + \divisioMaxima + \break + g a g + s^\markup { "finalis" } + \finalis + g a g + s^\markup { "virgula" } + \virgula + g a g + s^\markup { "caesura" } + \caesura + g a g + } + >> +} diff --git a/Documentation/included/editorial-headword.ly b/Documentation/included/editorial-headword.ly new file mode 100644 index 0000000000..b834181f48 --- /dev/null +++ b/Documentation/included/editorial-headword.ly @@ -0,0 +1,101 @@ +\version "2.12.0" +\include "english.ly" +#(set-global-staff-size 15) +\paper{ + ragged-right=##t + line-width=17\cm + indent=0\cm +} + +\layout { + \context { \Score + \override PaperColumn #'keep-inside-line = ##t + \override NonMusicalPaperColumn #'keep-inside-line = ##t + } +} + +% NR 1.7 Editorial annotations + +% Beethoven, Op. 31, No. 3 +% Piano sonata 18, Movt II, Scherzo +% Measures 9 - 14 + +\layout { } + +\new PianoStaff << + + % RH Staff + \new Staff { + \clef treble + \key af \major + \time 2/4 + \set Staff.fingeringOrientations = #'(up up) + \set Score.currentBarNumber = #9 + \partial 8 + 8 \staccato + | + \set doubleSlurs = ##t + 4 ( + 8 \staccato ) + \noBeam + c''8-5 \staccato \pp + | + \set doubleSlurs = ##f + bf'8.. ( + af'32 + g'8 ) \staccato + f'8 \staccato + | + e'4-2 + r8 + \once \override Script #'script-priority = #-100 + \afterGrace + f'8 ( \trill ^ \markup { \finger "3-2" } + { e'16 [ f'16 ] } + | + g'8..-3 + f'32 + e'8-1 ) \staccato + d'8-2 \staccato + | + c'4 + r4 + } + + % LH Staff + \new Staff { + \key af \major + \clef treble + \override Fingering #'direction = #down + \set Staff.fingeringOrientations = #'(down down) + \partial 8 + 8 \staccato + \set doubleSlurs = ##t + 4 ( + 8 ) \staccato + \noBeam + \clef bass + c'8-1 \staccato + | + \set doubleSlurs = ##f + bf8.. ( + af32 + g8-1 ) \staccato + f8 \staccato + | + e4 + r8 + \afterGrace + f8 ( \trill _ \markup { \finger "2-1" } + { e16 [ f16 ] } + | + g8..-1 + f32 + e8 ) \staccato + d8 \staccato + | + c4 + r4 + } + +>> diff --git a/Documentation/included/engraver-example.ily b/Documentation/included/engraver-example.ily new file mode 100644 index 0000000000..f099874d3b --- /dev/null +++ b/Documentation/included/engraver-example.ily @@ -0,0 +1,37 @@ +%% texidoc = "Include file for engraver example." +\version "2.11.61" +topVoice = \relative c' { + \key d\major + es8([ g] a[ fis]) + b4 + b16[-. b-. b-. cis-.] + d4-> +} + +botVoice = \relative c' { + \key d\major + c8[( f] b[ a)] + es4 + es16[-. es-. es-. fis-.] + b4-> +} + +hoom = \relative c { + \key d \major + \clef bass + g8-. r + r4 + fis8-. + r8 + r4 + b'4-> +} + +pah = \relative c' { + r8 b-. + r4 + r8 g8-. + r16 g-. r8 + \clef treble + fis'4-> +} diff --git a/Documentation/included/expressive-headword.ly b/Documentation/included/expressive-headword.ly new file mode 100644 index 0000000000..ed62f91ee1 --- /dev/null +++ b/Documentation/included/expressive-headword.ly @@ -0,0 +1,263 @@ +\version "2.12.0" +\include "english.ly" +#(set-global-staff-size 15) +\paper { + line-width = 16\cm + indent = 0\cm +} + +% NR 1.3 Expressive marks + +% L. v. Beethoven, Op. 49 no. 1 +% Piano sonata 19 - "Leichte Sonate" +% measures 1 - 12 + +%\layout { +% \context { +% \Score +% \override SpacingSpanner #'base-shortest-duration = +% #(ly:make-moment 1 20) +% } +%} + +\new PianoStaff << + + % RH Staff + \new Staff { + \clef treble + \key g \major + \time 6/8 + \partial 2 + \once \override TextScript #'staff-padding = #2 + d'8 \staccato + ^ \markup { \column { + RONDO + \italic Allegro } } + d'8 \staccato + g'8 \staccato + a'8 \staccato + + | + + b'8 [ ( + g'8 ] ) + e'8 \staccato + e' \staccato + a'8 \staccato + b'8 \staccato + + | + + c''8 [ ( + a'8 ] ) + e''8 \staccato + d''8 \staccato + c''8 \staccato + b'8 \staccato + + | + + a'8 \staccato + g'8 \staccato + a'8 \staccato + \acciaccatura { g'16 [ a'16 ] } + bf'8 + a'8 \staccato + g'8 \staccato + + | + + fs'8 [ ( + d'8 ] ) + d'8 \staccato + d'8 \staccato + g'8 \staccato + a'8 \staccato + + | + + b'8 [ ( + g'8 ] ) + e'8 \staccato + e'8 \staccato + a'8 \staccato + b'8 \staccato + + | + + c''8 [ ( + a'8 ] ) + e''8 \staccato + d''8 \staccato + c''8 \staccato + b'8 \staccato + + | + + a'8 \staccato + g'8 \staccato + a'8 \staccato + << + { + \voiceOne + d'8 + g'8 + fs'8 + \oneVoice + } + \new Voice { + \voiceTwo + d'4 + c'8 + \oneVoice + } + >> + + | + + 4 \tenuto + d'8 \staccato + g'8 \staccato + b'8 \staccato + d''8 \staccato + + | + + d''8 ( + 8 \staccato ) + 8 \staccato + d''8 ( + 8 \staccato ) + 8 \staccato + + | + + d''8 ( + 8 \staccato ) + 8 \staccato + d''8 ( + 8 \staccato ) + 8 \staccato + + | + + d''8 \staccato + 8 \staccato + 8 \staccato + d'' \staccato + 8 \staccato + 8 \staccato + + | + + 4 \fermata + r8 r4 r8 + } + + % LH Staff + \new Staff { + \clef bass + \key g \major + \time 6/8 + \partial 2 + r8 + r8 + 8 \staccato + 8 \staccato + + | + + 4 + r8 + r8 + 8 \staccato + 8 \staccato + + | + + 4 + r8 + r8 + 8 \staccato + 8 \staccato + + | + + 8 \staccato + 8 \staccato + 8 \staccato + 4. ( + + | + + d'4 ) + r8 + r8 + 8 \staccato + 8 \staccato + + | + + 4 + r8 + r8 + 8 \staccato + 8 \staccato + + | + + 4 + r8 + r8 + 8 \staccato + 8 \staccato + + | + + 8 \staccato + 8 \staccato + 8 \staccato + 4 + 8 \staccato + + | + + 4 \tenuto + r8 + r4 + r8 + + | + + r8 + 8 \staccato + 8 \staccato + r8 + 8 \staccato + 8 \staccato + + | + + r8 + 8 \staccato + 8 \staccato + r8 + 8 \staccato + 8 \staccato + + | + + r8 + 8 \staccato + 8 \staccato + r8 + 8 \staccato + 8 \staccato + + | + + 4 \fermata + r8 r4 r8 + } + +>> diff --git a/Documentation/included/figured-bass-headword.ly b/Documentation/included/figured-bass-headword.ly new file mode 100644 index 0000000000..8f666920c0 --- /dev/null +++ b/Documentation/included/figured-bass-headword.ly @@ -0,0 +1,117 @@ +\version "2.12.0" +#(set-global-staff-size 15) +\paper{ + ragged-right=##f + line-width=16\cm + indent=1.5\cm +} + +\layout { + \context { \Score + \override PaperColumn #'keep-inside-line = ##t + \override NonMusicalPaperColumn #'keep-inside-line = ##t + } +} + +% NR 2.7.3 Figured bass + +% Arcangelo Corelli, 12 Sonate da Camera, Op. 2 +% Sonata II, Allemanda +% measures 1 - 88 +% Coded by Neil Puttock; modified by Carl Sorensen + +extendOn = \bassFigureExtendersOn +extendOff = \bassFigureExtendersOff + +\score { + + \new StaffGroup << + + \new GrandStaff << + + \new Staff = "violinoI" { + \set Staff.instrumentName = \markup { + \hcenter-in #11 + \line { Violino I. } + } + \time 4/4 + \mark \markup { \italic Adagio. } + \partial 8 + r16 a'16 | + a'8. [ d''16 d''8. e''16 ] cis''8 a'4 a''16 bes''16 | + cis''8 d''16 ( e'' ) e''8. d''16 d''4 r8 d''16 e''16 | + f''8 f''4 g''16 ( f''16 ) e''8 e''4 f''16 ( e''16 ) | + d''8. d''16 g''16 ( f''16 ) e''16 ( d''16 ) cis''8 + cis''4 cis''16 cis''16 | + d''8 d''8 c''8. c''16 c''8 ( b'4 ) b'16 b'16 | + c''8 c''8 bes'8. bes'16 bes'8 ( a'4 ) a''16 a''16 | + a''8 g''8 g''8. g''16 g''8 ( f''8 ) r8 f''8 | + } + + \new Staff = "violinoII" { + \set Staff.instrumentName = \markup { + \hcenter-in #11 + \line { Violino II. } + } + \time 4/4 + \partial 8 + r16 f'16 | + f'8. g'16 g'4 a'4 r8 d''16 d''16 | + e''8 a'8 cis''8. d''16 d''4 r8 f''16 g''16 | + a''8 a''8 d''8. d''16 g'8 g'8 c''8. c''16 | + f'8. f''16 bes''16 ( a''16 ) g''16 ( f''16 ) e''8 e''4 e''16 e''16 | + a'8 fis''8 g''8 a''8 d''8 d''4 d''16 d''16 | + g'8 e''8 f''8 g''8 c''8 c''4 cis''16 cis''16 | + d''8 d''8 e''8. e''16 e''8 a'8 r8 d''8 | + } + + >> + + \new Staff = "violone" { + \set Staff.instrumentName = \markup { + \hcenter-in #13 { + \center-column { + Violone, + \line { e Cembalo. } + } + } + } + \time 4/4 + \clef bass + \partial 8 + r16 d16 | + d4 bes,4 a,4 f4 | + g8 f16 g16 a8 a,8 d4 d'4 ~ | + d'8 c'8 b4 c'8 c'16 bes16 a4 | + bes8 bes16 a16 g4 a8 a,4 a16 g16 | + fis8 d8 e8 fis8 g8 g,4 g16 f16 | + e8 c8 d8 e8 f8 f,4 a,8 | + b,4 cis4 d4 r8 d'8 | + } + + \new FiguredBass \figuremode { + \set figuredBassAlterationDirection = #RIGHT + \set figuredBassPlusDirection = #RIGHT + \override VerticalAxisGroup #'minimum-Y-extent = #'() + \override BassFigureAlignment #'stacking-dir = #DOWN + s8 | + s4 <6>4 <_+>4 <6>4 | + <6 4\+ 2>8 <6>8 <_+> s8 s2 | + <5>8 <6 4>8 <6 5>4 s4 <5>8 <6>8 | + s4 <6 5 _-> <_+>2 | + <6>8 <_+>8 <6>8 <6 5>8 <5 4>8 \extendOn <5 _!>8 \extendOff s4 | + <6>4 <6->8 <6 5->8 <5 4->8 \extendOn <5 3>4 \extendOff <5 _+>8 | + <7>8 <6>8 <5>4 <9 4>8 <8 3>8 s4 | + } + + >> + + \layout { + \context { + \Score + \override RehearsalMark #'break-align-symbols = #'(time-signature) + \override RehearsalMark #'self-alignment-X = #LEFT + \override TimeSignature #'break-align-anchor-alignment = #LEFT + } + } +} diff --git a/Documentation/included/font-table.ly b/Documentation/included/font-table.ly new file mode 100644 index 0000000000..b468deb016 --- /dev/null +++ b/Documentation/included/font-table.ly @@ -0,0 +1,224 @@ +#(set-global-staff-size 16) + +#(begin + + ;; some helper functions + + (define (filter-out pred lst) + (filter (lambda (x) (not (pred x))) lst)) + + (define (filter-out-group glyph-list substring) + (filter-out (lambda (x) (string-contains x substring)) glyph-list)) + + (define (filter-out-groups glyph-list . substrings) + (let loop ((new glyph-list) (rem substrings)) + (if (null? rem) + new + (loop (filter-out-group new (car rem)) + (cdr rem))))) + + (define (get-group glyph-list substring) + (filter (lambda (x) (string-contains x substring)) glyph-list)) + + (define glyph-list + (delete ".notdef" + (ly:otf-glyph-list (ly:system-font-load "emmentaler-20")))) + + ;;;;;;;;; + + ;; define these 3 groups first since they're + ;; harder to get with (get-groups ...) + (define numbers + '("plus" "comma" "hyphen" "period" + "zero" "one" "two" "three" "four" + "five" "six" "seven" "eight" "nine")) + + (define default-noteheads + '("noteheads.uM2" "noteheads.dM2" "noteheads.sM1" + "noteheads.s0" "noteheads.s1" "noteheads.s2")) + + (define dynamics + '("space" "f" "m" "p" "r" "s" "z")) + + ;; remove them from the glyph-list + (for-each + (lambda (x) (set! glyph-list (delete x glyph-list))) + (append numbers + default-noteheads + dynamics)) + + ;;;;;;;;; + + ;; extract ancient-music groups before extracting default + ;; accidentals, rests, etc. to prevent duplication. + (define vaticana (get-group glyph-list "vaticana")) + (define medicaea (get-group glyph-list "medicaea")) + (define hufnagel (get-group glyph-list "hufnagel")) + (define neomensural (get-group glyph-list "neomensural")) + + ;; remove neomensural before defining mensural; otherwise, searching + ;; for "mensural" would return "neomensural" matches too. + (set! glyph-list + (filter-out-groups + glyph-list + "vaticana" + "medicaea" + "hufnagel" + "neomensural")) + + ;; get the rest of the ancient-music groups + (define mensural (get-group glyph-list "mensural")) + (define petrucci (get-group glyph-list "petrucci")) + (define solesmes (get-group glyph-list "solesmes")) + + ;; remove them from the glyph-list + (set! glyph-list + (filter-out-groups + glyph-list + "mensural" + "petrucci" + "solesmes")) + + ;; This would only get "rests.2classical". + ;; We're leaving it with the other rests for now. + ;; (define classical (get-group glyph-list "classical")) + ;; (set! glyph-list (filter-out-groups glyph-list "classical")) + + ;;;;;;;;; + + ;; get everything else except noteheads. + ;; * Some accidentals contain "slash" substring, so extract + ;; "accidentals" before extracting "slash" (noteheads). + ;; * Also use "pedal." not "pedal", for example, to prevent things + ;; like "scripts.upedalheel" ending up in the "pedal." list. + ;; * This doesn't apply to the ancient stuff because searching for + ;; "vaticana." (as an example) would miss things like + ;; "dots.dotvaticana" + (define clefs (get-group glyph-list "clefs.")) + (define timesig (get-group glyph-list "timesig.")) + (define accidentals (get-group glyph-list "accidentals.")) + (define rests (get-group glyph-list "rests.")) + (define flags (get-group glyph-list "flags.")) + (define dots (get-group glyph-list "dots.")) + (define scripts (get-group glyph-list "scripts.")) + (define arrowheads (get-group glyph-list "arrowheads.")) + (define brackettips (get-group glyph-list "brackettips.")) + (define pedal (get-group glyph-list "pedal.")) + (define accordion (get-group glyph-list "accordion.")) + + ;; remove them from the glyph-list + (set! glyph-list + (filter-out-groups + glyph-list + "clefs." + "timesig." + "accidentals." + "rests." + "flags." + "dots." + "scripts." + "arrowheads." + "brackettips." + "pedal." + "accordion.")) + + ;;;;;;;;; + + ;; get special noteheads + (define cross (get-group glyph-list "cross")) + (define diamond (get-group glyph-list "diamond")) + (define harmonic (get-group glyph-list "harmonic")) + (define slash (get-group glyph-list "slash")) + (define triangle (get-group glyph-list "triangle")) + (define xcircle (get-group glyph-list "xcircle")) + + (define special-noteheads + (append cross + diamond + harmonic + slash + triangle + xcircle)) + + ;; remove special noteheads from the glyph-list + (set! glyph-list + (filter-out-groups + glyph-list + "cross" + "diamond" + "harmonic" + "slash" + "triangle" + "xcircle")) + + ;; (lazy solution) + ;; any remaining glyphs containing "noteheads." should be shape-notes. + (define shape-note-noteheads (get-group glyph-list "noteheads.")) + + ;; remove shape-note-noteheads from the glyph-list + (set! glyph-list (filter-out-group glyph-list "noteheads.")) + + ;;;;;;;;; + + ;; simple debug test for any glyphs that didn't make it. + (if #f + (if (null? glyph-list) + (format #t "No glyphs are missing from the table.\n") + (format #t "You missed these glyphs: ~a\n" glyph-list))) + +) % end of (begin ...) + +\paper { + %% ugh. text on toplevel is a bit broken... + + oddHeaderMarkup = \markup {} + evenHeaderMarkup = \markup {} + oddFooterMarkup = \markup {} + evenFooterMarkup = \markup {} + } + +\version "2.12.0" + +#(define-markup-command (doc-char layout props name) (string?) + (interpret-markup layout props + (let* ((n (string-length name))) + (if (> n 24) + ;; split long glyph names near the middle at dots + (let* ((middle-pos (round (/ n 2))) + (left-dot-pos (string-rindex name #\. 0 middle-pos)) + (right-dot-pos (string-index name #\. middle-pos)) + (left-distance (if (number? left-dot-pos) + (- middle-pos left-dot-pos) + middle-pos)) + (right-distance (if (number? right-dot-pos) + (- right-dot-pos middle-pos) + middle-pos)) + (split-pos (if (> left-distance right-distance) + right-dot-pos + left-dot-pos)) + (left (substring name 0 split-pos)) + (right (substring name split-pos))) + (markup + #:pad-to-box '(0 . 36) '(-2 . 2) #:column (#:typewriter left + #:typewriter #:concat (" " right)) + #:pad-to-box '(-2 . 4) '(-3.5 . 3.5) #:huge #:musicglyph name)) + (markup + #:pad-to-box '(0 . 36) '(-2 . 2) #:typewriter name + #:pad-to-box '(-2 . 4) '(-3.5 . 3.5) #:huge #:musicglyph name))))) + +#(define-markup-list-command (doc-chars layout props names) (list?) + (define (min-length lst n) + "(min (length lst) n)" + (if (or (null? lst) (<= n 0)) + 0 + (1+ (min-length (cdr lst) (1- n))))) + (define (doc-chars-aux names acc) + (let* ((n (min-length names 2)) + (head (take names n)) + (tail (drop names n))) + (if (null? head) + (reverse! acc) + (doc-chars-aux tail + (cons (make-line-markup (map make-doc-char-markup head)) + acc))))) + (interpret-markup-list layout props (doc-chars-aux names (list)))) diff --git a/Documentation/included/fretted-headword.ly b/Documentation/included/fretted-headword.ly new file mode 100644 index 0000000000..f2d13ee0af --- /dev/null +++ b/Documentation/included/fretted-headword.ly @@ -0,0 +1,145 @@ +% INSPIRATIONAL HEADER FOR LILYPOND DOCUMENTATION fretted-strings % +% Passage from Johann Kaspar Mertz "Opern Revue, Op. 8, no. 17" % +% on melodies from Bellini's "Norma" % +%*****************************************************************% + +\version "2.12.0" + +#(set-global-staff-size 15) +\paper { + line-width = 17\cm + indent = 0\cm +} + +\layout { + \context { + \Score + \remove "Bar_number_engraver" + \override PaperColumn #'keep-inside-line = ##t + \override NonMusicalPaperColumn #'keep-inside-line = ##t + } +} + +%%%% shortcuts +% fingering orientations +sfol = \set fingeringOrientations = #'(left) +sfor = \set fingeringOrientations = #'(right) +sfod = \set fingeringOrientations = #'(down) +sfou = \set fingeringOrientations = #'(up) + +% string number orientations +ssnol = \set stringNumberOrientations = #'(left) %(down right up) +ssnou = \set stringNumberOrientations = #'(up) +ssnod = \set stringNumberOrientations = #'(down) +ssnor = \set stringNumberOrientations = #'(right) + +% define fingering offset +FO = #(define-music-function (parser location offsetX offsetY) (number? number?) +#{ + \once \override Voice.Fingering #'extra-offset = #(cons $offsetX $offsetY) +#}) + +% markups +rit = \markup \center-align { \bold { \italic { " rit." } } } +dim = \markup \center-align { \italic { " dim." } } +andantino = \markup \left-align { \italic { \bold { \fontsize #2.5 { "Andantino" } } } } +benmarcato = \markup { \italic { \bold { "il canto ben marcato" } } } +pdolce = #(make-dynamic-script (markup #:line (#:dynamic "p" #:normal-text #:italic "dol."))) + +%%% THE MUSIC %%% + +melody = \relative c { + \clef "treble_8" + \key d \major + \time 4/4 + \voiceOne + \sfol + e,32 a' c e + e, a c e + e,, a' c e + e, a c e + f4\rest 4-> | % m. 1 + + e,,,32 gis' b e + e, gis b e + e,, gis' b e + e, gis b e + f4\rest \FO #'0.4 #'0.5 4 | % m. 2 + + d4\rest -> d4\rest^\rit 4-> | % m. 3 + 1 | % m. 4 + + \bar "||" + \key a \minor + R1 % m. 5 + + e'4^\benmarcato e8. d16-4 + d4-4 \times 2/3 { \sfou \FO #'-0.3 #'0.6 4 b8 } | % end of m. 6 + + \FO #'-0.3 #'0.3 + 4 \times 2/3 { c4 b8 } a4 e'8. e16 | % m. 7 + + \FO #'-0.3 #'0.3 + 4 \times 2/3 { \sfol \FO #'0.3 #'0.0 4 e8 } e4 % beg of m. 8 + \times 2/3 { \sfou 4 c8 } | % end of m. 8 + + b4 \times 2/3 { d4-4 c8 } \sfou \FO #'-1.7 #'-1.5 4 e | % end of m. 9 + + e4 e8. d16-4 d4 \times 2/3 { c4 b8 } | % m. 10 + + \times 2/3 { a4 a8 b4 c8 } % beg of m. 11 + \sfou \FO #'-0.3 #'0.3 + 4^\< \times 2/3 { e4 8\! } | % end of m. 11 +} + +bass = \relative c { + \key d \major + \time 4/4 + \voiceTwo + + e,8\fp[ e'] e,[ e'] e, \sfol c, | % m. 1 + + e,,8\fp[ e'] e,[ e'] e, \sfod \FO #'0.2 #'-0.2 % beg m. 2 + \sfol \FO #'0.3 #'0.0 b | % end m. 2 + + e,,8 e' gis e e, e' gis_\dim e | % m. 3 + + e,1 | % m. 4 + + %% new section starts here in A minor + \overrideBeamSettings #'Score #'(4 . 4) #'end + #'((* . (1 1 1 1)) + ((1 . 12) . (3 3 3 3))) + \once \override TextScript #'staff-padding = #1.7 + \times 2/3 { a8\p^\andantino e' a c a e a, e' a c a e } | % m. 5 + + \times 2/3 { a,8\pdolce e' a c a e } % beg m. 6 + \times 2/3 { e,8 \sfou c gis e } | % end m. 6 + + \times 2/3 { a,8 a c e, b' a, e' a c a e } | % m. 7 + + \times 2/3 { f,8 f' a \sfol \FO #'0.3 #'-0.5 a f fis, d' a' d a d, } | % m. 8 + + \times 2/3 { 8 d' g d' g, d % beg m. 9 + \sfod \FO #'0.0 #'-2.0 \sfou b gis e } | % end m. 9 + + \times 2/3 { a,8 e' a c a e e, e' gis c gis e } | % m. 10 + + \times 2/3 { a,8 e' a b a e f, f' a d a f } | % m. 11 +} + +\score { + \new Staff = "guitar" << + \context Voice = "upper" { \melody } + \context Voice = "lower" { \bass } + >> + \layout { + \context { + \Score + \override Fingering #'staff-padding = #'() + \override TupletNumber #'stencil = ##f + \override TupletBracket #'bracket-visibility = ##f + } + } + \midi { } +} diff --git a/Documentation/included/keyboard-headword.ly b/Documentation/included/keyboard-headword.ly new file mode 100644 index 0000000000..8793965d37 --- /dev/null +++ b/Documentation/included/keyboard-headword.ly @@ -0,0 +1,241 @@ +\version "2.12.0" +\include "english.ly" + +#(set-global-staff-size 15) +\paper { + line-width = 16\cm + indent = 0\cm +} + +% NR 2.2 Keyboard instruments + +% M. Ravel, Sonatine (1905) +% First movement + +\layout { + \context { + \Score + \remove "Bar_number_engraver" + } +} + +fermataLong = \markup { + \override #'(direction . 1) + \override #'(baseline-skip . 2) { + \dir-column { + \musicglyph #"scripts.ufermata" + \text \italic \center-align long + } + } +} + +\new PianoStaff << + \set PianoStaff.connectArpeggios = ##t + \new Staff { + \time 2/4 + \key fs \major + << + \new Voice { + \voiceOne + fs''8 ( ^\markup { + \override #'(baseline-skip . 2.4) \column { + \line \bold { Un peu retenu } + \line \italic { très expressif } + } + } + es''16 + cs''16 + as'4 ) + | + fs''8 ( + es''16 + cs''16 + as'4 ) + | + fs''8 ( + es''16 + cs''16 + as'8 + cs''8 ) + | + } + \new Voice { + \voiceTwo + gs'8\rest \ppp + fs'4 ( + es'8 ) + | + gs'8\rest + fs'4 ( + es'8 ) + | + gs'8\rest + fs'4 ( + es'8 ) + | + } + >> + \clef bass + 4 ( ^ \markup \bold { Rall. } + \override Script #'stencil = #(lambda (grob) + ly:script::print (grob-interpret-markup grob fermataLong)) + 8 ) \fermata + \noBeam + \clef treble + \slurUp + \once \override Hairpin #'to-barline = ##f + 8 ( \pp \> + | + 4. \! ) ^\markup \bold { a Tempo } + \slurUp + 8 ^\( \> + | + 4. \! \) + << + \new Voice { + \voiceOne + 8 ( + | + cs'8 ^\markup \bold { Rallentando } + b16 + cs'16 + d'8 + e'16 + fs'16 + | + 4. ) + s8 + | + r8 + 4 \arpeggio + e''16 ( ^\markup \bold { Lent } + fs''16 + | + \voiceTwo + 2 ) + | + } + \new Voice { + \voiceTwo + s8 + | + 4 \< + 4 \> + | + s4. \! + \slurUp + \once \override Script #'direction = #UP + 8 ( \accent + | + 4. ) + \once \override Hairpin #'to-barline = ##f + 8 \ppp \> + | + s8 \! + \stemDown + \once \override Script #'direction = #UP + \ottava #1 + \voiceOne + \once \override PianoStaff.Arpeggio #'padding = #0.8 + 4. \arpeggio \fermata + \ottava #0 + \bar "|." + } + >> + } + \new Staff << + \set Staff.pedalSustainStyle = #'bracket + \key fs \major + \clef bass + \new Voice { + \voiceOne + ds'4 \tenuto + cs'4 \tenuto + | + ds'4 \tenuto + cs'4 \tenuto + | + ds'4 \tenuto + cs'4 \tenuto + | + s8 + \clef treble + 8 [ + \clef bass + 8 \fermata ] + s8 + | + fs8\rest + \clef treble + 4 \tenuto + s8 + | + fs8\rest + \clef treble + 4 \tenuto + s8 + | + s2 + | + ds8\rest + \clef treble + 4 + \clef bass + s8 + | + s8 + \clef treble + 4 \arpeggio + \clef bass + s8 + | + s8 + \clef treble + 4. \arpeggio \fermata + | + } + \new Voice { + \voiceTwo + ds'8 [ ( + < ds bs >8 + cs'8 + < ds as >8 ] ) + | + ds'8 [ ( + < ds bs >8 + cs'8 + < ds as >8 ] ) + | + ds'8 [ ( + < ds bs >8 + cs'8 + < ds as >8 ] ) + | + \once \override Script #'outside-staff-priority = #100 + \once \override TextScript #'outside-staff-priority = #500 + 4. \fermata _\markup \italic { ped. } + 8 ( + | + 4. ) \sustainOn + \clef bass + 8 \( \sustainOff + | + 4. \) \sustainOn + \clef bass + 8 ( \sustainOff + | + 4 + 4 + | + 4. ) \sustainOn + 8 ( \sustainOff + | + 4. ) \sustainOn + \slurUp + 8 ( \sustainOff \sustainOn + | + 2 ) \sustainOff \sustainOn + | + } + >> +>> diff --git a/Documentation/included/note-head-style.ly b/Documentation/included/note-head-style.ly new file mode 100644 index 0000000000..fc908c05ee --- /dev/null +++ b/Documentation/included/note-head-style.ly @@ -0,0 +1,104 @@ +\version "2.12.0" +\header{ + texidoc=" +Note head shapes may be set from several choices. +The stem endings should be adjusted according to the note head. +If you want different note head styles on one stem, +you must create a special context. + +Harmonic notes have a different shape and different +dimensions. +" +} + +\layout { + indent = 0.0 + ragged-right = ##t +} + +pattern = << + \new Voice { + \override Stem #'direction = #UP + e'4 e'2. e'1 e'\breve*1/2 e'\longa*1/4 + } + \new Voice { + \override Stem #'direction = #DOWN + a4 a2. a1 a\breve*1/2 a\longa*1/4 + } +>> + + +\transpose c c { + \clef C + + \override Staff.NoteHead #'style = #'default + s1*0^\markup { "default" } + \pattern + + \override Staff.NoteHead #'style = #'altdefault + s1*0^\markup { "altdefault" } + \pattern + + \break + + \override Staff.NoteHead #'style = #'baroque + s1*0^\markup { "baroque" } + \pattern + + \override Staff.NoteHead #'style = #'neomensural + s1*0^\markup { "neomensural" } + \pattern + + \break + + \override Staff.NoteHead #'style = #'mensural + s1*0^\markup { "mensural" } + \pattern + + \override Staff.NoteHead #'style = #'petrucci + s1*0^\markup { "petrucci" } + \pattern + + \break + + \override Staff.NoteHead #'style = #'harmonic + s1*0^\markup { "harmonic" } + \pattern + + \override Staff.NoteHead #'style = #'harmonic-black + s1*0^\markup { "harmonic-black" } + \pattern + + \break + + \override Staff.NoteHead #'style = #'harmonic-mixed + s1*0^\markup { "harmonic-mixed" } + \pattern + + \override Staff.NoteHead #'style = #'diamond + s1*0^\markup { "diamond" } + \pattern + + \break + + \override Staff.NoteHead #'style = #'cross + s1*0^\markup { "cross" } + \pattern + + \override Staff.NoteHead #'style = #'xcircle + s1*0^\markup { "xcircle" } + \pattern + + \break + + \override Staff.NoteHead #'style = #'triangle + s1*0^\markup { "triangle" } + \pattern + + \override Staff.NoteHead #'style = #'slash + s1*0^\markup { "slash" } + \pattern +} + + + diff --git a/Documentation/included/percussion-chart.ly b/Documentation/included/percussion-chart.ly new file mode 100644 index 0000000000..cdbc6d7883 --- /dev/null +++ b/Documentation/included/percussion-chart.ly @@ -0,0 +1,68 @@ +\version "2.12.0" + +% yes, I know this is a mess. But I'm not going to fuss with +% it one day before I leave. -gp + +% this chart is used in the manual too. + +\header { + texidoc ="@cindex Percussion notes + +This chart shows all percussion and drum notes." +} + +myBreak = { \bar " " \break } + +\new Score \with { + \remove "Bar_number_engraver" +} \new DrumStaff \with { + \remove "Time_signature_engraver" +} \context DrumVoice { + +%% this stuff set up nice || bar lines to divide percussion notes +%% into related fields, but it should be placed in the actual +%% music, not as a separate voice. -gp +%{ +barlines = { +\repeat "unfold" 4 {s 1 \bar" " } s 1 \bar "||" +\repeat "unfold" 2 { s 1 \bar" " s 1 \bar" " s 1 \bar "||" } +\repeat "unfold" 4 {s 1 \bar" " } s 1 \bar "||" +\repeat "unfold" 7 {s 1 \bar" " } s 1 \bar "||" +s 1 \bar" " s 1 \bar "||" +\repeat "unfold" 2 { \repeat "unfold" 5 {s 1 \bar" " } s 1 \bar "||" } +\repeat "unfold" 2 { s 1 \bar" " s 1 \bar "||" } +\repeat "unfold" 2 {s 1 \bar" " } s 1 \bar "||" +\repeat "unfold" 4 {s 1 \bar" " } s 1 \bar "||" +s 1 \bar" " s 1 \bar "||" +\repeat "unfold" 3 {s 1 \bar" " } s 1 \bar "||" +\repeat "unfold" 2 {s 1 \bar" " } s 1 \bar "||" +\repeat "unfold" 3 {\repeat "unfold" 4 {s 1 \bar" " } s 1 \bar "||" } +} +%} + +\drummode { +\textLengthOn +\cadenzaOn +bda1 ^"acousticbassdrum: bda" bd ^"bassdrum: bd" sn ^"snare: sn" sne ^"electricsnare: sne" sna ^"acousticsnare: sna" \myBreak +tomfl ^"lowfloortom: tomfl" tomfh ^"highfloortom: tomfh" toml ^"lowtom: toml" tomh ^"hightom: tomh" +tomml ^"lowmidtom: tomml" tommh ^"himidtom: tommh" \myBreak +hhc ^"closedhihat: hhc" hh ^"hihat: hh" hhp ^"pedalhihat: hhp" hho ^"openhihat: hho" hhho ^"halfopenhihat: hhho" \myBreak +cymca ^"crashcymbala: cymca" cymc ^"crashcymbal: cymc" cymra ^"ridecymbala: cymra" cymr ^"ridecymbal: cymr" \myBreak cymch ^"chinesecymbal: cymch" cyms ^"splashcymbal: cyms" +cymcb ^"crashcymbalb: cymcb" cymrb ^"ridecymbalb: cymrb" +rb ^"ridebell: rb" cb ^"cowbell: cb" \myBreak +bohm ^"mutehibongo: bohm" boh ^"hibongo: boh" boho ^"openhibongo: boho" bolm ^"mutelobongo: bolm" bol ^"lobongo: bol" bolo ^"openlobongo: bolo"\myBreak +cghm ^"mutehiconga: cghm" cglm ^"muteloconga: cglm" cgho ^"openhiconga: cgho" cgh ^"hiconga: cgh" cglo ^"openloconga: cglo" cgl ^"loconga: cgl" \myBreak +timh ^"hitimbale: timh" timl ^"lotimbale: timl" +agh ^"hiagogo: agh" agl ^"loagogo: agl" \myBreak +ssh ^"hisidestick: ssh" ss ^"sidestick: ss" ssl ^"losidestick: ssl" \myBreak +guis ^"shortguiro: guis" guil ^"longguiro: guil" gui ^"guiro: gui" cab ^"cabasa: cab" mar ^"maracas: mar" \myBreak +whs ^"shortwhistle: whs" whl ^"longwhistle: whl" \myBreak +hc ^"handclap: hc" tamb ^"tambourine: tamb" vibs ^"vibraslap: vibs" tt ^"tamtam: tt" \myBreak +cl ^"claves: cl" wbh ^"hiwoodblock: wbh" wbl ^"lowoodblock: wbl" \myBreak +cuim ^"mutecuica: cuim" cuio ^"opencuica: cuio" +trim ^"mutetriangle: trim" tri ^"triangle: tri" trio ^"opentriangle: trio" \myBreak +ua ^"oneup: ua" ub ^"twoup: ub" uc ^"threeup: uc" ud ^"fourup: ud" ue ^"fiveup: ue" \myBreak +da ^"onedown: da" db ^"twodown: db" dc ^"threedown: dc" dd ^"fourdown: dd" de ^"fivedown: de" \myBreak +} +} + diff --git a/Documentation/included/pitches-headword.ly b/Documentation/included/pitches-headword.ly new file mode 100644 index 0000000000..d69c44a97f --- /dev/null +++ b/Documentation/included/pitches-headword.ly @@ -0,0 +1,143 @@ +\version "2.12.0" +\include "english.ly" +#(set-global-staff-size 15) +\paper{ + ragged-right=##t + line-width=17\cm + indent=0\cm +} + +\layout { + \context { \Score + \override PaperColumn #'keep-inside-line = ##t + \override NonMusicalPaperColumn #'keep-inside-line = ##t + } +} + +% NR 1.1 Pitches + +% L. v. Beethoven +% Piano sonata 21 - Dem Grafen von Waldstein Gewidmet +% chorale at measures 34 - 40+ + +\new PianoStaff << + + % RH Staff + \new Staff << + + % RH Voice 1 + \new Voice { + \set Score.currentBarNumber = #34 + \voiceOne + gs''2 ( ^ \markup \italic { dolce e molto ligato } + fs''4 + e''4 + | + ds''2 + cs''2 ) + | + ds''2 ( + e''4 + fs''4 + | + 2 + 2 ) + | + \oneVoice + \clef bass + 2 ( + 4 + 4 + | + 2 + 2 ) + | + \voiceOne + b2 %( + cs'4 + ds'4 + | + \clef treble + 4 %) + r4 r2 + } + + % RH Voice 2 + \new Voice { + \voiceTwo + \override Staff.DynamicLineSpanner #'staff-padding = #2.5 + 2 \p + 4 + 4 + | + 2 + e'2 + | + \once \override TextScript #'staff-padding = #2.5 + 2 _ \markup \italic { cresc. } + b'4 + 4 + | + b'2. ( \sf \> + a'4 ) + \clef bass + | \break + s1 \p + | + s1 + | + 4 ( + 2. ) + | + s4 + r4 r2 + } + + >> + + % LH Staff + \new Staff { + \override Staff.SustainPedalLineSpanner #'staff-padding = #5 + 2 ( \sustainOn + 4 \sustainOff + 4 + | + 2 + 2 ) \sustainOn + | + \clef bass + \slurDown + 2 ( \sustainOff + 4 + 4 \sustainOn + | + \clef treble + \voiceOne + << + { + 2 + 2 ) + } + \new Voice { + \voiceTwo + b1 \sustainOff + } + >> + \oneVoice + | + %\break + \clef bass + 2 ( + 4 + 4 + | + 2 + 2 ) \sustainOn + | + 1 ( \sustainOff + | + 4 ) + r4 r2 + } + +>> diff --git a/Documentation/included/repeats-headword.ly b/Documentation/included/repeats-headword.ly new file mode 100644 index 0000000000..faba778a12 --- /dev/null +++ b/Documentation/included/repeats-headword.ly @@ -0,0 +1,124 @@ +\version "2.12.0" +\include "english.ly" +#(set-global-staff-size 15) +\paper { + line-width = 16\cm + indent = 0\cm +} + +% NR 1.7 Repeats + +% Beethoven, Op. 57 +% Piano sonata 23 - Dem Grafen Franz von Brunswick Gewidmet +% Movt II, Andante con moto +% Measures 9 - 16 + +\new PianoStaff << + + \new Staff = RH { + \clef bass + \key df \major + \time 2/4 + \set Score.currentBarNumber = #9 + \bar "|:" + 4 ( + 8.. + 32 + | + 8. ) + 16 ( + 8 + 8 ) + | + 4 ( + 8.. + 32 + | + 8. ) + \slurDown + 16 ( + << + { + \voiceTwo + gf8 + f8 ) + } + \new Voice { + \voiceOne + 16 + ef'16 + 8 + } + >> + \oneVoice + | + 4 ( + 8.. + 32 + \clef treble + | + 8. ) + 16 ( + 16 + gf'16 + 8 ) + | + \slurUp + 4 + \change Staff = LH + \voiceOne + 4 + | + 4. + \change Staff = RH + \oneVoice + r8 + \clef bass + \bar ":|" + } + + \new Staff = LH { + \clef bass + \key df \major + \time 2/4 + 4 ( + 8.. + 32 + | + 8. ) + 16 ( + 8 + 8 ) + | + 4 ( + 8.. + 32 + | + 8. ) + 16 ( + 8 + ) + | + 4 ( + 8.. + 32 + | + 8. ) + 16 ( + 8 + 8 ) + | + \voiceTwo + gf,4 ( + af,4 ~ ) + | + af,16. [ ( + gf,32 + f,16. + ef,32 ] + df,8 ) + \oneVoice + r8 + } + +>> diff --git a/Documentation/included/rhythms-headword.ly b/Documentation/included/rhythms-headword.ly new file mode 100644 index 0000000000..a48f05ca9e --- /dev/null +++ b/Documentation/included/rhythms-headword.ly @@ -0,0 +1,209 @@ +\version "2.12.0" +\include "english.ly" +#(set-global-staff-size 15) +\paper { + line-width = 16\cm + indent = 0\cm +} + +% NR 1.2 Rhythms + +% Beethoven, Op. 81a +% Piano sonata 26 - Das Lebewohl +% Movt II - Abwesenheit +% Measures 31 - 34 + +\layout { + \context { + \Score + \override SpacingSpanner #'base-shortest-duration = + #(ly:make-moment 1 40) + %\override SpacingSpanner #'strict-grace-spacing = ##t + } +} + +\new PianoStaff << + + % RH Staff + \new Staff { + \clef treble + \key c \minor + \time 2/4 + \set Score.currentBarNumber = #31 + + 8 ( -\markup { + \override #'(baseline-skip . 2) \italic \column { + \line { a tempo } + cantabile + } + } + 8 ) + ~ + 8 ( + 16 + 16 ) + + | + + \afterGrace + 8 [ ( + { + e''16 [ + f''16 + e''16 + d''16 ] + } + 16 + 16 ] ) + \once \override TextScript #'padding = #3.8 + 16 ( \staccato -\markup { \italic cresc. } + 16 ) \staccato + 32 ( + 32 ) + 32 ( + 32 ) + + | + + \once \override DynamicLineSpanner #'padding = #2 + b''32 ( \p \> + c'''32 + d'''32 + c'''32 ) \! + g''8 ( + ~ + g''32 [ + a''64 + g''64 ) ] + + a''64 ( [ + g''64 ) + bf''64 ( + a''64 ) ] + + bf''64 ( [ + a''64 ) + c'''64 ( + b''64 ) ] + + c'''128 ( [ + b''128 + d'''128 + c'''128 + f'''64 + f''64 ) ] + + | + + \afterGrace + 8 [ ( + { + e''16 [ + f''16 + e''16 + d''16 ] + } + 16 + 16 ] ) + 16 ( \staccato -\markup { \italic cresc. } + 16 ) \staccato + 32 ( + 32 ) + 32 ( + 32 ) + } + + % LH Staff + \new Staff { + \clef bass + \key c \minor + \time 2/4 + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + | + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + | + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + | + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + } + +>> diff --git a/Documentation/included/screech-boink.ly b/Documentation/included/screech-boink.ly new file mode 100644 index 0000000000..a49cd240db --- /dev/null +++ b/Documentation/included/screech-boink.ly @@ -0,0 +1,73 @@ +\version "2.12.0" +\header { + title = "Screech and boink" + subtitle = "Random complex notation" + composer = "Han-Wen Nienhuys" +} + +\score { + \context PianoStaff << + \new Staff = "up" { + \time 4/8 + \key c \minor + + + << { + \revert Stem #'direction + \change Staff = down + \set subdivideBeams = ##t + g16.[ + \change Staff = up + c'''32 \change Staff = down + g32 \change Staff = up + c'''32 \change Staff = down + g16] + \change Staff = up + \stemUp + \set followVoice = ##t + c'''32([ b''16 a''16 gis''16 g''32)] } \\ + { s4 \times 2/3 { d'16[ f' g'] } as'32[ b''32 e'' d''] } \\ + { s4 \autoBeamOff d''8.. f''32 } \\ + { s4 es''4 } + >> + } + + \new Staff = "down" { + \clef bass + \key c \minor + \set subdivideBeams = ##f + \override Stem #'french-beaming = ##t + \override Beam #'thickness = #0.3 + \override Stem #'thickness = #4.0 + g'16[ b16 fis16 g16] + << \makeClusters { + as16 + + + } \\ + { + \override Staff.Arpeggio #'arpeggio-direction =#down + 4\arpeggio } + >> + } + >> + + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 60 8) + } + } + + + + \layout { + ragged-right = ##t + + \context { + \Staff + \consists Horizontal_bracket_engraver + } + + } +} diff --git a/Documentation/included/script-chart.ly b/Documentation/included/script-chart.ly new file mode 100644 index 0000000000..6adf282257 --- /dev/null +++ b/Documentation/included/script-chart.ly @@ -0,0 +1,62 @@ +\version "2.12.0" + +\header { + texidoc ="@cindex Feta scripts +This chart shows all articulations, or scripts, that the feta font contains. +" +} + +\score { + << + \new Voice = "scripts" { + c''\accent c''\marcato c''\staccatissimo c''\espressivo + c''\staccato c''\tenuto c''\portato + c''\upbow c''\downbow c''\flageolet + c''\thumb c''^\lheel c''\rheel + c''^\ltoe c''\rtoe c''\open + c''\stopped c''\snappizzicato c''\turn c''\reverseturn + c''\trill c''\prall c''\mordent + c''\prallprall c''\prallmordent c''\upprall + c''\downprall c''\upmordent c''\downmordent + c''\pralldown c''\prallup c''\lineprall + c''\signumcongruentiae c''\shortfermata c''\fermata + c''\longfermata c''\verylongfermata c''\segno + c''\coda c''\varcoda + } + \new Lyrics \lyricsto "scripts" { + accent marcato staccatissimo espressivo + staccato tenuto portato + upbow downbow flageolet + thumb lheel rheel + ltoe rtoe open + stopped snappizzicato turn reverseturn + trill prall mordent + prallprall prallmordent upprall + downprall upmordent downmordent + pralldown prallup lineprall + signumcongruentiae shortfermata fermata + longfermata verylongfermata segno + coda varcoda + } + >> + \layout { + line-width = 5.1\in + indent = 0.0\mm + \context { + \Score + timing = ##f + barAlways = ##t + \override NonMusicalPaperColumn #'padding = #2.5 + } + \context { + \Staff + \remove "Time_signature_engraver" + \override BarLine #'transparent = ##t + } + \context { + \Lyrics + \override LyricText #'font-family = #'typewriter + \override LyricText #'font-shape = #'upright + } + } +} diff --git a/Documentation/included/simultaneous-headword.ly b/Documentation/included/simultaneous-headword.ly new file mode 100644 index 0000000000..a6b5ff8e47 --- /dev/null +++ b/Documentation/included/simultaneous-headword.ly @@ -0,0 +1,313 @@ +\version "2.12.0" +\include "english.ly" +#(set-global-staff-size 15) +\paper{ + ragged-right=##t + line-width=17\cm + indent=0\cm +} + +\layout { + \context { \Score + \override PaperColumn #'keep-inside-line = ##t + \override NonMusicalPaperColumn #'keep-inside-line = ##t + } +} + +% NR 1.5 Simultaneous notes + +% L. v. Beethoven, Op. 111 +% Piano sonata 32 +% Movt II - Arietta - Adagio molto semplice e cantabile +% measures 108 - 118 + +\layout { + \context { + \Score + \override SpacingSpanner #'base-shortest-duration = + #(ly:make-moment 1 18) + \override NonMusicalPaperColumn #'line-break-system-details = + #'((alignment-offsets . (0 -12))) + } +} + +trillflat = + \once \override TrillSpanner #'(bound-details left text) = + #(markup #:translate-scaled '(-0.05 . -1) + #:concat (#:musicglyph "scripts.trill" + #:translate '(-0.5 . 1.9) #:fontsize -7 #:flat)) + + +\new PianoStaff << + + % RH + \new Staff << + \clef treble + \key c \major + \time 9/16 + \set Score.currentBarNumber = #108 + + % RH voice 1 + \new Voice { + + \voiceOne + s4. + s8. + + | + + s4. + a''8 \p \> [ ( + g''16 ] ) + + | + + g''4. + af''8 [ ( + g''16 ] ) + + | + + g''8. [ + g''8. + g''8. \pp ] + + | + + g''8. [ + af''8. + af''8. ] + + | + + af''8. [ + af''8. + af''8. ] + + | + \break + + \trillflat + af''4. \startTrillSpan + ~ + af''8. + ~ + + | + + af''4. + ~ + af''8. + ~ + + | + + \oneVoice + 8. [ + a''8. \p \< + bf''8. ] + ~ + + | + + bf''8. [ + b''8. + c'''8. ] + ~ + + \bar "||" + + \key ef \major + c'''8. [ + cs'''8. \f ] \stopTrillSpan + r8. + + } + + % RH voice 2 + \new Voice { + \voiceTwo + \override Voice.TrillSpanner #'direction = #down + d''4. \f \startTrillSpan + ~ + d''8. + ~ + + | + + d''4. + ~ + d''8. + ~ + + | + + d''8. \stopTrillSpan + \trillflat + d''4. \startTrillSpan + ~ + + | + + d''4. + ~ + d''8. + ~ + + | + + d''4. + ~ + d''8. + ~ + + | + + d''4. + ~ + d''8. \stopTrillSpan + ~ + + | + + \trillflat + d''4. \startTrillSpan + ~ + d''8. + ~ + + | + + d''4. + ~ + d''8. + ~ + + | + + \once \override NoteColumn #'ignore-collision = ##t + \once \override NoteHead #'transparent = ##t + \once \override Dots #'transparent = ##t + \once \override Stem #'transparent = ##t + d''8. \stopTrillSpan + s4. + + | + + s8. + s8. + + } + + >> + + % LH staff + \new Staff { + \clef bass + \key c \major + \time 9/16 + + r8. + r8. + 8 [ ( + 16 ] ) + + | + + 4. + \clef treble + c''8 [ ( + b'16 ] ) + + | + + b'4. + c''8 [ ( + b'16 ] ) + + | + + b'8. [ + b'8. + b'8. ] + + | + + b'8. [ + bf'8. ] + \clef bass + 8 [ ( + 16 ] ) + + | + + 4. + \clef treble + f'8 [ ( + bf16 ] ) + + | + + << + + \new Voice { + \voiceOne + \override Voice.TrillSpanner #'direction = #up + f'4. \startTrillSpan + ~ + f'8. + ~ + + | + + f'4. + ~ + f'8. + ~ + + | + + f'8. \stopTrillSpan + } + + \new Voice { + \voiceTwo + \override Voice.TrillSpanner #'direction = #down + bf8. [ + bf8. + bf8. ] + + | + + bf8. [ + bf8. + bf8. ] + + | + + bf8. + } + + >> + + \oneVoice + r8. + r8. + + | + + r8. + r8. + r8. + \clef bass + + | + + \key ef \major + r8. + r8. + r8. + + } + +>> diff --git a/Documentation/included/staff-headword.ly b/Documentation/included/staff-headword.ly new file mode 100644 index 0000000000..f7fa2e4145 --- /dev/null +++ b/Documentation/included/staff-headword.ly @@ -0,0 +1,119 @@ +\version "2.12.0" +\include "catalan.ly" +#(set-global-staff-size 15) +\paper{ + ragged-right=##t + line-width=17\cm + indent=0\cm +} + +\header { + mutopiatitle = "Napolitan Dance (Swan Lake)" + mutopiacomposer = "TchaikovskyPI" + mutopiainstrument = "Piano, Trumpet, Percussion" + source = "New arrangement" + style = "Classical" + copyright = "Public Domain" + maintainer = "Laurence Sardain" + lastupdated = "2006/Dec/21" +% title = "Le Lac des Cygnes" +% subtitle = "Danse Napolitaine" +% composer = "Piotr Ilitch Tchaïkovski" +% arranger = "arr. Laurence Sardain" +% footer = "Mutopia-2006/12/22-896" +} + +trompette = \relative do'' { + \clef treble + \key mib \major + \time 2/4 + R2^\markup { \italic Comodo } | + r8 \once \override TextScript #'padding = #2.0 + sib16-.^\markup {\dynamic p \italic grazioso} do-. mib( re)-. do-. sib-. | + re8-. r8 re4->( | + re8) do16-. re-. mib( re) do-. re-. | + do8-. r8 sib4-> | +} + +tambourin = \relative do' { + \time 2/4 + r8 do16 do do8 do | + r8 do16 do do8 do | + r8 do r do | + r8 do16 do do8 do | + r8 do r do | +} + +tambourinMidi = \drummode { + \time 2/4 + r8 tamb16 tamb tamb8 tamb | + r8 tamb16 tamb tamb8 tamb | + r8 tamb r tamb | + r8 tamb16 tamb tamb8 tamb | + r8 tamb r tamb | +} + +upper = \relative do' { + \clef treble + \key mib \major + \time 2/4 + r8\p 16-. -. 8-. -. | + r8 16-. -. 8-. -. | + r8 16-. -. 8-. -. | + r8 16-. -. 8-. -. | + r8 16-. -. 8-. -. | +} + +lower = \relative do { + \clef bass + \key mib \major + \time 2/4 + mib4-. r4 | + sib-. r | + fa'-. r | + sib, r | + mib4-. r4 | +} + + +\score { + << + \context Staff = "trumpet" << + \set Staff.instrumentName = \markup { "Trumpet" \concat{ B \teeny \raise #0.4 \flat } } + \transpose sib do' + \trompette + >> + \context RhythmicStaff = "tambourin" << + \set Staff.instrumentName = "Tambourine" + \tambourin + >> + \context PianoStaff = "prima" << + \set PianoStaff.instrumentName = "Piano " + \context Staff = "uppera" \upper + \context Staff = "lowera" \lower + >> + >> + \layout { } +} +\score { + << + \context Staff = "trumpet" { + \set Staff.midiInstrument = "trumpet" + \trompette + } + \context DrumStaff = "tambourin" { + \tambourinMidi + } + \context Staff = "piano" << + \upper + \lower + >> + >> + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 72 4) + } + } +} + diff --git a/Documentation/included/text-headword.ly b/Documentation/included/text-headword.ly new file mode 100644 index 0000000000..40af604f84 --- /dev/null +++ b/Documentation/included/text-headword.ly @@ -0,0 +1,236 @@ +\version "2.12.0" +\include "english.ly" +#(set-global-staff-size 15) +\paper{ + line-width = 16\cm + indent = 0\cm +} + +\layout { + \context { \Score + \override PaperColumn #'keep-inside-line = ##t + \override NonMusicalPaperColumn #'keep-inside-line = ##t + } +} + +% NR 1.8 Text + +% L. v. Beethoven, Op. 110 +% Piano sonata 31 +% measures 1 - 7 + +\layout { + \context { + \Score + \override SpacingSpanner #'base-shortest-duration = + #(ly:make-moment 1 20) + %\override NonMusicalPaperColumn #'line-break-system-details = + %#'((alignment-offsets . (0 -12))) + } +} + +\new PianoStaff << + + % RH staff + \new Staff { + \clef treble + \key af \major + \time 3/4 + + \once \override TextScript #'staff-padding = #4 + 4. ( + _ \markup { \dynamic p \italic { con amabilità } } + 8 ) + 8. [ + 16 ] + + | + + 4 + 2 + _ \markup { \italic { ten. } } + + | + + << + + \new Voice { + \voiceOne + ef''4. ( + df''8 [ ) + ef'' ( + f'' ) ] + + | + + \once \override TextScript #'staff-padding = #4 + ef''8. ( + _ \markup { \italic { tranqu. } } + d''16 ) + df''8 \trill \fermata + _ \markup { \italic { ten. } } + } + + \new Voice { + \voiceTwo + af'4. + af'8 [ + af'8 + af'8 ] + + | + + g'4 + g'8 + } + + >> + + \oneVoice + \once \override TextScript #'staff-padding = #4 + df''32 + _ \markup { \italic dolce } + c''32 + df''32 + ef''32 + \acciaccatura { df''[ ef'' ] } + f''8 + ef''16 + df''16 + + | + \break + \overrideProperty "Score.NonMusicalPaperColumn" + #'line-break-system-details #'((alignment-offsets . (0 -12))) + + c''4. ( + ^ \markup \italic { cantabile, con intimissimo sentimento, + ma sempre molto dolce e semplice } + ef''4 + af''8 ) + + | + + af''4 ( + g''2 ) + + | + + bf''4. ( + g''4 + ef''8 ) + + | + } + + % LH + \new Staff { + \clef bass + \key af \major + \time 3/4 + + 4. ( + 8 ) + 8. [ + 16 ] + + | + + 4 + 2 ^ \markup { \italic ten. } + + | + + << + + \new Voice { + \voiceOne + ef8 [ ( + af8 + c'8 + bf8 ) + c'8 ( \staccato + df'8 ] ) \staccato + + | + + bf4 + bf8 ^ \markup { \italic ten. } + } + + \new Voice { + \voiceTwo + c4. ( + f8 [ ) + ef8 ( \staccato + df8 ] ) \staccato + + | + + ef4 + ef8 \fermata + } + + >> + + \oneVoice + r8 + r4 + \clef treble + + | + + \override Staff.SustainPedalLineSpanner #'outside-staff-priority = #1000 + \override Staff.SustainPedalLineSpanner #'staff-padding = #7 + \once \override TextScript #'padding = #2 + af16 \sustainOn + ^ \markup \italic { non staccato } + _ \markup \italic { molto \concat {\dynamic {p},} sempre tranquillo + ed egualmente, non rubato } + 16 + 16 + 16 + af16 + 16 + 16 + 16 + af16 \sustainOn + 16 + 16 + 16 + + | + + bf16 \sustainOn + 16 + 16 + 16 + bf16 \sustainOn + 16 + 16 + 16 + bf16 + 16 + 16 + 16 + + | + + \override Staff.SustainPedalLineSpanner #'staff-padding = #4 + df'16 \sustainOn + 16 + 16 + 16 + df'16 + 16 + 16 + 16 + df'16 \sustainOn + 16 + 16 + 16 + + | + } + +>> diff --git a/Documentation/included/unfretted-headword.ly b/Documentation/included/unfretted-headword.ly new file mode 100644 index 0000000000..e859e1357b --- /dev/null +++ b/Documentation/included/unfretted-headword.ly @@ -0,0 +1,223 @@ +% #!lilypond lcp-extract.ly -*- coding: utf-8; -*- + +%%% +%%% les-cinq-pieds: +%%% extract for the lilypond documentaton project +%%% + +%% Title: Les cinq pieds +%% Composer: David Séverin +%% Date: Juillet 2007 +%% Instrument: Violon Solo +%% Dedication: A mon épouse Lívia De Souza Vidal +%% Additional: avec l'aide de Krzysztof Wagenaar + +%% Statement: + +%% Here by, I, the composer, agree that this extract of my composition +%% be in the public domain and can be part of, used and presented in +%% the LilyPond Documention Project. + +%% Statement Date: Octber the 9th, 2008 + + +\version "2.12.0" +#(set-global-staff-size 15) + +%%% +%%% Abreviations +%%% + +db = \markup { \musicglyph #"scripts.downbow" } +dub = \markup { \line { \musicglyph #"scripts.downbow" " " \musicglyph #"scripts.upbow" } } +dubetc = \markup { \line { \musicglyph #"scripts.downbow" " " \musicglyph #"scripts.upbow" "..." } } + +ub = \markup { \musicglyph #"scripts.upbow" } +udb = \markup { \line { \musicglyph #"scripts.upbow" " " \musicglyph #"scripts.downbow" } } +udbetc = \markup { \line { \musicglyph #"scripts.upbow" " " \musicglyph #"scripts.downbow" "..." } } + +fermaTa = \markup \musicglyph #"scripts.ufermata" + +accel = \markup \tiny \italic \bold "accel..." +ritar = \markup \tiny \italic \bold "ritar..." + +ignore = \override NoteColumn #'ignore-collision = ##t + + +%% +%% Strings +%% + +svib = \markup \small "s. vib." +pvib = \markup \small "p. vib." +mvib = \markup \small "m. vib." +sulp = \markup \small "s.p." +norm = \markup \small "n." + +quatre = \markup \teeny "IV" + + +%% +%% Shifting Notes +%% + +shift = \once \override NoteColumn #'force-hshift = #0.9 +shifta = \once \override NoteColumn #'force-hshift = #1.2 +shiftb = \once \override NoteColumn #'force-hshift = #1.4 + + +%% +%% Hairpin +%% + +% aniente = "a niente" +aniente = \once \override Hairpin #'circled-tip = ##t + + +%% +%% Tuplets +%% + +tupletbp = \once \override Staff.TupletBracket #'padding = #2.25 + + +%% +%% Flag [Note Head - Stem] +%% + +noflag = \once \override Stem #'flag-style = #'no-flag + +%%% +%%% Functions +%%% + +#(define-markup-command (colmark layout props args) + (markup-list?) + (let ((entries (cons (list '(baseline-skip . 2.3)) props) + )) + (interpret-markup layout entries + (make-column-markup + (map (lambda (arg) + (markup arg)) + (reverse args)))))) + + +%%% +%%% Instruments +%%% + +ViolinSolo = \relative c' { + + \voiceOne + + \set Score.markFormatter = #format-mark-box-numbers + \override Score.VoltaBracket #'font-name = #"sans" + \override Score.VoltaBracket #'extra-offset = #'(0 . 1) + \override SpacingSpanner #'uniform-stretching = ##t + + + %% Measure 1 + \time 25/8 + \mark \default + r2 ^\markup \colmark { \italic "fatigué" " " \bold "lentement"} r4 r r8 + << + { \shift d2 \glissando ^\markup \colmark { \quatre \dubetc \svib } \shifta e1 } \\ + { d2 \open \mf \< ~ \aniente d1 \! \> r4 r ^\markup \colmark { " " \fermaTa } \! } + >> + + + %% Measure 2 + \time 7/4 + \set Score.repeatCommands = #'((volta "1) n. 2) s.p.")) + << + { \shift d2 \glissando ^\markup \colmark { \quatre \udbetc } \shifta e1 } \\ + { d2 \open \mf \< ~ d1 \! \> ~ d4 ^\markup \colmark { " " \fermaTa } \! } + >> + \set Score.repeatCommands = #'((volta #f)) + + + %% Measure 3 + \time 15/4 + << + { \shift d2 \glissando ^\markup \colmark { \quatre \dubetc \pvib \norm } \shifta e1 \glissando d2 } \\ + { d2 \open \mf \< ~ d1 ~ d2 \ff ~ d1 \> ~ d2 ^\markup \colmark { " " " " \svib } ~ d4 \pp} + >> + \break + + %% Measure 4 + \time 4/4 + \stemUp + \tupletDown + \times 2/3 { d4 ^\markup \colmark { \quatre \db \accel } d d } + \times 2/3 { d4 ^\markup \colmark { " " \db " " \sulp } d d } + + + + %% Measure 5 + \time 5/4 + \tupletbp \times 2/3 { d8 \mf \< ^\markup \colmark { \quatre \db \norm } d _\open d } + \tupletbp \times 2/3 { d8 ^\markup \colmark { " " \db \sulp } d _\open d } + \tupletbp \times 2/3 { d16 ^\markup \colmark { " " \db \norm } d _\open d d d _\open d } + d2 \ff ^\markup \colmark { " " \pvib } \> + + + %% Measure 6 + \time 5/8 + \once \override Beam #'grow-direction = #RIGHT % \featherDurations #(ly:make-moment 2 3) + { d16 \staccato + [ d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato] + } + \break + + + %% Measure 7 + \time 7/4 + \tupletbp \times 2/3 { d16 ^\markup \colmark { \quatre } d _\open d d d _\open d } + \tupletbp \times 2/3 { d8 ^\markup \colmark { " " \db } d _\open d } + \tupletbp \times 2/3 { d8 ^\markup \colmark { " " \db " " \sulp } d _\open d } + \times 2/3 { d4 ^\markup \colmark { \quatre \db \ritar \norm } d d } + \times 2/3 { d4 ^\markup \colmark { " " \db " " \sulp } d d \ppp ~ } + + + %% Measure 8 + d4 ^\markup \colmark { " " " " \pvib \norm } + deh2 d dih \< + + + %% Measure 9 + << + { \shift d2 \glissando ^\markup \colmark { \quatre } \shifta e1 } \\ + { d2 \open ~ d1 ^\markup \colmark { " " " " \mvib } } + >> + \breathe r4 \! + +} + + +%%% +%%% Score +%%% + +\score { + + << + \relative << + \new Staff \ViolinSolo + >> + + \override Score.Rest #'transparent = ##t + \set Score.defaultBarType = "empty" + >> + + \layout { + indent = 0.0 + \context { + \Staff + \remove "Time_signature_engraver" + } + \context { + \Score + \remove "Bar_number_engraver" + } + } +} diff --git a/Documentation/included/wind-headword.ly b/Documentation/included/wind-headword.ly new file mode 100644 index 0000000000..6d8fa0a27b --- /dev/null +++ b/Documentation/included/wind-headword.ly @@ -0,0 +1,46 @@ +\version "2.12.0" +#(set-global-staff-size 15) +\paper { + line-width = 16\cm + indent = 0\cm +} + +% NR 2.whatever Wind + +% Tchaikovsky +% Nutcracker Suite, VII Dance of the Merlitons +\score { + \new StaffGroup << + \new Staff \relative c'' { + \set Staff.instrumentName = "Flauto I,II" + \once \override Score.RehearsalMark #'self-alignment-X = #-1 + \once \override Score.RehearsalMark #'break-align-symbols = +#'(time-signature) + \once \override Score.TimeSignature +#'break-align-anchor-alignment = #LEFT + \once \override Score.RehearsalMark #'padding = #4 + \mark \markup \large \bold {Moderato assai} + \key d \major + \time 2/4 + \compressFullBarRests + R2*2 + 16-.\p -. -. -. 8-. -. + -.\< 32( 4--)\mf + 16-. -. -. -. + (\> ) -. -.\! + 4--\sf \acciaccatura {8} 4--\mf + } + \new Staff \relative c' { + \set Staff.instrumentName = "Flauto III" + \key d \major + \time 2/4 + \compressFullBarRests + R2*2_\markup{Gr.Fl.} + fis16-.\p e-. fis-. e-. fis8-. e-. + g8-.\< fis32( a d fis a4--)\mf + b16-. a-. b-. a-. g(\> fis) d-. a-.\! + g4--\sf \acciaccatura fis'8 g4--\mf + } + >> +} + diff --git a/input/GNUmakefile b/input/GNUmakefile index 8191ba5f5a..aaa3954761 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -1,6 +1,6 @@ depth = .. -SUBDIRS = regression tutorial mutopia manual +SUBDIRS = regression tutorial mutopia examples = typography-demo les-nereides wilhelmus proportional bach-schenker cary diff --git a/input/manual/GNUmakefile b/input/manual/GNUmakefile deleted file mode 100644 index 6ba37af6fc..0000000000 --- a/input/manual/GNUmakefile +++ /dev/null @@ -1,9 +0,0 @@ -depth = ../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES= README -EXTRA_DIST_FILES+=$(call src-wildcard,*.ly) -EXTRA_DIST_FILES+=$(call src-wildcard,*.ily) - -include $(depth)/make/stepmake.make diff --git a/input/manual/README b/input/manual/README deleted file mode 100644 index f6e3131efb..0000000000 --- a/input/manual/README +++ /dev/null @@ -1,5 +0,0 @@ -This is for large examples that are included in the manual. Most of these -examples are distinct snippets; files that are also included in the -regression tests should be copied from input/regression/ into this -direction and listed here. - diff --git a/input/manual/ancient-headword.ly b/input/manual/ancient-headword.ly deleted file mode 100644 index 3b1136e989..0000000000 --- a/input/manual/ancient-headword.ly +++ /dev/null @@ -1,135 +0,0 @@ -\version "2.12.0" - -#(set-global-staff-size 15) -\paper{ - ragged-right=##t - line-width=17\cm - indent=0\cm -} - -\layout { - \context { \Score - \override PaperColumn #'keep-inside-line = ##t - \override NonMusicalPaperColumn #'keep-inside-line = ##t - } -} - -\include "gregorian.ly" - -\score { - << - \new VaticanaVoice = "cantus" { - \clef "vaticana-do3" - % Verse 1 — Salve, Regína - a\melisma \[ a \flexa g \pes a\melismaEnd \] d - \divisioMinima - \[ a\melisma \flexa g\melismaEnd \] - \[ f\melisma \flexa e f \pes g \flexa f\melismaEnd \] - \[ e\melisma \flexa d\melismaEnd \] - \divisioMaior - c d \[d\melisma \flexa c\melismaEnd \] d - \[ e\melisma \pes f\melismaEnd\] g - \[d\melisma \pes e \flexa c\melismaEnd \] d - \finalis - % Verse 2 — Vita, dulcédo - % a\melisma \[ a \flexa g \pes a\melismaEnd \] d - % \divisioMinima - % \[ a\melisma \flexa g\melismaEnd \] - % \[ f\melisma \flexa e f \pes g \flexa f\melismaEnd \] - % \[ e\melisma \flexa d\melismaEnd \] - % \divisioMaior - % c d \[e\melisma \pes f\melismaEnd \] g - % \[d\melisma \pes e \flexa c\melismaEnd \] d - % \finalis - % Verse 3 — Ad te clamámus - \[ d\melisma \pes f\melismaEnd\] a g - \[ g\melisma \flexa f \pes a\melismaEnd\] e - \divisioMaior - g f \[ e\melisma \flexa d \pes g\melismaEnd \] - \divisioMinima - c d \[ e\melisma \flexa d \pes g\melismaEnd \] - \[ f\melisma \flexa e\melismaEnd \] d - \finalis - % Verse 4 — Ad te suspirámus - \[ d\melisma \pes f\melismaEnd \] a c' g - \[ g\melisma \flexa f \pes g\melismaEnd \] a - \divisioMaior - d \[ f\melisma \pes \deminutum g\melismaEnd \] g d - \[ \virga f\melisma \inclinatum e \inclinatum d\melismaEnd \] - c \divisioMaior - d \[ d\melisma \flexa c \pes f\melismaEnd \] - \[ g\melisma \pes a\melismaEnd \] - g \[ f\melisma \flexa e\melismaEnd \] g - \[ f\melisma \flexa \deminutum e\melismaEnd \] - \[ d\melisma \flexa c \pes d\melismaEnd \] - \finalis - % Verse 5 — Eia ergo, Advocáta nostra - f\melisma \[ f \pes g\melismaEnd \] f - \[ g\melisma \pes \deminutum a\melismaEnd \] a - \divisioMinima - c' g \[ \virga a\melisma \inclinatum g \inclinatum f\melismaEnd \] d g a - \divisioMaior - d' d' \[ c'\melisma \flexa b c' \pes d'\melismaEnd \] a - \divisioMinima - d' c' a \[ g\melisma \flexa f \pes a\melismaEnd \] g - \[ d\melisma \pes e\melismaEnd \] f - \[ \virga e\melisma \inclinatum d \inclinatum c\melismaEnd \] - \divisioMaior - \[ c\melisma \pes d\melismaEnd \] - f \[ g\melisma \flexa \deminutum f\melismaEnd \] - \[ d\melisma \flexa c \pes d\melismaEnd \] d - \finalis - % Verse 6 — Et Jesum - d a, \[ c\melisma \pes d\melismaEnd \] - \divisioMinima - d \[ d\melisma \pes e\melismaEnd \] \[ e\melisma \flexa d d\melismaEnd \] - c g f \[ e\melisma \flexa \deminutum d\melismaEnd \] g - \[ f\melisma \flexa e\melismaEnd \] - \[ d\melisma \flexa c \pes d\melismaEnd \] - \[ d\melisma \pes a \] \virga bes\melismaEnd a - \divisioMinima - \[ \virga a\melisma \inclinatum g \inclinatum f\melismaEnd \] g d f - \[ f\melisma \flexa e\melismaEnd \] \[ d\melisma \flexa c\melismaEnd \] - \divisioMinima - \[ e\melisma \pes f \flexa e\melismaEnd \] d d - \finalis - % Verse 7 ad finem — O clemens: O pia: O dulcis Virgo María - a\melisma \[a \flexa g a \quilisma b \pes c'\melismaEnd \] - \[ \virga b\melisma \inclinatum a \inclinatum g\melismaEnd \] a - \finalis - \[ g\melisma \pes a \quilisma b \pes c' \] \[ c' \flexa b\melismaEnd \] - \[ a\melisma \flexa g\melismaEnd \] \[ g\melisma \pes a\melismaEnd \] - \finalis - \[ a\melisma \flexa d \virga f \inclinatum e \inclinatum d \inclinatum c d \] - \divisioMinima - \[ d \pes e f \pes g\melismaEnd \] - \[ g\melisma \flexa \deminutum f\melismaEnd \] - \[ g\melisma \pes a\melismaEnd \] - d c d \[ d\melisma \pes g \flexa f f\melismaEnd \] - \[ e\melisma \flexa d\melismaEnd \] - \finalis - } - \new Lyrics \lyricsto "cantus" { - Sal- ve, Re- gí- na, ma- ter mi- se- ri- cór- di- ae: - % Vi- ta, dul- cé- do, et spes no- stra, sal- ve. - Ad te cla- má- mus, éx- su- les, fi- li- i He- vae. - Ad te su- spi- rá- mus, ge- mén- tes et flen- tes in hac la- cri- má- rum - val- le. - E- ia er- go, Ad- vo- cá- ta no- stra, il- los tu- os mi- se- ri- cór- des - ó- cu- los ad nos con- vér- te. - Et Je- sum, be- ne- díc- tum fruc- tum ven- tris tu- i, no- bis post hoc - ex- sí- li- um os- tén- de. - O cle- mens: - O pi- a: - O dul- cis Vir- go Ma- rí- a. - } - >> -} - -\layout { - \context { - \Staff - \consists Custos_engraver - } -} - diff --git a/input/manual/chord-names-jazz.ly b/input/manual/chord-names-jazz.ly deleted file mode 100644 index ccd42c54b7..0000000000 --- a/input/manual/chord-names-jazz.ly +++ /dev/null @@ -1,152 +0,0 @@ -\version "2.12.0" -\header { - -texidoc = " Chord names are generated from a list pitches. The -functions which construct these names can be customised. Here are shown -Jazz chords, following Ignatzek (pp. 17-18, 1995) and -an alternative Jazz chord notation. - -Chords following Banter (1987) can also be printed from this file, but -are turned off for brevity. - -" - -} - -chs = \transpose c' c' -{ - 1 - % m = minor triad - - \break - - - % triangle = maj - - \break - - - - \break - % 6 = major triad with added sixth - % m6 = minor triad with added sixth - - \break - - - - \break - - - - \break - - - - \break - - - - \break - - - - \break - - - - \break - - % add9 - -} - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% alternate Jazz notation - -efullmusicJazzAlt = -{ - 1-\markup { "+" } - -\markup { \normal-size-super - % \override #'(font-family . math) "N" } - \override #'(font-family . math) "M" } - %%c:3.5.7 = \markup { \override #'(font-family . math) "M" } - %%c:3.5.7 = \markup { \normal-size-super "maj7" } - - -\markup { \super "o" } % should be $\circ$ ? - -\markup { \super \combine "o" "/" } - -\markup { \super "o7" } -} - -efullJazzAlt = #(sequential-music-to-chord-exceptions efullmusicJazzAlt #f) - -epartialmusicJazzAlt = { - 1-\markup { \normal-size-super "2" } - -\markup { "m" } - -\markup { \normal-size-super "sus4" } - -\markup { \normal-size-super "5" } - - %% TODO, partial exceptions - -\markup { "m" }-\markup { \normal-size-super "sus4" } - -\markup { "m" }-\markup { \normal-size-super "sus2" } -} - -epartialJazzAlt = #(sequential-music-to-chord-exceptions epartialmusicJazzAlt #f) - -jazzAltProperties = \sequential { - \set majorSevenSymbol = #whiteTriangleMarkup - \set chordNameSeparator = #(make-simple-markup "/") - \set chordNameExceptionsFull = #efullJazzAlt - \set chordNameExceptionsPartial = #epartialJazzAlt - \set chordNameFunction = #jazz-chord-names -} - -banterProperties = \sequential { - \set chordNameFunction = #banter-chord-names -} - -\score{ - << - \new ChordNames { - \set instrumentName = #"Ignatzek (default)" - \set shortInstrumentName = #"Def" - \chs - } - - \new ChordNames { - \jazzAltProperties - \set instrumentName = #"Alternative" - \set shortInstrumentName = #"Alt" - \chs - } - -%{ - - %% This is the Banter (1987) style. It gives exceedingly - %% verbose (wide) names, making the output file take up to 4 pages. - %% (FIXME: how big is is now?) - %% Turned off by default. - - %% FIXME: use smaller font for Banter (or remove some esoteric - %% chords). - - \new ChordNames { - \banterProperties - \set instrumentName = #"Banter" - \set shortInstrumentName = #"Ban" - \chs - } -%} - - \new Staff \transpose c c' { \chs } - >> - \layout { - indent = 3.\cm - \context { - \ChordNames - \consists Instrument_name_engraver - } - } -} - diff --git a/input/manual/chord-names-languages.ly b/input/manual/chord-names-languages.ly deleted file mode 100644 index e446afa4fb..0000000000 --- a/input/manual/chord-names-languages.ly +++ /dev/null @@ -1,47 +0,0 @@ -\version "2.12.0" -\header { - texidoc = "@cindex Chord Names German -The english naming of chords (default) can be changed to german -(@code{\germanChords} replaces B and Bes to H and B), semi-german -(@code{\semiGermanChords} replaces B and Bes to H and Bb), italian -(@code{\italianChords} uses Do Re Mi Fa Sol La Si), or french -(@code{\frenchChords} replaces Re to Ré). - -" } - -scm = \chordmode { - e1/d c:m - % c/c cis/cis - % yeah, we get the idea. -hwn - - % cisis/cisis ces/ces ceses/ceses - b/b bis/bis bes/bes - % beses/beses -} - - -\layout { - ragged-right = ##t - \context {\ChordNames \consists Instrument_name_engraver } -} - -<< - \new ChordNames { - \set instrumentName = #"default" - \scm - } - \new ChordNames { - \set instrumentName = #"german" - \germanChords \scm } - \new ChordNames { - \set instrumentName = #"semi-german" - \semiGermanChords \scm } - \new ChordNames { - \set instrumentName = #"italian" - \italianChords \scm } - \new ChordNames { - \set instrumentName = #"french" - \frenchChords \scm } - - \context Voice { \scm } ->> diff --git a/input/manual/chords-headword.ly b/input/manual/chords-headword.ly deleted file mode 100644 index f8a661fd71..0000000000 --- a/input/manual/chords-headword.ly +++ /dev/null @@ -1,101 +0,0 @@ -\version "2.12.0" -#(set-global-staff-size 15) -\paper{ - ragged-right=##f - line-width=15\cm - indent=0\cm -} - -\layout { - \context { \Score - \override PaperColumn #'keep-inside-line = ##t - \override NonMusicalPaperColumn #'keep-inside-line = ##t - } -} - -theChords = \chordmode { - \time 2/2 - f1 | c2 f2 | f1 | c2 f2| %\break - f2 bes2 | f1 | c2:7 f | c1 | \break -} - -verseOne = \lyricmode{ - \set stanza = "1. " - Fair is the sun - shine, - Fair - er the moon - light - And all the stars __ _ in heav'n a -- bove; -} - -verseTwo = \lyricmode{ - \set stanza = "2. " - Fair are the mead - ows, - Fair - er the wood - land, - Robed in the flow -- ers of bloom -- ing spring; -} - -Soprano = { - \time 2/2 - \key f \major - \stemUp - f'2 f'4 f' | g'4 e' f'2 | a'4. a'8 a'4 a' | bes'4 g' a'2 | -c''2 f''4 d'' | c''2 bes'4 a' | bes'2 a' | g'1 | -} - -Alto = { - \key f \major - c'2 c'4 c' | d'4 c' c'2 | f'4. f'8 f'4 fis' | g'4 e' f'2 | - f'2 f'4 f' | f'2 g'4 f' | e'2 f' | e'1 | -} - -Tenor = { - \key f \major - \stemDown - a2 a4 a | bes4 g a2 | c'4. c'8 d'4 d' | d'4 c' c'2 | - a2 d'4 bes | a2 c'4 c' | c'2 c' | c'1 | -} - -Bass = { - \key f \major - f2 f4 f | bes,4 c f2 | f4. e8 d4 c | bes,4 c f2 | - f2 bes,4 d | f2 e4 f | g2 f | c1 | -} - - -\score { - << - \new ChordNames { \theChords } - \context Staff = upper { - \context Voice = sop { - << - \Soprano - \Alto - >> - } - } - \context Lyrics="LyrOne" \lyricsto "sop" {\verseOne} - \context Lyrics="LyrTwo" \lyricsto "sop" {\verseTwo} - \context Staff = lower { - \new Voice { - \clef bass - #(set-accidental-style 'modern-cautionary) - << - \Tenor - \Bass - >> - } - } - >> - -\layout { - %between-system-space = 1\mm - indent = 0 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { \Staff - \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1) - } - } -} -\paper { } diff --git a/input/manual/display-predefined-fretboards.ly b/input/manual/display-predefined-fretboards.ly deleted file mode 100644 index bf2283db3c..0000000000 --- a/input/manual/display-predefined-fretboards.ly +++ /dev/null @@ -1,69 +0,0 @@ -\include "predefined-guitar-fretboards.ly" -\version "2.12.0" - - -mychords = \chordmode {c1 c:m c:aug c:dim c:7 c:maj7 c:m7 \break } - -chordsline = { - \mychords - \transpose c cis { - \mychords - } - \transpose c des { - \mychords - } - \transpose c d { - \mychords - } - \transpose c dis { - \mychords - } - \transpose c ees { - \mychords - } - \transpose c e { - \mychords - } - \transpose c f { - \mychords - } - \transpose c fis { - \mychords - } - \transpose c ges { - \mychords - } - \transpose c g { - \mychords - } - \transpose c gis { - \mychords - } - \transpose c aes { - \mychords - } - \transpose c a { - \mychords - } - \transpose c ais { - \mychords - } - \transpose c bes { - \mychords - } - \transpose c b { - \mychords - } -} - -<< - \context ChordNames { - \chordsline - } - \context FretBoards { - \chordsline - } - \context Staff { - \chordsline - } ->> diff --git a/input/manual/divisiones.ly b/input/manual/divisiones.ly deleted file mode 100644 index 6307c9ac8c..0000000000 --- a/input/manual/divisiones.ly +++ /dev/null @@ -1,42 +0,0 @@ -% possible rename to ancient- or gregorian- ? -\header { - texidoc = "@cindex Divisiones - -Divisiones are ancient variants of breathing signs. -Choices are @code{divisioMinima}, @code{divisioMaior}, -@code{divisioMaxima} and @code{finalis}, @code{virgula} and -@code{caesura}. - -" } - -\version "2.12.0" - -\include "gregorian.ly" - -\score { - << - \context VaticanaVoice { - \override TextScript #'padding = #3 - g a g - s^\markup { "divisio minima" } - \divisioMinima - g a g - s^\markup { "divisio maior" } - \divisioMaior - g a g - s^\markup { "divisio maxima" } - \divisioMaxima - \break - g a g - s^\markup { "finalis" } - \finalis - g a g - s^\markup { "virgula" } - \virgula - g a g - s^\markup { "caesura" } - \caesura - g a g - } - >> -} diff --git a/input/manual/editorial-headword.ly b/input/manual/editorial-headword.ly deleted file mode 100644 index b834181f48..0000000000 --- a/input/manual/editorial-headword.ly +++ /dev/null @@ -1,101 +0,0 @@ -\version "2.12.0" -\include "english.ly" -#(set-global-staff-size 15) -\paper{ - ragged-right=##t - line-width=17\cm - indent=0\cm -} - -\layout { - \context { \Score - \override PaperColumn #'keep-inside-line = ##t - \override NonMusicalPaperColumn #'keep-inside-line = ##t - } -} - -% NR 1.7 Editorial annotations - -% Beethoven, Op. 31, No. 3 -% Piano sonata 18, Movt II, Scherzo -% Measures 9 - 14 - -\layout { } - -\new PianoStaff << - - % RH Staff - \new Staff { - \clef treble - \key af \major - \time 2/4 - \set Staff.fingeringOrientations = #'(up up) - \set Score.currentBarNumber = #9 - \partial 8 - 8 \staccato - | - \set doubleSlurs = ##t - 4 ( - 8 \staccato ) - \noBeam - c''8-5 \staccato \pp - | - \set doubleSlurs = ##f - bf'8.. ( - af'32 - g'8 ) \staccato - f'8 \staccato - | - e'4-2 - r8 - \once \override Script #'script-priority = #-100 - \afterGrace - f'8 ( \trill ^ \markup { \finger "3-2" } - { e'16 [ f'16 ] } - | - g'8..-3 - f'32 - e'8-1 ) \staccato - d'8-2 \staccato - | - c'4 - r4 - } - - % LH Staff - \new Staff { - \key af \major - \clef treble - \override Fingering #'direction = #down - \set Staff.fingeringOrientations = #'(down down) - \partial 8 - 8 \staccato - \set doubleSlurs = ##t - 4 ( - 8 ) \staccato - \noBeam - \clef bass - c'8-1 \staccato - | - \set doubleSlurs = ##f - bf8.. ( - af32 - g8-1 ) \staccato - f8 \staccato - | - e4 - r8 - \afterGrace - f8 ( \trill _ \markup { \finger "2-1" } - { e16 [ f16 ] } - | - g8..-1 - f32 - e8 ) \staccato - d8 \staccato - | - c4 - r4 - } - ->> diff --git a/input/manual/engraver-example.ily b/input/manual/engraver-example.ily deleted file mode 100644 index f099874d3b..0000000000 --- a/input/manual/engraver-example.ily +++ /dev/null @@ -1,37 +0,0 @@ -%% texidoc = "Include file for engraver example." -\version "2.11.61" -topVoice = \relative c' { - \key d\major - es8([ g] a[ fis]) - b4 - b16[-. b-. b-. cis-.] - d4-> -} - -botVoice = \relative c' { - \key d\major - c8[( f] b[ a)] - es4 - es16[-. es-. es-. fis-.] - b4-> -} - -hoom = \relative c { - \key d \major - \clef bass - g8-. r - r4 - fis8-. - r8 - r4 - b'4-> -} - -pah = \relative c' { - r8 b-. - r4 - r8 g8-. - r16 g-. r8 - \clef treble - fis'4-> -} diff --git a/input/manual/expressive-headword.ly b/input/manual/expressive-headword.ly deleted file mode 100644 index ed62f91ee1..0000000000 --- a/input/manual/expressive-headword.ly +++ /dev/null @@ -1,263 +0,0 @@ -\version "2.12.0" -\include "english.ly" -#(set-global-staff-size 15) -\paper { - line-width = 16\cm - indent = 0\cm -} - -% NR 1.3 Expressive marks - -% L. v. Beethoven, Op. 49 no. 1 -% Piano sonata 19 - "Leichte Sonate" -% measures 1 - 12 - -%\layout { -% \context { -% \Score -% \override SpacingSpanner #'base-shortest-duration = -% #(ly:make-moment 1 20) -% } -%} - -\new PianoStaff << - - % RH Staff - \new Staff { - \clef treble - \key g \major - \time 6/8 - \partial 2 - \once \override TextScript #'staff-padding = #2 - d'8 \staccato - ^ \markup { \column { - RONDO - \italic Allegro } } - d'8 \staccato - g'8 \staccato - a'8 \staccato - - | - - b'8 [ ( - g'8 ] ) - e'8 \staccato - e' \staccato - a'8 \staccato - b'8 \staccato - - | - - c''8 [ ( - a'8 ] ) - e''8 \staccato - d''8 \staccato - c''8 \staccato - b'8 \staccato - - | - - a'8 \staccato - g'8 \staccato - a'8 \staccato - \acciaccatura { g'16 [ a'16 ] } - bf'8 - a'8 \staccato - g'8 \staccato - - | - - fs'8 [ ( - d'8 ] ) - d'8 \staccato - d'8 \staccato - g'8 \staccato - a'8 \staccato - - | - - b'8 [ ( - g'8 ] ) - e'8 \staccato - e'8 \staccato - a'8 \staccato - b'8 \staccato - - | - - c''8 [ ( - a'8 ] ) - e''8 \staccato - d''8 \staccato - c''8 \staccato - b'8 \staccato - - | - - a'8 \staccato - g'8 \staccato - a'8 \staccato - << - { - \voiceOne - d'8 - g'8 - fs'8 - \oneVoice - } - \new Voice { - \voiceTwo - d'4 - c'8 - \oneVoice - } - >> - - | - - 4 \tenuto - d'8 \staccato - g'8 \staccato - b'8 \staccato - d''8 \staccato - - | - - d''8 ( - 8 \staccato ) - 8 \staccato - d''8 ( - 8 \staccato ) - 8 \staccato - - | - - d''8 ( - 8 \staccato ) - 8 \staccato - d''8 ( - 8 \staccato ) - 8 \staccato - - | - - d''8 \staccato - 8 \staccato - 8 \staccato - d'' \staccato - 8 \staccato - 8 \staccato - - | - - 4 \fermata - r8 r4 r8 - } - - % LH Staff - \new Staff { - \clef bass - \key g \major - \time 6/8 - \partial 2 - r8 - r8 - 8 \staccato - 8 \staccato - - | - - 4 - r8 - r8 - 8 \staccato - 8 \staccato - - | - - 4 - r8 - r8 - 8 \staccato - 8 \staccato - - | - - 8 \staccato - 8 \staccato - 8 \staccato - 4. ( - - | - - d'4 ) - r8 - r8 - 8 \staccato - 8 \staccato - - | - - 4 - r8 - r8 - 8 \staccato - 8 \staccato - - | - - 4 - r8 - r8 - 8 \staccato - 8 \staccato - - | - - 8 \staccato - 8 \staccato - 8 \staccato - 4 - 8 \staccato - - | - - 4 \tenuto - r8 - r4 - r8 - - | - - r8 - 8 \staccato - 8 \staccato - r8 - 8 \staccato - 8 \staccato - - | - - r8 - 8 \staccato - 8 \staccato - r8 - 8 \staccato - 8 \staccato - - | - - r8 - 8 \staccato - 8 \staccato - r8 - 8 \staccato - 8 \staccato - - | - - 4 \fermata - r8 r4 r8 - } - ->> diff --git a/input/manual/figured-bass-headword.ly b/input/manual/figured-bass-headword.ly deleted file mode 100644 index 8f666920c0..0000000000 --- a/input/manual/figured-bass-headword.ly +++ /dev/null @@ -1,117 +0,0 @@ -\version "2.12.0" -#(set-global-staff-size 15) -\paper{ - ragged-right=##f - line-width=16\cm - indent=1.5\cm -} - -\layout { - \context { \Score - \override PaperColumn #'keep-inside-line = ##t - \override NonMusicalPaperColumn #'keep-inside-line = ##t - } -} - -% NR 2.7.3 Figured bass - -% Arcangelo Corelli, 12 Sonate da Camera, Op. 2 -% Sonata II, Allemanda -% measures 1 - 88 -% Coded by Neil Puttock; modified by Carl Sorensen - -extendOn = \bassFigureExtendersOn -extendOff = \bassFigureExtendersOff - -\score { - - \new StaffGroup << - - \new GrandStaff << - - \new Staff = "violinoI" { - \set Staff.instrumentName = \markup { - \hcenter-in #11 - \line { Violino I. } - } - \time 4/4 - \mark \markup { \italic Adagio. } - \partial 8 - r16 a'16 | - a'8. [ d''16 d''8. e''16 ] cis''8 a'4 a''16 bes''16 | - cis''8 d''16 ( e'' ) e''8. d''16 d''4 r8 d''16 e''16 | - f''8 f''4 g''16 ( f''16 ) e''8 e''4 f''16 ( e''16 ) | - d''8. d''16 g''16 ( f''16 ) e''16 ( d''16 ) cis''8 - cis''4 cis''16 cis''16 | - d''8 d''8 c''8. c''16 c''8 ( b'4 ) b'16 b'16 | - c''8 c''8 bes'8. bes'16 bes'8 ( a'4 ) a''16 a''16 | - a''8 g''8 g''8. g''16 g''8 ( f''8 ) r8 f''8 | - } - - \new Staff = "violinoII" { - \set Staff.instrumentName = \markup { - \hcenter-in #11 - \line { Violino II. } - } - \time 4/4 - \partial 8 - r16 f'16 | - f'8. g'16 g'4 a'4 r8 d''16 d''16 | - e''8 a'8 cis''8. d''16 d''4 r8 f''16 g''16 | - a''8 a''8 d''8. d''16 g'8 g'8 c''8. c''16 | - f'8. f''16 bes''16 ( a''16 ) g''16 ( f''16 ) e''8 e''4 e''16 e''16 | - a'8 fis''8 g''8 a''8 d''8 d''4 d''16 d''16 | - g'8 e''8 f''8 g''8 c''8 c''4 cis''16 cis''16 | - d''8 d''8 e''8. e''16 e''8 a'8 r8 d''8 | - } - - >> - - \new Staff = "violone" { - \set Staff.instrumentName = \markup { - \hcenter-in #13 { - \center-column { - Violone, - \line { e Cembalo. } - } - } - } - \time 4/4 - \clef bass - \partial 8 - r16 d16 | - d4 bes,4 a,4 f4 | - g8 f16 g16 a8 a,8 d4 d'4 ~ | - d'8 c'8 b4 c'8 c'16 bes16 a4 | - bes8 bes16 a16 g4 a8 a,4 a16 g16 | - fis8 d8 e8 fis8 g8 g,4 g16 f16 | - e8 c8 d8 e8 f8 f,4 a,8 | - b,4 cis4 d4 r8 d'8 | - } - - \new FiguredBass \figuremode { - \set figuredBassAlterationDirection = #RIGHT - \set figuredBassPlusDirection = #RIGHT - \override VerticalAxisGroup #'minimum-Y-extent = #'() - \override BassFigureAlignment #'stacking-dir = #DOWN - s8 | - s4 <6>4 <_+>4 <6>4 | - <6 4\+ 2>8 <6>8 <_+> s8 s2 | - <5>8 <6 4>8 <6 5>4 s4 <5>8 <6>8 | - s4 <6 5 _-> <_+>2 | - <6>8 <_+>8 <6>8 <6 5>8 <5 4>8 \extendOn <5 _!>8 \extendOff s4 | - <6>4 <6->8 <6 5->8 <5 4->8 \extendOn <5 3>4 \extendOff <5 _+>8 | - <7>8 <6>8 <5>4 <9 4>8 <8 3>8 s4 | - } - - >> - - \layout { - \context { - \Score - \override RehearsalMark #'break-align-symbols = #'(time-signature) - \override RehearsalMark #'self-alignment-X = #LEFT - \override TimeSignature #'break-align-anchor-alignment = #LEFT - } - } -} diff --git a/input/manual/font-table.ly b/input/manual/font-table.ly deleted file mode 100644 index b468deb016..0000000000 --- a/input/manual/font-table.ly +++ /dev/null @@ -1,224 +0,0 @@ -#(set-global-staff-size 16) - -#(begin - - ;; some helper functions - - (define (filter-out pred lst) - (filter (lambda (x) (not (pred x))) lst)) - - (define (filter-out-group glyph-list substring) - (filter-out (lambda (x) (string-contains x substring)) glyph-list)) - - (define (filter-out-groups glyph-list . substrings) - (let loop ((new glyph-list) (rem substrings)) - (if (null? rem) - new - (loop (filter-out-group new (car rem)) - (cdr rem))))) - - (define (get-group glyph-list substring) - (filter (lambda (x) (string-contains x substring)) glyph-list)) - - (define glyph-list - (delete ".notdef" - (ly:otf-glyph-list (ly:system-font-load "emmentaler-20")))) - - ;;;;;;;;; - - ;; define these 3 groups first since they're - ;; harder to get with (get-groups ...) - (define numbers - '("plus" "comma" "hyphen" "period" - "zero" "one" "two" "three" "four" - "five" "six" "seven" "eight" "nine")) - - (define default-noteheads - '("noteheads.uM2" "noteheads.dM2" "noteheads.sM1" - "noteheads.s0" "noteheads.s1" "noteheads.s2")) - - (define dynamics - '("space" "f" "m" "p" "r" "s" "z")) - - ;; remove them from the glyph-list - (for-each - (lambda (x) (set! glyph-list (delete x glyph-list))) - (append numbers - default-noteheads - dynamics)) - - ;;;;;;;;; - - ;; extract ancient-music groups before extracting default - ;; accidentals, rests, etc. to prevent duplication. - (define vaticana (get-group glyph-list "vaticana")) - (define medicaea (get-group glyph-list "medicaea")) - (define hufnagel (get-group glyph-list "hufnagel")) - (define neomensural (get-group glyph-list "neomensural")) - - ;; remove neomensural before defining mensural; otherwise, searching - ;; for "mensural" would return "neomensural" matches too. - (set! glyph-list - (filter-out-groups - glyph-list - "vaticana" - "medicaea" - "hufnagel" - "neomensural")) - - ;; get the rest of the ancient-music groups - (define mensural (get-group glyph-list "mensural")) - (define petrucci (get-group glyph-list "petrucci")) - (define solesmes (get-group glyph-list "solesmes")) - - ;; remove them from the glyph-list - (set! glyph-list - (filter-out-groups - glyph-list - "mensural" - "petrucci" - "solesmes")) - - ;; This would only get "rests.2classical". - ;; We're leaving it with the other rests for now. - ;; (define classical (get-group glyph-list "classical")) - ;; (set! glyph-list (filter-out-groups glyph-list "classical")) - - ;;;;;;;;; - - ;; get everything else except noteheads. - ;; * Some accidentals contain "slash" substring, so extract - ;; "accidentals" before extracting "slash" (noteheads). - ;; * Also use "pedal." not "pedal", for example, to prevent things - ;; like "scripts.upedalheel" ending up in the "pedal." list. - ;; * This doesn't apply to the ancient stuff because searching for - ;; "vaticana." (as an example) would miss things like - ;; "dots.dotvaticana" - (define clefs (get-group glyph-list "clefs.")) - (define timesig (get-group glyph-list "timesig.")) - (define accidentals (get-group glyph-list "accidentals.")) - (define rests (get-group glyph-list "rests.")) - (define flags (get-group glyph-list "flags.")) - (define dots (get-group glyph-list "dots.")) - (define scripts (get-group glyph-list "scripts.")) - (define arrowheads (get-group glyph-list "arrowheads.")) - (define brackettips (get-group glyph-list "brackettips.")) - (define pedal (get-group glyph-list "pedal.")) - (define accordion (get-group glyph-list "accordion.")) - - ;; remove them from the glyph-list - (set! glyph-list - (filter-out-groups - glyph-list - "clefs." - "timesig." - "accidentals." - "rests." - "flags." - "dots." - "scripts." - "arrowheads." - "brackettips." - "pedal." - "accordion.")) - - ;;;;;;;;; - - ;; get special noteheads - (define cross (get-group glyph-list "cross")) - (define diamond (get-group glyph-list "diamond")) - (define harmonic (get-group glyph-list "harmonic")) - (define slash (get-group glyph-list "slash")) - (define triangle (get-group glyph-list "triangle")) - (define xcircle (get-group glyph-list "xcircle")) - - (define special-noteheads - (append cross - diamond - harmonic - slash - triangle - xcircle)) - - ;; remove special noteheads from the glyph-list - (set! glyph-list - (filter-out-groups - glyph-list - "cross" - "diamond" - "harmonic" - "slash" - "triangle" - "xcircle")) - - ;; (lazy solution) - ;; any remaining glyphs containing "noteheads." should be shape-notes. - (define shape-note-noteheads (get-group glyph-list "noteheads.")) - - ;; remove shape-note-noteheads from the glyph-list - (set! glyph-list (filter-out-group glyph-list "noteheads.")) - - ;;;;;;;;; - - ;; simple debug test for any glyphs that didn't make it. - (if #f - (if (null? glyph-list) - (format #t "No glyphs are missing from the table.\n") - (format #t "You missed these glyphs: ~a\n" glyph-list))) - -) % end of (begin ...) - -\paper { - %% ugh. text on toplevel is a bit broken... - - oddHeaderMarkup = \markup {} - evenHeaderMarkup = \markup {} - oddFooterMarkup = \markup {} - evenFooterMarkup = \markup {} - } - -\version "2.12.0" - -#(define-markup-command (doc-char layout props name) (string?) - (interpret-markup layout props - (let* ((n (string-length name))) - (if (> n 24) - ;; split long glyph names near the middle at dots - (let* ((middle-pos (round (/ n 2))) - (left-dot-pos (string-rindex name #\. 0 middle-pos)) - (right-dot-pos (string-index name #\. middle-pos)) - (left-distance (if (number? left-dot-pos) - (- middle-pos left-dot-pos) - middle-pos)) - (right-distance (if (number? right-dot-pos) - (- right-dot-pos middle-pos) - middle-pos)) - (split-pos (if (> left-distance right-distance) - right-dot-pos - left-dot-pos)) - (left (substring name 0 split-pos)) - (right (substring name split-pos))) - (markup - #:pad-to-box '(0 . 36) '(-2 . 2) #:column (#:typewriter left - #:typewriter #:concat (" " right)) - #:pad-to-box '(-2 . 4) '(-3.5 . 3.5) #:huge #:musicglyph name)) - (markup - #:pad-to-box '(0 . 36) '(-2 . 2) #:typewriter name - #:pad-to-box '(-2 . 4) '(-3.5 . 3.5) #:huge #:musicglyph name))))) - -#(define-markup-list-command (doc-chars layout props names) (list?) - (define (min-length lst n) - "(min (length lst) n)" - (if (or (null? lst) (<= n 0)) - 0 - (1+ (min-length (cdr lst) (1- n))))) - (define (doc-chars-aux names acc) - (let* ((n (min-length names 2)) - (head (take names n)) - (tail (drop names n))) - (if (null? head) - (reverse! acc) - (doc-chars-aux tail - (cons (make-line-markup (map make-doc-char-markup head)) - acc))))) - (interpret-markup-list layout props (doc-chars-aux names (list)))) diff --git a/input/manual/fretted-headword.ly b/input/manual/fretted-headword.ly deleted file mode 100644 index f2d13ee0af..0000000000 --- a/input/manual/fretted-headword.ly +++ /dev/null @@ -1,145 +0,0 @@ -% INSPIRATIONAL HEADER FOR LILYPOND DOCUMENTATION fretted-strings % -% Passage from Johann Kaspar Mertz "Opern Revue, Op. 8, no. 17" % -% on melodies from Bellini's "Norma" % -%*****************************************************************% - -\version "2.12.0" - -#(set-global-staff-size 15) -\paper { - line-width = 17\cm - indent = 0\cm -} - -\layout { - \context { - \Score - \remove "Bar_number_engraver" - \override PaperColumn #'keep-inside-line = ##t - \override NonMusicalPaperColumn #'keep-inside-line = ##t - } -} - -%%%% shortcuts -% fingering orientations -sfol = \set fingeringOrientations = #'(left) -sfor = \set fingeringOrientations = #'(right) -sfod = \set fingeringOrientations = #'(down) -sfou = \set fingeringOrientations = #'(up) - -% string number orientations -ssnol = \set stringNumberOrientations = #'(left) %(down right up) -ssnou = \set stringNumberOrientations = #'(up) -ssnod = \set stringNumberOrientations = #'(down) -ssnor = \set stringNumberOrientations = #'(right) - -% define fingering offset -FO = #(define-music-function (parser location offsetX offsetY) (number? number?) -#{ - \once \override Voice.Fingering #'extra-offset = #(cons $offsetX $offsetY) -#}) - -% markups -rit = \markup \center-align { \bold { \italic { " rit." } } } -dim = \markup \center-align { \italic { " dim." } } -andantino = \markup \left-align { \italic { \bold { \fontsize #2.5 { "Andantino" } } } } -benmarcato = \markup { \italic { \bold { "il canto ben marcato" } } } -pdolce = #(make-dynamic-script (markup #:line (#:dynamic "p" #:normal-text #:italic "dol."))) - -%%% THE MUSIC %%% - -melody = \relative c { - \clef "treble_8" - \key d \major - \time 4/4 - \voiceOne - \sfol - e,32 a' c e - e, a c e - e,, a' c e - e, a c e - f4\rest 4-> | % m. 1 - - e,,,32 gis' b e - e, gis b e - e,, gis' b e - e, gis b e - f4\rest \FO #'0.4 #'0.5 4 | % m. 2 - - d4\rest -> d4\rest^\rit 4-> | % m. 3 - 1 | % m. 4 - - \bar "||" - \key a \minor - R1 % m. 5 - - e'4^\benmarcato e8. d16-4 - d4-4 \times 2/3 { \sfou \FO #'-0.3 #'0.6 4 b8 } | % end of m. 6 - - \FO #'-0.3 #'0.3 - 4 \times 2/3 { c4 b8 } a4 e'8. e16 | % m. 7 - - \FO #'-0.3 #'0.3 - 4 \times 2/3 { \sfol \FO #'0.3 #'0.0 4 e8 } e4 % beg of m. 8 - \times 2/3 { \sfou 4 c8 } | % end of m. 8 - - b4 \times 2/3 { d4-4 c8 } \sfou \FO #'-1.7 #'-1.5 4 e | % end of m. 9 - - e4 e8. d16-4 d4 \times 2/3 { c4 b8 } | % m. 10 - - \times 2/3 { a4 a8 b4 c8 } % beg of m. 11 - \sfou \FO #'-0.3 #'0.3 - 4^\< \times 2/3 { e4 8\! } | % end of m. 11 -} - -bass = \relative c { - \key d \major - \time 4/4 - \voiceTwo - - e,8\fp[ e'] e,[ e'] e, \sfol c, | % m. 1 - - e,,8\fp[ e'] e,[ e'] e, \sfod \FO #'0.2 #'-0.2 % beg m. 2 - \sfol \FO #'0.3 #'0.0 b | % end m. 2 - - e,,8 e' gis e e, e' gis_\dim e | % m. 3 - - e,1 | % m. 4 - - %% new section starts here in A minor - \overrideBeamSettings #'Score #'(4 . 4) #'end - #'((* . (1 1 1 1)) - ((1 . 12) . (3 3 3 3))) - \once \override TextScript #'staff-padding = #1.7 - \times 2/3 { a8\p^\andantino e' a c a e a, e' a c a e } | % m. 5 - - \times 2/3 { a,8\pdolce e' a c a e } % beg m. 6 - \times 2/3 { e,8 \sfou c gis e } | % end m. 6 - - \times 2/3 { a,8 a c e, b' a, e' a c a e } | % m. 7 - - \times 2/3 { f,8 f' a \sfol \FO #'0.3 #'-0.5 a f fis, d' a' d a d, } | % m. 8 - - \times 2/3 { 8 d' g d' g, d % beg m. 9 - \sfod \FO #'0.0 #'-2.0 \sfou b gis e } | % end m. 9 - - \times 2/3 { a,8 e' a c a e e, e' gis c gis e } | % m. 10 - - \times 2/3 { a,8 e' a b a e f, f' a d a f } | % m. 11 -} - -\score { - \new Staff = "guitar" << - \context Voice = "upper" { \melody } - \context Voice = "lower" { \bass } - >> - \layout { - \context { - \Score - \override Fingering #'staff-padding = #'() - \override TupletNumber #'stencil = ##f - \override TupletBracket #'bracket-visibility = ##f - } - } - \midi { } -} diff --git a/input/manual/keyboard-headword.ly b/input/manual/keyboard-headword.ly deleted file mode 100644 index 8793965d37..0000000000 --- a/input/manual/keyboard-headword.ly +++ /dev/null @@ -1,241 +0,0 @@ -\version "2.12.0" -\include "english.ly" - -#(set-global-staff-size 15) -\paper { - line-width = 16\cm - indent = 0\cm -} - -% NR 2.2 Keyboard instruments - -% M. Ravel, Sonatine (1905) -% First movement - -\layout { - \context { - \Score - \remove "Bar_number_engraver" - } -} - -fermataLong = \markup { - \override #'(direction . 1) - \override #'(baseline-skip . 2) { - \dir-column { - \musicglyph #"scripts.ufermata" - \text \italic \center-align long - } - } -} - -\new PianoStaff << - \set PianoStaff.connectArpeggios = ##t - \new Staff { - \time 2/4 - \key fs \major - << - \new Voice { - \voiceOne - fs''8 ( ^\markup { - \override #'(baseline-skip . 2.4) \column { - \line \bold { Un peu retenu } - \line \italic { très expressif } - } - } - es''16 - cs''16 - as'4 ) - | - fs''8 ( - es''16 - cs''16 - as'4 ) - | - fs''8 ( - es''16 - cs''16 - as'8 - cs''8 ) - | - } - \new Voice { - \voiceTwo - gs'8\rest \ppp - fs'4 ( - es'8 ) - | - gs'8\rest - fs'4 ( - es'8 ) - | - gs'8\rest - fs'4 ( - es'8 ) - | - } - >> - \clef bass - 4 ( ^ \markup \bold { Rall. } - \override Script #'stencil = #(lambda (grob) - ly:script::print (grob-interpret-markup grob fermataLong)) - 8 ) \fermata - \noBeam - \clef treble - \slurUp - \once \override Hairpin #'to-barline = ##f - 8 ( \pp \> - | - 4. \! ) ^\markup \bold { a Tempo } - \slurUp - 8 ^\( \> - | - 4. \! \) - << - \new Voice { - \voiceOne - 8 ( - | - cs'8 ^\markup \bold { Rallentando } - b16 - cs'16 - d'8 - e'16 - fs'16 - | - 4. ) - s8 - | - r8 - 4 \arpeggio - e''16 ( ^\markup \bold { Lent } - fs''16 - | - \voiceTwo - 2 ) - | - } - \new Voice { - \voiceTwo - s8 - | - 4 \< - 4 \> - | - s4. \! - \slurUp - \once \override Script #'direction = #UP - 8 ( \accent - | - 4. ) - \once \override Hairpin #'to-barline = ##f - 8 \ppp \> - | - s8 \! - \stemDown - \once \override Script #'direction = #UP - \ottava #1 - \voiceOne - \once \override PianoStaff.Arpeggio #'padding = #0.8 - 4. \arpeggio \fermata - \ottava #0 - \bar "|." - } - >> - } - \new Staff << - \set Staff.pedalSustainStyle = #'bracket - \key fs \major - \clef bass - \new Voice { - \voiceOne - ds'4 \tenuto - cs'4 \tenuto - | - ds'4 \tenuto - cs'4 \tenuto - | - ds'4 \tenuto - cs'4 \tenuto - | - s8 - \clef treble - 8 [ - \clef bass - 8 \fermata ] - s8 - | - fs8\rest - \clef treble - 4 \tenuto - s8 - | - fs8\rest - \clef treble - 4 \tenuto - s8 - | - s2 - | - ds8\rest - \clef treble - 4 - \clef bass - s8 - | - s8 - \clef treble - 4 \arpeggio - \clef bass - s8 - | - s8 - \clef treble - 4. \arpeggio \fermata - | - } - \new Voice { - \voiceTwo - ds'8 [ ( - < ds bs >8 - cs'8 - < ds as >8 ] ) - | - ds'8 [ ( - < ds bs >8 - cs'8 - < ds as >8 ] ) - | - ds'8 [ ( - < ds bs >8 - cs'8 - < ds as >8 ] ) - | - \once \override Script #'outside-staff-priority = #100 - \once \override TextScript #'outside-staff-priority = #500 - 4. \fermata _\markup \italic { ped. } - 8 ( - | - 4. ) \sustainOn - \clef bass - 8 \( \sustainOff - | - 4. \) \sustainOn - \clef bass - 8 ( \sustainOff - | - 4 - 4 - | - 4. ) \sustainOn - 8 ( \sustainOff - | - 4. ) \sustainOn - \slurUp - 8 ( \sustainOff \sustainOn - | - 2 ) \sustainOff \sustainOn - | - } - >> ->> diff --git a/input/manual/note-head-style.ly b/input/manual/note-head-style.ly deleted file mode 100644 index fc908c05ee..0000000000 --- a/input/manual/note-head-style.ly +++ /dev/null @@ -1,104 +0,0 @@ -\version "2.12.0" -\header{ - texidoc=" -Note head shapes may be set from several choices. -The stem endings should be adjusted according to the note head. -If you want different note head styles on one stem, -you must create a special context. - -Harmonic notes have a different shape and different -dimensions. -" -} - -\layout { - indent = 0.0 - ragged-right = ##t -} - -pattern = << - \new Voice { - \override Stem #'direction = #UP - e'4 e'2. e'1 e'\breve*1/2 e'\longa*1/4 - } - \new Voice { - \override Stem #'direction = #DOWN - a4 a2. a1 a\breve*1/2 a\longa*1/4 - } ->> - - -\transpose c c { - \clef C - - \override Staff.NoteHead #'style = #'default - s1*0^\markup { "default" } - \pattern - - \override Staff.NoteHead #'style = #'altdefault - s1*0^\markup { "altdefault" } - \pattern - - \break - - \override Staff.NoteHead #'style = #'baroque - s1*0^\markup { "baroque" } - \pattern - - \override Staff.NoteHead #'style = #'neomensural - s1*0^\markup { "neomensural" } - \pattern - - \break - - \override Staff.NoteHead #'style = #'mensural - s1*0^\markup { "mensural" } - \pattern - - \override Staff.NoteHead #'style = #'petrucci - s1*0^\markup { "petrucci" } - \pattern - - \break - - \override Staff.NoteHead #'style = #'harmonic - s1*0^\markup { "harmonic" } - \pattern - - \override Staff.NoteHead #'style = #'harmonic-black - s1*0^\markup { "harmonic-black" } - \pattern - - \break - - \override Staff.NoteHead #'style = #'harmonic-mixed - s1*0^\markup { "harmonic-mixed" } - \pattern - - \override Staff.NoteHead #'style = #'diamond - s1*0^\markup { "diamond" } - \pattern - - \break - - \override Staff.NoteHead #'style = #'cross - s1*0^\markup { "cross" } - \pattern - - \override Staff.NoteHead #'style = #'xcircle - s1*0^\markup { "xcircle" } - \pattern - - \break - - \override Staff.NoteHead #'style = #'triangle - s1*0^\markup { "triangle" } - \pattern - - \override Staff.NoteHead #'style = #'slash - s1*0^\markup { "slash" } - \pattern -} - - - diff --git a/input/manual/percussion-chart.ly b/input/manual/percussion-chart.ly deleted file mode 100644 index cdbc6d7883..0000000000 --- a/input/manual/percussion-chart.ly +++ /dev/null @@ -1,68 +0,0 @@ -\version "2.12.0" - -% yes, I know this is a mess. But I'm not going to fuss with -% it one day before I leave. -gp - -% this chart is used in the manual too. - -\header { - texidoc ="@cindex Percussion notes - -This chart shows all percussion and drum notes." -} - -myBreak = { \bar " " \break } - -\new Score \with { - \remove "Bar_number_engraver" -} \new DrumStaff \with { - \remove "Time_signature_engraver" -} \context DrumVoice { - -%% this stuff set up nice || bar lines to divide percussion notes -%% into related fields, but it should be placed in the actual -%% music, not as a separate voice. -gp -%{ -barlines = { -\repeat "unfold" 4 {s 1 \bar" " } s 1 \bar "||" -\repeat "unfold" 2 { s 1 \bar" " s 1 \bar" " s 1 \bar "||" } -\repeat "unfold" 4 {s 1 \bar" " } s 1 \bar "||" -\repeat "unfold" 7 {s 1 \bar" " } s 1 \bar "||" -s 1 \bar" " s 1 \bar "||" -\repeat "unfold" 2 { \repeat "unfold" 5 {s 1 \bar" " } s 1 \bar "||" } -\repeat "unfold" 2 { s 1 \bar" " s 1 \bar "||" } -\repeat "unfold" 2 {s 1 \bar" " } s 1 \bar "||" -\repeat "unfold" 4 {s 1 \bar" " } s 1 \bar "||" -s 1 \bar" " s 1 \bar "||" -\repeat "unfold" 3 {s 1 \bar" " } s 1 \bar "||" -\repeat "unfold" 2 {s 1 \bar" " } s 1 \bar "||" -\repeat "unfold" 3 {\repeat "unfold" 4 {s 1 \bar" " } s 1 \bar "||" } -} -%} - -\drummode { -\textLengthOn -\cadenzaOn -bda1 ^"acousticbassdrum: bda" bd ^"bassdrum: bd" sn ^"snare: sn" sne ^"electricsnare: sne" sna ^"acousticsnare: sna" \myBreak -tomfl ^"lowfloortom: tomfl" tomfh ^"highfloortom: tomfh" toml ^"lowtom: toml" tomh ^"hightom: tomh" -tomml ^"lowmidtom: tomml" tommh ^"himidtom: tommh" \myBreak -hhc ^"closedhihat: hhc" hh ^"hihat: hh" hhp ^"pedalhihat: hhp" hho ^"openhihat: hho" hhho ^"halfopenhihat: hhho" \myBreak -cymca ^"crashcymbala: cymca" cymc ^"crashcymbal: cymc" cymra ^"ridecymbala: cymra" cymr ^"ridecymbal: cymr" \myBreak cymch ^"chinesecymbal: cymch" cyms ^"splashcymbal: cyms" -cymcb ^"crashcymbalb: cymcb" cymrb ^"ridecymbalb: cymrb" -rb ^"ridebell: rb" cb ^"cowbell: cb" \myBreak -bohm ^"mutehibongo: bohm" boh ^"hibongo: boh" boho ^"openhibongo: boho" bolm ^"mutelobongo: bolm" bol ^"lobongo: bol" bolo ^"openlobongo: bolo"\myBreak -cghm ^"mutehiconga: cghm" cglm ^"muteloconga: cglm" cgho ^"openhiconga: cgho" cgh ^"hiconga: cgh" cglo ^"openloconga: cglo" cgl ^"loconga: cgl" \myBreak -timh ^"hitimbale: timh" timl ^"lotimbale: timl" -agh ^"hiagogo: agh" agl ^"loagogo: agl" \myBreak -ssh ^"hisidestick: ssh" ss ^"sidestick: ss" ssl ^"losidestick: ssl" \myBreak -guis ^"shortguiro: guis" guil ^"longguiro: guil" gui ^"guiro: gui" cab ^"cabasa: cab" mar ^"maracas: mar" \myBreak -whs ^"shortwhistle: whs" whl ^"longwhistle: whl" \myBreak -hc ^"handclap: hc" tamb ^"tambourine: tamb" vibs ^"vibraslap: vibs" tt ^"tamtam: tt" \myBreak -cl ^"claves: cl" wbh ^"hiwoodblock: wbh" wbl ^"lowoodblock: wbl" \myBreak -cuim ^"mutecuica: cuim" cuio ^"opencuica: cuio" -trim ^"mutetriangle: trim" tri ^"triangle: tri" trio ^"opentriangle: trio" \myBreak -ua ^"oneup: ua" ub ^"twoup: ub" uc ^"threeup: uc" ud ^"fourup: ud" ue ^"fiveup: ue" \myBreak -da ^"onedown: da" db ^"twodown: db" dc ^"threedown: dc" dd ^"fourdown: dd" de ^"fivedown: de" \myBreak -} -} - diff --git a/input/manual/pitches-headword.ly b/input/manual/pitches-headword.ly deleted file mode 100644 index d69c44a97f..0000000000 --- a/input/manual/pitches-headword.ly +++ /dev/null @@ -1,143 +0,0 @@ -\version "2.12.0" -\include "english.ly" -#(set-global-staff-size 15) -\paper{ - ragged-right=##t - line-width=17\cm - indent=0\cm -} - -\layout { - \context { \Score - \override PaperColumn #'keep-inside-line = ##t - \override NonMusicalPaperColumn #'keep-inside-line = ##t - } -} - -% NR 1.1 Pitches - -% L. v. Beethoven -% Piano sonata 21 - Dem Grafen von Waldstein Gewidmet -% chorale at measures 34 - 40+ - -\new PianoStaff << - - % RH Staff - \new Staff << - - % RH Voice 1 - \new Voice { - \set Score.currentBarNumber = #34 - \voiceOne - gs''2 ( ^ \markup \italic { dolce e molto ligato } - fs''4 - e''4 - | - ds''2 - cs''2 ) - | - ds''2 ( - e''4 - fs''4 - | - 2 - 2 ) - | - \oneVoice - \clef bass - 2 ( - 4 - 4 - | - 2 - 2 ) - | - \voiceOne - b2 %( - cs'4 - ds'4 - | - \clef treble - 4 %) - r4 r2 - } - - % RH Voice 2 - \new Voice { - \voiceTwo - \override Staff.DynamicLineSpanner #'staff-padding = #2.5 - 2 \p - 4 - 4 - | - 2 - e'2 - | - \once \override TextScript #'staff-padding = #2.5 - 2 _ \markup \italic { cresc. } - b'4 - 4 - | - b'2. ( \sf \> - a'4 ) - \clef bass - | \break - s1 \p - | - s1 - | - 4 ( - 2. ) - | - s4 - r4 r2 - } - - >> - - % LH Staff - \new Staff { - \override Staff.SustainPedalLineSpanner #'staff-padding = #5 - 2 ( \sustainOn - 4 \sustainOff - 4 - | - 2 - 2 ) \sustainOn - | - \clef bass - \slurDown - 2 ( \sustainOff - 4 - 4 \sustainOn - | - \clef treble - \voiceOne - << - { - 2 - 2 ) - } - \new Voice { - \voiceTwo - b1 \sustainOff - } - >> - \oneVoice - | - %\break - \clef bass - 2 ( - 4 - 4 - | - 2 - 2 ) \sustainOn - | - 1 ( \sustainOff - | - 4 ) - r4 r2 - } - ->> diff --git a/input/manual/repeats-headword.ly b/input/manual/repeats-headword.ly deleted file mode 100644 index faba778a12..0000000000 --- a/input/manual/repeats-headword.ly +++ /dev/null @@ -1,124 +0,0 @@ -\version "2.12.0" -\include "english.ly" -#(set-global-staff-size 15) -\paper { - line-width = 16\cm - indent = 0\cm -} - -% NR 1.7 Repeats - -% Beethoven, Op. 57 -% Piano sonata 23 - Dem Grafen Franz von Brunswick Gewidmet -% Movt II, Andante con moto -% Measures 9 - 16 - -\new PianoStaff << - - \new Staff = RH { - \clef bass - \key df \major - \time 2/4 - \set Score.currentBarNumber = #9 - \bar "|:" - 4 ( - 8.. - 32 - | - 8. ) - 16 ( - 8 - 8 ) - | - 4 ( - 8.. - 32 - | - 8. ) - \slurDown - 16 ( - << - { - \voiceTwo - gf8 - f8 ) - } - \new Voice { - \voiceOne - 16 - ef'16 - 8 - } - >> - \oneVoice - | - 4 ( - 8.. - 32 - \clef treble - | - 8. ) - 16 ( - 16 - gf'16 - 8 ) - | - \slurUp - 4 - \change Staff = LH - \voiceOne - 4 - | - 4. - \change Staff = RH - \oneVoice - r8 - \clef bass - \bar ":|" - } - - \new Staff = LH { - \clef bass - \key df \major - \time 2/4 - 4 ( - 8.. - 32 - | - 8. ) - 16 ( - 8 - 8 ) - | - 4 ( - 8.. - 32 - | - 8. ) - 16 ( - 8 - ) - | - 4 ( - 8.. - 32 - | - 8. ) - 16 ( - 8 - 8 ) - | - \voiceTwo - gf,4 ( - af,4 ~ ) - | - af,16. [ ( - gf,32 - f,16. - ef,32 ] - df,8 ) - \oneVoice - r8 - } - ->> diff --git a/input/manual/rhythms-headword.ly b/input/manual/rhythms-headword.ly deleted file mode 100644 index a48f05ca9e..0000000000 --- a/input/manual/rhythms-headword.ly +++ /dev/null @@ -1,209 +0,0 @@ -\version "2.12.0" -\include "english.ly" -#(set-global-staff-size 15) -\paper { - line-width = 16\cm - indent = 0\cm -} - -% NR 1.2 Rhythms - -% Beethoven, Op. 81a -% Piano sonata 26 - Das Lebewohl -% Movt II - Abwesenheit -% Measures 31 - 34 - -\layout { - \context { - \Score - \override SpacingSpanner #'base-shortest-duration = - #(ly:make-moment 1 40) - %\override SpacingSpanner #'strict-grace-spacing = ##t - } -} - -\new PianoStaff << - - % RH Staff - \new Staff { - \clef treble - \key c \minor - \time 2/4 - \set Score.currentBarNumber = #31 - - 8 ( -\markup { - \override #'(baseline-skip . 2) \italic \column { - \line { a tempo } - cantabile - } - } - 8 ) - ~ - 8 ( - 16 - 16 ) - - | - - \afterGrace - 8 [ ( - { - e''16 [ - f''16 - e''16 - d''16 ] - } - 16 - 16 ] ) - \once \override TextScript #'padding = #3.8 - 16 ( \staccato -\markup { \italic cresc. } - 16 ) \staccato - 32 ( - 32 ) - 32 ( - 32 ) - - | - - \once \override DynamicLineSpanner #'padding = #2 - b''32 ( \p \> - c'''32 - d'''32 - c'''32 ) \! - g''8 ( - ~ - g''32 [ - a''64 - g''64 ) ] - - a''64 ( [ - g''64 ) - bf''64 ( - a''64 ) ] - - bf''64 ( [ - a''64 ) - c'''64 ( - b''64 ) ] - - c'''128 ( [ - b''128 - d'''128 - c'''128 - f'''64 - f''64 ) ] - - | - - \afterGrace - 8 [ ( - { - e''16 [ - f''16 - e''16 - d''16 ] - } - 16 - 16 ] ) - 16 ( \staccato -\markup { \italic cresc. } - 16 ) \staccato - 32 ( - 32 ) - 32 ( - 32 ) - } - - % LH Staff - \new Staff { - \clef bass - \key c \minor - \time 2/4 - - 32 - c'32 - 32 - c'32 - - 32 - c'32 - 32 - c'32 - - 32 - c'32 - 32 - c'32 - - 32 - c'32 - 32 - c'32 - - | - - 32 - c'32 - 32 - c'32 - - 32 - c'32 - 32 - c'32 - - 32 - c'32 - 32 - c'32 - - 32 - c'32 - 32 - c'32 - - | - - 32 - c'32 - 32 - c'32 - - 32 - c'32 - 32 - c'32 - - 32 - c'32 - 32 - c'32 - - 32 - c'32 - 32 - c'32 - - | - - 32 - c'32 - 32 - c'32 - - 32 - c'32 - 32 - c'32 - - 32 - c'32 - 32 - c'32 - - 32 - c'32 - 32 - c'32 - } - ->> diff --git a/input/manual/screech-boink.ly b/input/manual/screech-boink.ly deleted file mode 100644 index a49cd240db..0000000000 --- a/input/manual/screech-boink.ly +++ /dev/null @@ -1,73 +0,0 @@ -\version "2.12.0" -\header { - title = "Screech and boink" - subtitle = "Random complex notation" - composer = "Han-Wen Nienhuys" -} - -\score { - \context PianoStaff << - \new Staff = "up" { - \time 4/8 - \key c \minor - - - << { - \revert Stem #'direction - \change Staff = down - \set subdivideBeams = ##t - g16.[ - \change Staff = up - c'''32 \change Staff = down - g32 \change Staff = up - c'''32 \change Staff = down - g16] - \change Staff = up - \stemUp - \set followVoice = ##t - c'''32([ b''16 a''16 gis''16 g''32)] } \\ - { s4 \times 2/3 { d'16[ f' g'] } as'32[ b''32 e'' d''] } \\ - { s4 \autoBeamOff d''8.. f''32 } \\ - { s4 es''4 } - >> - } - - \new Staff = "down" { - \clef bass - \key c \minor - \set subdivideBeams = ##f - \override Stem #'french-beaming = ##t - \override Beam #'thickness = #0.3 - \override Stem #'thickness = #4.0 - g'16[ b16 fis16 g16] - << \makeClusters { - as16 - - - } \\ - { - \override Staff.Arpeggio #'arpeggio-direction =#down - 4\arpeggio } - >> - } - >> - - \midi { - \context { - \Score - tempoWholesPerMinute = #(ly:make-moment 60 8) - } - } - - - - \layout { - ragged-right = ##t - - \context { - \Staff - \consists Horizontal_bracket_engraver - } - - } -} diff --git a/input/manual/script-chart.ly b/input/manual/script-chart.ly deleted file mode 100644 index 6adf282257..0000000000 --- a/input/manual/script-chart.ly +++ /dev/null @@ -1,62 +0,0 @@ -\version "2.12.0" - -\header { - texidoc ="@cindex Feta scripts -This chart shows all articulations, or scripts, that the feta font contains. -" -} - -\score { - << - \new Voice = "scripts" { - c''\accent c''\marcato c''\staccatissimo c''\espressivo - c''\staccato c''\tenuto c''\portato - c''\upbow c''\downbow c''\flageolet - c''\thumb c''^\lheel c''\rheel - c''^\ltoe c''\rtoe c''\open - c''\stopped c''\snappizzicato c''\turn c''\reverseturn - c''\trill c''\prall c''\mordent - c''\prallprall c''\prallmordent c''\upprall - c''\downprall c''\upmordent c''\downmordent - c''\pralldown c''\prallup c''\lineprall - c''\signumcongruentiae c''\shortfermata c''\fermata - c''\longfermata c''\verylongfermata c''\segno - c''\coda c''\varcoda - } - \new Lyrics \lyricsto "scripts" { - accent marcato staccatissimo espressivo - staccato tenuto portato - upbow downbow flageolet - thumb lheel rheel - ltoe rtoe open - stopped snappizzicato turn reverseturn - trill prall mordent - prallprall prallmordent upprall - downprall upmordent downmordent - pralldown prallup lineprall - signumcongruentiae shortfermata fermata - longfermata verylongfermata segno - coda varcoda - } - >> - \layout { - line-width = 5.1\in - indent = 0.0\mm - \context { - \Score - timing = ##f - barAlways = ##t - \override NonMusicalPaperColumn #'padding = #2.5 - } - \context { - \Staff - \remove "Time_signature_engraver" - \override BarLine #'transparent = ##t - } - \context { - \Lyrics - \override LyricText #'font-family = #'typewriter - \override LyricText #'font-shape = #'upright - } - } -} diff --git a/input/manual/simultaneous-headword.ly b/input/manual/simultaneous-headword.ly deleted file mode 100644 index a6b5ff8e47..0000000000 --- a/input/manual/simultaneous-headword.ly +++ /dev/null @@ -1,313 +0,0 @@ -\version "2.12.0" -\include "english.ly" -#(set-global-staff-size 15) -\paper{ - ragged-right=##t - line-width=17\cm - indent=0\cm -} - -\layout { - \context { \Score - \override PaperColumn #'keep-inside-line = ##t - \override NonMusicalPaperColumn #'keep-inside-line = ##t - } -} - -% NR 1.5 Simultaneous notes - -% L. v. Beethoven, Op. 111 -% Piano sonata 32 -% Movt II - Arietta - Adagio molto semplice e cantabile -% measures 108 - 118 - -\layout { - \context { - \Score - \override SpacingSpanner #'base-shortest-duration = - #(ly:make-moment 1 18) - \override NonMusicalPaperColumn #'line-break-system-details = - #'((alignment-offsets . (0 -12))) - } -} - -trillflat = - \once \override TrillSpanner #'(bound-details left text) = - #(markup #:translate-scaled '(-0.05 . -1) - #:concat (#:musicglyph "scripts.trill" - #:translate '(-0.5 . 1.9) #:fontsize -7 #:flat)) - - -\new PianoStaff << - - % RH - \new Staff << - \clef treble - \key c \major - \time 9/16 - \set Score.currentBarNumber = #108 - - % RH voice 1 - \new Voice { - - \voiceOne - s4. - s8. - - | - - s4. - a''8 \p \> [ ( - g''16 ] ) - - | - - g''4. - af''8 [ ( - g''16 ] ) - - | - - g''8. [ - g''8. - g''8. \pp ] - - | - - g''8. [ - af''8. - af''8. ] - - | - - af''8. [ - af''8. - af''8. ] - - | - \break - - \trillflat - af''4. \startTrillSpan - ~ - af''8. - ~ - - | - - af''4. - ~ - af''8. - ~ - - | - - \oneVoice - 8. [ - a''8. \p \< - bf''8. ] - ~ - - | - - bf''8. [ - b''8. - c'''8. ] - ~ - - \bar "||" - - \key ef \major - c'''8. [ - cs'''8. \f ] \stopTrillSpan - r8. - - } - - % RH voice 2 - \new Voice { - \voiceTwo - \override Voice.TrillSpanner #'direction = #down - d''4. \f \startTrillSpan - ~ - d''8. - ~ - - | - - d''4. - ~ - d''8. - ~ - - | - - d''8. \stopTrillSpan - \trillflat - d''4. \startTrillSpan - ~ - - | - - d''4. - ~ - d''8. - ~ - - | - - d''4. - ~ - d''8. - ~ - - | - - d''4. - ~ - d''8. \stopTrillSpan - ~ - - | - - \trillflat - d''4. \startTrillSpan - ~ - d''8. - ~ - - | - - d''4. - ~ - d''8. - ~ - - | - - \once \override NoteColumn #'ignore-collision = ##t - \once \override NoteHead #'transparent = ##t - \once \override Dots #'transparent = ##t - \once \override Stem #'transparent = ##t - d''8. \stopTrillSpan - s4. - - | - - s8. - s8. - - } - - >> - - % LH staff - \new Staff { - \clef bass - \key c \major - \time 9/16 - - r8. - r8. - 8 [ ( - 16 ] ) - - | - - 4. - \clef treble - c''8 [ ( - b'16 ] ) - - | - - b'4. - c''8 [ ( - b'16 ] ) - - | - - b'8. [ - b'8. - b'8. ] - - | - - b'8. [ - bf'8. ] - \clef bass - 8 [ ( - 16 ] ) - - | - - 4. - \clef treble - f'8 [ ( - bf16 ] ) - - | - - << - - \new Voice { - \voiceOne - \override Voice.TrillSpanner #'direction = #up - f'4. \startTrillSpan - ~ - f'8. - ~ - - | - - f'4. - ~ - f'8. - ~ - - | - - f'8. \stopTrillSpan - } - - \new Voice { - \voiceTwo - \override Voice.TrillSpanner #'direction = #down - bf8. [ - bf8. - bf8. ] - - | - - bf8. [ - bf8. - bf8. ] - - | - - bf8. - } - - >> - - \oneVoice - r8. - r8. - - | - - r8. - r8. - r8. - \clef bass - - | - - \key ef \major - r8. - r8. - r8. - - } - ->> diff --git a/input/manual/staff-headword.ly b/input/manual/staff-headword.ly deleted file mode 100644 index f7fa2e4145..0000000000 --- a/input/manual/staff-headword.ly +++ /dev/null @@ -1,119 +0,0 @@ -\version "2.12.0" -\include "catalan.ly" -#(set-global-staff-size 15) -\paper{ - ragged-right=##t - line-width=17\cm - indent=0\cm -} - -\header { - mutopiatitle = "Napolitan Dance (Swan Lake)" - mutopiacomposer = "TchaikovskyPI" - mutopiainstrument = "Piano, Trumpet, Percussion" - source = "New arrangement" - style = "Classical" - copyright = "Public Domain" - maintainer = "Laurence Sardain" - lastupdated = "2006/Dec/21" -% title = "Le Lac des Cygnes" -% subtitle = "Danse Napolitaine" -% composer = "Piotr Ilitch Tchaïkovski" -% arranger = "arr. Laurence Sardain" -% footer = "Mutopia-2006/12/22-896" -} - -trompette = \relative do'' { - \clef treble - \key mib \major - \time 2/4 - R2^\markup { \italic Comodo } | - r8 \once \override TextScript #'padding = #2.0 - sib16-.^\markup {\dynamic p \italic grazioso} do-. mib( re)-. do-. sib-. | - re8-. r8 re4->( | - re8) do16-. re-. mib( re) do-. re-. | - do8-. r8 sib4-> | -} - -tambourin = \relative do' { - \time 2/4 - r8 do16 do do8 do | - r8 do16 do do8 do | - r8 do r do | - r8 do16 do do8 do | - r8 do r do | -} - -tambourinMidi = \drummode { - \time 2/4 - r8 tamb16 tamb tamb8 tamb | - r8 tamb16 tamb tamb8 tamb | - r8 tamb r tamb | - r8 tamb16 tamb tamb8 tamb | - r8 tamb r tamb | -} - -upper = \relative do' { - \clef treble - \key mib \major - \time 2/4 - r8\p 16-. -. 8-. -. | - r8 16-. -. 8-. -. | - r8 16-. -. 8-. -. | - r8 16-. -. 8-. -. | - r8 16-. -. 8-. -. | -} - -lower = \relative do { - \clef bass - \key mib \major - \time 2/4 - mib4-. r4 | - sib-. r | - fa'-. r | - sib, r | - mib4-. r4 | -} - - -\score { - << - \context Staff = "trumpet" << - \set Staff.instrumentName = \markup { "Trumpet" \concat{ B \teeny \raise #0.4 \flat } } - \transpose sib do' - \trompette - >> - \context RhythmicStaff = "tambourin" << - \set Staff.instrumentName = "Tambourine" - \tambourin - >> - \context PianoStaff = "prima" << - \set PianoStaff.instrumentName = "Piano " - \context Staff = "uppera" \upper - \context Staff = "lowera" \lower - >> - >> - \layout { } -} -\score { - << - \context Staff = "trumpet" { - \set Staff.midiInstrument = "trumpet" - \trompette - } - \context DrumStaff = "tambourin" { - \tambourinMidi - } - \context Staff = "piano" << - \upper - \lower - >> - >> - \midi { - \context { - \Score - tempoWholesPerMinute = #(ly:make-moment 72 4) - } - } -} - diff --git a/input/manual/text-headword.ly b/input/manual/text-headword.ly deleted file mode 100644 index 40af604f84..0000000000 --- a/input/manual/text-headword.ly +++ /dev/null @@ -1,236 +0,0 @@ -\version "2.12.0" -\include "english.ly" -#(set-global-staff-size 15) -\paper{ - line-width = 16\cm - indent = 0\cm -} - -\layout { - \context { \Score - \override PaperColumn #'keep-inside-line = ##t - \override NonMusicalPaperColumn #'keep-inside-line = ##t - } -} - -% NR 1.8 Text - -% L. v. Beethoven, Op. 110 -% Piano sonata 31 -% measures 1 - 7 - -\layout { - \context { - \Score - \override SpacingSpanner #'base-shortest-duration = - #(ly:make-moment 1 20) - %\override NonMusicalPaperColumn #'line-break-system-details = - %#'((alignment-offsets . (0 -12))) - } -} - -\new PianoStaff << - - % RH staff - \new Staff { - \clef treble - \key af \major - \time 3/4 - - \once \override TextScript #'staff-padding = #4 - 4. ( - _ \markup { \dynamic p \italic { con amabilità } } - 8 ) - 8. [ - 16 ] - - | - - 4 - 2 - _ \markup { \italic { ten. } } - - | - - << - - \new Voice { - \voiceOne - ef''4. ( - df''8 [ ) - ef'' ( - f'' ) ] - - | - - \once \override TextScript #'staff-padding = #4 - ef''8. ( - _ \markup { \italic { tranqu. } } - d''16 ) - df''8 \trill \fermata - _ \markup { \italic { ten. } } - } - - \new Voice { - \voiceTwo - af'4. - af'8 [ - af'8 - af'8 ] - - | - - g'4 - g'8 - } - - >> - - \oneVoice - \once \override TextScript #'staff-padding = #4 - df''32 - _ \markup { \italic dolce } - c''32 - df''32 - ef''32 - \acciaccatura { df''[ ef'' ] } - f''8 - ef''16 - df''16 - - | - \break - \overrideProperty "Score.NonMusicalPaperColumn" - #'line-break-system-details #'((alignment-offsets . (0 -12))) - - c''4. ( - ^ \markup \italic { cantabile, con intimissimo sentimento, - ma sempre molto dolce e semplice } - ef''4 - af''8 ) - - | - - af''4 ( - g''2 ) - - | - - bf''4. ( - g''4 - ef''8 ) - - | - } - - % LH - \new Staff { - \clef bass - \key af \major - \time 3/4 - - 4. ( - 8 ) - 8. [ - 16 ] - - | - - 4 - 2 ^ \markup { \italic ten. } - - | - - << - - \new Voice { - \voiceOne - ef8 [ ( - af8 - c'8 - bf8 ) - c'8 ( \staccato - df'8 ] ) \staccato - - | - - bf4 - bf8 ^ \markup { \italic ten. } - } - - \new Voice { - \voiceTwo - c4. ( - f8 [ ) - ef8 ( \staccato - df8 ] ) \staccato - - | - - ef4 - ef8 \fermata - } - - >> - - \oneVoice - r8 - r4 - \clef treble - - | - - \override Staff.SustainPedalLineSpanner #'outside-staff-priority = #1000 - \override Staff.SustainPedalLineSpanner #'staff-padding = #7 - \once \override TextScript #'padding = #2 - af16 \sustainOn - ^ \markup \italic { non staccato } - _ \markup \italic { molto \concat {\dynamic {p},} sempre tranquillo - ed egualmente, non rubato } - 16 - 16 - 16 - af16 - 16 - 16 - 16 - af16 \sustainOn - 16 - 16 - 16 - - | - - bf16 \sustainOn - 16 - 16 - 16 - bf16 \sustainOn - 16 - 16 - 16 - bf16 - 16 - 16 - 16 - - | - - \override Staff.SustainPedalLineSpanner #'staff-padding = #4 - df'16 \sustainOn - 16 - 16 - 16 - df'16 - 16 - 16 - 16 - df'16 \sustainOn - 16 - 16 - 16 - - | - } - ->> diff --git a/input/manual/unfretted-headword.ly b/input/manual/unfretted-headword.ly deleted file mode 100644 index e859e1357b..0000000000 --- a/input/manual/unfretted-headword.ly +++ /dev/null @@ -1,223 +0,0 @@ -% #!lilypond lcp-extract.ly -*- coding: utf-8; -*- - -%%% -%%% les-cinq-pieds: -%%% extract for the lilypond documentaton project -%%% - -%% Title: Les cinq pieds -%% Composer: David Séverin -%% Date: Juillet 2007 -%% Instrument: Violon Solo -%% Dedication: A mon épouse Lívia De Souza Vidal -%% Additional: avec l'aide de Krzysztof Wagenaar - -%% Statement: - -%% Here by, I, the composer, agree that this extract of my composition -%% be in the public domain and can be part of, used and presented in -%% the LilyPond Documention Project. - -%% Statement Date: Octber the 9th, 2008 - - -\version "2.12.0" -#(set-global-staff-size 15) - -%%% -%%% Abreviations -%%% - -db = \markup { \musicglyph #"scripts.downbow" } -dub = \markup { \line { \musicglyph #"scripts.downbow" " " \musicglyph #"scripts.upbow" } } -dubetc = \markup { \line { \musicglyph #"scripts.downbow" " " \musicglyph #"scripts.upbow" "..." } } - -ub = \markup { \musicglyph #"scripts.upbow" } -udb = \markup { \line { \musicglyph #"scripts.upbow" " " \musicglyph #"scripts.downbow" } } -udbetc = \markup { \line { \musicglyph #"scripts.upbow" " " \musicglyph #"scripts.downbow" "..." } } - -fermaTa = \markup \musicglyph #"scripts.ufermata" - -accel = \markup \tiny \italic \bold "accel..." -ritar = \markup \tiny \italic \bold "ritar..." - -ignore = \override NoteColumn #'ignore-collision = ##t - - -%% -%% Strings -%% - -svib = \markup \small "s. vib." -pvib = \markup \small "p. vib." -mvib = \markup \small "m. vib." -sulp = \markup \small "s.p." -norm = \markup \small "n." - -quatre = \markup \teeny "IV" - - -%% -%% Shifting Notes -%% - -shift = \once \override NoteColumn #'force-hshift = #0.9 -shifta = \once \override NoteColumn #'force-hshift = #1.2 -shiftb = \once \override NoteColumn #'force-hshift = #1.4 - - -%% -%% Hairpin -%% - -% aniente = "a niente" -aniente = \once \override Hairpin #'circled-tip = ##t - - -%% -%% Tuplets -%% - -tupletbp = \once \override Staff.TupletBracket #'padding = #2.25 - - -%% -%% Flag [Note Head - Stem] -%% - -noflag = \once \override Stem #'flag-style = #'no-flag - -%%% -%%% Functions -%%% - -#(define-markup-command (colmark layout props args) - (markup-list?) - (let ((entries (cons (list '(baseline-skip . 2.3)) props) - )) - (interpret-markup layout entries - (make-column-markup - (map (lambda (arg) - (markup arg)) - (reverse args)))))) - - -%%% -%%% Instruments -%%% - -ViolinSolo = \relative c' { - - \voiceOne - - \set Score.markFormatter = #format-mark-box-numbers - \override Score.VoltaBracket #'font-name = #"sans" - \override Score.VoltaBracket #'extra-offset = #'(0 . 1) - \override SpacingSpanner #'uniform-stretching = ##t - - - %% Measure 1 - \time 25/8 - \mark \default - r2 ^\markup \colmark { \italic "fatigué" " " \bold "lentement"} r4 r r8 - << - { \shift d2 \glissando ^\markup \colmark { \quatre \dubetc \svib } \shifta e1 } \\ - { d2 \open \mf \< ~ \aniente d1 \! \> r4 r ^\markup \colmark { " " \fermaTa } \! } - >> - - - %% Measure 2 - \time 7/4 - \set Score.repeatCommands = #'((volta "1) n. 2) s.p.")) - << - { \shift d2 \glissando ^\markup \colmark { \quatre \udbetc } \shifta e1 } \\ - { d2 \open \mf \< ~ d1 \! \> ~ d4 ^\markup \colmark { " " \fermaTa } \! } - >> - \set Score.repeatCommands = #'((volta #f)) - - - %% Measure 3 - \time 15/4 - << - { \shift d2 \glissando ^\markup \colmark { \quatre \dubetc \pvib \norm } \shifta e1 \glissando d2 } \\ - { d2 \open \mf \< ~ d1 ~ d2 \ff ~ d1 \> ~ d2 ^\markup \colmark { " " " " \svib } ~ d4 \pp} - >> - \break - - %% Measure 4 - \time 4/4 - \stemUp - \tupletDown - \times 2/3 { d4 ^\markup \colmark { \quatre \db \accel } d d } - \times 2/3 { d4 ^\markup \colmark { " " \db " " \sulp } d d } - - - - %% Measure 5 - \time 5/4 - \tupletbp \times 2/3 { d8 \mf \< ^\markup \colmark { \quatre \db \norm } d _\open d } - \tupletbp \times 2/3 { d8 ^\markup \colmark { " " \db \sulp } d _\open d } - \tupletbp \times 2/3 { d16 ^\markup \colmark { " " \db \norm } d _\open d d d _\open d } - d2 \ff ^\markup \colmark { " " \pvib } \> - - - %% Measure 6 - \time 5/8 - \once \override Beam #'grow-direction = #RIGHT % \featherDurations #(ly:make-moment 2 3) - { d16 \staccato - [ d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato] - } - \break - - - %% Measure 7 - \time 7/4 - \tupletbp \times 2/3 { d16 ^\markup \colmark { \quatre } d _\open d d d _\open d } - \tupletbp \times 2/3 { d8 ^\markup \colmark { " " \db } d _\open d } - \tupletbp \times 2/3 { d8 ^\markup \colmark { " " \db " " \sulp } d _\open d } - \times 2/3 { d4 ^\markup \colmark { \quatre \db \ritar \norm } d d } - \times 2/3 { d4 ^\markup \colmark { " " \db " " \sulp } d d \ppp ~ } - - - %% Measure 8 - d4 ^\markup \colmark { " " " " \pvib \norm } - deh2 d dih \< - - - %% Measure 9 - << - { \shift d2 \glissando ^\markup \colmark { \quatre } \shifta e1 } \\ - { d2 \open ~ d1 ^\markup \colmark { " " " " \mvib } } - >> - \breathe r4 \! - -} - - -%%% -%%% Score -%%% - -\score { - - << - \relative << - \new Staff \ViolinSolo - >> - - \override Score.Rest #'transparent = ##t - \set Score.defaultBarType = "empty" - >> - - \layout { - indent = 0.0 - \context { - \Staff - \remove "Time_signature_engraver" - } - \context { - \Score - \remove "Bar_number_engraver" - } - } -} diff --git a/input/manual/wind-headword.ly b/input/manual/wind-headword.ly deleted file mode 100644 index 6d8fa0a27b..0000000000 --- a/input/manual/wind-headword.ly +++ /dev/null @@ -1,46 +0,0 @@ -\version "2.12.0" -#(set-global-staff-size 15) -\paper { - line-width = 16\cm - indent = 0\cm -} - -% NR 2.whatever Wind - -% Tchaikovsky -% Nutcracker Suite, VII Dance of the Merlitons -\score { - \new StaffGroup << - \new Staff \relative c'' { - \set Staff.instrumentName = "Flauto I,II" - \once \override Score.RehearsalMark #'self-alignment-X = #-1 - \once \override Score.RehearsalMark #'break-align-symbols = -#'(time-signature) - \once \override Score.TimeSignature -#'break-align-anchor-alignment = #LEFT - \once \override Score.RehearsalMark #'padding = #4 - \mark \markup \large \bold {Moderato assai} - \key d \major - \time 2/4 - \compressFullBarRests - R2*2 - 16-.\p -. -. -. 8-. -. - -.\< 32( 4--)\mf - 16-. -. -. -. - (\> ) -. -.\! - 4--\sf \acciaccatura {8} 4--\mf - } - \new Staff \relative c' { - \set Staff.instrumentName = "Flauto III" - \key d \major - \time 2/4 - \compressFullBarRests - R2*2_\markup{Gr.Fl.} - fis16-.\p e-. fis-. e-. fis8-. e-. - g8-.\< fis32( a d fis a4--)\mf - b16-. a-. b-. a-. g(\> fis) d-. a-.\! - g4--\sf \acciaccatura fis'8 g4--\mf - } - >> -} - diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index c01e27cb2f..993d6de0f6 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -28,9 +28,9 @@ LILYPOND_BOOK = $(script-dir)/lilypond-book.py LILYPOND_BOOK_INCLUDES = -I $(src-dir)/ -I $(outdir) -I $(input-dir) \ -I $(top-src-dir)/Documentation -I $(top-src-dir)/Documentation/snippets \ - -I $(input-dir)/regression/ -I $(input-dir)/manual/ \ + -I $(input-dir)/regression/ -I $(top-src-dir)/Documentation/included/ \ -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/ \ - -I $(top-build-dir)/mf/out/ -I $(top-src-dir)/input/manual \ + -I $(top-build-dir)/mf/out/ \ -I $(top-src-dir)/Documentation/pictures \ -I $(top-build-dir)/Documentation/pictures/$(outdir) diff --git a/make/lysdoc-targets.make b/make/lysdoc-targets.make index 7f58e9692f..e39fa1c58b 100644 --- a/make/lysdoc-targets.make +++ b/make/lysdoc-targets.make @@ -16,6 +16,6 @@ local-test: echo -e '\n\n\n' ; \ (cd $(top-src-dir) && git diff ) ; \ fi > $(outdir)/tree.gittxt - $(MAKE) LILYPOND_BOOK_LILYPOND_FLAGS="-dbackend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-lily-fonts --header=texidoc -I $(top-src-dir)/input/manual -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= $(outdir)/collated-files.html LYS_OUTPUT_DIR=$(top-build-dir)/out/lybook-testdb + $(MAKE) LILYPOND_BOOK_LILYPOND_FLAGS="-dbackend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-lily-fonts --header=texidoc -I $(top-src-dir)/Documentation/included/ -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= $(outdir)/collated-files.html LYS_OUTPUT_DIR=$(top-build-dir)/out/lybook-testdb rsync -L -a --exclude 'out-*' --exclude 'out' --exclude mf --exclude source --exclude mf $(top-build-dir)/out/share $(outdir)