* mf/parmesan-clefs.mf: still more set_char_box() fixes and code

	cleanup; bugfix: exact_center

	* Documentation/user/refman.itely: added more documentation on
	ambitus according to recent questions on lilypond-user list

diff --git a/ChangeLog b/ChangeLog
index 68428c7c6cb56699350b5ca9ee73a58261abd78e..08a20f6b4f6460311c769cb59df64f48e0718750 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-13  Juergen Reuter  <reuter@ipd.uka.de>
+
+       * mf/parmesan-clefs.mf: still more set_char_box() fixes and code
+       cleanup; bugfix: exact_center
+
+       * Documentation/user/refman.itely: added more documentation on
+       ambitus according to recent questions on lilypond-user list
+
 2003-09-12  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * input/regression/ottava.ly (texidoc): demo 15ma too.

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 32f4edf3b91ebc26f63bdb799c1bcc55a8189747..0396005cd3f93edc437cd25f06805fd3b043676c 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -3558,10 +3558,12 @@ To apply, add the @internalsref{Ambitus_engraver} to the
 @internalsref{Voice} context, i.e.
 
 @example
-  \paper @{ \translator @{
+  \paper @{
+    \translator @{
       \VoiceContext
       \consists Ambitus_engraver
-    @} @}
+    @}
+  @}
 @end example
 
 For example,
@@ -3585,10 +3587,73 @@ lower = \notes \relative c {
     >>
   }
   \paper {
+    \translator {
+      \StaffContext
+      \consists Ambitus_engraver
+    }
+  }
+}
+@end lilypond
+
+If you have multiple voices in a single staff, and you want a single
+ambitus per staff rather than per each voice, then add the
+@internalsref{Ambitus_engraver} to the @internalsref{Staff} context
+rather than to the @internalsref{Voice} context.
+
+If you have a score with multiple staves and you want the ambitus to
+appear only in some of the staves, then you have to declare a new
+context type derived from the @internalsref{Voice} context or
+@internalsref{Staff} context.  The derived context must consist of the
+@internalsref{Ambitus_engraver} and it must be accepted by a proper
+parent context, in the below example the @internalsref{Staff} context
+or @internalsref{Score} context, respectively.  The original context
+and the derived context can then be used in parallel in the same
+score.
+
+@lilypond[singleline]
+voiceA = \notes \transpose c c'' {
+  c4 d e c e f g2
+}
+voiceB = \notes \transpose c c' {
+  e4 f g2 g8 a g f e4 c
+}
+\score {
+  \context ChoirStaff <<
+    \new Staff <<
+      \new VoiceWithAmbitus { \stemUp \voiceA }
+      \new VoiceWithAmbitus { \stemDown \voiceB }
+    >>
+    \new StaffWithAmbitus <<
+      \new Voice { \stemUp \voiceA }
+      \new Voice { \stemDown \voiceB }
+    >>
+    \new Staff <<
+      \new Voice { \stemUp \voiceA }
+      \new Voice { \stemDown \voiceB }
+    >>
+  >>
+  \paper {
+    raggedright = ##t
     \translator {
       \VoiceContext
+      \name "VoiceWithAmbitus"
+      \alias "Voice"
+      \consists Ambitus_engraver
+    }
+    \translator {
+      \StaffContext
+      \name "StaffWithAmbitus"
+      \alias "Staff"
       \consists Ambitus_engraver
     }
+    \translator {
+      \StaffContext
+      \accepts "VoiceWithAmbitus"
+    }
+    \translator {
+      \ScoreContext
+      \accepts "StaffWithAmbitus"
+    }
   }
 }
 @end lilypond
@@ -3598,6 +3663,13 @@ lower = \notes \relative c {
 
 @internalsref{Ambitus}, and @inputfileref{input/regression,ambitus.ly}.
 
+@refbugs
+
+There is no collision handling in the case of multiple per-voice
+ambitus.  To avoid collision, multiple ambitus in a single staff
+should be printed horizontally one after the other rather than on top
+of each other in the same horizontal position.
+
 @node Tablatures
 @section Tablatures
 

diff --git a/mf/parmesan-clefs.mf b/mf/parmesan-clefs.mf
index f37b880c41b008f81b58707870d1af50b0b9ea18..0cdf84899ac8ae4eac43df56d2f47c8744b5d7ba 100644 (file)
--- a/mf/parmesan-clefs.mf
+++ b/mf/parmesan-clefs.mf
@@ -54,8 +54,10 @@ def draw_vaticana_do_clef(expr exact_center, reduction) =
 
        reduced_il# = staff_space# * reduction;
        
-       set_char_box(0.0reduced_il#, 0.5reduced_il#,
-                    0.8reduced_il#, 0.8reduced_il#);
+       set_char_box(0 - xpart exact_center,
+                    0.5reduced_il# + xpart exact_center,
+                    0.8reduced_il# - ypart exact_center,
+                    0.8reduced_il# + ypart exact_center);
 
        define_pixels(reduced_il);
 
@@ -111,8 +113,10 @@ def draw_vaticana_fa_clef(expr exact_center, reduction) =
        %right-handed puncta as in do clef
        draw_vaticana_do_clef(exact_center + (0.55reduced_il, 0), reduction);
 
-       set_char_box(0.0reduced_il#, 1.05reduced_il#,
-                    1.5reduced_il#, 0.8reduced_il#);
+       set_char_box(0 - xpart exact_center,
+                    1.05reduced_il# + xpart exact_center,
+                    1.5reduced_il# - ypart exact_center,
+                    0.8reduced_il# + ypart exact_center);
 enddef;
 
 
@@ -179,8 +183,10 @@ def draw_medicaea_do_clef(expr exact_center, reduction) =
                = bot ypart za + 1.5 reduced_il;
        draw za -- zb;
 
-       set_char_box(0, 1.0reduced_il#,
-                    1.5reduced_il#, 1.5reduced_il#);
+       set_char_box(0 - xpart exact_center,
+                    1.0reduced_il# + xpart exact_center,
+                    1.5reduced_il# - ypart exact_center,
+                    1.5reduced_il# + ypart exact_center);
 enddef;
 
 
@@ -224,7 +230,10 @@ def draw_medicaea_fa_clef(expr exact_center, reduction) =
        %right-handed puncta as in do clef
        draw_medicaea_do_clef(exact_center + (0.7reduced_il, 0), reduction);
 
-       set_char_box(0, 1.7reduced_il#, 1.5reduced_il#, 1.5reduced_il#);
+       set_char_box(0 - xpart exact_center,
+                    1.7reduced_il# + xpart exact_center,
+                    1.5reduced_il# - ypart exact_center,
+                    1.5reduced_il# + ypart exact_center);
 enddef;
 
 
@@ -247,61 +256,6 @@ fet_endchar;
 %
 %
 %
-brevis_wid# := 2 staff_space#;
-
-def draw_brevis(expr exact_center, reduction, small_width, small_height) =
-       %
-       % inspired by function draw_brevis of
-       % feta-bolletjes.mf
-       %
-       save reduced_slt, reduced_nht;
-       save stem_width, head_width;
-       save serif_size, serif_protrude;
-       save holeheight, beamheight;
-
-       reduced_slt# = stafflinethickness# * reduction;
-       reduced_nht# = noteheight# * reduction;
-       stem_width# = 1.4 reduced_slt#;
-       if small_width:
-               head_width# = 0.5brevis_wid# * reduction;
-       else:
-               head_width# = brevis_wid# * reduction;
-       fi;
-       if small_height:
-               serif_size# = 0.64 reduced_slt#;
-               serif_protrude# = 0.96 serif_size#;
-               holeheight# = 3 reduced_slt#;
-               beamheight# = 0.32(reduced_nht# - holeheight#);
-       else:
-               serif_size# = 1.0 reduced_slt#;
-               serif_protrude# = 1.5 serif_size#;
-               holeheight# = 3 reduced_slt#;
-               beamheight# = 0.5(reduced_nht# - holeheight#);
-       fi;
-       define_pixels(reduced_slt);
-       define_pixels(stem_width);
-       define_pixels(head_width);
-       define_pixels(serif_size);
-       define_pixels(serif_protrude);
-       define_pixels(beamheight);
-
-       penpos1(stem_width, 0);
-       penpos2(stem_width, 0);
-       penpos3(beamheight, 90);
-       penpos4(beamheight, 90);
-       penpos5(stem_width, 180);
-
-       z1l = exact_center;
-       z2l = z1l + (0, -reduced_slt/2);
-       z3r = z2r + serif_size*(1,-1);
-       y4r = y3r;
-       x4l = x1l + head_width/2;
-       z5l = z3l + (-serif_size, -serif_protrude);
-
-       penlabels(1,2,3,4,5);
-       fill z1r -- z1l -- z5r{down} .. z5l{up} .. z3l{right}
-               -- z4l -- z4r -- z3r{left} .. z2r{up} -- cycle;
-enddef;
 
 %
 % width:        interval from left end to right end
@@ -309,7 +263,7 @@ enddef;
 % exact_center: the coordinates of the vertical center point of the
 %               left edge.
 %
-def draw_full_brevis(expr exact_center, bwidth, bheight, blinethickness) =
+def draw_brevis(expr exact_center, bwidth, bheight, blinethickness) =
 
        save xoffs, yoffs, brevis_width, brevis_height, linethickness;
        xoffs# = xpart exact_center;
@@ -317,21 +271,21 @@ def draw_full_brevis(expr exact_center, bwidth, bheight, blinethickness) =
        brevis_width# = bwidth; brevis_height# = bheight;
        linethickness# = blinethickness;
 
-       save stem_width, beam_height, serif_size, serif_protrude, hole_height;
-       stem_width# = 1.4 linethickness#;
+       save beam_width, beam_height, serif_size, serif_protrude, hole_height;
+       beam_width# = 1.4 linethickness#;
        hole_height# = 3 linethickness#;
        2 beam_height# + hole_height# = brevis_height#;
        serif_size# = (hole_height# - linethickness#)/2;
        serif_protrude# = 1.5 serif_size#;
 
        define_pixels(xoffs, yoffs, brevis_width, brevis_height, linethickness);
-       define_pixels(stem_width, beam_height, serif_size, serif_protrude);
+       define_pixels(beam_width, beam_height, serif_size, serif_protrude);
 
-       penpos1(stem_width, 0);
-       penpos2(stem_width, 0);
+       penpos1(beam_width, 0);
+       penpos2(beam_width, 0);
        penpos3(beam_height, 90);
        penpos4(beam_height, 90);
-       penpos5(stem_width, 180);
+       penpos5(beam_width, 180);
        z1l = (xoffs, yoffs);
        z2l = z1l + (0, -linethickness);
        z3r = z2r + serif_size*(1,-1);
@@ -362,11 +316,16 @@ def draw_neo_mensural_c_clef(expr exact_center, reduction) =
        stem_width# = 1.4 reduced_slt#;
        define_pixels(reduced_il, reduced_slt, stem_width);
 
-       draw_full_brevis(exact_center + (3reduced_slt#, 0),
-                        2reduced_il#, reduced_il#, reduced_slt#);
+       draw_brevis(exact_center + (3reduced_slt#, 0),
+                   2reduced_il#, reduced_il#, reduced_slt#);
+
+       save xoffs, yoffs;
+       xoffs# = xpart exact_center;
+       yoffs# = ypart exact_center;
+       define_pixels(xoffs, yoffs);
 
        pickup pencircle xscaled stem_width yscaled blot_diameter;
-       lft x8  = lft x9  = xoffs - 3reduced_slt;
+       lft x8  = lft x9  = xoffs;
        lft x10 = lft x11 = lft x8  + 3reduced_slt;
        rt  x12 = rt  x13 = lft x10 + 2reduced_il;
        rt  x14 = rt  x15 = rt  x12 + 3reduced_slt;
@@ -378,8 +337,10 @@ def draw_neo_mensural_c_clef(expr exact_center, reduction) =
        draw z12 -- z13;
        draw z14 -- z15;
 
-       set_char_box(0, 2reduced_il# + 6reduced_slt#,
-                    2reduced_il#, 2reduced_il#);
+       set_char_box(0 - xpart exact_center,
+                    2reduced_il# + 6reduced_slt# + xpart exact_center,
+                    2reduced_il# - ypart exact_center,
+                    2reduced_il# + ypart exact_center);
 enddef;
 
 
@@ -403,10 +364,12 @@ def draw_petrucci_c_clef(expr exact_center, flare_align, reduction) =
        save reduced_il, reduced_slt;
        reduced_il# = staff_space# * reduction;
        reduced_slt# = stafflinethickness# * reduction;
-       draw_full_brevis(exact_center + (0, 0.5staff_space#),
-                        reduced_il#, reduced_il#, reduced_slt#);
        define_pixels(reduced_il);
-       addto currentpicture also currentpicture shifted (0, -reduced_il);
+
+       draw_brevis(exact_center + (0, 0.5staff_space#),
+                   reduced_il#, reduced_il#, reduced_slt#);
+
+       addto currentpicture also currentpicture shifted (0, -staff_space);
 
        save half_reduced_il, left_depth, left_height;
        half_reduced_il# = staff_space# * sqrt(reduction);
@@ -432,7 +395,10 @@ def draw_petrucci_c_clef(expr exact_center, flare_align, reduction) =
        y11 = max(y9 + 0.2*half_reduced_il, yoffs - 2.2half_reduced_il);
        draw z10 .. z11;
 
-       set_char_box(0, reduced_il#, left_depth#, left_height#);
+       set_char_box(0 - xpart exact_center,
+                    reduced_il# + xpart exact_center,
+                    left_depth# - ypart exact_center,
+                    left_height# + ypart exact_center);
 enddef;
 
 
@@ -490,18 +456,39 @@ fet_endchar;
 def draw_mensural_c_clef(expr exact_center, reduction) =
        % inspired by Ockeghem, "Missa Prolationum", in: MGG, volume
        % 9, table 94.
-       draw_petrucci_c_clef(exact_center, 0, reduction);
 
+       save reduced_il;
+       reduced_il# = staff_space# * reduction;
+       draw_brevis(exact_center + (0, 0.5staff_space#),
+                   2reduced_il#, 0.8staff_space#, 0.8stafflinethickness#);
+       define_pixels(reduced_il);
+       addto currentpicture also currentpicture shifted (0, -staff_space);
        addto currentpicture also currentpicture shifted (0, -staff_space);
 
        save half_reduced_il;
-       save left_depth, left_height;
-
        half_reduced_il# = staff_space# * sqrt(reduction);
-       left_height# = 3.2 * half_reduced_il#;
-       left_depth# = left_height# + staff_space#;
+       define_pixels(half_reduced_il);
 
-       set_char_box(0, reduced_il#, left_depth#, left_height#);
+       save xoffs, yoffs;
+       xoffs# = xpart exact_center;
+       yoffs# = ypart exact_center;
+       define_pixels(xoffs, yoffs);
+
+       pickup pencircle xscaled 1.4 stafflinethickness yscaled blot_diameter;
+       lft x8 = lft x9 = xoffs;
+       top y8 = yoffs + 2.2 half_reduced_il;
+       bot y9 = yoffs - 2.2 half_reduced_il - staff_space;
+       draw z8 .. z9;
+
+       rt x10 = rt x11 = xoffs + brevis_width;
+       y10 = yoffs + 1.4half_reduced_il;
+       y11 = yoffs - 1.4half_reduced_il - staff_space;
+       draw z10 .. z11;
+
+       set_char_box(0 - xpart exact_center,
+                    2reduced_il# + xpart exact_center,
+                    -yoffs# + 2.2 half_reduced_il# + staff_space# - ypart exact_center,
+                    yoffs# + 2.2 half_reduced_il# + ypart exact_center);
 enddef;
 
 
@@ -554,18 +541,18 @@ def draw_petrucci_f_clef(expr exact_center, reduction) =
        % Campra, "Entr'ee des s'er'enades" (1710), in: MGG, volume 2,
        % col. 1649 ("Contredanse"), fig. 2.
        %
-       draw_brevis(exact_center, reduction, true, false);
 
        save reduced_il, reduced_slt;
-       save stem_width, interline;
-
        reduced_il# = staff_space# * reduction;
        reduced_slt# = stafflinethickness# * reduction;
-       stem_width# = 1.4 reduced_slt#;
-       interline# = staff_space#;
-
        define_pixels(reduced_il);
        define_pixels(reduced_slt);
+
+       draw_brevis(exact_center, reduced_il#, reduced_il#, reduced_slt#);
+
+       save stem_width, interline;
+       stem_width# = 1.4 reduced_slt#;
+       interline# = staff_space#;
        define_pixels(stem_width);
        define_pixels(interline);
 
@@ -577,34 +564,36 @@ def draw_petrucci_f_clef(expr exact_center, reduction) =
 
        % brevis stem
        pickup pencircle xscaled stem_width yscaled blot_diameter;
-       z6 = exact_center + (2x4l - stem_width/2, 0);
-       z7 = z6 + (0, -4reduced_il);
-       draw z6 .. z7;
+       rt z8 = exact_center + (reduced_il, 0);
+       z9 = z8 + (0, -4reduced_il);
+       draw z8 .. z9;
 
        % upper diamond
        draw_diamond(exact_center + (1.6interline*reduction, interline/2),
                     reduction);
        pickup pencircle xscaled stem_width yscaled blot_diameter;
-       z8 = exact_center +
+       z10 = exact_center +
             (1.6interline*reduction + stem_width/2, interline*reduction);
-       z9 = z8 + (0, 1.5interline*reduction);
-       draw z8 .. z9; % diamond stem
+       top z11 = z10 + (0, 1.5interline*reduction);
+       draw z10 .. z11; % diamond stem
 
        % lower diamond
        draw_diamond(exact_center + (1.6interline*reduction, -interline/2),
                     reduction);
        pickup pencircle xscaled stem_width yscaled blot_diameter;
-       z10 = exact_center +
+       z12 = exact_center +
              (1.6interline*reduction - stem_width/2, -interline*reduction);
-       z11 = z10 + (0, -3.5interline*reduction);
-       draw z10 .. z11; % diamond stem
+       bot z13 = z12 + (0, -3.5interline*reduction);
+       draw z12 .. z13; % diamond stem
 
        save reduced_il, rh_height, rh_width;
        reduced_il# = staff_space# * reduction;
        rh_height# = 1.2reduced_il#;
        rh_width# / rh_height# = tand(30);
-       set_char_box(0, 1.6interline#*reduction + 0.5rh_width#,
-                    4.5*interline#*reduction, 2.5*interline#*reduction);
+       set_char_box(0 - xpart exact_center,
+                    1.6interline#*reduction + 0.5rh_width# + xpart exact_center,
+                    4.5*interline#*reduction - ypart exact_center,
+                    2.5*interline#*reduction + ypart exact_center);
 enddef;
 
 
@@ -626,35 +615,41 @@ def draw_mensural_f_clef(expr exact_center, reduction) =
        % Booke of Songes" (1597), in: MGG, volume 3, col. 721
        % ("Dowland"), fig. 3.
 
-       save reduced_slt, stem_width, reduced_nht, holeheight, beamheight;
+       save width, reduced_slt, stem_width, dot_diameter;
 
+       width# = 1.2staff_space# * reduction;
        reduced_slt# = stafflinethickness# * reduction;
        stem_width# = 1.4 reduced_slt#;
-       reduced_nht# = noteheight# * reduction;
-       holeheight# = 3 reduced_slt#;
-       beamheight# = 0.4(reduced_nht# - holeheight#);
-
-       define_pixels(beamheight, stem_width, staff_space);
+       dot_diameter# = 0.1 reduction * staff_space#;
+       define_pixels(width, stem_width, staff_space, dot_diameter);
 
        pickup pencircle
-               xscaled beamheight
+               xscaled 0.2width
                yscaled stem_width
                rotated 45;
 
-       draw
-               exact_center + (1.0 staff_space, 0.55 staff_space) --
-               exact_center + (1.1 staff_space, 0.45 staff_space);
+       % half circle
+       lft z5 = (0, 0);
+       draw    halfcircle scaled width rotated -90
+               shifted (z5-exact_center);
 
-       draw
-               exact_center + (1.1 staff_space, -0.55 staff_space) --
-               exact_center + (1.1 staff_space, -0.45 staff_space);
 
-       draw    halfcircle scaled 1.1 staff_space rotated -90
-               shifted (-exact_center + (+0.05 staff_space, 0));
+       % upper dot
+       rt x2 = xpart exact_center + width;
+       top y1 = ypart exact_center + 0.5width;
+       z2 - z1 = (dot_diameter, -dot_diameter);
+       draw z1 -- z2;
+
+       % lower dot
+       x3 = x1;
+       top y1 - bot y4 = width;
+       z4 - z3 = (dot_diameter, -dot_diameter);
+       draw z3 -- z4;
 
-       set_char_box(0.5beamheight#, 1.1staff_space# + 0.5beamheight#,
-                    0.55staff_space# + 0.5stem_width#,
-                    0.55staff_space# + 0.5stem_width#);
+       set_char_box(0 - xpart exact_center,
+                    width# + xpart exact_center,
+                    0.5width# - ypart exact_center,
+                    0.5width# + ypart exact_center);
 enddef;
 
 fet_beginchar("mensural f clef", "mensural_f", "mensfclef")
@@ -690,8 +685,10 @@ def draw_mensural_g_clef(expr exact_center, reduction) =
 
        reduced_il#=staff_space#*reduction;
 
-       set_char_box(0.0reduced_il#, 1.2reduced_il#,
-                    0.8reduced_il#, 1.5reduced_il#);
+       set_char_box(0 - xpart exact_center,
+                    1.2reduced_il# + xpart exact_center,
+                    0.8reduced_il# - ypart exact_center,
+                    1.5reduced_il# + ypart exact_center);
 
        stem_width# = 0.17 reduced_il#;
        height# = 1.5 reduced_il#;
@@ -776,8 +773,10 @@ def draw_petrucci_g_clef(expr exact_center, reduction) =
        reduced_slt# = stafflinethickness# * reduction;
        define_pixels(reduced_il, reduced_slt);
 
-       set_char_box(0, 1.25 reduced_il#,
-                    0.65 reduced_il#, 3.80 reduced_il#);
+       set_char_box(0 - xpart exact_center,
+                    1.25 reduced_il# + xpart exact_center,
+                    0.65 reduced_il# - ypart exact_center,
+                    3.80 reduced_il# + ypart exact_center);
 
        save za, zb, zc, zd, ze, zf, zg, zh, zi, zj;
        pair za, zb, zc, zd, ze, zf, zg, zh, zi, zj;
@@ -857,16 +856,18 @@ def draw_hufnagel_do_clef(expr exact_center, reduction) =
        save za, zb, zc, zd, ze, zf;
        pair za, zb, zc, zd, ze, zf;
 
-       za = exact_center + (+0.30reduced_il, +.45reduced_il);
-       zb = exact_center + (+0.20reduced_il, +.45reduced_il);
-       zc = exact_center + (-0.10reduced_il, +.60reduced_il);
-       zd = exact_center + (-0.40reduced_il, +.45reduced_il);
-       ze = exact_center + (-0.40reduced_il, -.45reduced_il);
-       zf = exact_center + (-0.20reduced_il, -.55reduced_il);
+       za = exact_center + (0.90reduced_il, +.45reduced_il);
+       zb = exact_center + (0.80reduced_il, +.45reduced_il);
+       zc = exact_center + (0.50reduced_il, +.60reduced_il);
+       zd = exact_center + (0.20reduced_il, +.45reduced_il);
+       ze = exact_center + (0.20reduced_il, -.45reduced_il);
+       zf = exact_center + (0.40reduced_il, -.55reduced_il);
        draw za .. zb .. zc -- zd -- ze -- zf;
 
-       set_char_box(0.60reduced_il#, 0.50reduced_il#,
-                    0.70reduced_il#, 0.75reduced_il#);
+       set_char_box(0 - xpart exact_center,
+                    1.10reduced_il# + xpart exact_center,
+                    0.70reduced_il# - ypart exact_center,
+                    0.75reduced_il# + ypart exact_center);
 enddef;
 
 
@@ -877,7 +878,7 @@ fet_beginchar("Hufnagel do clef", "hufnagel_do", "hufnageldoclef")
        draw_hufnagel_do_clef((0,0), 1.0);
 fet_endchar;
 fet_beginchar("Hufnagel do clef", "hufnagel_do_change", "chufnageldoclef")
-       draw_hufnagel_do_clef((1.3 staff_space#,0), .8);
+       draw_hufnagel_do_clef((0,0), .8);
 fet_endchar;
 
 
@@ -899,24 +900,26 @@ def draw_hufnagel_fa_clef(expr exact_center, reduction) =
        save za, zb, zc, zd, ze, zf;
        pair za, zb, zc, zd, ze, zf;
 
-       za = exact_center + (+0.30reduced_il, +0.70reduced_il);
-       zb = exact_center + (+0.20reduced_il, +0.70reduced_il);
-       zc = exact_center + (-0.10reduced_il, +0.85reduced_il);
-       zd = exact_center + (-0.40reduced_il, +0.70reduced_il);
-       ze = exact_center + (-0.40reduced_il, -1.10reduced_il);
+       za = exact_center + (0.90reduced_il, +0.70reduced_il);
+       zb = exact_center + (0.80reduced_il, +0.70reduced_il);
+       zc = exact_center + (0.50reduced_il, +0.85reduced_il);
+       zd = exact_center + (0.20reduced_il, +0.70reduced_il);
+       ze = exact_center + (0.20reduced_il, -1.10reduced_il);
        draw za .. zb .. zc -- zd -- ze;
 
        save zg, zh, zi, zj;
        pair zg, zh, zi, zj;
 
-       zg = exact_center + (+0.30reduced_il, -0.05reduced_il);
-       zh = exact_center + (+0.20reduced_il, -0.05reduced_il);
-       zi = exact_center + (-0.10reduced_il, +0.10reduced_il);
-       zj = exact_center + (-0.40reduced_il, -0.05reduced_il);
+       zg = exact_center + (0.90reduced_il, -0.05reduced_il);
+       zh = exact_center + (0.80reduced_il, -0.05reduced_il);
+       zi = exact_center + (0.50reduced_il, +0.10reduced_il);
+       zj = exact_center + (0.20reduced_il, -0.05reduced_il);
        draw zg .. zh .. zi -- zj;
 
-       set_char_box(0.60reduced_il#, 0.60reduced_il#,
-                    1.15reduced_il#, 1.00reduced_il#);
+       set_char_box(0 - xpart exact_center,
+                    1.20reduced_il# + xpart exact_center,
+                    1.15reduced_il# - ypart exact_center,
+                    1.00reduced_il# + ypart exact_center);
 enddef;
 
 
@@ -934,8 +937,10 @@ fet_endchar;
 def draw_hufnagel_do_fa_clef(expr exact_center, reduction) =
        draw_hufnagel_do_clef(exact_center, reduction);
        draw_hufnagel_fa_clef(exact_center + (0, -2staff_space), reduction);
-       set_char_box(0.60reduced_il#, 0.60reduced_il#,
-                    1.15reduced_il# + 2staff_space#, 0.75reduced_il#);
+       set_char_box(0 - xpart exact_center,
+                    1.20reduced_il# + xpart exact_center,
+                    1.15reduced_il# + 2staff_space# - ypart exact_center,
+                    0.75reduced_il# + ypart exact_center);
 enddef;