Update to 3.10

Upstream changes:
CHANGES FROM 3.00 to 3.10

   * Implements most of the following BASIC dialects:
      OPTION VERSION DARTMOUTH        ' Dartmouth DTSS BASIC
      OPTION VERSION MARK-I           ' GE 265 Mainframe BASIC
      OPTION VERSION MARK-II          ' GE 435 Mainframe BASIC
      OPTION VERSION SYSTEM-360       ' IBM System/360 BASIC
      OPTION VERSION SYSTEM-370       ' IBM System/370 BASIC
      OPTION VERSION CBASIC-II        ' CBASIC-II for CP/M
      OPTION VERSION ECMA-55          ' ANSI Minimal BASIC
      OPTION VERSION HANDBOOK1        ' The BASIC Handbook, 1st Edition
      OPTION VERSION HANDBOOK2        ' The BASIC Handbook, 2nd Edition
      OPTION VERSION TRS-80           ' TRS-80 Model I/III/4 LBASIC
      OPTION VERSION BASIC-80         ' Microsoft BASIC-80 for Xenix
      OPTION VERSION ECMA-116         ' ANSI Full BASIC

   * from Howard Wulf, AF5NE

5 files changed, 87 insertions, 297 deletions

diff --git a/lang/bwbasic/Makefile b/lang/bwbasic/Makefile
index 6700f06aa14..075264affee 100644
--- a/lang/bwbasic/Makefile
+++ b/lang/bwbasic/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2015/09/05 23:56:56 wiedi Exp $
+# $NetBSD: Makefile,v 1.19 2017/01/19 06:48:46 wen Exp $
 
-DISTNAME=	bwbasic-3.00
+DISTNAME=	bwbasic-3.10
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bwbasic/}
 EXTRACT_SUFX=	.zip
@@ -14,16 +14,11 @@ WRKSRC=		${WRKDIR}
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c99
 
-SHARE_DIR=	${PREFIX}/share/bwbasic
-
 CFLAGS+=		-DHAVE_ISNAN=1
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${SHARE_DIR}
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 post-install:
-	${CP} -r ${WRKSRC}/bwbtest ${DESTDIR}${SHARE_DIR}
-	${FIND} ${DESTDIR}${SHARE_DIR} -type d -print | ${XARGS} ${CHMOD} ${BINMODE}
-	${FIND} ${DESTDIR}${SHARE_DIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
 	${INSTALL_MAN} ${WRKSRC}/bwbasic.doc ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/bwbasic.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/bwbasic/PLIST b/lang/bwbasic/PLIST
index 24c124b1763..002192a8216 100644
--- a/lang/bwbasic/PLIST
+++ b/lang/bwbasic/PLIST
@@ -1,226 +1,3 @@
-@comment $NetBSD: PLIST,v 1.4 2015/05/20 07:28:05 wen Exp $
+@comment $NetBSD: PLIST,v 1.5 2017/01/19 06:48:46 wen Exp $
 bin/bwbasic
 man/man1/bwbasic.1
-share/bwbasic/bwbtest/00readme.txt
-share/bwbasic/bwbtest/00test.sh
-share/bwbasic/bwbtest/PAD80.BAS
-share/bwbasic/bwbtest/PAD80.INP
-share/bwbasic/bwbtest/abs.80
-share/bwbasic/bwbtest/abs.OUT
-share/bwbasic/bwbtest/abs.bas
-share/bwbasic/bwbtest/abs.dif
-share/bwbasic/bwbtest/abs.run
-share/bwbasic/bwbtest/assign.80
-share/bwbasic/bwbtest/assign.OUT
-share/bwbasic/bwbtest/assign.bas
-share/bwbasic/bwbtest/assign.dif
-share/bwbasic/bwbtest/assign.run
-share/bwbasic/bwbtest/callfunc.80
-share/bwbasic/bwbtest/callfunc.OUT
-share/bwbasic/bwbtest/callfunc.bas
-share/bwbasic/bwbtest/callfunc.dif
-share/bwbasic/bwbtest/callfunc.run
-share/bwbasic/bwbtest/callsub.80
-share/bwbasic/bwbtest/callsub.OUT
-share/bwbasic/bwbtest/callsub.bas
-share/bwbasic/bwbtest/callsub.dif
-share/bwbasic/bwbtest/callsub.run
-share/bwbasic/bwbtest/chain1.80
-share/bwbasic/bwbtest/chain1.OUT
-share/bwbasic/bwbtest/chain1.bas
-share/bwbasic/bwbtest/chain1.dif
-share/bwbasic/bwbtest/chain1.run
-share/bwbasic/bwbtest/chain2.80
-share/bwbasic/bwbtest/chain2.OUT
-share/bwbasic/bwbtest/chain2.bas
-share/bwbasic/bwbtest/chain2.dif
-share/bwbasic/bwbtest/chain2.run
-share/bwbasic/bwbtest/data.tmp
-share/bwbasic/bwbtest/dataread.80
-share/bwbasic/bwbtest/dataread.OUT
-share/bwbasic/bwbtest/dataread.bas
-share/bwbasic/bwbtest/dataread.dif
-share/bwbasic/bwbtest/dataread.run
-share/bwbasic/bwbtest/deffn.80
-share/bwbasic/bwbtest/deffn.OUT
-share/bwbasic/bwbtest/deffn.bas
-share/bwbasic/bwbtest/deffn.dif
-share/bwbasic/bwbtest/deffn.run
-share/bwbasic/bwbtest/dif.OUT
-share/bwbasic/bwbtest/dim.80
-share/bwbasic/bwbtest/dim.OUT
-share/bwbasic/bwbtest/dim.bas
-share/bwbasic/bwbtest/dim.dif
-share/bwbasic/bwbtest/dim.run
-share/bwbasic/bwbtest/doloop.80
-share/bwbasic/bwbtest/doloop.OUT
-share/bwbasic/bwbtest/doloop.bas
-share/bwbasic/bwbtest/doloop.dif
-share/bwbasic/bwbtest/doloop.run
-share/bwbasic/bwbtest/dowhile.80
-share/bwbasic/bwbtest/dowhile.OUT
-share/bwbasic/bwbtest/dowhile.bas
-share/bwbasic/bwbtest/dowhile.dif
-share/bwbasic/bwbtest/dowhile.run
-share/bwbasic/bwbtest/elseif.80
-share/bwbasic/bwbtest/elseif.INP
-share/bwbasic/bwbtest/elseif.OUT
-share/bwbasic/bwbtest/elseif.bas
-share/bwbasic/bwbtest/elseif.dif
-share/bwbasic/bwbtest/elseif.run
-share/bwbasic/bwbtest/end.80
-share/bwbasic/bwbtest/end.OUT
-share/bwbasic/bwbtest/end.bas
-share/bwbasic/bwbtest/end.dif
-share/bwbasic/bwbtest/end.run
-share/bwbasic/bwbtest/err.80
-share/bwbasic/bwbtest/err.OUT
-share/bwbasic/bwbtest/err.bas
-share/bwbasic/bwbtest/err.dif
-share/bwbasic/bwbtest/err.run
-share/bwbasic/bwbtest/fncallfn.80
-share/bwbasic/bwbtest/fncallfn.OUT
-share/bwbasic/bwbtest/fncallfn.bas
-share/bwbasic/bwbtest/fncallfn.dif
-share/bwbasic/bwbtest/fncallfn.run
-share/bwbasic/bwbtest/fornext.80
-share/bwbasic/bwbtest/fornext.OUT
-share/bwbasic/bwbtest/fornext.bas
-share/bwbasic/bwbtest/fornext.dif
-share/bwbasic/bwbtest/fornext.run
-share/bwbasic/bwbtest/function.80
-share/bwbasic/bwbtest/function.INP
-share/bwbasic/bwbtest/function.OUT
-share/bwbasic/bwbtest/function.bas
-share/bwbasic/bwbtest/function.dif
-share/bwbasic/bwbtest/function.run
-share/bwbasic/bwbtest/gosub.80
-share/bwbasic/bwbtest/gosub.INP
-share/bwbasic/bwbtest/gosub.OUT
-share/bwbasic/bwbtest/gosub.bas
-share/bwbasic/bwbtest/gosub.dif
-share/bwbasic/bwbtest/gosub.run
-share/bwbasic/bwbtest/gotolabl.80
-share/bwbasic/bwbtest/gotolabl.OUT
-share/bwbasic/bwbtest/gotolabl.bas
-share/bwbasic/bwbtest/gotolabl.dif
-share/bwbasic/bwbtest/gotolabl.run
-share/bwbasic/bwbtest/ifline.80
-share/bwbasic/bwbtest/ifline.OUT
-share/bwbasic/bwbtest/ifline.bas
-share/bwbasic/bwbtest/ifline.dif
-share/bwbasic/bwbtest/ifline.run
-share/bwbasic/bwbtest/index.txt
-share/bwbasic/bwbtest/input.80
-share/bwbasic/bwbtest/input.INP
-share/bwbasic/bwbtest/input.OUT
-share/bwbasic/bwbtest/input.bas
-share/bwbasic/bwbtest/input.dif
-share/bwbasic/bwbtest/input.run
-share/bwbasic/bwbtest/lof.80
-share/bwbasic/bwbtest/lof.INP
-share/bwbasic/bwbtest/lof.OUT
-share/bwbasic/bwbtest/lof.bas
-share/bwbasic/bwbtest/lof.dif
-share/bwbasic/bwbtest/lof.run
-share/bwbasic/bwbtest/loopuntl.80
-share/bwbasic/bwbtest/loopuntl.OUT
-share/bwbasic/bwbtest/loopuntl.bas
-share/bwbasic/bwbtest/loopuntl.dif
-share/bwbasic/bwbtest/loopuntl.run
-share/bwbasic/bwbtest/main.80
-share/bwbasic/bwbtest/main.OUT
-share/bwbasic/bwbtest/main.bas
-share/bwbasic/bwbtest/main.dif
-share/bwbasic/bwbtest/main.run
-share/bwbasic/bwbtest/mlifthen.80
-share/bwbasic/bwbtest/mlifthen.OUT
-share/bwbasic/bwbtest/mlifthen.bas
-share/bwbasic/bwbtest/mlifthen.dif
-share/bwbasic/bwbtest/mlifthen.run
-share/bwbasic/bwbtest/on.80
-share/bwbasic/bwbtest/on.INP
-share/bwbasic/bwbtest/on.OUT
-share/bwbasic/bwbtest/on.bas
-share/bwbasic/bwbtest/on.dif
-share/bwbasic/bwbtest/on.run
-share/bwbasic/bwbtest/onerr.80
-share/bwbasic/bwbtest/onerr.OUT
-share/bwbasic/bwbtest/onerr.bas
-share/bwbasic/bwbtest/onerr.dif
-share/bwbasic/bwbtest/onerr.run
-share/bwbasic/bwbtest/onerrlbl.80
-share/bwbasic/bwbtest/onerrlbl.OUT
-share/bwbasic/bwbtest/onerrlbl.bas
-share/bwbasic/bwbtest/onerrlbl.dif
-share/bwbasic/bwbtest/onerrlbl.run
-share/bwbasic/bwbtest/ongosub.80
-share/bwbasic/bwbtest/ongosub.INP
-share/bwbasic/bwbtest/ongosub.OUT
-share/bwbasic/bwbtest/ongosub.bas
-share/bwbasic/bwbtest/ongosub.dif
-share/bwbasic/bwbtest/ongosub.run
-share/bwbasic/bwbtest/opentest.80
-share/bwbasic/bwbtest/opentest.OUT
-share/bwbasic/bwbtest/opentest.bas
-share/bwbasic/bwbtest/opentest.dif
-share/bwbasic/bwbtest/opentest.run
-share/bwbasic/bwbtest/option.80
-share/bwbasic/bwbtest/option.OUT
-share/bwbasic/bwbtest/option.bas
-share/bwbasic/bwbtest/option.dif
-share/bwbasic/bwbtest/option.run
-share/bwbasic/bwbtest/pascaltr.80
-share/bwbasic/bwbtest/pascaltr.OUT
-share/bwbasic/bwbtest/pascaltr.bas
-share/bwbasic/bwbtest/pascaltr.dif
-share/bwbasic/bwbtest/pascaltr.run
-share/bwbasic/bwbtest/profile.bas
-share/bwbasic/bwbtest/putget.80
-share/bwbasic/bwbtest/putget.INP
-share/bwbasic/bwbtest/putget.OUT
-share/bwbasic/bwbtest/putget.bas
-share/bwbasic/bwbtest/putget.dif
-share/bwbasic/bwbtest/putget.run
-share/bwbasic/bwbtest/random.80
-share/bwbasic/bwbtest/random.OUT
-share/bwbasic/bwbtest/random.bas
-share/bwbasic/bwbtest/random.dif
-share/bwbasic/bwbtest/random.run
-share/bwbasic/bwbtest/selcase.80
-share/bwbasic/bwbtest/selcase.OUT
-share/bwbasic/bwbtest/selcase.bas
-share/bwbasic/bwbtest/selcase.dif
-share/bwbasic/bwbtest/selcase.run
-share/bwbasic/bwbtest/snglfunc.80
-share/bwbasic/bwbtest/snglfunc.OUT
-share/bwbasic/bwbtest/snglfunc.bas
-share/bwbasic/bwbtest/snglfunc.dif
-share/bwbasic/bwbtest/snglfunc.run
-share/bwbasic/bwbtest/stop.80
-share/bwbasic/bwbtest/stop.OUT
-share/bwbasic/bwbtest/stop.bas
-share/bwbasic/bwbtest/stop.dif
-share/bwbasic/bwbtest/stop.run
-share/bwbasic/bwbtest/term.80
-share/bwbasic/bwbtest/term.INP
-share/bwbasic/bwbtest/term.OUT
-share/bwbasic/bwbtest/term.bas
-share/bwbasic/bwbtest/term.dif
-share/bwbasic/bwbtest/term.run
-share/bwbasic/bwbtest/test.out
-share/bwbasic/bwbtest/whilwend.80
-share/bwbasic/bwbtest/whilwend.OUT
-share/bwbasic/bwbtest/whilwend.bas
-share/bwbasic/bwbtest/whilwend.dif
-share/bwbasic/bwbtest/whilwend.run
-share/bwbasic/bwbtest/width.80
-share/bwbasic/bwbtest/width.OUT
-share/bwbasic/bwbtest/width.bas
-share/bwbasic/bwbtest/width.dif
-share/bwbasic/bwbtest/width.run
-share/bwbasic/bwbtest/writeinp.80
-share/bwbasic/bwbtest/writeinp.OUT
-share/bwbasic/bwbtest/writeinp.bas
-share/bwbasic/bwbtest/writeinp.dif
-share/bwbasic/bwbtest/writeinp.run
diff --git a/lang/bwbasic/distinfo b/lang/bwbasic/distinfo
index a89f7d841dd..d5e169abb27 100644
--- a/lang/bwbasic/distinfo
+++ b/lang/bwbasic/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2015/12/29 23:34:44 dholland Exp $
+$NetBSD: distinfo,v 1.15 2017/01/19 06:48:46 wen Exp $
 
-SHA1 (bwbasic-3.00.zip) = 89bb9e960bb91339752bb6d9796d93998d9ca3f6
-RMD160 (bwbasic-3.00.zip) = 3d78b2fc3c6a73856b92443c296d71cd5b39208e
-SHA512 (bwbasic-3.00.zip) = 28d43aa272bf75eda822e7629bcf227049cb8d05ad24f7ebe6229871c302a8bc360b8c5cb252248e8285065be8c06b7fa94d53e7c81042078f3bcda281584afe
-Size (bwbasic-3.00.zip) = 2777709 bytes
-SHA1 (patch-aa) = baa2ae3e72dda0146914d57285aba715d93aec60
-SHA1 (patch-ac) = c82d9eb2159faae0ad3f22da525d2a2dd2de4e95
+SHA1 (bwbasic-3.10.zip) = da5966490b83c47b61c937f5090e75c50d4df520
+RMD160 (bwbasic-3.10.zip) = 1b0b279a5e559f189c1dba8e83a0b2689af8ac1c
+SHA512 (bwbasic-3.10.zip) = 36e896bafaac370c1c03f066e1d7830e308b022c9a62833756c13ee179a80cb948cdae1f0ad3129bdd5f72a5f40432bc3989744fc183812ea4bf99807c75c7d8
+Size (bwbasic-3.10.zip) = 3158727 bytes
+SHA1 (patch-aa) = 948ffb5ccde6ffa371fc96c836314738bfdfd789
+SHA1 (patch-ac) = c471944fd4e8d86ebc53746aa008a2e7424a6dc3
 SHA1 (patch-renum.c) = 458affe1dd9742b54040b9721d2a8a7cfa82956b
diff --git a/lang/bwbasic/patches/patch-aa b/lang/bwbasic/patches/patch-aa
index 3699a3f2b1f..04d5a0406bb 100644
--- a/lang/bwbasic/patches/patch-aa
+++ b/lang/bwbasic/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.5 2015/12/29 23:34:44 dholland Exp $
+$NetBSD: patch-aa,v 1.6 2017/01/19 06:48:46 wen Exp $
 
 Configure for pkgsrc.
 DESTDIR support.
 
---- Makefile.in.orig	2009-06-04 12:50:16.000000000 +0000
+--- Makefile.in.orig	2015-05-12 12:10:34.000000000 +0000
 +++ Makefile.in
 @@ -16,9 +16,10 @@ INSTALL_DATA = @INSTALL_DATA@
  
@@ -19,6 +19,24 @@ DESTDIR support.
  
  # Revised by JBV
  #LDFLAGS = -s
+@@ -29,13 +30,13 @@ bindir = $(exec_prefix)/bin
+ 
+ SHELL = /bin/sh
+ 
+-CFILES=         bwbasic.c bwb_cmd.c bwb_cnd.c bwb_dio.c bwb_elx.c\
+-                bwb_exp.c bwb_fnc.c bwb_inp.c bwb_int.c bwb_ops.c\
++CFILES=         bwbasic.c bwb_cmd.c bwb_cnd.c bwb_dio.c \
++                bwb_exp.c bwb_fnc.c bwb_inp.c bwb_int.c \
+                 bwb_prn.c bwb_stc.c bwb_str.c bwb_tbl.c bwb_var.c\
+ 		bwd_cmd.c bwd_fun.c bwx_tty.c
+ 
+-OFILES=         bwbasic.o bwb_cmd.o bwb_cnd.o bwb_dio.o bwb_elx.o\
+-                bwb_exp.o bwb_fnc.o bwb_inp.o bwb_int.o bwb_ops.o\
++OFILES=         bwbasic.o bwb_cmd.o bwb_cnd.o bwb_dio.o \
++                bwb_exp.o bwb_fnc.o bwb_inp.o bwb_int.o \
+                 bwb_prn.o bwb_stc.o bwb_str.o bwb_tbl.o bwb_var.o\
+ 		bwd_cmd.o bwd_fun.o bwx_tty.o
+  
 @@ -75,7 +76,7 @@ $(OFILES):      $(HFILES)
  	$(CC) -c $(CPPFLAGS) -I$(srcdir) $(DEFS) $(CFLAGS) $<
  
diff --git a/lang/bwbasic/patches/patch-ac b/lang/bwbasic/patches/patch-ac
index ba9771bcc1d..f7de8887d5f 100644
--- a/lang/bwbasic/patches/patch-ac
+++ b/lang/bwbasic/patches/patch-ac
@@ -1,36 +1,37 @@
-$NetBSD: patch-ac,v 1.5 2015/12/29 23:34:44 dholland Exp $
+$NetBSD: patch-ac,v 1.6 2017/01/19 06:48:46 wen Exp $
 
 Primitively roffify the doc so it can be installed as a man page.
 
---- bwbasic.doc.orig	2015-05-20 14:17:40.000000000 +0000
+--- bwbasic.doc.orig	2017-01-19 03:03:40.000000000 +0000
 +++ bwbasic.doc
-@@ -1,36 +1,10 @@
+@@ -1,38 +1,10 @@
 -
--
--
--
--               Bywater BASIC Interpreter, version 3.00
+-               Bywater BASIC Interpreter, version 3.10
 -               ---------------------------------------------
 -
--                    Copyright (c) 1993, Ted A. Campbell
+-                  Copyright (c) 1993, Ted A. Campbell
 -                  for bwBASIC version 2.10, 11 October 1993
 -
 -                  Copyright (c) 2014-2015, Howatd Wulf, AF5NE
--                  for bwBASIC version 3.00, 2015-04-05
+-                  for bwBASIC version 3.00, 12 May 2015
+-
+-                  Copyright (c) 2015-2016, Howatd Wulf, AF5NE
+-                  for bwBASIC version 3.10, 27 July 2016
 -
 -
 -CONTENTS:
 -
+-
 -   1. DESCRIPTION
 -   2. TERMS OF USE
--   3. QUICK REFERENCE LIST OF COMMANDS AND FUNCTIONS
+-   3. QUICK REFERENCE LIST OF COMMANDS, FUNCTIONS AND OPERATORS
 -   4. GENERAL NOTES ON USAGE
--   5. EXPANDED REFERENCE FOR COMMANDS AND FUNCTIONS
--   6. PREDEFINED VARIABLES
--   7. UNIMPLEMENTED COMMANDS AND FUNCTIONS
+-   5. PREDEFINED VARIABLES
+-   6. UNIMPLEMENTED COMMANDS AND FUNCTIONS
 -      and AGENDA FOR DEVELOPMENT
--   8. THE STORY OF BYWATER BASIC
--   9. COMMUNICATIONS
+-   7. THE STORY OF Bywater BASIC
+-   8. COMMUNICATIONS
+-   9. EXPANDED REFERENCE FOR COMMANDS, FUNCTIONS AND OPERATORS
 -
 -   The author wishes to express his thanks to Mr. David MacKenzie, 
 -   who assisted in the development Unix installation and configuration
@@ -38,6 +39,7 @@ Primitively roffify the doc so it can be installed as a man page.
 -
 -
 -1. DESCRIPTION
+-
 +.Dd October 11, 1993
 +.Dt bwBASIC 1
 +.Os
@@ -46,77 +48,75 @@ Primitively roffify the doc so it can be installed as a man page.
 +.Nd BASIC Interpreter/Shell, version 2.10
 +.Sh SYNOPSIS
  
-    The Bywater BASIC Interpreter (bwBASIC) implements a large
-    superset of the ANSI Standard for Minimal BASIC (X3.60-1978)
-@@ -53,7 +27,7 @@ CONTENTS:
-    into distinct lines as they are loaded.
+    The Bywater BASIC Interpreter (bwBASIC) implements a large superset 
+    of the ANSI Standard for Minimal BASIC (X3.60-1978) and a significant 
+@@ -55,7 +27,7 @@ CONTENTS:
+    lines as they are loaded.
  
  
 -2. TERMS OF USE:
-+.Sh TERMS OF USE:
++.SH TERMS OF USE:
+ 
  
     This version of Bywater BASIC is released under the terms of the 
-    GNU General Public License (GPL), which is distributed with this 
-@@ -64,7 +38,7 @@ CONTENTS:
+@@ -67,7 +39,7 @@ CONTENTS:
     for information on which you should contact the author.
  
  
--3. QUICK REFERENCE LIST OF COMMANDS AND FUNCTIONS
-+.Sh QUICK REFERENCE LIST OF COMMANDS AND FUNCTIONS
+-3. QUICK REFERENCE LIST OF COMMANDS, FUNCTIONS AND OPERATORS
++.SH QUICK REFERENCE LIST OF COMMANDS, FUNCTIONS AND OPERATORS
  
-    Be aware that many of these commands and functions will not be
-    available unless you have enabled a particular dialect using
-@@ -380,7 +354,7 @@ CONTENTS:
-      WRITE [# device-number,] element [, .... ]
+    
+    The OPTION VERSION command selects a specific BASIC dialect.
+@@ -630,7 +602,7 @@ CONTENTS:
+       [LET] variable = expression
     
  
 -4. GENERAL NOTES ON USAGE:
-+.Sh GENERAL NOTES ON USAGE:
++.SH GENERAL NOTES ON USAGE:
  
-    4.a. Interactive Environment
  
-@@ -790,7 +764,7 @@ CONTENTS:
-    END FUNCTION
-    
-    
--5. EXPANDED REFERENCE FOR COMMANDS AND FUNCTIONS
-+.Sh EXPANDED REFERENCE FOR COMMANDS AND FUNCTIONS
-    
-    bwBASIC provides a simple "HELP" command to assist you in
-    finding the command or function you are looking for.
-@@ -6965,7 +6939,7 @@ DESCRIPTION: For file X, sets the line w
+    4.a. Interactive Environment
+@@ -1564,7 +1536,7 @@ CONTENTS:
+          Completed.
  
  
+-5. PREDEFINED VARIABLES
++.SH PREDEFINED VARIABLES
  
--6. PREDEFINED VARIABLES
-+.Sh PREDEFINED VARIABLES
  
     BWB.EDITOR$
-    BWB.FILES$
-@@ -7003,7 +6977,7 @@ DESCRIPTION: For file X, sets the line w
-    return the current OPTION TERMINAL setting.
-    
+@@ -1601,7 +1573,7 @@ CONTENTS:
+    these keywords output nothing.     
+ 
     
--7. UNIMPLEMENTED COMMANDS AND FUNCTIONS, and AGENDA FOR DEVELOPMENT
-+.Sh UNIMPLEMENTED COMMANDS AND FUNCTIONS, and AGENDA FOR DEVELOPMENT
+-6. UNIMPLEMENTED COMMANDS AND FUNCTIONS, and AGENDA FOR DEVELOPMENT
++.SH UNIMPLEMENTED COMMANDS AND FUNCTIONS, and AGENDA FOR DEVELOPMENT
+ 
  
     There are some items not implemented that have been so long
-    a part of standard BASICs that their absence will seem surprising.
-@@ -7172,7 +7146,7 @@ DESCRIPTION: For file X, sets the line w
+@@ -1761,7 +1733,7 @@ CONTENTS:
     ZONEWIDTH
  
  
--8. THE STORY OF BYWATER BASIC
-+.Sh THE STORY OF BYWATER BASIC
+-7. THE STORY OF Bywater BASIC
++.SH THE STORY OF Bywater BASIC
+ 
  
     This program was originally begun in 1982 by my grandmother, Mrs.
-    Verda Spell of Beaumont, TX.  She was writing the program using
-@@ -7194,7 +7168,7 @@ DESCRIPTION: For file X, sets the line w
+@@ -1784,13 +1756,13 @@ CONTENTS:
     should know, though, that I myself am an historian, not a programmer.
  
  
--9. COMMUNICATIONS:
-+.Sh COMMUNICATIONS:
+-8. COMMUNICATIONS:
++.SH COMMUNICATIONS:
+ 
  
     email:  tcamp@delphi.com
  
+ 
+-9. EXPANDED REFERENCE FOR COMMANDS, FUNCTIONS AND OPERATORS
++.SH EXPANDED REFERENCE FOR COMMANDS, FUNCTIONS AND OPERATORS
+ 
+    
+    bwBASIC provides a simple "HELP" command to assist you in