+2005-07-13 Graham Percival <gperlist@shaw.ca>
+
+ * input/regression/slur-extreme.ly, input/regression/slur-scoring.ly,
+ lily/slur-configuration.cc, lily/slur.cc, mf/feta-din-code.mf,
+ mf/feta-timesig.mf, mf/parmesan-heads.mf, scm/define-grob-properties.scm:
+ Change "excentricity" to "eccentricity".
+
2005-07-12 Han-Wen Nienhuys <hanwen@xs4all.nl>
* scm/define-markup-commands.scm (justify-field): add.
texidoc="
Extreme slurs are scaled to fit the pattern, but only symmetrically.
-Asymmetric slurs are created by setting @code{excentricity}."
+Asymmetric slurs are created by setting @code{eccentricity}."
}
\layout {
\slurUp
d,8[( a' d f] a[ d f d] a[ f d a)]
d,8[( a' d f] a[ a a d] f[ d d, a)]
- \once\override Slur #'excentricity = #6.0
+ \once\override Slur #'eccentricity = #6.0
d,8[( a' d f] a[ a a d] f[ d d, a)]
}
f=''2( d4 f | g c a f | d c f2 | f1) |
}
-% \override Slur #'excentricity = #-2
+% \override Slur #'eccentricity = #-2
c=''8 ( d[ b f d] a'[ c])
}
max_h = sqrt (max_h);
}
- Real excentricity = robust_scm2double (state.slur_->get_property ("excentricity"), 0);
+ Real eccentricity = robust_scm2double (state.slur_->get_property ("eccentricity"), 0);
- Real x1 = (excentricity + indent);
- Real x2 = (excentricity - indent);
+ Real x1 = (eccentricity + indent);
+ Real x2 = (eccentricity - indent);
Bezier curve;
curve.control_[0] = attachment_[LEFT];
ADD_INTERFACE (Slur, "slur-interface",
"A slur",
- "positions quant-score excentricity encompass-objects control-points dash-period dash-fraction slur-details direction height-limit note-columns ratio thickness");
+ "positions quant-score eccentricity encompass-objects control-points dash-period dash-fraction slur-details direction height-limit note-columns ratio thickness");
fet_beginchar ("dynamic f", "f");
save left_angle, right_angle;
- save serif_length, serif_excentricity;
+ save serif_length, serif_eccentricity;
save f_thick;
save bulb_thick, bulb_diam, fill_up;
save slant;
right_angle = slant_angle - 3;
f_thick = 7/16 ex;
serif_length = 0.96 ex;
- serif_excentricity = 0.01 ex;
+ serif_eccentricity = 0.01 ex;
% z1 is the `base point'
z1 = (0.2 ex, -serif_thick);
x13 - x14 = serif_length;
y13 = y14;
y14 = y2;
- 0.5 [x13, x14] = x2 + serif_excentricity;
+ 0.5 [x13, x14] = x2 + serif_eccentricity;
draw_rounded_block (z14 - (0, 0.7 serif_thick),
z13 + (0, 0.7 serif_thick),
fet_beginchar ("2/2 meter", "C22");
- save excentricity, top_stemlen, bottom_stemlen, thick, left_pos;
+ save eccentricity, top_stemlen, bottom_stemlen, thick, left_pos;
draw_C;
- excentricity = -1.75 stafflinethickness - 0.025 staff_space;
+ eccentricity = -1.75 stafflinethickness - 0.025 staff_space;
top_stemlen# = bottom_stemlen# = 1.4 staff_space#;
thick# = stafflinethickness# + 0.05 staff_space#;
define_whole_pixels (top_stemlen, bottom_stemlen);
bottom_stemlen := bottom_stemlen - feta_shift;
- draw_block ((x2 + excentricity, -bottom_stemlen),
- (x2 + excentricity + thick, top_stemlen));
+ draw_block ((x2 + eccentricity, -bottom_stemlen),
+ (x2 + eccentricity + thick, top_stemlen));
fet_endchar;
fet_endgroup ("timesig");
direction_sign# = -1;
fi;
- % convexity and excentricity
- save u_convexity, u_excentricity;
+ % convexity and eccentricity
+ save u_convexity, u_eccentricity;
if straight:
u_convexity# = -0.01ht#;
- u_excentricity# = 0.0ht#; % dummy
+ u_eccentricity# = 0.0ht#; % dummy
elseif auctum:
u_convexity# = -0.03ht#;
- u_excentricity# = +0.25ht#;
+ u_eccentricity# = +0.25ht#;
elseif rev_auctum:
u_convexity# = -0.10ht#;
- u_excentricity# = -0.12ht#;
+ u_eccentricity# = -0.12ht#;
else:
u_convexity# = -0.05ht#;
- u_excentricity# = 0.0ht#; % dummy
+ u_eccentricity# = 0.0ht#; % dummy
fi;
- save convexity, excentricity;
+ save convexity, eccentricity;
convexity# = direction_sign# * u_convexity#;
- excentricity# = direction_sign# * u_excentricity#;
+ eccentricity# = direction_sign# * u_eccentricity#;
% y shift offset
save yoffs;
yoffs# = 0.00ht#;
fi
- define_pixels(convexity, excentricity, yoffs, ht, wd);
+ define_pixels(convexity, eccentricity, yoffs, ht, wd);
pickup pencircle scaled linethickness;
path p;
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);
+ yoffs_bt + 1.0*eccentricity);
box_top# = height# + yoffs_bt# +
- max(0, 1.0*convexity#, 1.0*excentricity#);
+ max(0, 1.0*convexity#, 1.0*eccentricity#);
box_bt# = yoffs_bt# +
- min(0, 1.0*convexity#, 1.0*excentricity#);
+ min(0, 1.0*convexity#, 1.0*eccentricity#);
p = z1a .. {right}z2a .. {direction}z3a --
z3b{-direction} .. z2b{left} .. z1b -- cycle;
elseif excentric:
the vertical edges '(@var{left-height} . @var{right-height}).")
(edge-text ,pair? "A pair specifying the texts to be set at the
edges '(@var{left-text} . @var{right-text}).")
- (excentricity ,number? "How asymmetrical to make a slur. Positive means move the center to the right.")
+ (eccentricity ,number? "How asymmetrical to make a slur. Positive means move the center to the right.")
(expand-limit ,integer? "maximum number of measures expanded in church rests.")