merge

.gitattributes

@@ -13,3 +13,5 @@ README NHSUBST
 *.uu NH_header=no
 *.xpm NH_header=no
 .git* NH_header=no
+* NH_filestag=(file%s_in_top_directory)
+NetHack.dsw NH_filestag=(file%s_for_win32_that_are_moved_into_._at_compile_time)

DEVEL/.gitattributes

@@ -4,3 +4,4 @@ hooksdir/* NHSUBST
 * text=auto
 DOTGIT/TARGET NH_header=no
 hooksdir/TARGET NH_header=no
+* NH_filestag=(file%s_for_people_developing_changes_to_NetHack)

Files

@@ -50,8 +50,9 @@ fixes30.pl08   fixes30.pl09   fixes30.pl10   fixes31.1      fixes31.2
 fixes31.3      fixes32.0      fixes32.1      fixes32.2      fixes32.3
 fixes33.0      fixes33.1      fixes34.0      fixes34.1      fixes34.2
 fixes34.3      fixes35.0      fixes36.0      fixes36.1      fixes36.2
-lev_comp.6     lev_comp.txt   makedefs.6     makedefs.txt   nethack.6      
+lev_comp.6     lev_comp.txt   makedefs.6     makedefs.txt   mn.7
-nethack.txt    recover.6      recover.txt    tmac.n         window.doc     
+mnh.7          nethack.6      nethack.txt    recover.6      recover.txt
+tmac.n         tmac.nh        window.doc
 
 include:
 (files for GEM versions)
@@ -257,7 +258,7 @@ sys/winnt:
 Install.nt    Makefile.gcc  Makefile.msc  console.rc    defaults.nh
 nethack.def   nh340key.c    nhdefkey.c    nhico.uu      nhraykey.c
 nhsetup.bat   ntsound.c     nttty.c       porthelp      stubs.c
-sysconf       win32api.h    winnt.c       
+sysconf       win10.c       win10.h       win32api.h    winnt.c
 
 util:
 (files for all versions)
@@ -359,70 +360,23 @@ uudecode.vcxproj
 
 win/win32/vs2017:
 (files for Visual Studio 2017 Community Edition builds)
-NetHack.sln         NetHack.vcxproj     NetHackW.vcxproj    
+NetHack.sln            NetHack.vcxproj        NetHackW.exe.manifest
-afterdgncomp.proj   afterdlb.proj       afterlevcomp.proj   
+NetHackW.vcxproj       afterdgncomp.proj      afterdlb.proj
-aftermakedefs.proj  afternethack.proj   afterrecover.proj   
+afterlevcomp.proj      aftermakedefs.proj     afternethack.proj
-aftertile2bmp.proj  aftertilemap.proj   afteruudecode.proj  
+afterrecover.proj      aftertile2bmp.proj     aftertilemap.proj
-build.bat           common.props        config.props        
+afteruudecode.proj     build.bat              common.props
-console.props       default.props       default_dll.props   
+config.props           console.props          default.props
-dgncomp.vcxproj     dirs.props          dlb.vcxproj         
+default_dll.props      dgncomp.vcxproj        dirs.props
-dll.props           files.props         levcomp.vcxproj     
+dlb.vcxproj            dll.props              files.props
-makedefs.vcxproj    nh340key.def        nh340key.vcxproj    
+levcomp.vcxproj        makedefs.vcxproj       nh340key.def
-nhdefkey.def        nhdefkey.vcxproj    nhraykey.def        
+nh340key.vcxproj       nhdefkey.def           nhdefkey.vcxproj
-nhraykey.vcxproj    recover.vcxproj     tile2bmp.vcxproj    
+nhraykey.def           nhraykey.vcxproj       recover.vcxproj
-tilemap.vcxproj     tiles.vcxproj       uudecode.vcxproj    
+tile2bmp.vcxproj       tilemap.vcxproj        tiles.vcxproj
+uudecode.vcxproj
 
 This is a list of files produced by auxiliary programs.  They can all be
 regenerated from the files in the distribution.
 
-dat:
-(file generated by dgn_comp at playground creation time)
-dungeon  
-
-(files generated by lev_comp at playground creation time)
-Arc-fila.lev  Arc-filb.lev  Arc-goal.lev  Arc-loca.lev  Arc-strt.lev  
-Bar-fila.lev  Bar-filb.lev  Bar-goal.lev  Bar-loca.lev  Bar-strt.lev  
-Cav-fila.lev  Cav-filb.lev  Cav-goal.lev  Cav-loca.lev  Cav-strt.lev  
-Hea-fila.lev  Hea-filb.lev  Hea-goal.lev  Hea-loca.lev  Hea-strt.lev  
-Kni-fila.lev  Kni-filb.lev  Kni-goal.lev  Kni-loca.lev  Kni-strt.lev  
-Mon-fila.lev  Mon-filb.lev  Mon-goal.lev  Mon-loca.lev  Mon-strt.lev  
-Pri-fila.lev  Pri-filb.lev  Pri-goal.lev  Pri-loca.lev  Pri-strt.lev  
-Ran-fila.lev  Ran-filb.lev  Ran-goal.lev  Ran-loca.lev  Ran-strt.lev  
-Rog-fila.lev  Rog-filb.lev  Rog-goal.lev  Rog-loca.lev  Rog-strt.lev  
-Sam-fila.lev  Sam-filb.lev  Sam-goal.lev  Sam-loca.lev  Sam-strt.lev  
-Tou-fila.lev  Tou-filb.lev  Tou-goal.lev  Tou-loca.lev  Tou-strt.lev  
-Val-fila.lev  Val-filb.lev  Val-goal.lev  Val-loca.lev  Val-strt.lev  
-Wiz-fila.lev  Wiz-filb.lev  Wiz-goal.lev  Wiz-loca.lev  Wiz-strt.lev  
-air.lev       asmodeus.lev  astral.lev    baalz.lev     bigrm-1.lev   
-bigrm-2.lev   bigrm-3.lev   bigrm-4.lev   bigrm-5.lev   bigrm-6.lev   
-bigrm-7.lev   bigrm-8.lev   bigrm-9.lev   bigrm-10.lev  castle.lev    
-earth.lev     fakewiz1.lev  fakewiz2.lev  fire.lev      juiblex.lev   
-knox.lev      medusa-1.lev  medusa-2.lev  medusa-3.lev  medusa-4.lev  
-minefill.lev  minend-1.lev  minend-2.lev  minend-3.lev  minetn-1.lev  
-minetn-2.lev  minetn-3.lev  minetn-4.lev  minetn-5.lev  minetn-6.lev  
-minetn-7.lev  oracle.lev    orcus.lev     sanctum.lev   soko1-1.lev   
-soko1-2.lev   soko2-1.lev   soko2-2.lev   soko3-1.lev   soko3-2.lev   
-soko4-1.lev   soko4-2.lev   tower1.lev    tower2.lev    tower3.lev    
-valley.lev    water.lev     wizard1.lev   wizard2.lev   wizard3.lev   
-
-(files generated by makedefs at playground creation time)
-data         dungeon.pdf  options      oracles      quest.dat    rumors       
-
-(files generated for Qt interface on Mac OS X)
-Info.plist    nethack.icns  
-
-(files generated for win32 at compile time)
-dlb.lst   porthelp  
-
-(files generated for win32 gui at compile time)
-guioptions  
-
-(files generated for win32 tty at compile time)
-ttyoptions  
-
-(tile files optionally generated for X ports at playground creation time)
-pet_mark.xbm  rip.xpm       x11tiles      
-
 include:
 (file for tiles support copied from win/share at compile time)
 tile.h
@@ -443,8 +397,11 @@ Makefile      Makefile.bcc  Makefile.gcc
 (files generated by 'moc' for Qt interface at compile time)
 qt_kde0.moc      qt_win.moc       qttableview.moc
 
-(files generated by makedefs at compile time)
+(file generated by makedefs at compile time by some ports)
-monstr.c   vis_tab.c  
+monstr.c
+
+(file generated by makedefs at compile time)
+vis_tab.c
 
 (file optionally generated by tilemap at compile time)
 tile.c

dat/.gitattributes

@@ -4,3 +4,5 @@
 data.base NHSUBST
 symbols NHSUBST
 tribute NHSUBST
+* NH_filestag=(file%s_for_all_versions)
+..files NH_filegenprog

doc/.gitattributes

@@ -1,5 +1,6 @@
 *.mn	NHSUBST
 *.6	NHSUBST
+*.7	NHSUBST
 fixes*	NHSUBST
 window.doc NHSUBST
 config.nh NHSUBST
@@ -8,3 +9,4 @@ tmac.n NH_header=no
 tmac.nh NUSUBST
 fixes* NH_header=no
 *.txt NH_header=no
+* NH_filestag=(file%s_for_all_versions)

doc/Guidebook.mn

@@ -4086,7 +4086,7 @@ For example, the following line in your config file will cause
 the hitpoints field to display in the color red if your hitpoints
 drop to or below a threshold of 30%:
 .si
-.lp "OPTION=hilite_status: hitpoints/<30%/red/normal"
+.lp "OPTION=hilite_status: hitpoints/<=30%/red/normal"
 .ei
 .pg
 For another example, the following line in your config file will cause

doc/Guidebook.tex

@@ -4549,7 +4549,7 @@ For example, the following line in your config file will cause
 the hitpoints field to display in the color red if your hitpoints
 drop to or below a threshold of 30%:
 \begin{verbatim}
-    OPTION=hilite_status: hitpoints/<30%/red/normal
+    OPTION=hilite_status: hitpoints/<=30%/red/normal
 \end{verbatim}
 %.pg
 For another example, the following line in your config file will cause

doc/mn.7

@@ -0,0 +1,273 @@
+.\" $NHDT-Branch: NetHack-3.6.2 $:$NHDT-Revision: 1.0 $ $NHDT-Date: 1541298619 2018/11/04 02:30:19 $
+.TH MN 7 "News Version B2.11"
+.SH NAME
+mn \- text formatting macros for the news documentation
+.SH SYNOPSIS
+.B "nroff  \-mn"
+[ options ]  file  ...
+.br
+.B "troff  \-mn"
+[ options ]  file  ...
+.SH DESCRIPTION
+.PP
+This package of
+.IR nroff (1)
+and
+.IR troff (1)
+macro definitions provides a formatting facility
+which may be used to run off the formatted news documents.
+When reverse line motions are needed,
+filter the output through
+.IR col (1).
+.PP
+All \-mn macros,
+diversions,
+string registers,
+and number registers are defined below.
+Many
+.I nroff
+and
+.I troff
+requests are unsafe in conjunction with this package.
+However,
+the requests below may be used with impunity:
+.LP
+.ta 5n 12n
+.nf
+	.bp	begin new page
+	.br	break output line
+	.sp \f2n\fP	insert \f2n\fP spacing lines
+	.ce \f2n\fP	center next \f2n\fP lines
+	.ls \f2n\fP	line spacing: \f2n\fP=1 single, \f2n\fP=2 double space
+	.na	no alignment of right margin
+.fi
+.PP
+Font and point size changes with \ef and \es are also allowed;
+for example,
+\&``\ef2word\efR'' will italicize \f2word.\fP
+Output of the
+.IR tbl (1),
+.IR eqn (1),
+and
+.IR refer (1)
+preprocessors for equations,
+tables,
+and references is acceptable as input.
+.SH FILES
+/usr/lib/tmac/tmac.n
+.SH "SEE ALSO"
+eqn(1), refer(1), tbl(1), troff(1)
+.SH WARNINGS
+.PP
+If you do not set the string register ``.f'' to the file name,
+you will only be told the line number on which any errors occur.
+If you define this string to be the file name,
+you will get the file name,
+too.
+This is useful when dealing with a document
+split up into many files.
+.PP
+This package is not now intended for uses
+other than with the news documentation.
+.PP
+Bug reports are always welcome;
+please send them to the author.
+(Include a sample of the input;
+this helps track down the bug.)
+.SH AUTHOR
+Matt Bishop
+.RI ( mab@riacs.arpa ,
+.IR ihnp4!ames!riacs!mab ,
+.IR decvax!decwrl!riacs!mab )
+.br
+Updated for versions 1.4-1.6 by The NetHack Development Team
+.SH REQUESTS
+.PP
+In the
+.I Note
+column,
+.I b
+means the request causes a break,
+and
+.I i
+means the macro,
+number register,
+string register,
+or diversion is internal and should not be used for anything.
+In the
+.I "What It Is"
+column,
+.IR div " means " diversion ,
+.IR mac " means " macro ,
+.IR num " means " "number register" ,
+and
+.IR str " means " "string register" .
+In the
+.I "Initial Value"
+column,
+a hyphen means no initial value is used,
+anything else is the initial value,
+and if two values are given,
+the first is for
+.I nroff
+and the second for
+.IR troff .
+.PP
+.if n .in 0
+.ds x \f2x\fP\|
+.ds y \f2y\fP\|
+.ds z \f2z\fP\|
+.ds X "\*x
+.ds Y "\*x \*y
+.ds Z "\*x \*y \*z
+.tr _.
+.ta \w'MacroNames'u +\w'WhatItIs'u +\w'InitialVal'u +\w'Note 'u
+.sp .3
+.nf
+Macro	What	Initial	Note	\0 Explanation
+Name	It Is	Value
+.sp .3
+_f	num	\-	\-	file name, used in error messages if set
+_ai	mac	\-	\-	author's institution
+_au	mac	\-	b	author's name
+_b \*Z	mac	\-	\-	print \*x in font 3, \*y after, \*z before;
+				if no arguments, switch to font 3
+b	num	\-	i	used to embolden italics
+_bi \*Z	mac	\-	\-	print \*x in emboldened font 2, \*y after,
+				\*z before
+bm	num	1i,1i+1v	\-	height of bottom margin
+_bt	mac	\-	\-	print pottom title
+bt	num	.5i+1v	\-	bottom of footer to bottom of page
+_cf \*Z	mac	\-	\-	print contents of header line (double
+				quotes around \*x, \*y before, \*z after)
+cm	num	0	\-	0 if no cut marks, nonzero if cut marks
+_cn \*Z	mac	\-	\-	print computer/site name; same as _i
+_dd	div	\-	i	text of display
+dg	str	\(**,\(dg	\-	footnote mark
+dw	str	\f2current\fP	\-	name of current day of week
+dy	str	\f2current\fP	\-	full date
+_ed	mac	\-	b	end display
+_ef	mac	\-	b	end footnote
+_ei	mac	\-	b	move left margin to the right
+_er	mac	\-	\-	print error message
+_et	mac	\-	b,i	macro called at end of text
+f0	str	\-	\-	left bottom title
+f1	num	\-	i	current font number
+f1	str	\f2date\fP,\-	\-	center bottom title
+f2	num	\-	i	previous font number
+f2	str	\-	\-	right bottom title
+fc	num	\-	i	per-page footnote count
+_fd	mac	\-	b,i	drop footnotes
+fg	num	\-	i	gets fudge factor for footnote
+fl	num	5.5i	\-	default footnote line length
+_fn	mac	\-	\-	begin footnote
+_fo	mac	\-	\-	bottom of page (footer) macro
+fp	num	\-	i	current location of trap for _fo macro
+_fs	mac	\-	i	print text/footnote separator
+fs	num	\-	i	position where footnote printing should begin
+_fx	mac	\-	i	collect overflow footnotes
+_fy	div	\-	i	text of footnote overflow
+_fz	mac	\-	i	move overflow footnotes from _fy to _tf
+gs	num	\-	i	used to be sure footnotes fit
+h0	num	0	i	current level 1 section number
+h0	str	\-	\-	left header title
+h1	num	0	i	current level 2 section number
+h1	str	\f2\- page \-\fP	\-	center header title
+h2	num	0	i	current level 3 section number
+h2	str	\-	\-	right header title
+h3	num	0	i	current level 4 section number
+_hd	mac	\-	i	top of page (header) macro
+_hf	mac	\-	\-	print header field name; same as _cf
+_hn \*x	mac	\-	b	numbered section; if present, \*x is level
+hn	num	0	i	current level of numbering (temporary)
+hs	num	1v	\-	default intra-section spacing
+_hu	mac	\-	b	unnumbered section header
+_i \*Z	mac	\-	\-	print \*x in font 2, \*y after, \*z before;
+				if no arguments, switch to font 2
+i1	num	\-	i	current indent
+i2	num	\-	i	previous indent
+id	num	0	i	1 if in display, 0 otherwise
+if	num	0	i	1 if in footnote, 0 otherwise
+_is \*Z	mac	\-	\-	print \*x 2p bigger, \*y after, \*z before;
+				if no arguments, increase point size by 2p
+it	num	0	i	0 before _bt called, 1 after
+l0	num	0	i	leftmost position for left margin
+l1	num	\-	i	first level of indent for left margin
+l2	num	\-	i	second level of indent for left margin
+l3	num	\-	i	third level of indent for left margin
+l4	num	\-	i	fourth level of indent for left margin
+l5	num	\-	i	fifth level of indent for left margin
+l6	num	\-	i	sixth level of indent for left margin
+l7	num	\-	i	seventh level of indent for left margin
+l8	num	\-	i	eighth level of indent for left margin
+l9	num	\-	i	ninth level of indent for left margin
+li	num	5n	\-	paragraph indent
+ll	num	6i	\-	default line length
+lm	num	0	i	current level of indent for left margin
+lo	num	\-	i	previous level for left margin
+_lp \*Y	mac	\-	b	labelled paragraph; \*x is label, \*y indent
+lq	str	",``	\-	left double quotation marks
+mo	str	\f2current\fP	\-	name of current month
+_mt	mac	\-	b	title
+mt	num	1.5i+1v	\-	distance of title from top of page
+_ng \*Z	mac	\-	\-	newsgroup name; same as _b
+_nl	mac	\-	b	reset point size to default
+ns	num	0	i	if nonzero, _fn does not call _fs
+_op \*Z	mac	\-	\-	command option; same as _b
+p1	num	0	i	1 after PDP-11(tm) footnote printed,
+				0 before
+_pa \*Z	mac	\-	\-	print protocol appellation; same as _i
+_pd \*Y	mac	\-	\-	print PDP-11(tm), footnote; \*x after,
+				\*y before
+pd	num	1v,.3v	\-	intra-paragraph spacing
+_pf	mac	\-	\-	print footer title
+_pg \*x	mac	\-	b	paragraph; if \*x is l, left justify
+pi	num	5n	\-	default paragraph indent
+po	num	1.25i	\-	default page offset
+ps	num	12p	\-	default point size
+_pt \*x	mac	\-	\-	print header; \*x is distance from top of
+				page
+_qc \*Z	mac	\-	\-	print name of control char; \*x is name,
+				in font 3, between <>, \*y after, \*z before
+_qp \*Z	mac	\-	\-	print char; same as _b
+_r	mac	\-	\-	switch to font 1
+rg	str	\-	\-	registered trademark symbol
+rq	str	",''	\-	right double quotation marks
+s1	num	\-	i	current point size
+s2	num	\-	i	previous point size
+_sd \*X	mac	\-	\-	start display; if \*x is c, center display
+sf	num	\-	i	1 if center display, 0 otherwise
+_si \*x	num	\-	\-	indent left margin by \*x (5n default)
+_sm \*Z	mac	\-	\-	print \*x 2p smaller, \*y after, \*z before;
+				if no arguments, decrease point size by 2p
+_sn \*x	mac	\-	b	space by \*x (1v default), enter nospace mode
+_sr \*x	mac	\-	\-	enter spacemode, space by \*x (1v default)
+t2	num	0	i	0 if little/no space, nonzero otherwise
+_tf	div	\-	i	text of footnotes
+tm	num	1i-.5v	\-	height of top margin
+tt	num	.5i-.5v	\-	distance from top of page to header
+_ux \*Y	mac	\-	\-	print UNIX(tm), footnote; \*x after,
+				\*y before
+ux	num	0	i	1 after UNIX(tm) footnote printed,
+				0 before
+v1	num	\-	i	current vertical spacing
+v2	num	\-	i	previous vertical spacing
+vr	str	\-	\-	current version of news
+vs	num	16p	\-	default vertical spacing
+vx	num	0	i	1 after VAX(tm) footnote printed,
+				0 before
+_vx \*Y	mac	\-	\-	print VAX(tm), footnote; \*x after,
+				\*y before
+ws	str	\-	\-	used to construct error message
+_ya	mac	\-	\-	same as calling _yf, _yi, _ys, _yv
+_yf	mac	\-	\-	restore fonts saved by _zf
+_yi	mac	\-	\-	restore indents saved by _zi
+Yr	str	\-	\-	current year
+_ys	mac	\-	\-	restore point sizes saved by _zs
+_yv	mac	\-	\-	restore vertical spacings saved by _zv
+_za	mac	\-	\-	same as calling _zf, _zi, _zs, _zv
+_zf	mac	\-	\-	save previous, current fonts
+_zi	mac	\-	\-	save previous, current indents
+_zs	mac	\-	\-	save previous, current point sizes
+_zv	mac	\-	\-	save previous, current vertical spacings
+.fi

doc/mnh.7

@@ -0,0 +1,95 @@
+.\" $NHDT-Branch: NetHack-3.6.2 $:$NHDT-Revision: 1.0 $ $NHDT-Date: 1541298620 2018/11/04 02:30:20 $
+.TH MNH 7 NETHACK
+.SH NAME
+mnh \- additional text formatting macros for the NetHack Guidebook
+.SH SYNOPSIS
+.B "make Guidebook"
+.\"[ options ]  file  ...
+.\".br
+.\".B "troff  \-mn"
+.\"[ options ]  file  ...
+.SH DESCRIPTION
+.PP
+This package of
+.IR nroff (1)
+and
+.IR troff (1)
+macro definitions extends
+.IR tmac.n (7)
+for the NetHack Guidebook.  This document should be
+read as an addendum to the documentation for
+.IR tmac.n .
+.PP
+All \-mnh macros,
+diversions,
+string registers,
+and number registers are defined below.
+.SH FILES
+doc/tmac.nh
+.SH "SEE ALSO"
+mn(7)
+.SH AUTHOR
+Pat Rankin
+.SH REQUESTS
+.PP
+In the
+.I Note
+column,
+.I b
+means the request causes a break,
+and
+.I i
+means the macro,
+number register,
+string register,
+or diversion is internal and should not be used for anything.
+In the
+.I "What It Is"
+column,
+.IR div " means " diversion ,
+.IR mac " means " macro ,
+.IR num " means " "number register" ,
+and
+.IR str " means " "string register" .
+In the
+.I "Initial Value"
+column,
+a hyphen means no initial value is used,
+anything else is the initial value,
+and if two values are given,
+the first is for
+.I nroff
+and the second for
+.IR troff .
+.PP
+.if n .in 0
+.ds x \f2x\fP\|
+.ds y \f2y\fP\|
+.ds z \f2z\fP\|
+.ds X "\*x
+.ds Y "\*x \*y
+.ds Z "\*x \*y \*z
+.tr _.
+.ta \w'MacroNames'u +\w'WhatItIs'u +\w'InitialVal'u +\w'Note 'u
+.sp .3
+.nf
+Macro	What	Initial	Note	\0 Explanation
+Name	It Is	Value
+.sp .3
+_BR	mac	\-	\-	hard line break with vertical padding inserted
+bR	num	\-	i
+_CC \*Y	mac	\-	\-	aligned one char key \*x with \fIshort\fP definition \*y
+CW	num	\-	i
+CX	num	\-	i
+CY	num	\-	i
+CZ	num	\-	i
+CZ	num	\-	i
+_ED	mac	\-	\-	ends .SD
+_PE	mac	\-	b	labelled paragraph end
+_PL \*X	mac	\-	b	labelled paragraph label is \*x
+_PS \*X	mac	\-	b	labelled paragraph start for label the width of \*x
+PX	num	\-	i
+PY	num	\-	i
+_SD \*X	mac	\-	\-	.sd with options c-center i-indent n-no indent
+SF	num	\-	i
+_UX	mac	\-	\-	.ux with updated trademark owner

include/.gitattributes

@@ -0,0 +1,43 @@
+* NH_filestag=(file%s_for_all_versions)
+..files NH_filegenerated=win32api.h,tile.h,dgn_comp.h,lev_comp.h,date.h,onames.h,pm.h,vis_tab.h
+
+win32api.h NH_filesgentag=(file%s_for_win32_that_are_moved_into_include_at_compile_time)
+
+tile.h NH_filesgentag=(file%s_for_tiles_support_copied_from_win/share_at_compile_time)
+
+dgn_comp.h NH_filesgentag=(file%s_generated_by_yacc_(or_copied_from_sys/share)_at_compile_time)
+lev_comp.h NH_filesgentag=>dgn_comp.h
+
+date.h NH_filesgentag=(file%s_generated_by_makedefs_at_compile_time)
+onames.h NH_filesgentag=>date.h
+pm.h NH_filesgentag=>date.h
+vis_tab.h NH_filesgentag=>date.h
+
+wintty.h NH_filestag=(file%s_for_tty_versions)
+
+tile2x11.h NH_filestag=(file%s_for_X_versions)
+winX.h NH_filestag=>tile2x11.h
+xwindow.h NH_filestag=>tile2x11.h
+xwindowp.h NH_filestag=>tile2x11.h
+
+qt_clust.h NH_filestag=(file%s_for_Qt_versions)
+qt_kde0.h NH_filestag=>qt_clust.h
+qt_win.h NH_filestag=>qt_clust.h
+qt_xpms.h NH_filestag=>qt_clust.h
+qttableview.h NH_filestag=>qt_clust.h
+
+bitmfile.h   NH_filestag=(file%s_for_GEM_versions)
+gem_rsc.h NH_filestag=>bitmfile.h
+load_img.h NH_filestag=>bitmfile.h
+wingem.h NH_filestag=>bitmfile.h
+
+winGnome.h NH_filestag=(file%s_for_GNOME_versions)
+
+mac-carbon.h NH_filestag=(file%s_for_various_Macintosh_versions)
+mac-qt.h NH_filestag=>mac-carbon.h
+mac-term.h NH_filestag=>mac-carbon.h
+macconf.h NH_filestag=>mac-carbon.h
+macpopup.h NH_filestag=>mac-carbon.h
+mactty.h NH_filestag=>mac-carbon.h
+macwin.h NH_filestag=>mac-carbon.h
+mttypriv.h NH_filestag=>mac-carbon.h

src/.gitattributes

@@ -0,0 +1,14 @@
+* NH_filestag=(file%s_for_all_versions)
+..files NH_filegenerated=Makefile,Makefile.bcc,Makefile.gcc,qt_kde0.moc,qt_win.moc,qttableview.moc,tile.c,monstr.c,vis_tab.c
+Makefile.bcc	NH_filesgentag=(file%s_for_win32_that_are_moved_into_src_at_compile_time)
+Makefile.gcc	NH_filesgentag=>Makefile.bcc
+Makefile	NH_filesgentag=>Makefile.bcc
+
+qt_kde0.moc	NH_filesgentag=(file%s_generated_by_'moc'_for_Qt_interface_at_compile_time)
+qt_win.moc	NH_filesgentag=>qt_kde0.moc
+qttableview.moc	NH_filesgentag=>qt_kde0.moc
+
+tile.c		NH_filesgentag=(file%s_optionally_generated_by_tilemap_at_compile_time)
+monstr.c	NH_filesgentag=(file%s_generated_by_makedefs_at_compile_time_by_some_ports)
+
+vis_tab.c	NH_filesgentag=(file%s_generated_by_makedefs_at_compile_time)

sys/amiga/.gitattributes

@@ -1 +1,2 @@
 *.p NHSUBST
+* NH_filestag=(file%s_for_Amiga_versions_-_untested_for_3.6.2)

sys/atari/.gitattributes

@@ -0,0 +1 @@
+* NH_filestag=(file%s_for_Atari_version_-_untested_for_3.6.2)

sys/be/.gitattributes

@@ -0,0 +1 @@
+* NH_filestag=(file%s_for_BeOS_version_-_untested_for_3.6.2)

sys/mac/.gitattributes

@@ -1 +1,2 @@
 NHDeflts NHSUBST
+* NH_filestag=(file%s_for_68K_Macintosh_versions)

sys/msdos/.gitattributes

@@ -4,3 +4,6 @@ Makefile.* NHSUBST
 Install.* NHSUBST
 moveinit.pat NH_header=no
 vesa.h NH_header=no
+* NH_filestag=(file%s_for_MSDOS_version_-_untested_for_3.6.2)
+nhico.uu NH_filestag=(file%s_for_running_MSDOS_binary_under_Windows)
+nhpif.uu NH_filestag=>nhico.uu

sys/os2/.gitattributes

@@ -1 +1,2 @@
 Makefile.* NHSUBST
+* NH_filestag=(file%s_for_OS/2_version_-_untested_for_3.6.2)

sys/share/.gitattributes

@@ -4,3 +4,41 @@ termcap NH_header=no
 dgn_comp.h NH_header=no
 lev_comp.h NH_header=no
 Makefile.lib NH_header=no
+
+Makefile.lib	NH_filestag=(file%s_for_MSDOS_and_OS/2_versions_-_untested_for_3.6.2)
+#termcap.uu NH_filestag=(file%s_for_MSDOS_and_OS/2_versions_-_untested_for_3.6.2)
+termcap.uu	NH_filestag=>Makefile.lib
+
+pcmain.c	NH_filestag=(file_for_MSDOS,_OS/2,_NT,_Amiga,_and_Atari_versions_-_untested_for_3.6.2)
+
+pcsys.c		NH_filestag=(file%s_for_MSDOS,_OS/2,_NT,_and_Atari_versions_-_untested_for_3.6.2)
+pcunix.c	NH_filestag=>pcsys.c
+
+NetHack.cnf	NH_filestag=(file_for_MSDOS,_OS/2,_and_Atari_versions_-_untested_for_3.6.2)
+pctty.c		NH_filestag=>NetHack.cnf
+
+ioctl.c		NH_filestag=(file%s_for_UNIX_and_Be_versions)
+unixtty.c	NH_filestag=>ioctl.c
+
+nhlan.c NH_filestag=(file_for_NT_version)
+
+random.c NH_filestag=(Berkeley_random_number_file,_which_may_be_included_in_any_version)
+
+uudecode.c NH_filestag=(Berkeley_uudecode_file,_which_may_be_used_in_build_process_of_any_version)
+
+tclib.c NH_filestag=(file_for_VMS_version)
+
+termcap NH_filestag=(file_for_MSDOS,_OS/2,_and_VMS_versions)
+
+dgn_comp.h	NH_filestag=(lex/yacc_output_for_special_level_and_dungeon_compilers)
+dgn_lex.c	NH_filestag=>dgn_comp.h
+dgn_yacc.c	NH_filestag=>dgn_comp.h
+lev_comp.h	NH_filestag=>dgn_comp.h
+lev_lex.c	NH_filestag=>dgn_comp.h
+lev_yacc.c	NH_filestag=>dgn_comp.h
+
+posixregex.c NH_filestag=60(posix_regex_for_versions_that_include_regex_in_their_C_library)
+
+cppregex.cpp NH_filestag=61(c++_regex_code_for_versions_that_can_build_a_C++_module_and_link_it_in)
+
+pmatchregex.c NH_filestag=62(pmatch_regex_for_other_versions)

sys/share/sounds/.gitattributes

@@ -0,0 +1 @@
+* NH_filestag=(file%s_for_Amiga_and_Macintosh_versions)

sys/unix/.gitattributes

@@ -5,3 +5,6 @@ README.linux NHSUBST
 depend.awk NHSUBST
 sysconf NHSUBST
 *shr NH_header=no
+* NH_filestag=(file%s_for_UNIX_versions)
+cpp?.shr NH_filestag=(file%s_for_replacement_cpp,_only_needed_by_some_ancient_UNIX_systems)
+snd86unx.shr NH_filestag=(file%s_for_sound_driver_for_386_UNIX)

sys/unix/hints/.gitattributes

@@ -1 +1,2 @@
 * NHSUBST
+* NH_filestag=(file%s_for_configuring_UNIX_NetHack_versions)

sys/vms/.gitattributes

@@ -2,3 +2,4 @@ Makefile.* NHSUBST
 *.com NHSUBST
 Install.vms NHSUBST
 sysconf NHSUBST
+* NH_filestag=(file%s_for_VMS_version)

sys/wince/.gitattributes

@@ -1,3 +1,4 @@
 *.ce NHSUBST
 *.mak NHSUBST
 *.bat NHSUBST
+* NH_filestag=(file%s_for_Windows_CE_and_PocketPC_-_untested_for_3.6.2)

sys/wince/ceinc/.gitattributes

@@ -0,0 +1 @@
+* NH_filestag=(header_file%s_for_Windows_CE_and_PocketPC_-_untested_for_3.6.2)

sys/wince/ceinc/sys/.gitattributes

@@ -0,0 +1 @@
+* NH_filestag=(sys/stat.h_for_Windows_CE_and_PocketPC_-_untested_for_3.6.2)

sys/winnt/.gitattributes

@@ -5,3 +5,6 @@ sysconf NHSUBST
 *.rc NHSUBST
 *.bat NHSUBST
 *.def NH_header=no
+* NH_filestag=(file%s_for_Windows_7/8.x/10_version)
+..files NH_filegenerated=nethack.ico
+nethack.ico NH_filesgentag=(file%s_generated_by_uudecode_at_compile_time)

sys/winnt/win10.c

@@ -0,0 +1,42 @@
+/* NetHack 3.6	win10.c	$NHDT-Date: 1432512810 2015/05/25 00:13:30 $  $NHDT-Branch: master $:$NHDT-Revision: 1.15 $ */
+/* Copyright (C) 2018 by Bart House 	 */
+/* NetHack may be freely redistributed.  See license for details. */
+
+#include <process.h>
+#include "winMS.h"
+#include "hack.h"
+#include "win10.h"
+#include <VersionHelpers.h>
+
+Win10 gWin10 = { 0 };
+
+void win10_init()
+{
+    if (IsWindows10OrGreater())
+    {
+        HINSTANCE hUser32 = LoadLibraryA("user32.dll");
+
+        if (hUser32 == NULL) 
+            panic("Unable to load user32.dll");
+
+        gWin10.GetThreadDpiAwarenessContext = (GetThreadDpiAwarenessContextProc) GetProcAddress(hUser32, "GetThreadDpiAwarenessContext");
+        if (gWin10.GetThreadDpiAwarenessContext == NULL)
+            panic("Unable to get address of GetThreadDpiAwarenessContext()");
+
+        gWin10.AreDpiAwarenessContextsEqual = (AreDpiAwarenessContextsEqualProc) GetProcAddress(hUser32, "AreDpiAwarenessContextsEqual");
+        if (gWin10.AreDpiAwarenessContextsEqual == NULL)
+            panic("Unable to get address of AreDpiAwarenessContextsEqual");
+
+        FreeLibrary(hUser32);
+
+        gWin10.Valid = TRUE;
+    }
+
+    if (gWin10.Valid) {
+        if (!gWin10.AreDpiAwarenessContextsEqual(
+                gWin10.GetThreadDpiAwarenessContext(),
+                DPI_AWARENESS_CONTEXT_UNAWARE))
+            panic("Unexpected DpiAwareness state");
+    }
+
+}

sys/winnt/win10.h

@@ -0,0 +1,17 @@
+/* NetHack 3.6	win10.h	$NHDT-Date: 1432512810 2015/05/25 00:13:30 $  $NHDT-Branch: master $:$NHDT-Revision: 1.15 $ */
+/* Copyright (C) 2018 by Bart House 	 */
+/* NetHack may be freely redistributed.  See license for details. */
+
+typedef DPI_AWARENESS_CONTEXT(WINAPI * GetThreadDpiAwarenessContextProc)(VOID);
+typedef BOOL (WINAPI *AreDpiAwarenessContextsEqualProc)(DPI_AWARENESS_CONTEXT dpiContextA, DPI_AWARENESS_CONTEXT dpiContextB);
+
+typedef struct {
+    BOOL Valid;
+    GetThreadDpiAwarenessContextProc GetThreadDpiAwarenessContext;
+    AreDpiAwarenessContextsEqualProc AreDpiAwarenessContextsEqual;
+} Win10;
+
+extern Win10 gWin10;
+
+void win10_init();
+

util/.gitattributes

@@ -1,2 +1,14 @@
 *.pl NHSUBST
 *.[ly] NHSUBST
+* NH_filestag=(file%s_for_all_versions)
+*.[ly] NH_filestag=(lex/yacc_input_for_special_level_and_dungeon_compilers)
+
+..files NH_filegenerated=uudecode.exe,tiletxt.c,dgn_lex.c,dgn_yacc.c,lev_lex.c,lev_yacc.c
+uudecode.exe NH_filesgentag=(file%s_generated_for_win32_at_compile_time)
+tiletxt.c NH_filesgentag=(file%s_generated_for_unix_at_compile_time_if_various_tiles_utilities_are_built)
+
+dgn_lex.c NH_filesgentag=(file%s_generated_by_lex_and_yacc_(or_copied_from_sys/share)_at_compile_time)
+dgn_yacc.c NH_filesgentag=>dgn_lex.c
+lev_lex.c NH_filesgentag=>dgn_lex.c
+lev_yacc.c NH_filesgentag=>dgn_lex.c
+

win/Qt/.gitattributes

@@ -1,3 +1,4 @@
 Install.Qt NHSUBST
 qpe-nethack.control NH_header=no
 knethack.lnk NH_header=no
+* NH_filestag=(file%s_for_the_Qt_3_widget_library_-_X11,_Windows,_Mac_OS_X,_or_Qtopia)

win/Qt4/.gitattributes

@@ -0,0 +1 @@
+* NH_filestag=(file%s_for_the_Qt_4_widget_library_-_X11,_Windows,_Mac_OS_X)

win/X11/.gitattributes

@@ -4,3 +4,4 @@ Install.X11 NHSUBST
 nethack.rc NHSUBST
 *.bdf   NH_header=no
 *.xbm   NH_header=no
+* NH_filestag=(file%s_for_X_versions)

win/chain/.gitattributes

@@ -0,0 +1 @@
+* NH_filestag=(file%s_for_stacking_window_systems)

win/gem/.gitattributes

@@ -0,0 +1 @@
+* NH_filestag=(file%s_for_GEM_versions_-_untested_for_3.6.2)

win/gnome/.gitattributes

@@ -0,0 +1 @@
+* NH_filestag=(file%s_for_GNOME_versions_-_untested_for_3.6.2)

win/macosx/.gitattributes

@@ -1 +1,2 @@
 *.applescript NHSUBST
+* NH_filestag=(file%s_for_macosx_versions)

win/share/.gitattributes

@@ -1 +1,2 @@
 tile.doc NHSUBST
+* NH_filestag=(file%s_for_versions_using_optional_tiles)

win/tty/.gitattributes

@@ -0,0 +1 @@
+* NH_filestag=(file%s_for_tty_versions)

win/win32/.gitattributes

@@ -8,3 +8,4 @@
 *.props NH_header=no
 resource.h NH_header=no
 nhresource.h NH_header=no
+* NH_filestag=(file%s_for_Windows_versions_-_tested_up_to_Windows_10)

win/win32/vs2017/.gitattributes

@@ -0,0 +1 @@
+* NH_filestag=(file%s_for_Visual_Studio_2017_Community_Edition_builds)

win/win32/vs2017/NetHackW.exe.manifest

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">unaware</dpiAwareness>
+        <!-- <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness> -->
+        <!-- <gdiScaling xmlns="http://schemas.microsoft.com/SMI/2017/WindowsSettings">true</gdiScaling> -->
+    </windowsSettings>
+  </application>
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> 
+      <application>
+        <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> <!-- Windows 7 -->
+        <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> <!-- Windows 8 -->
+        <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> <!-- Windows 8.1 -->
+        <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> <!-- Windows 10 --> 
+      </application> 
+    </compatibility>
+</assembly>

win/win32/vs2017/NetHackW.vcxproj

@@ -30,6 +30,9 @@
       <SubSystem>Windows</SubSystem>
       <AdditionalDependencies>comctl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>NethackW.exe.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="$(SrcDir)allmain.c" />
@@ -152,6 +155,7 @@
       <PreprocessorDefinitions>TTYSTUB;</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="$(SysWinntDir)winnt.c" />
+    <ClCompile Include="$(SysWinntDir)win10.c" />
     <ClCompile Include="$(WinWin32Dir)mhaskyn.c" />
     <ClCompile Include="$(WinWin32Dir)mhdlg.c" />
     <ClCompile Include="$(WinWin32Dir)mhfont.c" />

win/win32/winhack.c

@@ -12,6 +12,7 @@
 #include "resource.h"
 #include "mhmain.h"
 #include "mhmap.h"
+#include "win10.h"
 
 /* Borland and MinGW redefine "boolean" in shlwapi.h,
    so just use the little bit we need */
@@ -88,18 +89,18 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
     UNREFERENCED_PARAMETER(lpCmdLine);
     UNREFERENCED_PARAMETER(nCmdShow);
 
-    //
+    /* We must initialize state sufficiently to support calls to panic */
     // We need to support DPI awareness.
     //
     // BOOL result = SetProcessDpiAwarenessContext(
     //                            DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
     //
-
-    /* We must initialize state sufficiently to support calls to panic */
     windowprocs.win_raw_print = mswin_raw_print;
     windowprocs.win_raw_print_bold = mswin_raw_print_bold;
     windowprocs.win_wait_synch = mswin_wait_synch;
 
+    win10_init();
+
     sys_early_init();
 
     /* init applicatio structure */