diff options
author | G. Branden Robinson <g.branden.robinson@gmail.com> | 2023-02-04 15:42:23 -0600 |
---|---|---|
committer | G. Branden Robinson <g.branden.robinson@gmail.com> | 2023-02-05 03:06:19 -0600 |
commit | 45b628322b2a16b2fd0726f7ac0f48dad34f92bd (patch) | |
tree | 246ac2e441994b9eda4c5a90a8699bf2207a1406 /src | |
parent | 708bf75d3431e3fb71d83cafa95608c77757c533 (diff) | |
download | groff-git-45b628322b2a16b2fd0726f7ac0f48dad34f92bd.tar.gz |
Fix Savannah #63589.
Correct numerous typos and solecisms throughout the source tree.
* ChangeLog:
* ChangeLog.115:
* ChangeLog.116:
* ChangeLog.117:
* ChangeLog.118:
* ChangeLog.119:
* ChangeLog.121:
* ChangeLog.122:
* Makefile.am:
* NEWS:
* PROBLEMS:
* README:
* contrib/chem/chem.am:
* contrib/chem/chem.pl:
* contrib/glilypond/README.txt:
* contrib/glilypond/glilypond.pl:
* contrib/hdtbl/groff_hdtbl.7.man:
* contrib/mm/ChangeLog:
* contrib/mm/m.tmac:
* contrib/pdfmark/pdfmark.ms:
* doc/automake.mom:
* doc/groff.texi:
* doc/me-revisions:
* doc/webpage.ms:
* m4/lib-link.m4:
* man/groff.7.man:
* man/groff_diff.7.man:
* man/roff.7.man:
* src/devices/grohtml/post-html.cpp:
* src/devices/grolbp/lbp.h:
* src/devices/gropdf/TODO:
* src/devices/gropdf/gropdf.1.man:
* src/devices/gropdf/gropdf.pl:
* src/devices/xditview/ChangeLog:
* src/devices/xditview/xditview.c:
* src/libs/libdriver/input.cpp:
* src/libs/libgroff/glyphuni.cpp:
* src/preproc/eqn/eqn.1.man:
* src/preproc/grn/gprint.h:
* src/preproc/grn/main.cpp:
* src/preproc/html/pre-html.cpp:
* src/preproc/preconv/preconv.cpp:
* src/preproc/tbl/table.cpp:
* src/roff/groff/pipeline.c:
* src/roff/groff/tests/substring_works.sh:
* src/roff/groff/tests/use_point_size_escape_with_single_digit_arg.sh:
* src/roff/troff/div.cpp:
* src/roff/troff/input.cpp:
* src/roff/troff/troff.1.man:
* src/utils/grog/grog.pl:
* src/utils/indxbib/indxbib.cpp:
* src/utils/tfmtodit/tfmtodit.1.man:
* tmac/doc-old.tmac:
* tmac/doc.tmac:
* tmac/groff_man.7.man.in:
* tmac/hyphen.fr: Do it.
Fixes <https://savannah.gnu.org/bugs/?63589>. Thanks to Bjarni Ingi
Gislason for the report.
* ANNOUNCE: Update bug counts.
I also killed some pointless white space, refilled affected lines at 72
columns where convenient and non-disruptive to existing text flow, and
corrected a misspelling of Ralph Corderoy's surname.
Diffstat (limited to 'src')
-rw-r--r-- | src/devices/grohtml/post-html.cpp | 2 | ||||
-rw-r--r-- | src/devices/grolbp/lbp.h | 4 | ||||
-rw-r--r-- | src/devices/gropdf/TODO | 16 | ||||
-rw-r--r-- | src/devices/gropdf/gropdf.1.man | 2 | ||||
-rw-r--r-- | src/devices/gropdf/gropdf.pl | 6 | ||||
-rw-r--r-- | src/devices/xditview/ChangeLog | 2 | ||||
-rw-r--r-- | src/devices/xditview/xditview.c | 2 | ||||
-rw-r--r-- | src/libs/libdriver/input.cpp | 2 | ||||
-rw-r--r-- | src/libs/libgroff/glyphuni.cpp | 2 | ||||
-rw-r--r-- | src/preproc/eqn/eqn.1.man | 2 | ||||
-rw-r--r-- | src/preproc/grn/gprint.h | 2 | ||||
-rw-r--r-- | src/preproc/grn/main.cpp | 2 | ||||
-rw-r--r-- | src/preproc/html/pre-html.cpp | 2 | ||||
-rw-r--r-- | src/preproc/preconv/preconv.cpp | 3 | ||||
-rw-r--r-- | src/preproc/tbl/table.cpp | 4 | ||||
-rw-r--r-- | src/roff/groff/pipeline.c | 6 | ||||
-rwxr-xr-x | src/roff/groff/tests/substring_works.sh | 2 | ||||
-rwxr-xr-x | src/roff/groff/tests/use_point_size_escape_with_single_digit_arg.sh | 6 | ||||
-rw-r--r-- | src/roff/troff/div.cpp | 2 | ||||
-rw-r--r-- | src/roff/troff/input.cpp | 2 | ||||
-rw-r--r-- | src/roff/troff/troff.1.man | 2 | ||||
-rw-r--r-- | src/utils/grog/grog.pl | 4 | ||||
-rw-r--r-- | src/utils/indxbib/indxbib.cpp | 2 | ||||
-rw-r--r-- | src/utils/tfmtodit/tfmtodit.1.man | 2 |
24 files changed, 41 insertions, 40 deletions
diff --git a/src/devices/grohtml/post-html.cpp b/src/devices/grohtml/post-html.cpp index fb4fdc28b..4e02b5cfa 100644 --- a/src/devices/grohtml/post-html.cpp +++ b/src/devices/grohtml/post-html.cpp @@ -5275,7 +5275,7 @@ html_printer::~html_printer() } /* - * get_str - returns a dupicate of string, s. The duplicate + * get_str - returns a duplicate of string, s. The duplicate * string is terminated at the next ',' or ']'. */ diff --git a/src/devices/grolbp/lbp.h b/src/devices/grolbp/lbp.h index bae58f83b..ee1c7b935 100644 --- a/src/devices/grolbp/lbp.h +++ b/src/devices/grolbp/lbp.h @@ -346,8 +346,8 @@ vdmpolygon(int numpoints, int *points) /************************************************************************ - * Highter level auxiliary functions * - ************************************************************************/ + * Higher level auxiliary functions * + ************************************************************************/ static inline int vdminited() { diff --git a/src/devices/gropdf/TODO b/src/devices/gropdf/TODO index 4d6fca18f..12042c278 100644 --- a/src/devices/gropdf/TODO +++ b/src/devices/gropdf/TODO @@ -1,14 +1,14 @@ pspic.tmac ---------- -Equiv for gropdf is pdfpic (which is dependant on a program -pdfbb (to extract MediaBox (etc.) from the pdf) which is not written yet! -Meanwhile you could use \X'pdf: pdfpic filename -L|R|C wid (hgt) (linelen)' -(-R and -C require a linelen) Wid or hgt may be zero (in which case the same -scaling as the other axis is used). The disadvantage of this call (over -pdfpic macro) is that it is transparent to groff, after placing the image -the current X/Y position remains what it was, so you need to do your own -'motion control' (like a .sp) to "step over" the image you just placed. +Equiv for gropdf is pdfpic (which is dependent on a program pdfbb (to +extract MediaBox (etc.) from the pdf) which is not written yet! Meanwhile +you could use \X'pdf: pdfpic filename -L|R|C wid (hgt) (linelen)' (-R and -C +require a linelen) Wid or hgt may be zero (in which case the same scaling as +the other axis is used). The disadvantage of this call (over pdfpic macro) +is that it is transparent to groff, after placing the image the current X/Y +position remains what it was, so you need to do your own 'motion control' +(like a .sp) to "step over" the image you just placed. psfig.tmac ---------- diff --git a/src/devices/gropdf/gropdf.1.man b/src/devices/gropdf/gropdf.1.man index 40f369343..389a8e9d1 100644 --- a/src/devices/gropdf/gropdf.1.man +++ b/src/devices/gropdf/gropdf.1.man @@ -950,7 +950,7 @@ position within the document (see pagename command above). .I \[oq]when\[cq] can be either .RI \[oq] after "\[cq] or \[oq]" before \[cq]. -If it is ommitted it defaults to +If it is omitted it defaults to .RI \[oq] before \[cq]. .IP The convenience command for this is diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl index 678597da6..f24889219 100644 --- a/src/devices/gropdf/gropdf.pl +++ b/src/devices/gropdf/gropdf.pl @@ -428,7 +428,7 @@ if ($cpageno > 0) my $pg=$bg->[3] || \@mediabox; - $bg->[5]=$pg->[3]; # box is continueing to next page + $bg->[5]=$pg->[3]; # box is continuing to next page $box.=DrawBox($bg); $bg->[4]=$pg->[1]; # will continue from page top } @@ -2822,7 +2822,7 @@ sub NewPage my $pg=$bg->[3] || \@defaultmb; - $bg->[5]=$pg->[3]; # box is continueing to next page + $bg->[5]=$pg->[3]; # box is continuing to next page $box.=DrawBox($bg); $bg->[4]=$pg->[1]; # will continue from page top } @@ -3029,7 +3029,7 @@ sub do_m # PDF uses G/RG/K for graphic stroke, and g/rg/k for text & graphic fill. # # This means that we must maintain g/rg/k state separately for text colour & graphic fill (this is - # probably why 'gs' maintains seperate graphic states for text & graphics when distilling PS -> PDF). + # probably why 'gs' maintains separate graphic states for text & graphics when distilling PS -> PDF). # # To facilitate this:- # diff --git a/src/devices/xditview/ChangeLog b/src/devices/xditview/ChangeLog index 95647403e..a33297bbe 100644 --- a/src/devices/xditview/ChangeLog +++ b/src/devices/xditview/ChangeLog @@ -436,7 +436,7 @@ Thu Aug 29 20:15:31 1991 James Clark (jjc at jclark) Tue Aug 13 12:04:41 1991 James Clark (jjc at jclark) - * draw.c (FakeCharacter): Remove casts in defintion of pack2. + * draw.c (FakeCharacter): Remove casts in definition of pack2. Tue Jul 30 11:42:39 1991 James Clark (jjc at jclark) diff --git a/src/devices/xditview/xditview.c b/src/devices/xditview/xditview.c index df0b7be42..1f56940b2 100644 --- a/src/devices/xditview/xditview.c +++ b/src/devices/xditview/xditview.c @@ -470,7 +470,7 @@ DoPrint (const char *name) FILE *print_file; RETSIGTYPE (*handler)(int); - /* Avoid dieing because of an invalid command. */ + /* Avoid dying because of an invalid command. */ handler = signal(SIGPIPE, SIG_IGN); print_file = popen(name, "w"); diff --git a/src/libs/libdriver/input.cpp b/src/libs/libdriver/input.cpp index 2d99eaeb2..821b526bd 100644 --- a/src/libs/libdriver/input.cpp +++ b/src/libs/libdriver/input.cpp @@ -131,7 +131,7 @@ independence by scaling the intermediate output to the resolution of the postprocessor device if different from the one specified with 'x T', groff have not. So implement full quasi device - indepedence, including the mapping of the strange classical + independence, including the mapping of the strange classical devices to the postprocessor device (seems to be reasonably easy). - The external, global pointer variables are not optimally handled. diff --git a/src/libs/libgroff/glyphuni.cpp b/src/libs/libgroff/glyphuni.cpp index ae89c3f1d..0d5a217e0 100644 --- a/src/libs/libgroff/glyphuni.cpp +++ b/src/libs/libgroff/glyphuni.cpp @@ -170,7 +170,7 @@ struct S { { "Fo", "00AB" }, { "no", "00AC" }, { "tno", "00AC" }, - // The soft hypen U+00AD is meaningful only in the input file, + // The soft hyphen U+00AD is meaningful only in the input file, // not in the output. { "rg", "00AE" }, { "a-", "00AF" }, diff --git a/src/preproc/eqn/eqn.1.man b/src/preproc/eqn/eqn.1.man index 9915a5352..93cbf2d25 100644 --- a/src/preproc/eqn/eqn.1.man +++ b/src/preproc/eqn/eqn.1.man @@ -93,7 +93,7 @@ or MathML .SH Description .\" ==================================================================== . -The GNU implemenation of +The GNU implementation of .I eqn \" GNU is part of the .MR groff @MAN7EXT@ diff --git a/src/preproc/grn/gprint.h b/src/preproc/grn/gprint.h index 63511bf19..772d79a8a 100644 --- a/src/preproc/grn/gprint.h +++ b/src/preproc/grn/gprint.h @@ -21,7 +21,7 @@ #define DOTDASHED 024 /* 054 */ #define LONGDASHED 074 -#define DEFTHICK -1 /* default thicknes */ +#define DEFTHICK -1 /* default thickness */ #define DEFSTYLE SOLID /* default line style */ #define TRUE 1 diff --git a/src/preproc/grn/main.cpp b/src/preproc/grn/main.cpp index bb20296b1..6d6d58669 100644 --- a/src/preproc/grn/main.cpp +++ b/src/preproc/grn/main.cpp @@ -188,7 +188,7 @@ enum E { OUTLINE, FILL, BOTH } polyfill; -/* flag to controll filling of polygons */ +/* flag to control filling of polygons */ double adj1 = 0.0; double adj2 = 0.0; diff --git a/src/preproc/html/pre-html.cpp b/src/preproc/html/pre-html.cpp index 9b4197659..2c87b2d8f 100644 --- a/src/preproc/html/pre-html.cpp +++ b/src/preproc/html/pre-html.cpp @@ -1397,7 +1397,7 @@ int char_buffer::run_output_filter(int filter, int argc, char **argv) set_redirection(STDERR_FILENO, saved_stderr); // Now we redirect the standard output to the inlet end of the pipe, - // and push out the appropiately formatted data to the filter. + // and push out the appropriately formatted data to the filter. set_redirection(STDOUT_FILENO, pipedes[1]); emit_troff_output(DEVICE_FORMAT(filter)); diff --git a/src/preproc/preconv/preconv.cpp b/src/preproc/preconv/preconv.cpp index 460562771..e52b3eee6 100644 --- a/src/preproc/preconv/preconv.cpp +++ b/src/preproc/preconv/preconv.cpp @@ -1020,7 +1020,8 @@ detect_file_encoding(FILE *fp) char *ret = NULL; current_position = ftell(fp); - /* due to BOM and tag detection we are not at the begining of the file */ + /* Due to BOM and tag detection, we are not at the beginning of the + file. */ rewind(fp); if (fstat(fileno(fp), &stat_buf) != 0) { error("fstat: %1", strerror(errno)); diff --git a/src/preproc/tbl/table.cpp b/src/preproc/tbl/table.cpp index e87acebbc..c391c90ae 100644 --- a/src/preproc/tbl/table.cpp +++ b/src/preproc/tbl/table.cpp @@ -423,7 +423,7 @@ void simple_entry::position_vertically() printfs(".sp |\\n[%1]u\n", row_start_reg(start_row)); break; case entry_modifier::CENTER: - // Peform the motion in two stages so that the center is rounded + // Perform the motion in two stages so that the center is rounded // vertically upwards even if net vertical motion is upwards. printfs(".sp |\\n[%1]u\n", row_start_reg(start_row)); printfs(".sp \\n[" BOTTOM_REG "]u-\\n[%1]u-1v/2u\n", @@ -660,7 +660,7 @@ void block_entry::position_vertically() printfs(".sp |\\n[%1]u\n", row_start_reg(start_row)); break; case entry_modifier::CENTER: - // Peform the motion in two stages so that the center is rounded + // Perform the motion in two stages so that the center is rounded // vertically upwards even if net vertical motion is upwards. 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", diff --git a/src/roff/groff/pipeline.c b/src/roff/groff/pipeline.c index 646c84f33..defafc24e 100644 --- a/src/roff/groff/pipeline.c +++ b/src/roff/groff/pipeline.c @@ -342,9 +342,9 @@ int run_pipeline(int ncommands, char ***commands, int no_pipe) #else /* not _WIN32 */ -/* MSDOS doesn't have 'fork', so we need to simulate the pipe by running - the programs in sequence with standard streams redirected to and - from temporary files. +/* MS-DOS doesn't have 'fork', so we need to simulate the pipe by + running the programs in sequence with standard streams redirected to + and from temporary files. */ diff --git a/src/roff/groff/tests/substring_works.sh b/src/roff/groff/tests/substring_works.sh index c70ced8ad..a57d5795d 100755 --- a/src/roff/groff/tests/substring_works.sh +++ b/src/roff/groff/tests/substring_works.sh @@ -37,7 +37,7 @@ groff="${abs_top_builddir:-.}/test-groff" . .\" .substring xx n1 [n2] .\" Replace contents of string named xx with the substring bounded by -.\" zero-based indicies indices n1 and n2. Negative indices count +.\" zero-based indices indices n1 and n2. Negative indices count .\" backwards 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 diff --git a/src/roff/groff/tests/use_point_size_escape_with_single_digit_arg.sh b/src/roff/groff/tests/use_point_size_escape_with_single_digit_arg.sh index 74efaac6a..0d1cacd9e 100755 --- a/src/roff/groff/tests/use_point_size_escape_with_single_digit_arg.sh +++ b/src/roff/groff/tests/use_point_size_escape_with_single_digit_arg.sh @@ -31,14 +31,14 @@ set -e # Verify that the idiosyncratic behavior of \sN is supported in # compatibility mode... -echo "testing \s36A in compatiblity mode (36-point 'A')" >&2 +echo "testing \s36A in compatibility mode (36-point 'A')" >&2 echo "$DOC" | "$groff" -C -Z | grep -qx 's36000' # ...and not in regular mode. -echo "testing \s36A in non-compatiblity mode (3-point '6A')" >&2 +echo "testing \s36A in non-compatibility mode (3-point '6A')" >&2 echo "$DOC" | "$groff" -Z | grep -qx 's3000' # Check that we get a diagnostic when relying on the ambiguous form. -echo "testing for diagnostic on \s36 in compatiblity mode" >&2 +echo "testing for diagnostic on \s36 in compatibility mode" >&2 echo "$DOC" | "$groff" -C -Z 2>&1 >/dev/null \ | grep -q 'ambiguous type size in escape sequence' diff --git a/src/roff/troff/div.cpp b/src/roff/troff/div.cpp index 647f2c0d8..d195baf0e 100644 --- a/src/roff/troff/div.cpp +++ b/src/roff/troff/div.cpp @@ -246,7 +246,7 @@ vunits macro_diversion::distance_to_next_trap() if (!diversion_trap.is_null() && diversion_trap_pos > vertical_position) return diversion_trap_pos - vertical_position; else - // Substract vresolution so that vunits::vunits does not overflow. + // Subtract vresolution so that vunits::vunits does not overflow. return vunits(INT_MAX - vresolution); } diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp index cd786087b..8779a78fe 100644 --- a/src/roff/troff/input.cpp +++ b/src/roff/troff/input.cpp @@ -110,7 +110,7 @@ int have_input = 0; // whether \f, \F, \D'F...', \H, \m, \M, // \O[345], \R, \s, or \S has been processed // in token::next() int old_have_input = 0; // value of have_input right before \n -bool device_has_tcommand = false; // 't' ouput command supported +bool device_has_tcommand = false; // 't' output command supported int unsafe_flag = 0; // safer by default bool have_multiple_params = false; // e.g., \[e aa], \*[foo bar] diff --git a/src/roff/troff/troff.1.man b/src/roff/troff/troff.1.man index 68f61ab7f..32cd5b27e 100644 --- a/src/roff/troff/troff.1.man +++ b/src/roff/troff/troff.1.man @@ -368,7 +368,7 @@ and ordering. . .TP .BI \-n\~ num -Begin numering pages at +Begin numbering pages at .I num. . The default diff --git a/src/utils/grog/grog.pl b/src/utils/grog/grog.pl index f61275638..28973c514 100644 --- a/src/utils/grog/grog.pl +++ b/src/utils/grog/grog.pl @@ -340,7 +340,7 @@ sub do_line { } # XXX: If the macro name shadows a standard macro name, maybe we # should delete the latter from our lists and hashes. This might - # depend on whether the document is trying to remain compatibile + # depend on whether the document is trying to remain compatible # with an existing interface, or simply colliding with names they # don't care about (consider a raw roff document that defines 'PP'). # --GBR @@ -364,7 +364,7 @@ sub do_line { # macro package (tmac) ###################################################################### - # man and ms share too many macro names for the following approch to + # man and ms share too many macro names for the following approach to # be fruitful for many documents; see &infer_man_or_ms_package. # # We can put one thumb on the scale, however. diff --git a/src/utils/indxbib/indxbib.cpp b/src/utils/indxbib/indxbib.cpp index 005385341..92aafeddd 100644 --- a/src/utils/indxbib/indxbib.cpp +++ b/src/utils/indxbib/indxbib.cpp @@ -295,7 +295,7 @@ int main(int argc, char **argv) #endif /* __EMX__ */ if (rename(temp_index_file, index_file) < 0) { #ifdef __MSDOS__ - // RENAME could fail on plain MSDOS filesystems because + // RENAME could fail on plain MS-DOS filesystems because // INDEX_FILE is an invalid filename, e.g. it has multiple dots. char *fname = p ? index_file + (p - base_name) : 0; char *dot = 0; diff --git a/src/utils/tfmtodit/tfmtodit.1.man b/src/utils/tfmtodit/tfmtodit.1.man index eba2044b8..2c55feb0b 100644 --- a/src/utils/tfmtodit/tfmtodit.1.man +++ b/src/utils/tfmtodit/tfmtodit.1.man @@ -250,7 +250,7 @@ commands to obtain additional font metric information. . .TP .BI \-k \~skew-char -The skew charcter of this font is at position +The skew character of this font is at position .I skew-char. . .I skew-char |