X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fpuer-fragment.ly;h=afcfc52bf99e66231b9f252973d4c7aba252685e;hb=01423a6e8f18d5735a37cdaac940a4038aa7ac33;hp=d40718c00c680b4f88f2e4526b186d2c646b3d8d;hpb=2205ef7a616d73e6a83274816e775426bf41b7bd;p=lilypond.git

diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly
index d40718c00c..afcfc52bf9 100644
--- a/input/puer-fragment.ly
+++ b/input/puer-fragment.ly
@@ -1,19 +1,18 @@
-\version "2.7.39"
+\version "2.11.51"
 \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 \oldaddlyrics 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)."
 
 }
 
@@ -25,63 +24,251 @@ before the ligature (not demonstrated in this example)."
 %%% global search/replace operations in emacs).
 
 cantus = \new VaticanaVoice = "cantus"  {
-  \[ g4\melisma %%% Pu-
+  \set Staff.instrumentName = \markup {
+    \column {
+      " " " " " " " " "VII" " "
+      {
+	\bigger \bigger \bigger \bigger
+	\bigger \bigger \bigger \bigger
+	\bigger \bigger \bigger \bigger
+	"P"
+      }
+    }
+  }
+  \[
+    g4\melisma	%%% Pu-
     \pes
     d'\melismaEnd
   \]
-  d'		%%% er
-  \[ d'\melisma %%% na-
+  d'\augmentum	%%% er
+  \[
+    d'\melisma	%%% na-
     \pes e' \flexa
     d'\melismaEnd
   \]
   c'		%%% tus
-  \[ c'\melisma %%% est
+  \[
+    c'\melisma	%%% est
     c'
     c'\melismaEnd
   \]
-  \[ d'\melisma %%% no-
+  \[
+    d'\melisma	%%% no-
     \flexa c' e' \flexa
     d'\melismaEnd
   \]
-  d'            %%% bis,
+  d'\augmentum  %%% bis,
   \divisioMaior
-  \[ g\melisma %%% et
+  \[
+    g\melisma	%%% et
     \pes \deminutum
     d'\melismaEnd
   \]
-  \[ d'\melisma %%% fi-
+  \[
+    d'\melisma	%%% fí-
     \pes e' \flexa
     d'\melismaEnd
   \]
-  \[ c'\melisma %%% li-
+  \[
+    c'\melisma	%%% li-
     \flexa
     b\melismaEnd
   \]
   a		%%% us
-  \[ c'\melisma %%% da-
+  \[
+    c'\melisma	%%% da-
     c' \pes
     d'\melismaEnd
   \]
   c'		%%% tus-
   c'		%%% est
-  \[ c'\melisma %%% no-
+  \[
+    c'\melisma	%%% no-
     \pes d' \flexa c'
     c'\melismaEnd
   \]
-  \[ g\melisma %%% bis:
+  \[
+    g\melisma	%%% bis:
     \pes a \flexa
-    g\melismaEnd
+    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 {
-  Pu -- er na -- tus est no -- bis,
-  et fi -- li -- us da -- tus est no -- bis:
+  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.
 }
 
 \paper  {
-    line-thickness = \staff-space / 7.0
+%    line-thickness = \staff-space / 7.0
+%    line-thickness = \staff-space / 3.0
 }
 
 \score {
@@ -90,21 +277,10 @@ verba = \new Lyrics = "verba" \lyricmode {
     \lyricsto "cantus" \verba
   >>
   \layout {
-    line-width = 137.0\mm
-    width = 137.0\mm
-    indent = 0.0
-    ragged-right = ##t
-    packed = ##t
-    \context {
-      \Score
-      \remove Bar_number_engraver
-%     \override SpacingSpanner #'spacing-increment = #0.5
-      timing = ##f
-
-      % Maybe don't do this except for transcription -- it may produce
-      % additional space
-      barAlways = ##t
-%     skipBars = ##t
-    }
+    indent = 17.0\mm
   }
 }
+
+%%% Local Variables:
+%%% coding: utf-8
+%%% End: