gbranden pushed a commit to branch master
in repository groff.
commit 106cbcffab79095bf686168e8616ad5d9582e8f4
Author: G. Branden Robinson <[email protected]>
AuthorDate: Sat Aug 3 18:11:44 2024 -0500
Align "-ward/-wards" grammar/style orthography.
See man-pages(7). A project should select and use a consistent style.
Not changed:
* change log entries
* contrib/ stuff that GBR doesn't maintain (mom) or hasn't yet seriously
worked on (glilypond)
* false positive "rewards"
* glyph names containing "backwards" and similar
---
NEWS | 12 ++++++------
arch/djgpp/config.bat | 2 +-
contrib/sboxes/notquine.sed | 2 +-
doc/pic.ms | 12 ++++++------
doc/webpage.ms | 8 ++++----
man/groff.7.man | 2 +-
man/groff_diff.7.man | 6 +++---
man/groff_font.5.man | 4 ++--
src/devices/grohtml/post-html.cpp | 2 +-
src/devices/grops/grops.1.man | 2 +-
src/libs/libdriver/input.cpp | 2 +-
src/libs/libgroff/geometry.cpp | 8 ++++----
src/preproc/html/pre-html.cpp | 2 +-
src/preproc/refer/refer.1.man | 2 +-
src/preproc/tbl/table.cpp | 4 ++--
src/roff/groff/tests/substring_works.sh | 2 +-
src/roff/troff/env.cpp | 2 +-
tmac/groff_mdoc.7.man | 2 +-
18 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/NEWS b/NEWS
index c89f4b55b..889dc8822 100644
--- a/NEWS
+++ b/NEWS
@@ -1525,7 +1525,7 @@ Pic
---
o int(x) now really behaves as documented: It truncates the non-integer
- part of x, this is, it rounds towards zero and not towards the next
+ part of x, this is, it rounds toward zero and not toward the next
integer less than or equal to x.
o Pic now supports up to 32 macro arguments (and up to 16 on EBCDIC
@@ -1566,7 +1566,7 @@ o The PS font definition files have been regenerated with
newer AFM
printers. The changes are minor (most notably, the addition of the
`Euro' glyph and an extended set of kerning values).
- For backwards compatibility, the old set of font definition files is
+ For backward compatibility, the old set of font definition files is
still available; for details please read the man page of grops.
Grotty
@@ -2061,7 +2061,7 @@ o A new request `schar' has been added to define global
fallback
o In groff versions 1.18 and 1.18.1, \D'f ...' didn't move the current
point horizontally. Despite of being silly, this change has been
- reverted for backwards compatibility. Consequently, the intermediate
+ reverted for backward compatibility. Consequently, the intermediate
output command `Df' also moves the position horizontally again.
\D'f ...' is deprecated since it depends on the horizontal motion
@@ -2345,7 +2345,7 @@ o Color support has been added to troff and pic (and to
the device
groff.texinfo.
o Similar to \m and \M, \f[] switches back to the previous font. \fP
- (and \f[P]) is still valid for backwards compatibility.
+ (and \f[P]) is still valid for backward compatibility.
o The new escape \F is the same as `.fam'; \F[] switches back to
previous family -- \F[P] selects family `P'.
@@ -2840,7 +2840,7 @@ o The mdoc package has been completely rewritten, using
the full power
`groff_mdoc.7' replaces `groff_mdoc.samples.7'; it now completely
documents the mdoc package.
- Great care has been taken to assure backwards compatibility. If you
+ Great care has been taken to assure backward compatibility. If you
encounter any abnormal results, please report them to
[email protected]. [2018 UPDATE: This address no longer accepts bug
reports; please use the GNU Savannah bug tracker at
@@ -3046,7 +3046,7 @@ o groff now installs its data files into
is searched before the local tmac directory.
o All programs now have option `-v' to show the version number; they
- exit immediately afterwards, following the GNU standards.
+ exit immediately afterward, following the GNU standards.
Additionally, `--version' and `--help' have been added, doing the
obvious actions.
diff --git a/arch/djgpp/config.bat b/arch/djgpp/config.bat
index ba9d1c66b..f681425af 100644
--- a/arch/djgpp/config.bat
+++ b/arch/djgpp/config.bat
@@ -66,7 +66,7 @@ set OS=
Rem install-sh is required by the configure script but clashes with the
Rem various Makefile install-foo targets, so we MUST have it before the
-Rem script runs and rename it afterwards
+Rem script runs and rename it afterward
test -f install-sh
if not errorlevel 1 goto noren1
test -f install-sh.sh
diff --git a/contrib/sboxes/notquine.sed b/contrib/sboxes/notquine.sed
index 1a110abd3..11c81ed2b 100644
--- a/contrib/sboxes/notquine.sed
+++ b/contrib/sboxes/notquine.sed
@@ -12,7 +12,7 @@ s/^\./\\\&&/
.FS\
This is a long footnote occupying multiple output lines.\
Its only purpose is to verify that the bottom of the box on this page\
-has been adjusted upwards to accommodate it.\
+has been adjusted upward to accommodate it.\
.FE
s/@FOOTNOTE@/\\m[red]\\**\\m[]/
s/REPLACEME/(replaced by source of this document)/
diff --git a/doc/pic.ms b/doc/pic.ms
index f968ead00..fc97ee63a 100644
--- a/doc/pic.ms
+++ b/doc/pic.ms
@@ -940,7 +940,7 @@ end points are coincident.
More About Direction Changes
.PP
We've already seen how to change the direction in which objects are
-composed from rightwards to downwards.
+composed from rightward to downward.
Here are some more illustrative examples:
.KS
.PS
@@ -1016,7 +1016,7 @@ ellipse
Why is this?
Because the exit point for the current direction is already set when you
draw the object.
-The second arrow in Figure \*[SN]2 dropped downwards from the circle's
+The second arrow in Figure \*[SN]2 dropped downward from the circle's
attachment point for an
object to be joined to the right.
.PP
@@ -1055,7 +1055,7 @@ You can refer to (say) the third ellipse in the current
picture with
text string (which isn't an attribute to another object) as \fB5th
""\fP.
.PP
-Objects are also numbered backwards by type from the last one.
+Objects are also numbered backward by type from the last one.
You can say \fB2nd last box\fP to get the second-to-last box, or
\fB3rd last ellipse\fP to get the third-to-last ellipse.
.PP
@@ -1139,7 +1139,7 @@ Absolute Coordinates
The simplest is absolute coordinates in inches; \fBpic\fP uses a
Cartesian system with (0,0) at the lower left corner of the virtual
drawing surface for each picture (that is, X\~increases to the right
-and Y\~increases upwards).
+and Y\~increases upward).
An absolute location may always be written in the conventional form as
two comma-separated numbers surrounded by parentheses (and this is
recommended for clarity).
@@ -3073,8 +3073,8 @@ There are lots of different ways to specify positions:
.PP
As Kernighan notes, \[lq]since barbarisms like \fB1th\fP and \fB3th\fP are
barbaric, synonyms like \fB1st\fP and \fB3rd\fP are accepted as well.\[rq]
-Objects of a given type are numbered from 1 upwards in order of
-declaration; the \fBlast\fP modifier counts backwards.
+Objects of a given type are numbered from 1 upward in order of
+declaration; the \fBlast\fP modifier counts backward.
.PP
The \[lq]'th\[rq] form (which allows you to select a previous object with
an expression, as opposed to a numeric literal) is not documented in DWB's
diff --git a/doc/webpage.ms b/doc/webpage.ms
index 6d6a2885f..c3d40a275 100644
--- a/doc/webpage.ms
+++ b/doc/webpage.ms
@@ -708,7 +708,7 @@ pic
.ULS
.LI
int(x) now really behaves as documented: It truncates the non-integer part
-of\~x, this is, it rounds towards zero and not towards the next integer
+of\~x, this is, it rounds toward zero and not toward the next integer
less than or equal to\~x.
.LI
@@ -771,7 +771,7 @@ from Adobe's 35 core fonts as present in most Level\~2 PS
printers.
The changes are minor (most notably, the addition of the `Euro' glyph and an
extended set of kerning values).
-For backwards compatibility, the old set of font definition files is still
+For backward compatibility, the old set of font definition files is still
available; for details please read the man page of grops.
.ULE
.
@@ -1557,7 +1557,7 @@ They are searched after the list of fonts declared with
the
.LI
In groff versions 1.18 and 1.18.1, \eD'f\~.\|.\|.\&' didn't move the
current point horizontally.
-Despite of being silly, this change has been reverted for backwards
+Despite of being silly, this change has been reverted for backward
compatibility.
Consequently, the intermediate output command `Df' also moves the
position horizontally again.
@@ -1975,7 +1975,7 @@ groff.texinfo.
.LI
Similar to \em and \eM, \ef[] switches back to the previous font.
-\efP (and \ef[P]) is still valid for backwards compatibility.
+\efP (and \ef[P]) is still valid for backward compatibility.
.LI
The new escape \eF is the same as `.fam'; \eF[] switches back to previous
diff --git a/man/groff.7.man b/man/groff.7.man
index f8721ea66..602aefdf2 100644
--- a/man/groff.7.man
+++ b/man/groff.7.man
@@ -4385,7 +4385,7 @@ and
.IR end ,
inclusive.
.
-Negative indices count backwards from the end of the string.
+Negative indices count backward from the end of the string.
.
.TPx
.REQ .sv
diff --git a/man/groff_diff.7.man b/man/groff_diff.7.man
index f4ab749f7..4c08afcb3 100644
--- a/man/groff_diff.7.man
+++ b/man/groff_diff.7.man
@@ -2708,7 +2708,7 @@ implies a limit of
.
This value is associated with the environment.
.
-Only lines output from a given environment count towards the maximum
+Only lines output from a given environment count toward the maximum
associated with that environment.
.
Hyphens resulting from
@@ -2799,7 +2799,7 @@ is recognized also.
.
.
.IP \[bu]
-For backwards compatibility,
+For backward compatibility,
if
.B \[rs]patterns
is missing,
@@ -3613,7 +3613,7 @@ is omitted,
it is implicitly set to the largest valid value
(the string length minus one).
.
-Negative indices count backwards from the end of the string:
+Negative indices count backward from the end of the string:
the last character has index\~\-1,
the character before the last has index\~\-2,
and so on.
diff --git a/man/groff_font.5.man b/man/groff_font.5.man
index fd73154b5..3c9d43e0d 100644
--- a/man/groff_font.5.man
+++ b/man/groff_font.5.man
@@ -836,7 +836,7 @@ subfield gives the width of the glyph.
The
.I height
subfield gives the height of the glyph
-(upwards is positive);
+(upward is positive);
if a glyph does not extend above the baseline,
it should be given a zero height,
rather than a negative height.
@@ -846,7 +846,7 @@ The
subfield gives the depth of the glyph,
that is,
the distance below the baseline to which the glyph extends
-(downwards is positive);
+(downward is positive);
if a glyph does not extend below the baseline,
it should be given a zero depth,
rather than a negative depth.
diff --git a/src/devices/grohtml/post-html.cpp
b/src/devices/grohtml/post-html.cpp
index fcfb70bed..84a0c2220 100644
--- a/src/devices/grohtml/post-html.cpp
+++ b/src/devices/grohtml/post-html.cpp
@@ -3498,7 +3498,7 @@ text_glob *html_printer::insert_tab_ts (text_glob *where)
/*
* insert_tab_te - inserts a tab-te before the current position
- * (it skips backwards over .sp/.br)
+ * (it skips backward over .sp/.br)
*/
void html_printer::insert_tab_te (void)
diff --git a/src/devices/grops/grops.1.man b/src/devices/grops/grops.1.man
index b42ad9f5d..60be78f16 100644
--- a/src/devices/grops/grops.1.man
+++ b/src/devices/grops/grops.1.man
@@ -1617,7 +1617,7 @@ The older set has 229 glyphs and a larger set of kerning
pairs;
the newer one has 314 glyphs,
including the Euro sign.
.
-For backwards compatibility,
+For backward compatibility,
these old font descriptions are also installed in the
.I @OLDFONTDIR@/\:\%devps
directory.
diff --git a/src/libs/libdriver/input.cpp b/src/libs/libdriver/input.cpp
index 6cff913f5..99089adb8 100644
--- a/src/libs/libdriver/input.cpp
+++ b/src/libs/libdriver/input.cpp
@@ -40,7 +40,7 @@
variables was not changed, but internally many necessary changes
were performed.
- The main aim for this rewrite is to provide a first step towards
+ The main aim for this rewrite is to provide a first step toward
making groff fully compatible with classical troff without pain.
Bugs fixed
diff --git a/src/libs/libgroff/geometry.cpp b/src/libs/libgroff/geometry.cpp
index 1bb23b968..dfbf1a8b6 100644
--- a/src/libs/libgroff/geometry.cpp
+++ b/src/libs/libgroff/geometry.cpp
@@ -83,10 +83,10 @@ int printer::adjust_arc_center(const int *p, double *c)
}
else {
// We would never reach such a point. So instead start at the
- // specified end point of the arc. Go towards the specified
- // center point until we reach a point that is equidistant between
- // the specified start point and specified end point. Place
- // the center of the arc there.
+ // specified end point of the arc. Go toward the specified center
+ // point until we reach a point that is equidistant between the
+ // specified start point and specified end point. Place the center
+ // of the arc there.
n = p[2]*double(x) + p[3]*double(y);
if (n > 0) {
double k = 1 - (double(x)*x + double(y)*y)/(2.0*n);
diff --git a/src/preproc/html/pre-html.cpp b/src/preproc/html/pre-html.cpp
index e0788c234..3cdef1772 100644
--- a/src/preproc/html/pre-html.cpp
+++ b/src/preproc/html/pre-html.cpp
@@ -701,7 +701,7 @@ void char_buffer::write_upto_newline(char_block **t, int *i,
}
/*
- * can_see - Return true if we can see string in t->buffer[i] onwards.
+ * can_see - Return true if we can see string in t->buffer[i] onward.
*/
bool char_buffer::can_see(char_block **t, int *i, const char *str)
diff --git a/src/preproc/refer/refer.1.man b/src/preproc/refer/refer.1.man
index 5065f9d1b..b487fd3bd 100644
--- a/src/preproc/refer/refer.1.man
+++ b/src/preproc/refer/refer.1.man
@@ -1478,7 +1478,7 @@ special characters
.BR \e(\[aq]a )
count as a single letter.
.
-Accent strings are retained but do not count towards the total.
+Accent strings are retained but do not count toward the total.
.
.
.TP
diff --git a/src/preproc/tbl/table.cpp b/src/preproc/tbl/table.cpp
index 9f1268a5c..9452d94f0 100644
--- a/src/preproc/tbl/table.cpp
+++ b/src/preproc/tbl/table.cpp
@@ -425,7 +425,7 @@ void simple_entry::position_vertically()
break;
case entry_modifier::CENTER:
// Perform the motion in two stages so that the center is rounded
- // vertically upwards even if net vertical motion is upwards.
+ // vertically upward even if net vertical motion is upward.
printfs(".sp |\\n[%1]u\n", row_start_reg(start_row));
printfs(".sp \\n[" BOTTOM_REG "]u-\\n[%1]u-1v/2u\n",
row_start_reg(start_row));
@@ -662,7 +662,7 @@ void block_entry::position_vertically()
break;
case entry_modifier::CENTER:
// Perform the motion in two stages so that the center is rounded
- // vertically upwards even if net vertical motion is upwards.
+ // vertically upward even if net vertical motion is upward.
printfs(".sp |\\n[%1]u\n", row_start_reg(start_row));
printfs(".sp \\n[" BOTTOM_REG "]u-\\n[%1]u-\\n[%2]u/2u\n",
row_start_reg(start_row),
diff --git a/src/roff/groff/tests/substring_works.sh
b/src/roff/groff/tests/substring_works.sh
index a57d5795d..a6f59ce1a 100755
--- a/src/roff/groff/tests/substring_works.sh
+++ b/src/roff/groff/tests/substring_works.sh
@@ -38,7 +38,7 @@ groff="${abs_top_builddir:-.}/test-groff"
.\" .substring xx n1 [n2]
.\" Replace contents of string named xx with the substring bounded by
.\" zero-based indices indices n1 and n2. Negative indices count
-.\" backwards from the end of the string. If omitted, n2 is `-1`.
+.\" backward from the end of the string. If omitted, n2 is `-1`.
.\"
.\" If n1 > n2, n1 and n2 are swapped. If n1 equals or exceeds the
.\" string length, it is set to `-1`.
diff --git a/src/roff/troff/env.cpp b/src/roff/troff/env.cpp
index 35a81d12c..015d1c172 100644
--- a/src/roff/troff/env.cpp
+++ b/src/roff/troff/env.cpp
@@ -3888,7 +3888,7 @@ void hyphen_trie::do_delete(void *v)
. '\endinput' is recognized also.
- . For backwards compatibility, if '\patterns' is missing, the
+ . For backward compatibility, if '\patterns' is missing, the
whole file is treated as a list of hyphenation patterns (only
recognizing '%' as the start of a comment.
diff --git a/tmac/groff_mdoc.7.man b/tmac/groff_mdoc.7.man
index 2b56fc5a3..e376fa24f 100644
--- a/tmac/groff_mdoc.7.man
+++ b/tmac/groff_mdoc.7.man
@@ -4538,7 +4538,7 @@ flag works in combination with a tag list.
is saved before
.Aq Ar string
is interpreted;
-afterwards,
+afterward,
all variables are restored again.
.
However,
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
