* doc/groff.texinfo: Spelling fixes.

* src/roff/troff/TODO: Updated.

* tmac/eqnrc: Small fixes.

4 files changed, 71 insertions, 67 deletions

diff --git a/ChangeLog b/ChangeLog
index 3031dad1..264da737 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-03-07  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: Spelling fixes.
+
 2000-03-06  Werner LEMBERG  <wl@gnu.org>
 
 	* tmac/groff_man.man: Completely revised to cover everything in
@@ -7,9 +11,12 @@
 	Other minor fixings.
 	* src/roff/troff/env.cc (environment_copy): Improve error message and
 	fix itoa->i_to_a.
+	* src/roff/troff/TODO: Updated.
 
 	* doc/Makefile: Bug fixes -- this is still provisional, though...
 
+	* tmac/eqnrc: Small fixes.
+
 2000-03-05  Abramo Bagnara <abramo@alsa-project.org>
 
 	Adding a request `evc' to copy environments.
diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index 0015bddd..52ed4ec4 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -634,8 +634,8 @@ for further work on the operating system.  In order to justify the cost
 for this system, they proposed that they would implement a document
 formatting system for the AT&T patents division.  This first formatting
 program was a reimplementation of @code{runoff}.  In accordance with
-@sc{Unix}'s penchant for abreviations, it was named @code{roff} (an
-abreviation of @code{runoff}).
+@sc{Unix}'s penchant for abbreviations, it was named @code{roff} (an
+abbreviation of @code{runoff}).
 
 @cindex @code{nroff}
 When they needed a more flexible language, a new version of @code{roff}
@@ -651,7 +651,7 @@ name @code{troff} is pronounced t-roff rather than trough.
 With @code{troff} came @code{nroff} (they were actually the same program
 except for some @samp{#ifdefs}), which was for producing output for line
 printers and character terminals.  It understood everything @code{troff}
-did, and ignored the commands which were not aplicable (i.e.@: font
+did, and ignored the commands which were not applicable (e.g.@: font
 changes).
 
 Since there are several things which cannot be done easily in
@@ -679,7 +679,7 @@ So, Brian Kernighan took on the task of rewriting @code{troff}.  The
 newly rewritten version produced a device independent code which was
 very easy for postprocessors to read and translate to the appropriate
 printer codes.  Also, this new version of @code{troff} (called
-@code{ditroff}) had several extentions, which included drawing
+@code{ditroff}) had several extensions, which included drawing
 functions.
 
 Due to the additional abilities of the new version of @code{troff},
@@ -695,7 +695,7 @@ June@w{ }1990.  @code{groff} included
 
 @itemize @bullet{}
 @item
-A replacement for @code{ditroff} with many extentions.
+A replacement for @code{ditroff} with many extensions.
 @item
 The @code{soelim}, @code{pic}, @code{tbl}, and @code{eqn} preprocessors.
 @item
@@ -978,7 +978,7 @@ The following are the output devices currently available:
 @item ps
 For PostScript printers and previewers.
 @item dvi
-For @TeX{} dvi format.
+For @TeX{} DVI format.
 @item X75
 For a 75@dmn{dpi} X11 previewer.
 @item X100
@@ -1018,7 +1018,7 @@ Generate an @sc{ascii} approximation of the typeset output.
 Print a backtrace with each warning or error message.  This backtrace
 should help track down the cause of the error.  The line numbers given
 in the backtrace may not always be correct: @code{gtroff} can get
-confused by @code{as} or @code{am} requests while couting line numbers.
+confused by @code{as} or @code{am} requests while counting line numbers.
 @item -i
 Read the standard input after all the named input files have been
 processed.
@@ -1192,7 +1192,7 @@ something meaningful (i.e.@: either a file or a pager program like
 @cindex user's macro tutorial
 
 Most users tend to use a macro package to format their papers.  This
-means that the whole breadth of @code{groff} is not neccessary for most
+means that the whole breadth of @code{groff} is not necessary for most
 people.  This chapter covers the material needed to efficiently use a
 macro package.
 
@@ -1404,7 +1404,7 @@ Most macro packages supply some form of section headers.  The simplest
 kind is simply the heading on a line by itself in bold type.  Others
 supply automatically numbered section heading or different heading
 styles at different levels.  Some, more sophisticated, macro packages
-supply macros for starting chapters and appendicies.
+supply macros for starting chapters and appendices.
 
 @subsection Headers and Footers
 
@@ -1682,7 +1682,7 @@ next line to be filled.
 @cindex sentences
 
 Although it is often debated, some typesetting rules say there should be
-different amounts of space after various puctuation marks.  For example,
+different amounts of space after various punctuation marks.  For example,
 a period at the end of a sentence should have twice as much space
 following it as would a comma or a period as part of an abbreviation.
 
@@ -1777,7 +1777,7 @@ paragraphs.  These are some conventions commonly used when typing
 
 @itemize @bullet{}
 @item
-Break lines after punctuation, particularily at the end of sentences,
+Break lines after punctuation, particularly at the end of sentences,
 and in other logical places.  Keep separate phrases on lines by
 themselves, as entire phrases are often added or deleted when editing.
 @item
@@ -2066,7 +2066,7 @@ silently ignored or expanded to nothing.
 @cindex embedded commands
 @cindex commands, embedded
 
-With most documents you need more funtionality beyond filling, adjusting
+With most documents you need more functionality beyond filling, adjusting
 and implicit line breaking.  In order to gain further functionality,
 @code{gtroff} allows commands to be embedded into your text, in two
 ways.
@@ -2163,7 +2163,7 @@ with a backslash and are followed by a single character which indicates
 the function to be performed.  If you want to have a backslash appear in
 your document, you should use the escape sequence @code{\e}.  Merely
 escaping the backslash with another backslash will work in @emph{some}
-curcumstances.
+circumstances.
 
 Many escapes have no parameters; those that do, do so in one of two
 ways.  For escapes which require an identifier there must be a way for
@@ -2216,7 +2216,7 @@ of escapes is the comment.  They begin with the @code{\"} escape and end
 at the end of the input line.
 
 This may sound simple, but it can be tricky to keep the comments from
-interfering with the apperarance of your final outupt.
+interfering with the appearance of your final output.
 
 @findex ds
 If the escape is to the right of some text or a request, that portion of
@@ -2236,7 +2236,7 @@ So, it is common to start the line with @code{.\"} which will cause the
 line to be treated as an undefined request.
 
 Another commenting scheme seen sometimes is three consecutive single
-quotes (@code{'''}) at the begining of a line.  This works, but
+quotes (@code{'''}) at the beginning of a line.  This works, but
 @code{gtroff} will give a warning about an undefined macro, which is
 harmless, but irritating.
 
@@ -2360,7 +2360,7 @@ a register, the following can be used.
 When a register is used in the text of an input file (as opposed to part
 of an expression) it is textually replaced (or interpolated) with a
 representation of that number.  This output format can be changed to a
-variety of formats (numbers, roman numerals, etc).  This is done using
+variety of formats (numbers, Roman numerals, etc).  This is done using
 the @code{af} request.  The first argument to @code{af} is the name of
 the number register to be changed, and the second argument is the output
 format.  The following output formats are available:
@@ -2373,10 +2373,10 @@ Decimal numbers with as many leading zeros as specified.  So, @samp{001}
 would result in 001, 002, 003,@w{ }@dots{}
 @item I
 @cindex roman numerals
-@cindex numerals, roman
-Upper-case roman numerals: 0, I, II, III, IV,@w{ }@dots{}
+@cindex numerals, Roman
+Upper-case Roman numerals: 0, I, II, III, IV,@w{ }@dots{}
 @item i
-Lower-case roman numerals: 0, i, ii, iii, iv,@w{ }@dots{}
+Lower-case Roman numerals: 0, i, ii, iii, iv,@w{ }@dots{}
 @item A
 Upper-case letters: A, B, C, @dots{},@w{ }Z, AA, AB,@w{ }@dots{}
 @item a
@@ -2515,7 +2515,7 @@ other requests will also cause breaks, but implicitly.  They are
 @findex nf
 @findex fi
 @vindex .u
-Initially, @code{gtroff} will fill and ajust text to both margins.
+Initially, @code{gtroff} will fill and adjust text to both margins.
 Filling can be disabled via the @code{nf} request and re-enabled with
 the @code{fi} request.  These implicitly disable and re-enable
 adjusting.  Both of these will cause a break in the text currently being
@@ -2654,7 +2654,7 @@ There are a number of ways to influence how hyphenation is done.
 Hyphenation can be turned off with the @code{nh} request, and turned
 back on with the @code{hy} request.  However, the hyphenation facilities
 of @code{gtroff} are far more flexible than this.  The @code{hy} request
-can be used to tell @code{gtroff} to restrict hypenation to certain
+can be used to tell @code{gtroff} to restrict hyphenation to certain
 cases.  The request takes a single numeric argument.  The current
 hyphenation restrictions can be found in the number register @code{.hy}.
 
@@ -2880,7 +2880,7 @@ Tab stops can be changed with the @code{ta} request.  This request takes
 a series of numbers as arguments which indicate where each tab stop is
 to be (overriding any previous settings).  These can be specified
 absolutely, i.e.@: as the distance from the left margin.  For example,
-the following wil set tab stops every one inch.
+the following will set tab stops every one inch.
 
 @example
 .ta 1i 2i 3i 4i 5i 6i
@@ -3229,12 +3229,12 @@ text.  There are two ways to do this, via the @code{ft} request and the
 @code{\f} escape.
 
 Fonts are generally specified as upper-case strings, which are usually
-1@w{ }to 4 characters representing an abreviation or acronym of the font
+1@w{ }to 4 characters representing an abbreviation or acronym of the font
 name.
 
 The basic set of fonts are @samp{R}, @samp{I}, @samp{B}, and @samp{BI}.
 These are Times Roman, Italic, Bold, and Bold Italic.  There is also at
-least one symbol font which contains various special symbols (greek,
+least one symbol font which contains various special symbols (Greek,
 mathematics).  Such symbols fonts cannot be used directly, but should be
 used via an escape.
 
@@ -3287,12 +3287,12 @@ space at such boundaries.  There are two escapes to help with this.
 @cindex correction, italic
 The @code{\/} escape increases the width of the preceding character so
 that the spacing between that character and the following character will
-be correct if the following character is a roman character.  For
-example, if an italic@w{ }f is immediately followed by a roman right
+be correct if the following character is a Roman character.  For
+example, if an italic@w{ }f is immediately followed by a Roman right
 parenthesis, then in many fonts the top right portion of the f will
 overlap the top left of the right parenthesis.  It is a good idea to use
 this escape sequence whenever an italic character is immediately
-followed by a roman character without any intervening space.  This small
+followed by a Roman character without any intervening space.  This small
 amount of space is also called @dfn{italic correction}.
 
 @c XXX example
@@ -3304,8 +3304,8 @@ amount of space is also called @dfn{italic correction}.
 @cindex correction, left italic
 The @code{\,} escape modifies the spacing of the following character so
 that the spacing between that character and the preceding character will
-be correct if the preceding character is a roman character.  It is a
-good idea to use this escape sequence whenever a roman character is
+be correct if the preceding character is a Roman character.  It is a
+good idea to use this escape sequence whenever a Roman character is
 immediately followed by an italic character without any intervening
 space.  In analogy to above, this space could be called @dfn{left italic
 correction}, but this term isn't used widely.
@@ -3584,7 +3584,7 @@ of a @code{char} request.
 @cindex fonts, artificial
 
 There are a number of requests for artificially creating fonts.  These
-are largely vestigal remains from the days when output devices did not
+are largely vestigial remains from the days when output devices did not
 have a wide variety of fonts, and when @code{nroff} and @code{troff}
 were separate programs.  These are no longer necessary in GNU
 @code{troff}.
@@ -3687,7 +3687,7 @@ function of the point size.
 @cindex spacing, vertical
 @code{gtroff} uses two dimensions with each line of text, type size and
 vertical spacing.  The @dfn{type size} is the height from the text
-@dfn{baseline} to the top of the tallest character (decenders may drop
+@dfn{baseline} to the top of the tallest character (descenders may drop
 below this baseline).  @dfn{Vertical spacing} is the amount of space
 @code{gtroff} allows for a line of text; normally, this is about 20%@w{
 }larger than the current type size.  Ratios smaller than this can result
@@ -3787,7 +3787,7 @@ A @dfn{scaled point} is equal to 1/@var{sizescale} points, where
 @var{sizescale} is specified in the @file{DESC} file (1@w{ }by default.)
 There is a new scale indicator @samp{z} which has the effect of
 multiplying by @var{sizescale}.  Requests and escape sequences in
-@code{gtroff} interpret arguments that represent a pointsize as being in
+@code{gtroff} interpret arguments that represent a point size as being in
 units of scaled points, but they evaluate each such argument using a
 default scale indicator of @samp{z}.  Arguments treated in this way are
 the argument to the @code{ps} request, the third argument to the
@@ -3798,12 +3798,12 @@ as their argument (see below).
 
 For example, suppose @var{sizescale} is@w{ }1000; then a scaled point
 will be equivalent to a millipoint; the request @w{@samp{.ps 10.25}} is
-equivalent to @w{@samp{.ps 10.25z}} and thus sets the pointsize to 10250
+equivalent to @w{@samp{.ps 10.25z}} and thus sets the point size to 10250
 scaled points, which is equal to 10.25@w{ }points.
 
 It would make no sense to use the @samp{z} scale indicator in a numeric
 expression whose default scale indicator was neither @samp{u} nor
-@samp{z}, and so @code{gtroff} disallows this.  Similarily it would make
+@samp{z}, and so @code{gtroff} disallows this.  Similarly it would make
 no sense to use a scaling indicator other than @samp{z} or @samp{u} in a
 numeric expression whose default scale indicator was @samp{z}, and so
 @code{gtroff} disallows this as well.
@@ -3815,14 +3815,14 @@ scale indicators.
 
 @vindex .s
 @vindex .ps
-The number register @code{.s} returns the pointsize in points as decimal
+The number register @code{.s} returns the point size in points as decimal
 fraction.  There is also a new number register @code{.ps} that returns
-the pointsize in scaled points.
+the point size in scaled points.
 
 @vindex .psr
 @vindex .sr
-The last-requested pointsize in scaled points is contained in the
-@code{.psr} number register.  The last requested pointsize in points as
+The last-requested point size in scaled points is contained in the
+@code{.psr} number register.  The last requested point size in points as
 a decimal fraction can be found in @code{.psr}.  This is a string-valued
 register.
 
@@ -3916,11 +3916,11 @@ argument onto the string named by the first argument.
 @end example
 
 @findex \@key{RET}
-@cindex multiline strings
-@cindex strings, multiline
+@cindex multi-line strings
+@cindex strings, multi-line
 @cindex newline character, escaping
 @cindex escaping newline characters
-Strings are not limited to a sigle line of text.  A string can span
+Strings are not limited to a single line of text.  A string can span
 several lines by escaping the newlines with a backslash.  The resulting
 string will be stored @emph{without} the newlines.
 
@@ -3932,7 +3932,7 @@ next several lines
 
 @findex substring
 @cindex substrings
-Rudimentary string maipulation routines are given with the
+Rudimentary string manipulation routines are given with the
 @code{substring} and @code{length} requests.  The former has the
 following syntax:
 
@@ -4262,7 +4262,7 @@ name.
 This would be called as
 
 @example
-.vl $Id: groff.texinfo,v 1.15 2000/03/06 11:18:41 wlemb Exp $
+.vl $Id: groff.texinfo,v 1.16 2000/03/07 08:26:47 wlemb Exp $
 @end example
 
 @xref{Request Arguments}.
@@ -4332,7 +4332,7 @@ There are a number of special case escapes for horizontal motion:
 an unbreakable and unpaddable (i.e.@: not expanded during filling)
 space.  (Note: It is a backslash followed by a space.)
 @item \~
-an unbreakable space that stretches like a normal interword space when a
+an unbreakable space that stretches like a normal inter-word space when a
 line is adjusted.
 @item \|
 a 1/6th em space.
@@ -4390,13 +4390,13 @@ heights and depths of characters.
 is set according to what kinds of characters occur in @var{text}:
 @table @asis
 @item 0
-only short characters, no decenders or tall characters.
+only short characters, no descenders or tall characters.
 @item 1
-decender
+descender
 @item 2
 tall character
 @item 3
-both a decender and a tall character
+both a descender and a tall character
 @end table
 @vindex ssc
 @item ssc
@@ -4405,7 +4405,7 @@ to the last character before a subscript.
 @vindex skw
 @item skw
 How far to right of the center of the last character in the @code{\w}
-argument, the center of an accent from a roman font should be placed
+argument, the center of an accent from a Roman font should be placed
 over that character.
 @end table
 
@@ -4730,7 +4730,7 @@ next @var{n}@w{ }lines in a bold font.
 
 @findex em
 The @code{em} request will set a trap at the end of input.  The macro
-specified as an arguement will be executed after the last line of the
+specified as an argument will be executed after the last line of the
 input file has been processed.
 
 For example, if your document had to have a section at the bottom of the
@@ -4933,10 +4933,10 @@ register.
 
 Note that a call to @code{ev} (with argument) will push the previously
 active environment onto a stack.  If, say, environments @samp{foo},
-@{bar}, and @{zap} are called (in that order), the first @{ev} request
-without parameter will switch back to environment @samp{bar} (which will
-be popped off the stack), and a second call will switch back to
-environment @samp{foo}.
+@samp{bar}, and @samp{zap} are called (in that order), the first
+@code{ev} request without parameter will switch back to environment
+@samp{bar} (which will be popped off the stack), and a second call will
+switch back to environment @samp{foo}.
 
 @c XXX example
 
@@ -5490,7 +5490,7 @@ sequences in names.
 @cindex fractional point sizes
 @cindex point sizes, fractional
 @findex ps
-Fractional pointsizes cause one noteworthy incompatibility.  In
+Fractional point sizes cause one noteworthy incompatibility.  In
 @sc{Unix} @code{troff} the @code{ps} request ignores scale indicators
 and thus
 
@@ -5499,8 +5499,8 @@ and thus
 @end example
 
 @noindent
-will set the pointsize to 10@w{ }points, whereas in GNU @code{troff} it
-will set the pointsize to 10@w{ }scaled points.  @xref{Fractional Type
+will set the point size to 10@w{ }points, whereas in GNU @code{troff} it
+will set the point size to 10@w{ }scaled points.  @xref{Fractional Type
 Sizes}, for more information.
 
 @findex bd
@@ -5912,7 +5912,7 @@ output format used by GNU @code{troff} is very similar to that used by
 @cindex 8-bit input
 @cindex input, 8-bit
 The output format is text based, as opposed to a binary format (like
-@TeX{} dvi).  The output format is @w{8-bit} clean, thus single
+@TeX{} DVI).  The output format is @w{8-bit} clean, thus single
 characters can have the eighth bit set, as can the names of fonts and
 special characters.
 
@@ -5990,7 +5990,7 @@ Device control.
 The @samp{x} command is normally followed by a letter or word indicating
 the function to perform, followed by white space separated arguments.
 
-The first argument can be abreviated to the first letter.
+The first argument can be abbreviated to the first letter.
 
 @table @code
 @item x init
@@ -6172,7 +6172,7 @@ The horizontal resolution is @var{n} machine units.
 The vertical resolution is @var{n} machine units.
 @kindex sizescale
 @item sizescale @var{n}
-The scale factor for pointsizes.  By default this has a value of@w{ }1.
+The scale factor for point sizes.  By default this has a value of@w{ }1.
 One scaled point is equal to one point/@var{n}.  The arguments to the
 @code{unitwidth} and @code{sizes} commands are given in scaled points.
 @xref{Fractional Type Sizes}, for more information.
@@ -6242,7 +6242,7 @@ The characters of the font have a slant of @var{n}@w{ }degrees.
 @item ligatures @var{lig1} @var{lig2} @dots{} @var{lign} [0]
 Characters @var{lig1}, @var{lig2}, @dots{}, @var{lign} are ligatures;
 possible ligatures are @samp{ff}, @samp{fi}, @samp{fl}, @samp{ffi} and
-@samp{ffl}.  For backwards compatibiliy, the list of ligatures may be
+@samp{ffl}.  For backwards compatibility, the list of ligatures may be
 terminated with a@w{ }0.  The list of ligatures may not extend over more
 than one line.
 @kindex special
@@ -6317,7 +6317,7 @@ The @var{code} field gives the code which the postprocessor uses to
 print the character.  The character can also be input to @code{gtroff}
 using this code by means of the @code{\N} escape sequence.  The code can
 be any integer.  If it starts with @samp{0} it will be interpreted as
-octal; if it starts with @samp{0x} or @samp{0X} it will be intepreted as
+octal; if it starts with @samp{0x} or @samp{0X} it will be interpreted as
 hexadecimal.
 
 Anything on the line after the @var{code} field will be ignored.
@@ -6342,10 +6342,10 @@ the lowest point below the baseline to which the character extends
 baseline, it should be given a zero depth, rather than a negative depth.
 The @var{italic_correction} subfield gives the amount of space that
 should be added after the character when it is immediately to be
-followed by a character from a roman font.  The
+followed by a character from a Roman font.  The
 @var{left_italic_correction} subfield gives the amount of space that
 should be added before the character when it is immediately to be
-preceded by a character from a roman font.  The
+preceded by a character from a Roman font.  The
 @var{subscript_correction} gives the amount of space that should be
 added after a character before adding a subscript.  This should be less
 than the italic correction.
diff --git a/src/roff/troff/TODO b/src/roff/troff/TODO
index 1852aafc..3e6480b6 100644
--- a/src/roff/troff/TODO
+++ b/src/roff/troff/TODO
@@ -77,8 +77,6 @@ Then is you ask for R at pointsize 16, groff will first look for
 R.display and then R.  Probably necessary to be able to specify a
 separate unitwidth for each sizesuffix (eg. for X).
 
-Request to copy an environment into the current environment.
-
 Variant of `.it' for which a line interrupted with \c counts as one
 input line.
 
diff --git a/tmac/eqnrc b/tmac/eqnrc
index a8bc8365..6642a2d0 100644
--- a/tmac/eqnrc
+++ b/tmac/eqnrc
@@ -57,7 +57,6 @@ set nroff 1
 !
 
 undef X
-undef ps|X
+undef ps|X|html
 undef n
-undef html
 .EN