Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / input / test / ancient-font.ly

diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly
index e5245d52c3f0c9be525731ddc3bdbb5c5c462128..6ac44816938579f82f67ac5c4173a73b6e146252 100644 (file)
--- a/input/test/ancient-font.ly
+++ b/input/test/ancient-font.ly
@@ -1,4 +1,4 @@
-\version "2.7.10"
+\version "2.11.6"
 % TODO: split ancient-font into seperate files; possibly in
 % different locations.
 \header {
@@ -9,7 +9,7 @@ included in LilyPond's support of ancient notation.
 }
 
 
-upperStaff = \context GregorianStaff = "upperStaff" <<
+upperStaff = \new GregorianStaff =  "upperStaff" <<
   \context GregorianVoice <<
     \set Score.timing = ##f
 %   \set Score.forceAccidental = ##t %%%%%%%% FIXME: what happened to this property?
@@ -17,8 +17,8 @@ upperStaff = \context GregorianStaff = "upperStaff" <<
     \override Staff.StaffSymbol  #'line-count = #4
 
      \transpose c c {
-       \override Staff.KeySignature  #'style = #'vaticana
-       \override Staff.Accidental  #'style = #'vaticana
+       \override Staff.KeySignature #'glyph-name-alist = #alteration-vaticana-glyph-name-alist
+       \override Staff.Accidental #'glyph-name-alist = #alteration-vaticana-glyph-name-alist
        \override NoteHead  #'style = #'vaticana.punctum
        \key es \major
        \clef "vaticana-fa2"
@@ -58,8 +58,8 @@ upperStaff = \context GregorianStaff = "upperStaff" <<
        \override NoteHead  #'style = #'vaticana.cephalicus
        es f
 
-       \override Staff.KeySignature  #'style = #'medicaea
-       \override Staff.Accidental  #'style = #'medicaea
+       \override Staff.KeySignature #'glyph-name-alist = #alteration-medicaea-glyph-name-alist
+       \override Staff.Accidental #'glyph-name-alist = #alteration-medicaea-glyph-name-alist
        \override Staff.Custos  #'style = #'medicaea
        \override NoteHead  #'style = #'medicaea.punctum
        \clef "medicaea-fa2"
@@ -81,8 +81,8 @@ upperStaff = \context GregorianStaff = "upperStaff" <<
        \override NoteHead  #'style = #'medicaea.rvirga
        e! des! ces!
 
-       \override Staff.KeySignature  #'style = #'hufnagel
-       \override Staff.Accidental  #'style = #'hufnagel
+       \override Staff.KeySignature #'glyph-name-alist = #alteration-hufnagel-glyph-name-alist
+       \override Staff.Accidental #'glyph-name-alist = #alteration-hufnagel-glyph-name-alist
        \override Staff.Custos  #'style = #'hufnagel
        \override NoteHead  #'style = #'hufnagel.punctum
        \clef "hufnagel-fa2"
@@ -112,12 +112,12 @@ upperStaff = \context GregorianStaff = "upperStaff" <<
   >>
 >>
 
-lowerStaff = \context MensuralStaff = "lowerStaff" <<
+lowerStaff = \new MensuralStaff =  "lowerStaff" <<
   \context MensuralVoice <<
     
     % this is broken until further notice -- see refman
     % \override Staff.StaffSymbol  #'line-count = #5
-    \context Staff \applyOutput #(outputproperty-compatibility (make-type-checker 'staff-symbol-interface) 'line-count 5)
+    \applyOutput #'Staff #(outputproperty-compatibility (make-type-checker 'staff-symbol-interface) 'line-count 5)
 
      \transpose c c {
        \set autoBeaming = ##f
@@ -211,7 +211,7 @@ lowerStaff = \context MensuralStaff = "lowerStaff" <<
 >>
 
 \paper {
-       linethickness = #(/ staffspace 5.0)
+       line-thickness = #(/ staff-space 5.0)
 }
 
 \score {
@@ -221,7 +221,7 @@ lowerStaff = \context MensuralStaff = "lowerStaff" <<
     >>
     \layout {
 % do we want to keep these settings? -gp
-       linewidth = 17.25\cm
+       line-width = 17.25\cm
        textheight = 26.0\cm
        indent = 0.0
        \context {
@@ -258,8 +258,8 @@ lowerStaff = \context MensuralStaff = "lowerStaff" <<
            \accepts MensuralVoice
            \consists Custos_engraver
            \override TimeSignature #'style = #'mensural
-           \override KeySignature #'style = #'mensural
-           \override Accidental #'style = #'mensural
+           \override KeySignature #'glyph-name-alist = #alteration-mensural-glyph-name-alist
+           \override Accidental #'glyph-name-alist = #alteration-mensural-glyph-name-alist
            \override Custos #'style = #'mensural
            \override Custos #'neutral-position = #3
            \override Custos #'neutral-direction = #down
@@ -276,8 +276,8 @@ lowerStaff = \context MensuralStaff = "lowerStaff" <<
            \remove Time_signature_engraver
            \override StaffSymbol #'thickness = #2.0
            \override StaffSymbol #'line-count = #4
-           \override KeySignature #'style = #'vaticana
-           \override Accidental #'style = #'vaticana
+           \override KeySignature #'glyph-name-alist = #alteration-vaticana-glyph-name-alist
+           \override Accidental #'glyph-name-alist = #alteration-vaticana-glyph-name-alist
            \override Custos #'style = #'vaticana
            \override Custos #'neutral-position = #4
            \override Custos #'neutral-direction = #down