X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Flsr%2Fancient-fonts.ly;h=e925c35490cf21a717c4fba53975fb9aafa770bc;hb=5c14a087ca6cbd665fd631452b7b1283ba0387c3;hp=332cce62d00d34bb65e47f466b69a1c4292d5b7f;hpb=20b8c1519bbba8728457aa98e59993837bedfb04;p=lilypond.git diff --git a/input/lsr/ancient-fonts.ly b/input/lsr/ancient-fonts.ly index 332cce62d0..e925c35490 100644 --- a/input/lsr/ancient-fonts.ly +++ b/input/lsr/ancient-fonts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.55" +\version "2.11.62" \header { lsrtags = "ancient-notation" @@ -14,296 +14,222 @@ antigua. doctitlees = "Tipografía de música antigua" texidoc = " -Here are shown many (all?) of the symbols that are included in -LilyPond's support of ancient notation. +Shown here are many (all?) of the symbols that are included in +LilyPond's support for ancient notation. " doctitle = "Ancient fonts" } % begin verbatim -upperStaff = \context GregorianStaff = "upperStaff" << - \context GregorianVoice << - \set Score.timing = ##f -% \set Score.forceAccidental = ##t %%%%%%%% FIXME: what happened to this property? - - \override Staff.StaffSymbol #'line-count = #4 - - \transpose c c { - \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 - a! b! ces' - \override Staff.BarLine #'bar-size = #3.0 \bar "|" -% \break % 1 (8*1) - - \override NoteHead #'style = #'vaticana.quilisma - b! des'! ges! fes! - \breathe - \clef "vaticana-fa1" - \override NoteHead #'style = #'vaticana.plica - es d - \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 - es f - \override NoteHead #'style = #'vaticana.lpes - g as - \override NoteHead #'style = #'vaticana.upes - bes as - \override NoteHead #'style = #'vaticana.vupes - g f - \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 - c d - \override NoteHead #'style = #'vaticana.cephalicus - es f - - \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" - ces! des! - \override Staff.BarLine #'bar-size = #3.0 \bar "|" -% \break % 4 (8*1) - - e! f! ges! - \clef "medicaea-do2" - \override NoteHead #'style = #'medicaea.inclinatum - a! b! ces'! - \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 - e! des! ces! - - \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" - ces! des! es! - \override Staff.BarLine #'bar-size = #3.0 \bar "|" -% \break % 6 (8*1) - - fes! ges! - \clef "hufnagel-do2" - \override NoteHead #'style = #'hufnagel.lpes - as! bes! ces'! - \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 - es! des! ces! des! es! fes! - \bar "||" -% \break % 8 (8*1) - - s32*1 -% \break % 12 (32*1) +upperStaff = \new VaticanaStaff = "upperStaff" << + \context VaticanaVoice << + \transpose c c { + + \override NoteHead #'style = #'vaticana.punctum + \key es \major + \clef "vaticana-fa2" + c1 des e f ges + + \override NoteHead #'style = #'vaticana.inclinatum + a! b ces' + \bar "|" + % \break % 1 (8*1) + + \override NoteHead #'style = #'vaticana.quilisma + b! des'! ges! fes! + \breathe + \clef "vaticana-fa1" + \override NoteHead #'style = #'vaticana.plica + es d + \override NoteHead #'style = #'vaticana.reverse.plica + c d + \bar "|" + % \break %2 (8*1) + + \override NoteHead #'style = #'vaticana.punctum.cavum + es f + \override NoteHead #'style = #'vaticana.lpes + g as + \override NoteHead #'style = #'vaticana.upes + bes as + \override NoteHead #'style = #'vaticana.vupes + g f + \override NoteHead #'style = #'vaticana.linea.punctum + \once \override Staff.BarLine #'bar-size = #2.0 \bar "|" + % \break % 3 (8*1) + + es d + \override NoteHead #'style = #'vaticana.epiphonus + c d + \override NoteHead #'style = #'vaticana.cephalicus + es f + + \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" + ces des + \bar "|" + % \break % 4 (8*1) + + e! f! ges + \clef "medicaea-do2" + \override NoteHead #'style = #'medicaea.inclinatum + a! b! ces' + \override NoteHead #'style = #'medicaea.virga + b! a! + \bar "|" + % \break % 5 (8*1) + + ges fes + \clef "medicaea-fa1" + \override NoteHead #'style = #'medicaea.rvirga + e des ces + + \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" + ces des es + \bar "|" + % \break % 6 (8*1) + + fes ges + \clef "hufnagel-do2" + \override NoteHead #'style = #'hufnagel.lpes + as! bes! ces' + \override NoteHead #'style = #'hufnagel.virga + bes! as! + \bar "|" + % \break % 7 (8*1) + + ges! fes! + \clef "hufnagel-do-fa" + \override NoteHead #'style = #'hufnagel.punctum + es! des ces des! es! fes! + \bar "||" + % \break % 8 (8*1) + + s32*1 + % \break % 12 (32*1) } >> >> -lowerStaff = \context MensuralStaff = "lowerStaff" << +lowerStaff = \new MensuralStaff = "lowerStaff" << \context MensuralVoice << - - % this is broken until further notice -- see refman - % \override Staff.StaffSymbol #'line-count = #5 - \applyOutput #'Staff #(outputproperty-compatibility (make-type-checker 'staff-symbol-interface) 'line-count 5) - - \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: -% ERROR: In procedure gh_scm2int: -% ERROR: Wrong type argument in position 1: () - -% FIXME: lily emits "Programming error: Infinity or NaN encountered" -% on many ligatures such as BB. - - cis'1 d'\breve gis'\breve e'\breve \[ e'\longa fis'\longa \] - \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" -% \break % 4 (16*1) - - fis1 ces1 - \clef "petrucci-c2" - r\longa - \set Staff.forceClef = ##t - \clef "mensural-c2" - r\breve - \bar "|" -% \break % 5 (8*1) - - r2 - \clef "mensural-g" - r4 r8 r16 r16 - \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 - \set Staff.forceClef = ##t - \clef "petrucci-f" - r\breve - \bar "|" -% \break % 6 (8*1) - - r\breve - \clef "mensural-f" - % FIXME: must set Stem flag-style to #'neomensural to avoid - % segmentation fault on r8/r16/r32. (Strange: what has - % 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 - \override Stem #'flag-style = #'mensural - \set Staff.forceClef = ##t - \clef "mensural-f" - e\breve f g a1 - \clef "mensural-g" -% \break % 7 (8*1) - - \[ bes'!\longa a'!\longa c''!\longa \] - e'1 d' c' d' \bar "|" - \bar "|" -% \break % 9 (16*1) - - bes'!\longa fis'!1 as'!1 ges'!\longa % lig - \set Staff.forceClef = ##t - \clef "mensural-g" - e'2 d' c' \bar "|" -% \break % 11 (16*1) - - \set Staff.forceClef = ##t - \clef "petrucci-g" - c'2 d' e' f' - \clef "petrucci-g" - g' as'! bes'! cis''! - bes'! as'! gis'! fis'! - \set Staff.forceClef = ##t - \clef "mensural-g" - es'! des'! cis'!1 \bar "||" -% \break % 12 (8*1) + \transpose c c { + + \key a \major + cis'1 d'\breve gis'\breve e'\breve \[ e'\longa fis'\longa \] + \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" + % \break % 4 (16*1) + + fis1 ces1 + \clef "petrucci-c2" + r\longa + \set Staff.forceClef = ##t + \clef "mensural-c2" + r\breve + \bar "|" + % \break % 5 (8*1) + + r2 + \clef "mensural-g" + r4 r8 r16 r16 + \override NoteHead #'style = #'mensural + \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 + \set Staff.forceClef = ##t + \clef "petrucci-f" + r\breve + \bar "|" + % \break % 6 (8*1) + + r\breve + \clef "mensural-f" + r2 r4 r8 r16 r16 + + \set Staff.forceClef = ##t + \clef "mensural-f" + e\breve f g a1 + \clef "mensural-g" + % \break % 7 (8*1) + + \[ bes'!\longa a'!\longa c''!\longa \] + e'1 d' c' d' \bar "|" + \bar "|" + % \break % 9 (16*1) + + bes'!\longa fis'!1 as'!1 ges'!\longa % lig + \set Staff.forceClef = ##t + \clef "mensural-g" + e'2 d' c' \bar "|" + % \break % 11 (16*1) + + \set Staff.forceClef = ##t + \clef "petrucci-g" + c'2 d' e' f' + \clef "petrucci-g" + g' as'! bes'! cis''! + bes'! as'! gis'! fis'! + \set Staff.forceClef = ##t + \clef "mensural-g" + es'! des'! cis'!1 \bar "||" + % \break % 12 (8*1) } >> >> \paper { - line-thickness = #(/ staff-space 5.0) + line-thickness = #(/ staff-space 5.0) } \score { - \context Score << - \upperStaff - \lowerStaff - >> - \layout { -% do we want to keep these settings? -gp - line-width = 17.25\cm - textheight = 26.0\cm - indent = 0.0 - \context { - \Score - \accepts MensuralStaff - \accepts GregorianStaff -% timing = ##f %%%%%%%% FIXME: this has no effect - } - \context { - \Voice - \name MensuralVoice - \alias Voice - \remove Ligature_bracket_engraver - \consists Mensural_ligature_engraver - \override NoteHead #'style = #'mensural -% \override Stem #'flag-style = #'mensural %%%%%%%% FIXME: this core dumps - \override Stem #'thickness = #1.0 - \override Rest #'style = #'mensural - autoBeaming = ##f - } - \context { - \Voice - \name GregorianVoice - \alias Voice - \remove Ligature_bracket_engraver -% \consists Gregorian_ligature_engraver %%%%%%%% TODO: not yet implemented - \override NoteHead #'style = #'vaticana.punctum - autoBeaming = ##f - } - \context { - \Staff - \name MensuralStaff - \alias Staff - \accepts MensuralVoice - \consists Custos_engraver - \override TimeSignature #'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" - clefPosition = #-2 - clefOctavation = #0 - } - \context { - \Staff - \name GregorianStaff - \alias Staff - \accepts GregorianVoice - \consists Custos_engraver - \remove Time_signature_engraver - \override StaffSymbol #'thickness = #2.0 - \override StaffSymbol #'line-count = #4 - \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" - clefPosition = #1 - clefOctavation = #0 - } - \context { - \RemoveEmptyStaffContext - \accepts MensuralVoice - \accepts GregorianVoice - } + << + \upperStaff + \lowerStaff + >> + \layout { + indent = 0.0 + line-width = 17.25\cm + \context { + \Score + timing = ##f + } + \context { + \MensuralVoice + \override NoteHead #'style = #'neomensural + \override Rest #'style = #'neomensural + \override Stem #'flag-style = #'mensural + \override Stem #'thickness = #1.0 + } + \context { + \MensuralStaff + \revert BarLine #'transparent + \override KeySignature #'glyph-name-alist = #alteration-mensural-glyph-name-alist + clefGlyph = #"clefs.petrucci.c2" } + \context { + \VaticanaStaff + \revert BarLine #'transparent + \override StaffSymbol #'thickness = #2.0 + \override KeySignature #'glyph-name-alist = #alteration-vaticana-glyph-name-alist + \override Custos #'neutral-position = #4 + } + } } - -