fix #H7444 - bad line split in Guidebook

Reported for Windows beta3 but turns out to be present in 3.6.1
distribution.
| #wait
|      Rest one move while doing nothing. Default key is '.', and '
|      ' if rest_on_space is on.
where the line split occurs in the middle of "' '".  We should
switch from the ascii single quote to the 'nroff open and close
single quote escapes but I haven't gotten around to that.
Preceding the space with backslash prevents a line break there.

diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn
index ca6341e888f5ba94beaadf3ff43fb42bf68a7a53..806b0518eb20d75cbd411c53bee8213ac5f5605b 100644 (file)
--- a/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@ -1,4 +1,4 @@
-.\" $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.279 $ $NHDT-Date: 1539547136 2018/10/14 19:58:56 $
+.\" $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.280 $ $NHDT-Date: 1539552590 2018/10/14 21:29:50 $
 .\"
 .\" This is an excerpt from the 'roff' man page from the 'groff' package.
 .\" NetHack's Guidebook.mn currently does *not* adhere to these guidelines.
@@ -1326,7 +1326,7 @@ Autocompletes.
 Debug mode only.
 .lp #wait
 Rest one move while doing nothing.
-Default key is '.', and also ' ' if
+Default key is '.', and also '\ ' if
 rest_on_space is on.
 .lp #wear
 Wear a piece of armor. Default key is 'W'.
@@ -3849,17 +3849,18 @@ MENUCOLOR="* cursed *"=red
 MENUCOLOR="* cursed *(being worn)"=red&underline
 .ei
 .ed
-.\" these quotes with leading or trailing space should be flagged "don't split"
-specifies that any menu line with \(lq blessed \(rq contained
-in it will be shown in green color, lines with \(lq cursed \(rq will be
-shown in red, and lines with \(lq cursed \(rq followed by \(lq(being worn)\(rq
+.\" note backslash-quoted spaces to prevent line breaks within " word "
+specifies that any menu line with \(lq\ blessed\ \(rq contained
+in it will be shown in green color, lines with \(lq\ cursed\ \(rq will be
+shown in red, and lines with \(lq\ cursed\ \(rq followed
+by \(lq(being worn)\(rq
 on the same line will be shown in red color and underlined.
 You can have multiple MENUCOLOR entries in your config file,
 and the last MENUCOLOR-line in your config file that matches
 a menu line will be used for the line.
 .pg
 Note that if you intend to have one or more color specifications match
-\(lq uncursed \(rq, you will probably want to turn the
+\(lq\ uncursed\ \(rq, you will probably want to turn the
 .op implicit_uncursed
 option off so that all items known to be uncursed are actually
 displayed with the \(lquncursed\(rq description.

diff --git a/doc/fixes36.2 b/doc/fixes36.2
index f63ea6f135a370c94ec569d8c9edeb9e223a8714..3d801d65e4ba70929aebd5833dd5c4c06b038ad5 100644 (file)
--- a/doc/fixes36.2
+++ b/doc/fixes36.2
@@ -163,6 +163,7 @@ Elbereth hypocrisy penalty doesn't apply if attacking a monster which isn't
 Elbereth hypocrisy penalty reduced when alignment is already low
 during character creation, don't unset alternate weapon when a shield gets
        worn (was preventing knight from having lance set up as uswapwep)
+preformatted Guidebook.txt split line in middle of "' '" for #wait command
 
 
 Fixes to Post-3.6.1 Problems that Were Exposed Via git Repository