X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fmensural-ligatures.ly;h=787cde444b80026db9ad4f5250a742670991608d;hb=8a2669df6c35c51d577e73f81946be90352f4192;hp=a4afa7ccfeb2e7c5e6637d5ef4b5f2e1103c4495;hpb=86575b43c110b0cd9cb378055f8ea670dd4cd7de;p=lilypond.git

diff --git a/input/regression/mensural-ligatures.ly b/input/regression/mensural-ligatures.ly
index a4afa7ccfe..787cde444b 100644
--- a/input/regression/mensural-ligatures.ly
+++ b/input/regression/mensural-ligatures.ly
@@ -1,331 +1,335 @@
-\version "2.4.15"
+\version "2.12.0"
 
 \header {
   texidoc = "Mensural ligatures show different shapes, depending on the
   rhythmical pattern and direction of the melody line."
 }
 
-\score {
-  \context Voice{
-    \clef "petrucci-c4"
-    \set Staff.printKeyCancellation = ##f
-    \cadenzaOn % turn off bar lines
-    #(set-accidental-style 'forget)
 
-    % ligaturae binaria
+\layout {
+  ragged-right = ##t
+  indent = 0.0
+  \context {
+    \Voice
+    \remove "Ligature_bracket_engraver"
+    \consists "Mensural_ligature_engraver"
+  }
+  \context {
+    \Score
+    \override SpacingSpanner #'packed-spacing = ##t
+  }
+}
+
+\context Voice {
+  \clef "petrucci-c4"
+  \set Staff.printKeyCancellation = ##f
+  \cadenzaOn % turn off bar lines
+  #(set-accidental-style 'forget)
+  \textLengthOn
+
+				% ligaturae binaria
 
-    \[
-      b\breve^\markup { \column { { \bold "ligaturae binaria" } "BL" } }
-      g\longa
+  \[
+    b\breve^\markup { \column { { \bold "ligaturae binaria" } "BL" } }
+    g\longa
     \]
 
-    \[
-      g\breve^\markup { "BL" }
-      b\longa
+  \[
+    g\breve^\markup { "BL" }
+    b\longa
     \]
 
-    \[
-      b\longa^\markup { "LL" }
-      g
+  \[
+    b\longa^\markup { "LL" }
+    g
     \]
 
-    \[
-      g\longa^\markup { "LL" }
-      b
+  \[
+    g\longa^\markup { "LL" }
+    b
     \]
 
-    \[
-      b\breve^\markup { "BB" }
-      g
+  \[
+    b\breve^\markup { "BB" }
+    g
     \]
 
-    \[
-      g\breve^\markup { "BB" }
-      b
+  \[
+    g\breve^\markup { "BB" }
+    b
     \]
 
-    \[
-      b\longa^\markup { "LB" }
-      g\breve
+  \[
+    b\longa^\markup { "LB" }
+    g\breve
     \]
 
-    \[
-      g\longa^\markup { "LB" }
-      b\breve
+  \[
+    g\longa^\markup { "LB" }
+    b\breve
     \]
 
-    \[
-      b1^\markup { "SS" }
-      g
+  \[
+    b1^\markup { "SS" }
+    g
     \]
 
-    \[
-      g1^\markup { "SS" }
-      b
+  \[
+    g1^\markup { "SS" }
+    b
     \]
 
-    \bar "|" \break
+  \bar "|" \break
 
-    % ligaturae ternariae, quaternariae, etc. (sicut in Apel[1])
+				% ligaturae ternariae, quaternariae, etc. (sicut in Apel[1])
 
-    \[
-      b\breve^\markup {
-	\column { { \bold "ligaturae ternariae, quaternariae, etc." } "BBL" } }
-      a
-      g\longa
+  \[
+    b\breve^\markup {
+      \column { { \bold "ligaturae ternariae, quaternariae, etc." } "BBL" } }
+    a
+    g\longa
     \]
 
-    \[
-      a\breve^\markup { "BBBB" }
-      g
-      a
-      b
+  \[
+    a\breve^\markup { "BBBB" }
+    g
+    a
+    b
     \]
 
-    \[
-      b1^\markup { "SSBBBLB" }
-      a
-      g\breve
-      a
-      b
-      a\longa
-      b\breve
+  \[
+    b1^\markup { "SSBBBLB" }
+    a
+    g\breve
+    a
+    b
+    a\longa
+    b\breve
     \]
 
-    \[
-      a\longa^\markup { "LBMxBL" }
-      g\breve
-      a\maxima
-      b\breve
-      a\longa
+  \[
+    a\longa^\markup { "LBMxBL" }
+    g\breve
+    a\maxima
+    b\breve
+    a\longa
     \]
 
-    \[
-      d'\breve^\markup { "BBBBLL" }
-      c'
-      f
-      d'
-      b\longa
-      g
+  \[
+    d'\breve^\markup { "BBBBLL" }
+    c'
+    f
+    d'
+    b\longa
+    g
     \]
 
-    \[
-      c'1^\markup { "SSBLLBB" }
-      b
-      g\breve
-      d'\longa
-      a
-      c'\breve
-      b
+  \[
+    c'1^\markup { "SSBLLBB" }
+    b
+    g\breve
+    d'\longa
+    a
+    c'\breve
+    b
     \]
 
-    \bar "|" \break
+  \bar "|" \break
 
-    % examples from "dtv-Atlas zur Musik" [2]
+				% examples from "dtv-Atlas zur Musik" [2]
 
-    \[
-      d'\breve^\markup { \column { { \bold "dtv-Atlas" } "BBL" } }
-      c'
-      b\longa
+  \[
+    d'\breve^\markup { \column { { \bold "dtv-Atlas" } "BBL" } }
+    c'
+    b\longa
     \]
 
-    \[
-      a\breve^\markup { "BBBL" }
-      b
-      c'
-      d'\longa
+  \[
+    a\breve^\markup { "BBBL" }
+    b
+    c'
+    d'\longa
     \]
 
-    \[
-      b\longa.^\markup { "L.B.BBLBBB" }
-      g\breve.
-      a\breve
-      b
-      c'\longa
-      a\breve
-      b
-      a
+  \[
+    b\longa.^\markup { "L.B.BBLBBB" }
+    g\breve.
+    a\breve
+    b
+    c'\longa
+    a\breve
+    b
+    a
     \]
 
-    \[
-      c'1^\markup { "SSBB" }
-      b
-      g\breve
-      a
+  \[
+    c'1^\markup { "SSBB" }
+    b
+    g\breve
+    a
     \]
 
-    \[
-      b\longa^\markup { "LBL" }
-      a\breve
-      c'\longa
+  \[
+    b\longa^\markup { "LBL" }
+    a\breve
+    c'\longa
     \]
 
-    \[
-      a1^\markup { "SSBL" }
-      b
-      d'\breve
-      c'\longa
+  \[
+    a1^\markup { "SSBL" }
+    b
+    d'\breve
+    c'\longa
     \]
 
-    \bar "|" \break
+  \bar "|" \break
 
-    % some ligatures from Ockeghem: Missa De plus en plus
+				% some ligatures from Ockeghem: Missa De plus en plus
 
-    \[
-       c'\maxima^\markup {
-	\column { { \bold "Ockeghem: Missa De plus en plus" } "MxMx" } }
-       g
+  \[
+    c'\maxima^\markup {
+      \column { { \bold "Ockeghem: Missa De plus en plus" } "MxMx" } }
+    g
     \]
 
-    \[
-      d\longa^\markup { "LBBBB" }
-      c\breve
-      f
-      e
-      d
+  \[
+    d\longa^\markup { "LBBBB" }
+    c\breve
+    f
+    e
+    d
     \]
 
-    \[
-      c'\maxima^\markup { "MxL" }
-      d'\longa
+  \[
+    c'\maxima^\markup { "MxL" }
+    d'\longa
     \]
 
-    \[
-      e'\breve^\markup { "BBB" }
-      d'
-      c'
+  \[
+    e'\breve^\markup { "BBB" }
+    d'
+    c'
     \]
 
-    \[
-      b\longa^\markup { "LBBBBB" }
-      c'\breve
-      d'
-      g
-      f
-      g
-   \]
+  \[
+    b\longa^\markup { "LBBBBB" }
+    c'\breve
+    d'
+    g
+    f
+    g
+    \]
 
-    \[
-      g\breve^\markup { "BBBBL" }
-      b
-      c'
-      e'
-      d'\longa
+  \[
+    g\breve^\markup { "BBBBL" }
+    b
+    c'
+    e'
+    d'\longa
     \]
 
-    \[
-      e'1^\markup { "SSB" }
-      a
-      g\breve
+  \[
+    e'1^\markup { "SSB" }
+    a
+    g\breve
     \]
 
-    \[
-      g\longa^\markup { "LLLL" }
-      b
-      c'
-      e'
+  \[
+    g\longa^\markup { "LLLL" }
+    b
+    c'
+    e'
     \]
 
-    \bar "|" \break
+  \bar "|" \break
 
-    % some from the Requiem
+				% some from the Requiem
 
-    \[
-      a1^\markup { \column { { \bold "Ockeghem: Requiem" } "SSBBBBBBBL" } }
-      d
-      e\breve
-      f
-      d
-      f
-      e
-      f
-      g
-      e\longa
+  \[
+    a1^\markup { \column { { \bold "Ockeghem: Requiem" } "SSBBBBBBBL" } }
+    d
+    e\breve
+    f
+    d
+    f
+    e
+    f
+    g
+    e\longa
     \]
 
-    \[
-      c'\breve^\markup { "BBBBL" }
-      c
-      d
-      c
-      c'\longa
+  \[
+    c'\breve^\markup { "BBBBL" }
+    c
+    d
+    c
+    c'\longa
     \]
 
-    \bar "|" \break
+  \bar "|" \break
 
-    % crazy ligatures
+				% crazy ligatures
 
-    \[
-      c\breve^\markup { \column { { \bold "crazy ligatures" } "BBBBB" } }
-      e
-      f
-      g
-      bes
+  \[
+    c\breve^\markup { \column { { \bold "crazy ligatures" } "BBBBB" } }
+    e
+    f
+    g
+    bes
     \]
 
-    \[
-      bes\breve^\markup { "BB" }
-      a
+  \[
+    bes\breve^\markup { "BB" }
+    a
     \] % TODO: accidentals must be collected and printed before ligature
 
-    \[
-      a\breve.^\markup { "B.B.B.B.B.B.B.B.B." }
-      g
-      b
-      a
-      e
-      g
-      f
-      a
-      g
-    \]
-
-    \[
-      b^\markup { "B.B." }
-      a
+  \[
+    a\breve.^\markup { "B.B.B.B.B.B.B.B.B." }
+    g
+    b
+    a
+    e
+    g
+    f
+    a
+    g
+    \]
+
+  \[
+    b^\markup { "B.B." }
+    a
     \] % TODO: dots within ligatures must be placed above heads
 
-    \bar "|" \break
+  \bar "|" \break
 
-    % invalid ligatures (those commented out are rejected with explanation)
+				% invalid ligatures (those commented out are rejected with explanation)
 
-    %  \[
-    %    a1^\markup { \column { { \bold "invalid ligatures" } "SS" } }
-    %    as
-    %  \]
+				%  \[
+				%    a1^\markup { \column { { \bold "invalid ligatures" } "SS" } }
+				%    as
+				%  \]
 
-    \[
-      a\breve^\markup { "BBB" }
-      g
-      as
+  \[
+    a\breve^\markup { "BBB" }
+    g
+    as
     \]
 
-    %  \[
-    %    f\longa^\markup { "LLB" }
-    %    g
-    %    f\breve
-    %  \]
-
-    %  \[
-    %    f\breve^\markup { "BSLB" }
-    %    a1
-    %    g\longa
-    %    a\breve
-    %  \]
-  }
+				%  \[
+				%    f\longa^\markup { "LLB" }
+				%    g
+				%    f\breve
+				%  \]
 
-  \layout {
-    raggedright = ##t
-    packed = ##t
-    indent = 0.0
-    \context {
-      \Voice
-      \remove Ligature_bracket_engraver
-      \consists Mensural_ligature_engraver
-    }
-  }
+				%  \[
+				%    f\breve^\markup { "BSLB" }
+				%    a1
+				%    g\longa
+				%    a\breve
+				%  \]
 }
 
+
 % Litterae:
 %
 % [1] Willi Apel: The Notation of Polyphonic Music. 900-1600.