From bfddc0789a04273f70b4a1a3a8cad5a5e44d8cec Mon Sep 17 00:00:00 2001
From: Neil Puttock <n.puttock@gmail.com>
Date: Wed, 4 Jun 2008 00:11:15 +0100
Subject: [PATCH] Spelling fixes.
---
input/regression/lyric-extender-right-margin.ly | 8 ++------
lily/include/lookup.hh | 6 +++---
lily/lookup.cc | 12 ++++++------
lily/stencil-scheme.cc | 2 +-
mf/feta-din-code.mf | 10 +++++-----
mf/feta-klef.mf | 10 +++++-----
mf/feta-timesig.mf | 2 +-
7 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/input/regression/lyric-extender-right-margin.ly b/input/regression/lyric-extender-right-margin.ly
index 5fb01d5682..03f95a27a4 100644
--- a/input/regression/lyric-extender-right-margin.ly
+++ b/input/regression/lyric-extender-right-margin.ly
@@ -1,6 +1,6 @@
\version "2.10.19"
\header {
- texidoc = "extenders will not protude into the right margin"
+ texidoc = "Extenders will not protrude into the right margin"
}
\score{
@@ -16,8 +16,4 @@
e d c
}
}
-
-}
-\paper {
- ragged-right = ##t
-}
+}
\ No newline at end of file
diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index ec8aeede49..b07acd6ef0 100644
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -16,7 +16,7 @@
struct Lookup
{
static Stencil dot (Offset p, Real radius);
- static Stencil bracket (Axis a, Interval iv, Real thick, Real protude, Real blot);
+ static Stencil bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot);
static Stencil accordion (SCM arg, Real interline_f, Font_metric *fm);
static Stencil rotated_box (Real slope, Real width, Real thick, Real blot);
static Stencil round_filled_polygon (vector<Offset> const &points, Real blotdiameter);
@@ -24,13 +24,13 @@ struct Lookup
static Stencil slur (Bezier controls, Real cthick, Real thick);
static Stencil bezier_sandwich (Bezier top_curve, Bezier bottom_curve);
static Stencil beam (Real slope, Real width, Real thick, Real blot);
- static Stencil dashed_slur (Bezier, Real thick, Real dash_period, Real dash_fraction);
+ static Stencil dashed_slur (Bezier b, Real thick, Real dash_period, Real dash_fraction);
static Stencil blank (Box b);
static Stencil filled_box (Box b);
static Stencil round_filled_box (Box b, Real blotdiameter);
static Stencil repeat_slash (Real w, Real slope, Real th);
static Stencil horizontal_line (Interval w, Real th);
- static Stencil triangle (Interval, Real, Real);
+ static Stencil triangle (Interval iv, Real thick, Real protrude);
static Stencil points_to_line_stencil (Real thick, vector<Offset> const &points);
};
diff --git a/lily/lookup.cc b/lily/lookup.cc
index dfda5f73e4..62e0d97317 100644
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -688,7 +688,7 @@ Lookup::repeat_slash (Real w, Real s, Real t)
}
Stencil
-Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot)
+Lookup::bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot)
{
Box b;
Axis other = Axis ((a + 1)%2);
@@ -698,8 +698,8 @@ Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot)
Stencil m = round_filled_box (b, blot);
b[a] = Interval (iv[UP] - thick, iv[UP]);
- Interval oi = Interval (-thick / 2, thick / 2 + fabs (protude));
- oi *= sign (protude);
+ Interval oi = Interval (-thick / 2, thick / 2 + fabs (protrude));
+ oi *= sign (protrude);
b[other] = oi;
m.add_stencil (round_filled_box (b, blot));
b[a] = Interval (iv[DOWN], iv[DOWN] + thick);
@@ -709,16 +709,16 @@ Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot)
}
Stencil
-Lookup::triangle (Interval iv, Real thick, Real protude)
+Lookup::triangle (Interval iv, Real thick, Real protrude)
{
Box b;
b[X_AXIS] = Interval (0, iv.length ());
- b[Y_AXIS] = Interval (min (0., protude), max (0.0, protude));
+ b[Y_AXIS] = Interval (min (0., protrude), max (0.0, protrude));
vector<Offset> points;
points.push_back (Offset (iv[LEFT], 0));
points.push_back (Offset (iv[RIGHT], 0));
- points.push_back (Offset (iv.center (), protude));
+ points.push_back (Offset (iv.center (), protrude));
return points_to_line_stencil (thick, points);
diff --git a/lily/stencil-scheme.cc b/lily/stencil-scheme.cc
index a092856a0a..79e76e3dcc 100644
--- a/lily/stencil-scheme.cc
+++ b/lily/stencil-scheme.cc
@@ -270,7 +270,7 @@ LY_DEFINE (ly_bracket, "ly:bracket",
4, 0, 0,
(SCM a, SCM iv, SCM t, SCM p),
"Make a bracket in direction@tie{}@var{a}. The extent of the"
- " bracket is given by @var{iv}. The wings protude by an amount"
+ " bracket is given by @var{iv}. The wings protrude by an amount"
" of@tie{}@var{p}, which may be negative. The thickness is given"
" by@tie{}@var{t}.")
{
diff --git a/mf/feta-din-code.mf b/mf/feta-din-code.mf
index 0b757af413..e2cf7bb6da 100644
--- a/mf/feta-din-code.mf
+++ b/mf/feta-din-code.mf
@@ -356,7 +356,7 @@ fet_beginchar ("dynamic p", "p")
save twiddle_thick, stem_thick, cheek_thick, cheek_width;
save fill_up, straigh_len;
save serif, dishing_angle, p, tmp;
- save cheek_medium, left_serif_protude, right_serif_protude;
+ save cheek_medium, left_serif_protrude, right_serif_protrude;
save lower_overshoot;
save blot_t, corner_t;
path serif, p;
@@ -375,8 +375,8 @@ fet_beginchar ("dynamic p", "p")
stem_thick = 2/6 ex;
cheek_thick = 13/32 ex;
cheek_width = 0.72 ex;
- left_serif_protude = 18/60 ex;
- right_serif_protude = 15/60 ex;
+ left_serif_protrude = 18/60 ex;
+ right_serif_protrude = 15/60 ex;
currenttransform := currenttransform slanted slant;
@@ -453,8 +453,8 @@ fet_beginchar ("dynamic p", "p")
pickup pencircle scaled serif_thick;
- lft x11 = -left_serif_protude;
- rt x10 = stem_thick + right_serif_protude;
+ lft x11 = -left_serif_protrude;
+ rt x10 = stem_thick + right_serif_protrude;
bot y10 = bot y11 = -descender;
z15 = z6l + up * fill_up;
diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf
index 66aa9b8d26..efcca040a9 100644
--- a/mf/feta-klef.mf
+++ b/mf/feta-klef.mf
@@ -195,9 +195,9 @@ enddef;
def draw_bass_clef (expr exact_center, reduction) =
save reduced_ss, swoosh_width;
- save right_thickness, right_offset, tip_protude;
+ save right_thickness, right_offset, tip_protrude;
save dot_diam, bulb_y_offset, bulb_flare;
- pair tip_protude;
+ pair tip_protrude;
reduced_ss# = staff_space# * reduction;
2.2 dot_diam# = reduction * (staff_space# - stafflinethickness#);
@@ -210,8 +210,8 @@ def draw_bass_clef (expr exact_center, reduction) =
right_offset = 0.05 staff_space;
bulb_y_offset := 0.075 staff_space;
bulb_flare := 2.5 linethickness;
-% tip_protude := (-linethickness, -.2 staff_space);
- tip_protude := (0, 0);
+% tip_protrude := (-linethickness, -.2 staff_space);
+ tip_protrude := (0, 0);
set_char_box (-xpart exact_center,
xpart exact_center + swoosh_width# + 7/12 reduced_ss#,
@@ -233,7 +233,7 @@ def draw_bass_clef (expr exact_center, reduction) =
% optical correction: the top dot seems farther away if y3l = 0.
y3l = right_offset;
- z4 = -(0, 2.0 reduced_ss) + tip_protude;
+ z4 = -(0, 2.0 reduced_ss) + tip_protrude;
penpos3 (whatever, 185);
penpos4 (linethickness, 135);
diff --git a/mf/feta-timesig.mf b/mf/feta-timesig.mf
index 4f23566293..fb86e19bdb 100644
--- a/mf/feta-timesig.mf
+++ b/mf/feta-timesig.mf
@@ -18,7 +18,7 @@ fet_begingroup ("timesig");
% * The inside curve of the C is rather straight.
% * The outside curve of the C is rather round.
% * Right tips of the C point slightly outward.
-% * Lower tip protudes to the right very slightly.
+% * Lower tip protrudes to the right very slightly.
%
def draw_C =
--
2.39.5