[PATCH 18/25] Style keyboard literals consistently.

[G. Branden Robinson]

Use italics for them, not bold, to align with the preponderance of
usage.

Also use man(7) font style alternation macros instead of *roff escape
sequences for adjacent roman and italic type.  In groff man(7), this
gets you automatic italic corrections.

Sync rluser.texi's input line break points with the man pages.
---
 doc/bash.1                   | 18 +++++++++++-------
 lib/readline/doc/readline.3  | 18 +++++++++++-------
 lib/readline/doc/rluser.texi |  8 ++++++--
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/doc/bash.1 b/doc/bash.1
index f700a736..f893fbfc 100644
--- a/doc/bash.1
+++ b/doc/bash.1
@@ -7192,9 +7192,9 @@ .SS Searching
 the next entry from the history matching the string typed so far.
 An incremental search requires only as many characters as needed to
 find the desired history entry.
-When using emacs editing mode, type \fBC\-r\fP to
+When using emacs editing mode, type \fIC\-r\fP to
 search backward in the history for a particular string.
-Typing \fBC\-s\fP searches forward through the history.
+Typing \fIC\-s\fP searches forward through the history.
 The characters present in the value of the \fBisearch-terminators\fP
 variable are used to terminate an incremental search.
 If that variable has not been assigned a value,
@@ -7203,8 +7203,8 @@ .SS Searching
 When the search is terminated, the history entry containing the
 search string becomes the current line.
 .PP
-To find other matching entries in the history list, type \fBC\-r\fP or
-\fBC\-s\fP as appropriate.
+To find other matching entries in the history list, type \fIC\-r\fP or
+\fIC\-s\fP as appropriate.
 This will search backward or forward in the history for the next
 entry matching the search string typed so far.
 Any other key sequence bound to a \fBreadline\fP command will terminate
@@ -7216,7 +7216,9 @@ .SS Searching
 .PP
 .B Readline
 remembers the last incremental search string.
-If two \fBC\-r\fPs are typed without any intervening characters defining
+If two
+.IR C\-r s
+are typed without any intervening characters defining
 a new search string, \fBreadline\fP uses any remembered search string.
 .PP
 Non-incremental searches read the entire search string before starting
@@ -7497,7 +7499,7 @@ .SS Commands for Changing Text
 .B delete\-char (C\-d)
 Delete the character at point.
 If this function is bound to the
-same character as the tty \fBEOF\fP character, as \fBC\-d\fP
+same character as the tty \fIEOF\fP character, as \fIC\-d\fP
 commonly is, see above for the effects.
 This may also be bound to the Delete key on some keyboards.
 .TP
@@ -7513,7 +7515,9 @@ .SS Commands for Changing Text
 .TP
 .B quoted\-insert (C\-q, C\-v)
 Add the next character typed to the line verbatim.
-This is how to insert characters like \fBC\-q\fP, for example.
+This is how to insert characters like
+.IR C\-q ,
+for example.
 .TP
 .B tab\-insert (C\-v TAB)
 Insert a tab character.
diff --git a/lib/readline/doc/readline.3 b/lib/readline/doc/readline.3
index 265e22fa..ce719a14 100644
--- a/lib/readline/doc/readline.3
+++ b/lib/readline/doc/readline.3
@@ -954,9 +954,9 @@ .SH SEARCHING
 the next entry from the history matching the string typed so far.
 An incremental search requires only as many characters as needed to
 find the desired history entry.
-When using emacs editing mode, type \fBC\-r\fP to
+When using emacs editing mode, type \fIC\-r\fP to
 search backward in the history for a particular string.
-Typing \fBC\-s\fP searches forward through the history.
+Typing \fIC\-s\fP searches forward through the history.
 The characters present in the value of the \fBisearch-terminators\fP
 variable are used to terminate an incremental search.
 If that variable has not been assigned a value,
@@ -965,8 +965,8 @@ .SH SEARCHING
 When the search is terminated, the history entry containing the
 search string becomes the current line.
 .PP
-To find other matching entries in the history list, type \fBC\-r\fP or
-\fBC\-s\fP as appropriate.
+To find other matching entries in the history list, type \fIC\-r\fP or
+\fIC\-s\fP as appropriate.
 This will search backward or forward in the history for the next
 entry matching the search string typed so far.
 Any other key sequence bound to a \fBreadline\fP command will terminate
@@ -978,7 +978,9 @@ .SH SEARCHING
 .PP
 .B Readline
 remembers the last incremental search string.
-If two \fBC\-r\fPs are typed without any intervening characters defining
+If two
+.IR C\-r s
+are typed without any intervening characters defining
 a new search string, \fBreadline\fP uses any remembered search string.
 .PP
 Non-incremental searches read the entire search string before starting
@@ -1196,7 +1198,7 @@ .SS Commands for Changing Text
 .B delete\-char (C\-d)
 Delete the character at point.
 If this function is bound to the
-same character as the tty \fBEOF\fP character, as \fBC\-d\fP
+same character as the tty \fBEOF\fP character, as \fIC\-d\fP
 commonly is, see above for the effects.
 This may also be bound to the Delete key on some keyboards.
 .TP
@@ -1212,7 +1214,9 @@ .SS Commands for Changing Text
 .TP
 .B quoted\-insert (C\-q, C\-v)
 Add the next character typed to the line verbatim.
-This is how to insert characters like \fBC\-q\fP, for example.
+This is how to insert characters like
+.IR C\-q ,
+for example.
 .TP
 .B tab\-insert (M-TAB)
 Insert a tab character.
diff --git a/lib/readline/doc/rluser.texi b/lib/readline/doc/rluser.texi
index 1b545cd1..d5b08409 100644
--- a/lib/readline/doc/rluser.texi
+++ b/lib/readline/doc/rluser.texi
@@ -356,7 +356,9 @@
 the current line, and begin editing.
 
 Readline remembers the last incremental search string.
-If two @kbd{C-r}s are typed without any intervening characters defining
+If two
+@kbd{C-r}s
+are typed without any intervening characters defining
 a new search string, Readline uses any remembered search string.
 
 Non-incremental searches read the entire search string before starting
@@ -1549,7 +1551,9 @@
 
 @item quoted-insert (C-q or C-v)
 Add the next character typed to the line verbatim.
-This is how to insert key sequences like @kbd{C-q}, for example.
+This is how to insert key sequences like
+@kbd{C-q},
+for example.
 
 @ifclear BashFeatures
 @item tab-insert (M-@key{TAB})
-- 
2.30.2

signature.asc
Description: PGP signature