From ac2514c149c7c963a583591d7683a77b2b8262a0 Mon Sep 17 00:00:00 2001 From: PatR Date: Sun, 14 Oct 2018 17:46:48 -0700 Subject: [PATCH] Guidebook.mn screenshot Putting a box around the simulated screenshot has a side-effect of forcing it to the next page if there isn't room on the current page. And it looks at least as good as the old top and bottom horizontal lines, if not better. This also eliminates the blank left-most column (relative to those lines) which isn't part of the screenshot. There are issues: 1) for Guidebook.ps, the "Figure 1" label underneath seems to be too close to the box; I didn't try to force a blank line in front of it because that increases the risk of pushing it to the next page if the figure lands at the bottom; 2) for Guidebook.txt, the "Figure 1" label actually overwrites the bottom line of the box, and the embedded space allows the line to show through: "---Figure-1---"; I tried using "\ Figure\ 1\ " to see if that might hide the issue by making it seem that the label in intended to be on that line, but it didn't help-- unbreakable-space evidently does not imply always-visible-space; 3) the box is one column wider than the rest of the document (the previous horizontal lines were two or three columns wider, so this is actually a tiny imrovement); squeezing out some whitespace to make the status lines narrower didn't help--or at least not enough; squeezing some spaces was needed to match STATUS_HILITES- era status formatting anyway. 4] if there was a footnote (we have some for trademarks) on the same page as the screenshot, either the footnote or the table would probably become confused, perhaps both. I think we just pretend that that will never come up.... 5} I've made no attempt to alter Guidebook.tex to try to match. I'm throwing in the towel. Fixing this up is way beyond my limited 'roff/tbl capability. (There's probably a much more straightforward way to achieve what we want.) --- doc/Guidebook.mn | 15 +++++++-------- doc/fixes36.2 | 1 + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn index 806b0518e..de2e10f48 100644 --- a/doc/Guidebook.mn +++ b/doc/Guidebook.mn @@ -1,4 +1,4 @@ -.\" $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.280 $ $NHDT-Date: 1539552590 2018/10/14 21:29:50 $ +.\" $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.281 $ $NHDT-Date: 1539564402 2018/10/15 00:46:42 $ .\" .\" This is an excerpt from the 'roff' man page from the 'groff' package. .\" NetHack's Guidebook.mn currently does *not* adhere to these guidelines. @@ -282,11 +282,12 @@ replaces the \(lqYou see ...\(rq descriptions of text adventure games. Figure 1 is a sample of what a NetHack screen might look like. The way the screen looks for you depends on your platform. . +.br \" break - advance to next line +\ \" space to force non-empty line before table .ft CR \" set font to constant-width Roman .TS S -center tab(~); -a. -_ +center box tab(~); +L. The bat bites! ------ @@ -298,10 +299,8 @@ The bat bites! -Player the Rambler St:12 Dx:7 Co:18 In:11 Wi:9 Ch:15 Neutral -Dlvl:1 $:0 HP:9(12) Pw:3(3) AC:10 Exp:1/19 T:257 Weak - -_ +Player the Rambler St:12 Dx:7 Co:18 In:11 Wi:9 Ch:15 Neutral +Dlvl:1 $:0 HP:9(12) Pw:3(3) AC:10 Exp:1/19 T:257 Weak .TE .ft \" revert to previous font .ce 1 diff --git a/doc/fixes36.2 b/doc/fixes36.2 index 3d801d65e..86ace2873 100644 --- a/doc/fixes36.2 +++ b/doc/fixes36.2 @@ -164,6 +164,7 @@ 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 +prevent simiulated screenshot in Guidebook.txt from spanning page boundary Fixes to Post-3.6.1 Problems that Were Exposed Via git Repository