From 47cf4a7bd1d4113b115e90a2ef46ff7dd2f33d5a Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Sat, 21 May 2016 00:11:19 -0700
Subject: [PATCH] Guidebook tweaks

Fix a typo in the text for encumbrance in the Status section.

Fix a typo in Guidebook.mn for non-fatal status condtions that
resulted in bold font for the entire Stun/Conf/Hallu line.

For Guidebook.ps, force
 Status
     Hunger:
onto two lines instead of being bunched up together on one line.
(For Guidebook.txt, it's already two lines.)

For both Guidebook.txt and Guidebook.ps, force some extra vertical
separation between the set of one-letter commands and the set of
extended commands, between the set of extended commands and the
set of Meta-key commands, and between the set of Meta-key commands
and the extra one-letter commands available when number_pad is on.
I don't know whether Guidebook.tex's output would look better with
something similar.
---
 doc/Guidebook.mn  | 9 ++++++---
 doc/Guidebook.tex | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn
index b69d9daf1..977cad2a6 100644
--- a/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@ -345,7 +345,7 @@ show only your experience level here.
 The number of turns elapsed so far, displayed if you have the
 .op time
 option set.
-.lp Status
+.lp "Status  "
 Hunger:
 your current hunger status.
 Values are \fBSatiated\fP, \fBNot Hungry\fP (or \fBNormal\fP),
@@ -354,7 +354,7 @@ Values are \fBSatiated\fP, \fBNot Hungry\fP (or \fBNormal\fP),
 Not shown when \fBNormal\fP.
 .lp ""
 Encumbrance:
-an indication of how what your are carrying affects your ability to move.
+an indication of how what you are carrying affects your ability to move.
 Values are \fBUnencumbered\fP, \fBEncumbered\fP, \fBStressed\fP,
 \fBStrained\fP, \fBOvertaxed\fP, and \fBOverloaded\fP.
 Not shown when \fBUnencumbered\fP.
@@ -368,7 +368,7 @@ Fatal conditions:
 .lp ""
 Non-fatal conditions:
 \fBBlind\fP (can't see), \fBDeaf\fP (can't hear),
-\fBStun\fB (stunned), \fBConf\fP (confused), \fBHallu\fP (hallucinating).
+\fBStun\fP (stunned), \fBConf\fP (confused), \fBHallu\fP (hallucinating).
 .lp ""
 Movement modifiers:
 \fBLev\fP (levitating), \fBFly\fP (flying), \fBRide\fP (riding).
@@ -876,6 +876,7 @@ Escape to a shell.
 .lp #
 Perform an extended command.
 .lp ""
+.pg
 As you can see, the authors of NetHack
 used up all the letters, so this is a way to introduce the less frequently
 used commands.
@@ -982,6 +983,7 @@ Print compile time options for this version of NetHack.
 Wipe off your face.
 .lp "#?   "
 Help menu:  get the list of available extended commands.
+.lp ""
 .pg
 If your keyboard has a meta key (which, when pressed in combination
 with another key, modifies it by setting the `meta' [8th, or `high']
@@ -1049,6 +1051,7 @@ option to have nethack combine them into meta+key.
 #version
 .lp M-w
 #wipe
+.lp ""
 .pg
 If the
 .op number_pad
diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex
index 6f667bbfd..b66e5466c 100644
--- a/doc/Guidebook.tex
+++ b/doc/Guidebook.tex
@@ -418,7 +418,7 @@ Not shown when {\it Normal}.
 
 %.lp ""
 Encumbrance:
-an indication of how what your are carrying affects your ability to move.
+an indication of how what you are carrying affects your ability to move.
 Values are {\it Unencumbered}, {\it Encumbered}, {\it Stressed},
 {\it Strained}, {\it Overtaxed}, and {\it Overloaded}.
 Not shown when {\it Unencumbered}.
-- 
2.40.0