[PATCH 11/42] Migrate terminology from "non-spacing" to "combining".

[G. Branden Robinson]

* man/curs_add_wch.3x:
* man/curs_addwstr.3x:
* man/curs_getcchar.3x:
* man/curs_ins_wstr.3x: Do it.
---
 man/curs_add_wch.3x  | 16 ++++++++--------
 man/curs_addwstr.3x  |  2 +-
 man/curs_getcchar.3x | 20 ++++++++++----------
 man/curs_ins_wstr.3x |  4 ++--
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index accbe0620..a59cd7a43 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -86,17 +86,17 @@ .SS add_wch
 to prepare for writing the next character on the screen.
 .IP
 The newly added spacing character is the base of the active complex character.
-Subsequent non-spacing characters can be combined with this base
+Subsequent combining characters can be combined with this base
 until another spacing character is written to the screen,
 or the cursor is moved, e.g., using \fBwmove\fP.
 .bP
-If \fIwch\fP refers to a non-spacing character,
+If \fIwch\fP refers to a combining character,
 it is appended to the active complex character,
 retaining the previous characters at that location.
 The rendition specified by \fIwch\fP is ignored.
 .IP
-The cursor is not advanced after adding a non-spacing character.
-Subsequent calls to add non-spacing characters will update the same position.
+The cursor is not advanced after adding a combining character.
+Subsequent calls to add combining characters will update the same position.
 .bP
 If the character part of \fIwch\fP is
 a tab, newline, backspace or other control character,
@@ -338,20 +338,20 @@ .SS Complex Characters
 can store more than one wide character (\fBwchar_t\fR).
 The X/Open Curses description does not mention this possibility,
 describing only the cases where \fIwch\fP is a spacing character
-or a non-spacing character.
+or a combining character.
 .PP
 This implementation assumes that \fIwch\fP is constructed using
 \fB\%setcchar\fP(3X), and in turn that the result
 .bP
 contains at most one spacing character in the beginning of its list of wide
 characters,
-and zero or more non-spacing characters
+and zero or more combining characters
 or
 .bP
-may hold one non-spacing character.
+may hold one combining character.
 .PP
 In the latter case,
-\fI\%ncurses\fP adds the non-spacing character to the active
+\fI\%ncurses\fP adds the combining character to the active
 (base) spacing character.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index ff8240bc9..a2887d2db 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -76,7 +76,7 @@ .SH DESCRIPTION
 each \fBwchar_t\fR in the string,
 then calling \fBwadd_wch\fP(3X) for the resulting \fBcchar_t\fP:
 .bP
-spacing and non-spacing characters in the string
+spacing and combining characters in the string
 are processed one at a time, and
 .bP
 control characters are processed as in \fBwaddch\fP(3X).
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index d518abcf0..0c19efb55 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -98,11 +98,11 @@ .SS setcchar
 contain at most one spacing character,
 which must be the first.
 .IP
-Up to \fBCCHARW_MAX\fP\-1 non-spacing characters may follow.
-Additional non-spacing characters are ignored.
+Up to \fBCCHARW_MAX\fP\-1 combining characters may follow.
+Additional combining characters are ignored.
 .IP
 The string may contain a single control character instead.
-In that case, no non-spacing characters are allowed.
+In that case, no combining characters are allowed.
 .SH RETURN VALUE
 When \fIwch\fP is a null pointer,
 \fBgetcchar\fP returns the number of wide characters referenced by
@@ -142,24 +142,24 @@ .SH PORTABILITY
 .bP
 a spacing character (\fBwchar_t\fP, i.e., 32-bits).
 .bP
-non-spacing characters (again, \fBwchar_t\fP's).
+combining characters (again, \fBwchar_t\fP's).
 .bP
 attributes (at least 16 bits, inferred from the various ACS- and WACS-flags).
 .bP
 color pair (at least 16 bits, inferred from the \fBunsigned short\fP type).
 .PP
-The non-spacing characters are optional,
+The combining characters are optional,
 in the sense that zero or more may be stored in a \fBcchar_t\fP.
 XOpen/Curses specifies a limit:
 .RS 4
 .PP
-Implementations may limit the number of non-spacing characters that can be
+Implementations may limit the number of combining characters that can be
 associated with a spacing character, provided any limit is at least 5.
 .RE
 .PP
 The Unix implementations at the time follow that limit:
 .bP
-AIX\ 4 and OSF1\ 4 use the same declaration with an array of 5 non-spacing
+AIX\ 4 and OSF1\ 4 use the same declaration with an array of 5 combining
 characters \fIz\fP and a single spacing character \fIc\fP.
 .bP
 HP-UX\ 10 uses an opaque structure with 28 bytes,
@@ -168,15 +168,15 @@ .SH PORTABILITY
 Solaris \fIxpg4\fP curses uses a single array of 6 \fBwchar_t\fP values.
 .PP
 This implementation's \fBcchar_t\fP was defined in 1995
-using \fB5\fP for the total of spacing and non-spacing characters
+using \fB5\fP for the total of spacing and combining characters
 (\fBCCHARW_MAX\fP).
 That was probably due to a misreading of the AIX\ 4 header files,
 because the X/Open Curses document was not generally available at that time.
 Later (in 2002), this detail was overlooked when beginning to implement
 the functions using the structure.
 .PP
-In practice, even four non-spacing characters may seem enough.
-X/Open Curses documents possible uses for non-spacing characters,
+In practice, even four combining characters may seem enough.
+X/Open Curses documents possible uses for combining characters,
 including using them for ligatures between characters
 (a feature apparently not supported by any curses implementation).
 Unicode does not limit the (analogous) number of combining characters,
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index 70ad06d5b..421fde20b 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -104,9 +104,9 @@ .SH RETURN VALUE
 .SH NOTES
 All but \fBwins_nwstr\fP may be macros.
 .PP
-If the first character in the string is a non-spacing character, these
+If the first character in the string is a combining character, these
 functions will fail.
-XSI does not define what will happen if a non-spacing character follows
+XSI does not define what will happen if a combining character follows
 a control character.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4,
-- 
2.30.2

signature.asc
Description: PGP signature