X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Fpuer-fragment.ly;h=c378c2ed73296350bf480e2ef8fedd13cab156ce;hb=610d0fa7d8958e746530f127eef37d25bd8bc3df;hp=21865956cfd644a6ad7fe5f413eeed642f11f8e8;hpb=51159f8679de00e6cd526ca2a16e1ea4d4294f81;p=lilypond.git

diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly
index 21865956cf..c378c2ed73 100644
--- a/input/puer-fragment.ly
+++ b/input/puer-fragment.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.7.32"
 \header {
     title	= "Puer natus est nobis (excerptum)"
     subtitle	= "Antiphona ad introitum VII"
@@ -10,7 +10,7 @@ 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)."
@@ -24,7 +24,7 @@ before the ligature (not demonstrated in this example)."
 %%% but this is intentional for editorial purposes (simplifies some
 %%% global search/replace operations in emacs).
 
-cantus = \context VaticanaVoice = "cantus"  {
+cantus = \new VaticanaVoice = "cantus"  {
   \[ g4\melisma %%% Pu-
     \pes
     d'\melismaEnd
@@ -75,9 +75,13 @@ cantus = \context VaticanaVoice = "cantus"  {
   \divisioMaxima
 }
 
-verba = \context Lyrics = "verba" \lyrics {
-  Pu- er na- tus est no- bis,
-  et fi- li- us da- tus est no- bis:
+verba = \new Lyrics = "verba" \lyricmode {
+  Pu -- er na -- tus est no -- bis,
+  et fi -- li -- us da -- tus est no -- bis:
+}
+
+\paper  {
+    line-thickness = \staff-space / 7.0
 }
 
 \score {
@@ -85,12 +89,11 @@ verba = \context Lyrics = "verba" \lyrics {
     \cantus
     \lyricsto "cantus" \verba
   >>
-  \paper {
-    linethickness = \staffspace / 7.0
-    linewidth = 137.0\mm
+  \layout {
+    line-width = 137.0\mm
     width = 137.0\mm
     indent = 0.0
-    raggedright = ##t
+    ragged-right = ##t
     packed = ##t
     \context {
       \Score