X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fpuer-fragment.ly;h=f05fa6a0a7eca4778d7ea80933e729acd3b91687;hb=5ea982187f9aebfe588225813be14c48020452f3;hp=c53c8e5912411e4a58cc07a97e2cd0e3d2094dd8;hpb=833d34025e532630f273076f7eb47c399d90f396;p=lilypond.git diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly index c53c8e5912..f05fa6a0a7 100644 --- a/input/puer-fragment.ly +++ b/input/puer-fragment.ly @@ -1,120 +1,286 @@ -\version "2.1.11" +\version "2.12.0" \header { - title = "Puer natus est nobis (excerptum)" + title = "Puer natus est nobis" subtitle = "Antiphona ad introitum VII" texidoc = " Demonstrate gregorian chant notation -This file pretty nicely demonstrates what still does -not work among ligatures: (i) horizontal spacing between ligatures and -lyrics aligment is broken; (ii) lily crashes when removing -Stem_engraver, but still using Slur_engraver (this is useful needed -for the \addlyrics feature when no slurs are to be typeset); (iii) -episem causes a parse error (this used to work a while ago); (iv) -support for augmentum dots is missing; (v) accidentals must be placed -before the ligature (not demonstrated in this example)." +This file pretty nicely demonstrates what still does not work among +ligatures: (i) horizontal spacing between ligatures and lyrics +aligment is broken; (ii) there is no satisfactory support for +initials; (iii) all scripts are broken as soon as they appear within +ligatures, and episem is broken also outside of ligatures; (iv) +augmentum dots is missing; (v) accidentals must be placed before the +ligature (not demonstrated in this example)." } -#(set-staff-size 26) -\include "gregorian-init.ly" +#(set-global-staff-size 26) +\include "gregorian.ly" %%% N.B.: Yes, I know, the formatting of the following looks awful, %%% but this is intentional for editorial purposes (simplifies some %%% global search/replace operations in emacs). -cantus = \notes { - \[ g4 - ( %%% Pu- +cantus = \new VaticanaVoice = "cantus" { + \set Staff.instrumentName = \markup { + \column { + " " " " " " " " "VII" " " + { + \larger \larger \larger \larger + \larger \larger \larger \larger + \larger \larger \larger \larger + "P" + } + } + } + \[ + g4\melisma %%% Pu- \pes - d') + d'\melismaEnd \] - d' %%% er - \[ d' - ( %%% na- + d'\augmentum %%% er + \[ + d'\melisma %%% na- \pes e' \flexa - d') + d'\melismaEnd \] c' %%% tus - \[ c' - ( %%% est + \[ + c'\melisma %%% est c' - c') + c'\melismaEnd \] - \[ d' - ( %%% no- + \[ + d'\melisma %%% no- \flexa c' e' \flexa - d') + d'\melismaEnd \] - d' %%% bis, + d'\augmentum %%% bis, \divisioMaior - \[ g - ( %%% et + \[ + g\melisma %%% et \pes \deminutum - d') + d'\melismaEnd \] - \[ d' - ( %%% fi- + \[ + d'\melisma %%% fí- \pes e' \flexa - d') + d'\melismaEnd \] - \[ c' - ( %%% li- + \[ + c'\melisma %%% li- \flexa - b) + b\melismaEnd \] a %%% us - \[ c' - ( %%% da- + \[ + c'\melisma %%% da- c' \pes - d') + d'\melismaEnd \] c' %%% tus- c' %%% est - \[ c' - ( %%% no- + \[ + c'\melisma %%% no- \pes d' \flexa c' - c') + c'\melismaEnd \] - \[ g - ( %%% bis: + \[ + g\melisma %%% bis: \pes a \flexa - g) + g\melismaEnd\augmentum \] \divisioMaxima + g %%% cu- + a %%% ius + c' %%% im- + \[ + b\melisma %%% pé- + \pes d' e' + \pes f'\melismaEnd + \] + \[ + d'\melisma %%% ri- + \flexa c'\melismaEnd + \] + c'\augmentum %%% um + \divisioMinima + c' %%% su- + c' %%% per + \[ + d'\melisma %%% hú- + \flexa c' + e' \flexa + d'\melismaEnd + \] + \[ + c'\melisma %%% me- + \flexa b\melismaEnd + \] + \[ + c'\melisma %%% rum + c' c'\melismaEnd + \] + \[ + c'\melisma %%% e- + \flexa a + c' \flexa b + \virga c' \inclinatum b + \inclinatum a\melismaEnd + \] + \[ + b\melisma %%% ius: + \augmentum \flexa + a\melismaEnd \augmentum + \] + \divisioMaxima + \[ + c'\melisma %%% et + \flexa b\melismaEnd + \] + c' %%% vo- + \[ + c'\melisma %%% cá- + \pes e' \flexa + d'\melismaEnd + \] + c' %%% bi- + \[ + c'\melisma %%% tur + c' c'\melismaEnd + \] + c' %%% no- + \[ + c'\melisma %%% men + c' c'\melismaEnd + \] + \[ + c'\melisma %%% e- + \pes d' \flexa b + \virga c' \inclinatum b + \inclinatum a\melismaEnd + \] + \[ + b\melisma %%% ius, + \augmentum \flexa + a\melismaEnd\augmentum + \] + \divisioMaior + \[ + c'\melisma %%% ma- + \pes e'\melismaEnd + \] + d' %%% gni + \[ + g\melisma %%% con- + \pes \deminutum + c'\melismaEnd + \] + c' %%% sí- + \[ + c'\melisma %%% li- + c' c' \flexa a\melismaEnd + \] + a %%% i + \[ + a\melisma %%% An- + \pes c' \flexa a + \quilisma b \pes + c'\melismaEnd + \] + \[ + g\melisma %%% ge- + \pes a \flexa + g\melismaEnd + \] + g\augmentum %%% lus. + s_\markup { \italic { "Ps." } } + \finalis + \[ + g\melisma %%% Can- + \pes c' \flexa b\melismaEnd + \] + \[ + c'\melisma %%% tá- + \pes d'\melismaEnd + \] + d' %%% te + d' %%% Dó- + d' %%% mi- + d' %%% no + \[ + d'\melisma %%% cán- + \pes f'\melismaEnd + \] + e' %%% ti- + e' %%% cum + \[ + e'\melisma %%% no- + \flexa d'\melismaEnd + \] + \[ + d'\melisma %%% vum: + \augmentum \pes + e'\melismaEnd \augmentum + \] + \[ + d'\melisma %%% qui- + \flexa b\melismaEnd + \] + \[ + c'\melisma %%% a + \pes d'\melismaEnd + \] + d' %%% mi- + d' %%% ra- + \[ + d'\melisma %%% bí- + \quilisma e' + \pes f'\melismaEnd + \] + d' %%% li- + c' %%% a + \[ + c'\melisma %%% fe- + c' c'\melismaEnd + \] + \[ + a\melisma %%% cit. + \augmentum \flexa + g\melismaEnd \augmentum + \] + \finalis +} + +verba = \new Lyrics = "verba" \lyricmode { + U -- ER na -- tus est no -- bis, + et fí -- li -- us da -- tus est no -- "bis :" + cu -- ius im -- pé -- ri -- um su -- per + hú -- me -- rum e -- "ius :" et vo -- cá -- + bi -- tur no -- men e -- ius, ma -- gni + con -- sí -- li -- i An -- ge -- lus. + Can -- tá -- te Dó -- mi -- no cán -- + ti -- cum no -- "vum :" qui -- a mi -- ra -- + bí -- li -- a fe -- cit. } -verba = \context Lyrics = verba \lyrics { - Pu- er na- tus est no- bis, - et fi- li- us da- tus est no- bis: +\paper { +% line-thickness = \staff-space / 7.0 +% line-thickness = \staff-space / 3.0 } \score { - \context VaticanaVoice << - \addlyrics + << \cantus - \verba + \lyricsto "cantus" \verba >> - \paper { - stafflinethickness = \staffspace / 7.0 - linewidth = 137.0\mm - width = 137.0\mm - indent = 0.0 - raggedright = ##t - packed = ##t -% width = 15.0 \cm %%% no effect? - - \translator { - \ScoreContext - \remove Bar_number_engraver -% SpacingSpanner \set #'spacing-increment = #0.5 - timing = ##f - - % Maybe don't do this except for transcription -- it may produce - % additional space - barAlways = ##t -% skipBars = ##t - } + \layout { + indent = 17.0\mm } } + +%%% Local Variables: +%%% coding: utf-8 +%%% End: