-% -*-Fundamental-*-
+% -%-Fundamental-%- -*-Metafont-*-
% parmesan-heads.mf -- implement ancient note heads
%
% source file of LilyPond's pretty-but-neat music font
%
-% (c) 2001--2002 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2001--2005 Juergen Reuter <reuter@ipd.uka.de>
+%
+% Neo-mensural heads originally by
+% Christian Mondrup and Mats Bengtsson
%
save black_notehead_width;
fet_begingroup ("noteheads")
-noteheight#:=staff_space#+ (1 + overdone_heads) *stafflinethickness#;
+%
+% character aligment:
+%
+% The head is assumed to be vertically centered around (0, 0).
+% The left-most edge of the head should touch the vertical line
+% that goes though the point (0, 0).
+%
+% set_char_box() conventions:
+%
+% * breapth: Ignored (as far as I know). Should be set to 0.
+%
+% * width: Should match the head's width.
+%
+% * depth: Should match the bottom edge of the head. Affects vertical
+% collision handling.
+%
+% * height: Should match the top edge of the head. Affects vertical
+% collision handling.
+%
+% TODO: should depth/height include appendages/stems?
+
+overdone_heads = 0;
+noteheight# := staff_space# + (1 + overdone_heads)*stafflinethickness#;
define_pixels(noteheight);
%
%
%
-brevis_wid# := 2 staff_space#;
-def draw_brevis(expr brevwid) =
+def draw_neomensural_brevis(expr brevwid) =
save beamheight, head_width;
save holeheight, stem_width;
save serif_size, serif_protrude;
-- z4l -- z4r -- z3r{left} .. z2r{up} -- cycle;
addto currentpicture also currentpicture yscaled -1;
- show z4r; show z4l;
addto currentpicture also currentpicture
shifted (-x4r,0) xscaled -1 shifted (x4l,0);
enddef;
+def draw_neomensural_left_stemmed_head (expr wid) =
+ draw_neomensural_brevis(wid);
+
+ x6 = x7 = stem_width/2;
+ y6 = y5;
+ y7 = y5 - 2.25 staff_space;
+ pickup pencircle scaled stem_width;
+ draw z6 .. z7;
+enddef;
+
+fet_beginchar("Left stemmed notehead", "lneomensural");
+ draw_neomensural_left_stemmed_head (2 staff_space#);
+fet_endchar;
+
%
% Some sources (eg Musix/OpusTeX think that the appendage should be on
% the left, some say right. Right wins democratically.
%
-def draw_longa (expr wid) =
- draw_brevis(wid);
+def draw_neomensural_longa (expr wid) =
+ draw_neomensural_brevis(wid);
save theta;
x7r = head_width;
%
% (ze is wel breed)
%
-fet_beginchar("Maxima notehead", "-3mensural", "mensuralmaximahead");
- draw_longa (1.3 brevis_wid#)
+fet_beginchar("Neo-mensural maxima notehead", "s-3neomensural");
+ draw_neomensural_longa (2.6 staff_space#)
fet_endchar;
-fet_beginchar("Longa notehead", "-2mensural", "mensurallongahead");
- draw_longa (brevis_wid#)
+fet_beginchar("Neo-mensural longa notehead", "s-2neomensural");
+ draw_neomensural_longa (2 staff_space#)
fet_endchar;
-fet_beginchar("Brevis notehead", "-1mensural", "mensuralbrevishead")
- draw_brevis(brevis_wid#);
+fet_beginchar("Neo-mensural brevis notehead", "s-1neomensural")
+ draw_neomensural_brevis(2 staff_space#);
fet_endchar;
-def draw_neo_mensural_black_head (expr wid) =
+def draw_neomensural_black_head (expr wid, height) =
save head_width;
head_width# = wid;
- set_char_box (0, head_width#, noteheight#/2, noteheight#/2);
-
+ set_char_box (0, head_width#, height/2, height/2);
+
+ charwx := head_width# / 2;
+ charwy := height / 2;
y3 = y1 =0;
x2 = x4 = (x1 + x3) /2;
filldraw z1 -- z2 -- z3 -- z4 -- cycle;
enddef;
-def draw_neo_mensural_open_head (expr wid)=
- draw_neo_mensural_black_head (wid);
+def draw_neomensural_open_head (expr wid, height)=
+ draw_neomensural_black_head (wid, height);
save diamNW, diamSW;
diamNW = length (z2 - z1) + blot_diameter;
diamSW = length (z4 - z1) + blot_diameter;
save hole_widthNW, hole_widthSW;
hole_widthNW = 0.34 diamNW ;
- hole_widthSW + 2.6 stafflinethickness = diamSW;
+ hole_widthSW + 2.6 linethickness = diamSW;
(z7 + z5)/2 = (w/2, 0);
(z8 + z6)/2 = (w/2, 0);
unfill z5 -- z6 -- z7 -- z8 --cycle;
enddef;
-fet_beginchar("Neo-mensural open head","0neo_mensural","neomensuralminimhead")
- draw_neo_mensural_open_head (staff_space#);
+fet_beginchar("Neo-mensural open head","s0neomensural")
+ draw_neomensural_open_head (staff_space#, noteheight#);
fet_endchar;
-fet_beginchar("Neo-mensural open head","1neo_mensural","neomensuralsemiminimhead")
- draw_neo_mensural_open_head (staff_space#);
-fet_endchar;
+%
+% WL says the thin lines should be thinner.
+%
-fet_beginchar("Neo-mensural black head","2neo_mensural","neofusahead")
- draw_neo_mensural_black_head (staff_space#);
+fet_beginchar("Harmonic notehead (Neo-mensural open)",
+ "0harmonic")
+
+ draw_neomensural_open_head (1.3 staff_space#, 1.3 noteheight#);
+ charwx := head_width#;
+ charwy := 0;
fet_endchar;
-def draw_mensural_head (expr wid, open) =
- save head_width;
- head_width# = wid;
- set_char_box (head_width#/2, head_width#/2,
- noteheight#/2, noteheight#/2);
+fet_beginchar("Neo-mensural open head","s1neomensural")
+ draw_neomensural_open_head (staff_space#, noteheight#);
+fet_endchar;
- define_pixels(head_width, noteheight);
+fet_beginchar("Neo-mensural black head","s2neomensural")
+ draw_neomensural_black_head (staff_space#, noteheight#);
+fet_endchar;
- x1 = -x3;
- y1 = x2 = y3 = x4 = 0;
- y4 = -y2;
- y2 = 1.4 noteheight/2;
- tand(30) = x3 / y2;
- pickup pencircle
- xscaled 0.15 head_width
- yscaled 0.30 head_width
- rotated -30;
- % pencircle width correction
- save zc, zd; pair zc, zd;
- zc = (+0.150 head_width * sind(30), +0.150 head_width * cosd(30));
- zd = (+0.075 head_width * sind(30), -0.075 head_width * cosd(30));
+def draw_mensural_brevis (expr wid) =
+ % TODO. For the moment, fall back to draw_neomensural_brevis.
+ draw_neomensural_brevis(wid);
+enddef;
- if open:
- draw (z1+zc+zd) -- (z2-zc+zd) --
- (z3-zc-zd) -- (z4+zc-zd) -- cycle;
- else:
- filldraw (z1+zc+zd) -- (z2-zc+zd) --
- (z3-zc-zd) -- (z4+zc-zd) -- cycle;
- fi;
+def draw_mensural_left_stemmed_head (expr wid) =
+ draw_mensural_brevis(wid);
+ x6 = x7 = stem_width/2;
+ y6 = y5;
+ y7 = y5 - 2.25staff_space;
+ pickup pencircle scaled stem_width;
+ draw z6 .. z7;
enddef;
+def draw_mensural_longa (expr wid) =
+ draw_mensural_brevis(wid);
+ x6 = x7 = head_width - stem_width/2;
+ y6 = y5;
+ y7 = y5 - 2.25staff_space;
+ pickup pencircle scaled stem_width;
+ draw z6 .. z7;
+enddef;
-fet_beginchar("Mensural open head","0mensural","mensuralminimhead")
- draw_mensural_head (staff_space#, true);
+fet_beginchar("Mensural left stemmed notehead", "slmensural");
+ draw_mensural_left_stemmed_head (staff_space#)
fet_endchar;
-fet_beginchar("Mensural open head","1mensural","mensuralsemiminimhead")
- draw_mensural_head (staff_space#, true);
+fet_beginchar("Mensural maxima notehead", "s-3mensural");
+ draw_mensural_longa (2.0 staff_space#)
fet_endchar;
-fet_beginchar("Mensural black head","2mensural","fusahead")
- draw_mensural_head (staff_space#, false);
+fet_beginchar("Mensural longa notehead", "s-2mensural");
+ draw_mensural_longa (staff_space#)
fet_endchar;
+fet_beginchar("Mensural brevis notehead", "s-1mensural")
+ draw_mensural_brevis(staff_space#);
+fet_endchar;
-%%%%%%%%%%%%
-%
-%
-% ledger (leger) lines
-%
-fet_beginchar("Ledger ending", "ledgerending", "ledgerending")
-set_char_box (5/2 ledgerlinethickness#, 5/2 ledgerlinethickness#,
- ledgerlinethickness#/2,ledgerlinethickness#/2);
- pickup pencircle scaled 1.3 blot_diameter;
+def draw_diamond_head (expr head_h, pen_w, pen_h, angle, open) =
+ save head_width, head_height;
+ head_height# = head_h;
+ head_width# / head_height# = tand(angle);
- rt x2 = w;
- lft x1 = -b;
- x3 = x2;
- bot y1 = -d;
- y2 = y1;
+ set_char_box (0, head_width#,
+ head_height#/2, head_height#/2);
+
+ charwx := head_width# / 2;
+ charwy := head_height# / 2 - linethickness#;
- top y3 = h;
- y4 = y3;
- x4 = x1;
+ define_pixels(head_width, head_height);
+ pickup pencircle
+ xscaled (max(blot_diameter, pen_w * head_width))
+ yscaled (max(blot_diameter, pen_h * head_width))
+ rotated -angle;
+
+ %% FIXME: replace "xpart (top z2)" (and, analogously,
+ %% "ypart (rt z3)") with an expression that really delivers the
+ %% x coordinate of the uppermost pixel that is drawn with respect
+ %% to the pencircle (this requires some elliptical computations).
+ %% MF obviously interprets "xpart (top z2)" as "top (xpart z2)",
+ %% i.e. "top x2", which is not what we want.
+
+ xpart (top z2) = ypart (rt z3) = 0;
+ top y2 = head_height/2;
+ rt x3 = head_width/2;
+ z2 = - z4;
+ z3 = - z1;
- filldraw z1 --- z2 --- z3 --- z4 --- cycle ;
+ if open:
+ draw z1 -- z2 -- z3 -- z4 -- cycle;
+ else:
+ filldraw z1 -- z2 -- z3 -- z4 -- cycle;
+ fi;
+
+ currentpicture := currentpicture shifted (head_width/2, 0);
+
+enddef;
+
+
+fet_beginchar("Mensural open head","s0mensural")
+ draw_diamond_head (staff_space#, 0.15, 0.30, 30, true);
+fet_endchar;
+
+fet_beginchar("Mensural open head","s1mensural")
+ draw_diamond_head (staff_space#, 0.15, 0.30, 30, true);
+fet_endchar;
+
+fet_beginchar("Mensural black head","s2mensural")
+ draw_diamond_head (staff_space#, 0.15, 0.30, 30, false);
fet_endchar;
%
% parameterized punctum
-def punctum_char (expr verbose_name, internal_name, mudela_name,
+def punctum_char (expr verbose_name, internal_name,
left_stem, right_stem, linea, cavum,
- straight, auctum, direction_up, excentric, up_shift, mag) =
+ straight, auctum, direction_up, excentric, up_shift, down_shift, mag) =
- fet_beginchar(verbose_name, internal_name, mudela_name)
+ fet_beginchar(verbose_name, "s" & internal_name)
save b_h, a_w;
a_b := 1.54; % b_h*a_b/a_w = wd/ht
b_h := 0.85;
2beta# = ht# * b_h;
a# = beta# * a_b;
wd# = 2a# / a_w;
- set_char_box(0.50wd#, 0.10wd#, 0.5ht#, 0);
black_notehead_width# := wd#;
% direction
save yoffs;
if up_shift:
yoffs# = 0.08ht#;
+ elseif down_shift:
+ yoffs# = -0.11ht#;
else:
yoffs# = 0.00ht#;
fi
define_pixels(convexity, excentricity, yoffs, ht, wd);
- pickup pencircle scaled stafflinethickness;
+ pickup pencircle scaled linethickness;
path p;
save height, yoffs_bt;
define_pixels (height, yoffs_bt);
- height# = max (0.5ht# - stafflinethickness#, 0);
- yoffs_bt# = yoffs# - (height# - stafflinethickness#)/2 -
- convexity#;
+ height# = 0.47ht#;
+ yoffs_bt# = yoffs# - 0.5*height# - 0.25*convexity#;
xpart z1a = xpart z1b;
xpart z2a = xpart z2b;
xpart z3a = xpart z3b;
ypart z2a + height = ypart z2b;
ypart z3a + height = ypart z3b;
+ save box_top, box_bt;
+
if auctum:
- z1a = (0.00wd + stafflinethickness/2, yoffs_bt);
- z2a = (0.20wd, yoffs_bt + 1.0*convexity);
- z3a = (0.40wd - stafflinethickness/2,
+ z1a = (0.00wd + linethickness/2, yoffs_bt);
+ z2a = (0.21wd, yoffs_bt + 1.0*convexity);
+ z3a = (0.42wd - linethickness/2,
yoffs_bt + 1.0*excentricity);
+ box_top# = height# + yoffs_bt# +
+ max(0, 1.0*convexity#, 1.0*excentricity#);
+ box_bt# = yoffs_bt# +
+ min(0, 1.0*convexity#, 1.0*excentricity#);
p = z1a .. {right}z2a .. {direction}z3a --
z3b{-direction} .. z2b{left} .. z1b -- cycle;
elseif excentric:
- z1a = (0.00wd + stafflinethickness/2,
+ z1a = (0.00wd + linethickness/2,
yoffs_bt - 1.0*convexity);
z2a = (0.08wd, yoffs_bt + 1.4*convexity);
- z3a = (0.40wd - stafflinethickness/2, yoffs_bt);
+ z3a = (0.42wd - linethickness/2,
+ yoffs_bt - 1.0*convexity);
+ box_top# = height# + yoffs_bt# +
+ max(-1.0*convexity#, 1.4*convexity#, 0);
+ box_bt# = yoffs_bt# +
+ min(-1.0*convexity#, 1.4*convexity#, 0);
p = z1a{direction} .. z2a{right} .. z3a --
z3b .. {left}z2b .. {-direction}z1b -- cycle;
else:
- z1a = (0.00wd + stafflinethickness/2, yoffs_bt);
- z2a = (0.20wd, yoffs_bt + 1.0*convexity);
- z3a = (0.40wd - stafflinethickness/2, yoffs_bt);
+ z1a = (0.00wd + linethickness/2, yoffs_bt);
+ z2a = (0.21wd, yoffs_bt + 1.0*convexity);
+ z3a = (0.42wd - linethickness/2, yoffs_bt);
+ box_top# = height# + yoffs_bt# +
+ max(0, 1.0*convexity#);
+ box_bt# = yoffs_bt# +
+ min(0, 1.0*convexity#);
p = z1a .. z2a .. z3a --
z3b .. z2b .. z1b -- cycle;
fi;
filldraw p;
fi;
+ pickup pencircle scaled 0.6linethickness;
- pickup pencircle scaled stafflinethickness;
+ save stem_bt;
if left_stem:
- z5=(0.00wd + stafflinethickness/2, yoffs);
- z6=(0.00wd + stafflinethickness/2, yoffs - 1.5ht);
+ z5=(0.00wd + 0.6linethickness/2, yoffs);
+ z6=(0.00wd + 0.6linethickness/2, yoffs - 1.1ht);
draw z5 -- z6;
- fi;
-
- if right_stem:
- z5=(0.40wd - stafflinethickness/2, yoffs);
- z6=(0.40wd - stafflinethickness/2, yoffs - 1.5ht);
+ stem_bt# = yoffs# - 1.1ht#;
+ elseif right_stem:
+ z5=(0.42wd - 0.6linethickness/2, yoffs);
+ z6=(0.42wd - 0.6linethickness/2, yoffs - 1.5ht);
draw z5 -- z6;
+ stem_bt# = yoffs# - 1.5ht#;
+ else:
+ stem_bt# = 0;
fi;
+ set_char_box(0.00wd#, 0.42wd#,
+ max(0, -box_bt#, -stem_bt#) + linethickness#/2,
+ max(0, box_top#) + linethickness#/2);
+
if linea:
save linea_width, linea_height;
- linea_width# = stafflinethickness#;
- linea_height# = 0.85 ht#;
+ linea_width# = 0.6 linethickness#;
+ linea_height# = 0.7 ht#;
define_pixels (linea_width, linea_height);
draw_block ((-0.10wd - linea_width/2,
- yoffs - linea_height/2),
+ -linea_height/2),
(-0.10wd + linea_width/2,
- yoffs + linea_height/2));
- draw_block ((+0.50wd - linea_width/2,
- yoffs - linea_height/2),
- (+0.50wd + linea_width/2,
- yoffs + linea_height/2));
+ +linea_height/2));
+ draw_block ((+0.52wd - linea_width/2,
+ -linea_height/2),
+ (+0.52wd + linea_width/2,
+ +linea_height/2));
+ set_char_box(0,
+ 0.62wd# + linea_width#,
+ linea_height#/2,
+ linea_height#/2);
+ currentpicture := currentpicture
+ shifted (0.10wd + linea_width/2, 0);
fi;
fet_endchar;
enddef;
% parameterized punctum inclinatum
-def inclinatum_char(expr verbose_name, internal_name, mudela_name,
+def inclinatum_char(expr verbose_name, internal_name,
small, stropha, auctum) =
- fet_beginchar(verbose_name, internal_name, mudela_name)
-
- save b_h, a_w;
- a_b := 1.54; % b_h*a_b/a_w = wd/ht
- b_h := 0.85;
- a_w := 1.09;
-
- save a, beta, ht, wd;
- ht# = noteheight#;
- 2beta# = ht# * b_h;
- a# = beta# * a_b;
- wd# = 2a# / a_w;
- set_char_box(0.3wd#, 0.3wd#, 0.5 ht#, 0.5 ht#);
- black_notehead_width# := wd#;
-
- save za, alpha, size;
- pair za;
- alpha = 35;
- define_pixels(ht, wd);
-
+ fet_beginchar(verbose_name, "s"&internal_name)
+ save ht, alpha;
+ alpha# = 35;
if small:
- size# = 0.23ht#;
+ ht# = 0.50 noteheight#;
else:
- size# = 0.45ht#;
+ ht# = 0.80 noteheight#;
fi;
- define_pixels(size);
-
- pickup pencircle
- xscaled blot_diameter
- yscaled size rotated -alpha;
- za = (0, size - blot_diameter/2) / 2 rotated alpha;
- draw -za .. za;
+ draw_diamond_head (ht#, 0, 0, alpha#, false);
if stropha:
pickup pencircle
- xscaled (size/3)
- yscaled size rotated alpha;
+ xscaled (0.25*head_height)
+ yscaled (0.55*head_height)
+ rotated alpha#;
save za, off_angle; pair za;
off_angle := 15;
- za = (0, -size) / 2 rotated -(alpha + off_angle);
+ za = (0, -0.25*head_height)
+ rotated -(alpha# + off_angle)
+ shifted (0.48 head_width, -0.02 head_width);
undraw za;
fi;
if auctum:
- pickup pencircle scaled stafflinethickness;
- save za, zb;
- pair za, zb;
- za = ((0, -size) rotated -alpha) +
- (0, stafflinethickness/2);
- xpart zb = 0;
- ypart zb = ypart za;
- draw za{(0,-1) rotated alpha} ..
- {(0,1) rotated -alpha}zb;
+ pickup pencircle scaled linethickness;
+ save za, zb, zc;
+ pair za, zb, zc;
+ za = (0, -0.5 head_height + linethickness);
+ zb = 0.6 (za + zc);
+ zc = za + (0.52 head_width, 0);
+ draw za{(0,-1) rotated alpha#} .. {right}zb{right} ..
+ {(0,1) rotated -alpha#}zc;
fi;
fet_endchar;
enddef;
% punctum
-punctum_char("Ed. Vat. punctum", "0vaticana_punctum", "vatpunctumhead",
+punctum_char("Ed. Vat. punctum", "vaticana.punctum",
false, false, false, false, false,
- false, false, false, false, 1.0);
+ false, false, false, false, false, 1.0);
% punctum cavum (for OpusTeX compatibility)
-%punctum_char("Ed. Vat. punctum cavum", "0vaticana_punctum_cavum",
-% "vatpunctumcavumhead",
-% false, false, false, true, false,
-% false, false, false, false, 1.0);
+punctum_char("Ed. Vat. punctum cavum", "vaticana.punctum.cavum",
+ false, false, false, true, false,
+ false, false, false, false, false, 1.0);
% linea punctum (for OpusTeX compatibility)
-%punctum_char("Ed. Vat. linea punctum", "0vaticana_linea_punctum",
-% "vatlineapunctumhead",
-% false, false, true, false, false,
-% false, false, false, false, 1.0);
+punctum_char("Ed. Vat. linea punctum", "vaticana.linea.punctum",
+ false, false, true, false, false,
+ false, false, false, false, false, 1.0);
% linea punctum cavum (for OpusTeX compatibility)
-%punctum_char("Ed. Vat. linea punctum cavum", "0vaticana_linea_punctum_cavum",
-% "vatlineapunctumcavumhead",
-% false, false, true, true, false,
-% false, false, false, false, 1.0);
+punctum_char("Ed. Vat. linea punctum cavum", "vaticana.linea.punctum.cavum",
+ false, false, true, true, false,
+ false, false, false, false, false, 1.0);
% punctum inclinatum
-inclinatum_char("Ed. Vat. inclinatum", "0vaticana_inclinatum",
- "vatinclinatumhead",
+inclinatum_char("Ed. Vat. inclinatum", "vaticana.inclinatum",
false, false, false);
-% virga (i.e. right stemmed punctum)
-punctum_char("Ed. Vat. virga", "0vaticana_virga", "vatvirgahead",
- false, true, false, false, false,
- false, false, false, false, 1.0);
-
-% left stemmed punctum as used in clivis (flexa) ligature
-punctum_char("Ed. Vat. reverse virga", "0vaticana_rvirga", "vatrvirgahead",
- true, false, false, false, false,
- false, false, false, false, 1.0);
+% pes lower punctum
+punctum_char("Ed. Vat. pes lower punctum", "vaticana.lpes",
+ false, false, false, false, true,
+ false, true, false, false, false, 1.0);
% pes lower punctum
-punctum_char("Ed. Vat. pes lower punctum", "0vaticana_lpes", "vatlpeshead",
+punctum_char("Ed. Vat. pes var lower punctum", "vaticana.vlpes",
false, false, false, false, true,
- false, true, false, false, 1.0);
+ false, true, false, false, true, 1.0);
% pes upper punctum
-punctum_char("Ed. Vat. pes upper punctum", "0vaticana_upes", "vatupeshead",
+punctum_char("Ed. Vat. pes upper punctum", "vaticana.upes",
false, false, false, false, true,
- false, false, false, false, 1.0);
+ false, false, false, false, false, 1.0);
% pes upper punctum (shifted variation)
%
-% Note: This note head is used instead of the regular pes upper
-% punctum to avoid collision with the lower punctum note of the pes when
-% the upper punctum sits directly on top of the lower punctum.
+% This note head is used instead of the regular pes upper punctum to
+% avoid collision with the lower punctum note of the pes when the upper
+% punctum sits directly on top of the lower punctum.
%
-punctum_char("Ed. Vat. var pes upper punctum", "0vaticana_vupes",
- "vatvupeshead",
+punctum_char("Ed. Vat. var pes upper punctum", "vaticana.vupes",
false, false, false, false, true,
- false, false, false, true, 1.0);
+ false, false, false, true, false, 1.0);
-% small punctum as used in epiphonus/cephalicus
-punctum_char("Ed. Vat. plica", "0vaticana_plica", "vatplicahead",
- false, false, false, false, true,
- false, false, false, false, 0.5);
+% small punctum as used in epiphonus
+punctum_char("Ed. Vat. plica", "vaticana.plica",
+ false, false, false, false, false,
+ false, false, false, false, false, 0.6);
% excentric punctum as used in epiphonus
-punctum_char("Ed. Vat. epiphonus", "0vaticana_epiphonus", "vatepiphonushead",
+punctum_char("Ed. Vat. epiphonus", "vaticana.epiphonus",
false, false, false, false, false,
- false, true, true, false, 1.0);
+ false, true, true, false, false, 1.0);
-% excentric punctum as used in cephalicus
-punctum_char("Ed. Vat. cephalicus", "0vaticana_cephalicus",
- "vatcephalicushead",
+% excentric punctum as used in epiphonus (shifted variation)
+%
+% This note head is used instead of the regular epiphonus punctum to
+% avoid collision with the plica head when the plica sits directly on
+% top of the lower head.
+%
+punctum_char("Ed. Vat. var epiphonus", "vaticana.vepiphonus",
+ false, false, false, false, false,
+ false, true, true, false, true, 1.0);
+
+% small punctum as used in cephalicus
+punctum_char("Ed. Vat. rev. plica", "vaticana.reverse.plica",
+ false, false, false, false, false,
+ false, true, false, false, false, 0.6);
+
+% excentric punctum as used in cephalicus; without left stem
+punctum_char("Ed. Vat. cephalicus", "vaticana.inner.cephalicus",
false, false, false, false, false,
- false, false, true, false, 1.0);
+ false, false, true, false, false, 1.0);
+
+% excentric punctum as used in cephalicus; with left stem
+punctum_char("Ed. Vat. cephalicus", "vaticana.cephalicus",
+ true, false, false, false, false,
+ false, false, true, false, false, 1.0);
% quilisma
-fet_beginchar("Ed. Vat. quilisma", "0vaticana_quilisma", "vatquilismahead")
+fet_beginchar("Ed. Vat. quilisma", "svaticana.quilisma")
save b_h,a_w;
a_b:=1.54; % b_h*a_b/a_w = wd/ht
b_h:=0.85;
2beta# = ht#*b_h;
a# = beta#*a_b;
wd# = 2a# / a_w;
- set_char_box(0.4wd#, 0.00wd#, 0.5 ht#, 0.5 ht#);
+ set_char_box(0, 0.42wd#, 0.28 ht#, 0.36 ht#);
black_notehead_width# := wd#;
define_pixels(ht, wd);
- pickup pencircle xscaled stafflinethickness yscaled 0.4ht;
- z1 = (0.00wd, -0.11ht);
- z2 = (0.00wd, +0.06ht);
- z3 = (0.10wd, -0.05ht);
- z4 = (0.16wd, +0.11ht);
- z5 = (0.24wd, -0.01ht);
- z6 = (0.30wd, +0.15ht);
- z7 = (0.40wd, +0.04ht);
- z8 = (0.40wd, +0.21ht);
- draw z1 -- z2 -- z3 -- z4 -- z5 -- z6 -- z7 -- z8;
+ pickup pencircle xscaled linethickness yscaled 0.44ht;
+ lft x1 = 0.00wd; bot y1 = -0.28ht;
+ x2 = 0.11wd; y2 = -0.14ht;
+ x3 = 0.12wd; y3 = +0.03ht;
+ x4 = 0.25wd; y4 = -0.09ht;
+ x5 = 0.26wd; y5 = +0.08ht;
+ x6 = 0.40wd; y6 = -0.04ht;
+ rt x7 = 0.42wd; top y7 = +0.36ht;
+ draw z1 .. z2 -- z3 .. z4 -- z5 .. z6 -- z7;
fet_endchar;
% solesmes punctum inclinatum parvum
-%inclinatum_char("Solesmes punctum inclinatum parvum", "0solesmes_incl_parvum",
-% "solinclparvumhead",
-% true, false, false);
+inclinatum_char("Solesmes punctum inclinatum parvum", "solesmes.incl.parvum",
+ true, false, false);
% solesmes punctum auctum ascendens
-%punctum_char("Solesmes punctum auctum ascendens", "0solesmes_auct_asc",
-% "solauctaschead",
-% false, false, false, false, false,
-% true, true, false, false, 1.0);
+punctum_char("Solesmes punctum auctum ascendens", "solesmes.auct.asc",
+ false, false, false, false, false,
+ true, true, false, false, false, 1.0);
% solesmes punctum auctum descendens
-%punctum_char("Solesmes punctum auctum descendens", "0solesmes_auct_desc",
-% "solauctdeschead",
-% false, false, false, false, false,
-% true, false, false, false, 1.0);
+punctum_char("Solesmes punctum auctum descendens", "solesmes.auct.desc",
+ false, false, false, false, false,
+ true, false, false, false, false, 1.0);
% solesmes punctum inclinatum auctum
-%inclinatum_char("Solesmes punctum incl. auctum", "0solesmes_incl_auctum",
-% "solpunctuminclinatumauctumhead",
-% false, false, true);
+inclinatum_char("Solesmes punctum incl. auctum", "solesmes.incl.auctum",
+ false, false, true);
% solesmes stropha
-%inclinatum_char("Solesmes stropha", "0solesmes_stropha",
-% "solstrophahead",
-% false, true, false);
+inclinatum_char("Solesmes stropha", "solesmes.stropha",
+ false, true, false);
% solesmes stropha aucta
-%inclinatum_char("Solesmes stropha aucta", "0solesmes_stropha_aucta",
-% "solstrophaauctahead",
-% false, true, true);
+inclinatum_char("Solesmes stropha aucta", "solesmes.stropha.aucta",
+ false, true, true);
% solesmes oriscus
-fet_beginchar("Solesmes oriscus", "0solesmes_oriscus",
- "soloriscushead")
+fet_beginchar("Solesmes oriscus", "ssolesmes.oriscus")
save b_h, a_w;
a_b := 1.54; % b_h*a_b/a_w = wd/ht
b_h := 0.85;
a_w := 1.09;
save a, beta, ht, wd;
- ht# = noteheight# * mag;
+ ht# = noteheight#;
2beta# = ht# * b_h;
a# = beta# * a_b;
wd# = 2a# / a_w;
- set_char_box(0.5wd#, 0.0wd#, 0.5ht#, 0.5ht#);
black_notehead_width# := wd#;
save convexity;
define_pixels(ht, wd, convexity);
pickup pencircle xscaled blot_diameter yscaled 0.50ht;
- z1 = (0.00wd, -convexity);
- z2 = (0.16wd, +convexity);
- z3 = (0.33wd, -convexity);
- z4 = (0.50wd, +convexity);
+ lft x1 = 0.00wd; y1 = -convexity;
+ x2 = 0.16wd; y2 = +convexity;
+ x3 = 0.33wd; y3 = -convexity;
+ rt x4 = 0.50wd; y4 = +convexity;
draw z1 .. z2 .. z3 .. z4;
+ set_char_box(0.00wd#, 0.50wd#,
+ 0.25ht# + convexity#, 0.25ht# + convexity#);
fet_endchar;
%%%%%%%%
%
% inclinatum
-fet_beginchar("Ed. Med. inclinatum", "0medicaea_inclinatum",
- "medinclinatumhead")
- save b_h, a_w;
- a_b := 1.54; % b_h*a_b/a_w = wd/ht
- b_h := 0.85;
- a_w := 1.09;
-
- save a, beta, ht, wd;
- ht# = noteheight#;
- 2beta# = ht# * b_h;
- a# = beta# * a_b;
- wd# = 2a# / a_w;
- set_char_box(wd#/2, wd#/2, 0.5 ht#, 0.5 ht#);
- black_notehead_width# := wd#;
-
- save za, alpha, size;
- pair za;
- define_pixels(ht, wd);
- alpha = 35;
- size = 0.7ht;
- pickup pencircle
- xscaled blot_diameter
- yscaled size rotated -alpha;
- za = (0, size) / 2 rotated alpha;
- draw -za .. za;
-
+fet_beginchar("Ed. Med. inclinatum", "smedicaea.inclinatum")
+ draw_diamond_head (1.2staff_space#, 0, 0, 35, false);
fet_endchar;
% parametrized punctum
-def punctum_char (expr verbose_name, internal_name, mudela_name,
+def punctum_char (expr verbose_name, internal_name,
left_up_stem, left_down_stem) =
- fet_beginchar(verbose_name, internal_name, mudela_name)
+ fet_beginchar(verbose_name, "s"&internal_name)
save a, beta, ht, wd;
ht# = 2 staff_space#;
wd# = ht#;
- set_char_box(0.0, 0.4wd#, 0.5ht#, 0.5ht#);
black_notehead_width# := wd#;
define_pixels(ht, wd);
xscaled blot_diameter
yscaled 0.50ht;
z1 = (0.00wd + blot_diameter/2, 0);
- z2 = (0.40wd - blot_diameter/2, 0);
+ z2 = (0.4wd - blot_diameter/2, 0);
draw z1 .. z2;
pickup pencircle
- xscaled stafflinethickness
+ xscaled linethickness
yscaled blot_diameter;
if left_down_stem:
- z4=(0.00wd + stafflinethickness/2, blot_diameter/2);
- z5=(0.00wd + stafflinethickness/2, - 1.25ht);
+ z4=(0.00wd + linethickness/2, blot_diameter/2);
+ z5=(0.00wd + linethickness/2, - 1.25ht);
draw z4 .. z5;
+ set_char_box(0.0, 0.4wd#, 1.25ht#, 0.25ht#);
elseif left_up_stem:
- z4=(0.00wd + stafflinethickness/2, blot_diameter/2);
- z5=(0.00wd + stafflinethickness/2, + 1.25ht);
+ z4=(0.00wd + linethickness/2, blot_diameter/2);
+ z5=(0.00wd + linethickness/2, + 1.25ht);
draw z4 .. z5;
+ set_char_box(0.0, 0.4wd#, 0.25ht#, 1.25ht#);
+ else:
+ set_char_box(0.0, 0.4wd#, 0.25ht#, 0.25ht#);
fi;
fet_endchar;
enddef;
% punctum
-punctum_char("Ed. Med. punctum", "0medicaea_punctum", "medpunctumhead",
+punctum_char("Ed. Med. punctum", "medicaea.punctum",
false, false);
% left up-stemmed punctum
-punctum_char("Ed. Med. reverse virga", "0medicaea_rvirga", "medrvirgahead",
+punctum_char("Ed. Med. reverse virga", "medicaea.rvirga",
true, false);
% virga (i.e. left down-stemmed punctum)
-punctum_char("Ed. Med. virga", "0medicaea_virga", "medvirgahead",
+punctum_char("Ed. Med. virga", "medicaea.virga",
false, true);
%%%%%%%%
% punctum
% parametrized punctum
-def punctum_char (expr verbose_name, internal_name, mudela_name,
+def punctum_char (expr verbose_name, internal_name,
down_stem) =
-
- fet_beginchar(verbose_name, internal_name, mudela_name)
- save b_h, a_w;
- a_b := 1.54; % b_h*a_b/a_w = wd/ht
- b_h := 0.85;
- a_w := 1.09;
-
- save a, beta, ht, wd;
- ht# = noteheight#;
- 2beta# = ht# * b_h;
- a# = beta# * a_b;
- wd# = 2a# / a_w;
- set_char_box(wd#/2, wd#/2, 0.5 ht#, 0.5 ht#);
- black_notehead_width# := wd#;
-
- save za, zb, zc, alpha, size;
- pair za, zb, zc;
- define_pixels(ht, wd);
- alpha = 55;
- size = 0.7ht;
- pickup pencircle
- xscaled blot_diameter
- yscaled size rotated -alpha;
- za = (0, size) / 2 rotated alpha;
- draw -za .. za;
-
+ fet_beginchar(verbose_name, "s" & internal_name)
+ save alpha;
+ alpha# = 55;
+ draw_diamond_head (staff_space#, 0, 0, alpha#, false);
if down_stem:
- zb = (0.00wd, 0);
- zc = (0.00wd, - 1.25ht);
- draw zb -- zc;
+ pickup pencircle
+ xscaled blot_diameter
+ yscaled (0.7*staff_space)
+ rotated -alpha#;
+ save za, zb; pair za, zb;
+ za = (head_width/2, 0);
+ bot zb = (head_width/2, -1.5staff_space);
+ draw za -- zb;
+ set_char_box (0, head_width#,
+ 1.5staff_space#, head_height#/2);
fi;
fet_endchar;
enddef;
% punctum
-punctum_char("Hufnagel punctum", "0hufnagel_punctum", "hufpunctumhead", false)
+punctum_char("Hufnagel punctum", "hufnagel.punctum", false)
% virga
-punctum_char("Hufnagel virga", "0hufnagel_virga", "hufvirgahead", true)
+punctum_char("Hufnagel virga", "hufnagel.virga", true)
% pes lower punctum
-fet_beginchar("Hufnagel pes lower punctum", "0hufnagel_lpes", "huflpeshead")
- save b_h, a_w;
- a_b := 1.54; % b_h*a_b/a_w = wd/ht
- b_h := 0.85;
- a_w := 1.09;
+fet_beginchar("Hufnagel pes lower punctum", "shufnagel.lpes")
+ save width, height, alpha;
+ width# = 2*staff_space#;
+ height# = 0.7*staff_space#;
+ alpha# = 35;
- save a, beta, ht, wd;
- ht# = noteheight#;
- 2beta# = ht# * b_h;
- a# = beta# * a_b;
- wd# = 2a# / a_w;
- set_char_box(wd#, wd#, 0.7 ht#, 0.7 ht#);
- black_notehead_width# := wd#;
+ set_char_box(0, width#, height#/2, height#/2);
- save za, alpha, size;
- pair za;
- define_pixels(ht, wd);
- alpha = 35;
- size = 0.7ht;
- pickup pencircle
- xscaled blot_diameter
- yscaled size rotated -alpha;
- za = (size, 0);
- draw -za .. za;
+ pickup pencircle scaled linethickness;
+ define_pixels(width, height);
+
+ rt x3 = -lft x1 = width/2;
+ y2 = y3 = height/2;
+ y1 = y4 = -height/2;
+ tand(alpha#) * (y2 - y1) = x2 - x1 = x3 - x4;
+
+ filldraw z1 -- z2 -- z3 -- z4 -- cycle;
+
+ currentpicture := currentpicture shifted (width/2, 0);
fet_endchar;
fet_endgroup ("noteheads")
projects / lilypond.git / blobdiff