X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftest%2Fancient-font.ly;h=a295c68c377ed2c5fe6d4fbaf7f71d3a28739aad;hb=76d3f50159ef5db6468171e553d64c697620f33b;hp=fa45aac5060685152f5950f30ffac6b5928a536b;hpb=8b88bf025331c789167734067001a3d79501b433;p=lilypond.git

diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly
index fa45aac506..a295c68c37 100644
--- a/input/test/ancient-font.ly
+++ b/input/test/ancient-font.ly
@@ -1,123 +1,295 @@
+\version "2.9.6"
+% TODO: split ancient-font into seperate files; possibly in
+% different locations.
 \header {
-    title	= "ancient font test";
-    date	= "2000";
+texidoc = "@cindex Ancient Font
+Here are shown many (all?) of the symbols that are
+included in LilyPond's support of ancient notation.
+"
 }
 
 
+upperStaff = \new GregorianStaff =  "upperStaff" <<
+  \context GregorianVoice <<
+    \set Score.timing = ##f
+%   \set Score.forceAccidental = ##t %%%%%%%% FIXME: what happened to this property?
 
-\include "paper26.ly"
+    \override Staff.StaffSymbol  #'line-count = #4
 
-global =  \notes {
-    \property Score.timing = ##f
-%   \property Staff.TimeSignature \override #'style = #'old
-}
+     \transpose c c {
+	\override Staff.KeySignature  #'style = #'vaticana
+	\override Staff.Accidental  #'style = #'vaticana
+	\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  #'style = #'medicaea
+	\override Staff.Accidental  #'style = #'medicaea
+	\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!
 
-upperVoice =  \context Staff = upperVoice <
-    \global
-    \property Staff.StaffSymbol \override #'line-count = #4
-    \notes \transpose c' {
-	\property Voice.NoteHead \override #'style = #'mensural
-	\property Voice.Stem \override #'stem-centered = ##t
-	\property Staff.Custos \override #'style = #'vaticana
-	\clef "vaticana_fa2";
-	c2 d e f g
-
-%	\property Staff.clefGlyph = #"clefs-vaticana_do"
-%	\property Staff.clefPosition = #1
-%	\property Staff.clefOctavation = #0 
-	\clef "vaticana_do2";
-
-	a b c'
-	b a g f
-	\clef "vaticana_fa1";
-	e d c1 \bar "|";
-
-	\property Staff.Custos \override #'style = #'medicaea
-	\clef "medicaea_fa2";
-	c2 d e f g
-	\clef "medicaea_do2";
-	a b c'
-	b a g f
-	\clef "medicaea_fa1";
-	e d c1 \bar "|";
-
-	\property Staff.Custos \override #'style = #'hufnagel
-	\clef "hufnagel_fa2";
-	c2 d e f g
-	\clef "hufnagel_do2";
-	a b c'
-	b a g f
-	\clef "hufnagel_fa1";
-	e d c1 \bar "||";
+	\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!
+	\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)
     }
->
-
-lowerVoice =  \context Staff = lowerNotes <
-    \global
-    \property Staff.StaffSymbol \override #'line-count = #5
-    \notes \transpose c' {
-        \property Voice.NoteHead \override #'style = #'mensural
-	\property Voice.Stem \override #'stem-centered = ##t
-	\property Staff.Custos \override #'style = #'mensural
-	\clef "mensural1_c2";
-	c2 d e f g
-	\clef "mensural1_c2";
-	a b c'
-	b a g f
-	\clef "mensural2_c2";
-	e d c1 \bar "|";
-
-	\clef "mensural2_c2";
-	c2 d e f g
-	\clef "mensural3_c2";
-	a b c'
-	b a g f
-	\clef "mensural3_c2";
-	e d c1 \bar "|";
-
-	\clef "mensural1_f";
-	c2 d e f g
-	\clef "mensural1_f";
-	a b c'
-	b a g f
-	\clef "mensural2_f";
-	e d c1 \bar "|";
-
-	\clef "mensural2_f";
-	c2 d e f g
-	\clef "mensural_g";
-	a' b' c''
-	b' a' g' f'
-	\clef "mensural_g";
-	e' d' c'1 \bar "|";
-
-	\clef "mensural_g";
-	c'2 d' e' f' g'
-	\clef "hufnagel_do_fa";
-	a b c'
-	b a g f
-	\clef "hufnagel_do_fa";
-	e d c1 \bar "||";
+  >>
+>>
+
+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)
     }
->
+  >>
+>>
+
+\paper {
+	line-thickness = #(/ staff-space 5.0)
+}
 
 \score {
-    \context ChoirStaff <
-	\upperVoice
-	\lowerVoice
-    >
-    \paper {
-%	\paperTwentysix
-	linewidth = 17.25\cm;
-	textheight = 26.0\cm;
-	indent = 0.0;
-	\translator {
-	    \StaffContext
-	    \consists Custos_engraver;
-%	    Custos \override #'style = #'mensural;
-	    \remove Time_signature_engraver;
-%	    StaffSymbol \override #'line-count = #4
+    \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 #'style = #'mensural
+	    \override Accidental #'style = #'mensural
+	    \override Custos #'style = #'mensural
+	    \override Custos #'neutral-position = #3
+	    \override Custos #'neutral-direction = #down
+	    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 #'style = #'vaticana
+	    \override Accidental #'style = #'vaticana
+	    \override Custos #'style = #'vaticana
+	    \override Custos #'neutral-position = #4
+	    \override Custos #'neutral-direction = #down
+	    clefGlyph = #"clefs.vaticana.do"
+	    clefPosition = #1
+	    clefOctavation = #0 
 	}
+	\context {
+	    \RemoveEmptyStaffContext
+	    \accepts MensuralVoice
+	    \accepts GregorianVoice
+        }
     }
 }