From e316d962a80d6e76cd491317df26442b7e0921fb Mon Sep 17 00:00:00 2001 From: nhkeni Date: Sat, 9 Mar 2024 13:28:15 -0500 Subject: [PATCH] Minor regex naming and doc cleanup. --- doc/Guidebook.mn | 8 +++++--- doc/Guidebook.tex | 7 ++++--- include/extern.h | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn index 7cdebb4b4..400b0b47e 100644 --- a/doc/Guidebook.mn +++ b/doc/Guidebook.mn @@ -1,4 +1,4 @@ -.\" $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.536 $ $NHDT-Date: 1699260377 2023/11/06 08:46:17 $ +.\" $NHDT-Branch: keni-regex $:$NHDT-Revision: 1.571 $ $NHDT-Date: 1710008891 2024/03/09 18:28:11 $ .\" .\" This is an excerpt from the 'roff' man page from the 'groff' package. .\"+-- @@ -5112,7 +5112,9 @@ Regular expressions are normally POSIX extended regular expressions. It is possible to compile NetHack without regular expression support on a platform where there is no regular expression library. While this is not true of any modern platform, if your NetHack was built this way, patterns are instead glob -patterns. This applies to Autopickup exceptions, Message types, Menu colors, +patterns; regardless, this document refers to both as \(oqregular +expressions.\(cq +This applies to Autopickup exceptions, Message types, Menu colors, and User sounds. .hn 2 Configuring Autopickup Exceptions @@ -5462,7 +5464,7 @@ the volume to be set while playing the sound file; optional; the index corresponding to a sound file. .PE .lp "" -The pattern should be a POSIX extended regular expression. +The pattern should be a regular expression. .pg For example: .sd diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index 6e26de554..695893306 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -1,5 +1,5 @@ \documentstyle[titlepage,longtable]{article} -% NetHack 3.7 Guidebook.tex $NHDT-Date: 1699260377 2023/11/06 08:46:17 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.531 $ */ +% NetHack 3.7 Guidebook.tex $NHDT-Date: 1710008891 2024/03/09 18:28:11 $ $NHDT-Branch: keni-regex $:$NHDT-Revision: 1.559 $ */ %+% we're still limping along in LaTeX 2.09 compatibility mode %-%\documentclass{article} %-%\usepackage{hyperref} % before longtable @@ -5665,7 +5665,8 @@ possible to compile {\it NetHack\/} without regular expression support on a platform where there is no regular expression library. While this is not true of any modern platform, if your {\it NetHack\/} was built this way, patterns are instead glob -patterns. This applies to Autopickup exceptions, Message types, Menu colors, +patterns; regardless, this document refers to both as ``regular expressions.'' +This applies to Autopickup exceptions, Message types, Menu colors, and User sounds. %.hn 2 @@ -6062,7 +6063,7 @@ Each SOUND entry is broken down into the following parts: \elist %.lp "" -The pattern should be a POSIX extended regular expression. +The pattern should be a regular expression. For example: diff --git a/include/extern.h b/include/extern.h index baba78970..4733f1246 100644 --- a/include/extern.h +++ b/include/extern.h @@ -1,4 +1,4 @@ -/* NetHack 3.7 extern.h $NHDT-Date: 1709675219 2024/03/05 21:46:59 $ $NHDT-Branch: keni-mdlib-followup $:$NHDT-Revision: 1.1400 $ */ +/* NetHack 3.7 extern.h $NHDT-Date: 1710008870 2024/03/09 18:27:50 $ $NHDT-Branch: keni-regex $:$NHDT-Revision: 1.1397 $ */ /* Copyright (c) Steve Creps, 1988. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1999,7 +1999,7 @@ extern void tutorial(boolean); #endif /* !CROSSCOMPILE || CROSSCOMPILE_TARGET */ #endif /* MAKEDEFS_C MDLIB_C CPPREGEX_C */ -/* ### nhregex.c ### */ +/* ### {cpp,pmatch,posix}regex.c ### */ extern struct nhregex *regex_init(void); extern boolean regex_compile(const char *, struct nhregex *) NONNULLARG1;