CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Graham Percival <[EMAIL PROTECTED]> 05/07/13 06:45:16
Modified files:
. : ChangeLog
input/regression: slur-extreme.ly slur-scoring.ly
lily : slur-configuration.cc slur.cc
mf : feta-din-code.mf feta-timesig.mf
parmesan-heads.mf
scm : define-grob-properties.scm
Log message:
(spelling) change "excentricity" to "eccentricity".
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3869&tr2=1.3870&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/slur-extreme.ly.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/slur-scoring.ly.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/slur-configuration.cc.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/slur.cc.diff?tr1=1.218&tr2=1.219&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/feta-din-code.mf.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/feta-timesig.mf.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/parmesan-heads.mf.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grob-properties.scm.diff?tr1=1.101&tr2=1.102&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3869 lilypond/ChangeLog:1.3870
--- lilypond/ChangeLog:1.3869 Tue Jul 12 20:46:24 2005
+++ lilypond/ChangeLog Wed Jul 13 06:45:13 2005
@@ -1,3 +1,10 @@
+2005-07-13 Graham Percival <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* scm/define-markup-commands.scm (justify-field): add.
Index: lilypond/input/regression/slur-extreme.ly
diff -u lilypond/input/regression/slur-extreme.ly:1.6
lilypond/input/regression/slur-extreme.ly:1.7
--- lilypond/input/regression/slur-extreme.ly:1.6 Sun Jun 26 22:39:14 2005
+++ lilypond/input/regression/slur-extreme.ly Wed Jul 13 06:45:15 2005
@@ -5,7 +5,7 @@
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 {
@@ -18,7 +18,7 @@
\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)]
}
Index: lilypond/input/regression/slur-scoring.ly
diff -u lilypond/input/regression/slur-scoring.ly:1.2
lilypond/input/regression/slur-scoring.ly:1.3
--- lilypond/input/regression/slur-scoring.ly:1.2 Sun Jun 26 22:39:14 2005
+++ lilypond/input/regression/slur-scoring.ly Wed Jul 13 06:45:15 2005
@@ -72,7 +72,7 @@
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])
}
Index: lilypond/lily/slur-configuration.cc
diff -u lilypond/lily/slur-configuration.cc:1.18
lilypond/lily/slur-configuration.cc:1.19
--- lilypond/lily/slur-configuration.cc:1.18 Wed Jun 1 15:04:56 2005
+++ lilypond/lily/slur-configuration.cc Wed Jul 13 06:45:15 2005
@@ -138,10 +138,10 @@
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];
Index: lilypond/lily/slur.cc
diff -u lilypond/lily/slur.cc:1.218 lilypond/lily/slur.cc:1.219
--- lilypond/lily/slur.cc:1.218 Tue Jun 7 15:13:06 2005
+++ lilypond/lily/slur.cc Wed Jul 13 06:45:15 2005
@@ -235,5 +235,5 @@
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");
Index: lilypond/mf/feta-din-code.mf
diff -u lilypond/mf/feta-din-code.mf:1.21 lilypond/mf/feta-din-code.mf:1.22
--- lilypond/mf/feta-din-code.mf:1.21 Tue Feb 8 11:12:06 2005
+++ lilypond/mf/feta-din-code.mf Wed Jul 13 06:45:15 2005
@@ -135,7 +135,7 @@
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;
@@ -151,7 +151,7 @@
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);
@@ -216,7 +216,7 @@
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),
Index: lilypond/mf/feta-timesig.mf
diff -u lilypond/mf/feta-timesig.mf:1.17 lilypond/mf/feta-timesig.mf:1.18
--- lilypond/mf/feta-timesig.mf:1.17 Fri Feb 4 13:48:10 2005
+++ lilypond/mf/feta-timesig.mf Wed Jul 13 06:45:15 2005
@@ -89,11 +89,11 @@
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);
@@ -101,8 +101,8 @@
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");
Index: lilypond/mf/parmesan-heads.mf
diff -u lilypond/mf/parmesan-heads.mf:1.39 lilypond/mf/parmesan-heads.mf:1.40
--- lilypond/mf/parmesan-heads.mf:1.39 Mon May 9 21:08:38 2005
+++ lilypond/mf/parmesan-heads.mf Wed Jul 13 06:45:15 2005
@@ -353,24 +353,24 @@
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;
@@ -382,7 +382,7 @@
yoffs# = 0.00ht#;
fi
- define_pixels(convexity, excentricity, yoffs, ht, wd);
+ define_pixels(convexity, eccentricity, yoffs, ht, wd);
pickup pencircle scaled linethickness;
path p;
@@ -403,11 +403,11 @@
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:
Index: lilypond/scm/define-grob-properties.scm
diff -u lilypond/scm/define-grob-properties.scm:1.101
lilypond/scm/define-grob-properties.scm:1.102
--- lilypond/scm/define-grob-properties.scm:1.101 Mon Jun 6 18:44:50 2005
+++ lilypond/scm/define-grob-properties.scm Wed Jul 13 06:45:15 2005
@@ -171,7 +171,7 @@
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.")
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
