Merge branch 'NetHack-3.7' of https://github.com/g-branden-robinson/NetHack into NetHack-3.7

doc/Guidebook.mn

@@ -31,7 +31,8 @@
 .lt 70n
 .\}
 .
-.so tmac.nh	\" extra macros which aren't in tmac.n
+.so tmac.nh \" extra macros which aren't in tmac.n
+.if !\n(nH .so doc/tmac.nh
 .
 .\" building Guidebook.txt doesn't have CR font available; groff 1.23 issues
 .\" a warning each time any font can't be loaded; earlier versions silently
@@ -288,15 +289,15 @@ Dlvl:1 $:993 HP:9(12) Pw:3(3) AC:10 Exp:1/19 T:752 Hungry Conf
 .if t .sp 0.5v
 Figure 1
 .
-.\" Figure 2 uses trailing spaces to force the same width as Figure 1.
 .BR 1
 .ft CR
 .TS
 center box tab(~);
 L.
-Player the Rambler   St:12 Dx:7 Co:18 In:11 Wi:9 Ch:15        \"
+.\" Use trailing spaces to force the same width as Figure 1.
-Neutral $:993 HP:9(12) Pw:3(3) AC:10 Exp:1/19 Hungry          \"
+Player the Rambler   St:12 Dx:7 Co:18 In:11 Wi:9 Ch:15        \&
-Dlvl:1 T:752                                  Conf            \"
+Neutral $:993 HP:9(12) Pw:3(3) AC:10 Exp:1/19 Hungry          \&
+Dlvl:1 T:752                                  Conf            \&
 .TE
 .ft R
 .ce 1
@@ -429,13 +430,15 @@ Movement modifiers:
 .lp ""
 Other conditions and modifiers exist, but there isn't enough room to
 display them with the other status fields.
+.\" Don't give the next paragraph a first-line indent.
+.nr @p \n(pi \" Save mn's paragraph indentation.
+.nr pi 0
 .pg
-.in -5n .\" outdent this paragraph
 The \f(CR#attributes\fP command (default key \f(CR\(haX\fP) will show
 all current status information in unabbreviated format.
 It also shows other information which might be included on the status
 lines if those had more room.
-.in 0 .\" reset indentation
+.nr pi \n(@p \" Restore mn's paragraph indentation.
 .hn 2
 The message line (top)
 .pg
@@ -2825,15 +2828,15 @@ Here is a list of the armor class values provided by suits of armor:
 .\" line and leading spaces to indent their second line.
 .TS
 center;
-a n.
+l r.
 Dragon scale mail	1
 Plate mail, Crystal plate mail	3
-Bronze plate mail, Splint mail,	\"
+Bronze plate mail, Splint mail,	\&
-\ \ \ Banded mail, Dwarvish mithril-coat	4
+   Banded mail, Dwarvish mithril-coat	4
 Chain mail, Elven mithril-coat	5
 Scale mail, Orcish chain mail	6
-Ring mail, Studded leather armor,	\"
+Ring mail, Studded leather armor,	\&
-\ \ \ Dragon scales	7
+   Dragon scales	7
 Leather armor, Orcish ring mail	8
 Leather jacket	9
 none	10
@@ -3390,87 +3393,47 @@ it because they fall into the same category of \(lqbragging rights\(rq
 and to limit the number of questions during disclosure.
 Listed here roughly in order of difficulty and not necessarily in the order
 in which you might accomplish them.
-.\" Vary the output between Guidebook.txt and Guidebook.{ps,pdf}
-.ie n \{\
-.\" fixed-width font: default key width is fine;
-.\" display longest entries (below) across two lines for Guidebook.txt
-.PS "Mines'\~End"
-.\}
-.el \{\
-.\" proportional font: force blank line, indent, and use slightly wider key
 .sp
-.in +5n
+.TS
-.PS "Mines'\~End\~"
+center;
-.\}
+L Lz2 L.
-.fi
+\fIRank\fP	\-	Attained rank title \fIRank\fP.
-.PL "<Rank>"
+Shop	\-	Entered a shop.
-Attained rank title <Rank>.
+Temple	\-	Entered a temple.
-.PL Shop
+Mines	\-	Entered the Gnomish Mines.
-Entered a shop.
+Town	\-	Entered Mine Town.
-.PL Temple
+Oracle	\-	Consulted the Oracle of Delphi.
-Entered a temple.
+Novel	\-	Read a passage from a Discworld Novel.
-.PL Mines
+Sokoban	\-	Entered Sokoban.
-Entered the Gnomish Mines.
+Big Room	\-	Entered the Big Room.
-.PL Town
+Soko-Prize	\-	T{
-Entered Mine Town.
-.PL Oracle
-Consulted the Oracle of Delphi.
-.PL Novel
-Read a passage from a Discworld Novel.
-.PL Sokoban
-Entered Sokoban.
-.PL "Big\~Room"
-Entered the Big Room.
-.ie n \{\
-.PL "Soko-Prize"
-Explored to the top of Sokoban
-.br
-and found a special item there.
-.PL "Mines'\~End"
-Explored to the bottom of the Gnomish Mines
-.br
-and found a special item there.
-.\}
-.el \{\
-.PL "Soko-Prize"
 Explored to the top of Sokoban and found a special item there.
-.PL "Mines'\~End"
+T}
-Explored to the bottom of the Gnomish Mines and found a special item there.
+Mines' End	\-	T{
-.\}
+Explored to the bottom of the Gnomish Mines and found a special item
-.fi
+there.
-.PL Medusa
+T}
-Defeated Medusa.
+Medusa	\-	Defeated Medusa.
-.PL Tune
+Tune	\-	T{
 Discovered the tune that can be used to open and close the drawbridge on
 the Castle level.
-.PL Bell
+T}
-Acquired the Bell of Opening.
+Bell	\-	Acquired the Bell of Opening.
-.PL Gehennom
+Gehennom	\-	Entered Gehennom.
-Entered Gehennom.
+Candle	\-	Acquired the Candelabrum of Invocation.
-.PL Candle
+Book	\-	Acquired the Book of the Dead.
-Acquired the Candelabrum of Invocation.
+Invocation	\-	T{
-.PL Book
-Acquired the Book of the Dead.
-.PL Invocation
 Gained access to the bottommost level of Gehennom.
-.PL Amulet
+T}
-Acquired the fabled Amulet of Yendor.
+Amulet	\-	Acquired the fabled Amulet of Yendor.
-.PL Endgame
+Endgame	\-	Reached the Elemental Planes.
-Reached the Elemental Planes.
+Astral	\-	Reached the Astral Plane level.
-.PL Astral
+Blind	\-	Blind from birth.
-Reached the Astral Plane level.
+Deaf	\-	Deaf from birth.
-.PL Blind
+Nudist	\-	Never wore any armor.
-Blind from birth.
+Pauper	\-	Started out with no possessions.
-.PL Deaf
+Ascended	\-	Delivered the Amulet to its final destination.
-Deaf from birth.
+.TE
-.PL Nudist
-Never wore any armor.
-.PL Pauper
-Started out with no possessions.
-.PL Ascended
-Delivered the Amulet to its final destination.
-.PE
-.if t .in -5n  \" undo proportional-width font-specific indentation
 .sp
 .lp "Notes:  "
 .pg
@@ -3503,7 +3466,8 @@ instrument played closely
 enough\(embut not too close!\(emto
 the Castle level's drawbridge or can be given to you via prayer boon.
 .pg
-\fIBlind\fP, \fIDeaf\fP, \fINudist\fP, and \FIPauper\fP are also conducts, and they can only be
+\fIBlind\fP, \fIDeaf\fP, \fINudist\fP,
+and \fIPauper\fP are also conducts, and they can only be
 enabled by setting the correspondingly named option in NETHACKOPTIONS
 or run-time configuration file prior to game start.
 In the case of \fIBlind\fP and \fIDeaf\fP, the option also enforces the conduct.
@@ -5530,7 +5494,7 @@ SOUND=MESG hide "^You miss the " "swing.wav" 75
 .ft
 .ei
 .ed
-.BR 0 .\" without this, the next section seems too close to this one
+.BR 0 \" without this, the next section seems too close to this one
 .hn 2
 Configuring Status Hilites
 .pg
@@ -5714,7 +5678,7 @@ OPTION=hilite_status: condition/lev+fly/red&inverse
 .ft
 .ei
 .ed
-.BR 0 .\" without this, the next section seems too close to this one
+.BR 0 \" without this, the next section seems too close to this one
 .hn 2
 Modifying NetHack Symbols
 .pg

doc/tmac.n

@@ -1,4 +1,4 @@
-\" @(#)$Id: tmac.n,v 1.4 2002/01/19 13:41:15 michael.allison Exp $
+.\" @(#)$Id: tmac.n,v 1.4 2002/01/19 13:41:15 michael.allison Exp $
 .\" The News macro package
 .\"
 .\" This  is  the macro package that is used to format news documents.  It
@@ -761,4 +761,3 @@
 .\" couple of miscellaneous requests
 .bd S 3 3				\" embolden special font chars if B
 .hy 2					\" don't hyphenate last lines
-

doc/tmac.nh

@@ -8,6 +8,10 @@
 .\"   cluttered as their number increased.  It now uses the '.so' directive
 .\"   to include this file.  (tmac.n is passed to 'roff on the command line.)
 .
+.\" Protect against being sourced twice.
+.nr nH +1
+.if \n(nH>1 .nx
+.
 .\" labeled paragraph start
 .\" .PS word
 .\"	set the width for the label column
@@ -85,7 +89,8 @@
 .	if \\n(id=0 \{\
 .		di			\" end diversion
 .		fi			\" resume filling
-.		in -\\n(piu		\" dedent
+.		ie \\n(.i<\\n(pi .in 0
+.		el .in -\\n(piu		\" dedent
 .		ev			\" pop environment
 .		ne \\n(dnu		\" be sure you have room
 .		nf			\" don't reprocess display
@@ -118,7 +123,7 @@
 .\"    $1 - repeat count for amount of padding (optional; default is 1)
 .de BR
 .ie \\.$==0 .nr bR 1v
-.el .nr bR (\\$1-0)v
+.el .nr bR 0\\$1v
 \0
 .sp \\n(bR
 .br

sys/unix/Makefile.doc

@@ -19,6 +19,8 @@ GUIDEBOOK = Guidebook		# regular ASCII file
 # Some versions of col need -x to keep them from converting spaces to tabs;
 # some versions of col don't do the conversion by default and don't
 # recognize the option.  Sigh.
+#
+# col is unnecessary, but harmless, with groff.  See grotty(1).
 COLCMD = col -bx
 #COLCMD = col -b
 

sys/unix/hints/include/misc.370

@@ -76,6 +76,13 @@ NROFFISGROFF := $(shell echo `nroff --version | grep "GNU groff version"`)
 ifneq "$(NROFFISGROFF)" ""
 # get the version of groff and flag if it is gt or eq to 1.23
 GROFFGE123 := $(shell expr `echo $(NROFFISGROFF) | cut -f2 -d.` \>= 23)
+# or less than 1.24
+GROFFLT124 := $(shell expr `echo $(NROFFISGROFF) | cut -f2 -d.` \< 24)
+# -Wtab -Wrange are for the sake of tmac.n.
+NROFF_FLAGS := -wall -Wtab -Wrange
+ifneq "$(GROFFLT124)" ""
+NROFF_FLAGS += -Wel -Wscale
+endif
 endif  # NROFFISGROFF
 
 ifneq "$(NROFFISGROFF)" ""   # It's groff
@@ -83,7 +90,8 @@ ifneq "$(NROFFISGROFF)" ""   # It's groff
 MAN2TXTPRE += -Tascii
 ifneq "$(GROFFGE123)" ""   # It's groff 1.23 or greater
 #$(info GROFFGE123=$(GROFFGE123))
-# add the groff 1.23 specific plain text flag -P
+# nroff in groff 1.23 supports the -P option to pass arguments to the
+# output driver.  -cbou are flags to grotty(1).
 MAN2TXTPRE += -P -cbou
 MAN2TXTPOST=
 else