From c4b122bf88e2aff20df5f85130e67aab73f7c5bf Mon Sep 17 00:00:00 2001 From: Phil Holmes Date: Tue, 5 May 2015 13:02:50 +0100 Subject: [PATCH] Update incipit snippets --- Documentation/ca/learning/templates.itely | 8 +- Documentation/cs/learning/templates.itely | 2 +- Documentation/de/learning/templates.itely | 8 +- Documentation/es/learning/templates.itely | 8 +- Documentation/fr/learning/templates.itely | 8 +- Documentation/it/learning/templates.itely | 8 +- Documentation/ja/learning/templates.itely | 3 +- Documentation/learning/templates.itely | 8 +- Documentation/nl/learning/templates.itely | 8 +- ...-modern-transcription-of-mensural-music.ly | 250 ---------------- .../snippets/ancient-notation.snippet-list | 2 - ...onducting-signs,-measure-grouping-signs.ly | 4 +- Documentation/snippets/incipit.ly | 189 ++++-------- Documentation/snippets/new/incipit.ly | 208 +++++++++++++ .../snippets/real-music.snippet-list | 1 - .../snippets/really-cool.snippet-list | 2 - .../snippets/specific-notation.snippet-list | 1 - Documentation/snippets/template.snippet-list | 1 - ...scription-of-ancient-music-with-incipit.ly | 278 ------------------ .../tweaks-and-overrides.snippet-list | 1 - .../snippets/workaround.snippet-list | 1 - 21 files changed, 298 insertions(+), 701 deletions(-) delete mode 100644 Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly create mode 100644 Documentation/snippets/new/incipit.ly delete mode 100644 Documentation/snippets/transcription-of-ancient-music-with-incipit.ly diff --git a/Documentation/ca/learning/templates.itely b/Documentation/ca/learning/templates.itely index daf46cd171..84d8ff4914 100644 --- a/Documentation/ca/learning/templates.itely +++ b/Documentation/ca/learning/templates.itely @@ -218,9 +218,8 @@ LilyPond i gaudir d'unes belles partitures impreses! @appendixsubsec Transcripció dfe música mensural @translationof Transcription of mensural music -@c Line-width below is because of Issue 766. If that's fixed, it can be removed. -@lilypondfile[verbatim,quote,ragged-right,texidoc,line-width=140] -{ancient-notation-template----modern-transcription-of-mensural-music.ly} +@lilypondfile[verbatim,quote,ragged-right,texidoc] +{incipit.ly} @node Plantilla per a transcripció de cant gregorià @appendixsubsec Plantilla per a transcripció de cant gregorià @@ -242,6 +241,5 @@ LilyPond i gaudir d'unes belles partitures impreses! @appendixsubsec Combo de jazz @translationof Jazz combo -@c Line-width below is because of Issue 766. If that's fixed, it can be removed. -@lilypondfile[verbatim,quote,ragged-right,texidoc,line-width=140] +@lilypondfile[verbatim,quote,ragged-right,texidoc] {jazz-combo-template.ly} diff --git a/Documentation/cs/learning/templates.itely b/Documentation/cs/learning/templates.itely index 6e4c63b2f7..85ca4061f0 100644 --- a/Documentation/cs/learning/templates.itely +++ b/Documentation/cs/learning/templates.itely @@ -143,7 +143,7 @@ not! @appendixsubsec Přepis menzurální hudby @lilypondfile[verbatim,quote,ragged-right,texidoc] -{ancient-notation-template----modern-transcription-of-mensural-music.ly} +{incipit.ly} @appendixsubsec Předlohy pro přepis gregorianik diff --git a/Documentation/de/learning/templates.itely b/Documentation/de/learning/templates.itely index d188635ef2..a31cd4fc4a 100644 --- a/Documentation/de/learning/templates.itely +++ b/Documentation/de/learning/templates.itely @@ -154,9 +154,8 @@ schönen Notenbild erfreuen! @translationof Ancient notation templates @appendixsubsec Transkription mensuraler Musik -@c Line-width below is because of Issue 766. If that's fixed, it can be removed. -@lilypondfile[verbatim,quote,ragged-right,texidoc,line-width=140] -{ancient-notation-template----modern-transcription-of-mensural-music.ly} +@lilypondfile[verbatim,quote,ragged-right,texidoc] +{incipit.ly} @appendixsubsec Vorlage zur Transkription von Gregorianik @@ -172,8 +171,7 @@ schönen Notenbild erfreuen! @appendixsubsec Jazz-Combo @translationof Jazz combo -@c Line-width below is because of Issue 766. If that's fixed, it can be removed. -@lilypondfile[verbatim,quote,ragged-right,texidoc,line-width=140] +@lilypondfile[verbatim,quote,ragged-right,texidoc] {jazz-combo-template.ly} diff --git a/Documentation/es/learning/templates.itely b/Documentation/es/learning/templates.itely index ce9b26d388..e3aa730163 100644 --- a/Documentation/es/learning/templates.itely +++ b/Documentation/es/learning/templates.itely @@ -219,9 +219,8 @@ unas hermosas partituras impresas! @appendixsubsec Transcripción de música mensural @translationof Transcription of mensural music -@c Line-width below is because of Issue 766. If that's fixed, it can be removed. -@lilypondfile[verbatim,quote,ragged-right,texidoc,line-width=140] -{ancient-notation-template----modern-transcription-of-mensural-music.ly} +@lilypondfile[verbatim,quote,ragged-right,texidoc] +{incipit.ly} @node Plantilla para transcripción de canto gregoriano @appendixsubsec Plantilla para transcripción de canto gregoriano @@ -243,8 +242,7 @@ unas hermosas partituras impresas! @appendixsubsec Combo de jazz @translationof Jazz combo -@c Line-width below is because of Issue 766. If that's fixed, it can be removed. -@lilypondfile[verbatim,quote,ragged-right,texidoc,line-width=140] +@lilypondfile[verbatim,quote,ragged-right,texidoc] {jazz-combo-template.ly} diff --git a/Documentation/fr/learning/templates.itely b/Documentation/fr/learning/templates.itely index faaef02aed..edf71a5127 100644 --- a/Documentation/fr/learning/templates.itely +++ b/Documentation/fr/learning/templates.itely @@ -420,9 +420,8 @@ adopter une construction préprogrammée appelée par une instruction @appendixsubsec Transcription de musique mensurale @translationof Transcription of mensural music -@c Line-width below is because of Issue 766. If that's fixed, it can be removed. -@lilypondfile[verbatim,quote,ragged-right,texidoc,line-width=140] -{ancient-notation-template----modern-transcription-of-mensural-music.ly} +@lilypondfile[verbatim,quote,ragged-right,texidoc] +{incipit.ly} @node Transcription du grégorien @@ -446,6 +445,5 @@ adopter une construction préprogrammée appelée par une instruction @appendixsubsec Symboles de jazz @translationof Jazz combo -@c Line-width below is because of Issue 766. If that's fixed, it can be removed. -@lilypondfile[verbatim,quote,ragged-right,texidoc,line-width=140] +@lilypondfile[verbatim,quote,ragged-right,texidoc] {jazz-combo-template.ly} diff --git a/Documentation/it/learning/templates.itely b/Documentation/it/learning/templates.itely index cc6ed31f3f..ecc82011f0 100644 --- a/Documentation/it/learning/templates.itely +++ b/Documentation/it/learning/templates.itely @@ -396,9 +396,8 @@ inclusi con @code{include}, come è spiegato in @ref{Built-in templates}. @appendixsubsec Trascrizione di musica mensurale @translationof Transcription of mensural music -@c Line-width below is because of Issue 766. If that's fixed, it can be removed. -@lilypondfile[verbatim,quote,ragged-right,texidoc,line-width=140] -{ancient-notation-template----modern-transcription-of-mensural-music.ly} +@lilypondfile[verbatim,quote,ragged-right,texidoc] +{incipit.ly} @node Trascrizione di musica Gregoriana @appendixsubsec Trascrizione di musica Gregoriana @@ -420,8 +419,7 @@ inclusi con @code{include}, come è spiegato in @ref{Built-in templates}. @appendixsubsec Combo jazz @translationof Jazz combo -@c Line-width below is because of Issue 766. If that's fixed, it can be removed. -@lilypondfile[verbatim,quote,ragged-right,texidoc,line-width=140] +@lilypondfile[verbatim,quote,ragged-right,texidoc] {jazz-combo-template.ly} diff --git a/Documentation/ja/learning/templates.itely b/Documentation/ja/learning/templates.itely index de6f029732..af5077d0b0 100644 --- a/Documentation/ja/learning/templates.itely +++ b/Documentation/ja/learning/templates.itely @@ -223,7 +223,7 @@ @appendixsubsec Transcription of mensural music @lilypondfile[verbatim,quote,ragged-right,texidoc] -{ancient-notation-template----modern-transcription-of-mensural-music.ly} +{incipit.ly} @node Gregorian transcription template @appendixsubsec Gregorian transcription template @@ -244,7 +244,6 @@ @appendixsubsec ジャズ バンド @translationof Jazz combo -@c Line-width below is because of Issue 766. If that's fixed, it can be removed. @lilypondfile[verbatim,quote,ragged-right,texidoc] {jazz-combo-template.ly} diff --git a/Documentation/learning/templates.itely b/Documentation/learning/templates.itely index 1fd7b7b466..9b82f46862 100644 --- a/Documentation/learning/templates.itely +++ b/Documentation/learning/templates.itely @@ -370,9 +370,8 @@ use the built-in templates, which can simply be @code{\include}'d, see @node Transcription of mensural music @appendixsubsec Transcription of mensural music -@c Line-width below is because of Issue 766. If that's fixed, it can be removed. -@lilypondfile[verbatim,quote,ragged-right,texidoc,line-width=140] -{ancient-notation-template----modern-transcription-of-mensural-music.ly} +@lilypondfile[verbatim,quote,ragged-right,texidoc] +{incipit.ly} @node Gregorian transcription template @appendixsubsec Gregorian transcription template @@ -391,8 +390,7 @@ use the built-in templates, which can simply be @code{\include}'d, see @node Jazz combo @appendixsubsec Jazz combo -@c Line-width below is because of Issue 766. If that's fixed, it can be removed. -@lilypondfile[verbatim,quote,ragged-right,texidoc,line-width=140] +@lilypondfile[verbatim,quote,ragged-right,texidoc] {jazz-combo-template.ly} diff --git a/Documentation/nl/learning/templates.itely b/Documentation/nl/learning/templates.itely index 7f7d1c93fa..36fcf4ee7f 100644 --- a/Documentation/nl/learning/templates.itely +++ b/Documentation/nl/learning/templates.itely @@ -193,9 +193,8 @@ beautiful printed scores! @node Transcription of mensural music @appendixsubsec Transcription of mensural music -@c Line-width below is because of Issue 766. If that's fixed, it can be removed. -@lilypondfile[verbatim,quote,ragged-right,texidoc,line-width=140] -{ancient-notation-template----modern-transcription-of-mensural-music.ly} +@lilypondfile[verbatim,quote,ragged-right,texidoc] +{incipit.ly} @node Gregorian transcription template @appendixsubsec Gregorian transcription template @@ -214,8 +213,7 @@ beautiful printed scores! @node Jazz combo @appendixsubsec Jazz combo -@c Line-width below is because of Issue 766. If that's fixed, it can be removed. -@lilypondfile[verbatim,quote,ragged-right,texidoc,line-width=140] +@lilypondfile[verbatim,quote,ragged-right,texidoc] {jazz-combo-template.ly} diff --git a/Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly b/Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly deleted file mode 100644 index b03a124a46..0000000000 --- a/Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly +++ /dev/null @@ -1,250 +0,0 @@ -%% DO NOT EDIT this file manually; it is automatically -%% generated from LSR http://lsr.di.unimi.it -%% Make any changes in LSR itself, or in Documentation/snippets/new/ , -%% and then run scripts/auxiliar/makelsr.py -%% -%% This file is in the public domain. -\version "2.18.0" - -\header { - lsrtags = "ancient-notation, real-music, really-cool, template" - - texidoc = " -When transcribing mensural music, an incipit at the beginning of the -piece is useful to indicate the original key and tempo. While today -musicians are used to bar lines in order to faster recognize rhythmic -patterns, bar lines were not yet invented during the period of mensural -music; in fact, the meter often changed after every few notes. As a -compromise, bar lines are often printed between the staves rather than -on the staves. - -" - doctitle = "Ancient notation template -- modern transcription of mensural music" -} % begin verbatim - -global = { - \set Score.skipBars = ##t - - % incipit - \once \hide Score.SystemStartBracket - % Set tight spacing - \override Score.SpacingSpanner.spacing-increment = #1.0 - \key f \major - \time 2/2 - \once \override Staff.TimeSignature.style = #'neomensural - \override Voice.NoteHead.style = #'neomensural - \override Voice.Rest.style = #'neomensural - \set Staff.printKeyCancellation = ##f - \cadenzaOn % turn off bar lines - \skip 1*10 - \once \override Staff.BarLine.transparent = ##f - \bar "||" - \skip 1*1 % need this extra \skip such that clef change comes - % after bar line - \bar "" - - % main - \cadenzaOff % turn bar lines on again - \once \override Staff.Clef.full-size-change = ##t - \set Staff.forceClef = ##t - \key g \major - \time 4/4 - \override Voice.NoteHead.style = #'default - \override Voice.Rest.style = #'default - - % Setting printKeyCancellation back to #t must not - % occur in the first bar after the incipit. Dto. for forceClef. - % Therefore, we need an extra \skip. - \skip 1*1 - \set Staff.printKeyCancellation = ##t - \set Staff.forceClef = ##f - - \skip 1*7 % the actual music - - % let finis bar go through all staves - \override Staff.BarLine.transparent = ##f - - % finis bar - \bar "|." -} - -discantusNotes = { - \transpose c' c'' { - \set Staff.instrumentName = #"Discantus " - - % incipit - \clef "neomensural-c1" - c'1. s2 % two bars - \skip 1*8 % eight bars - \skip 1*1 % one bar - - % main - \clef "treble" - d'2. d'4 | - b e' d'2 | - c'4 e'4.( d'8 c' b | - a4) b a2 | - b4.( c'8 d'4) c'4 | - \once \hide NoteHead c'1 | - b\breve | - } -} - -discantusLyrics = \lyricmode { - % incipit - IV- - - % main - Ju -- bi -- | - la -- te De -- | - o, om -- - nis ter -- | - ra, __ om- | - "..." | - -us. | -} - -altusNotes = { - \transpose c' c'' { - \set Staff.instrumentName = #"Altus " - - % incipit - \clef "neomensural-c3" - r1 % one bar - f1. s2 % two bars - \skip 1*7 % seven bars - \skip 1*1 % one bar - - % main - \clef "treble" - r2 g2. e4 fis g | % two bars - a2 g4 e | - fis g4.( fis16 e fis4) | - g1 | - \once \hide NoteHead g1 | - g\breve | - } -} - -altusLyrics = \lyricmode { - % incipit - IV- - - % main - Ju -- bi -- la -- te | % two bars - De -- o, om -- | - nis ter -- ra, | - "..." | - -us. | -} - -tenorNotes = { - \transpose c' c' { - \set Staff.instrumentName = #"Tenor " - - % incipit - \clef "neomensural-c4" - r\longa % four bars - r\breve % two bars - r1 % one bar - c'1. s2 % two bars - \skip 1*1 % one bar - \skip 1*1 % one bar - - % main - \clef "treble_8" - R1 | - R1 | - R1 | - r2 d'2. d'4 b e' | % two bars - \once \hide NoteHead e'1 | - d'\breve | - } -} - -tenorLyrics = \lyricmode { - % incipit - IV- - - % main - Ju -- bi -- la -- te | % two bars - "..." | - -us. | -} - -bassusNotes = { - \transpose c' c' { - \set Staff.instrumentName = #"Bassus " - - % incipit - \clef "bass" - r\maxima % eight bars - f1. s2 % two bars - \skip 1*1 % one bar - - % main - \clef "bass" - R1 | - R1 | - R1 | - R1 | - g2. e4 | - \once \hide NoteHead e1 | - g\breve | - } -} - -bassusLyrics = \lyricmode { - % incipit - IV- - - % main - Ju -- bi- | - "..." | - -us. | -} - -\score { - \new StaffGroup = choirStaff << - \new Voice = - "discantusNotes" << \global \discantusNotes >> - \new Lyrics = - "discantusLyrics" \lyricsto discantusNotes { \discantusLyrics } - \new Voice = - "altusNotes" << \global \altusNotes >> - \new Lyrics = - "altusLyrics" \lyricsto altusNotes { \altusLyrics } - \new Voice = - "tenorNotes" << \global \tenorNotes >> - \new Lyrics = - "tenorLyrics" \lyricsto tenorNotes { \tenorLyrics } - \new Voice = - "bassusNotes" << \global \bassusNotes >> - \new Lyrics = - "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics } - >> - \layout { - \context { - \Score - - % no bars in staves - \hide BarLine - - % incipit should not start with a start delimiter - \remove "System_start_delimiter_engraver" - } - \context { - \Voice - - % no slurs - \hide Slur - - % The command below can be commented out in - % short scores, but especially for large scores you - % will typically yield better line breaking and improve - % overall spacing if you do not comment the command out. - - \remove "Forbid_line_break_engraver" - } - } -} diff --git a/Documentation/snippets/ancient-notation.snippet-list b/Documentation/snippets/ancient-notation.snippet-list index 79f96b4454..f75ad047d8 100644 --- a/Documentation/snippets/ancient-notation.snippet-list +++ b/Documentation/snippets/ancient-notation.snippet-list @@ -1,12 +1,10 @@ adding-a-figured-bass-above-or-below-the-notes.ly ancient-fonts.ly ancient-notation-template----modern-transcription-of-gregorian-music.ly -ancient-notation-template----modern-transcription-of-mensural-music.ly ancient-time-signatures.ly chant-or-psalms-notation.ly custodes.ly incipit.ly mensurstriche-layout-bar-lines-between-the-staves.ly rest-styles.ly -transcription-of-ancient-music-with-incipit.ly vertical-line-as-a-baroque-articulation-mark.ly diff --git a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly index b0fc8eb5e7..514718f9bd 100644 --- a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly +++ b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly @@ -12,7 +12,7 @@ texidoc = " Beat grouping within a measure is controlled by the context property @code{beatStructure}. Values of @code{beatStructure} are established -for many time signatures in @file{scm/time-signature-settings.scm}. +for many time signatures in @@file@{scm/time-signature-settings.scm@}. Values of @code{beatStructure} can be changed or set with @code{\\set}. Alternatively, @code{\\time} can be used to both set the time signature and establish the beat structure. For this, you specify the internal @@ -28,7 +28,7 @@ display contexts, measure grouping signs will be created. Such signs ease reading rhythmically complex modern music. In the example, the 9/8 measure is grouped in two different patterns using the two different methods, while the 5/8 measure is grouped according to the default -setting in @file{scm/time-signature-settings.scm}: +setting in @@file@{scm/time-signature-settings.scm@}: " doctitle = "Conducting signs measure grouping signs" diff --git a/Documentation/snippets/incipit.ly b/Documentation/snippets/incipit.ly index 4674257d0d..522bf1d730 100644 --- a/Documentation/snippets/incipit.ly +++ b/Documentation/snippets/incipit.ly @@ -1,57 +1,30 @@ -%% DO NOT EDIT this file manually; it is automatically -%% generated from LSR http://lsr.di.unimi.it -%% Make any changes in LSR itself, or in Documentation/snippets/new/ , -%% and then run scripts/auxiliar/makelsr.py -%% -%% This file is in the public domain. -\version "2.18.0" +% DO NOT EDIT this file manually; it is automatically +% generated from Documentation/snippets/new +% Make any changes in Documentation/snippets/new/ +% and then run scripts/auxiliar/makelsr.py +% +% This file is in the public domain. +%% Note: this file works from version 2.19.16 +\version "2.19.16" \header { - lsrtags = "ancient-notation, really-cool, staff-notation" + lsrtags = "ancient-notation, staff-notation" texidoc = " -Incipits can be added using the instrument name grob, but keeping -separate the instrument name definition and the incipit definition. - +When transcribing mensural music, an incipit at the beginning of the piece is +useful to indicate the original key and tempo. Musicians today are used +to bar lines, but these were not known during the period of mensural music. As +a compromise, bar lines are often printed between the staves, a layout style +called mensurstriche layout. " + doctitle = "Incipit" } % begin verbatim -incipit = -#(define-music-function (parser location incipit-music) (ly:music?) - #{ - \once \override Staff.InstrumentName.self-alignment-X = #RIGHT - \once \override Staff.InstrumentName.self-alignment-Y = ##f - \once \override Staff.InstrumentName.padding = #0.3 - \once \override Staff.InstrumentName.stencil = - #(lambda (grob) - (let* ((instrument-name (ly:grob-property grob 'long-text))) - (set! (ly:grob-property grob 'long-text) - #{ \markup - \score - { - { \context MensuralStaff \with { - instrumentName = #instrument-name - } $incipit-music - } - \layout { $(ly:grob-layout grob) - line-width = \indent - indent = - % primitive-eval is probably easiest for - % escaping lexical closure and evaluating - % everything respective to (current-module). - #(primitive-eval - '(or (false-if-exception (- indent incipit-width)) - (* 0.5 indent))) - ragged-right = ##f - ragged-last = ##f - system-count = #1 } - } - #}) - (system-start-text::print grob))) - #}) -%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% A short excerpt from the Jubilate Deo by Orlande de Lassus +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% global = { \set Score.skipBars = ##t @@ -68,18 +41,12 @@ global = { \bar "|." } -discantusIncipit = << - \new MensuralVoice = "discantusIncipit" << - \repeat unfold 9 { s1 \noBreak } - { - \clef "neomensural-c1" - \key f \major - \time 2/2 - c''1. - } - >> - \new Lyrics \lyricsto discantusIncipit { IV- } ->> +discantusIncipit = { + \clef "neomensural-c1" + \key f \major + \time 2/2 + c''1. +} discantusNotes = { \transpose c' c'' { @@ -96,32 +63,22 @@ discantusNotes = { } discantusLyrics = \lyricmode { - Ju -- bi -- | - la -- te De -- | - o, om -- - nis ter -- | - ra, __ om- | - "..." | - -us. | + Ju -- bi -- la -- te De -- o, + om -- nis ter -- ra, __ om- + "..." + -us. } -altusIncipit = << - \new MensuralVoice = "altusIncipit" << - \repeat unfold 9 { s1 \noBreak } - { - \clef "neomensural-c3" - \key f \major - \time 2/2 - r1 f'1. - } - >> - \new Lyrics \lyricsto altusIncipit { IV- } ->> +altusIncipit = { + \clef "neomensural-c3" + \key f \major + \time 2/2 + r1 f'1. +} altusNotes = { \transpose c' c'' { \clef "treble" - % two measures r2 g2. e4 fis g | a2 g4 e | fis g4.( fis16 e fis4) | @@ -133,28 +90,20 @@ altusNotes = { } altusLyrics = \lyricmode { - % two measures - Ju -- bi -- la -- te | - De -- o, om -- | - nis ter -- ra, | - "..." | - -us. | + Ju -- bi -- la -- te + De -- o, om -- nis ter -- ra, + "..." + -us. } -tenorIncipit = << - \new MensuralVoice = "tenorIncipit" << - \repeat unfold 9 { s1 \noBreak } - { - \clef "neomensural-c4" - \key f \major - \time 2/2 - r\longa - r\breve - r1 c'1. - } - >> - \new Lyrics \lyricsto tenorIncipit { IV- } ->> +tenorIncipit = { + \clef "neomensural-c4" + \key f \major + \time 2/2 + r\longa + r\breve + r1 c'1. +} tenorNotes = { \transpose c' c' { @@ -171,26 +120,18 @@ tenorNotes = { } tenorLyrics = \lyricmode { - % two measures - Ju -- bi -- la -- te | - "..." | + Ju -- bi -- la -- te + "..." -us. } -bassusIncipit = << - \new MensuralVoice = "bassusIncipit" << - \repeat unfold 9 { s1 \noBreak } - { - \clef "bass" - \key f \major - \time 2/2 - %% incipit - r\maxima - f1. - } - >> - \new Lyrics \lyricsto bassusIncipit { IV- } ->> +bassusIncipit = { + \clef "mensural-f" + \key f \major + \time 2/2 + r\maxima + f1. +} bassusNotes = { \transpose c' c' { @@ -207,8 +148,8 @@ bassusNotes = { } bassusLyrics = \lyricmode { - Ju -- bi- | - "..." | + Ju -- bi- + "..." -us. } @@ -216,33 +157,33 @@ bassusLyrics = \lyricmode { << \new StaffGroup = choirStaff << \new Voice = "discantusNotes" << - \global \set Staff.instrumentName = #"Discantus" \incipit \discantusIncipit + \global \discantusNotes >> - \new Lyrics = "discantusLyrics" \lyricsto discantusNotes { \discantusLyrics } + \new Lyrics \lyricsto discantusNotes { \discantusLyrics } \new Voice = "altusNotes" << - \global \set Staff.instrumentName = #"Altus" + \global \incipit \altusIncipit \altusNotes >> - \new Lyrics = "altusLyrics" \lyricsto altusNotes { \altusLyrics } + \new Lyrics \lyricsto altusNotes { \altusLyrics } \new Voice = "tenorNotes" << - \global \set Staff.instrumentName = #"Tenor" + \global \incipit \tenorIncipit \tenorNotes >> - \new Lyrics = "tenorLyrics" \lyricsto tenorNotes { \tenorLyrics } + \new Lyrics \lyricsto tenorNotes { \tenorLyrics } \new Voice = "bassusNotes" << - \global \set Staff.instrumentName = #"Bassus" + \global \incipit \bassusIncipit \bassusNotes >> - \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics } + \new Lyrics \lyricsto bassusNotes { \bassusLyrics } >> >> \layout { diff --git a/Documentation/snippets/new/incipit.ly b/Documentation/snippets/new/incipit.ly new file mode 100644 index 0000000000..584afaa9fc --- /dev/null +++ b/Documentation/snippets/new/incipit.ly @@ -0,0 +1,208 @@ +\version "2.19.16" + +\header { + lsrtags = "ancient-notation, staff-notation" + + texidoc = " +When transcribing mensural music, an incipit at the beginning of the piece is +useful to indicate the original key and tempo. Musicians today are used +to bar lines, but these were not known during the period of mensural music. As +a compromise, bar lines are often printed between the staves, a layout style +called mensurstriche layout. +" + + doctitle = "Incipit" +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% A short excerpt from the Jubilate Deo by Orlande de Lassus +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +global = { + \set Score.skipBars = ##t + \key g \major + \time 4/4 + + % the actual music + \skip 1*8 + + % let finis bar go through all staves + \override Staff.BarLine.transparent = ##f + + % finis bar + \bar "|." +} + +discantusIncipit = { + \clef "neomensural-c1" + \key f \major + \time 2/2 + c''1. +} + +discantusNotes = { + \transpose c' c'' { + \clef "treble" + d'2. d'4 | + b e' d'2 | + c'4 e'4.( d'8 c' b | + a4) b a2 | + b4.( c'8 d'4) c'4 | + \once \hide NoteHead + c'1 | + b\breve | + } +} + +discantusLyrics = \lyricmode { + Ju -- bi -- la -- te De -- o, + om -- nis ter -- ra, __ om- + "..." + -us. +} + +altusIncipit = { + \clef "neomensural-c3" + \key f \major + \time 2/2 + r1 f'1. +} + +altusNotes = { + \transpose c' c'' { + \clef "treble" + r2 g2. e4 fis g | + a2 g4 e | + fis g4.( fis16 e fis4) | + g1 | + \once \hide NoteHead + g1 | + g\breve | + } +} + +altusLyrics = \lyricmode { + Ju -- bi -- la -- te + De -- o, om -- nis ter -- ra, + "..." + -us. +} + +tenorIncipit = { + \clef "neomensural-c4" + \key f \major + \time 2/2 + r\longa + r\breve + r1 c'1. +} + +tenorNotes = { + \transpose c' c' { + \clef "treble_8" + R1 | + R1 | + R1 | + % two measures + r2 d'2. d'4 b e' | + \once \hide NoteHead + e'1 | + d'\breve | + } +} + +tenorLyrics = \lyricmode { + Ju -- bi -- la -- te + "..." + -us. +} + +bassusIncipit = { + \clef "mensural-f" + \key f \major + \time 2/2 + r\maxima + f1. +} + +bassusNotes = { + \transpose c' c' { + \clef "bass" + R1 | + R1 | + R1 | + R1 | + g2. e4 | + \once \hide NoteHead + e1 | + g\breve | + } +} + +bassusLyrics = \lyricmode { + Ju -- bi- + "..." + -us. +} + +\score { + << + \new StaffGroup = choirStaff << + \new Voice = "discantusNotes" << + \set Staff.instrumentName = #"Discantus" + \incipit \discantusIncipit + \global + \discantusNotes + >> + \new Lyrics \lyricsto discantusNotes { \discantusLyrics } + \new Voice = "altusNotes" << + \set Staff.instrumentName = #"Altus" + \global + \incipit \altusIncipit + \altusNotes + >> + \new Lyrics \lyricsto altusNotes { \altusLyrics } + \new Voice = "tenorNotes" << + \set Staff.instrumentName = #"Tenor" + \global + \incipit \tenorIncipit + \tenorNotes + >> + \new Lyrics \lyricsto tenorNotes { \tenorLyrics } + \new Voice = "bassusNotes" << + \set Staff.instrumentName = #"Bassus" + \global + \incipit \bassusIncipit + \bassusNotes + >> + \new Lyrics \lyricsto bassusNotes { \bassusLyrics } + >> + >> + \layout { + \context { + \Score + %% no bar lines in staves or lyrics + \hide BarLine + } + %% the next two instructions keep the lyrics between the bar lines + \context { + \Lyrics + \consists "Bar_engraver" + \consists "Separating_line_group_engraver" + } + \context { + \Voice + %% no slurs + \hide Slur + %% Comment in the below "\remove" command to allow line + %% breaking also at those bar lines where a note overlaps + %% into the next measure. The command is commented out in this + %% short example score, but especially for large scores, you + %% will typically yield better line breaking and thus improve + %% overall spacing if you comment in the following command. + %%\remove "Forbid_line_break_engraver" + } + indent = 6\cm + incipit-width = 4\cm + } +} diff --git a/Documentation/snippets/real-music.snippet-list b/Documentation/snippets/real-music.snippet-list index 67467c170c..a00d629147 100644 --- a/Documentation/snippets/real-music.snippet-list +++ b/Documentation/snippets/real-music.snippet-list @@ -1,4 +1,3 @@ -ancient-notation-template----modern-transcription-of-mensural-music.ly changing-midi-output-to-one-channel-per-voice.ly creating-a-sequence-of-notes-on-various-pitches.ly creating-slurs-across-voices.ly diff --git a/Documentation/snippets/really-cool.snippet-list b/Documentation/snippets/really-cool.snippet-list index 507d91f7cc..606a423463 100644 --- a/Documentation/snippets/really-cool.snippet-list +++ b/Documentation/snippets/really-cool.snippet-list @@ -1,5 +1,4 @@ adding-the-current-date-to-a-score.ly -ancient-notation-template----modern-transcription-of-mensural-music.ly blanking-staff-lines-using-the--whiteout-command.ly center-text-below-hairpin-dynamics.ly changing-properties-for-individual-grobs.ly @@ -9,7 +8,6 @@ creating-a-sequence-of-notes-on-various-pitches.ly embedding-native-postscript-in-a--markup-block.ly generating-random-notes.ly generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly -incipit.ly making-some-staff-lines-thicker-than-the-others.ly non-traditional-key-signatures.ly printing-music-with-different-time-signatures.ly diff --git a/Documentation/snippets/specific-notation.snippet-list b/Documentation/snippets/specific-notation.snippet-list index dd4195d73b..b372f9879f 100644 --- a/Documentation/snippets/specific-notation.snippet-list +++ b/Documentation/snippets/specific-notation.snippet-list @@ -26,6 +26,5 @@ laissez-vibrer-ties.ly score-for-diatonic-accordion.ly time-signature-in-parentheses---method-3.ly time-signature-in-parentheses.ly -transcription-of-ancient-music-with-incipit.ly using-an-extra-voice-for-breaks.ly woodwind-diagrams-listing.ly diff --git a/Documentation/snippets/template.snippet-list b/Documentation/snippets/template.snippet-list index 45be61d85b..a1f03e998d 100644 --- a/Documentation/snippets/template.snippet-list +++ b/Documentation/snippets/template.snippet-list @@ -1,5 +1,4 @@ ancient-notation-template----modern-transcription-of-gregorian-music.ly -ancient-notation-template----modern-transcription-of-mensural-music.ly anglican-psalm-template.ly hymn-template.ly jazz-combo-template.ly diff --git a/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly b/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly deleted file mode 100644 index 28ae9b4451..0000000000 --- a/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly +++ /dev/null @@ -1,278 +0,0 @@ -%% DO NOT EDIT this file manually; it is automatically -%% generated from LSR http://lsr.di.unimi.it -%% Make any changes in LSR itself, or in Documentation/snippets/new/ , -%% and then run scripts/auxiliar/makelsr.py -%% -%% This file is in the public domain. -\version "2.18.0" - -\header { - lsrtags = "ancient-notation, specific-notation, tweaks-and-overrides, workaround" - - texidoc = " -As a workaround to get real incipits which are independent from the -main score these are included as a markup into the field normally used -for the instrument name. As for now lyrics can only be added as a -direct markup. It doesn't unfortunately conform with the spacing of the -main lyrics. - -" - doctitle = "Transcription of Ancient music with incipit" -} % begin verbatim - -incipit = -#(define-music-function (parser location incipit-music) (ly:music?) - #{ - \once \override Staff.InstrumentName.self-alignment-X = #RIGHT - \once \override Staff.InstrumentName.self-alignment-Y = ##f - \once \override Staff.InstrumentName.padding = #0.3 - \once \override Staff.InstrumentName.stencil = - #(lambda (grob) - (let* ((instrument-name (ly:grob-property grob 'long-text))) - (set! (ly:grob-property grob 'long-text) - #{ \markup - \score - { - { \context MensuralStaff \with { - instrumentName = #instrument-name - } $incipit-music - } - \layout { $(ly:grob-layout grob) - line-width = \indent - indent = - % primitive-eval is probably easiest for - % escaping lexical closure and evaluating - % everything respective to (current-module). - #(primitive-eval - '(or (false-if-exception (- indent incipit-width)) - (* 0.5 indent))) - ragged-right = ##f - ragged-last = ##f - system-count = #1 } - } - #}) - (system-start-text::print grob))) - #}) - -%%%%%%%%%%%%%%%%%%%%%%%%% - -global = { - \set Score.skipBars = ##t - \key g \major - \time 4/4 - - % the actual music - \skip 1*8 - - % let finis bar go through all staves - \override Staff.BarLine.transparent = ##f - - % finis bar - \bar "|." -} - -discantusIncipit = << - \new MensuralVoice = "discantusIncipit" << - \repeat unfold 9 { s1 \noBreak } - { - \clef "neomensural-c1" - \key f \major - \time 2/2 - c''1. - } - >> - \new Lyrics \lyricsto discantusIncipit { IV- } ->> - -discantusNotes = { - \transpose c' c'' { - \clef "treble" - d'2. d'4 | - b e' d'2 | - c'4 e'4.( d'8 c' b | - a4) b a2 | - b4.( c'8 d'4) c'4 | - \once \hide NoteHead - c'1 | - b\breve | - } -} - -discantusLyrics = \lyricmode { - Ju -- bi -- | - la -- te De -- | - o, om -- - nis ter -- | - ra, __ om- | - "..." | - -us. | -} - -altusIncipit = << - \new MensuralVoice = "altusIncipit" << - \repeat unfold 9 { s1 \noBreak } - { - \clef "neomensural-c3" - \key f \major - \time 2/2 - r1 f'1. - } - >> - \new Lyrics \lyricsto altusIncipit { IV- } ->> - -altusNotes = { - \transpose c' c'' { - \clef "treble" - % two measures - r2 g2. e4 fis g | - a2 g4 e | - fis g4.( fis16 e fis4) | - g1 | - \once \hide NoteHead - g1 | - g\breve | - } -} - -altusLyrics = \lyricmode { - % two measures - Ju -- bi -- la -- te | - De -- o, om -- | - nis ter -- ra, | - "..." | - -us. | -} - -tenorIncipit = << - \new MensuralVoice = "tenorIncipit" << - \repeat unfold 9 { s1 \noBreak } - { - \clef "neomensural-c4" - \key f \major - \time 2/2 - r\longa - r\breve - r1 c'1. - } - >> - \new Lyrics \lyricsto tenorIncipit { IV- } ->> - -tenorNotes = { - \transpose c' c' { - \clef "treble_8" - R1 | - R1 | - R1 | - % two measures - r2 d'2. d'4 b e' | - \once \hide NoteHead - e'1 | - d'\breve | - } -} - -tenorLyrics = \lyricmode { - % two measures - Ju -- bi -- la -- te | - "..." | - -us. -} - -bassusIncipit = << - \new MensuralVoice = "bassusIncipit" << - \repeat unfold 9 { s1 \noBreak } - { - \clef "bass" - \key f \major - \time 2/2 - %% incipit - r\maxima - f1. - } - >> - \new Lyrics \lyricsto bassusIncipit { IV- } ->> - -bassusNotes = { - \transpose c' c' { - \clef "bass" - R1 | - R1 | - R1 | - R1 | - g2. e4 | - \once \hide NoteHead - e1 | - g\breve | - } -} - -bassusLyrics = \lyricmode { - Ju -- bi- | - "..." | - -us. -} - -\score { - << - \new StaffGroup = choirStaff << - \new Voice = "discantusNotes" << - \global - \set Staff.instrumentName = #"Discantus " - \incipit \discantusIncipit - \discantusNotes - >> - \new Lyrics = "discantusLyrics" \lyricsto discantusNotes { \discantusLyrics } - \new Voice = "altusNotes" << - \global - \set Staff.instrumentName = #"Altus " - \incipit \altusIncipit - \altusNotes - >> - \new Lyrics = "altusLyrics" \lyricsto altusNotes { \altusLyrics } - \new Voice = "tenorNotes" << - \global - \set Staff.instrumentName = #"Tenor " - \incipit \tenorIncipit - \tenorNotes - >> - \new Lyrics = "tenorLyrics" \lyricsto tenorNotes { \tenorLyrics } - \new Voice = "bassusNotes" << - \global - \set Staff.instrumentName = #"Bassus " - \incipit \bassusIncipit - \bassusNotes - >> - \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics } - >> - >> - \layout { - \context { - \Score - %% no bar lines in staves or lyrics - \hide BarLine - } - %% the next two instructions keep the lyrics between the bar lines - \context { - \Lyrics - \consists "Bar_engraver" - \consists "Separating_line_group_engraver" - } - \context { - \Voice - %% no slurs - \hide Slur - %% Comment in the below "\remove" command to allow line - %% breaking also at those bar lines where a note overlaps - %% into the next measure. The command is commented out in this - %% short example score, but especially for large scores, you - %% will typically yield better line breaking and thus improve - %% overall spacing if you comment in the following command. - %%\remove "Forbid_line_break_engraver" - } - indent = 6\cm - incipit-width = 4\cm - } -} diff --git a/Documentation/snippets/tweaks-and-overrides.snippet-list b/Documentation/snippets/tweaks-and-overrides.snippet-list index 6ca05f41e5..bbda0d49ca 100644 --- a/Documentation/snippets/tweaks-and-overrides.snippet-list +++ b/Documentation/snippets/tweaks-and-overrides.snippet-list @@ -85,7 +85,6 @@ suppressing-warnings-for-clashing-note-columns.ly time-signature-in-parentheses---method-3.ly time-signature-in-parentheses.ly time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly -transcription-of-ancient-music-with-incipit.ly tuplet-bracket-and-change-staff.ly tweaking-clef-properties.ly tweaking-grace-layout-within-music.ly diff --git a/Documentation/snippets/workaround.snippet-list b/Documentation/snippets/workaround.snippet-list index 3167e71737..d1e641f4a5 100644 --- a/Documentation/snippets/workaround.snippet-list +++ b/Documentation/snippets/workaround.snippet-list @@ -14,7 +14,6 @@ marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly measure-counter.ly positioning-segno-and-coda-with-line-break.ly printing-text-from-right-to-left.ly -transcription-of-ancient-music-with-incipit.ly transposing-pitches-with-minimum-accidentals-smart-transpose.ly using-an-extra-voice-for-breaks.ly vertically-aligned-dynamics-and-textscripts.ly -- 2.39.2