Merge with master

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

diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly
index 1772eab2eb114a74afcd26fce98267279ca41d74..6ac44816938579f82f67ac5c4173a73b6e146252 100644 (file)
--- a/input/test/ancient-font.ly
+++ b/input/test/ancient-font.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\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,51 +17,51 @@ upperStaff = \context GregorianStaff = upperStaff <<
     \override Staff.StaffSymbol  #'line-count = #4
 
      \transpose c c {
-       \override Staff.KeySignature  #'style = #'vaticana
-       \override Staff.Accidental  #'style = #'vaticana
-       \override NoteHead  #'style = #'vaticana-punctum
+       \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"
        c!1 des! e! f! ges!
 
-       \override NoteHead  #'style = #'vaticana-inclinatum
+       \override NoteHead  #'style = #'vaticana.inclinatum
        a! b! ces'
        \override Staff.BarLine  #'bar-size = #3.0 \bar "|"
 %      \break % 1 (8*1)
 
-       \override NoteHead  #'style = #'vaticana-quilisma
+       \override NoteHead  #'style = #'vaticana.quilisma
        b! des'! ges! fes!
        \breathe
        \clef "vaticana-fa1"
-       \override NoteHead  #'style = #'vaticana-plica
+       \override NoteHead  #'style = #'vaticana.plica
        es d
-       \override NoteHead  #'style = #'vaticana-reverse-plica
+       \override NoteHead  #'style = #'vaticana.reverse.plica
        c d
        \override Staff.BarLine  #'bar-size = #3.0 \bar "|"
 %      \break %2 (8*1)
 
-       \override NoteHead  #'style = #'vaticana-punctum-cavum
+       \override NoteHead  #'style = #'vaticana.punctum.cavum
        es f
-       \override NoteHead  #'style = #'vaticana-lpes
+       \override NoteHead  #'style = #'vaticana.lpes
        g as
-       \override NoteHead  #'style = #'vaticana-upes
+       \override NoteHead  #'style = #'vaticana.upes
        bes as
-       \override NoteHead  #'style = #'vaticana-vupes
+       \override NoteHead  #'style = #'vaticana.vupes
        g f
-       \override NoteHead  #'style = #'vaticana-linea-punctum
+       \override NoteHead  #'style = #'vaticana.linea.punctum
        \override Staff.BarLine  #'bar-size = #2.0 \bar "|"
 %      \break % 3 (8*1)
 
        es d
-       \override NoteHead  #'style = #'vaticana-epiphonus
+       \override NoteHead  #'style = #'vaticana.epiphonus
        c d
-       \override NoteHead  #'style = #'vaticana-cephalicus
+       \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
+       \override NoteHead  #'style = #'medicaea.punctum
        \clef "medicaea-fa2"
        ces! des!
        \override Staff.BarLine  #'bar-size = #3.0 \bar "|"
@@ -69,22 +69,22 @@ upperStaff = \context GregorianStaff = upperStaff <<
 
        e! f! ges!
        \clef "medicaea-do2"
-       \override NoteHead  #'style = #'medicaea-inclinatum
+       \override NoteHead  #'style = #'medicaea.inclinatum
        a! b! ces'!
-       \override NoteHead  #'style = #'medicaea-virga
+       \override NoteHead  #'style = #'medicaea.virga
        b! a!
        \override Staff.BarLine  #'bar-size = #3.0 \bar "|"
 %      \break % 5 (8*1)
 
        ges! fes!
        \clef "medicaea-fa1"
-       \override NoteHead  #'style = #'medicaea-rvirga
+       \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
+       \override NoteHead  #'style = #'hufnagel.punctum
        \clef "hufnagel-fa2"
        ces! des! es!
        \override Staff.BarLine  #'bar-size = #3.0 \bar "|"
@@ -92,16 +92,16 @@ upperStaff = \context GregorianStaff = upperStaff <<
 
        fes! ges!
        \clef "hufnagel-do2"
-       \override NoteHead  #'style = #'hufnagel-lpes
+       \override NoteHead  #'style = #'hufnagel.lpes
        as! bes! ces'!
-       \override NoteHead  #'style = #'hufnagel-virga
+       \override NoteHead  #'style = #'hufnagel.virga
        bes! as!
        \override Staff.BarLine  #'bar-size = #3.0 \bar "|"
 %      \break % 7 (8*1)
 
        ges! fes!
        \clef "hufnagel-do-fa"
-       \override NoteHead  #'style = #'hufnagel-punctum
+       \override NoteHead  #'style = #'hufnagel.punctum
        es! des! ces! des! es! fes!
        \bar "||"
 %      \break % 8 (8*1)
@@ -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
@@ -210,8 +210,8 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
   >>
 >>
 
-\bookpaper {
-       linethickness = #(/ staffspace 5.0)
+\paper {
+       line-thickness = #(/ staff-space 5.0)
 }
 
 \score {
@@ -219,9 +219,9 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
        \upperStaff
        \lowerStaff
     >>
-    \paper {
+    \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 {
@@ -248,7 +248,7 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
            \alias Voice
            \remove Ligature_bracket_engraver
 %          \consists Gregorian_ligature_engraver %%%%%%%% TODO: not yet implemented
-           \override NoteHead #'style = #'vaticana-punctum
+           \override NoteHead #'style = #'vaticana.punctum
            autoBeaming = ##f
        }
        \context {
@@ -258,12 +258,12 @@ 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 = #-1
-           clefGlyph = #"clefs-petrucci-c2"
+           \override Custos #'neutral-direction = #down
+           clefGlyph = #"clefs.petrucci.c2"
            clefPosition = #-2
            clefOctavation = #0 
        }
@@ -276,12 +276,12 @@ 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 = #-1
-           clefGlyph = #"clefs-vaticana-do"
+           \override Custos #'neutral-direction = #down
+           clefGlyph = #"clefs.vaticana.do"
            clefPosition = #1
            clefOctavation = #0 
        }