X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftest%2Fancient-font.ly;h=5960389186616206a1365a33d11dcfc890418908;hb=df56feefa28914b45532b0a31b24c304c162b497;hp=b652256df85794e2c33adfc4a0fb974013abba3d;hpb=5fe877ded1247f67ef7ed43d04354dc07b0a0c21;p=lilypond.git diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index b652256df8..5960389186 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -1,111 +1,107 @@ -\version "1.7.19" +\version "2.5.2" % TODO: split ancient-font into seperate files; possibly in % different locations. \header { texidoc = "@cindex Ancient Font -Here is a display of many (all?) symbols that are -included in Lilypond's support of ancient notation. +Here are shown many (all?) of the symbols that are +included in LilyPond's support of ancient notation. " } -\include "paper26.ly" -upperStaff = \context GregorianStaff = upperStaff < - \context GregorianVoice < - \property Score.timing = ##f -% \property Score.forceAccidental = ##t %%%%%%%% FIXME: what happened to this property? +upperStaff = \context GregorianStaff = "upperStaff" << + \context GregorianVoice << + \set Score.timing = ##f +% \set Score.forceAccidental = ##t %%%%%%%% FIXME: what happened to this property? - % this is broken until further notice -- see refman - % \property Staff.StaffSymbol \override #'line-count = #4 - \context Staff \outputproperty #(make-type-checker 'staff-symbol-interface) - #'line-count = #4 + \override Staff.StaffSymbol #'line-count = #4 - \notes \transpose c c { - \property Staff.KeySignature \override #'style = #'vaticana - \property Staff.Accidental \override #'style = #'vaticana - \property Voice.NoteHead \override #'style = #'vaticana_punctum + \transpose c c { + \override Staff.KeySignature #'style = #'vaticana + \override Staff.Accidental #'style = #'vaticana + \override NoteHead #'style = #'vaticana.punctum \key es \major - \clef "vaticana_fa2" + \clef "vaticana-fa2" c!1 des! e! f! ges! - \property Voice.NoteHead \override #'style = #'vaticana_inclinatum + \override NoteHead #'style = #'vaticana.inclinatum a! b! ces' - \property Staff.BarLine \override #'bar-size = #3.0 \bar "|" + \override Staff.BarLine #'bar-size = #3.0 \bar "|" % \break % 1 (8*1) - \property Voice.NoteHead \override #'style = #'vaticana_virga + \override NoteHead #'style = #'vaticana.quilisma b! des'! ges! fes! \breathe - \clef "vaticana_fa1" - \property Voice.NoteHead \override #'style = #'vaticana_quilisma + \clef "vaticana-fa1" + \override NoteHead #'style = #'vaticana.plica es d - \property Voice.NoteHead \override #'style = #'vaticana_rvirga + \override NoteHead #'style = #'vaticana.reverse.plica c d - \property Staff.BarLine \override #'bar-size = #3.0 \bar "|" + \override Staff.BarLine #'bar-size = #3.0 \bar "|" % \break %2 (8*1) - \property Voice.NoteHead \override #'style = #'vaticana_rvirga + \override NoteHead #'style = #'vaticana.punctum.cavum es f - \property Voice.NoteHead \override #'style = #'vaticana_lpes + \override NoteHead #'style = #'vaticana.lpes g as - \property Voice.NoteHead \override #'style = #'vaticana_upes + \override NoteHead #'style = #'vaticana.upes bes as - \property Voice.NoteHead \override #'style = #'vaticana_vupes + \override NoteHead #'style = #'vaticana.vupes g f - \property Voice.NoteHead \override #'style = #'vaticana_plica - \property Staff.BarLine \override #'bar-size = #2.0 \bar "|" + \override NoteHead #'style = #'vaticana.linea.punctum + \override Staff.BarLine #'bar-size = #2.0 \bar "|" % \break % 3 (8*1) es d - \property Voice.NoteHead \override #'style = #'vaticana_epiphonus + \override NoteHead #'style = #'vaticana.epiphonus c d - \property Voice.NoteHead \override #'style = #'vaticana_cephalicus + \override NoteHead #'style = #'vaticana.cephalicus es f - \property Staff.KeySignature \override #'style = #'medicaea - \property Staff.Accidental \override #'style = #'medicaea - \property Staff.Custos \override #'style = #'medicaea - \property Voice.NoteHead \override #'style = #'medicaea_punctum - \clef "medicaea_fa2" + \override Staff.KeySignature #'style = #'medicaea + \override Staff.Accidental #'style = #'medicaea + \override Staff.Custos #'style = #'medicaea + \override NoteHead #'style = #'medicaea.punctum + \clef "medicaea-fa2" ces! des! - \property Staff.BarLine \override #'bar-size = #3.0 \bar "|" + \override Staff.BarLine #'bar-size = #3.0 \bar "|" % \break % 4 (8*1) e! f! ges! - \clef "medicaea_do2" - \property Voice.NoteHead \override #'style = #'medicaea_inclinatum + \clef "medicaea-do2" + \override NoteHead #'style = #'medicaea.inclinatum a! b! ces'! - \property Voice.NoteHead \override #'style = #'medicaea_virga + \override NoteHead #'style = #'medicaea.virga b! a! - \property Staff.BarLine \override #'bar-size = #3.0 \bar "|" + \override Staff.BarLine #'bar-size = #3.0 \bar "|" % \break % 5 (8*1) ges! fes! - \clef "medicaea_fa1" - \property Voice.NoteHead \override #'style = #'medicaea_rvirga + \clef "medicaea-fa1" + \override NoteHead #'style = #'medicaea.rvirga e! des! ces! - \property Staff.KeySignature \override #'style = #'hufnagel - \property Staff.Accidental \override #'style = #'hufnagel - \property Staff.Custos \override #'style = #'hufnagel - \property Voice.NoteHead \override #'style = #'hufnagel_punctum - \clef "hufnagel_fa2" + \override Staff.KeySignature #'style = #'hufnagel + \override Staff.Accidental #'style = #'hufnagel + \override Staff.Custos #'style = #'hufnagel + \override NoteHead #'style = #'hufnagel.punctum + \clef "hufnagel-fa2" ces! des! es! - \property Staff.BarLine \override #'bar-size = #3.0 \bar "|" + \override Staff.BarLine #'bar-size = #3.0 \bar "|" % \break % 6 (8*1) fes! ges! - \clef "hufnagel_do2" - \property Voice.NoteHead \override #'style = #'hufnagel_lpes + \clef "hufnagel-do2" + \override NoteHead #'style = #'hufnagel.lpes as! bes! ces'! - \property Voice.NoteHead \override #'style = #'hufnagel_virga + \override NoteHead #'style = #'hufnagel.virga bes! as! - \property Staff.BarLine \override #'bar-size = #3.0 \bar "|" + \override Staff.BarLine #'bar-size = #3.0 \bar "|" % \break % 7 (8*1) ges! fes! - \clef "hufnagel_do_fa" - \property Voice.NoteHead \override #'style = #'hufnagel_punctum + \clef "hufnagel-do-fa" + \override NoteHead #'style = #'hufnagel.punctum es! des! ces! des! es! fes! \bar "||" % \break % 8 (8*1) @@ -113,21 +109,20 @@ upperStaff = \context GregorianStaff = upperStaff < s32*1 % \break % 12 (32*1) } - > -> + >> +>> -lowerStaff = \context MensuralStaff = lowerStaff < - \context MensuralVoice < +lowerStaff = \context MensuralStaff = "lowerStaff" << + \context MensuralVoice << % this is broken until further notice -- see refman - % \property Staff.StaffSymbol \override #'line-count = #5 - \context Staff \outputproperty #(make-type-checker 'staff-symbol-interface) - #'line-count = #5 + % \override Staff.StaffSymbol #'line-count = #5 + \context Staff \applyoutput #(outputproperty-compatibility (make-type-checker 'staff-symbol-interface) 'line-count 5) - \notes \transpose c c { - \property Voice.autoBeaming = ##f - \property Voice.NoteHead \override #'style = #'neo_mensural - \property Voice.Rest \override #'style = #'neo_mensural + \transpose c c { + \set autoBeaming = ##f + \override NoteHead #'style = #'neomensural + \override Rest #'style = #'neomensural \key a \major % FIXME: lily crashes on some (invalid?) ligatures with: @@ -138,56 +133,56 @@ lowerStaff = \context MensuralStaff = lowerStaff < % on many ligatures such as BB. cis'1 d'\breve gis'\breve e'\breve \[ e'\longa fis'\longa \] - \property Staff.forceClef = ##t - \clef "neo_mensural_c2" + \set Staff.forceClef = ##t + \clef "neomensural-c2" cis1 \bar "|" % \break % 2 (16*1) \[ g\breve dis''\longa \] b\breve \[ a\longa d\longa \] - \clef "petrucci_c2" + \clef "petrucci-c2" % \break % 4 (16*1) fis1 ces1 - \clef "petrucci_c2" + \clef "petrucci-c2" r\longa - \property Staff.forceClef = ##t - \clef "mensural_c2" + \set Staff.forceClef = ##t + \clef "mensural-c2" r\breve \bar "|" % \break % 5 (8*1) r2 - \clef "mensural_g" + \clef "mensural-g" r4 r8 r16 r16 - \property Voice.NoteHead \override #'style = #'mensural - \property Voice.Stem \override #'flag-style = #'mensural - \property Voice.Stem \override #'thickness = #1.0 - \property Voice.Rest \override #'style = #'mensural - \clef "petrucci_f" + \override NoteHead #'style = #'mensural + \override Stem #'flag-style = #'mensural + \override Stem #'thickness = #1.0 + \override Rest #'style = #'mensural + \clef "petrucci-f" c8 b, c16 b, c32 b, c64 b, c64 b, d8 e d16 e d32 e d64 e d64 e r\longa - \property Staff.forceClef = ##t - \clef "petrucci_f" + \set Staff.forceClef = ##t + \clef "petrucci-f" r\breve \bar "|" % \break % 6 (8*1) r\breve - \clef "mensural_f" - % FIXME: must set Voice.Stem flag-style to #'neo_mensural to avoid + \clef "mensural-f" + % FIXME: must set Stem flag-style to #'neomensural to avoid % segmentation fault on r8/r16/r32. (Strange: what has - % Voice.Stem flag-style to do with mensural rests?) - \property Voice.Stem \override #'flag-style = #'neo_mensural - % FIXME: produces warnings about "flag `neo_mensurald4' (or 3) not found". + % Stem flag-style to do with mensural rests?) + \override Stem #'flag-style = #'neomensural + % FIXME: produces warnings about "flag `neomensurald4' (or 3) not found". r2 r4 r8 r16 r16 - \property Voice.Stem \override #'flag-style = #'mensural - \property Staff.forceClef = ##t - \clef "mensural_f" + \override Stem #'flag-style = #'mensural + \set Staff.forceClef = ##t + \clef "mensural-f" e\breve f g a1 - \clef "mensural_g" + \clef "mensural-g" % \break % 7 (8*1) \[ bes'!\longa a'!\longa c''!\longa \] @@ -196,103 +191,105 @@ lowerStaff = \context MensuralStaff = lowerStaff < % \break % 9 (16*1) bes'!\longa fis'!1 as'!1 ges'!\longa % lig - \property Staff.forceClef = ##t - \clef "mensural_g" + \set Staff.forceClef = ##t + \clef "mensural-g" e'2 d' c' \bar "|" % \break % 11 (16*1) - \property Staff.forceClef = ##t - \clef "petrucci_g" + \set Staff.forceClef = ##t + \clef "petrucci-g" c'2 d' e' f' - \clef "petrucci_g" + \clef "petrucci-g" g' as'! bes'! cis''! bes'! as'! gis'! fis'! - \property Staff.forceClef = ##t - \clef "mensural_g" + \set Staff.forceClef = ##t + \clef "mensural-g" es'! des'! cis'!1 \bar "||" % \break % 12 (8*1) } - > -> + >> +>> + +\paper { + linethickness = #(/ staffspace 5.0) +} \score { - \context Score < + \context Score << \upperStaff \lowerStaff - > - \paper { + >> + \layout { +% do we want to keep these settings? -gp linewidth = 17.25\cm textheight = 26.0\cm - stafflinethickness = \staffspace / 5.0 indent = 0.0 - \translator { - \ScoreContext + \context { + \Score \accepts MensuralStaff \accepts GregorianStaff % timing = ##f %%%%%%%% FIXME: this has no effect } - \translator { - \VoiceContext + \context { + \Voice \name MensuralVoice \alias Voice \remove Ligature_bracket_engraver \consists Mensural_ligature_engraver - NoteHead \set #'style = #'mensural -% Stem \set #'flag-style = #'mensural %%%%%%%% FIXME: this core dumps - Stem \set #'thickness = #1.0 - Rest \set #'style = #'mensural + \override NoteHead #'style = #'mensural +% \override Stem #'flag-style = #'mensural %%%%%%%% FIXME: this core dumps + \override Stem #'thickness = #1.0 + \override Rest #'style = #'mensural autoBeaming = ##f } - \translator { - \VoiceContext + \context { + \Voice \name GregorianVoice \alias Voice \remove Ligature_bracket_engraver % \consists Gregorian_ligature_engraver %%%%%%%% TODO: not yet implemented - NoteHead \set #'style = #'vaticana_punctum + \override NoteHead #'style = #'vaticana.punctum autoBeaming = ##f } - \translator { - \StaffContext + \context { + \Staff \name MensuralStaff \alias Staff \accepts MensuralVoice \consists Custos_engraver - TimeSignature \set #'style = #'mensural - KeySignature \set #'style = #'mensural - Accidental \set #'style = #'mensural - Custos \set #'style = #'mensural - Custos \set #'neutral-position = #3 - Custos \set #'neutral-direction = #-1 - Custos \set #'adjust-if-on-staffline = ##t - clefGlyph = #"clefs-petrucci_c2" + \override TimeSignature #'style = #'mensural + \override KeySignature #'style = #'mensural + \override Accidental #'style = #'mensural + \override Custos #'style = #'mensural + \override Custos #'neutral-position = #3 + \override Custos #'neutral-direction = #-1 + clefGlyph = #"clefs.petrucci-c2" clefPosition = #-2 clefOctavation = #0 } - \translator { - \StaffContext + \context { + \Staff \name GregorianStaff \alias Staff \accepts GregorianVoice \consists Custos_engraver \remove Time_signature_engraver - StaffSymbol \set #'thickness = #2.0 - StaffSymbol \set #'line-count = #4 - KeySignature \set #'style = #'vaticana - Accidental \set #'style = #'vaticana - Custos \set #'style = #'vaticana - Custos \set #'neutral-position = #4 - Custos \set #'neutral-direction = #-1 - Custos \set #'adjust-if-on-staffline = ##t - clefGlyph = #"clefs-vaticana_do" + \override StaffSymbol #'thickness = #2.0 + \override StaffSymbol #'line-count = #4 + \override KeySignature #'style = #'vaticana + \override Accidental #'style = #'vaticana + \override Custos #'style = #'vaticana + \override Custos #'neutral-position = #4 + \override Custos #'neutral-direction = #-1 + clefGlyph = #"clefs.vaticana-do" clefPosition = #1 clefOctavation = #0 } - \translator { + \context { \RemoveEmptyStaffContext \accepts MensuralVoice \accepts GregorianVoice } } } -%% new-chords-done %% +