X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fpuer-fragment.ly;h=b1007b270d1597df4c8f1c805720ae52274554de;hb=14a80befb9892f9a164db420fdd187792eb2769f;hp=44793116ae0ae93a661ec78450c82e48647c4bff;hpb=70048d99398924e7ca0eb481925145ec243700c5;p=lilypond.git

diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly
index 44793116ae..b1007b270d 100644
--- a/input/puer-fragment.ly
+++ b/input/puer-fragment.ly
@@ -1,4 +1,4 @@
-\version "1.9.4"
+\version "2.3.16"
 \header {
     title	= "Puer natus est nobis (excerptum)"
     subtitle	= "Antiphona ad introitum VII"
@@ -10,105 +10,95 @@ 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)
+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)."
 
 }
 
-\include "paper26.ly"
+#(set-global-staff-size 26)
 \include "gregorian-init.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 = \context VaticanaVoice = "cantus"  {
+  \[ g4\melisma %%% Pu-
     \pes
-    d')
+    d'\melismaEnd
   \]
   d'		%%% er
-  \[ d'
-    (		%%% na-
+  \[ 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,
   \divisioMaior
-  \[ g
-    (		%%% et
+  \[ g\melisma %%% et
     \pes \deminutum
-    d')
+    d'\melismaEnd
   \]
-  \[ d'
-    (		%%% fi-
+  \[ d'\melisma %%% fi-
     \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
   \]
   \divisioMaxima
 }
 
-verba = \context Lyrics = verba \lyrics {
-  Pu- er na- tus est no- bis,
-  et fi- li- us da- tus est no- bis:
+verba = \context Lyrics = "verba" \lyricmode {
+  Pu -- er na -- tus est no -- bis,
+  et fi -- li -- us da -- tus est no -- bis:
+}
+
+\bookpaper  {
+    linethickness = \staffspace / 7.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
+    \context {
+      \Score
       \remove Bar_number_engraver
-%     SpacingSpanner \set #'spacing-increment = #0.5
+%     \override SpacingSpanner #'spacing-increment = #0.5
       timing = ##f
 
       % Maybe don't do this except for transcription -- it may produce